Attachment #486 for bug #600

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

(-)a/bindings/python/ns3_module_list_routing.py (-5 lines)

Lines 120-130 def register_Ns3Ipv4ListRouting_methods(	Link Here

120

                   'void',

120

                   'void',

121

                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')],

121

                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')],

122

                   is_virtual=True)

122

                   is_virtual=True)

123

    ## ipv4-list-routing.h: ns3::Ptr<ns3::Ipv4StaticRouting> ns3::Ipv4ListRouting::GetStaticRouting() const [member function]

124

    cls.add_method('GetStaticRouting',

125

                   'ns3::Ptr< ns3::Ipv4StaticRouting >',

126

[],

127

                   is_const=True, is_virtual=True)

128

    ## ipv4-list-routing.h: void ns3::Ipv4ListRouting::DoDispose() [member function]

123

    ## ipv4-list-routing.h: void ns3::Ipv4ListRouting::DoDispose() [member function]

129

    cls.add_method('DoDispose',

124

    cls.add_method('DoDispose',

130

                   'void',

125

                   'void',

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

Lines 178-185 InternetStackHelper::InternetStackHelper	Link Here

178

  static Ipv4StaticRoutingHelper staticRouting;

178

  static Ipv4StaticRoutingHelper staticRouting;

179

  static Ipv4GlobalRoutingHelper globalRouting;

179

  static Ipv4GlobalRoutingHelper globalRouting;

180

  static Ipv4ListRoutingHelper listRouting;

180

  static Ipv4ListRoutingHelper listRouting;

181

  listRouting.Add (staticRouting,0);

181

  listRouting.Add (staticRouting, 0);

182

  listRouting.Add (globalRouting,3);

182

  listRouting.Add (globalRouting, -10);

183

  SetRoutingHelper (listRouting);

183

  SetRoutingHelper (listRouting);

184

185

(-)a/src/helper/ipv4-global-routing-helper.cc (-2 / +5 lines)

Lines 29-40 void	Link Here

void

void

Ipv4GlobalRoutingHelper::PopulateRoutingTables (void)

Ipv4GlobalRoutingHelper::PopulateRoutingTables (void)

  GlobalRouteManager::PopulateRoutingTables ();

  GlobalRouteManager::BuildGlobalRoutingDatabase ();

  GlobalRouteManager::InitializeRoutes ();

void

void

Ipv4GlobalRoutingHelper::RecomputeRoutingTables (void)

Ipv4GlobalRoutingHelper::RecomputeRoutingTables (void)

  GlobalRouteManager::RecomputeRoutingTables ();

  GlobalRouteManager::DeleteGlobalRoutes ();

  GlobalRouteManager::BuildGlobalRoutingDatabase ();

  GlobalRouteManager::InitializeRoutes ();

(-)a/src/internet-stack/ipv4-l3-protocol.h (-3 lines)

Lines 155-163 public:	Link Here

155

156

  Ptr<NetDevice> GetNetDevice (uint32_t i);

156

  Ptr<NetDevice> GetNetDevice (uint32_t i);

157

158

  void AddRoutingProtocol (Ptr<Ipv4RoutingProtocol> routingProtocol,

159

                           int16_t priority);

160

161

protected:

158

protected:

162

159

163

  virtual void DoDispose (void);

160

  virtual void DoDispose (void);

(-)a/src/routing/global-routing/global-route-manager.h (-7 / +7 lines)

Lines 22-27	Link Here

#ifndef GLOBAL_ROUTE_MANAGER_H

#ifndef GLOBAL_ROUTE_MANAGER_H

#define GLOBAL_ROUTE_MANAGER_H

#define GLOBAL_ROUTE_MANAGER_H

#include "ns3/deprecated.h"

namespace ns3 {

namespace ns3 {

/**

/**

Lines 43-57 public:	Link Here

 * the nodes in the simulation.  Makes all nodes in the simulation into

 * the nodes in the simulation.  Makes all nodes in the simulation into

 * routers.

 * routers.

 * All this function does is call the three functions

 * All this function does is call the functions

 * SelectRouterNodes (), BuildGlobalRoutingDatabase (), and

 * BuildGlobalRoutingDatabase () and  InitializeRoutes ().

 * InitializeRoutes ().

 * @see SelectRouterNodes ();

 * @see BuildGlobalRoutingDatabase ();

 * @see BuildGlobalRoutingDatabase ();

 * @see InitializeRoutes ();

 * @see InitializeRoutes ();

*/

*/

  static void PopulateRoutingTables ();

  static void PopulateRoutingTables () NS_DEPRECATED;

/**

/**

  *@brief Remove all routes that were previously installed in a prior call

  *@brief Remove all routes that were previously installed in a prior call

Lines 68-74 public:	Link Here

 * @see BuildGlobalRoutingDatabase ();

 * @see BuildGlobalRoutingDatabase ();

 * @see InitializeRoutes ();

 * @see InitializeRoutes ();

*/

*/

 static void RecomputeRoutingTables ();

 static void RecomputeRoutingTables () NS_DEPRECATED;

public:

public:

/**

/**

Lines 76-82 public:	Link Here

*/

*/

  static uint32_t AllocateRouterId ();

  static uint32_t AllocateRouterId ();

private:

/**

/**

 * @brief Delete all static routes on all nodes that have a

 * @brief Delete all static routes on all nodes that have a

 * GlobalRouterInterface

 * GlobalRouterInterface

Lines 99-104 private:	Link Here

*/

*/

100

  static void InitializeRoutes ();

  static void InitializeRoutes ();

101

100

101

private:

102

/**

102

/**

103

 * @brief Global Route Manager copy construction is disallowed.  There's no

103

 * @brief Global Route Manager copy construction is disallowed.  There's no

104

 * need for it and a compiler provided shallow copy would be wrong.

104

 * need for it and a compiler provided shallow copy would be wrong.




  return 0;
}

Ptr<Ipv4StaticRouting>
Ipv4ListRouting::GetStaticRouting (void) const
{
  NS_LOG_FUNCTION (this);
  Ipv4StaticRouting* srp;
  for (Ipv4RoutingProtocolList::const_iterator rprotoIter = m_routingProtocols.begin ();
       rprotoIter != m_routingProtocols.end (); rprotoIter++)
    {
      NS_LOG_LOGIC ("Searching for static routing");
      srp = dynamic_cast<Ipv4StaticRouting*> (PeekPointer((*rprotoIter).second));
      if (srp)
        {
          NS_LOG_LOGIC ("Found static routing");
          return Ptr<Ipv4StaticRouting> (srp);
        }
    }
  NS_LOG_LOGIC ("Static routing not found");
  return 0;

}

bool 
Ipv4ListRouting::Compare (const Ipv4RoutingProtocolEntry& a, const Ipv4RoutingProtocolEntry& b)
{




#include "ns3/ipv4-routing-protocol.h"

namespace ns3 {

class Ipv4StaticRouting;

/**
 * \ingroup ipv4Routing 

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual Ptr<Ipv4StaticRouting> GetStaticRouting (void) const;

protected:
  void DoDispose (void);
private:

Return to bug 600