Attachment #631 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 213-218	Link Here

213

  m_rqueue.clear ();

213

  m_rqueue.clear ();

214

  m_rtable = 0;

214

  m_rtable = 0;

215

  m_mp = 0;

215

  m_mp = 0;

216

217

  m_neighboursCallback = MakeNullCallback<std::vector<Mac48Address>, uint32_t> ();

216

218

217

219

218

bool

220

bool

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

Lines 95-100	Link Here

  m_neighbourBeacons.clear ();

  m_neighbourBeacons.clear ();

  m_plugins.clear ();

  m_plugins.clear ();

  m_peerStatusCallback = MakeNullCallback<void, Mac48Address, Mac48Address, uint32_t, bool> ();

100

101

100

bool

102

bool

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

Lines 73-81	Link Here

      hwmp->SetRoot ();

      hwmp->SetRoot ();

  //Install interaction between HWMP and Peer management protocol:

  //Install interaction between HWMP and Peer management protocol:

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

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

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

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

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

  return true;

  return true;

void

void

Return to bug 711