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

fix of internal session_impl logic regarding TOS (#1518) 

fix of internal session_impl logic regarding TOS
This commit is contained in:
Alden Torres 2017-01-13 00:55:54 -05:00 committed by Arvid Norberg
parent 3a19f33097
commit 4f7b69be90
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/session_impl.cpp
View File

@ -1879,7 +1879,7 @@ namespace aux {
, tcp::endpoint(ep.addr, std::uint16_t(ep.port)) , tcp::endpoint(ep.addr, std::uint16_t(ep.port))
, flags | (ep.ssl ? open_ssl_socket : 0), ec); , flags | (ep.ssl ? open_ssl_socket : 0), ec);
if (!ec && s.sock) if (!ec && (s.sock || s.udp_sock))
{ {
// TODO notify interested parties of this socket's creation // TODO notify interested parties of this socket's creation
m_listen_sockets.push_back(s); m_listen_sockets.push_back(s);
@ -5950,29 +5950,35 @@ namespace aux {
int const tos = m_settings.get_int(settings_pack::peer_tos); int const tos = m_settings.get_int(settings_pack::peer_tos);
for (auto const& l : m_listen_sockets) for (auto const& l : m_listen_sockets)
{ {
error_code ec; if (l.sock)
set_tos(*l.sock, tos, ec); {
error_code ec;
set_tos(*l.sock, tos, ec);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log())
{ {
session_log(">>> SET_TOS [ tcp (%s %d) tos: %x e: %s ]" session_log(">>> SET_TOS [ tcp (%s %d) tos: %x e: %s ]"
, l.sock->local_endpoint().address().to_string().c_str() , l.sock->local_endpoint().address().to_string().c_str()
, l.sock->local_endpoint().port(), tos, ec.message().c_str()); , l.sock->local_endpoint().port(), tos, ec.message().c_str());
} }
#endif #endif
ec.clear(); }
set_tos(*l.udp_sock, tos, ec); if (l.udp_sock)
{
error_code ec;
set_tos(*l.udp_sock, tos, ec);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log())
{ {
session_log(">>> SET_TOS [ udp (%s %d) tos: %x e: %s ]" session_log(">>> SET_TOS [ udp (%s %d) tos: %x e: %s ]"
, l.udp_sock->local_endpoint().address().to_string().c_str() , l.udp_sock->local_endpoint().address().to_string().c_str()
, l.udp_sock->local_port() , l.udp_sock->local_port()
, tos, ec.message().c_str()); , tos, ec.message().c_str());
} }
#endif #endif
}
} }
} }