From 4ea974bb7fd5fa45b28ea3662f900c02467daf7a Mon Sep 17 00:00:00 2001 From: Steve Zabele Date: Sat, 31 Jan 2015 13:20:37 +0100 Subject: [PATCH] Bug 2053 - In tcp-socket-base.cc, NotifyDataSent incorrectly called with retransmits --- RELEASE_NOTES | 2 ++ src/internet/model/tcp-socket-base.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 2fb7751a2..904a6175f 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -71,9 +71,11 @@ Bugs fixed - Bug 2038 - Stop method does not stop next wave in WaveformGenerator - Bug 2042 - src/lte/model/a3-rsrp-handover-algorithm.cc:137:79: error: overflow in implicit constant conversion - Bug 2043 - print-introspected-doxygen crashes when some modules are disabled default tip +- Bug 2044 - Buffer::Iterator::ReadNtohU16() and ReadNtohU32() not implemented correctly - Bug 2045 - Missing NS_OBJECT_ENSURE_REGISTERED in TcpTxBuffer and TcpRxBuffer - Bug 2047 - Ipv6EndPointDemux::Lookup may crash - Bug 2049 - CQI feedback should always use the same calculation method +- Bug 2053 - In tcp-socket-base.cc, NotifyDataSent incorrectly called with retransmits Known issues ------------ diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index 3e1cbc160..afc58053c 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -2025,7 +2025,7 @@ TcpSocketBase::SendDataPacket (SequenceNumber32 seq, uint32_t maxSize, bool with } // Notify the application of the data being sent unless this is a retransmit - if (seq == m_nextTxSequence) + if (seq == m_highTxMark) { Simulator::ScheduleNow (&TcpSocketBase::NotifyDataSent, this, sz); }