premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

restrict DHT nodes to the network they are associated with (multi-homed)

This commit is contained in:
arvidn 2020-01-15 19:47:41 +01:00 committed by Arvid Norberg
parent df85b31490
commit 82d4d1927d
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,3 +1,4 @@
* fix external IP voting for multi-homed DHT nodes
* deprecate broadcast_lsd setting. Just use multicast
* deprecate upnp_ignore_nonrouters setting
* don't attempt sending event=stopped if event=start never succeeded

56
src/kademlia/node.cpp
View File

@ -269,32 +269,37 @@ void node::incoming(aux::listen_socket_handle const& s, msg const& m)
return;
}
const char y = *(y_ent.string_ptr());
char const y = *(y_ent.string_ptr());
bdecode_node ext_ip = m.message.dict_find_string("ip");
// we can only ascribe the external IP this node is saying we have to the
// listen socket the packet was received on
if (s == m_sock)
{
bdecode_node ext_ip = m.message.dict_find_string("ip");
// backwards compatibility
if (!ext_ip)
{
bdecode_node const r = m.message.dict_find_dict("r");
if (r)
ext_ip = r.dict_find_string("ip");
}
// backwards compatibility
if (!ext_ip)
{
bdecode_node const r = m.message.dict_find_dict("r");
if (r)
ext_ip = r.dict_find_string("ip");
}
if (ext_ip && ext_ip.string_length() >= int(detail::address_size(udp::v6())))
{
// this node claims we use the wrong node-ID!
char const* ptr = ext_ip.string_ptr();
if (m_observer != nullptr)
m_observer->set_external_address(m_sock, detail::read_v6_address(ptr)
, m.addr.address());
}
else if (ext_ip && ext_ip.string_length() >= int(detail::address_size(udp::v4())))
{
char const* ptr = ext_ip.string_ptr();
if (m_observer != nullptr)
m_observer->set_external_address(m_sock, detail::read_v4_address(ptr)
, m.addr.address());
if (ext_ip && ext_ip.string_length() >= int(detail::address_size(udp::v6())))
{
// this node claims we use the wrong node-ID!
char const* ptr = ext_ip.string_ptr();
if (m_observer != nullptr)
m_observer->set_external_address(m_sock, detail::read_v6_address(ptr)
, m.addr.address());
}
else if (ext_ip && ext_ip.string_length() >= int(detail::address_size(udp::v4())))
{
char const* ptr = ext_ip.string_ptr();
if (m_observer != nullptr)
m_observer->set_external_address(m_sock, detail::read_v4_address(ptr)
, m.addr.address());
}
}
switch (y)
@ -312,8 +317,9 @@ void node::incoming(aux::listen_socket_handle const& s, msg const& m)
// responds to 'query' messages that it receives.
if (m_settings.read_only) break;
// only respond to requests if they're addressed to this node
if (s != m_sock) break;
// ignore packets arriving on a different interface than the one we're
// associated with
if (s != m_sock) return;
if (!m_sock_man->has_quota())
{

3
src/session_impl.cpp
View File

@ -6908,7 +6908,8 @@ namespace aux {
, ip_source_t const source_type, address const& source)
{
auto sock = std::find_if(m_listen_sockets.begin(), m_listen_sockets.end()
, [&](std::shared_ptr<listen_socket_t> const& v) { return v->local_endpoint == local_endpoint; });
, [&](std::shared_ptr<listen_socket_t> const& v)
{ return v->local_endpoint.address() == local_endpoint.address(); });
if (sock != m_listen_sockets.end())
set_external_address(*sock, ip, source_type, source);