fix typo in lsd::start

This commit is contained in:
arvidn 2020-03-07 12:53:01 +01:00 committed by Arvid Norberg
parent 6480b9df8c
commit 9469913cb2
4 changed files with 5 additions and 2 deletions

View File

@ -1,3 +1,4 @@
* fix LSD over IPv6
* support TCP_NOTSENT_LOWAT on Linux
* fix correct interface binding of local service discovery multicast
* fix issue with knowing which interfaces to announce to trackers and DHT

View File

@ -1879,7 +1879,7 @@ namespace {
std::string lsd_error_alert::message() const
{
return "Local Service Discovery error: " + convert_from_native(error.message());
return "Local Service Discovery startup error: " + convert_from_native(error.message());
}
#if TORRENT_ABI_VERSION == 1

View File

@ -116,7 +116,7 @@ void lsd::start(error_code& ec)
m_socket.set_option(udp::socket::reuse_address(true), ec);
if (ec) return;
m_socket.bind(udp::endpoint(address_v4::any(), lsd_port), ec);
m_socket.bind(udp::endpoint(v4 ? address(address_v4::any()) : address(address_v6::any()), lsd_port), ec);
if (ec) return;
if (v4)
m_socket.set_option(join_group(lsd_multicast_addr4, m_listen_address.to_v4()), ec);

View File

@ -1884,6 +1884,8 @@ namespace aux {
if ((*remove_iter)->sock) (*remove_iter)->sock->close(ec);
if ((*remove_iter)->udp_sock) (*remove_iter)->udp_sock->sock.close();
if ((*remove_iter)->natpmp_mapper) (*remove_iter)->natpmp_mapper->close();
if ((*remove_iter)->upnp_mapper) (*remove_iter)->upnp_mapper->close();
if ((*remove_iter)->lsd) (*remove_iter)->lsd->close();
remove_iter = m_listen_sockets.erase(remove_iter);
}