F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge file restructure, random variables, static mobility model to ns3dev.

Browse Source
This commit is contained in:
Kirill Andreev
2009-03-12 13:39:22 +03:00
parent 53f0b1a007 db729599d5
commit 68c54afa42
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/devices/wifi/mesh-wifi-mac.cc
View File

@@ -306,17 +306,20 @@ MeshWifiMac::SetBeaconInterval (Time interval)
void
MeshWifiMac::DoDispose (void)
{
NS_LOG_FUNCTION (this);
delete m_rxMiddle;
delete m_dcfManager;
//Delete smart pointers:
m_beaconSendEvent.Cancel ();
m_beaconFormEvent.Cancel ();
m_rxMiddle = 0;
m_low = 0;
m_dcfManager = 0;
m_phy = 0;
m_BE = 0;
m_VO = 0;
m_peerManager = 0;
m_beaconSendEvent.Cancel ();
m_beaconFormEvent.Cancel ();
m_beaconDca = 0;
m_phy = 0;
m_peerManager=0;
WifiMac::DoDispose ();
}

3
src/helper/mesh-wifi-helper.cc
View File

@@ -180,7 +180,7 @@ MeshWifiHelper::Install (const WifiPhyHelper &phyHelper, NodeContainer c, uint8_
{
Ptr<Node> node = *i;
Ptr<L2RoutingNetDevice> virtualDevice = m_deviceFactory.Create<L2RoutingNetDevice> ();
Ptr<WifiPeerManager>pPeer = m_peerManager.Create<WifiPeerManager > ();
Ptr<WifiPeerManager> pPeer = m_peerManager.Create<WifiPeerManager > ();
devices.Add (virtualDevice);
std::vector<Ptr<WifiNetDevice> > nodeDevices;
for (uint8_t k=0; k<numOfPorts; k++)
@@ -193,7 +193,6 @@ MeshWifiHelper::Install (const WifiPhyHelper &phyHelper, NodeContainer c, uint8_
device->SetMac (mac);
device->SetPhy (phy);
device->SetRemoteStationManager (manager);
//mac ->SetPeerLinkManager (pPeer);
//create L2RoutingNetDevice and add WifiNetDevice to it
node->AddDevice(device);
nodeDevices.push_back(device);