merge
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Wed, 26 Nov 2008 14:56:21 +0000
changeset 3934 745312072e11
parent 3933 3c149230e98a (current diff)
parent 3932 76fabfcfd757 (diff)
child 3948 a8e97cf0aae3
merge
--- a/src/applications/v4ping/v4ping.cc	Wed Nov 26 14:55:35 2008 +0000
+++ b/src/applications/v4ping/v4ping.cc	Wed Nov 26 14:56:21 2008 +0000
@@ -149,6 +149,7 @@
 V4Ping::StopApplication (void)
 {
   NS_LOG_FUNCTION (this);
+  m_socket->Close ();
 }
 
 
--- a/src/node/application.cc	Wed Nov 26 14:55:35 2008 +0000
+++ b/src/node/application.cc	Wed Nov 26 14:56:21 2008 +0000
@@ -58,6 +58,7 @@
   m_node = 0;
   Simulator::Cancel(m_startEvent);
   Simulator::Cancel(m_stopEvent);
+  Object::DoDispose ();
 }  
    
 void Application::Start(const Time& startTime)