diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index dc4b76aec..70b24cfea 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -45,6 +45,8 @@ def register_types(module): module.add_class('IntToType', template_parameters=['6']) ## int-to-type.h: ns3::IntToType<6>::v_e [enumeration] module.add_enum('v_e', ['value'], outer_class=root_module['ns3::IntToType< 6 >']) + ## names.h: ns3::Names [class] + module.add_class('Names') ## object-base.h: ns3::ObjectBase [class] module.add_class('ObjectBase', allow_subclassing=True) ## object-factory.h: ns3::ObjectFactory [class] @@ -223,6 +225,7 @@ def register_methods(root_module): register_Ns3IntToType__4_methods(root_module, root_module['ns3::IntToType< 4 >']) register_Ns3IntToType__5_methods(root_module, root_module['ns3::IntToType< 5 >']) register_Ns3IntToType__6_methods(root_module, root_module['ns3::IntToType< 6 >']) + register_Ns3Names_methods(root_module, root_module['ns3::Names']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) @@ -463,6 +466,58 @@ def register_Ns3IntToType__6_methods(root_module, cls): cls.add_constructor([]) return +def register_Ns3Names_methods(root_module, cls): + ## names.h: ns3::Names::Names(ns3::Names const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Names const &', 'arg0')]) + ## names.h: ns3::Names::Names() [constructor] + cls.add_constructor([]) + ## names.h: static bool ns3::Names::Add(std::string name, ns3::Ptr obj) [member function] + cls.add_method('Add', + 'bool', + [param('std::string', 'name'), param('ns3::Ptr< ns3::Object >', 'obj')], + is_static=True) + ## names.h: static bool ns3::Names::Add(std::string path, std::string name, ns3::Ptr object) [member function] + cls.add_method('Add', + 'bool', + [param('std::string', 'path'), param('std::string', 'name'), param('ns3::Ptr< ns3::Object >', 'object')], + is_static=True) + ## names.h: static bool ns3::Names::Add(ns3::Ptr context, std::string name, ns3::Ptr object) [member function] + cls.add_method('Add', + 'bool', + [param('ns3::Ptr< ns3::Object >', 'context'), param('std::string', 'name'), param('ns3::Ptr< ns3::Object >', 'object')], + is_static=True) + ## names.h: static bool ns3::Names::Rename(std::string oldpath, std::string newname) [member function] + cls.add_method('Rename', + 'bool', + [param('std::string', 'oldpath'), param('std::string', 'newname')], + is_static=True) + ## names.h: static bool ns3::Names::Rename(std::string path, std::string oldname, std::string newname) [member function] + cls.add_method('Rename', + 'bool', + [param('std::string', 'path'), param('std::string', 'oldname'), param('std::string', 'newname')], + is_static=True) + ## names.h: static bool ns3::Names::Rename(ns3::Ptr context, std::string oldname, std::string newname) [member function] + cls.add_method('Rename', + 'bool', + [param('ns3::Ptr< ns3::Object >', 'context'), param('std::string', 'oldname'), param('std::string', 'newname')], + is_static=True) + ## names.h: static std::string ns3::Names::FindName(ns3::Ptr object) [member function] + cls.add_method('FindName', + 'std::string', + [param('ns3::Ptr< ns3::Object >', 'object')], + is_static=True) + ## names.h: static std::string ns3::Names::FindPath(ns3::Ptr object) [member function] + cls.add_method('FindPath', + 'std::string', + [param('ns3::Ptr< ns3::Object >', 'object')], + is_static=True) + ## names.h: static void ns3::Names::Delete() [member function] + cls.add_method('Delete', + 'void', + [], + is_static=True) + return + def register_Ns3ObjectBase_methods(root_module, cls): ## object-base.h: ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor] cls.add_constructor([param('ns3::ObjectBase const &', 'arg0')]) @@ -2062,7 +2117,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['long long']) + template_parameters=['long']) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', @@ -2082,7 +2137,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['unsigned long long']) + template_parameters=['unsigned long']) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', diff --git a/bindings/python/ns3_module_helper.py b/bindings/python/ns3_module_helper.py index 8744186c1..7fe0ad665 100644 --- a/bindings/python/ns3_module_helper.py +++ b/bindings/python/ns3_module_helper.py @@ -37,6 +37,8 @@ def register_types(module): 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] module.add_class('UdpEchoClientHelper', allow_subclassing=False) ## udp-echo-helper.h: ns3::UdpEchoServerHelper [class] @@ -110,6 +112,7 @@ def register_methods(root_module): 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']) register_Ns3V4PingHelper_methods(root_module, root_module['ns3::V4PingHelper']) @@ -126,6 +129,8 @@ def register_Ns3ApplicationContainer_methods(root_module, cls): cls.add_constructor([]) ## application-container.h: ns3::ApplicationContainer::ApplicationContainer(ns3::Ptr application) [constructor] cls.add_constructor([param('ns3::Ptr< ns3::Application >', 'application')]) + ## application-container.h: ns3::ApplicationContainer::ApplicationContainer(std::string name) [constructor] + cls.add_constructor([param('std::string', 'name')]) ## application-container.h: __gnu_cxx::__normal_iterator*,std::vector, std::allocator > > > ns3::ApplicationContainer::Begin() const [member function] cls.add_method('Begin', '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Application > const, std::vector< ns3::Ptr< ns3::Application > > >', @@ -154,6 +159,10 @@ def register_Ns3ApplicationContainer_methods(root_module, cls): cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::Application >', 'application')]) + ## application-container.h: void ns3::ApplicationContainer::Add(std::string name) [member function] + cls.add_method('Add', + 'void', + [param('std::string', 'name')]) ## application-container.h: void ns3::ApplicationContainer::Start(ns3::Time start) [member function] cls.add_method('Start', 'void', @@ -177,6 +186,10 @@ def register_Ns3BridgeHelper_methods(root_module, cls): cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::NetDeviceContainer', 'c')]) + ## bridge-helper.h: ns3::NetDeviceContainer ns3::BridgeHelper::Install(std::string nodeName, ns3::NetDeviceContainer c) [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('std::string', 'nodeName'), param('ns3::NetDeviceContainer', 'c')]) return def register_Ns3CsmaHelper_methods(root_module, cls): @@ -251,11 +264,31 @@ def register_Ns3CsmaHelper_methods(root_module, cls): 'ns3::NetDeviceContainer', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string name) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('std::string', 'name')], + is_const=True) ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr node, ns3::Ptr channel) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr node, std::string channelName) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string', 'channelName')], + is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, ns3::Ptr channel) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('std::string', 'nodeName'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], + is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, std::string channelName) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('std::string', 'nodeName'), param('std::string', 'channelName')], + is_const=True) ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', @@ -266,10 +299,19 @@ def register_Ns3CsmaHelper_methods(root_module, cls): 'ns3::NetDeviceContainer', [param('ns3::NodeContainer const &', 'c'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, std::string channelName) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::NodeContainer const &', 'c'), param('std::string', 'channelName')], + is_const=True) ## csma-helper.h: void ns3::CsmaHelper::InstallStar(ns3::Ptr hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function] cls.add_method('InstallStar', 'void', [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')]) + ## csma-helper.h: void ns3::CsmaHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function] + cls.add_method('InstallStar', + 'void', + [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')]) return def register_Ns3EmuHelper_methods(root_module, cls): @@ -330,6 +372,11 @@ def register_Ns3EmuHelper_methods(root_module, cls): 'ns3::NetDeviceContainer', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('std::string', 'nodeName')], + is_const=True) ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::NodeContainer const & c) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', @@ -342,6 +389,11 @@ def register_Ns3InternetStackHelper_methods(root_module, cls): cls.add_constructor([param('ns3::InternetStackHelper const &', 'arg0')]) ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper() [constructor] cls.add_constructor([]) + ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'void', + [param('std::string', 'nodeName')], + is_const=True) ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'void', @@ -423,6 +475,10 @@ def register_Ns3Ipv4InterfaceContainer_methods(root_module, cls): cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')]) + ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::string ipv4Name, uint32_t interface) [member function] + cls.add_method('Add', + 'void', + [param('std::string', 'ipv4Name'), param('uint32_t', 'interface')]) return def register_Ns3MobilityHelper_methods(root_module, cls): @@ -446,6 +502,10 @@ def register_Ns3MobilityHelper_methods(root_module, cls): cls.add_method('PushReferenceMobilityModel', 'void', [param('ns3::Ptr< ns3::Object >', 'reference')]) + ## mobility-helper.h: void ns3::MobilityHelper::PushReferenceMobilityModel(std::string referenceName) [member function] + cls.add_method('PushReferenceMobilityModel', + 'void', + [param('std::string', 'referenceName')]) ## mobility-helper.h: void ns3::MobilityHelper::PopReferenceMobilityModel() [member function] cls.add_method('PopReferenceMobilityModel', 'void', @@ -460,6 +520,11 @@ def register_Ns3MobilityHelper_methods(root_module, cls): 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## mobility-helper.h: void ns3::MobilityHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'void', + [param('std::string', 'nodeName')], + is_const=True) ## mobility-helper.h: void ns3::MobilityHelper::Install(ns3::NodeContainer container) const [member function] cls.add_method('Install', 'void', @@ -493,6 +558,8 @@ def register_Ns3NetDeviceContainer_methods(root_module, cls): cls.add_constructor([]) ## net-device-container.h: ns3::NetDeviceContainer::NetDeviceContainer(ns3::Ptr dev) [constructor] cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev')]) + ## net-device-container.h: ns3::NetDeviceContainer::NetDeviceContainer(std::string devName) [constructor] + cls.add_constructor([param('std::string', 'devName')]) ## net-device-container.h: ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & a, ns3::NetDeviceContainer const & b) [constructor] cls.add_constructor([param('ns3::NetDeviceContainer const &', 'a'), param('ns3::NetDeviceContainer const &', 'b')]) ## net-device-container.h: __gnu_cxx::__normal_iterator*,std::vector, std::allocator > > > ns3::NetDeviceContainer::Begin() const [member function] @@ -523,6 +590,10 @@ def register_Ns3NetDeviceContainer_methods(root_module, cls): cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'device')]) + ## net-device-container.h: void ns3::NetDeviceContainer::Add(std::string deviceName) [member function] + cls.add_method('Add', + 'void', + [param('std::string', 'deviceName')]) return def register_Ns3NodeContainer_methods(root_module, cls): @@ -532,6 +603,8 @@ def register_Ns3NodeContainer_methods(root_module, cls): cls.add_constructor([]) ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::Ptr node) [constructor] cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')]) + ## node-container.h: ns3::NodeContainer::NodeContainer(std::string nodeName) [constructor] + cls.add_constructor([param('std::string', 'nodeName')]) ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b) [constructor] cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b')]) ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c) [constructor] @@ -572,6 +645,10 @@ def register_Ns3NodeContainer_methods(root_module, cls): cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::Node >', 'node')]) + ## node-container.h: void ns3::NodeContainer::Add(std::string nodeName) [member function] + cls.add_method('Add', + 'void', + [param('std::string', 'nodeName')]) ## node-container.h: static ns3::NodeContainer ns3::NodeContainer::GetGlobal() [member function] cls.add_method('GetGlobal', 'ns3::NodeContainer', @@ -608,6 +685,10 @@ def register_Ns3OlsrHelper_methods(root_module, cls): cls.add_method('Install', 'void', [param('ns3::Ptr< ns3::Node >', 'node')]) + ## olsr-helper.h: void ns3::OlsrHelper::Install(std::string nodeName) [member function] + cls.add_method('Install', + 'void', + [param('std::string', 'nodeName')]) ## olsr-helper.h: void ns3::OlsrHelper::InstallAll() [member function] cls.add_method('InstallAll', 'void', @@ -633,6 +714,11 @@ def register_Ns3OnOffHelper_methods(root_module, cls): 'ns3::ApplicationContainer', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## on-off-helper.h: ns3::ApplicationContainer ns3::OnOffHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('std::string', 'nodeName')], + is_const=True) return def register_Ns3PacketSinkHelper_methods(root_module, cls): @@ -654,6 +740,11 @@ def register_Ns3PacketSinkHelper_methods(root_module, cls): 'ns3::ApplicationContainer', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## packet-sink-helper.h: ns3::ApplicationContainer ns3::PacketSinkHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('std::string', 'nodeName')], + is_const=True) return def register_Ns3PacketSocketHelper_methods(root_module, cls): @@ -666,6 +757,11 @@ def register_Ns3PacketSocketHelper_methods(root_module, cls): 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'void', + [param('std::string', 'nodeName')], + is_const=True) ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(ns3::NodeContainer c) const [member function] cls.add_method('Install', 'void', @@ -748,10 +844,26 @@ def register_Ns3PointToPointHelper_methods(root_module, cls): cls.add_method('Install', 'ns3::NetDeviceContainer', [param('ns3::Ptr< ns3::Node >', 'a'), param('ns3::Ptr< ns3::Node >', 'b')]) + ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::Ptr a, std::string bName) [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::Ptr< ns3::Node >', 'a'), param('std::string', 'bName')]) + ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aName, ns3::Ptr b) [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('std::string', 'aName'), param('ns3::Ptr< ns3::Node >', 'b')]) + ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aNode, std::string bNode) [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('std::string', 'aNode'), param('std::string', 'bNode')]) ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(ns3::Ptr hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function] cls.add_method('InstallStar', 'void', [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')]) + ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function] + cls.add_method('InstallStar', + 'void', + [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')]) return def register_Ns3StaticMulticastRouteHelper_methods(root_module, cls): @@ -759,18 +871,73 @@ def register_Ns3StaticMulticastRouteHelper_methods(root_module, cls): 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 arg0, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr input, ns3::NetDeviceContainer output) [member function] + ## 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 >', 'arg0'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')]) + [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')]) + ## tap-bridge-helper.h: ns3::TapBridgeHelper::TapBridgeHelper(ns3::Ipv4Address gateway) [constructor] + cls.add_constructor([param('ns3::Ipv4Address', 'gateway')]) + ## tap-bridge-helper.h: void ns3::TapBridgeHelper::SetAttribute(std::string n1, ns3::AttributeValue const & v1) [member function] + cls.add_method('SetAttribute', + 'void', + [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')]) + ## tap-bridge-helper.h: ns3::Ptr ns3::TapBridgeHelper::Install(ns3::Ptr node, ns3::Ptr nd) [member function] + cls.add_method('Install', + 'ns3::Ptr< ns3::NetDevice >', + [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) + ## tap-bridge-helper.h: ns3::Ptr ns3::TapBridgeHelper::Install(std::string nodeName, ns3::Ptr nd) [member function] + cls.add_method('Install', + 'ns3::Ptr< ns3::NetDevice >', + [param('std::string', 'nodeName'), param('ns3::Ptr< ns3::NetDevice >', 'nd')]) + ## tap-bridge-helper.h: ns3::Ptr ns3::TapBridgeHelper::Install(ns3::Ptr node, std::string ndName) [member function] + cls.add_method('Install', + 'ns3::Ptr< ns3::NetDevice >', + [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string', 'ndName')]) + ## tap-bridge-helper.h: ns3::Ptr ns3::TapBridgeHelper::Install(std::string nodeName, std::string ndName) [member function] + cls.add_method('Install', + 'ns3::Ptr< ns3::NetDevice >', + [param('std::string', 'nodeName'), param('std::string', 'ndName')]) return def register_Ns3UdpEchoClientHelper_methods(root_module, cls): @@ -787,6 +954,11 @@ def register_Ns3UdpEchoClientHelper_methods(root_module, cls): 'ns3::ApplicationContainer', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('std::string', 'nodeName')], + is_const=True) ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(ns3::NodeContainer c) const [member function] cls.add_method('Install', 'ns3::ApplicationContainer', @@ -808,6 +980,11 @@ def register_Ns3UdpEchoServerHelper_methods(root_module, cls): 'ns3::ApplicationContainer', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('std::string', 'nodeName')], + is_const=True) ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(ns3::NodeContainer c) const [member function] cls.add_method('Install', 'ns3::ApplicationContainer', @@ -834,6 +1011,11 @@ def register_Ns3V4PingHelper_methods(root_module, cls): 'ns3::ApplicationContainer', [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## v4ping-helper.h: ns3::ApplicationContainer ns3::V4PingHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('std::string', 'nodeName')], + is_const=True) return def register_Ns3WifiHelper_methods(root_module, cls): @@ -864,6 +1046,11 @@ def register_Ns3WifiHelper_methods(root_module, cls): 'ns3::NetDeviceContainer', [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) + ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::WifiPhyHelper const &', 'phy'), param('std::string', 'nodeName')], + is_const=True) return def register_Ns3WifiPhyHelper_methods(root_module, cls): @@ -917,6 +1104,10 @@ def register_Ns3YansWifiPhyHelper_methods(root_module, cls): cls.add_method('SetChannel', 'void', [param('ns3::Ptr< ns3::YansWifiChannel >', 'channel')]) + ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::SetChannel(std::string channelName) [member function] + cls.add_method('SetChannel', + 'void', + [param('std::string', 'channelName')]) ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::Set(std::string name, ns3::AttributeValue const & v) [member function] cls.add_method('Set', 'void', diff --git a/bindings/python/ns3_module_node.py b/bindings/python/ns3_module_node.py index 2e50f5842..b214fcda6 100644 --- a/bindings/python/ns3_module_node.py +++ b/bindings/python/ns3_module_node.py @@ -109,6 +109,8 @@ def register_types(module): module.add_class('Channel', parent=root_module['ns3::Object']) ## drop-tail-queue.h: ns3::DropTailQueue [class] module.add_class('DropTailQueue', parent=root_module['ns3::Queue']) + ## drop-tail-queue.h: ns3::DropTailQueue::Mode [enumeration] + module.add_enum('Mode', ['ILLEGAL', 'PACKETS', 'BYTES'], outer_class=root_module['ns3::DropTailQueue']) ## ethernet-header.h: ns3::EthernetHeader [class] module.add_class('EthernetHeader', parent=root_module['ns3::Header']) ## ethernet-trailer.h: ns3::EthernetTrailer [class] @@ -2340,6 +2342,14 @@ def register_Ns3DropTailQueue_methods(root_module, cls): is_static=True) ## drop-tail-queue.h: ns3::DropTailQueue::DropTailQueue() [constructor] cls.add_constructor([]) + ## drop-tail-queue.h: void ns3::DropTailQueue::SetMode(ns3::DropTailQueue::Mode mode) [member function] + cls.add_method('SetMode', + 'void', + [param('ns3::DropTailQueue::Mode', 'mode')]) + ## drop-tail-queue.h: ns3::DropTailQueue::Mode ns3::DropTailQueue::GetMode() [member function] + cls.add_method('GetMode', + 'ns3::DropTailQueue::Mode', + []) ## drop-tail-queue.h: bool ns3::DropTailQueue::DoEnqueue(ns3::Ptr p) [member function] cls.add_method('DoEnqueue', 'bool', diff --git a/bindings/python/ns3_module_simulator.py b/bindings/python/ns3_module_simulator.py index da1d6eb39..78bef44f9 100644 --- a/bindings/python/ns3_module_simulator.py +++ b/bindings/python/ns3_module_simulator.py @@ -55,6 +55,8 @@ def register_types(module): module.add_class('ListScheduler', parent=root_module['ns3::Scheduler']) ## map-scheduler.h: ns3::MapScheduler [class] module.add_class('MapScheduler', parent=root_module['ns3::Scheduler']) + ## ns2-calendar-scheduler.h: ns3::Ns2CalendarScheduler [class] + module.add_class('Ns2CalendarScheduler', parent=root_module['ns3::Scheduler']) ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl [class] module.add_class('RealtimeSimulatorImpl', parent=root_module['ns3::SimulatorImpl']) ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration] @@ -127,6 +129,7 @@ def register_methods(root_module): register_Ns3HeapScheduler_methods(root_module, root_module['ns3::HeapScheduler']) register_Ns3ListScheduler_methods(root_module, root_module['ns3::ListScheduler']) register_Ns3MapScheduler_methods(root_module, root_module['ns3::MapScheduler']) + register_Ns3Ns2CalendarScheduler_methods(root_module, root_module['ns3::Ns2CalendarScheduler']) register_Ns3RealtimeSimulatorImpl_methods(root_module, root_module['ns3::RealtimeSimulatorImpl']) return @@ -726,7 +729,9 @@ def register_Ns3SchedulerEvent_methods(root_module, cls): return def register_Ns3SchedulerEventKey_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') + cls.add_binary_comparison_operator('>') ## scheduler.h: ns3::Scheduler::EventKey::EventKey() [constructor] cls.add_constructor([]) ## scheduler.h: ns3::Scheduler::EventKey::EventKey(ns3::Scheduler::EventKey const & arg0) [copy constructor] @@ -1309,6 +1314,43 @@ def register_Ns3MapScheduler_methods(root_module, cls): is_virtual=True) return +def register_Ns3Ns2CalendarScheduler_methods(root_module, cls): + ## ns2-calendar-scheduler.h: ns3::Ns2CalendarScheduler::Ns2CalendarScheduler(ns3::Ns2CalendarScheduler const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ns2CalendarScheduler const &', 'arg0')]) + ## ns2-calendar-scheduler.h: static ns3::TypeId ns3::Ns2CalendarScheduler::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ns2-calendar-scheduler.h: ns3::Ns2CalendarScheduler::Ns2CalendarScheduler() [constructor] + cls.add_constructor([]) + ## ns2-calendar-scheduler.h: void ns3::Ns2CalendarScheduler::Insert(ns3::Scheduler::Event const & ev) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Scheduler::Event const &', 'ev')], + is_virtual=True) + ## ns2-calendar-scheduler.h: bool ns3::Ns2CalendarScheduler::IsEmpty() const [member function] + cls.add_method('IsEmpty', + 'bool', + [], + is_const=True, is_virtual=True) + ## ns2-calendar-scheduler.h: ns3::Scheduler::Event ns3::Ns2CalendarScheduler::PeekNext() const [member function] + cls.add_method('PeekNext', + 'ns3::Scheduler::Event', + [], + is_const=True, is_virtual=True) + ## ns2-calendar-scheduler.h: ns3::Scheduler::Event ns3::Ns2CalendarScheduler::RemoveNext() [member function] + cls.add_method('RemoveNext', + 'ns3::Scheduler::Event', + [], + is_virtual=True) + ## ns2-calendar-scheduler.h: void ns3::Ns2CalendarScheduler::Remove(ns3::Scheduler::Event const & ev) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Scheduler::Event const &', 'ev')], + is_virtual=True) + return + def register_Ns3RealtimeSimulatorImpl_methods(root_module, cls): ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::RealtimeSimulatorImpl(ns3::RealtimeSimulatorImpl const & arg0) [copy constructor] cls.add_constructor([param('ns3::RealtimeSimulatorImpl const &', 'arg0')]) diff --git a/bindings/python/ns3_module_tap_bridge.py b/bindings/python/ns3_module_tap_bridge.py new file mode 100644 index 000000000..66185dc52 --- /dev/null +++ b/bindings/python/ns3_module_tap_bridge.py @@ -0,0 +1,235 @@ +from pybindgen import Module, FileCodeSink, param, retval, cppclass + +def register_types(module): + root_module = module.get_root() + + ## tap-bridge.h: ns3::TapBridge [class] + module.add_class('TapBridge', parent=root_module['ns3::NetDevice']) + + ## Register a nested module for the namespace Config + + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) + + + ## Register a nested module for the namespace TimeStepPrecision + + nested_module = module.add_cpp_namespace('TimeStepPrecision') + register_types_ns3_TimeStepPrecision(nested_module) + + + ## Register a nested module for the namespace internal + + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) + + + ## Register a nested module for the namespace olsr + + nested_module = module.add_cpp_namespace('olsr') + register_types_ns3_olsr(nested_module) + + +def register_types_ns3_Config(module): + root_module = module.get_root() + + +def register_types_ns3_TimeStepPrecision(module): + root_module = module.get_root() + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + +def register_types_ns3_olsr(module): + root_module = module.get_root() + + +def register_methods(root_module): + register_Ns3TapBridge_methods(root_module, root_module['ns3::TapBridge']) + return + +def register_Ns3TapBridge_methods(root_module, cls): + ## tap-bridge.h: ns3::TapBridge::TapBridge(ns3::TapBridge const & arg0) [copy constructor] + cls.add_constructor([param('ns3::TapBridge const &', 'arg0')]) + ## tap-bridge.h: static ns3::TypeId ns3::TapBridge::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## tap-bridge.h: ns3::TapBridge::TapBridge() [constructor] + cls.add_constructor([]) + ## tap-bridge.h: ns3::Ptr ns3::TapBridge::GetBridgedNetDevice() [member function] + cls.add_method('GetBridgedNetDevice', + 'ns3::Ptr< ns3::NetDevice >', + []) + ## tap-bridge.h: void ns3::TapBridge::SetBridgedNetDevice(ns3::Ptr bridgedDevice) [member function] + cls.add_method('SetBridgedNetDevice', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'bridgedDevice')]) + ## tap-bridge.h: void ns3::TapBridge::Start(ns3::Time tStart) [member function] + cls.add_method('Start', + 'void', + [param('ns3::Time', 'tStart')]) + ## tap-bridge.h: void ns3::TapBridge::Stop(ns3::Time tStop) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time', 'tStop')]) + ## tap-bridge.h: void ns3::TapBridge::SetName(std::string const name) [member function] + cls.add_method('SetName', + 'void', + [param('std::string const', 'name')], + is_virtual=True) + ## tap-bridge.h: std::string ns3::TapBridge::GetName() const [member function] + cls.add_method('GetName', + 'std::string', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: void ns3::TapBridge::SetIfIndex(uint32_t const index) [member function] + cls.add_method('SetIfIndex', + 'void', + [param('uint32_t const', 'index')], + is_virtual=True) + ## tap-bridge.h: uint32_t ns3::TapBridge::GetIfIndex() const [member function] + cls.add_method('GetIfIndex', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: ns3::Ptr ns3::TapBridge::GetChannel() const [member function] + cls.add_method('GetChannel', + 'ns3::Ptr< ns3::Channel >', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: ns3::Address ns3::TapBridge::GetAddress() const [member function] + cls.add_method('GetAddress', + 'ns3::Address', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::SetMtu(uint16_t const mtu) [member function] + cls.add_method('SetMtu', + 'bool', + [param('uint16_t const', 'mtu')], + is_virtual=True) + ## tap-bridge.h: uint16_t ns3::TapBridge::GetMtu() const [member function] + cls.add_method('GetMtu', + 'uint16_t', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::IsLinkUp() const [member function] + cls.add_method('IsLinkUp', + 'bool', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: void ns3::TapBridge::SetLinkChangeCallback(ns3::Callback callback) [member function] + cls.add_method('SetLinkChangeCallback', + 'void', + [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], + is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::IsBroadcast() const [member function] + cls.add_method('IsBroadcast', + 'bool', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: ns3::Address ns3::TapBridge::GetBroadcast() const [member function] + cls.add_method('GetBroadcast', + 'ns3::Address', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::IsMulticast() const [member function] + cls.add_method('IsMulticast', + 'bool', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: ns3::Address ns3::TapBridge::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv4Address', 'multicastGroup')], + is_const=True, is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::IsPointToPoint() const [member function] + cls.add_method('IsPointToPoint', + 'bool', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::IsBridge() const [member function] + cls.add_method('IsBridge', + 'bool', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::Send(ns3::Ptr packet, ns3::Address const & dest, uint16_t protocolNumber) [member function] + cls.add_method('Send', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], + is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::SendFrom(ns3::Ptr packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function] + cls.add_method('SendFrom', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], + is_virtual=True) + ## tap-bridge.h: ns3::Ptr ns3::TapBridge::GetNode() const [member function] + cls.add_method('GetNode', + 'ns3::Ptr< ns3::Node >', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: void ns3::TapBridge::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::NeedsArp() const [member function] + cls.add_method('NeedsArp', + 'bool', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: void ns3::TapBridge::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> cb) [member function] + cls.add_method('SetReceiveCallback', + 'void', + [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'cb')], + is_virtual=True) + ## tap-bridge.h: void ns3::TapBridge::SetPromiscReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> cb) [member function] + cls.add_method('SetPromiscReceiveCallback', + 'void', + [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'cb')], + is_virtual=True) + ## tap-bridge.h: bool ns3::TapBridge::SupportsSendFrom() const [member function] + cls.add_method('SupportsSendFrom', + 'bool', + [], + is_const=True, is_virtual=True) + ## tap-bridge.h: ns3::Address ns3::TapBridge::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_const=True, is_virtual=True) + ## tap-bridge.h: void ns3::TapBridge::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + ## tap-bridge.h: void ns3::TapBridge::ReceiveFromBridgedDevice(ns3::Ptr device, ns3::Ptr packet, uint16_t protocol, ns3::Address const & src, ns3::Address const & dst, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('ReceiveFromBridgedDevice', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'src'), param('ns3::Address const &', 'dst'), param('ns3::NetDevice::PacketType', 'packetType')], + visibility='protected') + return + +def register_functions(root_module): + 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_internal(module.get_submodule('internal'), root_module) + register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) + return + +def register_functions_ns3_Config(module, root_module): + return + +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + +def register_functions_ns3_olsr(module, root_module): + return + diff --git a/bindings/python/ns3modulegen_generated.py b/bindings/python/ns3modulegen_generated.py index 4a256c7b8..5d682396c 100644 --- a/bindings/python/ns3modulegen_generated.py +++ b/bindings/python/ns3modulegen_generated.py @@ -20,17 +20,18 @@ import ns3_module_node import ns3_module_contrib import ns3_module_point_to_point import ns3_module_stats +import ns3_module_tap_bridge import ns3_module_internet_stack import ns3_module_wifi import ns3_module_csma import ns3_module_emu import ns3_module_bridge +import ns3_module_onoff import ns3_module_packet_sink import ns3_module_v4ping import ns3_module_global_routing -import ns3_module_onoff -import ns3_module_olsr import ns3_module_udp_echo +import ns3_module_olsr import ns3_module_helper def module_init(): @@ -128,6 +129,17 @@ def register_types(module): ns3_module_stats__local.register_types(module) root_module.end_section('ns3_module_stats') + root_module.begin_section('ns3_module_tap_bridge') + ns3_module_tap_bridge.register_types(module) + + try: + import ns3_module_tap_bridge__local + except ImportError: + pass + else: + ns3_module_tap_bridge__local.register_types(module) + + root_module.end_section('ns3_module_tap_bridge') root_module.begin_section('ns3_module_internet_stack') ns3_module_internet_stack.register_types(module) @@ -183,6 +195,17 @@ def register_types(module): ns3_module_bridge__local.register_types(module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_onoff') + ns3_module_onoff.register_types(module) + + try: + import ns3_module_onoff__local + except ImportError: + pass + else: + ns3_module_onoff__local.register_types(module) + + root_module.end_section('ns3_module_onoff') root_module.begin_section('ns3_module_packet_sink') ns3_module_packet_sink.register_types(module) @@ -216,28 +239,6 @@ def register_types(module): ns3_module_global_routing__local.register_types(module) root_module.end_section('ns3_module_global_routing') - root_module.begin_section('ns3_module_onoff') - ns3_module_onoff.register_types(module) - - try: - import ns3_module_onoff__local - except ImportError: - pass - else: - ns3_module_onoff__local.register_types(module) - - root_module.end_section('ns3_module_onoff') - root_module.begin_section('ns3_module_olsr') - ns3_module_olsr.register_types(module) - - try: - import ns3_module_olsr__local - except ImportError: - pass - else: - ns3_module_olsr__local.register_types(module) - - root_module.end_section('ns3_module_olsr') root_module.begin_section('ns3_module_udp_echo') ns3_module_udp_echo.register_types(module) @@ -249,6 +250,17 @@ def register_types(module): ns3_module_udp_echo__local.register_types(module) root_module.end_section('ns3_module_udp_echo') + root_module.begin_section('ns3_module_olsr') + ns3_module_olsr.register_types(module) + + try: + import ns3_module_olsr__local + except ImportError: + pass + else: + ns3_module_olsr__local.register_types(module) + + root_module.end_section('ns3_module_olsr') root_module.begin_section('ns3_module_helper') ns3_module_helper.register_types(module) @@ -393,6 +405,17 @@ def register_methods(root_module): ns3_module_stats__local.register_methods(root_module) root_module.end_section('ns3_module_stats') + root_module.begin_section('ns3_module_tap_bridge') + ns3_module_tap_bridge.register_methods(root_module) + + try: + import ns3_module_tap_bridge__local + except ImportError: + pass + else: + ns3_module_tap_bridge__local.register_methods(root_module) + + root_module.end_section('ns3_module_tap_bridge') root_module.begin_section('ns3_module_internet_stack') ns3_module_internet_stack.register_methods(root_module) @@ -448,6 +471,17 @@ def register_methods(root_module): ns3_module_bridge__local.register_methods(root_module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_onoff') + ns3_module_onoff.register_methods(root_module) + + try: + import ns3_module_onoff__local + except ImportError: + pass + else: + ns3_module_onoff__local.register_methods(root_module) + + root_module.end_section('ns3_module_onoff') root_module.begin_section('ns3_module_packet_sink') ns3_module_packet_sink.register_methods(root_module) @@ -481,28 +515,6 @@ def register_methods(root_module): ns3_module_global_routing__local.register_methods(root_module) root_module.end_section('ns3_module_global_routing') - root_module.begin_section('ns3_module_onoff') - ns3_module_onoff.register_methods(root_module) - - try: - import ns3_module_onoff__local - except ImportError: - pass - else: - ns3_module_onoff__local.register_methods(root_module) - - root_module.end_section('ns3_module_onoff') - root_module.begin_section('ns3_module_olsr') - ns3_module_olsr.register_methods(root_module) - - try: - import ns3_module_olsr__local - except ImportError: - pass - else: - ns3_module_olsr__local.register_methods(root_module) - - root_module.end_section('ns3_module_olsr') root_module.begin_section('ns3_module_udp_echo') ns3_module_udp_echo.register_methods(root_module) @@ -514,6 +526,17 @@ def register_methods(root_module): ns3_module_udp_echo__local.register_methods(root_module) root_module.end_section('ns3_module_udp_echo') + root_module.begin_section('ns3_module_olsr') + ns3_module_olsr.register_methods(root_module) + + try: + import ns3_module_olsr__local + except ImportError: + pass + else: + ns3_module_olsr__local.register_methods(root_module) + + root_module.end_section('ns3_module_olsr') root_module.begin_section('ns3_module_helper') ns3_module_helper.register_methods(root_module) @@ -617,6 +640,17 @@ def register_functions(root_module): ns3_module_stats__local.register_functions(root_module) root_module.end_section('ns3_module_stats') + root_module.begin_section('ns3_module_tap_bridge') + ns3_module_tap_bridge.register_functions(root_module) + + try: + import ns3_module_tap_bridge__local + except ImportError: + pass + else: + ns3_module_tap_bridge__local.register_functions(root_module) + + root_module.end_section('ns3_module_tap_bridge') root_module.begin_section('ns3_module_internet_stack') ns3_module_internet_stack.register_functions(root_module) @@ -672,6 +706,17 @@ def register_functions(root_module): ns3_module_bridge__local.register_functions(root_module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_onoff') + ns3_module_onoff.register_functions(root_module) + + try: + import ns3_module_onoff__local + except ImportError: + pass + else: + ns3_module_onoff__local.register_functions(root_module) + + root_module.end_section('ns3_module_onoff') root_module.begin_section('ns3_module_packet_sink') ns3_module_packet_sink.register_functions(root_module) @@ -705,28 +750,6 @@ def register_functions(root_module): ns3_module_global_routing__local.register_functions(root_module) root_module.end_section('ns3_module_global_routing') - root_module.begin_section('ns3_module_onoff') - ns3_module_onoff.register_functions(root_module) - - try: - import ns3_module_onoff__local - except ImportError: - pass - else: - ns3_module_onoff__local.register_functions(root_module) - - root_module.end_section('ns3_module_onoff') - root_module.begin_section('ns3_module_olsr') - ns3_module_olsr.register_functions(root_module) - - try: - import ns3_module_olsr__local - except ImportError: - pass - else: - ns3_module_olsr__local.register_functions(root_module) - - root_module.end_section('ns3_module_olsr') root_module.begin_section('ns3_module_udp_echo') ns3_module_udp_echo.register_functions(root_module) @@ -738,6 +761,17 @@ def register_functions(root_module): ns3_module_udp_echo__local.register_functions(root_module) root_module.end_section('ns3_module_udp_echo') + root_module.begin_section('ns3_module_olsr') + ns3_module_olsr.register_functions(root_module) + + try: + import ns3_module_olsr__local + except ImportError: + pass + else: + ns3_module_olsr__local.register_functions(root_module) + + root_module.end_section('ns3_module_olsr') root_module.begin_section('ns3_module_helper') ns3_module_helper.register_functions(root_module)