F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 876 - Tcp socket does not handle ShutdownRecv correctly

Browse Source
This commit is contained in:
Josh Pelkey
2010-04-14 16:31:55 -04:00
parent 87d04e1020
commit 5de47cd21f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/internet-stack/tcp-socket-impl.cc
View File

@@ -674,10 +674,6 @@ TcpSocketImpl::ForwardUp (Ptr<Packet> packet, Ipv4Address saddr, Ipv4Address dad
Address fromAddress = InetSocketAddress (saddr, port);
Address toAddress = InetSocketAddress (daddr, m_endPoint->GetLocalPort());
if (m_shutdownRecv)
{
return;
}
TcpHeader tcpHeader;
packet->RemoveHeader (tcpHeader);
@@ -735,7 +731,10 @@ Actions_t TcpSocketImpl::ProcessEvent (Events_t e)
if (saveState < CLOSING && (m_state == CLOSING || m_state == TIMED_WAIT) )
{
NS_LOG_LOGIC ("TcpSocketImpl peer closing, send EOF to application");
NotifyDataRecv ();
if (!m_shutdownRecv)
{
NotifyDataRecv ();
}
}
if (needCloseNotify && !m_closeNotified)
@@ -1296,7 +1295,10 @@ void TcpSocketImpl::NewRx (Ptr<Packet> p,
m_rxAvailable += p->GetSize ();
RxBufFinishInsert (tcpHeader.GetSequenceNumber ());
m_rxBufSize += p->GetSize ();
NotifyDataRecv ();
if (!m_shutdownRecv)
{
NotifyDataRecv ();
}
if (m_closeNotified)
{
NS_LOG_LOGIC ("Tcp " << this << " HuH? Got data after closeNotif");
@@ -1392,7 +1394,10 @@ void TcpSocketImpl::NewRx (Ptr<Packet> p,
m_rxAvailable += p->GetSize ();
m_rxBufSize += p->GetSize();
RxBufFinishInsert(start);
NotifyDataRecv ();
if (!m_shutdownRecv)
{
NotifyDataRecv ();
}
}
else
{ // debug