From 5a3256bd9eeb3f257ee99c447e70ebd409b13675 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 17 Nov 2010 16:23:09 -0800 Subject: [PATCH] bug 1009: decouple m_finSequence (TcpSocketImpl) from transmit sequence numbers --- src/internet-stack/tcp-socket-impl.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/internet-stack/tcp-socket-impl.cc b/src/internet-stack/tcp-socket-impl.cc index 71875a363..aff2ce449 100644 --- a/src/internet-stack/tcp-socket-impl.cc +++ b/src/internet-stack/tcp-socket-impl.cc @@ -347,7 +347,6 @@ TcpSocketImpl::Close (void) " deferring close, state " << m_state); return 0; } - m_finSequence = m_nextTxSequence + SequenceNumber32 (1); Actions_t action = ProcessEvent (APP_CLOSE); ProcessAction (action); return 0; @@ -947,7 +946,6 @@ bool TcpSocketImpl::ProcessPacketAction (Actions_t a, Ptr p, if(tcpHeader.GetFlags() & TcpHeader::FIN) { ++m_nextRxSequence; //bump this to account for the FIN - m_nextTxSequence = m_finSequence; } SendEmptyPacket (TcpHeader::ACK); break; @@ -1172,7 +1170,6 @@ bool TcpSocketImpl::SendPendingData (bool withAck) m_nextTxSequence + SequenceNumber32 (sz)); if (m_closeOnEmpty && (remainingData == 0)) { - m_finSequence = m_nextTxSequence + SequenceNumber32 (1 + sz); flags = TcpHeader::FIN; m_state = FIN_WAIT_1; }