Merge with ns-3-dev

2009-08-18 12:01:35 +04:00
parent 17bfa2237c 6c58559614
commit 679c50dc8f
87 changed files with 4067 additions and 936 deletions
--- a/src/internet-stack/udp-socket-impl.cc
+++ b/src/internet-stack/udp-socket-impl.cc
@@ -203,9 +203,16 @@ UdpSocketImpl::ShutdownRecv (void)
 }

 int
-UdpSocketImpl::Close(void)
+UdpSocketImpl::Close (void)
 {
  NS_LOG_FUNCTION_NOARGS ();
+  if (m_shutdownRecv == true && m_shutdownSend == true)
+    {
+      m_errno = Socket::ERROR_BADF;
+      return -1;
+    }
+  m_shutdownRecv = true;
+  m_shutdownSend = true;
  return 0;
 }