Merge with ns-3-dev

src/node/ipv4.h

@@ -37,7 +37,9 @@ class Ipv4RoutingProtocol;
 /**
  * \ingroup node
  * \defgroup ipv4 Ipv4
- * 
+ */
+/**
+ * \ingroup ipv4
  * \brief Access to the Ipv4 forwarding table, interfaces, and configuration
  *
  * This class defines the API to manipulate the following aspects of

src/node/packet-socket.cc

@@ -172,7 +172,7 @@ PacketSocket::ShutdownRecv (void)
       m_errno = ERROR_BADF;
       return -1;
     }
-  m_shutdownRecv = false;
+  m_shutdownRecv = true;
   return 0;
 }
 
@@ -186,6 +186,8 @@ PacketSocket::Close(void)
       return -1;
     }
   m_state = STATE_CLOSED;
+  m_shutdownSend = true;
+  m_shutdownRecv = true;
   return 0;
 }
 

src/node/socket.h

@@ -184,6 +184,7 @@ public:
 
   /** 
    * \brief Close a socket.
+   * \returns zero on success, -1 on failure.
    *
    * After the Close call, the socket is no longer valid, and cannot
    * safely be used for subsequent operations.