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

fixed busted is_any check for 'ipv6' key in extended handshake

Browse Source
This commit is contained in:
Arvid Norberg
2008-09-20 16:21:16 +00:00
parent e46f2396cf
commit 98f9d5826c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/broadcast_socket.cpp
View File

@@ -79,6 +79,8 @@ namespace libtorrent
{ {
if (addr.is_v4()) if (addr.is_v4())
return addr.to_v4() == address_v4::any(); return addr.to_v4() == address_v4::any();
else if (addr.to_v6().is_v4_mapped())
return (addr.to_v6().to_v4() == address_v4::any());
else else
return addr.to_v6() == address_v6::any(); return addr.to_v6() == address_v6::any();
} }

8
src/bt_peer_connection.cpp
View File

@@ -1314,7 +1314,11 @@ namespace libtorrent
{ {
address_v6::bytes_type bytes; address_v6::bytes_type bytes;
std::copy(myip.begin(), myip.end(), bytes.begin()); std::copy(myip.begin(), myip.end(), bytes.begin());
m_ses.set_external_address(address_v6(bytes)); address_v6 ipv6_address(bytes);
if (ipv6_address.is_v4_mapped())
m_ses.set_external_address(ipv6_address.to_v4());
else
m_ses.set_external_address(ipv6_address);
} }
} }
@@ -1567,7 +1571,7 @@ namespace libtorrent
if (t->is_finished()) handshake["upload_only"] = 1; if (t->is_finished()) handshake["upload_only"] = 1;
tcp::endpoint ep = m_ses.get_ipv6_interface(); tcp::endpoint ep = m_ses.get_ipv6_interface();
if (ep != tcp::endpoint()) if (!is_any(ep.address()))
{ {
std::string ipv6_address; std::string ipv6_address;
std::back_insert_iterator<std::string> out(ipv6_address); std::back_insert_iterator<std::string> out(ipv6_address);