ByteInFlight moved inside TcpTxBuffer

natale-p · Jan 9, 2016 · 0de8dbe · 0de8dbe
1 parent e7f2ca4
commit 0de8dbe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc
@@ -2516,7 +2516,13 @@ uint32_t
 TcpSocketBase::BytesInFlight () const
 {
   NS_LOG_FUNCTION (this);
-  return m_highTxMark.Get () - m_txBuffer->HeadSequence ();
+  uint32_t old = m_highTxMark.Get () - m_txBuffer->HeadSequence ();
+  uint32_t newValue = m_txBuffer->BytesInFlight ();
+
+  NS_ABORT_MSG_UNLESS (old == newValue,
+                       "What. Different value of inflight. Old=" << old <<
+                       " new=" << newValue);
+  return newValue;
 }
 
 uint32_t

diff --git a/src/internet/model/tcp-tx-buffer.cc b/src/internet/model/tcp-tx-buffer.cc
@@ -147,6 +147,14 @@ TcpTxBuffer::SizeFromSequence (const SequenceNumber32& seq) const
   return 0;
 }
 
+uint32_t
+TcpTxBuffer::BytesInFlight () const
+{
+  NS_LOG_FUNCTION (this);
+
+  return m_sentSize;
+}
+
 Ptr<Packet>
 TcpTxBuffer::CopyFromSequence (uint32_t numBytes, const SequenceNumber32& seq)
 {

diff --git a/src/internet/model/tcp-tx-buffer.h b/src/internet/model/tcp-tx-buffer.h
@@ -136,6 +136,13 @@ class TcpTxBuffer : public Object
    */
   uint32_t SizeFromSequence (const SequenceNumber32& seq) const;
 
+  /**
+   * \brief Get the number of bytes stored inside SentList
+   *
+   * \return the number of bytes sent but not discarded
+   */
+  uint32_t BytesInFlight () const;
+
   /**
    * \brief Copy data from the range [seq, seq+numBytes) into a packet
    *