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

don't buffer incoming uTP packets indefinitely

This commit is contained in:
Arvid Norberg 2013-09-25 01:37:12 +00:00
parent 7bbb0e4e6c
commit 52613b312c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/utp_stream.cpp
View File

@ -2227,9 +2227,6 @@ void utp_socket_impl::incoming(boost::uint8_t const* buf, int size, packet* p, p
memcpy(p->buf, buf, size); memcpy(p->buf, buf, size);
} }
// save this packet until the client issues another read // save this packet until the client issues another read
// TODO: 4 There's currently no limit on how many packets we save. In the case of the
// client setting a download rate limit, we may store incoming packets indefinitely!
// Right now, we rely on the other end honoring the advertised receive window.
m_receive_buffer.push_back(p); m_receive_buffer.push_back(p);
m_receive_buffer_size += p->size - p->header_size; m_receive_buffer_size += p->size - p->header_size;
@ -2274,6 +2271,12 @@ bool utp_socket_impl::consume_incoming_data(
{ {
TORRENT_ASSERT(m_inbuf.at(m_ack_nr) == 0); TORRENT_ASSERT(m_inbuf.at(m_ack_nr) == 0);
if (m_buffered_incoming_bytes + m_receive_buffer_size + payload_size > m_in_buf_size)
{
UTP_LOGV("%8p: other end is not honoring our advertised window, dropping packet\n", this);
return true;
}
// we received a packet in order // we received a packet in order
incoming(ptr, payload_size, 0, now); incoming(ptr, payload_size, 0, now);
m_ack_nr = (m_ack_nr + 1) & ACK_MASK; m_ack_nr = (m_ack_nr + 1) & ACK_MASK;
@ -2291,8 +2294,7 @@ bool utp_socket_impl::consume_incoming_data(
packet* p = (packet*)m_inbuf.remove(next_ack_nr); packet* p = (packet*)m_inbuf.remove(next_ack_nr);
if (!p) if (!p) break;
break;
m_buffered_incoming_bytes -= p->size - p->header_size; m_buffered_incoming_bytes -= p->size - p->header_size;
incoming(0, p->size - p->header_size, p, now); incoming(0, p->size - p->header_size, p, now);
@ -2325,6 +2327,13 @@ bool utp_socket_impl::consume_incoming_data(
return true; return true;
} }
if (m_buffered_incoming_bytes + m_receive_buffer_size + payload_size > m_in_buf_size)
{
UTP_LOGV("%8p: other end is not honoring our advertised window, dropping packet %d\n"
, this, int(ph->seq_nr));
return true;
}
// we don't need to save the packet header, just the payload // we don't need to save the packet header, just the payload
packet* p = (packet*)malloc(sizeof(packet) + payload_size); packet* p = (packet*)malloc(sizeof(packet) + payload_size);
p->size = payload_size; p->size = payload_size;