# HG changeset patch # User Tom Henderson # Date 1243571929 25200 # Node ID 19e2b7ff34824caeb64b70e93e93dec3f3c15950 # Parent 39ac17168023b82e582e53b8814dd01cfd45a4b8 bindings/ changes for IPv4 routing rework diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_bridge.py --- a/bindings/python/ns3_module_bridge.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_bridge.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -20,6 +20,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -40,6 +46,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -254,6 +264,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -264,6 +275,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_common.py --- a/bindings/python/ns3_module_common.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_common.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -66,6 +66,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -86,6 +92,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -1115,6 +1125,7 @@ []) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -1125,6 +1136,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_contrib.py --- a/bindings/python/ns3_module_contrib.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_contrib.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -52,6 +52,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -72,6 +78,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -470,6 +480,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -480,6 +491,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_core.py --- a/bindings/python/ns3_module_core.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_core.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -186,6 +186,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -209,6 +215,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -1641,6 +1651,11 @@ 'ns3::Object::AggregateIterator', [], is_const=True) + ## object.h: void ns3::Object::NotifyNewAggregate() [member function] + cls.add_method('NotifyNewAggregate', + 'void', + [], + visibility='protected', is_virtual=True) ## object.h: void ns3::Object::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -2222,6 +2237,7 @@ template_parameters=['unsigned char']) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -2288,6 +2304,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): ## double.h: extern ns3::Ptr ns3::internal::MakeDoubleChecker(double min, double max, std::string name) [free function] module.add_function('MakeDoubleChecker', diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_csma.py --- a/bindings/python/ns3_module_csma.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_csma.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -28,6 +28,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -48,6 +54,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -414,6 +424,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -424,6 +435,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_emu.py --- a/bindings/python/ns3_module_emu.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_emu.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -18,6 +18,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -38,6 +44,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -206,6 +216,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -216,6 +227,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_global_routing.py --- a/bindings/python/ns3_module_global_routing.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_global_routing.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -30,6 +30,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -50,6 +56,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -287,6 +297,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -297,6 +308,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_helper.py --- a/bindings/python/ns3_module_helper.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_helper.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -17,6 +17,8 @@ module.add_class('Ipv4AddressHelper', allow_subclassing=False) ## ipv4-interface-container.h: ns3::Ipv4InterfaceContainer [class] module.add_class('Ipv4InterfaceContainer') + ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper [class] + module.add_class('Ipv4StaticRoutingHelper', allow_subclassing=False) ## mobility-helper.h: ns3::MobilityHelper [class] module.add_class('MobilityHelper', allow_subclassing=False) ## net-device-container.h: ns3::NetDeviceContainer [class] @@ -35,8 +37,6 @@ module.add_class('PacketSocketHelper', allow_subclassing=False) ## point-to-point-helper.h: ns3::PointToPointHelper [class] module.add_class('PointToPointHelper', allow_subclassing=False) - ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper [class] - module.add_class('StaticMulticastRouteHelper', allow_subclassing=False) ## tap-bridge-helper.h: ns3::TapBridgeHelper [class] module.add_class('TapBridgeHelper', allow_subclassing=False) ## udp-echo-helper.h: ns3::UdpEchoClientHelper [class] @@ -72,6 +72,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -92,6 +98,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -108,6 +118,7 @@ register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper']) register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper']) register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer']) + register_Ns3Ipv4StaticRoutingHelper_methods(root_module, root_module['ns3::Ipv4StaticRoutingHelper']) register_Ns3MobilityHelper_methods(root_module, root_module['ns3::MobilityHelper']) register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer']) register_Ns3NodeContainer_methods(root_module, root_module['ns3::NodeContainer']) @@ -117,7 +128,6 @@ register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper']) register_Ns3PacketSocketHelper_methods(root_module, root_module['ns3::PacketSocketHelper']) register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper']) - register_Ns3StaticMulticastRouteHelper_methods(root_module, root_module['ns3::StaticMulticastRouteHelper']) register_Ns3TapBridgeHelper_methods(root_module, root_module['ns3::TapBridgeHelper']) register_Ns3UdpEchoClientHelper_methods(root_module, root_module['ns3::UdpEchoClientHelper']) register_Ns3UdpEchoServerHelper_methods(root_module, root_module['ns3::UdpEchoServerHelper']) @@ -423,10 +433,14 @@ 'void', [param('ns3::NodeContainer', 'c')], is_const=True) - ## internet-stack-helper.h: void ns3::InternetStackHelper::SetNscStack(std::string soname) [member function] - cls.add_method('SetNscStack', + ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid) [member function] + cls.add_method('SetTcp', 'void', - [param('std::string', 'soname')]) + [param('std::string', 'tid')]) + ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid, std::string attr, ns3::AttributeValue const & val) [member function] + cls.add_method('SetTcp', + 'void', + [param('std::string', 'tid'), param('std::string', 'attr'), param('ns3::AttributeValue const &', 'val')]) ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function] cls.add_method('EnableAscii', 'void', @@ -500,6 +514,50 @@ [param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) return +def register_Ns3Ipv4StaticRoutingHelper_methods(root_module, cls): + ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper(ns3::Ipv4StaticRoutingHelper const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4StaticRoutingHelper const &', 'arg0')]) + ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper() [constructor] + cls.add_constructor([]) + ## ipv4-static-routing-helper.h: ns3::Ptr ns3::Ipv4StaticRoutingHelper::GetStaticRouting(ns3::Ptr ipv4) const [member function] + cls.add_method('GetStaticRouting', + 'ns3::Ptr< ns3::Ipv4StaticRouting >', + [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], + is_const=True) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(ns3::Ptr n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr input, ns3::NetDeviceContainer output) [member function] + cls.add_method('AddMulticastRoute', + 'void', + [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')]) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(std::string n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr input, ns3::NetDeviceContainer output) [member function] + cls.add_method('AddMulticastRoute', + 'void', + [param('std::string', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')]) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(ns3::Ptr n, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function] + cls.add_method('AddMulticastRoute', + 'void', + [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')]) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(std::string nName, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function] + cls.add_method('AddMulticastRoute', + 'void', + [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')]) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(ns3::Ptr n, ns3::Ptr nd) [member function] + cls.add_method('SetDefaultMulticastRoute', + 'void', + [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(ns3::Ptr n, std::string ndName) [member function] + cls.add_method('SetDefaultMulticastRoute', + 'void', + [param('ns3::Ptr< ns3::Node >', 'n'), param('std::string', 'ndName')]) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(std::string nName, ns3::Ptr nd) [member function] + cls.add_method('SetDefaultMulticastRoute', + 'void', + [param('std::string', 'nName'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) + ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(std::string nName, std::string ndName) [member function] + cls.add_method('SetDefaultMulticastRoute', + 'void', + [param('std::string', 'nName'), param('std::string', 'ndName')]) + return + def register_Ns3MobilityHelper_methods(root_module, cls): ## mobility-helper.h: ns3::MobilityHelper::MobilityHelper(ns3::MobilityHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::MobilityHelper const &', 'arg0')]) @@ -885,53 +943,6 @@ [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')]) return -def register_Ns3StaticMulticastRouteHelper_methods(root_module, cls): - ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper::StaticMulticastRouteHelper(ns3::StaticMulticastRouteHelper const & arg0) [copy constructor] - cls.add_constructor([param('ns3::StaticMulticastRouteHelper const &', 'arg0')]) - ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper::StaticMulticastRouteHelper() [constructor] - cls.add_constructor([]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(ns3::Ptr n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr input, ns3::NetDeviceContainer output) [member function] - cls.add_method('AddMulticastRoute', - 'void', - [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(std::string n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr input, ns3::NetDeviceContainer output) [member function] - cls.add_method('AddMulticastRoute', - 'void', - [param('std::string', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(ns3::Ptr n, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function] - cls.add_method('AddMulticastRoute', - 'void', - [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(std::string nName, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function] - cls.add_method('AddMulticastRoute', - 'void', - [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(ns3::Ptr n, ns3::Ptr nd) [member function] - cls.add_method('SetDefaultMulticastRoute', - 'void', - [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(ns3::Ptr n, std::string ndName) [member function] - cls.add_method('SetDefaultMulticastRoute', - 'void', - [param('ns3::Ptr< ns3::Node >', 'n'), param('std::string', 'ndName')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(std::string nName, ns3::Ptr nd) [member function] - cls.add_method('SetDefaultMulticastRoute', - 'void', - [param('std::string', 'nName'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(std::string nName, std::string ndName) [member function] - cls.add_method('SetDefaultMulticastRoute', - 'void', - [param('std::string', 'nName'), param('std::string', 'ndName')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::JoinMulticastGroup(ns3::Ptr n, ns3::Ipv4Address source, ns3::Ipv4Address group) [member function] - cls.add_method('JoinMulticastGroup', - 'void', - [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')]) - ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::JoinMulticastGroup(std::string nName, ns3::Ipv4Address source, ns3::Ipv4Address group) [member function] - cls.add_method('JoinMulticastGroup', - 'void', - [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')]) - return - def register_Ns3TapBridgeHelper_methods(root_module, cls): ## tap-bridge-helper.h: ns3::TapBridgeHelper::TapBridgeHelper(ns3::TapBridgeHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::TapBridgeHelper const &', 'arg0')]) @@ -1264,6 +1275,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -1274,6 +1286,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_internet_stack.py --- a/bindings/python/ns3_module_internet_stack.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_internet_stack.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -23,8 +23,12 @@ module.add_enum('Flags_t', ['NONE', 'FIN', 'SYN', 'RST', 'PSH', 'ACK', 'URG'], outer_class=root_module['ns3::TcpHeader']) ## udp-header.h: ns3::UdpHeader [class] 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']) ## Register a nested module for the namespace Config @@ -38,6 +42,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -58,6 +68,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -73,7 +87,9 @@ register_Ns3Icmpv4TimeExceeded_methods(root_module, root_module['ns3::Icmpv4TimeExceeded']) 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 def register_Ns3Icmpv4DestinationUnreachable_methods(root_module, cls): @@ -508,6 +524,118 @@ is_const=True) return +def register_Ns3Ipv4StaticRoutingImpl_methods(root_module, cls): + ## ipv4-static-routing-impl.h: ns3::Ipv4StaticRoutingImpl::Ipv4StaticRoutingImpl(ns3::Ipv4StaticRoutingImpl const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4StaticRoutingImpl const &', 'arg0')]) + ## ipv4-static-routing-impl.h: static ns3::TypeId ns3::Ipv4StaticRoutingImpl::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-static-routing-impl.h: ns3::Ipv4StaticRoutingImpl::Ipv4StaticRoutingImpl() [constructor] + cls.add_constructor([]) + ## ipv4-static-routing-impl.h: ns3::Ptr ns3::Ipv4StaticRoutingImpl::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-static-routing-impl.h: bool ns3::Ipv4StaticRoutingImpl::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-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::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')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function] + cls.add_method('AddHostRouteTo', + 'void', + [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::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')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::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')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function] + cls.add_method('SetDefaultRoute', + 'void', + [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], + is_virtual=True) + ## ipv4-static-routing-impl.h: uint32_t ns3::Ipv4StaticRoutingImpl::GetNRoutes() [member function] + cls.add_method('GetNRoutes', + 'uint32_t', + [], + is_virtual=True) + ## ipv4-static-routing-impl.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRoutingImpl::GetDefaultRoute() [member function] + cls.add_method('GetDefaultRoute', + 'ns3::Ipv4RoutingTableEntry', + [], + is_virtual=True) + ## ipv4-static-routing-impl.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRoutingImpl::GetRoute(uint32_t i) [member function] + cls.add_method('GetRoute', + 'ns3::Ipv4RoutingTableEntry', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::RemoveRoute(uint32_t i) [member function] + cls.add_method('RemoveRoute', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector > outputInterfaces) [member function] + cls.add_method('AddMulticastRoute', + 'void', + [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::SetDefaultMulticastRoute(uint32_t outputInterface) [member function] + cls.add_method('SetDefaultMulticastRoute', + 'void', + [param('uint32_t', 'outputInterface')], + is_virtual=True) + ## ipv4-static-routing-impl.h: uint32_t ns3::Ipv4StaticRoutingImpl::GetNMulticastRoutes() const [member function] + cls.add_method('GetNMulticastRoutes', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## ipv4-static-routing-impl.h: ns3::Ipv4MulticastRoutingTableEntry ns3::Ipv4StaticRoutingImpl::GetMulticastRoute(uint32_t i) const [member function] + cls.add_method('GetMulticastRoute', + 'ns3::Ipv4MulticastRoutingTableEntry', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-static-routing-impl.h: bool ns3::Ipv4StaticRoutingImpl::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function] + cls.add_method('RemoveMulticastRoute', + 'bool', + [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::RemoveMulticastRoute(uint32_t index) [member function] + cls.add_method('RemoveMulticastRoute', + 'void', + [param('uint32_t', 'index')], + is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_virtual=True) + ## ipv4-static-routing-impl.h: ns3::Ptr ns3::Ipv4StaticRoutingImpl::GetNode() const [member function] + cls.add_method('GetNode', + 'ns3::Ptr< ns3::Node >', + [], + is_const=True, is_virtual=True) + ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + 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')]) @@ -518,15 +646,15 @@ is_static=True) ## ipv4-global-routing.h: ns3::Ipv4GlobalRouting::Ipv4GlobalRouting() [constructor] cls.add_constructor([]) - ## ipv4-global-routing.h: bool ns3::Ipv4GlobalRouting::RequestRoute(uint32_t interface, ns3::Ipv4Header const & ipHeader, ns3::Ptr packet, ns3::Callback,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> routeReply) [member function] - cls.add_method('RequestRoute', - 'bool', - [param('uint32_t', 'interface'), param('ns3::Ipv4Header const &', 'ipHeader'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, ns3::Ipv4Route const &, ns3::Ptr< ns3::Packet >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'routeReply')], + ## 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::RequestInterface(ns3::Ipv4Address destination, uint32_t & interface) [member function] - cls.add_method('RequestInterface', + ## 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::Ipv4Address', 'destination'), param('uint32_t &', 'interface')], + [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', @@ -548,14 +676,23 @@ cls.add_method('GetNRoutes', 'uint32_t', []) - ## ipv4-global-routing.h: ns3::Ipv4Route * ns3::Ipv4GlobalRouting::GetRoute(uint32_t i) [member function] + ## ipv4-global-routing.h: ns3::Ipv4RoutingTableEntry * ns3::Ipv4GlobalRouting::GetRoute(uint32_t i) [member function] cls.add_method('GetRoute', - 'ns3::Ipv4Route *', + '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', @@ -563,18 +700,67 @@ 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')]) + ## ipv4-list-routing-impl.h: static ns3::TypeId ns3::Ipv4ListRoutingImpl::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-list-routing-impl.h: ns3::Ipv4ListRoutingImpl::Ipv4ListRoutingImpl() [constructor] + cls.add_constructor([]) + ## ipv4-list-routing-impl.h: ns3::Ptr ns3::Ipv4ListRoutingImpl::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-list-routing-impl.h: bool ns3::Ipv4ListRoutingImpl::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-list-routing-impl.h: void ns3::Ipv4ListRoutingImpl::AddRoutingProtocol(ns3::Ptr routingProtocol, int16_t priority) [member function] + cls.add_method('AddRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], + is_virtual=True) + ## ipv4-list-routing-impl.h: uint32_t ns3::Ipv4ListRoutingImpl::GetNRoutingProtocols() const [member function] + cls.add_method('GetNRoutingProtocols', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## ipv4-list-routing-impl.h: ns3::Ptr ns3::Ipv4ListRoutingImpl::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [param('uint32_t', 'index'), param('int16_t &', 'priority')], + is_const=True, is_virtual=True) + ## ipv4-list-routing-impl.h: ns3::Ptr ns3::Ipv4ListRoutingImpl::GetStaticRouting() const [member function] + cls.add_method('GetStaticRouting', + 'ns3::Ptr< ns3::Ipv4StaticRouting >', + [], + is_const=True, is_virtual=True) + ## ipv4-list-routing-impl.h: void ns3::Ipv4ListRoutingImpl::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-list-routing-impl.h: ns3::Ptr ns3::Ipv4ListRoutingImpl::GetNode() const [member function] + cls.add_method('GetNode', + 'ns3::Ptr< ns3::Node >', + [], + is_const=True) + ## ipv4-list-routing-impl.h: void ns3::Ipv4ListRoutingImpl::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + return + def register_functions(root_module): module = root_module - ## internet-stack.h: extern void ns3::AddInternetStack(ns3::Ptr node) [free function] - module.add_function('AddInternetStack', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## internet-stack.h: extern void ns3::AddNscInternetStack(ns3::Ptr node, std::string const & soname) [free function] - module.add_function('AddNscInternetStack', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string const &', 'soname')]) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -585,6 +771,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_mobility.py --- a/bindings/python/ns3_module_mobility.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_mobility.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -62,6 +62,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -82,6 +88,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -748,6 +758,7 @@ []) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -758,6 +769,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_node.py --- a/bindings/python/ns3_module_node.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_node.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -29,10 +29,10 @@ module.add_enum('InterfaceAddressScope_e', ['HOST', 'LINK', 'GLOBAL'], outer_class=root_module['ns3::Ipv4InterfaceAddress']) ## ipv4-address.h: ns3::Ipv4Mask [class] module.add_class('Ipv4Mask') - ## ipv4-route.h: ns3::Ipv4MulticastRoute [class] - module.add_class('Ipv4MulticastRoute') - ## ipv4-route.h: ns3::Ipv4Route [class] - module.add_class('Ipv4Route') + ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry [class] + module.add_class('Ipv4MulticastRoutingTableEntry') + ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry [class] + module.add_class('Ipv4RoutingTableEntry') ## ipv6-address.h: ns3::Ipv6Address [class] module.add_class('Ipv6Address') ## ipv6-address.h: ns3::Ipv6Address [class] @@ -63,6 +63,10 @@ module.add_class('Ipv4MaskChecker', parent=root_module['ns3::AttributeChecker']) ## ipv4-address.h: ns3::Ipv4MaskValue [class] module.add_class('Ipv4MaskValue', parent=root_module['ns3::AttributeValue']) + ## ipv4-route.h: ns3::Ipv4MulticastRoute [class] + module.add_class('Ipv4MulticastRoute', parent=root_module['ns3::RefCountBase']) + ## ipv4-route.h: ns3::Ipv4Route [class] + module.add_class('Ipv4Route', parent=root_module['ns3::RefCountBase']) ## ipv6-address.h: ns3::Ipv6AddressChecker [class] module.add_class('Ipv6AddressChecker', parent=root_module['ns3::AttributeChecker']) ## ipv6-address.h: ns3::Ipv6AddressValue [class] @@ -123,8 +127,10 @@ module.add_class('Ipv4', parent=root_module['ns3::Object']) ## ipv4-raw-socket-factory.h: ns3::Ipv4RawSocketFactory [class] module.add_class('Ipv4RawSocketFactory', parent=root_module['ns3::SocketFactory']) - ## ipv4.h: ns3::Ipv4RoutingProtocol [class] + ## ipv4-routing-protocol.h: ns3::Ipv4RoutingProtocol [class] module.add_class('Ipv4RoutingProtocol', parent=root_module['ns3::Object']) + ## ipv4-static-routing.h: ns3::Ipv4StaticRouting [class] + module.add_class('Ipv4StaticRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) ## net-device.h: ns3::NetDevice [class] module.add_class('NetDevice', parent=root_module['ns3::Object']) ## net-device.h: ns3::NetDevice::PacketType [enumeration] @@ -137,6 +143,8 @@ module.add_class('SimpleChannel', parent=root_module['ns3::Channel']) ## simple-net-device.h: ns3::SimpleNetDevice [class] module.add_class('SimpleNetDevice', parent=root_module['ns3::NetDevice']) + ## ipv4-list-routing.h: ns3::Ipv4ListRouting [class] + module.add_class('Ipv4ListRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set') module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector') @@ -152,6 +160,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -172,6 +186,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -188,8 +206,8 @@ register_Ns3Ipv4AddressGenerator_methods(root_module, root_module['ns3::Ipv4AddressGenerator']) register_Ns3Ipv4InterfaceAddress_methods(root_module, root_module['ns3::Ipv4InterfaceAddress']) register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) - register_Ns3Ipv4MulticastRoute_methods(root_module, root_module['ns3::Ipv4MulticastRoute']) - register_Ns3Ipv4Route_methods(root_module, root_module['ns3::Ipv4Route']) + register_Ns3Ipv4MulticastRoutingTableEntry_methods(root_module, root_module['ns3::Ipv4MulticastRoutingTableEntry']) + register_Ns3Ipv4RoutingTableEntry_methods(root_module, root_module['ns3::Ipv4RoutingTableEntry']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) @@ -201,6 +219,8 @@ register_Ns3Ipv4Header_methods(root_module, root_module['ns3::Ipv4Header']) register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker']) register_Ns3Ipv4MaskValue_methods(root_module, root_module['ns3::Ipv4MaskValue']) + register_Ns3Ipv4MulticastRoute_methods(root_module, root_module['ns3::Ipv4MulticastRoute']) + register_Ns3Ipv4Route_methods(root_module, root_module['ns3::Ipv4Route']) register_Ns3Ipv6AddressChecker_methods(root_module, root_module['ns3::Ipv6AddressChecker']) register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) register_Ns3Ipv6Header_methods(root_module, root_module['ns3::Ipv6Header']) @@ -229,11 +249,13 @@ register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4']) register_Ns3Ipv4RawSocketFactory_methods(root_module, root_module['ns3::Ipv4RawSocketFactory']) register_Ns3Ipv4RoutingProtocol_methods(root_module, root_module['ns3::Ipv4RoutingProtocol']) + register_Ns3Ipv4StaticRouting_methods(root_module, root_module['ns3::Ipv4StaticRouting']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) register_Ns3PacketSocketFactory_methods(root_module, root_module['ns3::PacketSocketFactory']) register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice']) + register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting']) return def register_Ns3Address_methods(root_module, cls): @@ -664,125 +686,125 @@ [param('uint32_t', 'mask')]) return -def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): +def register_Ns3Ipv4MulticastRoutingTableEntry_methods(root_module, cls): cls.add_output_stream_operator() - ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute() [constructor] + ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry::Ipv4MulticastRoutingTableEntry() [constructor] cls.add_constructor([]) - ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute(ns3::Ipv4MulticastRoute const & route) [copy constructor] - cls.add_constructor([param('ns3::Ipv4MulticastRoute const &', 'route')]) - ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute(ns3::Ipv4MulticastRoute const * route) [constructor] - cls.add_constructor([param('ns3::Ipv4MulticastRoute const *', 'route')]) - ## ipv4-route.h: static ns3::Ipv4MulticastRoute ns3::Ipv4MulticastRoute::CreateMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector > outputInterfaces) [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry::Ipv4MulticastRoutingTableEntry(ns3::Ipv4MulticastRoutingTableEntry const & route) [copy constructor] + cls.add_constructor([param('ns3::Ipv4MulticastRoutingTableEntry const &', 'route')]) + ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry::Ipv4MulticastRoutingTableEntry(ns3::Ipv4MulticastRoutingTableEntry const * route) [constructor] + cls.add_constructor([param('ns3::Ipv4MulticastRoutingTableEntry const *', 'route')]) + ## ipv4-routing-table-entry.h: static ns3::Ipv4MulticastRoutingTableEntry ns3::Ipv4MulticastRoutingTableEntry::CreateMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector > outputInterfaces) [member function] cls.add_method('CreateMulticastRoute', - 'ns3::Ipv4MulticastRoute', + 'ns3::Ipv4MulticastRoutingTableEntry', [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], is_static=True) - ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetGroup() const [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4MulticastRoutingTableEntry::GetGroup() const [member function] cls.add_method('GetGroup', 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetInputInterface() const [member function] + ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4MulticastRoutingTableEntry::GetInputInterface() const [member function] cls.add_method('GetInputInterface', 'uint32_t', [], is_const=True) - ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetNOutputInterfaces() const [member function] + ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4MulticastRoutingTableEntry::GetNOutputInterfaces() const [member function] cls.add_method('GetNOutputInterfaces', 'uint32_t', [], is_const=True) - ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetOrigin() const [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4MulticastRoutingTableEntry::GetOrigin() const [member function] cls.add_method('GetOrigin', 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetOutputInterface(uint32_t n) const [member function] + ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4MulticastRoutingTableEntry::GetOutputInterface(uint32_t n) const [member function] cls.add_method('GetOutputInterface', 'uint32_t', [param('uint32_t', 'n')], is_const=True) - ## ipv4-route.h: std::vector > ns3::Ipv4MulticastRoute::GetOutputInterfaces() const [member function] + ## ipv4-routing-table-entry.h: std::vector > ns3::Ipv4MulticastRoutingTableEntry::GetOutputInterfaces() const [member function] cls.add_method('GetOutputInterfaces', 'std::vector< unsigned int >', [], is_const=True) return -def register_Ns3Ipv4Route_methods(root_module, cls): +def register_Ns3Ipv4RoutingTableEntry_methods(root_module, cls): cls.add_output_stream_operator() - ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route() [constructor] + ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry::Ipv4RoutingTableEntry() [constructor] cls.add_constructor([]) - ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route(ns3::Ipv4Route const & route) [copy constructor] - cls.add_constructor([param('ns3::Ipv4Route const &', 'route')]) - ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route(ns3::Ipv4Route const * route) [constructor] - cls.add_constructor([param('ns3::Ipv4Route const *', 'route')]) - ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry::Ipv4RoutingTableEntry(ns3::Ipv4RoutingTableEntry const & route) [copy constructor] + cls.add_constructor([param('ns3::Ipv4RoutingTableEntry const &', 'route')]) + ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry::Ipv4RoutingTableEntry(ns3::Ipv4RoutingTableEntry const * route) [constructor] + cls.add_constructor([param('ns3::Ipv4RoutingTableEntry const *', 'route')]) + ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function] cls.add_method('CreateDefaultRoute', - 'ns3::Ipv4Route', + 'ns3::Ipv4RoutingTableEntry', [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], is_static=True) - ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function] + ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function] cls.add_method('CreateHostRouteTo', - 'ns3::Ipv4Route', + 'ns3::Ipv4RoutingTableEntry', [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], is_static=True) - ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function] + ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function] cls.add_method('CreateHostRouteTo', - 'ns3::Ipv4Route', + 'ns3::Ipv4RoutingTableEntry', [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], is_static=True) - ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function] + ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function] cls.add_method('CreateNetworkRouteTo', - 'ns3::Ipv4Route', + 'ns3::Ipv4RoutingTableEntry', [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], is_static=True) - ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function] + ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function] cls.add_method('CreateNetworkRouteTo', - 'ns3::Ipv4Route', + 'ns3::Ipv4RoutingTableEntry', [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')], is_static=True) - ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetDest() const [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4RoutingTableEntry::GetDest() const [member function] cls.add_method('GetDest', 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetDestNetwork() const [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4RoutingTableEntry::GetDestNetwork() const [member function] cls.add_method('GetDestNetwork', 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h: ns3::Ipv4Mask ns3::Ipv4Route::GetDestNetworkMask() const [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4Mask ns3::Ipv4RoutingTableEntry::GetDestNetworkMask() const [member function] cls.add_method('GetDestNetworkMask', 'ns3::Ipv4Mask', [], is_const=True) - ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetGateway() const [member function] + ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4RoutingTableEntry::GetGateway() const [member function] cls.add_method('GetGateway', 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h: uint32_t ns3::Ipv4Route::GetInterface() const [member function] + ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4RoutingTableEntry::GetInterface() const [member function] cls.add_method('GetInterface', 'uint32_t', [], is_const=True) - ## ipv4-route.h: bool ns3::Ipv4Route::IsDefault() const [member function] + ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsDefault() const [member function] cls.add_method('IsDefault', 'bool', [], is_const=True) - ## ipv4-route.h: bool ns3::Ipv4Route::IsGateway() const [member function] + ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsGateway() const [member function] cls.add_method('IsGateway', 'bool', [], is_const=True) - ## ipv4-route.h: bool ns3::Ipv4Route::IsHost() const [member function] + ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsHost() const [member function] cls.add_method('IsHost', 'bool', [], is_const=True) - ## ipv4-route.h: bool ns3::Ipv4Route::IsNetwork() const [member function] + ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsNetwork() const [member function] cls.add_method('IsNetwork', 'bool', [], @@ -1403,6 +1425,97 @@ is_virtual=True) return +def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): + ## ipv4-route.h: ns3::Ipv4MulticastRoute::MAX_INTERFACES [variable] + cls.add_static_attribute('MAX_INTERFACES', 'uint32_t const', is_const=True) + ## ipv4-route.h: ns3::Ipv4MulticastRoute::MAX_TTL [variable] + cls.add_static_attribute('MAX_TTL', 'uint32_t const', is_const=True) + ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute(ns3::Ipv4MulticastRoute const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4MulticastRoute const &', 'arg0')]) + ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute() [constructor] + cls.add_constructor([]) + ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetGroup(ns3::Ipv4Address const group) [member function] + cls.add_method('SetGroup', + 'void', + [param('ns3::Ipv4Address const', 'group')]) + ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetGroup() const [member function] + cls.add_method('GetGroup', + 'ns3::Ipv4Address', + [], + is_const=True) + ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetOrigin(ns3::Ipv4Address const group) [member function] + cls.add_method('SetOrigin', + 'void', + [param('ns3::Ipv4Address const', 'group')]) + ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetOrigin() const [member function] + cls.add_method('GetOrigin', + 'ns3::Ipv4Address', + [], + is_const=True) + ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetParent(uint32_t iif) [member function] + cls.add_method('SetParent', + 'void', + [param('uint32_t', 'iif')]) + ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] + cls.add_method('GetParent', + 'uint32_t', + [], + is_const=True) + ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetOutputTtl(uint32_t oif, uint32_t ttl) [member function] + cls.add_method('SetOutputTtl', + 'void', + [param('uint32_t', 'oif'), param('uint32_t', 'ttl')]) + ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + cls.add_method('GetOutputTtl', + 'uint32_t', + [param('uint32_t', 'oif')], + is_const=True) + return + +def register_Ns3Ipv4Route_methods(root_module, cls): + cls.add_output_stream_operator() + ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route(ns3::Ipv4Route const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4Route const &', 'arg0')]) + ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route() [constructor] + cls.add_constructor([]) + ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetDestination() const [member function] + cls.add_method('GetDestination', + 'ns3::Ipv4Address', + [], + is_const=True) + ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetGateway() const [member function] + cls.add_method('GetGateway', + 'ns3::Ipv4Address', + [], + is_const=True) + ## ipv4-route.h: ns3::Ptr ns3::Ipv4Route::GetOutputDevice() const [member function] + cls.add_method('GetOutputDevice', + 'ns3::Ptr< ns3::NetDevice >', + [], + is_const=True) + ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetSource() const [member function] + cls.add_method('GetSource', + 'ns3::Ipv4Address', + [], + is_const=True) + ## ipv4-route.h: void ns3::Ipv4Route::SetDestination(ns3::Ipv4Address dest) [member function] + cls.add_method('SetDestination', + 'void', + [param('ns3::Ipv4Address', 'dest')]) + ## ipv4-route.h: void ns3::Ipv4Route::SetGateway(ns3::Ipv4Address gw) [member function] + cls.add_method('SetGateway', + 'void', + [param('ns3::Ipv4Address', 'gw')]) + ## ipv4-route.h: void ns3::Ipv4Route::SetOutputDevice(ns3::Ptr outputDevice) [member function] + cls.add_method('SetOutputDevice', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'outputDevice')]) + ## ipv4-route.h: void ns3::Ipv4Route::SetSource(ns3::Ipv4Address src) [member function] + cls.add_method('SetSource', + 'void', + [param('ns3::Ipv4Address', 'src')]) + return + def register_Ns3Ipv6AddressChecker_methods(root_module, cls): ## ipv6-address.h: ns3::Ipv6AddressChecker::Ipv6AddressChecker(ns3::Ipv6AddressChecker const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv6AddressChecker const &', 'arg0')]) @@ -2219,6 +2332,16 @@ is_static=True) ## udp-socket.h: ns3::UdpSocket::UdpSocket() [constructor] cls.add_constructor([]) + ## udp-socket.h: int ns3::UdpSocket::MulticastJoinGroup(uint32_t interface, ns3::Address const & groupAddress) [member function] + cls.add_method('MulticastJoinGroup', + 'int', + [param('uint32_t', 'interface'), param('ns3::Address const &', 'groupAddress')], + is_pure_virtual=True, is_virtual=True) + ## udp-socket.h: int ns3::UdpSocket::MulticastLeaveGroup(uint32_t interface, ns3::Address const & groupAddress) [member function] + cls.add_method('MulticastLeaveGroup', + 'int', + [param('uint32_t', 'interface'), param('ns3::Address const &', 'groupAddress')], + is_pure_virtual=True, is_virtual=True) ## udp-socket.h: void ns3::UdpSocket::SetRcvBufSize(uint32_t size) [member function] cls.add_method('SetRcvBufSize', 'void', @@ -2229,24 +2352,44 @@ 'uint32_t', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) - ## udp-socket.h: void ns3::UdpSocket::SetIpTtl(uint32_t ipTtl) [member function] + ## udp-socket.h: void ns3::UdpSocket::SetIpTtl(uint8_t ipTtl) [member function] cls.add_method('SetIpTtl', 'void', - [param('uint32_t', 'ipTtl')], + [param('uint8_t', 'ipTtl')], is_pure_virtual=True, visibility='private', is_virtual=True) - ## udp-socket.h: uint32_t ns3::UdpSocket::GetIpTtl() const [member function] + ## udp-socket.h: uint8_t ns3::UdpSocket::GetIpTtl() const [member function] cls.add_method('GetIpTtl', - 'uint32_t', + 'uint8_t', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastTtl(uint8_t ipTtl) [member function] + cls.add_method('SetIpMulticastTtl', + 'void', + [param('uint8_t', 'ipTtl')], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## udp-socket.h: uint8_t ns3::UdpSocket::GetIpMulticastTtl() const [member function] + cls.add_method('GetIpMulticastTtl', + 'uint8_t', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) - ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastTtl(uint32_t ipTtl) [member function] - cls.add_method('SetIpMulticastTtl', + ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastIf(int32_t ipIf) [member function] + cls.add_method('SetIpMulticastIf', 'void', - [param('uint32_t', 'ipTtl')], + [param('int32_t', 'ipIf')], is_pure_virtual=True, visibility='private', is_virtual=True) - ## udp-socket.h: uint32_t ns3::UdpSocket::GetIpMulticastTtl() const [member function] - cls.add_method('GetIpMulticastTtl', - 'uint32_t', + ## udp-socket.h: int32_t ns3::UdpSocket::GetIpMulticastIf() const [member function] + cls.add_method('GetIpMulticastIf', + 'int32_t', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastLoop(bool loop) [member function] + cls.add_method('SetIpMulticastLoop', + 'void', + [param('bool', 'loop')], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## udp-socket.h: bool ns3::UdpSocket::GetIpMulticastLoop() const [member function] + cls.add_method('GetIpMulticastLoop', + 'bool', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) ## udp-socket.h: void ns3::UdpSocket::SetMtuDiscover(bool discover) [member function] @@ -2572,6 +2715,8 @@ return def register_Ns3Ipv4_methods(root_module, cls): + ## ipv4.h: ns3::Ipv4::IF_ANY [variable] + cls.add_static_attribute('IF_ANY', 'uint32_t const', is_const=True) ## ipv4.h: ns3::Ipv4::Ipv4(ns3::Ipv4 const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4 const &', 'arg0')]) ## ipv4.h: static ns3::TypeId ns3::Ipv4::GetTypeId() [member function] @@ -2581,81 +2726,16 @@ is_static=True) ## ipv4.h: ns3::Ipv4::Ipv4() [constructor] cls.add_constructor([]) - ## ipv4.h: void ns3::Ipv4::AddRoutingProtocol(ns3::Ptr routingProtocol, int16_t priority) [member function] - cls.add_method('AddRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::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')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function] - cls.add_method('AddHostRouteTo', + ## ipv4.h: void ns3::Ipv4::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', 'void', - [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::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')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::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')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function] - cls.add_method('SetDefaultRoute', - 'void', - [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], is_pure_virtual=True, is_virtual=True) - ## ipv4.h: uint32_t ns3::Ipv4::GetNRoutes() [member function] - cls.add_method('GetNRoutes', - 'uint32_t', - [], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: ns3::Ipv4Route ns3::Ipv4::GetRoute(uint32_t i) [member function] - cls.add_method('GetRoute', - 'ns3::Ipv4Route', - [param('uint32_t', 'i')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::RemoveRoute(uint32_t i) [member function] - cls.add_method('RemoveRoute', - 'void', - [param('uint32_t', 'i')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector > outputInterfaces) [member function] - cls.add_method('AddMulticastRoute', - 'void', - [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function] - cls.add_method('RemoveMulticastRoute', - 'void', - [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::SetDefaultMulticastRoute(uint32_t outputInterface) [member function] - cls.add_method('SetDefaultMulticastRoute', - 'void', - [param('uint32_t', 'outputInterface')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: uint32_t ns3::Ipv4::GetNMulticastRoutes() const [member function] - cls.add_method('GetNMulticastRoutes', - 'uint32_t', + ## ipv4.h: ns3::Ptr ns3::Ipv4::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', [], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: ns3::Ipv4MulticastRoute ns3::Ipv4::GetMulticastRoute(uint32_t i) const [member function] - cls.add_method('GetMulticastRoute', - 'ns3::Ipv4MulticastRoute', - [param('uint32_t', 'i')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::RemoveMulticastRoute(uint32_t i) [member function] - cls.add_method('RemoveMulticastRoute', - 'void', - [param('uint32_t', 'i')], - is_pure_virtual=True, is_virtual=True) ## ipv4.h: uint32_t ns3::Ipv4::AddInterface(ns3::Ptr device) [member function] cls.add_method('AddInterface', 'uint32_t', @@ -2666,36 +2746,26 @@ 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: uint32_t ns3::Ipv4::FindInterfaceForAddr(ns3::Ipv4Address addr) const [member function] - cls.add_method('FindInterfaceForAddr', - 'uint32_t', - [param('ns3::Ipv4Address', 'addr')], + ## ipv4.h: int32_t ns3::Ipv4::GetInterfaceForAddress(ns3::Ipv4Address address) const [member function] + cls.add_method('GetInterfaceForAddress', + 'int32_t', + [param('ns3::Ipv4Address', 'address')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: uint32_t ns3::Ipv4::FindInterfaceForAddr(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('FindInterfaceForAddr', - 'uint32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], + ## ipv4.h: int32_t ns3::Ipv4::GetInterfaceForPrefix(ns3::Ipv4Address address, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'address'), param('ns3::Ipv4Mask', 'mask')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: int32_t ns3::Ipv4::FindInterfaceForDevice(ns3::Ptr nd) const [member function] - cls.add_method('FindInterfaceForDevice', - 'int32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'nd')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: ns3::Ptr ns3::Ipv4::GetNetDevice(uint32_t i) [member function] + ## ipv4.h: ns3::Ptr ns3::Ipv4::GetNetDevice(uint32_t interface) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', - [param('uint32_t', 'i')], + [param('uint32_t', 'interface')], is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::JoinMulticastGroup(ns3::Ipv4Address origin, ns3::Ipv4Address group) [member function] - cls.add_method('JoinMulticastGroup', - 'void', - [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')], - is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::LeaveMulticastGroup(ns3::Ipv4Address origin, ns3::Ipv4Address group) [member function] - cls.add_method('LeaveMulticastGroup', - 'void', - [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')], - is_pure_virtual=True, is_virtual=True) + ## ipv4.h: int32_t ns3::Ipv4::GetInterfaceForDevice(ns3::Ptr device) const [member function] + cls.add_method('GetInterfaceForDevice', + 'int32_t', + [param('ns3::Ptr< ns3::NetDevice const >', 'device')], + is_pure_virtual=True, is_const=True, is_virtual=True) ## ipv4.h: uint32_t ns3::Ipv4::AddAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function] cls.add_method('AddAddress', 'uint32_t', @@ -2711,51 +2781,46 @@ 'ns3::Ipv4InterfaceAddress', [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::SetMetric(uint32_t i, uint16_t metric) [member function] + ## ipv4.h: void ns3::Ipv4::SetMetric(uint32_t interface, uint16_t metric) [member function] cls.add_method('SetMetric', 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], + [param('uint32_t', 'interface'), param('uint16_t', 'metric')], is_pure_virtual=True, is_virtual=True) - ## ipv4.h: uint16_t ns3::Ipv4::GetMetric(uint32_t i) const [member function] + ## ipv4.h: uint16_t ns3::Ipv4::GetMetric(uint32_t interface) const [member function] cls.add_method('GetMetric', 'uint16_t', - [param('uint32_t', 'i')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: ns3::Ipv4Address ns3::Ipv4::GetSourceAddress(ns3::Ipv4Address destination) const [member function] - cls.add_method('GetSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ipv4Address', 'destination')], + [param('uint32_t', 'interface')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: bool ns3::Ipv4::GetInterfaceForDestination(ns3::Ipv4Address dest, uint32_t & interface) const [member function] - cls.add_method('GetInterfaceForDestination', - 'bool', - [param('ns3::Ipv4Address', 'dest'), param('uint32_t &', 'interface')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: uint16_t ns3::Ipv4::GetMtu(uint32_t i) const [member function] + ## ipv4.h: uint16_t ns3::Ipv4::GetMtu(uint32_t interface) const [member function] cls.add_method('GetMtu', 'uint16_t', - [param('uint32_t', 'i')], + [param('uint32_t', 'interface')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: bool ns3::Ipv4::IsUp(uint32_t i) const [member function] + ## ipv4.h: bool ns3::Ipv4::IsUp(uint32_t interface) const [member function] cls.add_method('IsUp', 'bool', - [param('uint32_t', 'i')], + [param('uint32_t', 'interface')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::SetUp(uint32_t i) [member function] + ## ipv4.h: void ns3::Ipv4::SetUp(uint32_t interface) [member function] cls.add_method('SetUp', 'void', - [param('uint32_t', 'i')], + [param('uint32_t', 'interface')], is_pure_virtual=True, is_virtual=True) - ## ipv4.h: void ns3::Ipv4::SetDown(uint32_t i) [member function] + ## ipv4.h: void ns3::Ipv4::SetDown(uint32_t interface) [member function] cls.add_method('SetDown', 'void', - [param('uint32_t', 'i')], + [param('uint32_t', 'interface')], is_pure_virtual=True, is_virtual=True) - ## ipv4.h: uint32_t ns3::Ipv4::GetInterfaceByAddress(ns3::Ipv4Address addr, ns3::Ipv4Mask mask=ns3::Ipv4Mask(((const char*)"255.255.255.255"))) [member function] - cls.add_method('GetInterfaceByAddress', - 'uint32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask', default_value='ns3::Ipv4Mask(((const char*)"255.255.255.255"))')], - is_virtual=True) + ## ipv4.h: void ns3::Ipv4::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## ipv4.h: bool ns3::Ipv4::GetIpForward() const [member function] + cls.add_method('GetIpForward', + 'bool', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) return def register_Ns3Ipv4RawSocketFactory_methods(root_module, cls): @@ -2771,22 +2836,122 @@ return def register_Ns3Ipv4RoutingProtocol_methods(root_module, cls): - ## ipv4.h: ns3::Ipv4RoutingProtocol::INTERFACE_ANY [variable] - cls.add_static_attribute('INTERFACE_ANY', 'uint32_t const', is_const=True) - ## ipv4.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol(ns3::Ipv4RoutingProtocol const & arg0) [copy constructor] + ## ipv4-routing-protocol.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol(ns3::Ipv4RoutingProtocol const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4RoutingProtocol const &', 'arg0')]) - ## ipv4.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol() [constructor] + ## ipv4-routing-protocol.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol() [constructor] + cls.add_constructor([]) + ## ipv4-routing-protocol.h: static ns3::TypeId ns3::Ipv4RoutingProtocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-routing-protocol.h: ns3::Ptr ns3::Ipv4RoutingProtocol::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_pure_virtual=True, is_virtual=True) + ## ipv4-routing-protocol.h: bool ns3::Ipv4RoutingProtocol::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_pure_virtual=True, is_virtual=True) + return + +def register_Ns3Ipv4StaticRouting_methods(root_module, cls): + ## ipv4-static-routing.h: ns3::Ipv4StaticRouting::Ipv4StaticRouting(ns3::Ipv4StaticRouting const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4StaticRouting const &', 'arg0')]) + ## ipv4-static-routing.h: ns3::Ipv4StaticRouting::Ipv4StaticRouting() [constructor] cls.add_constructor([]) - ## ipv4.h: bool ns3::Ipv4RoutingProtocol::RequestRoute(uint32_t interface, ns3::Ipv4Header const & ipHeader, ns3::Ptr packet, ns3::Callback,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> routeReply) [member function] - cls.add_method('RequestRoute', - 'bool', - [param('uint32_t', 'interface'), param('ns3::Ipv4Header const &', 'ipHeader'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, ns3::Ipv4Route const &, ns3::Ptr< ns3::Packet >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'routeReply')], + ## ipv4-static-routing.h: static ns3::TypeId ns3::Ipv4StaticRouting::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::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')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function] + cls.add_method('AddHostRouteTo', + 'void', + [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::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')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::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')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function] + cls.add_method('SetDefaultRoute', + 'void', + [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: uint32_t ns3::Ipv4StaticRouting::GetNRoutes() [member function] + cls.add_method('GetNRoutes', + 'uint32_t', + [], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRouting::GetDefaultRoute() [member function] + cls.add_method('GetDefaultRoute', + 'ns3::Ipv4RoutingTableEntry', + [], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRouting::GetRoute(uint32_t i) [member function] + cls.add_method('GetRoute', + 'ns3::Ipv4RoutingTableEntry', + [param('uint32_t', 'i')], is_pure_virtual=True, is_virtual=True) - ## ipv4.h: bool ns3::Ipv4RoutingProtocol::RequestInterface(ns3::Ipv4Address destination, uint32_t & interface) [member function] - cls.add_method('RequestInterface', + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::RemoveRoute(uint32_t i) [member function] + cls.add_method('RemoveRoute', + 'void', + [param('uint32_t', 'i')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector > outputInterfaces) [member function] + cls.add_method('AddMulticastRoute', + 'void', + [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetDefaultMulticastRoute(uint32_t outputInterface) [member function] + cls.add_method('SetDefaultMulticastRoute', + 'void', + [param('uint32_t', 'outputInterface')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: uint32_t ns3::Ipv4StaticRouting::GetNMulticastRoutes() const [member function] + cls.add_method('GetNMulticastRoutes', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## ipv4-static-routing.h: ns3::Ipv4MulticastRoutingTableEntry ns3::Ipv4StaticRouting::GetMulticastRoute(uint32_t i) const [member function] + cls.add_method('GetMulticastRoute', + 'ns3::Ipv4MulticastRoutingTableEntry', + [param('uint32_t', 'i')], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## ipv4-static-routing.h: bool ns3::Ipv4StaticRouting::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function] + cls.add_method('RemoveMulticastRoute', 'bool', - [param('ns3::Ipv4Address', 'destination'), param('uint32_t &', 'interface')], + [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::RemoveMulticastRoute(uint32_t index) [member function] + cls.add_method('RemoveMulticastRoute', + 'void', + [param('uint32_t', 'index')], is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-static-routing.h: ns3::Ptr ns3::Ipv4StaticRouting::GetNode() const [member function] + cls.add_method('GetNode', + 'ns3::Ptr< ns3::Node >', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) return def register_Ns3NetDevice_methods(root_module, cls): @@ -3177,6 +3342,33 @@ visibility='protected', is_virtual=True) return +def register_Ns3Ipv4ListRouting_methods(root_module, cls): + ## ipv4-list-routing.h: ns3::Ipv4ListRouting::Ipv4ListRouting(ns3::Ipv4ListRouting const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4ListRouting const &', 'arg0')]) + ## ipv4-list-routing.h: ns3::Ipv4ListRouting::Ipv4ListRouting() [constructor] + cls.add_constructor([]) + ## ipv4-list-routing.h: static ns3::TypeId ns3::Ipv4ListRouting::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-list-routing.h: void ns3::Ipv4ListRouting::AddRoutingProtocol(ns3::Ptr routingProtocol, int16_t priority) [member function] + cls.add_method('AddRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], + is_pure_virtual=True, is_virtual=True) + ## ipv4-list-routing.h: uint32_t ns3::Ipv4ListRouting::GetNRoutingProtocols() const [member function] + cls.add_method('GetNRoutingProtocols', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## ipv4-list-routing.h: ns3::Ptr ns3::Ipv4ListRouting::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [param('uint32_t', 'index'), param('int16_t &', 'priority')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_functions(root_module): module = root_module ## address.h: extern ns3::Ptr ns3::MakeAddressChecker() [free function] @@ -3237,6 +3429,7 @@ [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address', 'ad')]) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -3247,6 +3440,13 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + ## address-utils.h: extern bool ns3::addressUtils::IsMulticast(ns3::Address const & ad) [free function] + module.add_function('IsMulticast', + 'bool', + [param('ns3::Address const &', 'ad')]) + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_olsr.py --- a/bindings/python/ns3_module_olsr.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_olsr.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -24,6 +24,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -44,6 +50,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -91,6 +101,15 @@ module.add_class('TwoHopNeighborTuple') module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector') module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector') + typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet') + typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList') + typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet') def register_methods(root_module): register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState']) @@ -740,15 +759,15 @@ cls.add_method('SetMainInterface', 'void', [param('uint32_t', 'interface')]) - ## olsr-routing-protocol.h: bool ns3::olsr::RoutingProtocol::RequestRoute(uint32_t ifIndex, ns3::Ipv4Header const & ipHeader, ns3::Ptr packet, ns3::Callback,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> routeReply) [member function] - cls.add_method('RequestRoute', - 'bool', - [param('uint32_t', 'ifIndex'), param('ns3::Ipv4Header const &', 'ipHeader'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, ns3::Ipv4Route const &, ns3::Ptr< ns3::Packet >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'routeReply')], + ## olsr-routing-protocol.h: ns3::Ptr ns3::olsr::RoutingProtocol::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')], visibility='private', is_virtual=True) - ## olsr-routing-protocol.h: bool ns3::olsr::RoutingProtocol::RequestInterface(ns3::Ipv4Address destination, uint32_t & ifIndex) [member function] - cls.add_method('RequestInterface', + ## olsr-routing-protocol.h: bool ns3::olsr::RoutingProtocol::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::Ipv4Address', 'destination'), param('uint32_t &', 'ifIndex')], + [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')], visibility='private', is_virtual=True) ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::DoDispose() [member function] cls.add_method('DoDispose', @@ -808,6 +827,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -818,6 +838,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_onoff.py --- a/bindings/python/ns3_module_onoff.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_onoff.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -18,6 +18,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -38,6 +44,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -85,6 +95,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -95,6 +106,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_packet_sink.py --- a/bindings/python/ns3_module_packet_sink.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_packet_sink.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -18,6 +18,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -38,6 +44,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -81,6 +91,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -91,6 +102,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_point_to_point.py --- a/bindings/python/ns3_module_point_to_point.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_point_to_point.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -22,6 +22,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -42,6 +48,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -301,6 +311,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -311,6 +322,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_simulator.py --- a/bindings/python/ns3_module_simulator.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_simulator.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -61,6 +61,10 @@ module.add_class('RealtimeSimulatorImpl', parent=root_module['ns3::SimulatorImpl']) ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration] module.add_enum('SynchronizationMode', ['SYNC_BEST_EFFORT', 'SYNC_HARD_LIMIT'], outer_class=root_module['ns3::RealtimeSimulatorImpl']) + typehandlers.add_type_alias('ns3::TimeUnit< 2 >', 'ns3::TimeSquare') + typehandlers.add_type_alias('ns3::TimeUnit< - 1 >', 'ns3::TimeInvert') + typehandlers.add_type_alias('ns3::TimeUnit< 0 >', 'ns3::Scalar') + typehandlers.add_type_alias('ns3::TimeUnit< 1 >', 'ns3::Time') ## Register a nested module for the namespace Config @@ -74,6 +78,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -96,6 +106,10 @@ ## nstime.h: ns3::TimeStepPrecision::precision_t [enumeration] module.add_enum('precision_t', ['S', 'MS', 'US', 'NS', 'PS', 'FS']) +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -1530,6 +1544,7 @@ [param('uint64_t', 'ts')]) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -1548,6 +1563,9 @@ [param('ns3::TimeStepPrecision::precision_t', 'precision')]) return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_stats.py --- a/bindings/python/ns3_module_stats.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_stats.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -25,6 +25,8 @@ module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator']) ## packet-data-calculators.h: ns3::PacketCounterCalculator [class] module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >']) + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') + typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList') ## Register a nested module for the namespace Config @@ -38,6 +40,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -58,6 +66,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -419,6 +431,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -429,6 +442,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_tap_bridge.py --- a/bindings/python/ns3_module_tap_bridge.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_tap_bridge.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -20,6 +20,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -40,6 +46,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -217,6 +227,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -227,6 +238,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_udp_echo.py --- a/bindings/python/ns3_module_udp_echo.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_udp_echo.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -20,6 +20,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -40,6 +46,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -115,6 +125,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -125,6 +136,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_v4ping.py --- a/bindings/python/ns3_module_v4ping.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_v4ping.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -18,6 +18,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -38,6 +44,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -81,6 +91,7 @@ module = root_module register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -91,6 +102,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3_module_wifi.py --- a/bindings/python/ns3_module_wifi.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3_module_wifi.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers def register_types(module): root_module = module.get_root() @@ -135,6 +135,7 @@ module.add_class('YansWifiChannel', parent=root_module['ns3::WifiChannel']) ## aarf-wifi-manager.h: ns3::AarfWifiManager [class] module.add_class('AarfWifiManager', parent=root_module['ns3::ArfWifiManager']) + typehandlers.add_type_alias('std::vector< ns3::ThresholdsItem, std::allocator< ns3::ThresholdsItem > >', 'ns3::Thresholds') ## Register a nested module for the namespace Config @@ -148,6 +149,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -168,6 +175,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -4181,6 +4192,7 @@ [param('uint8_t', 'tid')]) register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -4191,6 +4203,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return diff -r 39ac17168023 -r 19e2b7ff3482 bindings/python/ns3modulegen_generated.py --- a/bindings/python/ns3modulegen_generated.py Thu May 28 21:38:06 2009 -0700 +++ b/bindings/python/ns3modulegen_generated.py Thu May 28 21:38:49 2009 -0700 @@ -1,4 +1,4 @@ -from pybindgen import Module, FileCodeSink, param, retval, cppclass +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers import pybindgen.settings @@ -288,6 +288,12 @@ register_types_ns3_TimeStepPrecision(nested_module) + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + ## Register a nested module for the namespace internal nested_module = module.add_cpp_namespace('internal') @@ -309,6 +315,10 @@ root_module = module.get_root() +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + def register_types_ns3_internal(module): root_module = module.get_root() @@ -786,6 +796,7 @@ root_module.end_section('ns3_module_helper') register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return @@ -796,6 +807,9 @@ def register_functions_ns3_TimeStepPrecision(module, root_module): return +def register_functions_ns3_addressUtils(module, root_module): + return + def register_functions_ns3_internal(module, root_module): return