Attachment #629 for bug #711

View | Details | Raw Unified | Return to bug 711
Collapse All | Expand All

(-)a/src/devices/mesh/dot11s/hwmp-protocol.cc (+2 lines)

Lines 209-216	Link Here

209

  m_preqTimeouts.clear ();

209

  m_preqTimeouts.clear ();

210

  m_lastDataSeqno.clear ();

210

  m_lastDataSeqno.clear ();

211

  m_lastHwmpSeqno.clear ();

211

  m_lastHwmpSeqno.clear ();

212

  m_interfaces.clear ();

212

  m_rqueue.clear ();

213

  m_rqueue.clear ();

213

  m_rtable = 0;

214

  m_rtable = 0;

215

  m_mp = 0;

214

216

215

217

216

bool

218

bool

(-)a/src/devices/mesh/dot11s/peer-management-protocol.cc (+2 lines)

Lines 93-98	Link Here

      i->second.clear ();

      i->second.clear ();

  m_neighbourBeacons.clear ();

  m_neighbourBeacons.clear ();

  m_plugins.clear ();

bool

100

bool

(-)a/src/devices/mesh/mesh-point-device.cc (+3 lines)

Lines 73-78	Link Here

      *iter = 0;

      *iter = 0;

  m_ifaces.clear ();

  m_ifaces.clear ();

  m_node = 0;

  m_channel = 0;

  m_routingProtocol = 0;

  NetDevice::DoDispose ();

  NetDevice::DoDispose ();

(-)a/src/devices/mesh/mesh-wifi-interface-mac.cc (+2 lines)

Lines 282-289	Link Here

282

  m_rxMiddle = 0;

282

  m_rxMiddle = 0;

283

  m_low = 0;

283

  m_low = 0;

284

  m_dcfManager = 0;

284

  m_dcfManager = 0;

285

  m_stationManager = 0;

285

  m_phy = 0;

286

  m_phy = 0;

286

  m_queues.clear ();

287

  m_queues.clear ();

288

  m_plugins.clear ();

287

  m_beaconSendEvent.Cancel ();

289

  m_beaconSendEvent.Cancel ();

288

  m_beaconDca = 0;

290

  m_beaconDca = 0;

289

291

(-)a/src/devices/wifi/yans-wifi-phy.cc (+2 lines)

Lines 139-144	Link Here

139

  m_channel = 0;

139

  m_channel = 0;

140

  m_modes.clear ();

140

  m_modes.clear ();

141

  m_device = 0;

141

  m_device = 0;

142

  m_mobility = 0;

143

  m_state = 0;

142

144

143

145

144

void

146

void

(-)a/src/helper/dot11s-installer.cc (-2 / +3 lines)

Lines 73-80	Link Here

      hwmp->SetRoot ();

      hwmp->SetRoot ();

  //Install interaction between HWMP and Peer management protocol:

  //Install interaction between HWMP and Peer management protocol:

  pmp->SetPeerLinkStatusCallback (MakeCallback (&HwmpProtocol::PeerLinkStatus, hwmp));

  //PeekPointer()'s to avoid circular Ptr references

  hwmp->SetNeighboursCallback (MakeCallback (&PeerManagementProtocol::GetActiveLinks, pmp));

  pmp->SetPeerLinkStatusCallback (MakeCallback (&HwmpProtocol::PeerLinkStatus, PeekPointer (hwmp)));

  hwmp->SetNeighboursCallback (MakeCallback (&PeerManagementProtocol::GetActiveLinks, PeekPointer (pmp)));

  return true;

  return true;

void

void

(-)a/src/node/node.cc (+1 lines)

Lines 148-153	Link Here

148

void

148

void

149

Node::DoDispose()

149

Node::DoDispose()

150

151

  m_handlers.clear ();

151

  for (std::vector<Ptr<NetDevice> >::iterator i = m_devices.begin ();

152

  for (std::vector<Ptr<NetDevice> >::iterator i = m_devices.begin ();

152

       i != m_devices.end (); i++)

153

       i != m_devices.end (); i++)

153

154

Return to bug 711