wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

close listen sockets after closing all connections (#1994) 

This fixes an assertion failure on shutdown if an IPv6 UTP socket tries
to send a FIN to a closed UDP socket. Because the closed socket reports
its local_endpoint() as udp::endpoint() it trips the protocol check in
send_udp_packet.
This commit is contained in:
Steven Siloti 2017-05-14 17:16:47 -07:00 committed by Arvid Norberg
parent e870852c66
commit 4bc9515766
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/session_impl.cpp
View File

@ -969,25 +969,6 @@ namespace aux {
}
m_incoming_sockets.clear();
// close the listen sockets
for (auto const& l : m_listen_sockets)
{
if (l.sock)
{
l.sock->close(ec);
TORRENT_ASSERT(!ec);
}
// TODO: 3 closing the udp sockets here means that
// the uTP connections cannot be closed gracefully
if (l.udp_sock)
{
l.udp_sock->sock.close();
}
}
m_outgoing_sockets.close();
#if TORRENT_USE_I2P
if (m_i2p_listen_socket && m_i2p_listen_socket->is_open())
{
@ -1023,6 +1004,25 @@ namespace aux {
for (auto const& p : conns)
p->disconnect(errors::stopping_torrent, op_bittorrent);
// close the listen sockets
for (auto const& l : m_listen_sockets)
{
if (l.sock)
{
l.sock->close(ec);
TORRENT_ASSERT(!ec);
}
// TODO: 3 closing the udp sockets here means that
// the uTP connections cannot be closed gracefully
if (l.udp_sock)
{
l.udp_sock->sock.close();
}
}
m_outgoing_sockets.close();
// we need to give all the sockets an opportunity to actually have their handlers
// called and cancelled before we continue the shutdown. This is a bit
// complicated, if there are no "undead" peers, it's safe to resume the