diff -r 784c45b27326 src/internet-stack/tcp-socket-impl.cc
--- a/src/internet-stack/tcp-socket-impl.cc	Thu Nov 06 11:52:59 2008 -0800
+++ b/src/internet-stack/tcp-socket-impl.cc	Thu Nov 06 16:56:45 2008 -0500
@@ -467,6 +467,11 @@
   NS_LOG_FUNCTION_NOARGS ();
   if(m_bufferedData.empty())
     {
+      if(m_state == CLOSE_WAIT) //means EOF
+        {
+          return Create<Packet>();
+        }
+      //else
       return 0;
     }
   UnAckData_t out; //serves as buffer to return up to the user