From 0717db6ed0711585133b39bc38d81dc7ef9394e2 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Mon, 18 Aug 2008 16:02:54 +0100 Subject: [PATCH] Rescan Python bindings --- bindings/python/ns3_module_core.py | 240 ---------------------- bindings/python/ns3_module_helper.py | 16 ++ bindings/python/ns3_module_node.py | 9 +- bindings/python/ns3modulegen_generated.py | 2 + 4 files changed, 22 insertions(+), 245 deletions(-) diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index a0d187ade..4c67b2a8d 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -97,26 +97,6 @@ def register_types(module): module.add_class('CallbackBase') ## random-variable.h: ns3::ExponentialVariable [class] module.add_class('ExponentialVariable', parent=root_module['ns3::RandomVariable']) - ## traced-callback.h: ns3::TracedCallback, ns3::Mac48Address, ns3::empty, ns3::empty> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty']) - ## traced-callback.h: ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty']) - ## traced-callback.h: ns3::TracedCallback, ns3::Address const&, ns3::empty, ns3::empty> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'ns3::Address const&', 'ns3::empty', 'ns3::empty']) - ## traced-callback.h: ns3::TracedCallback, unsigned int, ns3::empty, ns3::empty> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'unsigned int', 'ns3::empty', 'ns3::empty']) - ## traced-callback.h: ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty']) - ## traced-callback.h: ns3::TracedCallback, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty> [class] - module.add_class('TracedCallback', template_parameters=['ns3::TimeUnit<1>', 'ns3::TimeUnit<1>', 'ns3::WifiPhy::State', 'ns3::empty']) - ## traced-callback.h: ns3::TracedCallback, ns3::WifiMode, ns3::WifiPreamble, unsigned char> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'ns3::WifiMode', 'ns3::WifiPreamble', 'unsigned char']) - ## traced-callback.h: ns3::TracedCallback, double, ns3::empty, ns3::empty> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'double', 'ns3::empty', 'ns3::empty']) - ## traced-callback.h: ns3::TracedCallback, double, ns3::WifiMode, ns3::WifiPreamble> [class] - module.add_class('TracedCallback', template_parameters=['ns3::Ptr', 'double', 'ns3::WifiMode', 'ns3::WifiPreamble']) - ## traced-callback.h: ns3::TracedCallback [class] - module.add_class('TracedCallback', template_parameters=['unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty']) ## random-variable.h: ns3::DeterministicVariable [class] module.add_class('DeterministicVariable', parent=root_module['ns3::RandomVariable']) ## attribute-list.h: ns3::AttributeList [class] @@ -259,16 +239,6 @@ def register_methods(root_module): register_Ns3WeibullVariable_methods(root_module, root_module['ns3::WeibullVariable']) register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) register_Ns3ExponentialVariable_methods(root_module, root_module['ns3::ExponentialVariable']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Mac48Address_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, ns3::Mac48Address, ns3::empty, ns3::empty >']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, ns3::empty, ns3::empty, ns3::empty >']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Address_const__amp___Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, ns3::Address const&, ns3::empty, ns3::empty >']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, unsigned int, ns3::empty, ns3::empty >']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3MobilityModel_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, ns3::empty, ns3::empty, ns3::empty >']) - register_Ns3TracedCallback__Ns3TimeUnit__lt__1__gt___Ns3TimeUnit__lt__1__gt___Ns3WifiPhyState_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::TimeUnit<1>, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty >']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3WifiMode_Ns3WifiPreamble_Unsigned_char_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, ns3::WifiMode, ns3::WifiPreamble, unsigned char >']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, double, ns3::empty, ns3::empty >']) - register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3WifiMode_Ns3WifiPreamble_methods(root_module, root_module['ns3::TracedCallback< ns3::Ptr, double, ns3::WifiMode, ns3::WifiPreamble >']) - register_Ns3TracedCallback__Unsigned_int_Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, root_module['ns3::TracedCallback< unsigned int, unsigned int, ns3::empty, ns3::empty >']) register_Ns3DeterministicVariable_methods(root_module, root_module['ns3::DeterministicVariable']) register_Ns3AttributeList_methods(root_module, root_module['ns3::AttributeList']) register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue']) @@ -1114,216 +1084,6 @@ def register_Ns3ExponentialVariable_methods(root_module, cls): is_static=True) return -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Mac48Address_Ns3Empty_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, ns3::Mac48Address, ns3::empty, ns3::empty>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Mac48Address, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Mac48Address, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Mac48Address, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Mac48Address, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3Address_const__amp___Ns3Empty_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, ns3::Address const&, ns3::empty, ns3::empty>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Address const&, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Address const&, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Address const&, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::Address const&, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, unsigned int, ns3::empty, ns3::empty>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, unsigned int, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, unsigned int, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, unsigned int, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, unsigned int, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3MobilityModel_const__gt___Ns3Empty_Ns3Empty_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::empty, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3TimeUnit__lt__1__gt___Ns3TimeUnit__lt__1__gt___Ns3WifiPhyState_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::TimeUnit<1>, ns3::WifiPhy::State, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Ns3WifiMode_Ns3WifiPreamble_Unsigned_char_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, ns3::WifiMode, ns3::WifiPreamble, unsigned char>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3Empty_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, double, ns3::empty, ns3::empty>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::empty, ns3::empty>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::empty, ns3::empty>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::empty, ns3::empty>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::empty, ns3::empty>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Ns3Ptr__lt__ns3Packet_const__gt___Double_Ns3WifiMode_Ns3WifiPreamble_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback, double, ns3::WifiMode, ns3::WifiPreamble>::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::WifiMode, ns3::WifiPreamble>::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::WifiMode, ns3::WifiPreamble>::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::WifiMode, ns3::WifiPreamble>::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback, double, ns3::WifiMode, ns3::WifiPreamble>::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - -def register_Ns3TracedCallback__Unsigned_int_Unsigned_int_Ns3Empty_Ns3Empty_methods(root_module, cls): - ## traced-callback.h: ns3::TracedCallback::TracedCallback() [constructor] - cls.add_constructor([]) - ## traced-callback.h: void ns3::TracedCallback::ConnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('ConnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback::Connect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Connect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - ## traced-callback.h: void ns3::TracedCallback::DisconnectWithoutContext(ns3::CallbackBase const & callback) [member function] - cls.add_method('DisconnectWithoutContext', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True)]) - ## traced-callback.h: void ns3::TracedCallback::Disconnect(ns3::CallbackBase const & callback, std::string path) [member function] - cls.add_method('Disconnect', - 'void', - [param('ns3::CallbackBase&', 'callback', is_const=True), param('std::string', 'path')]) - return - def register_Ns3DeterministicVariable_methods(root_module, cls): ## random-variable.h: ns3::DeterministicVariable::DeterministicVariable(double * d, uint32_t c) [constructor] cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')]) diff --git a/bindings/python/ns3_module_helper.py b/bindings/python/ns3_module_helper.py index 26dad4e00..a15c72061 100644 --- a/bindings/python/ns3_module_helper.py +++ b/bindings/python/ns3_module_helper.py @@ -35,6 +35,8 @@ def register_types(module): module.add_class('WifiHelper', allow_subclassing=False) ## ipv4-address-helper.h: ns3::Ipv4AddressHelper [class] module.add_class('Ipv4AddressHelper', allow_subclassing=False) + ## bridge-helper.h: ns3::BridgeHelper [class] + module.add_class('BridgeHelper', allow_subclassing=False) ## packet-sink-helper.h: ns3::PacketSinkHelper [class] module.add_class('PacketSinkHelper', allow_subclassing=False) ## ns2-mobility-helper.h: ns3::Ns2MobilityHelper [class] @@ -97,6 +99,7 @@ def register_methods(root_module): register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer']) register_Ns3WifiHelper_methods(root_module, root_module['ns3::WifiHelper']) register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper']) + register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper']) register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper']) register_Ns3Ns2MobilityHelper_methods(root_module, root_module['ns3::Ns2MobilityHelper']) return @@ -635,6 +638,19 @@ def register_Ns3Ipv4AddressHelper_methods(root_module, cls): [param('ns3::NetDeviceContainer&', 'c', is_const=True)]) return +def register_Ns3BridgeHelper_methods(root_module, cls): + ## bridge-helper.h: ns3::BridgeHelper::BridgeHelper() [constructor] + cls.add_constructor([]) + ## bridge-helper.h: void ns3::BridgeHelper::SetDeviceAttribute(std::string n1, ns3::AttributeValue const & v1) [member function] + cls.add_method('SetDeviceAttribute', + 'void', + [param('std::string', 'n1'), param('ns3::AttributeValue&', 'v1', is_const=True)]) + ## bridge-helper.h: ns3::NetDeviceContainer ns3::BridgeHelper::Install(ns3::Ptr node, ns3::NetDeviceContainer c) [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::NetDeviceContainer', 'c')]) + return + def register_Ns3PacketSinkHelper_methods(root_module, cls): ## packet-sink-helper.h: ns3::PacketSinkHelper::PacketSinkHelper(std::string protocol, ns3::Address address) [constructor] cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')]) diff --git a/bindings/python/ns3_module_node.py b/bindings/python/ns3_module_node.py index 21e82ae38..c04fb13eb 100644 --- a/bindings/python/ns3_module_node.py +++ b/bindings/python/ns3_module_node.py @@ -1029,7 +1029,7 @@ def register_Ns3Queue_methods(root_module, cls): []) ## queue.h: ns3::Ptr ns3::Queue::Peek() const [member function] cls.add_method('Peek', - 'ns3::Ptr', + 'ns3::Ptr< const ns3::Packet >', [], is_const=True) ## queue.h: void ns3::Queue::DequeueAll() [member function] @@ -1087,7 +1087,7 @@ def register_Ns3Queue_methods(root_module, cls): is_pure_virtual=True, visibility='private', is_virtual=True) ## queue.h: ns3::Ptr ns3::Queue::DoPeek() const [member function] cls.add_method('DoPeek', - 'ns3::Ptr', + 'ns3::Ptr< const ns3::Packet >', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) return @@ -1121,8 +1121,7 @@ def register_Ns3Socket_methods(root_module, cls): ## socket.h: bool ns3::Socket::SetDataSentCallback(ns3::Callback, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty> dataSent) [member function] cls.add_method('SetDataSentCallback', 'bool', - [param('ns3::Callback< void, ns3::Ptr< ns3::Socket >, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'dataSent')], - is_virtual=True) + [param('ns3::Callback< void, ns3::Ptr< ns3::Socket >, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'dataSent')]) ## socket.h: void ns3::Socket::SetSendCallback(ns3::Callback, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty> sendCb) [member function] cls.add_method('SetSendCallback', 'void', @@ -1592,7 +1591,7 @@ def register_Ns3DropTailQueue_methods(root_module, cls): visibility='private', is_virtual=True) ## drop-tail-queue.h: ns3::Ptr ns3::DropTailQueue::DoPeek() const [member function] cls.add_method('DoPeek', - 'ns3::Ptr', + 'ns3::Ptr< const ns3::Packet >', [], is_const=True, visibility='private', is_virtual=True) return diff --git a/bindings/python/ns3modulegen_generated.py b/bindings/python/ns3modulegen_generated.py index e2ae02275..24d92c0c5 100644 --- a/bindings/python/ns3modulegen_generated.py +++ b/bindings/python/ns3modulegen_generated.py @@ -224,6 +224,8 @@ def register_types(module): ns3_module_helper__local.register_types(module) root_module.end_section('ns3_module_helper') + module.add_container('std::vector< unsigned int, std::allocator< unsigned int > >', 'unsigned int') + module.add_container('std::list< unsigned int, std::allocator< unsigned int > >', 'unsigned int') ## Register a nested module for the namespace internal