Changes for bug 205, unlisted FIN bug

This commit is contained in:
Craig Dowell committed 2008-06-16 16:25:52 -07:00
1 parent 154d15171b
commit d10c01649b
8 files changed
+13 -92

No files matched your search

+1 -3
View File
@@ -620,7 +620,6 @@ Actions_t TcpSocketImpl::ProcessEvent (Events_t e)
NS_LOG_LOGIC ("TcpSocketImpl " << this << " transition to CLOSED from "
<< m_state << " event " << e << " closeNot " << m_closeNotified
<< " action " << stateAction.action);
NotifyCloseCompleted ();
m_closeNotified = true;
NS_LOG_LOGIC ("TcpSocketImpl " << this << " calling Closed from PE"
<< " origState " << saveState
@@ -854,7 +853,6 @@ bool TcpSocketImpl::ProcessPacketAction (Actions_t a, Ptr<Packet> p,
{
NS_LOG_LOGIC ("TCP " << this
<< " calling AppCloseRequest");
NotifyCloseRequested();
m_closeRequestNotified = true;
}
NS_LOG_LOGIC ("TcpSocketImpl " << this
@@ -1298,7 +1296,7 @@ void TcpSocketImpl::Retransmit ()
}
if (!m_pendingData)
{
if (m_state == FIN_WAIT_1 || m_state == FIN_WAIT_2)
if (m_state == FIN_WAIT_1)
{ // Must have lost FIN, re-send
SendEmptyPacket (TcpHeader::FIN);
}