From a9b910fd142f90bbb98de7ed51ae90a3884a46ed Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 17 Nov 2010 16:17:35 -0800 Subject: [PATCH] bug 1022: inappropriate ASSERT in tcp-socket-impl.cc --- RELEASE_NOTES | 1 + src/internet-stack/tcp-socket-impl.cc | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 6cc3c72b3..99cf621ba 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -60,6 +60,7 @@ since ns-3.9, in many cases referencing the Bugzilla bug number - bug 988 - MacRxMiddle::SequenceControlSmaller method - bug 993 - MinstrelWifiManager::UpdateStats useless if clause - bug 1015 - GetChannelFrequencyMhz() does not match with standard + - bug 1022 - inappropriate ASSERT in tcp-socket-impl.cc - bug 1027 - RocketfuelTopologyReader is not working at all Known issues diff --git a/src/internet-stack/tcp-socket-impl.cc b/src/internet-stack/tcp-socket-impl.cc index f6fade464..71875a363 100644 --- a/src/internet-stack/tcp-socket-impl.cc +++ b/src/internet-stack/tcp-socket-impl.cc @@ -1314,9 +1314,6 @@ void TcpSocketImpl::NewRx (Ptr p, m_nextRxSequence += s; // Advance next expected sequence NS_LOG_LOGIC("Case 1, advanced nrxs to " << m_nextRxSequence ); //buffer this, it'll be read by call to Recv - UnAckData_t::iterator i = - m_bufferedData.find (tcpHeader.GetSequenceNumber () ); - NS_ASSERT(i == m_bufferedData.end ()); //no way it should have been found // Save for later delivery if there is room m_bufferedData[tcpHeader.GetSequenceNumber () ] = p; m_rxAvailable += p->GetSize ();