Attachment #627 for bug #711

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

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

Lines 184-189	Link Here

184

  m_doFlag (false),

184

  m_doFlag (false),

185

  m_rfFlag (false)

185

  m_rfFlag (false)

186

187

  NS_LOG_FUNCTION_NOARGS ();

187

188

  if (m_isRoot)

189

  if (m_isRoot)

189

190

Lines 193-213	Link Here

193

194

HwmpProtocol::~HwmpProtocol ()

195

HwmpProtocol::~HwmpProtocol ()

195

196

197

  NS_LOG_FUNCTION_NOARGS ();

198

  m_mp = 0;

196

199

197

200

198

void

201

void

199

HwmpProtocol::DoDispose ()

202

HwmpProtocol::DoDispose ()

200

203

204

  NS_LOG_FUNCTION_NOARGS ();

201

  for (std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.begin (); i != m_preqTimeouts.end (); i ++)

205

  for (std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.begin (); i != m_preqTimeouts.end (); i ++)

202

206

203

      i->second.Cancel ();

207

      i->second.Cancel ();

204

208

209

  for (HwmpProtocolMacMap::iterator i = m_interfaces.begin (); i != m_interfaces.end (); i ++)

210

211

      i->second = 0;

212

205

  m_proactivePreqTimer.Cancel();

213

  m_proactivePreqTimer.Cancel();

206

  m_preqTimeouts.clear ();

214

  m_preqTimeouts.clear ();

207

  m_lastDataSeqno.clear ();

215

  m_lastDataSeqno.clear ();

208

  m_lastHwmpSeqno.clear ();

216

  m_lastHwmpSeqno.clear ();

217

  m_interfaces.clear ();

209

  m_rqueue.clear ();

218

  m_rqueue.clear ();

210

  m_rtable = 0;

219

  m_rtable = 0;

220

  m_mp = 0;

211

221

212

222

213

bool

223

bool




void
IeBeaconTiming::ClearTimingElement ()
{
  uint16_t to_delete = 0;
  uint16_t i;
  for (NeighboursTimingUnitsList::iterator j = m_neighbours.begin (); j != m_neighbours.end (); j++)
    {
      to_delete++;
      (*j) = 0;
    }
  for (i = 0; i < to_delete; i++)
    {
      m_neighbours.pop_back ();
    }
  m_neighbours.clear ();

}
uint8_t
IeBeaconTiming::GetInformationSize () const




void
IePreq::ClearDestinationAddressElements ()
{
  int i;
  for (std::vector<Ptr<DestinationAddressUnit> >::iterator j = m_destinations.begin (); j
      != m_destinations.end (); j++)
    {
      (*j) = 0;
    }
  for (i = 0; i < m_destCount; i++)
    {
      m_destinations.pop_back ();
    }
  m_destinations.clear ();
  m_destCount = 0;
}

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

Lines 93-98	Link Here

      i->second.clear ();

      i->second.clear ();

  m_neighbourBeacons.clear ();

  m_neighbourBeacons.clear ();

  for (PeerManagementProtocolMacMap::iterator i = m_plugins.begin (); i != m_plugins.end (); i++)

      i->second = 0;

100

101

  m_plugins.clear ();

102

103

bool

104

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-beacon.h (-2 lines)

Lines 27-34	Link Here

#include "ns3/wifi-mac-header.h"

#include "ns3/wifi-mac-header.h"

#include "ns3/wifi-information-element-vector.h"

#include "ns3/wifi-information-element-vector.h"

#include <vector>

namespace ns3 {

namespace ns3 {

/**

/**




  NS_LOG_FUNCTION (this);
  delete m_rxMiddle;
  delete m_dcfManager;
  for (PluginList::iterator i = m_plugins.begin (); i != m_plugins.end (); i++)
    {
      *i = 0;
    }
  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); i++)
    {
      i->second = 0;
    }
  //Delete smart pointers:
  m_rxMiddle = 0;
  m_low = 0;
  m_dcfManager = 0;
  m_stationManager = 0;
  m_phy = 0;
  m_queues.clear ();
  m_plugins.clear ();
  m_beaconSendEvent.Cancel ();
  m_beaconDca = 0;


(-)a/src/devices/mesh/wifi-information-element-vector.cc (-1 / +1 lines)

Lines 74-80	Link Here

void

void

WifiInformationElementVector::Serialize (Buffer::Iterator start) const

WifiInformationElementVector::Serialize (Buffer::Iterator start) const

  for(std::vector<Ptr<WifiInformationElement> >::const_iterator i = m_elements.begin (); i != m_elements.end (); i ++)

  for(IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i ++)

      start.WriteU8((*i)->ElementId ());

      start.WriteU8((*i)->ElementId ());

      start.WriteU8 ((*i)->GetInformationSize ());

      start.WriteU8 ((*i)->GetInformationSize ());

(-)a/src/devices/wifi/interference-helper.cc (-1 / +1 lines)

Lines 611-617	Link Here

611

612

      *i = 0;

612

      *i = 0;

613

614

  m_events.erase (m_events.begin (), m_events.end ());

614

  m_events.clear ();

615

616

617

void

617

void

(-)a/src/devices/wifi/mac-rx-middle.cc (+1 lines)

Lines 25-30	Link Here

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "ns3/callback.h"

#include <list>

#include <list>

NS_LOG_COMPONENT_DEFINE ("MacRxMiddle");

NS_LOG_COMPONENT_DEFINE ("MacRxMiddle");

(-)a/src/devices/wifi/wifi-net-device.cc (-2 / +10 lines)

Lines 28-33	Link Here

#include "ns3/pointer.h"

#include "ns3/pointer.h"

#include "ns3/node.h"

#include "ns3/node.h"

#include "ns3/trace-source-accessor.h"

#include "ns3/trace-source-accessor.h"

#include "ns3/log.h"

NS_LOG_COMPONENT_DEFINE ("WifiNetDevice");

namespace ns3 {

namespace ns3 {

Lines 65-77	Link Here

WifiNetDevice::WifiNetDevice ()

WifiNetDevice::WifiNetDevice ()

  : m_mtu (0),

  : m_mtu (0),

    m_configComplete (false)

    m_configComplete (false)

{}

  NS_LOG_FUNCTION_NOARGS ();

WifiNetDevice::~WifiNetDevice ()

WifiNetDevice::~WifiNetDevice ()

{}

NS_LOG_FUNCTION_NOARGS ();

void

void

WifiNetDevice::DoDispose (void)

WifiNetDevice::DoDispose (void)

  NS_LOG_FUNCTION_NOARGS ();

  m_node = 0;

  m_node = 0;

  m_mac->Dispose ();

  m_mac->Dispose ();

  m_phy->Dispose ();

  m_phy->Dispose ();

(-)a/src/devices/wifi/yans-wifi-channel.cc (+7 lines)

Lines 56-61	Link Here

{}

{}

YansWifiChannel::~YansWifiChannel ()

YansWifiChannel::~YansWifiChannel ()

  m_loss = 0;

  m_delay = 0;

  for (PhyList::iterator i = m_phyList.begin (); i != m_phyList.end (); i++)

      *i = 0;

  m_phyList.clear ();

  m_phyList.clear ();

(-)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 / +2 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));

  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

(-)a/src/helper/net-device-container.cc (+8 lines)

Lines 39-44	Link Here

  *this = a;

  *this = a;

  Add (b);

  Add (b);

NetDeviceContainer::~NetDeviceContainer ()

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

      *i = 0;

  m_devices.clear ();

NetDeviceContainer::Iterator

NetDeviceContainer::Iterator

(-)a/src/helper/net-device-container.h (+5 lines)

Lines 85-90	Link Here

  NetDeviceContainer (const NetDeviceContainer &a, const NetDeviceContainer &b);

  NetDeviceContainer (const NetDeviceContainer &a, const NetDeviceContainer &b);

/**

/**

   * Destroy a NetDeviceContainer

*/

  ~NetDeviceContainer ();

/**

   * \brief Get an iterator which refers to the first NetDevice in the

   * \brief Get an iterator which refers to the first NetDevice in the

   * container.

   * container.

(-)a/src/helper/node-container.cc (+8 lines)

Lines 67-72	Link Here

  Add (e);

  Add (e);

NodeContainer::~NodeContainer ()

  for (std::vector<Ptr<Node> >::iterator i = m_nodes.begin (); i != m_nodes.end (); i++)

      *i = 0;

NodeContainer::Iterator

NodeContainer::Iterator

NodeContainer::Begin (void) const

NodeContainer::Begin (void) const

(-)a/src/helper/node-container.h (+5 lines)

Lines 138-143	Link Here

138

                 const NodeContainer &e);

138

                 const NodeContainer &e);

139

140

/**

140

/**

141

   * Destroy a NodeContainer

142

*/

143

  ~NodeContainer ();

144

145

/**

141

   * \brief Get an iterator which refers to the first Node in the

146

   * \brief Get an iterator which refers to the first Node in the

142

   * container.

147

   * container.

143

148

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

Lines 45-50	Link Here

NetDevice::~NetDevice ()

NetDevice::~NetDevice ()

{}

  NS_LOG_FUNCTION_NOARGS ();

} // namespace ns3

} // namespace ns3

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

Lines 148-153	Link Here

148

void

148

void

149

Node::DoDispose()

149

Node::DoDispose()

150

151

  for (ProtocolHandlerList::iterator i = m_handlers.begin ();

152

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

153

154

      i->device = 0;

155

156

  m_handlers.clear ();

151

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

157

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

152

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

158

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

153

159

Return to bug 711