F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcp: (fixes 2781) do not go beyond limit in TcpTxBuffer

Browse Source
This commit is contained in:
Robert Ammon
2017-09-10 12:45:38 +02:00
parent 66208e454a
commit 62ab39c9f1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/internet/model/tcp-rx-buffer.cc
View File

@@ -206,7 +206,7 @@ TcpRxBuffer::Add (Ptr<Packet> p, TcpHeader const& tcph)
NS_LOG_LOGIC ("Buffered packet of seqno=" << headSeq << " len=" << p->GetSize ());
// Update variables
m_size += p->GetSize (); // Occupancy
for (BufIterator i = m_data.begin (); i != m_data.end (); ++i)
for (i = m_data.begin (); i != m_data.end (); ++i)
{
if (i->first < m_nextRxSeq)
{
@@ -285,7 +285,7 @@ TcpRxBuffer::UpdateSackList (const SequenceNumber32 &head, const SequenceNumber3
// Iterates until we examined all blocks in the list (maximum 4)
while (it != m_sackList.end ())
{
TcpOptionSack::SackBlock current = *it;
current = *it;
// This is a left merge:
// [current_first; current_second] [beg_first; beg_second]
@@ -339,7 +339,7 @@ TcpRxBuffer::ClearSackList (const SequenceNumber32 &seq)
NS_LOG_FUNCTION (this << seq);
TcpOptionSack::SackList::iterator it;
for (it = m_sackList.begin (); it != m_sackList.end (); ++it)
for (it = m_sackList.begin (); it != m_sackList.end (); )
{
TcpOptionSack::SackBlock block = *it;
NS_ASSERT (block.first < block.second);
@@ -348,6 +348,10 @@ TcpRxBuffer::ClearSackList (const SequenceNumber32 &seq)
{
it = m_sackList.erase (it);
}
else
{
it++;
}
}
}