Attachment #613 for bug #678

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

(-)a/src/helper/internet-stack-helper.cc (-8 / +18 lines)

Lines 179-193	Link Here

179

bool InternetStackHelper::m_isInitialized = false;

179

bool InternetStackHelper::m_isInitialized = false;

180

181

InternetStackHelper::InternetStackHelper ()

181

InternetStackHelper::InternetStackHelper ()

182

  : m_ipv4Enabled (true),

182

  : m_routing (0),

183

  m_routingv6 (0),

184

  m_ipv4Enabled (true),

183

  m_ipv6Enabled (true)

185

  m_ipv6Enabled (true)

184

186

185

  SetTcp ("ns3::TcpL4Protocol");

187

  SetTcp ("ns3::TcpL4Protocol");

186

  static Ipv4StaticRoutingHelper staticRouting;

188

  Ipv4StaticRoutingHelper staticRouting;

187

  static Ipv4GlobalRoutingHelper globalRouting;

189

  Ipv4GlobalRoutingHelper globalRouting;

188

  static Ipv4ListRoutingHelper listRouting;

190

  Ipv4ListRoutingHelper listRouting;

189

  static Ipv6ListRoutingHelper listRoutingv6;

191

  Ipv6ListRoutingHelper listRoutingv6;

190

  static Ipv6StaticRoutingHelper staticRoutingv6;

192

  Ipv6StaticRoutingHelper staticRoutingv6;

191

  if (m_isInitialized == false)

193

  if (m_isInitialized == false)

192

194

193

      // Only add these once

195

      // Only add these once

Lines 203-218	Link Here

203

  SetRoutingHelper (listRoutingv6);

205

  SetRoutingHelper (listRoutingv6);

204

206

205

207

208

InternetStackHelper::~InternetStackHelper ()

209

210

  delete m_routing;

211

  delete m_routingv6;

212

213

206

void

214

void

207

InternetStackHelper::SetRoutingHelper (const Ipv4RoutingHelper &routing)

215

InternetStackHelper::SetRoutingHelper (const Ipv4RoutingHelper &routing)

208

216

209

  m_routing = &routing;

217

  delete m_routing;

218

  m_routing = routing.Copy ();

210

219

211

220

212

void

221

void

213

InternetStackHelper::SetRoutingHelper (const Ipv6RoutingHelper &routing)

222

InternetStackHelper::SetRoutingHelper (const Ipv6RoutingHelper &routing)

214

223

215

  m_routingv6 = &routing;

224

  delete m_routingv6;

225

  m_routingv6 = routing.Copy ();

216

226

217

227

218

void

228

void

(-)a/src/helper/internet-stack-helper.h (+1 lines)

Lines 53-58	Link Here

   * such as ns3::OlsrHelper

   * such as ns3::OlsrHelper

*/

*/

  InternetStackHelper(void);

  InternetStackHelper(void);

  virtual ~InternetStackHelper(void);

/**

/**

   * \param routing a new routing helper

   * \param routing a new routing helper





Ipv4GlobalRoutingHelper::Ipv4GlobalRoutingHelper ()
{}

Ipv4GlobalRoutingHelper::Ipv4GlobalRoutingHelper (const Ipv4GlobalRoutingHelper &o)
{
}

Ipv4GlobalRoutingHelper &
Ipv4GlobalRoutingHelper::operator = (const Ipv4GlobalRoutingHelper &o)
{
  return *this;
}

Ipv4GlobalRoutingHelper* 
Ipv4GlobalRoutingHelper::Copy (void) const 
{
  return new Ipv4GlobalRoutingHelper (*this); 
}

Ptr<Ipv4RoutingProtocol> 
Ipv4GlobalRoutingHelper::Create (Ptr<Node> node) const
{




{
public:
  Ipv4GlobalRoutingHelper ();
  Ipv4GlobalRoutingHelper (const Ipv4GlobalRoutingHelper &);
  Ipv4GlobalRoutingHelper &operator = (const Ipv4GlobalRoutingHelper &o);
  /**
   * \returns pointer to clone of this Ipv4GlobalRoutingHelper
   *
   * This method is mainly for internal use by the other helpers;
   * clients are expected to free the dynamic memory allocated by this method
   */
  Ipv4GlobalRoutingHelper* Copy (void) const;

  /**
   * \param node the node on which the routing protocol will run
   * \returns a newly-created routing protocol





Ipv4ListRoutingHelper::Ipv4ListRoutingHelper()
{}

Ipv4ListRoutingHelper::~Ipv4ListRoutingHelper()
{
  for (std::list<std::pair<const Ipv4RoutingHelper *, int16_t> >::iterator i = m_list.begin ();
       i != m_list.end (); ++i)
    {
      delete i->first;
    }
}

Ipv4ListRoutingHelper::Ipv4ListRoutingHelper (const Ipv4ListRoutingHelper &o)
{
  std::list<std::pair<const Ipv4RoutingHelper *, int16_t> >::const_iterator i;
  for (i = o.m_list.begin (); i != o.m_list.end (); ++i)
    {
      m_list.push_back (std::make_pair (const_cast<const Ipv4RoutingHelper *> (i->first->Copy ()), i->second));
    }
}

Ipv4ListRoutingHelper &
Ipv4ListRoutingHelper::operator = (const Ipv4ListRoutingHelper &o)
{
  if (this == &o)
    {
      return *this;
    }
  std::list<std::pair<const Ipv4RoutingHelper *, int16_t> >::const_iterator i;
  for (i = o.m_list.begin (); i != o.m_list.end (); ++i)
    {
      m_list.push_back (std::make_pair (const_cast<const Ipv4RoutingHelper *> (i->first->Copy ()), i->second));
    }
  return *this;
}

Ipv4ListRoutingHelper* 
Ipv4ListRoutingHelper::Copy (void) const 
{
  return new Ipv4ListRoutingHelper (*this); 
}

void 
Ipv4ListRoutingHelper::Add (const Ipv4RoutingHelper &routing, int16_t priority)
{
  m_list.push_back (std::make_pair (const_cast<const Ipv4RoutingHelper *> (routing.Copy ()), priority));
}

Ptr<Ipv4RoutingProtocol> 
Ipv4ListRoutingHelper::Create (Ptr<Node> node) const
{
  Ptr<Ipv4ListRouting> list = CreateObject<Ipv4ListRouting> ();
  for (std::list<std::pair<const Ipv4RoutingHelper *, int16_t> >::const_iterator i = m_list.begin ();
       i != m_list.end (); ++i)
    {
      Ptr<Ipv4RoutingProtocol> prot = i->first->Create (node);




class Ipv4ListRoutingHelper : public Ipv4RoutingHelper
{
public:
  Ipv4ListRoutingHelper ();
  virtual ~Ipv4ListRoutingHelper ();
  Ipv4ListRoutingHelper (const Ipv4ListRoutingHelper &);
  Ipv4ListRoutingHelper &operator = (const Ipv4ListRoutingHelper &o);
  /**
   * \returns pointer to clone of this Ipv4ListRoutingHelper 
   * 
   * This method is mainly for internal use by the other helpers;
   * clients are expected to free the dynamic memory allocated by this method
   */
  Ipv4ListRoutingHelper* Copy (void) const;

  /**
   * \param routing a routing helper
   * \param priority the priority of the associated helper




  m_agentFactory.SetTypeId ("ns3::Ipv4NixVectorRouting");
}

Ipv4NixVectorHelper::Ipv4NixVectorHelper (const Ipv4NixVectorHelper &o)
  : m_agentFactory (o.m_agentFactory)
{
}

Ipv4NixVectorHelper &
Ipv4NixVectorHelper::operator = (const Ipv4NixVectorHelper &o)
{
  if (this == &o)
    {
      return *this;
    }
  m_agentFactory = o.m_agentFactory;
  return *this;
}

Ipv4NixVectorHelper* 
Ipv4NixVectorHelper::Copy (void) const 
{
  return new Ipv4NixVectorHelper (*this); 
}

Ptr<Ipv4RoutingProtocol> 
Ipv4NixVectorHelper::Create (Ptr<Node> node) const
{

(-)a/src/helper/ipv4-nix-vector-helper.h (+9 lines)

Lines 38-43	Link Here

public:

public:

  Ipv4NixVectorHelper ();

  Ipv4NixVectorHelper ();

  Ipv4NixVectorHelper (const Ipv4NixVectorHelper &);

  Ipv4NixVectorHelper &operator = (const Ipv4NixVectorHelper &o);

/**

   * \returns pointer to clone of this Ipv4NixVectorHelper

   * This method is mainly for internal use by the other helpers;

   * clients are expected to free the dynamic memory allocated by this method

*/

  Ipv4NixVectorHelper* Copy (void) const;

/**

/**

  * \param node the node on which the routing protocol will run

  * \param node the node on which the routing protocol will run




{
public:
  virtual ~Ipv4RoutingHelper ();

  /**
   * \brief virtual constructor
   * \returns pointer to clone of this Ipv4RoutingHelper 
   * 
   * This method is mainly for internal use by the other helpers;
   * clients are expected to free the dynamic memory allocated by this method
   */
  virtual Ipv4RoutingHelper* Copy (void) const = 0;

  /**
   * \param node the node within which the new routing protocol will run
   * \returns a newly-created routing protocol





Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper()
{}

Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper (const Ipv4StaticRoutingHelper &o)
{
}

Ipv4StaticRoutingHelper &
Ipv4StaticRoutingHelper::operator = (const Ipv4StaticRoutingHelper &o)
{
  return *this;
}

Ipv4StaticRoutingHelper* 
Ipv4StaticRoutingHelper::Copy (void) const 
{
  return new Ipv4StaticRoutingHelper (*this); 
}

Ptr<Ipv4RoutingProtocol> 
Ipv4StaticRoutingHelper::Create (Ptr<Node> node) const
{




class Ipv4StaticRoutingHelper : public Ipv4RoutingHelper
{
public:
  Ipv4StaticRoutingHelper ();
  Ipv4StaticRoutingHelper (const Ipv4StaticRoutingHelper &);
  Ipv4StaticRoutingHelper &operator = (const Ipv4StaticRoutingHelper &o);
  /**
   * \returns pointer to clone of this Ipv4StaticRoutingHelper
   *
   * This method is mainly for internal use by the other helpers;
   * clients are expected to free the dynamic memory allocated by this method
   */
  Ipv4StaticRoutingHelper* Copy (void) const;

  /**
   * \param node the node on which the routing protocol will run





Ipv6ListRoutingHelper::Ipv6ListRoutingHelper ()
{}

Ipv6ListRoutingHelper::~Ipv6ListRoutingHelper()
{
  for (std::list<std::pair<const Ipv6RoutingHelper *, int16_t> >::iterator i = m_list.begin ();
       i != m_list.end (); ++i)
    {
      delete i->first;
    }
}
Ipv6ListRoutingHelper::Ipv6ListRoutingHelper (const Ipv6ListRoutingHelper &o)
{
  std::list<std::pair<const Ipv6RoutingHelper *, int16_t> >::const_iterator i;
  for (i = o.m_list.begin (); i != o.m_list.end (); ++i)
    {
      m_list.push_back (std::make_pair (const_cast<const Ipv6RoutingHelper *> (i->first->Copy ()), i->second));
    }
}

Ipv6ListRoutingHelper &
Ipv6ListRoutingHelper::operator = (const Ipv6ListRoutingHelper &o)
{
  if (this == &o)
    {
      return *this;
    }
  std::list<std::pair<const Ipv6RoutingHelper *, int16_t> >::const_iterator i;
  for (i = o.m_list.begin (); i != o.m_list.end (); ++i)
    {
      m_list.push_back (std::make_pair (const_cast<const Ipv6RoutingHelper *> (i->first->Copy ()), i->second));
    }
  return *this;
}

Ipv6ListRoutingHelper* 
Ipv6ListRoutingHelper::Copy (void) const 
{
  return new Ipv6ListRoutingHelper (*this); 
}

void 
Ipv6ListRoutingHelper::Add (const Ipv6RoutingHelper &routing, int16_t priority)
{
  m_list.push_back (std::make_pair (const_cast<const Ipv6RoutingHelper *> (routing.Copy ()), priority));
}
Ptr<Ipv6RoutingProtocol> 
Ipv6ListRoutingHelper::Create (Ptr<Node> node) const




{
public:
  Ipv6ListRoutingHelper ();
  virtual ~Ipv6ListRoutingHelper ();
  Ipv6ListRoutingHelper (const Ipv6ListRoutingHelper &);
  Ipv6ListRoutingHelper &operator = (const Ipv6ListRoutingHelper &o);
  /**
   * \returns pointer to clone of this Ipv6ListRoutingHelper 
   * 
   * This method is mainly for internal use by the other helpers;
   * clients are expected to free the dynamic memory allocated by this method
   */
  Ipv6ListRoutingHelper* Copy (void) const;

  /**
   * \param routing a routing helper
   * \param priority the priority of the associated helper




{
public:
  virtual ~Ipv6RoutingHelper ();

  /**
   * \brief virtual constructor
   * \returns pointer to clone of this Ipv6RoutingHelper 
   * 
   * This method is mainly for internal use by the other helpers;
   * clients are expected to free the dynamic memory allocated by this method
   */
  virtual Ipv6RoutingHelper* Copy (void) const = 0;

  /**
   * \param node the node within which the new routing protocol will run
   * \returns a newly-created routing protocol





Ipv6StaticRoutingHelper::Ipv6StaticRoutingHelper ()
{}

Ipv6StaticRoutingHelper::Ipv6StaticRoutingHelper (const Ipv6StaticRoutingHelper &o)
{
}

Ipv6StaticRoutingHelper &
Ipv6StaticRoutingHelper::operator = (const Ipv6StaticRoutingHelper &o)
{
  return *this;
}

Ipv6StaticRoutingHelper* 
Ipv6StaticRoutingHelper::Copy (void) const 
{
  return new Ipv6StaticRoutingHelper (*this); 
}

Ptr<Ipv6RoutingProtocol> 
Ipv6StaticRoutingHelper::Create (Ptr<Node> node) const
{

(-)a/src/helper/ipv6-static-routing-helper.h (+9 lines)

Lines 45-50	Link Here

   * \brief Constructor.

   * \brief Constructor.

*/

*/

  Ipv6StaticRoutingHelper ();

  Ipv6StaticRoutingHelper ();

  Ipv6StaticRoutingHelper (const Ipv6StaticRoutingHelper &);

  Ipv6StaticRoutingHelper &operator = (const Ipv6StaticRoutingHelper &o);

/**

   * \returns pointer to clone of this Ipv6StaticRoutingHelper

   * This method is mainly for internal use by the other helpers;

   * clients are expected to free the dynamic memory allocated by this method

*/

  Ipv6StaticRoutingHelper* Copy (void) const;

/**

/**

   * \param node the node on which the routing protocol will run

   * \param node the node on which the routing protocol will run




  m_agentFactory.SetTypeId ("ns3::olsr::RoutingProtocol");
}

OlsrHelper::OlsrHelper (const OlsrHelper &o)
  : m_agentFactory (o.m_agentFactory)
{
}

OlsrHelper &
OlsrHelper::operator = (const OlsrHelper &o)
{
  if (this == &o)
    {
      return *this;
    }
  m_agentFactory = o.m_agentFactory;
  return *this;
}

OlsrHelper* 
OlsrHelper::Copy (void) const 
{
  return new OlsrHelper (*this); 
}

Ptr<Ipv4RoutingProtocol> 
OlsrHelper::Create (Ptr<Node> node) const
{

(-)a/src/helper/olsr-helper.h (+9 lines)

Lines 37-42	Link Here

public:

public:

  OlsrHelper ();

  OlsrHelper ();

  OlsrHelper (const OlsrHelper &);

  OlsrHelper &operator = (const OlsrHelper &o);

/**

   * \returns pointer to clone of this OlsrHelper

   * This method is mainly for internal use by the other helpers;

   * clients are expected to free the dynamic memory allocated by this method

*/

  OlsrHelper* Copy (void) const;

/**

/**

   * \param node the node on which the routing protocol will run

   * \param node the node on which the routing protocol will run

Return to bug 678