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

if a udp socket is already bound to the IP and port we want to bind it to, don't reopen it

This commit is contained in:
arvidn 2016-03-05 15:42:29 -05:00
parent d705dc2953
commit e9a5985609
1 changed files with 73 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/session_impl.cpp
View File

@ -2069,83 +2069,96 @@ retry:
#ifdef TORRENT_USE_OPENSSL #ifdef TORRENT_USE_OPENSSL
int const ssl_port = m_settings.get_int(settings_pack::ssl_listen); int const ssl_port = m_settings.get_int(settings_pack::ssl_listen);
udp::endpoint ssl_bind_if(m_listen_interface.address(), ssl_port); udp::endpoint ssl_bind_if(m_listen_interface.address(), ssl_port);
tcp::endpoint ssl_bind_ep(m_listen_interface.address(), ssl_port);
// if ssl port is 0, we don't want to listen on an SSL port // if ssl port is 0, we don't want to listen on an SSL port
if (ssl_port != 0) if (ssl_port != 0)
{ {
// TODO: 2 use bind_to_device in udp_socket // if the socket is already open with the port we want, just leave it
m_ssl_udp_socket.bind(ssl_bind_if, ec); error_code err;
if (ec) if (!m_ssl_udp_socket.is_open()
|| m_ssl_udp_socket.local_endpoint(err) != ssl_bind_ep
|| err)
{ {
#ifndef TORRENT_DISABLE_LOGGING m_ssl_udp_socket.bind(ssl_bind_if, ec);
session_log("SSL: cannot bind to UDP interface \"%s\": %s" if (ec)
, print_endpoint(m_listen_interface).c_str(), ec.message().c_str());
#endif
if (m_alerts.should_post<listen_failed_alert>())
{ {
error_code err; #ifndef TORRENT_DISABLE_LOGGING
m_alerts.emplace_alert<listen_failed_alert>(ssl_bind_if.address().to_string() session_log("SSL: cannot bind to UDP interface \"%s\": %s"
, ssl_port, listen_failed_alert::bind, ec, listen_failed_alert::utp_ssl); , print_endpoint(m_listen_interface).c_str(), ec.message().c_str());
#endif
if (m_alerts.should_post<listen_failed_alert>())
{
m_alerts.emplace_alert<listen_failed_alert>(ssl_bind_if.address().to_string()
, ssl_port, listen_failed_alert::bind, ec, listen_failed_alert::utp_ssl);
}
ec.clear();
}
else
{
maybe_update_udp_mapping(0, true, ssl_port, ssl_port);
maybe_update_udp_mapping(1, true, ssl_port, ssl_port);
} }
ec.clear();
} }
else else
{ {
maybe_update_udp_mapping(0, true, ssl_port, ssl_port); m_ssl_udp_socket.close();
maybe_update_udp_mapping(1, true, ssl_port, ssl_port);
}
}
else
{
m_ssl_udp_socket.close();
// if there are mappings for the SSL socket, delete them now // if there are mappings for the SSL socket, delete them now
if (m_ssl_udp_mapping[0] != -1 && m_natpmp) if (m_ssl_udp_mapping[0] != -1 && m_natpmp)
{ {
m_natpmp->delete_mapping(m_ssl_udp_mapping[0]); m_natpmp->delete_mapping(m_ssl_udp_mapping[0]);
m_ssl_udp_mapping[0] = -1; m_ssl_udp_mapping[0] = -1;
} }
if (m_ssl_udp_mapping[1] != -1 && m_upnp) if (m_ssl_udp_mapping[1] != -1 && m_upnp)
{ {
m_upnp->delete_mapping(m_ssl_udp_mapping[1]); m_upnp->delete_mapping(m_ssl_udp_mapping[1]);
m_ssl_udp_mapping[1] = -1; m_ssl_udp_mapping[1] = -1;
}
} }
} }
#endif // TORRENT_USE_OPENSSL #endif // TORRENT_USE_OPENSSL
// TODO: 2 use bind_to_device in udp_socket udp::endpoint const udp_bind_ep(m_listen_interface.address()
m_udp_socket.bind(udp::endpoint(m_listen_interface.address() , m_listen_interface.port());
, m_listen_interface.port()), ec);
if (ec) // if the socket is already open with the port we want, just leave it
error_code err;
if (!m_udp_socket.is_open()
|| m_udp_socket.local_endpoint(err) != m_listen_interface
|| err)
{ {
m_udp_socket.bind(udp_bind_ep, ec);
if (ec)
{
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
session_log("cannot bind to UDP interface \"%s\": %s" session_log("cannot bind to UDP interface \"%s\": %s"
, print_endpoint(m_listen_interface).c_str(), ec.message().c_str()); , print_endpoint(m_listen_interface).c_str(), ec.message().c_str());
#endif #endif
if (m_alerts.should_post<listen_failed_alert>()) if (m_alerts.should_post<listen_failed_alert>())
{ {
error_code err; m_alerts.emplace_alert<listen_failed_alert>(m_listen_interface.address().to_string()
m_alerts.emplace_alert<listen_failed_alert>(m_listen_interface.address().to_string() , m_listen_interface.port()
, m_listen_interface.port() , listen_failed_alert::bind
, listen_failed_alert::bind , ec, listen_failed_alert::udp);
, ec, listen_failed_alert::udp); }
if (listen_port_retries > 0)
{
m_listen_interface.port(m_listen_interface.port() + 1);
// update the actual port m_listen_interface was derived from also
if (!m_listen_interfaces.empty())
m_listen_interfaces[0].second += 1;
--listen_port_retries;
goto retry;
}
return;
} }
if (listen_port_retries > 0) else
{ {
m_listen_interface.port(m_listen_interface.port() + 1); m_external_udp_port = m_udp_socket.local_port();
// update the actual port m_listen_interface was derived from also maybe_update_udp_mapping(0, false, m_listen_interface.port(), m_listen_interface.port());
if (!m_listen_interfaces.empty()) maybe_update_udp_mapping(1, false, m_listen_interface.port(), m_listen_interface.port());
m_listen_interfaces[0].second += 1;
--listen_port_retries;
goto retry;
} }
return;
}
else
{
m_external_udp_port = m_udp_socket.local_port();
maybe_update_udp_mapping(0, false, m_listen_interface.port(), m_listen_interface.port());
maybe_update_udp_mapping(1, false, m_listen_interface.port(), m_listen_interface.port());
} }
// we made it! now post all the listen_succeeded_alerts // we made it! now post all the listen_succeeded_alerts
@ -2159,9 +2172,9 @@ retry:
if (!m_alerts.should_post<listen_succeeded_alert>()) continue; if (!m_alerts.should_post<listen_succeeded_alert>()) continue;
error_code err; error_code error;
tcp::endpoint bind_ep = i->sock->local_endpoint(err); tcp::endpoint bind_ep = i->sock->local_endpoint(error);
if (err) continue; if (error) continue;
m_alerts.emplace_alert<listen_succeeded_alert>(bind_ep, socket_type); m_alerts.emplace_alert<listen_succeeded_alert>(bind_ep, socket_type);
} }
@ -2171,8 +2184,7 @@ retry:
{ {
if (m_alerts.should_post<listen_succeeded_alert>()) if (m_alerts.should_post<listen_succeeded_alert>())
m_alerts.emplace_alert<listen_succeeded_alert>( m_alerts.emplace_alert<listen_succeeded_alert>(
tcp::endpoint(ssl_bind_if.address(), ssl_bind_if.port()) ssl_bind_ep, listen_succeeded_alert::utp_ssl);
, listen_succeeded_alert::utp_ssl);
} }
#endif #endif