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

fix correct interface binding of local service discovery multicast

Browse Source
This commit is contained in:
Arvid Norberg 2020-03-03 22:07:08 +01:00 committed by Arvid Norberg
parent ee38106465
commit 83bbefc008
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,3 +1,4 @@
* fix correct interface binding of local service discovery multicast
* fix issue with knowing which interfaces to announce to trackers and DHT * fix issue with knowing which interfaces to announce to trackers and DHT
* undeprecate settings_pack::dht_upload_rate_limit * undeprecate settings_pack::dht_upload_rate_limit

11
src/lsd.cpp
View File

@ -101,8 +101,8 @@ void lsd::debug_log(char const* fmt, ...) const
#endif #endif
namespace { namespace {
address const lsd_multicast_addr4 = make_address_v4("239.192.152.143"); address_v4 const lsd_multicast_addr4 = make_address_v4("239.192.152.143");
address const lsd_multicast_addr6 = make_address_v6("ff15::efc0:988f"); address_v6 const lsd_multicast_addr6 = make_address_v6("ff15::efc0:988f");
int const lsd_port = 6771; int const lsd_port = 6771;
} }
@ -118,7 +118,10 @@ void lsd::start(error_code& ec)
m_socket.bind(udp::endpoint(address_v4::any(), lsd_port), ec); m_socket.bind(udp::endpoint(address_v4::any(), lsd_port), ec);
if (ec) return; if (ec) return;
m_socket.set_option(join_group(v4 ? lsd_multicast_addr4 : lsd_multicast_addr6), ec); if (v4)
m_socket.set_option(join_group(lsd_multicast_addr4, m_listen_address.to_v4()), ec);
else
m_socket.set_option(join_group(lsd_multicast_addr6, m_listen_address.to_v6().scope_id()), ec);
if (ec) return; if (ec) return;
m_socket.set_option(hops(32), ec); m_socket.set_option(hops(32), ec);
if (ec) return; if (ec) return;
@ -159,7 +162,7 @@ void lsd::announce_impl(sha1_hash const& ih, int const listen_port
int const msg_len = render_lsd_packet(msg, sizeof(msg), listen_port, aux::to_hex(ih).c_str() int const msg_len = render_lsd_packet(msg, sizeof(msg), listen_port, aux::to_hex(ih).c_str()
, m_cookie, v4 ? v4_address : v6_address); , m_cookie, v4 ? v4_address : v6_address);
udp::endpoint const to(v4 ? lsd_multicast_addr4 : lsd_multicast_addr6 udp::endpoint const to(v4 ? address(lsd_multicast_addr4) : address(lsd_multicast_addr6)
, lsd_port); , lsd_port);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING