From ba16796cd81e11362e8645639b8ed2ac2a321df0 Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Fri, 9 Nov 2012 12:23:27 +0100
Subject: [PATCH] fixed valgrind error in EpcEnbApplication

---
 src/lte/helper/epc-helper.cc         |  1 +
 src/lte/model/epc-enb-application.cc | 10 ++++++++++
 src/lte/model/epc-enb-application.h  |  8 +++++++-
 src/lte/test/examples-to-run.py      |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/lte/helper/epc-helper.cc b/src/lte/helper/epc-helper.cc
index a3a4487c9..6605b02f2 100644
--- a/src/lte/helper/epc-helper.cc
+++ b/src/lte/helper/epc-helper.cc
@@ -129,6 +129,7 @@ EpcHelper::GetTypeId (void)
 void
 EpcHelper::DoDispose ()
 {
+  NS_LOG_FUNCTION (this);
   m_tunDevice->SetSendCallback (MakeNullCallback<bool, Ptr<Packet>, const Address&, const Address&, uint16_t> ());
   m_tunDevice = 0;
   m_sgwPgwApp = 0;  
diff --git a/src/lte/model/epc-enb-application.cc b/src/lte/model/epc-enb-application.cc
index 3fad85d11..3bab77a43 100644
--- a/src/lte/model/epc-enb-application.cc
+++ b/src/lte/model/epc-enb-application.cc
@@ -44,6 +44,16 @@ EpcEnbApplication::GetTypeId (void)
   return tid;
 }
 
+void
+EpcEnbApplication::DoDispose (void)
+{
+  NS_LOG_FUNCTION (this);
+  m_lteSocket = 0;
+  m_s1uSocket = 0;
+  delete m_s1SapProvider;
+}
+
+
 EpcEnbApplication::EpcEnbApplication (Ptr<Socket> lteSocket, Ptr<Socket> s1uSocket, Ipv4Address sgwAddress)
   : m_lteSocket (lteSocket),
     m_s1uSocket (s1uSocket),    
diff --git a/src/lte/model/epc-enb-application.h b/src/lte/model/epc-enb-application.h
index e81ccc2a0..8b7ff777b 100644
--- a/src/lte/model/epc-enb-application.h
+++ b/src/lte/model/epc-enb-application.h
@@ -50,10 +50,16 @@ class EpcEnbApplication : public Application
 
   friend class MemberEpcEnbS1SapProvider<EpcEnbApplication>;
 
-public:
+
 
   // inherited from Object
+public:
   static TypeId GetTypeId (void);
+protected:
+  void DoDispose (void);
+
+public:
+  
   
 
   /** 
diff --git a/src/lte/test/examples-to-run.py b/src/lte/test/examples-to-run.py
index a3d488586..f1bb4d43c 100644
--- a/src/lte/test/examples-to-run.py
+++ b/src/lte/test/examples-to-run.py
@@ -10,6 +10,9 @@
 # See test.py for more information.
 cpp_examples = [
     ("lena-cqi-threshold", "True", "True"),
+    ("lena-dual-stripe", "True", "True"),
+    ("lena-dual-stripe --simTime=0.0 --nApartmentsX=1 --homeEnbDeploymentRatio=0.5 --nMacroEnbSites=0 --macroUeDensity=0 --nBlocks=1", "True", "True"),
+    ("lena-dual-stripe --epc=1 --simTime=0.0 --nApartmentsX=1 --homeEnbDeploymentRatio=0.5 --nMacroEnbSites=0 --macroUeDensity=0 --nBlocks=1", "True", "True"),
     ("lena-dual-stripe --simTime=0.01", "True", "True"),
     ("lena-dual-stripe --epc=1 --simTime=0.01", "True", "True"),
     ("lena-dual-stripe --epc=1 --useUdp=0 --simTime=0.01", "True", "True"),