diff --git a/bindings/python/ns3_module_internet_stack.py b/bindings/python/ns3_module_internet_stack.py index f74fed29f..a2626bc91 100644 --- a/bindings/python/ns3_module_internet_stack.py +++ b/bindings/python/ns3_module_internet_stack.py @@ -25,8 +25,6 @@ def register_types(module): module.add_class('UdpHeader', parent=root_module['ns3::Header']) ## ipv4-static-routing-impl.h: ns3::Ipv4StaticRoutingImpl [class] module.add_class('Ipv4StaticRoutingImpl', parent=root_module['ns3::Ipv4StaticRouting']) - ## ipv4-global-routing.h: ns3::Ipv4GlobalRouting [class] - module.add_class('Ipv4GlobalRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) ## ipv4-list-routing-impl.h: ns3::Ipv4ListRoutingImpl [class] module.add_class('Ipv4ListRoutingImpl', parent=root_module['ns3::Ipv4ListRouting']) @@ -88,7 +86,6 @@ def register_methods(root_module): register_Ns3TcpHeader_methods(root_module, root_module['ns3::TcpHeader']) register_Ns3UdpHeader_methods(root_module, root_module['ns3::UdpHeader']) register_Ns3Ipv4StaticRoutingImpl_methods(root_module, root_module['ns3::Ipv4StaticRoutingImpl']) - register_Ns3Ipv4GlobalRouting_methods(root_module, root_module['ns3::Ipv4GlobalRouting']) register_Ns3Ipv4ListRoutingImpl_methods(root_module, root_module['ns3::Ipv4ListRoutingImpl']) return @@ -636,70 +633,6 @@ def register_Ns3Ipv4StaticRoutingImpl_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3Ipv4GlobalRouting_methods(root_module, cls): - ## ipv4-global-routing.h: ns3::Ipv4GlobalRouting::Ipv4GlobalRouting(ns3::Ipv4GlobalRouting const & arg0) [copy constructor] - cls.add_constructor([param('ns3::Ipv4GlobalRouting const &', 'arg0')]) - ## ipv4-global-routing.h: static ns3::TypeId ns3::Ipv4GlobalRouting::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## ipv4-global-routing.h: ns3::Ipv4GlobalRouting::Ipv4GlobalRouting() [constructor] - cls.add_constructor([]) - ## ipv4-global-routing.h: ns3::Ptr ns3::Ipv4GlobalRouting::RouteOutput(ns3::Ipv4Header const & header, uint32_t oif, ns3::Socket::SocketErrno & sockerr) [member function] - cls.add_method('RouteOutput', - 'ns3::Ptr< ns3::Ipv4Route >', - [param('ns3::Ipv4Header const &', 'header'), param('uint32_t', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], - is_virtual=True) - ## ipv4-global-routing.h: bool ns3::Ipv4GlobalRouting::RouteInput(ns3::Ptr p, ns3::Ipv4Header const & header, ns3::Ptr idev, ns3::Callback,ns3::Ptr,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback,ns3::Ptr,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function] - cls.add_method('RouteInput', - 'bool', - [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], - is_virtual=True) - ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function] - cls.add_method('AddHostRouteTo', - 'void', - [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')]) - ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function] - cls.add_method('AddHostRouteTo', - 'void', - [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')]) - ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function] - cls.add_method('AddNetworkRouteTo', - 'void', - [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')]) - ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function] - cls.add_method('AddNetworkRouteTo', - 'void', - [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')]) - ## ipv4-global-routing.h: uint32_t ns3::Ipv4GlobalRouting::GetNRoutes() [member function] - cls.add_method('GetNRoutes', - 'uint32_t', - []) - ## ipv4-global-routing.h: ns3::Ipv4RoutingTableEntry * ns3::Ipv4GlobalRouting::GetRoute(uint32_t i) [member function] - cls.add_method('GetRoute', - 'ns3::Ipv4RoutingTableEntry *', - [param('uint32_t', 'i')]) - ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::RemoveRoute(uint32_t i) [member function] - cls.add_method('RemoveRoute', - 'void', - [param('uint32_t', 'i')]) - ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-global-routing.h: ns3::Ptr ns3::Ipv4GlobalRouting::GetNode() const [member function] - cls.add_method('GetNode', - 'ns3::Ptr< ns3::Node >', - [], - is_const=True) - ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3Ipv4ListRoutingImpl_methods(root_module, cls): ## ipv4-list-routing-impl.h: ns3::Ipv4ListRoutingImpl::Ipv4ListRoutingImpl(ns3::Ipv4ListRoutingImpl const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4ListRoutingImpl const &', 'arg0')]) diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript index 16eb5a5fd..c9a4d2f7e 100644 --- a/src/internet-stack/wscript +++ b/src/internet-stack/wscript @@ -82,7 +82,6 @@ def build(bld): 'ipv4-l3-protocol.cc', 'ipv4-static-routing-impl.cc', 'ipv4-list-routing-impl.cc', - 'ipv4-global-routing.cc', 'ipv4-end-point.cc', 'udp-l4-protocol.cc', 'tcp-l4-protocol.cc', @@ -110,7 +109,6 @@ def build(bld): 'udp-header.h', 'tcp-header.h', 'sequence-number.h', - 'ipv4-global-routing.h', 'ipv4-list-routing-impl.h', 'ipv4-static-routing-impl.h', 'icmpv4.h', diff --git a/src/routing/global-routing/global-route-manager-impl.cc b/src/routing/global-routing/global-route-manager-impl.cc index 9587dd441..d311026c9 100644 --- a/src/routing/global-routing/global-route-manager-impl.cc +++ b/src/routing/global-routing/global-route-manager-impl.cc @@ -30,12 +30,12 @@ #include "ns3/log.h" #include "ns3/node-list.h" #include "ns3/ipv4.h" -#include "ns3/ipv4-global-routing.h" #include "ns3/ipv4-routing-protocol.h" #include "ns3/ipv4-list-routing.h" #include "global-router-interface.h" #include "global-route-manager-impl.h" #include "candidate-queue.h" +#include "ipv4-global-routing.h" NS_LOG_COMPONENT_DEFINE ("GlobalRouteManager"); diff --git a/src/internet-stack/ipv4-global-routing.cc b/src/routing/global-routing/ipv4-global-routing.cc similarity index 100% rename from src/internet-stack/ipv4-global-routing.cc rename to src/routing/global-routing/ipv4-global-routing.cc diff --git a/src/internet-stack/ipv4-global-routing.h b/src/routing/global-routing/ipv4-global-routing.h similarity index 100% rename from src/internet-stack/ipv4-global-routing.h rename to src/routing/global-routing/ipv4-global-routing.h diff --git a/src/routing/global-routing/wscript b/src/routing/global-routing/wscript index 483e5b5d0..22c62947c 100644 --- a/src/routing/global-routing/wscript +++ b/src/routing/global-routing/wscript @@ -7,6 +7,7 @@ def build(bld): 'global-route-manager.cc', 'global-route-manager-impl.cc', 'candidate-queue.cc', + 'ipv4-global-routing.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'global-routing'