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

select which DHT port to report based on the connection's local endpoint (#2316)

This commit is contained in:
Steven Siloti 2017-09-10 01:25:04 -07:00 committed by Arvid Norberg
parent 55228756e5
commit df8a57efb7
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/libtorrent/aux_/session_impl.hpp
View File

@ -600,14 +600,7 @@ namespace aux {
#ifndef TORRENT_DISABLE_DHT #ifndef TORRENT_DISABLE_DHT
bool is_dht_running() const { return (m_dht.get() != nullptr); } bool is_dht_running() const { return (m_dht.get() != nullptr); }
int external_udp_port() const override int external_udp_port(address const& local_address) const override;
{
for (auto const& s : m_listen_sockets)
{
if (s->udp_sock) return s->udp_external_port;
}
return -1;
}
#endif #endif
#if TORRENT_USE_I2P #if TORRENT_USE_I2P

2
include/libtorrent/aux_/session_interface.hpp
View File

@ -300,7 +300,7 @@ namespace libtorrent { namespace aux {
virtual bool announce_dht() const = 0; virtual bool announce_dht() const = 0;
virtual void add_dht_node(udp::endpoint const& n) = 0; virtual void add_dht_node(udp::endpoint const& n) = 0;
virtual bool has_dht() const = 0; virtual bool has_dht() const = 0;
virtual int external_udp_port() const = 0; virtual int external_udp_port(address const& local_address) const = 0;
virtual dht::dht_tracker* dht() = 0; virtual dht::dht_tracker* dht() = 0;
virtual void prioritize_dht(std::weak_ptr<torrent> t) = 0; virtual void prioritize_dht(std::weak_ptr<torrent> t) = 0;
#endif #endif

2
src/bt_peer_connection.cpp
View File

@ -333,7 +333,7 @@ namespace {
#ifndef TORRENT_DISABLE_DHT #ifndef TORRENT_DISABLE_DHT
if (m_supports_dht_port && m_ses.has_dht()) if (m_supports_dht_port && m_ses.has_dht())
{ {
int const port = m_ses.external_udp_port(); int const port = m_ses.external_udp_port(local_endpoint().address());
if (port >= 0) write_dht_port(port); if (port >= 0) write_dht_port(port);
} }
#endif #endif

16
src/session_impl.cpp
View File

@ -2151,6 +2151,22 @@ namespace {
#endif #endif
} }
#ifndef TORRENT_DISABLE_DHT
int session_impl::external_udp_port(address const& local_address) const
{
auto ls = std::find_if(m_listen_sockets.begin(), m_listen_sockets.end()
, [&](std::shared_ptr<listen_socket_t> const& e)
{
return e->local_endpoint.address() == local_address;
});
if (ls != m_listen_sockets.end())
return (*ls)->udp_external_port;
else
return -1;
}
#endif
#if TORRENT_USE_I2P #if TORRENT_USE_I2P
proxy_settings session_impl::i2p_proxy() const proxy_settings session_impl::i2p_proxy() const