jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made the trackers pick the most suitable interface to connect to (IPv6/Ipv4 issue). added Mono Torrent to identify_client and dht statistics.

Browse Source
This commit is contained in:
Arvid Norberg
2007-03-02 18:40:02 +00:00
parent be574bcc33
commit 7e3a415d0b
10 changed files with 92 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/udp_tracker_connection.cpp
View File

@@ -78,20 +78,20 @@ namespace libtorrent
, tracker_request const& req
, std::string const& hostname
, unsigned short port
, address bind_infc
, boost::weak_ptr<request_callback> c
, session_settings const& stn)
: tracker_connection(man, req, str, c)
: tracker_connection(man, req, str, bind_infc, c)
, m_man(man)
, m_strand(str)
, m_name_lookup(m_strand.io_service())
, m_port(port)
, m_transaction_id(0)
, m_connection_id(0)
, m_settings(stn)
, m_attempts(0)
{
m_socket.reset(new datagram_socket(m_strand.io_service()));
tcp::resolver::query q(hostname, "0");
udp::resolver::query q(hostname, boost::lexical_cast<std::string>(port));
m_name_lookup.async_resolve(q
, m_strand.wrap(boost::bind(
&udp_tracker_connection::name_lookup, self(), _1, _2)));
@@ -100,11 +100,11 @@ namespace libtorrent
}
void udp_tracker_connection::name_lookup(asio::error_code const& error
, tcp::resolver::iterator i) try
, udp::resolver::iterator i) try
{
if (error == asio::error::operation_aborted) return;
if (!m_socket) return; // the operation was aborted
if (error || i == tcp::resolver::iterator())
if (error || i == udp::resolver::iterator())
{
fail(-1, error.message().c_str());
return;
@@ -114,10 +114,35 @@ namespace libtorrent
if (has_requester()) requester().debug_log("udp tracker name lookup successful");
#endif
restart_read_timeout();
m_target = udp::endpoint(i->endpoint().address(), m_port);
if (has_requester()) requester().m_tracker_address
= tcp::endpoint(i->endpoint().address(), m_port);
m_socket->connect(m_target);
// look for an address that has the same kind as the one
// we're listening on. To make sure the tracker get our
// correct listening address.
udp::resolver::iterator target = i;
udp::resolver::iterator end;
udp::endpoint target_address = *i;
for (; target != end && target->endpoint().address().is_v4()
!= bind_interface().is_v4(); ++target);
if (target == end)
{
assert(target_address.address().is_v4() != bind_interface().is_v4());
if (has_requester())
{
std::string tracker_address_type = target_address.address().is_v4() ? "IPv4" : "IPv6";
std::string bind_address_type = bind_interface().is_v4() ? "IPv4" : "IPv6";
requester().tracker_warning("the tracker only resolves to an "
+ tracker_address_type + " address, and your listen interface is an "
+ bind_address_type + " address. This may prevent you from incoming connections.");
}
}
else
{
target_address = *target;
}
if (has_requester()) requester().m_tracker_address = tcp::endpoint(target_address.address(), target_address.port());
m_target = target_address;
m_socket->connect(target_address);
send_udp_connect();
}
catch (std::exception& e)