merge with tip

2009-04-17 12:33:17 -07:00
parent 3dab88580e e22cd479c4
commit bd5cf9cb07
89 changed files with 2926 additions and 1350 deletions
--- a/src/internet-stack/ipv4-l3-protocol.cc
+++ b/src/internet-stack/ipv4-l3-protocol.cc
@@ -150,7 +150,13 @@ void
 Ipv4L3Protocol::DoDispose (void)
 {
  NS_LOG_FUNCTION (this);
-  for (L4List_t::iterator i = m_protocols.begin(); i != m_protocols.end(); ++i)
+ 
+  for (SocketList::iterator i = m_sockets.begin (); i != m_sockets.end (); ++i)
+    {
+      *i = 0;
+    }
+
+ for (L4List_t::iterator i = m_protocols.begin(); i != m_protocols.end(); ++i)
    {
      *i = 0;
    }