wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

Include &ipv4= for private trackers

This commit is contained in:
airium 2018-11-19 19:12:42 +08:00 committed by Arvid Norberg
parent 25a1f12991
commit 3406f12ab3
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/tracker_manager.hpp
View File

@ -161,6 +161,8 @@ namespace libtorrent
boost::uint32_t key; boost::uint32_t key;
int num_want; int num_want;
address_v4 ipv4;
#if TORRENT_USE_IPV6 #if TORRENT_USE_IPV6
address_v6 ipv6; address_v6 ipv6;
#endif #endif

11
src/http_tracker_connection.cpp
View File

@ -183,6 +183,17 @@ namespace libtorrent
} }
} }
if (tracker_req().ipv4 != address_v4() && !i2p)
{
error_code err;
std::string const ip = tracker_req().ipv4.to_string(err);
if (!err)
{
url += "&ipv4=";
url += escape_string(ip.c_str(), ip.size());
}
}
#if TORRENT_USE_IPV6 #if TORRENT_USE_IPV6
if (tracker_req().ipv6 != address_v6() && !i2p) if (tracker_req().ipv6 != address_v6() && !i2p)
{ {

12
src/torrent.cpp
View File

@ -3246,17 +3246,19 @@ namespace {
req.event = e; req.event = e;
#if TORRENT_USE_IPV6 // since sending our IPv4/v6 address to the tracker may be sensitive. Only
// since sending our IPv6 address to the tracker may be sensitive. Only
// do that if we're not in anonymous mode and if it's a private torrent // do that if we're not in anonymous mode and if it's a private torrent
if (!settings().get_bool(settings_pack::anonymous_mode) if (!settings().get_bool(settings_pack::anonymous_mode)
&& m_torrent_file && m_torrent_file
&& m_torrent_file->priv()) && m_torrent_file->priv())
{ {
boost::optional<tcp::endpoint> ep = m_ses.get_ipv6_interface(); boost::optional<tcp::endpoint> ep4 = m_ses.get_ipv4_interface();
if (ep) req.ipv6 = ep->address().to_v6(); if (ep4) req.ipv4 = ep4->address().to_v4();
} #if TORRENT_USE_IPV6
boost::optional<tcp::endpoint> ep6 = m_ses.get_ipv6_interface();
if (ep6) req.ipv6 = ep6->address().to_v6();
#endif #endif
}
// if we are aborting. we don't want any new peers // if we are aborting. we don't want any new peers
req.num_want = (req.event == tracker_request::stopped) req.num_want = (req.event == tracker_request::stopped)