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

hack to allow timeout utp sockets that are about to be closed (#976)

This commit is contained in:
Arvid Norberg 2016-08-02 00:07:36 -04:00 committed by GitHub
parent c948dc41af
commit 61031f1186
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jamfile
View File

@ -538,8 +538,8 @@ lib libiconv : : <name>iconv <link>shared <search>/usr/local/lib ;
# openssl on linux/bsd/macos etc.
lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
lib z : : <link>shared <name>z <search>/usr/lib ;
lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z ;
lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib ;
lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z : : <include>/opt/local/include ;
lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib : : <include>/opt/local/include ;
lib dl : : <link>shared <name>dl ;
# time functions used on linux require librt

13
src/utp_stream.cpp
View File

@ -3572,9 +3572,16 @@ void utp_socket_impl::tick(time_point now)
// TIMEOUT!
// set cwnd to 1 MSS
m_sm->inc_stats_counter(counters::utp_timeout);
if (m_outbuf.size()) ++m_num_timeouts;
// the close_reason here is a bit of a hack. When it's set, it indicates
// that the upper layer intends to close the socket. However, it has been
// observed that the SSL shutdown sometimes can hang in a state where
// there's no outstanding data, and it won't receive any more from the
// other end. This catches that case and let the socket time out.
if (m_outbuf.size() || m_close_reason != 0)
{
++m_num_timeouts;
m_sm->inc_stats_counter(counters::utp_timeout);
}
UTP_LOGV("%8p: timeout num-timeouts: %d max-resends: %d confirmed: %d "
" acked-seq-num: %d mtu-seq: %d\n"