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

make sure we reset the duplicate ack counter every time we don't receive a duplicate ack. Also fix logging of outstanding packets

This commit is contained in:
arvidn 2019-01-05 16:31:46 +01:00 committed by Arvid Norberg
parent a81eb050c5
commit 26c29ea030
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libtorrent/packet_buffer.hpp
View File

@ -76,8 +76,9 @@ namespace libtorrent
void* insert(index_type idx, void* value);
std::size_t size() const
{ return m_size; }
std::size_t size() const { return m_size; }
bool empty() const { return m_size == 0; }
std::size_t capacity() const
{ return m_capacity; }
@ -119,6 +120,7 @@ namespace libtorrent
using packet_buffer_impl::index_type;
using packet_buffer_impl::size;
using packet_buffer_impl::empty;
using packet_buffer_impl::capacity;
using packet_buffer_impl::reserve;
using packet_buffer_impl::cursor;

7
src/utp_stream.cpp
View File

@ -1586,6 +1586,8 @@ void utp_socket_impl::parse_sack(boost::uint16_t const packet_ack, boost::uint8_
if (ack_nr == m_seq_nr) break;
}
if (m_outbuf.empty()) m_duplicate_acks = 0;
// now, scan the bits in reverse, and count the number of ACKed packets. Only
// lost packets followed by 'dup_ack_limit' packets may be resent
// start with the sequence number represented by the last bit in the SACK
@ -2975,6 +2977,8 @@ bool utp_socket_impl::incoming_packet(boost::uint8_t const* buf, int size
++m_duplicate_acks;
}
TORRENT_ASSERT_VAL(m_outbuf.size() > 0 || m_duplicate_acks == 0, m_duplicate_acks);
boost::uint32_t min_rtt = (std::numeric_limits<boost::uint32_t>::max)();
TORRENT_ASSERT(m_outbuf.at((m_acked_seq_nr + 1) & ACK_MASK) || ((m_seq_nr - m_acked_seq_nr) & ACK_MASK) <= 1);
@ -3003,6 +3007,7 @@ bool utp_socket_impl::incoming_packet(boost::uint8_t const* buf, int size
}
maybe_inc_acked_seq_nr();
if (m_outbuf.empty()) m_duplicate_acks = 0;
}
// look for extended headers
@ -3341,7 +3346,7 @@ bool utp_socket_impl::incoming_packet(boost::uint8_t const* buf, int size
, packet_timeout()
, int(total_milliseconds(m_timeout - receive_time))
, int(total_microseconds(receive_time.time_since_epoch()))
, (m_seq_nr - m_acked_seq_nr) & ACK_MASK
, m_outbuf.size()
, m_mtu
, their_delay_base
, boost::uint32_t(m_reply_micro)