# HG changeset patch # User Mathieu Lacage # Date 1206999818 25200 # Node ID 8bb0479b09494d3daf30cb6ee4de214af1322780 # Parent f0b90b0fb7f817341be6a255b1370c813a535030 get rid of channel during dispose diff -r f0b90b0fb7f8 -r 8bb0479b0949 src/node/simple-net-device.cc --- a/src/node/simple-net-device.cc Mon Mar 31 14:36:21 2008 -0700 +++ b/src/node/simple-net-device.cc Mon Mar 31 14:43:38 2008 -0700 @@ -153,6 +153,14 @@ m_rxCallback = cb; } +void +SimpleNetDevice::DoDispose (void) +{ + m_channel = 0; + m_node = 0; + NetDevice::DoDispose (); +} + } // namespace ns3 diff -r f0b90b0fb7f8 -r 8bb0479b0949 src/node/simple-net-device.h --- a/src/node/simple-net-device.h Mon Mar 31 14:36:21 2008 -0700 +++ b/src/node/simple-net-device.h Mon Mar 31 14:43:38 2008 -0700 @@ -44,6 +44,8 @@ virtual bool NeedsArp (void) const; virtual void SetReceiveCallback (NetDevice::ReceiveCallback cb); +protected: + virtual void DoDispose (void); private: Ptr m_channel; NetDevice::ReceiveCallback m_rxCallback;