1.1 --- a/src/devices/wifi/mesh-wifi-mac.cc	Thu Mar 12 13:24:22 2009 +0300
     1.2 +++ b/src/devices/wifi/mesh-wifi-mac.cc	Thu Mar 12 13:39:22 2009 +0300
     1.3 @@ -306,17 +306,20 @@
     1.4  void
     1.5  MeshWifiMac::DoDispose (void)
     1.6  {
     1.7 +	NS_LOG_FUNCTION (this);
     1.8  	delete m_rxMiddle;
     1.9  	delete m_dcfManager;
    1.10  	//Delete smart pointers:
    1.11 +	m_rxMiddle = 0;
    1.12 +	m_low = 0;
    1.13 +	m_dcfManager = 0;
    1.14 +	m_phy = 0;
    1.15 +	m_BE = 0;
    1.16 +	m_VO = 0;
    1.17 +	m_peerManager = 0;
    1.18  	m_beaconSendEvent.Cancel ();
    1.19  	m_beaconFormEvent.Cancel ();
    1.20 -	m_low = 0;
    1.21 -	m_BE = 0;
    1.22 -	m_VO = 0;
    1.23  	m_beaconDca = 0;
    1.24 -	m_phy = 0;
    1.25 -        m_peerManager=0;
    1.26  	WifiMac::DoDispose ();
    1.27  }
    1.28  

     2.1 --- a/src/helper/mesh-wifi-helper.cc	Thu Mar 12 13:24:22 2009 +0300
     2.2 +++ b/src/helper/mesh-wifi-helper.cc	Thu Mar 12 13:39:22 2009 +0300
     2.3 @@ -180,7 +180,7 @@
     2.4  	{
     2.5  		Ptr<Node> node = *i;
     2.6  		Ptr<L2RoutingNetDevice> virtualDevice = m_deviceFactory.Create<L2RoutingNetDevice> ();
     2.7 -		Ptr<WifiPeerManager>pPeer = m_peerManager.Create<WifiPeerManager > ();
     2.8 +		Ptr<WifiPeerManager> pPeer = m_peerManager.Create<WifiPeerManager > ();
     2.9  		devices.Add (virtualDevice);
    2.10  		std::vector<Ptr<WifiNetDevice> > nodeDevices;
    2.11  		for (uint8_t k=0; k<numOfPorts; k++)
    2.12 @@ -193,7 +193,6 @@
    2.13  			device->SetMac (mac);
    2.14  			device->SetPhy (phy);
    2.15  			device->SetRemoteStationManager (manager);
    2.16 -			//mac ->SetPeerLinkManager (pPeer);
    2.17  			//create L2RoutingNetDevice and add WifiNetDevice to it
    2.18  			node->AddDevice(device);
    2.19  			nodeDevices.push_back(device);