diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index 3b322c935..7583051fe 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -335,6 +335,11 @@ def register_Ns3CallbackBase_methods(root_module, cls): ## callback.h: ns3::CallbackBase::CallbackBase(ns3::Ptr impl) [constructor] cls.add_constructor([param('ns3::Ptr< ns3::CallbackImplBase >', 'impl')], visibility='protected') + ## callback.h: static std::string ns3::CallbackBase::Demangle(std::string const & mangled) [member function] + cls.add_method('Demangle', + 'std::string', + [param('std::string const &', 'mangled')], + is_static=True, visibility='protected') cls.add_copy_constructor() return @@ -450,10 +455,6 @@ def register_Ns3IntToType__6_methods(root_module, cls): 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', @@ -499,6 +500,8 @@ def register_Ns3Names_methods(root_module, cls): 'void', [], is_static=True) + cls.add_constructor([]) + cls.add_copy_constructor() return def register_Ns3ObjectBase_methods(root_module, cls): @@ -722,15 +725,10 @@ def register_Ns3SeedManager_methods(root_module, cls): 'void', [param('uint32_t', 'seed')], is_static=True) - ## random-variable.h: static void ns3::SeedManager::SetSeed(uint32_t * seed) [member function] - cls.add_method('SetSeed', - 'void', - [param('uint32_t *', 'seed')], - is_static=True) - ## random-variable.h: static void ns3::SeedManager::GetSeed(uint32_t * seed) [member function] + ## random-variable.h: static uint32_t ns3::SeedManager::GetSeed() [member function] cls.add_method('GetSeed', - 'void', - [param('uint32_t *', 'seed')], + 'uint32_t', + [], is_static=True) ## random-variable.h: static void ns3::SeedManager::SetRun(uint32_t run) [member function] cls.add_method('SetRun', @@ -2059,7 +2057,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['long']) + template_parameters=['long long']) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', @@ -2079,7 +2077,7 @@ def register_functions(root_module): module.add_function('TypeNameGet', 'std::string', [], - template_parameters=['unsigned long']) + template_parameters=['unsigned long 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 4ff09ac68..a14c7bad4 100644 --- a/bindings/python/ns3_module_helper.py +++ b/bindings/python/ns3_module_helper.py @@ -183,6 +183,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')]) cls.add_copy_constructor() return @@ -300,6 +304,10 @@ def register_Ns3CsmaHelper_methods(root_module, cls): 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')]) cls.add_copy_constructor() return @@ -459,6 +467,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')]) cls.add_copy_constructor() return @@ -568,6 +580,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')]) cls.add_copy_constructor() return @@ -684,6 +700,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) cls.add_copy_constructor() return @@ -704,6 +725,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) cls.add_copy_constructor() return @@ -816,6 +842,10 @@ def register_Ns3PointToPointHelper_methods(root_module, cls): 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')]) cls.add_copy_constructor() return @@ -858,6 +888,36 @@ def register_Ns3StaticMulticastRouteHelper_methods(root_module, cls): 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')]) + cls.add_copy_constructor() + return + +def register_Ns3TapBridgeHelper_methods(root_module, cls): + ## 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')]) cls.add_copy_constructor() return @@ -928,6 +988,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) cls.add_copy_constructor() return @@ -957,6 +1022,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) cls.add_copy_constructor() return diff --git a/bindings/python/ns3_module_simulator.py b/bindings/python/ns3_module_simulator.py index 1f3934d5d..34875eb85 100644 --- a/bindings/python/ns3_module_simulator.py +++ b/bindings/python/ns3_module_simulator.py @@ -1330,43 +1330,6 @@ def register_Ns3Ns2CalendarScheduler_methods(root_module, cls): cls.add_copy_constructor() 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: static ns3::TypeId ns3::RealtimeSimulatorImpl::GetTypeId() [member function] cls.add_method('GetTypeId', diff --git a/bindings/python/ns3_module_tap_bridge.py b/bindings/python/ns3_module_tap_bridge.py index 66185dc52..ccc64c7b3 100644 --- a/bindings/python/ns3_module_tap_bridge.py +++ b/bindings/python/ns3_module_tap_bridge.py @@ -51,8 +51,6 @@ def register_methods(root_module): 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', @@ -211,6 +209,7 @@ def register_Ns3TapBridge_methods(root_module, cls): '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') + cls.add_copy_constructor() return def register_functions(root_module):