Advance m_nextTxSequence upon retransmit after RTO (fixes bug 1112)

2011-12-03 15:35:47 -05:00
parent 89019eabf5
commit 300b3cd758
3 changed files with 4 additions and 1 deletions
--- a/src/aodv/test/tcp-chain-test-0-0.pcap
+++ b/src/aodv/test/tcp-chain-test-0-0.pcap
--- a/src/aodv/test/tcp-chain-test-9-0.pcap
+++ b/src/aodv/test/tcp-chain-test-9-0.pcap
--- a/src/internet/model/tcp-socket-base.cc
+++ b/src/internet/model/tcp-socket-base.cc
@@ -1719,7 +1719,10 @@ TcpSocketBase::DoRetransmit ()
    }
  // Retransmit a data packet: Call SendDataPacket
  NS_LOG_LOGIC ("TcpSocketBase " << this << " retxing seq " << m_txBuffer.HeadSequence ());
-  SendDataPacket (m_txBuffer.HeadSequence (), m_segmentSize, true);
+  uint32_t sz = SendDataPacket (m_txBuffer.HeadSequence (), m_segmentSize, true);
+  // In case of RTO, advance m_nextTxSequence
+  m_nextTxSequence = std::max (m_nextTxSequence.Get (), m_txBuffer.HeadSequence () + sz);
+
 }

 void