From 65d4f0972c41d4004c8054d08e48952f0ed9635a Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Mon, 14 Jul 2008 11:42:49 +0100 Subject: [PATCH] Rescan API --- bindings/python/callbacks_list.py | 4 +- bindings/python/ns3_module_bridge.py | 153 +++++++++++++++++++ bindings/python/ns3_module_common.py | 16 +- bindings/python/ns3_module_contrib.py | 2 +- bindings/python/ns3_module_core.py | 104 ++++++------- bindings/python/ns3_module_csma.py | 18 ++- bindings/python/ns3_module_global_routing.py | 2 +- bindings/python/ns3_module_internet_stack.py | 14 +- bindings/python/ns3_module_mobility.py | 28 ++-- bindings/python/ns3_module_node.py | 148 +++++++++--------- bindings/python/ns3_module_olsr.py | 6 +- bindings/python/ns3_module_onoff.py | 2 +- bindings/python/ns3_module_packet_sink.py | 2 +- bindings/python/ns3_module_point_to_point.py | 10 +- bindings/python/ns3_module_simulator.py | 10 +- bindings/python/ns3_module_udp_echo.py | 4 +- bindings/python/ns3_module_wifi.py | 72 ++++----- bindings/python/ns3modulegen_generated.py | 34 +++++ 18 files changed, 416 insertions(+), 213 deletions(-) create mode 100644 bindings/python/ns3_module_bridge.py diff --git a/bindings/python/callbacks_list.py b/bindings/python/callbacks_list.py index 718c72288..2ea5db414 100644 --- a/bindings/python/callbacks_list.py +++ b/bindings/python/callbacks_list.py @@ -1,12 +1,12 @@ callback_classes = [ ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Mac48Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty'], + ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'], + ['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'], ['void', 'ns3::Ptr', 'double', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'double', 'ns3::WifiMode', 'ns3::WifiPreamble', 'ns3::empty', 'ns3::empty'], ] diff --git a/bindings/python/ns3_module_bridge.py b/bindings/python/ns3_module_bridge.py new file mode 100644 index 000000000..b15f97df0 --- /dev/null +++ b/bindings/python/ns3_module_bridge.py @@ -0,0 +1,153 @@ +from pybindgen import Module, FileCodeSink, write_preamble, param, retval + +def register_types(module): + root_module = module.get_root() + + ## bridge-net-device.h: ns3::BridgeNetDevice [class] + module.add_class('BridgeNetDevice', parent=root_module['ns3::NetDevice']) + ## bridge-channel.h: ns3::BridgeChannel [class] + module.add_class('BridgeChannel', parent=root_module['ns3::Channel']) + + ## 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 TimeStepPrecision + + nested_module = module.add_cpp_namespace('TimeStepPrecision') + register_types_ns3_TimeStepPrecision(nested_module) + + + ## 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 olsr + + nested_module = module.add_cpp_namespace('olsr') + register_types_ns3_olsr(nested_module) + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + +def register_types_ns3_TimeStepPrecision(module): + root_module = module.get_root() + + +def register_types_ns3_Config(module): + root_module = module.get_root() + + +def register_types_ns3_olsr(module): + root_module = module.get_root() + + +def register_methods(root_module): + register_Ns3BridgeNetDevice_methods(root_module, root_module['ns3::BridgeNetDevice']) + register_Ns3BridgeChannel_methods(root_module, root_module['ns3::BridgeChannel']) + return + +def register_Ns3BridgeNetDevice_methods(root_module, cls): + ## bridge-net-device.h: static ns3::TypeId ns3::BridgeNetDevice::GetTypeId() [member function] + cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) + ## bridge-net-device.h: ns3::BridgeNetDevice::BridgeNetDevice() [constructor] + cls.add_constructor([], visibility='public') + ## bridge-net-device.h: void ns3::BridgeNetDevice::AddBridgePort(ns3::Ptr bridgePort) [member function] + cls.add_method('AddBridgePort', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'bridgePort')]) + ## bridge-net-device.h: void ns3::BridgeNetDevice::SetName(std::string const name) [member function] + cls.add_method('SetName', 'void', [param('std::string', 'name', is_const=True)], is_virtual=True) + ## bridge-net-device.h: std::string ns3::BridgeNetDevice::GetName() const [member function] + cls.add_method('GetName', 'std::string', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: void ns3::BridgeNetDevice::SetIfIndex(uint32_t const index) [member function] + cls.add_method('SetIfIndex', 'void', [param('uint32_t', 'index', is_const=True)], is_virtual=True) + ## bridge-net-device.h: uint32_t ns3::BridgeNetDevice::GetIfIndex() const [member function] + cls.add_method('GetIfIndex', 'uint32_t', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: ns3::Ptr ns3::BridgeNetDevice::GetChannel() const [member function] + cls.add_method('GetChannel', 'ns3::Ptr< ns3::Channel >', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetAddress() const [member function] + cls.add_method('GetAddress', 'ns3::Address', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::SetMtu(uint16_t const mtu) [member function] + cls.add_method('SetMtu', 'bool', [param('uint16_t', 'mtu', is_const=True)], is_virtual=True) + ## bridge-net-device.h: uint16_t ns3::BridgeNetDevice::GetMtu() const [member function] + cls.add_method('GetMtu', 'uint16_t', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsLinkUp() const [member function] + cls.add_method('IsLinkUp', 'bool', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: void ns3::BridgeNetDevice::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 >', 'callback')], is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsBroadcast() const [member function] + cls.add_method('IsBroadcast', 'bool', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetBroadcast() const [member function] + cls.add_method('GetBroadcast', 'ns3::Address', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsMulticast() const [member function] + cls.add_method('IsMulticast', 'bool', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetMulticast() const [member function] + cls.add_method('GetMulticast', 'ns3::Address', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::MakeMulticastAddress(ns3::Ipv4Address multicastGroup) const [member function] + cls.add_method('MakeMulticastAddress', 'ns3::Address', [param('ns3::Ipv4Address', 'multicastGroup')], is_const=True, is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::IsPointToPoint() const [member function] + cls.add_method('IsPointToPoint', 'bool', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::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&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::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&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) + ## bridge-net-device.h: ns3::Ptr ns3::BridgeNetDevice::GetNode() const [member function] + cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: void ns3::BridgeNetDevice::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_virtual=True) + ## bridge-net-device.h: bool ns3::BridgeNetDevice::NeedsArp() const [member function] + cls.add_method('NeedsArp', 'bool', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: void ns3::BridgeNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] + cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_virtual=True) + ## bridge-net-device.h: void ns3::BridgeNetDevice::DoDispose() [member function] + cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True) + ## bridge-net-device.h: void ns3::BridgeNetDevice::ReceiveFromDevice(ns3::Ptr device, ns3::Ptr packet, uint16_t protocol, ns3::Address const & source, ns3::Address const & destination, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('ReceiveFromDevice', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address&', 'source', is_const=True), param('ns3::Address&', 'destination', is_const=True), param('ns3::NetDevice::PacketType', 'packetType')], visibility='protected') + ## bridge-net-device.h: void ns3::BridgeNetDevice::ForwardUnicast(ns3::Ptr incomingPort, ns3::Ptr packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function] + cls.add_method('ForwardUnicast', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], visibility='protected') + ## bridge-net-device.h: void ns3::BridgeNetDevice::ForwardBroadcast(ns3::Ptr incomingPort, ns3::Ptr packet, uint16_t protocol, ns3::Mac48Address src, ns3::Mac48Address dst) [member function] + cls.add_method('ForwardBroadcast', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'incomingPort'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dst')], visibility='protected') + ## bridge-net-device.h: void ns3::BridgeNetDevice::Learn(ns3::Mac48Address source, ns3::Ptr port) [member function] + cls.add_method('Learn', 'void', [param('ns3::Mac48Address', 'source'), param('ns3::Ptr< ns3::NetDevice >', 'port')], visibility='protected') + ## bridge-net-device.h: ns3::Ptr ns3::BridgeNetDevice::GetLearnedState(ns3::Mac48Address source) [member function] + cls.add_method('GetLearnedState', 'ns3::Ptr< ns3::NetDevice >', [param('ns3::Mac48Address', 'source')], visibility='protected') + return + +def register_Ns3BridgeChannel_methods(root_module, cls): + ## bridge-channel.h: static ns3::TypeId ns3::BridgeChannel::GetTypeId() [member function] + cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) + ## bridge-channel.h: ns3::BridgeChannel::BridgeChannel() [constructor] + cls.add_constructor([], visibility='public') + ## bridge-channel.h: void ns3::BridgeChannel::AddChannel(ns3::Ptr bridgedChannel) [member function] + cls.add_method('AddChannel', 'void', [param('ns3::Ptr< ns3::Channel >', 'bridgedChannel')]) + ## bridge-channel.h: uint32_t ns3::BridgeChannel::GetNDevices() const [member function] + cls.add_method('GetNDevices', 'uint32_t', [], is_const=True, is_virtual=True) + ## bridge-channel.h: ns3::Ptr ns3::BridgeChannel::GetDevice(uint32_t i) const [member function] + cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_const=True, is_virtual=True) + return + +def register_functions(root_module): + module = root_module + register_functions_ns3_internal(module.get_submodule('internal'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) + return + +def register_functions_ns3_internal(module, root_module): + return + +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_Config(module, root_module): + return + +def register_functions_ns3_olsr(module, root_module): + return + diff --git a/bindings/python/ns3_module_common.py b/bindings/python/ns3_module_common.py index 658c1fca3..ee80eda02 100644 --- a/bindings/python/ns3_module_common.py +++ b/bindings/python/ns3_module_common.py @@ -24,27 +24,27 @@ def register_types(module): ## buffer.h: ns3::Buffer::Iterator [class] module.add_class('Iterator', outer_class=root_module['ns3::Buffer']) ## chunk.h: ns3::Chunk [class] - module.add_class('Chunk', allow_subclassing=True, parent=root_module['ns3::ObjectBase']) + module.add_class('Chunk', parent=root_module['ns3::ObjectBase']) ## data-rate.h: ns3::DataRate [class] module.add_class('DataRate') ## tag.h: ns3::Tag [class] - module.add_class('Tag', allow_subclassing=True, parent=root_module['ns3::ObjectBase']) + module.add_class('Tag', parent=root_module['ns3::ObjectBase']) ## pcap-writer.h: ns3::PcapWriter [class] module.add_class('PcapWriter', parent=root_module['ns3::RefCountBase']) ## data-rate.h: ns3::DataRateChecker [class] module.add_class('DataRateChecker', parent=root_module['ns3::AttributeChecker']) ## error-model.h: ns3::ErrorModel [class] - module.add_class('ErrorModel', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('ErrorModel', parent=root_module['ns3::Object']) ## header.h: ns3::Header [class] - module.add_class('Header', allow_subclassing=True, parent=root_module['ns3::Chunk']) + module.add_class('Header', parent=root_module['ns3::Chunk']) ## trailer.h: ns3::Trailer [class] - module.add_class('Trailer', allow_subclassing=True, parent=root_module['ns3::Chunk']) + module.add_class('Trailer', parent=root_module['ns3::Chunk']) ## error-model.h: ns3::ListErrorModel [class] - module.add_class('ListErrorModel', allow_subclassing=True, parent=root_module['ns3::ErrorModel']) + module.add_class('ListErrorModel', parent=root_module['ns3::ErrorModel']) ## data-rate.h: ns3::DataRateValue [class] - module.add_class('DataRateValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('DataRateValue', parent=root_module['ns3::AttributeValue']) ## error-model.h: ns3::RateErrorModel [class] - module.add_class('RateErrorModel', allow_subclassing=True, parent=root_module['ns3::ErrorModel']) + module.add_class('RateErrorModel', parent=root_module['ns3::ErrorModel']) ## Register a nested module for the namespace internal diff --git a/bindings/python/ns3_module_contrib.py b/bindings/python/ns3_module_contrib.py index 852b23750..550413ff7 100644 --- a/bindings/python/ns3_module_contrib.py +++ b/bindings/python/ns3_module_contrib.py @@ -16,7 +16,7 @@ def register_types(module): ## gtk-config-store.h: ns3::GtkConfigStore [class] module.add_class('GtkConfigStore') ## config-store.h: ns3::ConfigStore [class] - module.add_class('ConfigStore', allow_subclassing=True, parent=root_module['ns3::ObjectBase']) + module.add_class('ConfigStore', parent=root_module['ns3::ObjectBase']) ## delay-jitter-estimation.h: ns3::DelayJitterEstimation [class] module.add_class('DelayJitterEstimation') diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index 6020f63c7..0ad9704e9 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -32,7 +32,7 @@ def register_types(module): ## object-factory.h: ns3::ObjectFactory [class] module.add_class('ObjectFactory') ## attribute.h: ns3::AttributeAccessor [class] - module.add_class('AttributeAccessor', allow_subclassing=True, parent=root_module['ns3::RefCountBase']) + module.add_class('AttributeAccessor', parent=root_module['ns3::RefCountBase']) ## random-variable.h: ns3::ParetoVariable [class] module.add_class('ParetoVariable', parent=root_module['ns3::RandomVariable']) ## random-variable.h: ns3::ConstantVariable [class] @@ -40,7 +40,7 @@ def register_types(module): ## random-variable.h: ns3::EmpiricalVariable [class] module.add_class('EmpiricalVariable', parent=root_module['ns3::RandomVariable']) ## enum.h: ns3::EnumChecker [class] - module.add_class('EnumChecker', allow_subclassing=True, parent=root_module['ns3::AttributeChecker']) + module.add_class('EnumChecker', parent=root_module['ns3::AttributeChecker']) ## empty.h: ns3::empty [class] module.add_class('empty') ## object-base.h: ns3::ObjectBase [class] @@ -82,7 +82,7 @@ def register_types(module): ## random-variable.h: ns3::IntEmpiricalVariable [class] module.add_class('IntEmpiricalVariable', parent=root_module['ns3::EmpiricalVariable']) ## pointer.h: ns3::PointerChecker [class] - module.add_class('PointerChecker', allow_subclassing=True, parent=root_module['ns3::AttributeChecker']) + module.add_class('PointerChecker', parent=root_module['ns3::AttributeChecker']) ## random-variable.h: ns3::WeibullVariable [class] module.add_class('WeibullVariable', parent=root_module['ns3::RandomVariable']) ## callback.h: ns3::CallbackBase [class] @@ -118,47 +118,47 @@ def register_types(module): ## random-variable.h: ns3::UniformVariable [class] module.add_class('UniformVariable', parent=root_module['ns3::RandomVariable']) ## object.h: ns3::Object [class] - module.add_class('Object', peekref_method='GetReferenceCount', parent=root_module['ns3::ObjectBase'], incref_method='Ref', decref_method='Unref', allow_subclassing=True, automatic_type_narrowing=True) + module.add_class('Object', incref_method='Ref', automatic_type_narrowing=True, decref_method='Unref', parent=root_module['ns3::ObjectBase'], peekref_method='GetReferenceCount') ## object.h: ns3::Object::AggregateIterator [class] module.add_class('AggregateIterator', outer_class=root_module['ns3::Object']) ## random-variable.h: ns3::SequentialVariable [class] module.add_class('SequentialVariable', parent=root_module['ns3::RandomVariable']) ## object-vector.h: ns3::ObjectVectorChecker [class] - module.add_class('ObjectVectorChecker', allow_subclassing=True, parent=root_module['ns3::AttributeChecker']) + module.add_class('ObjectVectorChecker', parent=root_module['ns3::AttributeChecker']) ## string.h: ns3::StringChecker [class] module.add_class('StringChecker', parent=root_module['ns3::AttributeChecker']) ## object-vector.h: ns3::ObjectVectorValue [class] - module.add_class('ObjectVectorValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('ObjectVectorValue', parent=root_module['ns3::AttributeValue']) ## boolean.h: ns3::BooleanChecker [class] module.add_class('BooleanChecker', parent=root_module['ns3::AttributeChecker']) ## uinteger.h: ns3::UintegerValue [class] - module.add_class('UintegerValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('UintegerValue', parent=root_module['ns3::AttributeValue']) ## object-vector.h: ns3::ObjectVectorAccessor [class] - module.add_class('ObjectVectorAccessor', allow_subclassing=True, parent=root_module['ns3::AttributeAccessor']) + module.add_class('ObjectVectorAccessor', parent=root_module['ns3::AttributeAccessor']) ## pointer.h: ns3::PointerValue [class] - module.add_class('PointerValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('PointerValue', parent=root_module['ns3::AttributeValue']) ## object-factory.h: ns3::ObjectFactoryChecker [class] module.add_class('ObjectFactoryChecker', parent=root_module['ns3::AttributeChecker']) ## type-id.h: ns3::TypeIdChecker [class] module.add_class('TypeIdChecker', parent=root_module['ns3::AttributeChecker']) ## double.h: ns3::DoubleValue [class] - module.add_class('DoubleValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) - ## string.h: ns3::StringValue [class] - module.add_class('StringValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('DoubleValue', parent=root_module['ns3::AttributeValue']) ## type-id.h: ns3::TypeIdValue [class] - module.add_class('TypeIdValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('TypeIdValue', parent=root_module['ns3::AttributeValue']) ## enum.h: ns3::EnumValue [class] - module.add_class('EnumValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('EnumValue', parent=root_module['ns3::AttributeValue']) ## random-variable.h: ns3::RandomVariableValue [class] - module.add_class('RandomVariableValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('RandomVariableValue', parent=root_module['ns3::AttributeValue']) ## object-factory.h: ns3::ObjectFactoryValue [class] - module.add_class('ObjectFactoryValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('ObjectFactoryValue', parent=root_module['ns3::AttributeValue']) ## integer.h: ns3::IntegerValue [class] - module.add_class('IntegerValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) - ## attribute.h: ns3::EmptyAttributeValue [class] - module.add_class('EmptyAttributeValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('IntegerValue', parent=root_module['ns3::AttributeValue']) ## boolean.h: ns3::BooleanValue [class] - module.add_class('BooleanValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('BooleanValue', parent=root_module['ns3::AttributeValue']) + ## string.h: ns3::StringValue [class] + module.add_class('StringValue', parent=root_module['ns3::AttributeValue']) + ## attribute.h: ns3::EmptyAttributeValue [class] + module.add_class('EmptyAttributeValue', parent=root_module['ns3::AttributeValue']) ## traced-value.h: ns3::TracedValue [class] module.add_class('TracedValue', template_parameters=['unsigned int']) ## traced-value.h: ns3::TracedValue [class] @@ -273,14 +273,14 @@ def register_methods(root_module): register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3DoubleValue_methods(root_module, root_module['ns3::DoubleValue']) - register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue']) register_Ns3RandomVariableValue_methods(root_module, root_module['ns3::RandomVariableValue']) register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3IntegerValue_methods(root_module, root_module['ns3::IntegerValue']) - register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) register_Ns3BooleanValue_methods(root_module, root_module['ns3::BooleanValue']) + register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue']) + register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) register_Ns3TracedValue__Unsigned_int_methods(root_module, root_module['ns3::TracedValue< unsigned int >']) return @@ -1061,23 +1061,6 @@ def register_Ns3DoubleValue_methods(root_module, cls): cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True) return -def register_Ns3StringValue_methods(root_module, cls): - ## string.h: ns3::StringValue::StringValue() [constructor] - cls.add_constructor([], visibility='public') - ## string.h: ns3::StringValue::StringValue(std::string const & value) [constructor] - cls.add_constructor([param('std::string&', 'value', is_const=True)], visibility='public') - ## string.h: void ns3::StringValue::Set(std::string const & value) [member function] - cls.add_method('Set', 'void', [param('std::string&', 'value', is_const=True)]) - ## string.h: std::string ns3::StringValue::Get() const [member function] - cls.add_method('Get', 'std::string', [], is_const=True) - ## string.h: ns3::Ptr ns3::StringValue::Copy() const [member function] - cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True) - ## string.h: std::string ns3::StringValue::SerializeToString(ns3::Ptr checker) const [member function] - cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True) - ## string.h: bool ns3::StringValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] - cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True) - return - def register_Ns3TypeIdValue_methods(root_module, cls): ## type-id.h: ns3::TypeIdValue::TypeIdValue() [constructor] cls.add_constructor([], visibility='public') @@ -1163,19 +1146,6 @@ def register_Ns3IntegerValue_methods(root_module, cls): cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True) return -def register_Ns3EmptyAttributeValue_methods(root_module, cls): - ## attribute.h: ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor] - cls.add_constructor([param('ns3::EmptyAttributeValue&', 'arg0', is_const=True)], visibility='public') - ## attribute.h: ns3::EmptyAttributeValue::EmptyAttributeValue() [constructor] - cls.add_constructor([], visibility='public') - ## attribute.h: ns3::Ptr ns3::EmptyAttributeValue::Copy() const [member function] - cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, visibility='private', is_virtual=True) - ## attribute.h: std::string ns3::EmptyAttributeValue::SerializeToString(ns3::Ptr checker) const [member function] - cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, visibility='private', is_virtual=True) - ## attribute.h: bool ns3::EmptyAttributeValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] - cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], visibility='private', is_virtual=True) - return - def register_Ns3BooleanValue_methods(root_module, cls): ## boolean.h: ns3::BooleanValue::BooleanValue(ns3::BooleanValue const & arg0) [copy constructor] cls.add_constructor([param('ns3::BooleanValue&', 'arg0', is_const=True)], visibility='public') @@ -1196,6 +1166,36 @@ def register_Ns3BooleanValue_methods(root_module, cls): cls.add_output_stream_operator() return +def register_Ns3StringValue_methods(root_module, cls): + ## string.h: ns3::StringValue::StringValue() [constructor] + cls.add_constructor([], visibility='public') + ## string.h: ns3::StringValue::StringValue(std::string const & value) [constructor] + cls.add_constructor([param('std::string&', 'value', is_const=True)], visibility='public') + ## string.h: void ns3::StringValue::Set(std::string const & value) [member function] + cls.add_method('Set', 'void', [param('std::string&', 'value', is_const=True)]) + ## string.h: std::string ns3::StringValue::Get() const [member function] + cls.add_method('Get', 'std::string', [], is_const=True) + ## string.h: ns3::Ptr ns3::StringValue::Copy() const [member function] + cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, is_virtual=True) + ## string.h: std::string ns3::StringValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, is_virtual=True) + ## string.h: bool ns3::StringValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_virtual=True) + return + +def register_Ns3EmptyAttributeValue_methods(root_module, cls): + ## attribute.h: ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EmptyAttributeValue&', 'arg0', is_const=True)], visibility='public') + ## attribute.h: ns3::EmptyAttributeValue::EmptyAttributeValue() [constructor] + cls.add_constructor([], visibility='public') + ## attribute.h: ns3::Ptr ns3::EmptyAttributeValue::Copy() const [member function] + cls.add_method('Copy', 'ns3::Ptr< ns3::AttributeValue >', [], is_const=True, visibility='private', is_virtual=True) + ## attribute.h: std::string ns3::EmptyAttributeValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', 'std::string', [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], is_const=True, visibility='private', is_virtual=True) + ## attribute.h: bool ns3::EmptyAttributeValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', 'bool', [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], visibility='private', is_virtual=True) + return + def register_Ns3TracedValue__Unsigned_int_methods(root_module, cls): ## traced-value.h: ns3::TracedValue::TracedValue() [constructor] cls.add_constructor([], visibility='public') diff --git a/bindings/python/ns3_module_csma.py b/bindings/python/ns3_module_csma.py index ee4152eac..aa310a6b4 100644 --- a/bindings/python/ns3_module_csma.py +++ b/bindings/python/ns3_module_csma.py @@ -10,9 +10,9 @@ def register_types(module): ## backoff.h: ns3::Backoff [class] module.add_class('Backoff') ## csma-channel.h: ns3::CsmaChannel [class] - module.add_class('CsmaChannel', allow_subclassing=True, parent=root_module['ns3::Channel']) + module.add_class('CsmaChannel', parent=root_module['ns3::Channel']) ## csma-net-device.h: ns3::CsmaNetDevice [class] - module.add_class('CsmaNetDevice', allow_subclassing=True, parent=root_module['ns3::NetDevice']) + module.add_class('CsmaNetDevice', parent=root_module['ns3::NetDevice']) ## csma-net-device.h: ns3::CsmaNetDevice::CsmaEncapsulationMode [enumeration] module.add_enum('CsmaEncapsulationMode', ['ETHERNET_V1', 'IP_ARP', 'RAW', 'LLC'], outer_class=root_module['ns3::CsmaNetDevice']) @@ -159,8 +159,8 @@ def register_Ns3CsmaNetDevice_methods(root_module, cls): cls.add_method('SetQueue', 'void', [param('ns3::Ptr< ns3::Queue >', 'queue')]) ## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveErrorModel(ns3::Ptr em) [member function] cls.add_method('SetReceiveErrorModel', 'void', [param('ns3::Ptr< ns3::ErrorModel >', 'em')]) - ## csma-net-device.h: void ns3::CsmaNetDevice::Receive(ns3::Ptr p) [member function] - cls.add_method('Receive', 'void', [param('ns3::Ptr< ns3::Packet >', 'p')]) + ## csma-net-device.h: void ns3::CsmaNetDevice::Receive(ns3::Ptr p, ns3::Ptr sender) [member function] + cls.add_method('Receive', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Ptr< ns3::CsmaNetDevice >', 'sender')]) ## csma-net-device.h: bool ns3::CsmaNetDevice::IsSendEnabled() [member function] cls.add_method('IsSendEnabled', 'bool', []) ## csma-net-device.h: void ns3::CsmaNetDevice::SetSendEnable(bool enable) [member function] @@ -205,20 +205,22 @@ def register_Ns3CsmaNetDevice_methods(root_module, cls): cls.add_method('IsPointToPoint', 'bool', [], is_const=True, is_virtual=True) ## csma-net-device.h: bool ns3::CsmaNetDevice::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&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) + ## csma-net-device.h: bool ns3::CsmaNetDevice::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&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) ## csma-net-device.h: ns3::Ptr ns3::CsmaNetDevice::GetNode() const [member function] cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True) ## csma-net-device.h: void ns3::CsmaNetDevice::SetNode(ns3::Ptr node) [member function] cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_virtual=True) ## csma-net-device.h: bool ns3::CsmaNetDevice::NeedsArp() const [member function] cls.add_method('NeedsArp', 'bool', [], is_const=True, is_virtual=True) - ## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> cb) [member function] - cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] + cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_virtual=True) ## csma-net-device.h: void ns3::CsmaNetDevice::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True) ## csma-net-device.h: ns3::Ptr ns3::CsmaNetDevice::GetQueue() const [member function] cls.add_method('GetQueue', 'ns3::Ptr< ns3::Queue >', [], is_const=True, visibility='protected') - ## csma-net-device.h: void ns3::CsmaNetDevice::AddHeader(ns3::Ptr p, ns3::Mac48Address dest, uint16_t protocolNumber) [member function] - cls.add_method('AddHeader', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Mac48Address', 'dest'), param('uint16_t', 'protocolNumber')], visibility='protected') + ## csma-net-device.h: void ns3::CsmaNetDevice::AddHeader(ns3::Ptr p, ns3::Mac48Address source, ns3::Mac48Address dest, uint16_t protocolNumber) [member function] + cls.add_method('AddHeader', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('ns3::Mac48Address', 'source'), param('ns3::Mac48Address', 'dest'), param('uint16_t', 'protocolNumber')], visibility='protected') ## csma-net-device.h: bool ns3::CsmaNetDevice::ProcessHeader(ns3::Ptr p, uint16_t & param) [member function] cls.add_method('ProcessHeader', 'bool', [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t&', 'param')], visibility='protected') return diff --git a/bindings/python/ns3_module_global_routing.py b/bindings/python/ns3_module_global_routing.py index 026ea0ac0..6a80d9623 100644 --- a/bindings/python/ns3_module_global_routing.py +++ b/bindings/python/ns3_module_global_routing.py @@ -16,7 +16,7 @@ def register_types(module): ## global-router-interface.h: ns3::GlobalRoutingLinkRecord::LinkType [enumeration] module.add_enum('LinkType', ['Unknown', 'PointToPoint', 'TransitNetwork', 'StubNetwork', 'VirtualLink'], outer_class=root_module['ns3::GlobalRoutingLinkRecord']) ## global-router-interface.h: ns3::GlobalRouter [class] - module.add_class('GlobalRouter', allow_subclassing=True, is_singleton=True, parent=root_module['ns3::Object']) + module.add_class('GlobalRouter', is_singleton=True, parent=root_module['ns3::Object']) ## Register a nested module for the namespace internal diff --git a/bindings/python/ns3_module_internet_stack.py b/bindings/python/ns3_module_internet_stack.py index c430e0d34..6adcbf070 100644 --- a/bindings/python/ns3_module_internet_stack.py +++ b/bindings/python/ns3_module_internet_stack.py @@ -4,17 +4,17 @@ def register_types(module): root_module = module.get_root() ## ipv4-interface.h: ns3::Ipv4Interface [class] - module.add_class('Ipv4Interface', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Ipv4Interface', parent=root_module['ns3::Object']) ## udp-header.h: ns3::UdpHeader [class] - module.add_class('UdpHeader', allow_subclassing=True, parent=root_module['ns3::Header']) + module.add_class('UdpHeader', parent=root_module['ns3::Header']) ## tcp-header.h: ns3::TcpHeader [class] - module.add_class('TcpHeader', allow_subclassing=True, parent=root_module['ns3::Header']) + module.add_class('TcpHeader', parent=root_module['ns3::Header']) ## tcp-header.h: ns3::TcpHeader::Flags_t [enumeration] module.add_enum('Flags_t', ['NONE', 'FIN', 'SYN', 'RST', 'PSH', 'ACK', 'URG'], outer_class=root_module['ns3::TcpHeader']) ## ipv4-static-routing.h: ns3::Ipv4StaticRouting [class] - module.add_class('Ipv4StaticRouting', allow_subclassing=True, parent=root_module['ns3::Ipv4RoutingProtocol']) + module.add_class('Ipv4StaticRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) ## ipv4-l3-protocol.h: ns3::Ipv4L3Protocol [class] - module.add_class('Ipv4L3Protocol', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Ipv4L3Protocol', parent=root_module['ns3::Object']) ## Register a nested module for the namespace internal @@ -245,8 +245,8 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('SetDefaultTtl', 'void', [param('uint8_t', 'ttl')]) ## ipv4-l3-protocol.h: ns3::Ptr ns3::Ipv4L3Protocol::FindInterfaceForDevice(ns3::Ptr device) [member function] cls.add_method('FindInterfaceForDevice', 'ns3::Ptr< ns3::Ipv4Interface >', [param('ns3::Ptr< const ns3::NetDevice >', 'device')]) - ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from) [member function] - cls.add_method('Receive', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address&', 'from', is_const=True)]) + ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', 'void', [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address&', 'from', is_const=True), param('ns3::Address&', 'to', is_const=True), param('ns3::NetDevice::PacketType', 'packetType')]) ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol) [member function] cls.add_method('Send', 'void', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol')]) ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function] diff --git a/bindings/python/ns3_module_mobility.py b/bindings/python/ns3_module_mobility.py index 2f5cedefe..470560ba9 100644 --- a/bindings/python/ns3_module_mobility.py +++ b/bindings/python/ns3_module_mobility.py @@ -16,37 +16,37 @@ def register_types(module): ## rectangle.h: ns3::Rectangle::Side [enumeration] module.add_enum('Side', ['RIGHT', 'LEFT', 'TOP', 'BOTTOM'], outer_class=root_module['ns3::Rectangle']) ## position-allocator.h: ns3::PositionAllocator [class] - module.add_class('PositionAllocator', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('PositionAllocator', parent=root_module['ns3::Object']) ## position-allocator.h: ns3::ListPositionAllocator [class] - module.add_class('ListPositionAllocator', allow_subclassing=True, parent=root_module['ns3::PositionAllocator']) + module.add_class('ListPositionAllocator', parent=root_module['ns3::PositionAllocator']) ## rectangle.h: ns3::RectangleValue [class] - module.add_class('RectangleValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('RectangleValue', parent=root_module['ns3::AttributeValue']) ## position-allocator.h: ns3::RandomRectanglePositionAllocator [class] - module.add_class('RandomRectanglePositionAllocator', allow_subclassing=True, parent=root_module['ns3::PositionAllocator']) + module.add_class('RandomRectanglePositionAllocator', parent=root_module['ns3::PositionAllocator']) ## vector.h: ns3::VectorValue [class] - module.add_class('VectorValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('VectorValue', parent=root_module['ns3::AttributeValue']) ## position-allocator.h: ns3::RandomDiscPositionAllocator [class] - module.add_class('RandomDiscPositionAllocator', allow_subclassing=True, parent=root_module['ns3::PositionAllocator']) + module.add_class('RandomDiscPositionAllocator', parent=root_module['ns3::PositionAllocator']) ## mobility-model.h: ns3::MobilityModel [class] - module.add_class('MobilityModel', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('MobilityModel', parent=root_module['ns3::Object']) ## random-direction-2d-mobility-model.h: ns3::RandomDirection2dMobilityModel [class] - module.add_class('RandomDirection2dMobilityModel', allow_subclassing=True, parent=root_module['ns3::MobilityModel']) + module.add_class('RandomDirection2dMobilityModel', parent=root_module['ns3::MobilityModel']) ## position-allocator.h: ns3::GridPositionAllocator [class] - module.add_class('GridPositionAllocator', allow_subclassing=True, parent=root_module['ns3::PositionAllocator']) + module.add_class('GridPositionAllocator', parent=root_module['ns3::PositionAllocator']) ## position-allocator.h: ns3::GridPositionAllocator::LayoutType [enumeration] module.add_enum('LayoutType', ['ROW_FIRST', 'COLUMN_FIRST'], outer_class=root_module['ns3::GridPositionAllocator']) ## random-waypoint-mobility-model.h: ns3::RandomWaypointMobilityModel [class] - module.add_class('RandomWaypointMobilityModel', allow_subclassing=True, parent=root_module['ns3::MobilityModel']) + module.add_class('RandomWaypointMobilityModel', parent=root_module['ns3::MobilityModel']) ## random-walk-2d-mobility-model.h: ns3::RandomWalk2dMobilityModel [class] - module.add_class('RandomWalk2dMobilityModel', allow_subclassing=True, parent=root_module['ns3::MobilityModel']) + module.add_class('RandomWalk2dMobilityModel', parent=root_module['ns3::MobilityModel']) ## random-walk-2d-mobility-model.h: ns3::RandomWalk2dMobilityModel::Mode [enumeration] module.add_enum('Mode', ['MODE_DISTANCE', 'MODE_TIME'], outer_class=root_module['ns3::RandomWalk2dMobilityModel']) ## static-speed-mobility-model.h: ns3::StaticSpeedMobilityModel [class] - module.add_class('StaticSpeedMobilityModel', allow_subclassing=True, parent=root_module['ns3::MobilityModel']) + module.add_class('StaticSpeedMobilityModel', parent=root_module['ns3::MobilityModel']) ## hierarchical-mobility-model.h: ns3::HierarchicalMobilityModel [class] - module.add_class('HierarchicalMobilityModel', allow_subclassing=True, parent=root_module['ns3::MobilityModel']) + module.add_class('HierarchicalMobilityModel', parent=root_module['ns3::MobilityModel']) ## static-mobility-model.h: ns3::StaticMobilityModel [class] - module.add_class('StaticMobilityModel', allow_subclassing=True, parent=root_module['ns3::MobilityModel']) + module.add_class('StaticMobilityModel', parent=root_module['ns3::MobilityModel']) ## Register a nested module for the namespace internal diff --git a/bindings/python/ns3_module_node.py b/bindings/python/ns3_module_node.py index d01bad33a..c3d161e8f 100644 --- a/bindings/python/ns3_module_node.py +++ b/bindings/python/ns3_module_node.py @@ -40,15 +40,15 @@ def register_types(module): ## ipv4-address.h: ns3::Ipv4Mask [class] module.add_class('Ipv4Mask') ## ipv4-address.h: ns3::Ipv4AddressValue [class] - module.add_class('Ipv4AddressValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('Ipv4AddressValue', parent=root_module['ns3::AttributeValue']) ## ipv4.h: ns3::Ipv4RoutingProtocol [class] - module.add_class('Ipv4RoutingProtocol', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Ipv4RoutingProtocol', parent=root_module['ns3::Object']) ## mac48-address.h: ns3::Mac48AddressValue [class] - module.add_class('Mac48AddressValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('Mac48AddressValue', parent=root_module['ns3::AttributeValue']) ## ipv4-address.h: ns3::Ipv4MaskValue [class] - module.add_class('Ipv4MaskValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('Ipv4MaskValue', parent=root_module['ns3::AttributeValue']) ## socket.h: ns3::SocketAddressTag [class] - module.add_class('SocketAddressTag', allow_subclassing=True, parent=root_module['ns3::Tag']) + module.add_class('SocketAddressTag', parent=root_module['ns3::Tag']) ## inet-socket-address.h: ns3::InetSocketAddress [class] module.add_class('InetSocketAddress') ## inet-socket-address.h: ns3::InetSocketAddress [class] @@ -58,51 +58,53 @@ def register_types(module): ## ipv4-address.h: ns3::Ipv4Address [class] root_module['ns3::Ipv4Address'].implicitly_converts_to(root_module['ns3::Address']) ## application.h: ns3::Application [class] - module.add_class('Application', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Application', parent=root_module['ns3::Object']) ## queue.h: ns3::Queue [class] - module.add_class('Queue', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Queue', parent=root_module['ns3::Object']) ## socket.h: ns3::Socket [class] - module.add_class('Socket', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Socket', parent=root_module['ns3::Object']) ## socket.h: ns3::Socket::SocketErrno [enumeration] module.add_enum('SocketErrno', ['ERROR_NOTERROR', 'ERROR_ISCONN', 'ERROR_NOTCONN', 'ERROR_MSGSIZE', 'ERROR_AGAIN', 'ERROR_SHUTDOWN', 'ERROR_OPNOTSUPP', 'ERROR_AFNOSUPPORT', 'ERROR_INVAL', 'ERROR_BADF', 'ERROR_NOROUTETOHOST', 'SOCKET_ERRNO_LAST'], outer_class=root_module['ns3::Socket']) ## ipv4-header.h: ns3::Ipv4Header [class] - module.add_class('Ipv4Header', allow_subclassing=True, parent=root_module['ns3::Header']) + module.add_class('Ipv4Header', parent=root_module['ns3::Header']) ## udp-socket.h: ns3::UdpSocket [class] - module.add_class('UdpSocket', allow_subclassing=True, parent=root_module['ns3::Socket']) + module.add_class('UdpSocket', parent=root_module['ns3::Socket']) ## net-device.h: ns3::NetDevice [class] - module.add_class('NetDevice', allow_subclassing=True, parent=root_module['ns3::Object']) - ## channel.h: ns3::Channel [class] - module.add_class('Channel', allow_subclassing=True, parent=root_module['ns3::Object']) - ## simple-channel.h: ns3::SimpleChannel [class] - module.add_class('SimpleChannel', allow_subclassing=True, parent=root_module['ns3::Channel']) + module.add_class('NetDevice', parent=root_module['ns3::Object']) + ## net-device.h: ns3::NetDevice::PacketType [enumeration] + module.add_enum('PacketType', ['PACKET_HOST', 'PACKET_BROADCAST', 'PACKET_MULTICAST', 'PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice']) ## address.h: ns3::AddressValue [class] - module.add_class('AddressValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('AddressValue', parent=root_module['ns3::AttributeValue']) ## node.h: ns3::Node [class] - module.add_class('Node', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Node', parent=root_module['ns3::Object']) ## tcp-socket.h: ns3::TcpSocket [class] - module.add_class('TcpSocket', allow_subclassing=True, parent=root_module['ns3::Socket']) + module.add_class('TcpSocket', parent=root_module['ns3::Socket']) + ## channel.h: ns3::Channel [class] + module.add_class('Channel', parent=root_module['ns3::Object']) ## ethernet-header.h: ns3::EthernetHeader [class] - module.add_class('EthernetHeader', allow_subclassing=True, parent=root_module['ns3::Header']) + module.add_class('EthernetHeader', parent=root_module['ns3::Header']) ## socket.h: ns3::SocketIpTtlTag [class] - module.add_class('SocketIpTtlTag', allow_subclassing=True, parent=root_module['ns3::Tag']) + module.add_class('SocketIpTtlTag', parent=root_module['ns3::Tag']) ## ipv4.h: ns3::Ipv4 [class] - module.add_class('Ipv4', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Ipv4', parent=root_module['ns3::Object']) ## socket-factory.h: ns3::SocketFactory [class] - module.add_class('SocketFactory', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('SocketFactory', parent=root_module['ns3::Object']) ## drop-tail-queue.h: ns3::DropTailQueue [class] - module.add_class('DropTailQueue', allow_subclassing=True, parent=root_module['ns3::Queue']) + module.add_class('DropTailQueue', parent=root_module['ns3::Queue']) ## ethernet-trailer.h: ns3::EthernetTrailer [class] - module.add_class('EthernetTrailer', allow_subclassing=True, parent=root_module['ns3::Trailer']) + module.add_class('EthernetTrailer', parent=root_module['ns3::Trailer']) ## llc-snap-header.h: ns3::LlcSnapHeader [class] - module.add_class('LlcSnapHeader', allow_subclassing=True, parent=root_module['ns3::Header']) + module.add_class('LlcSnapHeader', parent=root_module['ns3::Header']) ## udp-socket-factory.h: ns3::UdpSocketFactory [class] module.add_class('UdpSocketFactory', parent=root_module['ns3::SocketFactory']) ## simple-net-device.h: ns3::SimpleNetDevice [class] - module.add_class('SimpleNetDevice', allow_subclassing=True, parent=root_module['ns3::NetDevice']) + module.add_class('SimpleNetDevice', parent=root_module['ns3::NetDevice']) + ## simple-channel.h: ns3::SimpleChannel [class] + module.add_class('SimpleChannel', parent=root_module['ns3::Channel']) ## tcp-socket-factory.h: ns3::TcpSocketFactory [class] module.add_class('TcpSocketFactory', parent=root_module['ns3::SocketFactory']) ## packet-socket-factory.h: ns3::PacketSocketFactory [class] - module.add_class('PacketSocketFactory', allow_subclassing=True, parent=root_module['ns3::SocketFactory']) + module.add_class('PacketSocketFactory', parent=root_module['ns3::SocketFactory']) ## Register a nested module for the namespace internal @@ -171,11 +173,10 @@ def register_methods(root_module): register_Ns3Ipv4Header_methods(root_module, root_module['ns3::Ipv4Header']) register_Ns3UdpSocket_methods(root_module, root_module['ns3::UdpSocket']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) - register_Ns3Channel_methods(root_module, root_module['ns3::Channel']) - register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) register_Ns3TcpSocket_methods(root_module, root_module['ns3::TcpSocket']) + register_Ns3Channel_methods(root_module, root_module['ns3::Channel']) register_Ns3EthernetHeader_methods(root_module, root_module['ns3::EthernetHeader']) register_Ns3SocketIpTtlTag_methods(root_module, root_module['ns3::SocketIpTtlTag']) register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4']) @@ -185,6 +186,7 @@ def register_methods(root_module): register_Ns3LlcSnapHeader_methods(root_module, root_module['ns3::LlcSnapHeader']) register_Ns3UdpSocketFactory_methods(root_module, root_module['ns3::UdpSocketFactory']) register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice']) + register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel']) register_Ns3TcpSocketFactory_methods(root_module, root_module['ns3::TcpSocketFactory']) register_Ns3PacketSocketFactory_methods(root_module, root_module['ns3::PacketSocketFactory']) return @@ -851,49 +853,19 @@ def register_Ns3NetDevice_methods(root_module, cls): cls.add_method('IsPointToPoint', 'bool', [], is_pure_virtual=True, is_const=True, is_virtual=True) ## net-device.h: bool ns3::NetDevice::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&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_pure_virtual=True, is_virtual=True) + ## net-device.h: bool ns3::NetDevice::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&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_pure_virtual=True, is_virtual=True) ## net-device.h: ns3::Ptr ns3::NetDevice::GetNode() const [member function] cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_pure_virtual=True, is_const=True, is_virtual=True) ## net-device.h: void ns3::NetDevice::SetNode(ns3::Ptr node) [member function] cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_pure_virtual=True, is_virtual=True) ## net-device.h: bool ns3::NetDevice::NeedsArp() const [member function] cls.add_method('NeedsArp', 'bool', [], is_pure_virtual=True, is_const=True, is_virtual=True) - ## net-device.h: void ns3::NetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> cb) [member function] - cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], is_pure_virtual=True, is_virtual=True) + ## net-device.h: void ns3::NetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] + cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_pure_virtual=True, is_virtual=True) cls.add_constructor([]) return -def register_Ns3Channel_methods(root_module, cls): - ## channel.h: static ns3::TypeId ns3::Channel::GetTypeId() [member function] - cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) - ## channel.h: ns3::Channel::Channel() [constructor] - cls.add_constructor([], visibility='public') - ## channel.h: ns3::Channel::Channel(std::string name) [constructor] - cls.add_constructor([param('std::string', 'name')], visibility='public') - ## channel.h: void ns3::Channel::SetName(std::string arg0) [member function] - cls.add_method('SetName', 'void', [param('std::string', 'arg0')]) - ## channel.h: std::string ns3::Channel::GetName() [member function] - cls.add_method('GetName', 'std::string', []) - ## channel.h: uint32_t ns3::Channel::GetNDevices() const [member function] - cls.add_method('GetNDevices', 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True) - ## channel.h: ns3::Ptr ns3::Channel::GetDevice(uint32_t i) const [member function] - cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_pure_virtual=True, is_const=True, is_virtual=True) - return - -def register_Ns3SimpleChannel_methods(root_module, cls): - ## simple-channel.h: static ns3::TypeId ns3::SimpleChannel::GetTypeId() [member function] - cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) - ## simple-channel.h: ns3::SimpleChannel::SimpleChannel() [constructor] - cls.add_constructor([], visibility='public') - ## simple-channel.h: void ns3::SimpleChannel::Send(ns3::Ptr p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr sender) [member function] - cls.add_method('Send', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')]) - ## simple-channel.h: void ns3::SimpleChannel::Add(ns3::Ptr device) [member function] - cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')]) - ## simple-channel.h: uint32_t ns3::SimpleChannel::GetNDevices() const [member function] - cls.add_method('GetNDevices', 'uint32_t', [], is_const=True, is_virtual=True) - ## simple-channel.h: ns3::Ptr ns3::SimpleChannel::GetDevice(uint32_t i) const [member function] - cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - return - def register_Ns3AddressValue_methods(root_module, cls): ## address.h: ns3::AddressValue::AddressValue() [constructor] cls.add_constructor([], visibility='public') @@ -936,10 +908,14 @@ def register_Ns3Node_methods(root_module, cls): cls.add_method('GetFirstApplication', 'ns3::Ptr< ns3::Application >', [param('ns3::TypeId', 'tid')]) ## node.h: uint32_t ns3::Node::GetNApplications() const [member function] cls.add_method('GetNApplications', 'uint32_t', [], is_const=True) - ## node.h: void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device) [member function] - cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device')]) - ## node.h: void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> handler) [member function] - cls.add_method('UnregisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'handler')]) + ## node.h: void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> handler, uint16_t protocolType, ns3::Ptr device) [member function] + cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device')]) + ## node.h: void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> handler) [member function] + cls.add_method('UnregisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'handler')]) + ## node.h: void ns3::Node::RegisterPromiscuousProtocolHandler(ns3::Callback,ns3::Ptr,short unsigned int,const ns3::Address&,const ns3::Address&,bool> handler, uint16_t protocolType, ns3::Ptr device) [member function] + cls.add_method('RegisterPromiscuousProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, short unsigned int, const ns3::Address&, const ns3::Address&, bool >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device')]) + ## node.h: void ns3::Node::UnregisterPromiscuousProtocolHandler(ns3::Callback,ns3::Ptr,short unsigned int,const ns3::Address&,const ns3::Address&,bool> handler) [member function] + cls.add_method('UnregisterPromiscuousProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, short unsigned int, const ns3::Address&, const ns3::Address&, bool >', 'handler')]) ## node.h: void ns3::Node::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True) ## node.h: void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] @@ -993,6 +969,23 @@ def register_Ns3TcpSocket_methods(root_module, cls): cls.add_method('GetDelAckMaxCount', 'uint32_t', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) return +def register_Ns3Channel_methods(root_module, cls): + ## channel.h: static ns3::TypeId ns3::Channel::GetTypeId() [member function] + cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) + ## channel.h: ns3::Channel::Channel() [constructor] + cls.add_constructor([], visibility='public') + ## channel.h: ns3::Channel::Channel(std::string name) [constructor] + cls.add_constructor([param('std::string', 'name')], visibility='public') + ## channel.h: void ns3::Channel::SetName(std::string arg0) [member function] + cls.add_method('SetName', 'void', [param('std::string', 'arg0')]) + ## channel.h: std::string ns3::Channel::GetName() [member function] + cls.add_method('GetName', 'std::string', []) + ## channel.h: uint32_t ns3::Channel::GetNDevices() const [member function] + cls.add_method('GetNDevices', 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## channel.h: ns3::Ptr ns3::Channel::GetDevice(uint32_t i) const [member function] + cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_Ns3EthernetHeader_methods(root_module, cls): ## ethernet-header.h: ns3::EthernetHeader::EthernetHeader(bool hasPreamble) [constructor] cls.add_constructor([param('bool', 'hasPreamble')], visibility='public') @@ -1255,18 +1248,35 @@ def register_Ns3SimpleNetDevice_methods(root_module, cls): cls.add_method('IsPointToPoint', 'bool', [], is_const=True, is_virtual=True) ## simple-net-device.h: bool ns3::SimpleNetDevice::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&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) + ## simple-net-device.h: bool ns3::SimpleNetDevice::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&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) ## simple-net-device.h: ns3::Ptr ns3::SimpleNetDevice::GetNode() const [member function] cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True) ## simple-net-device.h: void ns3::SimpleNetDevice::SetNode(ns3::Ptr node) [member function] cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_virtual=True) ## simple-net-device.h: bool ns3::SimpleNetDevice::NeedsArp() const [member function] cls.add_method('NeedsArp', 'bool', [], is_const=True, is_virtual=True) - ## simple-net-device.h: void ns3::SimpleNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> cb) [member function] - cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## simple-net-device.h: void ns3::SimpleNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] + cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_virtual=True) ## simple-net-device.h: void ns3::SimpleNetDevice::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='protected', is_virtual=True) return +def register_Ns3SimpleChannel_methods(root_module, cls): + ## simple-channel.h: static ns3::TypeId ns3::SimpleChannel::GetTypeId() [member function] + cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) + ## simple-channel.h: ns3::SimpleChannel::SimpleChannel() [constructor] + cls.add_constructor([], visibility='public') + ## simple-channel.h: void ns3::SimpleChannel::Send(ns3::Ptr p, uint16_t protocol, ns3::Mac48Address to, ns3::Mac48Address from, ns3::Ptr sender) [member function] + cls.add_method('Send', 'void', [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint16_t', 'protocol'), param('ns3::Mac48Address', 'to'), param('ns3::Mac48Address', 'from'), param('ns3::Ptr< ns3::SimpleNetDevice >', 'sender')]) + ## simple-channel.h: void ns3::SimpleChannel::Add(ns3::Ptr device) [member function] + cls.add_method('Add', 'void', [param('ns3::Ptr< ns3::SimpleNetDevice >', 'device')]) + ## simple-channel.h: uint32_t ns3::SimpleChannel::GetNDevices() const [member function] + cls.add_method('GetNDevices', 'uint32_t', [], is_const=True, is_virtual=True) + ## simple-channel.h: ns3::Ptr ns3::SimpleChannel::GetDevice(uint32_t i) const [member function] + cls.add_method('GetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_const=True, is_virtual=True) + return + def register_Ns3TcpSocketFactory_methods(root_module, cls): ## tcp-socket-factory.h: static ns3::TypeId ns3::TcpSocketFactory::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', [], is_static=True) diff --git a/bindings/python/ns3_module_olsr.py b/bindings/python/ns3_module_olsr.py index 68089d125..0ff367f61 100644 --- a/bindings/python/ns3_module_olsr.py +++ b/bindings/python/ns3_module_olsr.py @@ -44,7 +44,7 @@ def register_types_ns3_olsr(module): root_module = module.get_root() ## olsr-header.h: ns3::olsr::MessageHeader [class] - module.add_class('MessageHeader', allow_subclassing=True, parent=root_module['ns3::Header']) + module.add_class('MessageHeader', parent=root_module['ns3::Header']) ## olsr-header.h: ns3::olsr::MessageHeader::MessageType [enumeration] module.add_enum('MessageType', ['HELLO_MESSAGE', 'TC_MESSAGE', 'MID_MESSAGE', 'HNA_MESSAGE'], outer_class=root_module['ns3::olsr::MessageHeader']) ## olsr-header.h: ns3::olsr::MessageHeader::Mid [struct] @@ -60,9 +60,9 @@ def register_types_ns3_olsr(module): ## olsr-header.h: ns3::olsr::MessageHeader::Hna::Association [struct] module.add_class('Association', outer_class=root_module['ns3::olsr::MessageHeader::Hna']) ## olsr-agent.h: ns3::olsr::Agent [class] - module.add_class('Agent', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Agent', parent=root_module['ns3::Object']) ## olsr-header.h: ns3::olsr::PacketHeader [class] - module.add_class('PacketHeader', allow_subclassing=True, parent=root_module['ns3::Header']) + module.add_class('PacketHeader', parent=root_module['ns3::Header']) def register_methods(root_module): register_Ns3OlsrMessageHeader_methods(root_module, root_module['ns3::olsr::MessageHeader']) diff --git a/bindings/python/ns3_module_onoff.py b/bindings/python/ns3_module_onoff.py index 3bef4f8f3..08aa7d9ba 100644 --- a/bindings/python/ns3_module_onoff.py +++ b/bindings/python/ns3_module_onoff.py @@ -4,7 +4,7 @@ def register_types(module): root_module = module.get_root() ## onoff-application.h: ns3::OnOffApplication [class] - module.add_class('OnOffApplication', allow_subclassing=True, parent=root_module['ns3::Application']) + module.add_class('OnOffApplication', parent=root_module['ns3::Application']) ## Register a nested module for the namespace internal diff --git a/bindings/python/ns3_module_packet_sink.py b/bindings/python/ns3_module_packet_sink.py index 1f24781aa..81ff49dfb 100644 --- a/bindings/python/ns3_module_packet_sink.py +++ b/bindings/python/ns3_module_packet_sink.py @@ -4,7 +4,7 @@ def register_types(module): root_module = module.get_root() ## packet-sink.h: ns3::PacketSink [class] - module.add_class('PacketSink', allow_subclassing=True, parent=root_module['ns3::Application']) + module.add_class('PacketSink', parent=root_module['ns3::Application']) ## Register a nested module for the namespace internal diff --git a/bindings/python/ns3_module_point_to_point.py b/bindings/python/ns3_module_point_to_point.py index 1cb6892e9..ac6e8520c 100644 --- a/bindings/python/ns3_module_point_to_point.py +++ b/bindings/python/ns3_module_point_to_point.py @@ -4,9 +4,9 @@ def register_types(module): root_module = module.get_root() ## point-to-point-channel.h: ns3::PointToPointChannel [class] - module.add_class('PointToPointChannel', allow_subclassing=True, parent=root_module['ns3::Channel']) + module.add_class('PointToPointChannel', parent=root_module['ns3::Channel']) ## point-to-point-net-device.h: ns3::PointToPointNetDevice [class] - module.add_class('PointToPointNetDevice', allow_subclassing=True, parent=root_module['ns3::NetDevice']) + module.add_class('PointToPointNetDevice', parent=root_module['ns3::NetDevice']) ## Register a nested module for the namespace internal @@ -123,14 +123,16 @@ def register_Ns3PointToPointNetDevice_methods(root_module, cls): cls.add_method('IsPointToPoint', 'bool', [], is_const=True, is_virtual=True) ## point-to-point-net-device.h: bool ns3::PointToPointNetDevice::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&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) + ## point-to-point-net-device.h: bool ns3::PointToPointNetDevice::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&', 'source', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) ## point-to-point-net-device.h: ns3::Ptr ns3::PointToPointNetDevice::GetNode() const [member function] cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True) ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::SetNode(ns3::Ptr node) [member function] cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_virtual=True) ## point-to-point-net-device.h: bool ns3::PointToPointNetDevice::NeedsArp() const [member function] cls.add_method('NeedsArp', 'bool', [], is_const=True, is_virtual=True) - ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> cb) [member function] - cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] + cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_virtual=True) ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='private', is_virtual=True) return diff --git a/bindings/python/ns3_module_simulator.py b/bindings/python/ns3_module_simulator.py index c06e3b783..9c837f9d0 100644 --- a/bindings/python/ns3_module_simulator.py +++ b/bindings/python/ns3_module_simulator.py @@ -28,17 +28,17 @@ def register_types(module): ## nstime.h: ns3::TimeChecker [class] module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker']) ## scheduler.h: ns3::Scheduler [class] - module.add_class('Scheduler', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('Scheduler', parent=root_module['ns3::Object']) ## scheduler.h: ns3::Scheduler::EventKey [struct] module.add_class('EventKey', outer_class=root_module['ns3::Scheduler']) ## nstime.h: ns3::TimeValue [class] - module.add_class('TimeValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('TimeValue', parent=root_module['ns3::AttributeValue']) ## heap-scheduler.h: ns3::HeapScheduler [class] - module.add_class('HeapScheduler', allow_subclassing=True, parent=root_module['ns3::Scheduler']) + module.add_class('HeapScheduler', parent=root_module['ns3::Scheduler']) ## list-scheduler.h: ns3::ListScheduler [class] - module.add_class('ListScheduler', allow_subclassing=True, parent=root_module['ns3::Scheduler']) + module.add_class('ListScheduler', parent=root_module['ns3::Scheduler']) ## map-scheduler.h: ns3::MapScheduler [class] - module.add_class('MapScheduler', allow_subclassing=True, parent=root_module['ns3::Scheduler']) + module.add_class('MapScheduler', parent=root_module['ns3::Scheduler']) ## Register a nested module for the namespace internal diff --git a/bindings/python/ns3_module_udp_echo.py b/bindings/python/ns3_module_udp_echo.py index d7b9b7aae..91c273684 100644 --- a/bindings/python/ns3_module_udp_echo.py +++ b/bindings/python/ns3_module_udp_echo.py @@ -4,9 +4,9 @@ def register_types(module): root_module = module.get_root() ## udp-echo-client.h: ns3::UdpEchoClient [class] - module.add_class('UdpEchoClient', allow_subclassing=True, parent=root_module['ns3::Application']) + module.add_class('UdpEchoClient', parent=root_module['ns3::Application']) ## udp-echo-server.h: ns3::UdpEchoServer [class] - module.add_class('UdpEchoServer', allow_subclassing=True, parent=root_module['ns3::Application']) + module.add_class('UdpEchoServer', parent=root_module['ns3::Application']) ## Register a nested module for the namespace internal diff --git a/bindings/python/ns3_module_wifi.py b/bindings/python/ns3_module_wifi.py index 4348d8129..ff93b16c9 100644 --- a/bindings/python/ns3_module_wifi.py +++ b/bindings/python/ns3_module_wifi.py @@ -16,15 +16,15 @@ def register_types(module): ## supported-rates.h: ns3::SupportedRates [class] module.add_class('SupportedRates') ## ideal-wifi-manager.h: ns3::IdealWifiRemoteStation [class] - module.add_class('IdealWifiRemoteStation', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStation']) + module.add_class('IdealWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## wifi-mode.h: ns3::WifiModeChecker [class] module.add_class('WifiModeChecker', parent=root_module['ns3::AttributeChecker']) ## wifi-mode.h: ns3::WifiModeFactory [class] module.add_class('WifiModeFactory') ## onoe-wifi-manager.h: ns3::OnoeWifiRemoteStation [class] - module.add_class('OnoeWifiRemoteStation', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStation']) + module.add_class('OnoeWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## rraa-wifi-manager.h: ns3::RraaWifiRemoteStation [class] - module.add_class('RraaWifiRemoteStation', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStation']) + module.add_class('RraaWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## ssid.h: ns3::Ssid [class] module.add_class('Ssid') ## wifi-mode.h: ns3::WifiMode [class] @@ -32,69 +32,69 @@ def register_types(module): ## wifi-mode.h: ns3::WifiMode::ModulationType [enumeration] module.add_enum('ModulationType', ['BPSK', 'QAM'], outer_class=root_module['ns3::WifiMode']) ## ssid.h: ns3::SsidValue [class] - module.add_class('SsidValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('SsidValue', parent=root_module['ns3::AttributeValue']) ## ssid.h: ns3::SsidChecker [class] module.add_class('SsidChecker', parent=root_module['ns3::AttributeChecker']) ## constant-rate-wifi-manager.h: ns3::ConstantRateWifiRemoteStation [class] - module.add_class('ConstantRateWifiRemoteStation', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStation']) + module.add_class('ConstantRateWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## propagation-loss-model.h: ns3::PropagationLossModel [class] - module.add_class('PropagationLossModel', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('PropagationLossModel', parent=root_module['ns3::Object']) ## arf-wifi-manager.h: ns3::ArfWifiRemoteStation [class] - module.add_class('ArfWifiRemoteStation', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStation']) + module.add_class('ArfWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## wifi-mac.h: ns3::WifiMac [class] - module.add_class('WifiMac', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('WifiMac', parent=root_module['ns3::Object']) ## nqap-wifi-mac.h: ns3::NqapWifiMac [class] - module.add_class('NqapWifiMac', allow_subclassing=True, parent=root_module['ns3::WifiMac']) + module.add_class('NqapWifiMac', parent=root_module['ns3::WifiMac']) ## amrr-wifi-manager.h: ns3::AmrrWifiRemoteStation [class] - module.add_class('AmrrWifiRemoteStation', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStation']) + module.add_class('AmrrWifiRemoteStation', parent=root_module['ns3::WifiRemoteStation']) ## composite-propagation-loss-model.h: ns3::CompositePropagationLossModel [class] - module.add_class('CompositePropagationLossModel', allow_subclassing=True, parent=root_module['ns3::PropagationLossModel']) + module.add_class('CompositePropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## propagation-loss-model.h: ns3::FriisPropagationLossModel [class] - module.add_class('FriisPropagationLossModel', allow_subclassing=True, parent=root_module['ns3::PropagationLossModel']) + module.add_class('FriisPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## wifi-remote-station-manager.h: ns3::WifiRemoteStationManager [class] - module.add_class('WifiRemoteStationManager', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('WifiRemoteStationManager', parent=root_module['ns3::Object']) ## wifi-mode.h: ns3::WifiModeValue [class] - module.add_class('WifiModeValue', allow_subclassing=True, parent=root_module['ns3::AttributeValue']) + module.add_class('WifiModeValue', parent=root_module['ns3::AttributeValue']) ## onoe-wifi-manager.h: ns3::OnoeWifiManager [class] - module.add_class('OnoeWifiManager', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStationManager']) + module.add_class('OnoeWifiManager', parent=root_module['ns3::WifiRemoteStationManager']) ## wifi-phy.h: ns3::WifiPhy [class] - module.add_class('WifiPhy', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('WifiPhy', parent=root_module['ns3::Object']) ## wifi-phy.h: ns3::WifiPhy::State [enumeration] module.add_enum('State', ['SYNC', 'TX', 'CCA_BUSY', 'IDLE'], outer_class=root_module['ns3::WifiPhy']) ## wifi-channel.h: ns3::WifiChannel [class] - module.add_class('WifiChannel', allow_subclassing=True, parent=root_module['ns3::Channel']) + module.add_class('WifiChannel', parent=root_module['ns3::Channel']) ## propagation-loss-model.h: ns3::LogDistancePropagationLossModel [class] - module.add_class('LogDistancePropagationLossModel', allow_subclassing=True, parent=root_module['ns3::PropagationLossModel']) + module.add_class('LogDistancePropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## constant-rate-wifi-manager.h: ns3::ConstantRateWifiManager [class] - module.add_class('ConstantRateWifiManager', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStationManager']) + module.add_class('ConstantRateWifiManager', parent=root_module['ns3::WifiRemoteStationManager']) ## aarf-wifi-manager.h: ns3::AarfWifiRemoteStation [class] - module.add_class('AarfWifiRemoteStation', allow_subclassing=True, parent=root_module['ns3::ArfWifiRemoteStation']) + module.add_class('AarfWifiRemoteStation', parent=root_module['ns3::ArfWifiRemoteStation']) ## propagation-delay-model.h: ns3::PropagationDelayModel [class] - module.add_class('PropagationDelayModel', allow_subclassing=True, parent=root_module['ns3::Object']) + module.add_class('PropagationDelayModel', parent=root_module['ns3::Object']) ## adhoc-wifi-mac.h: ns3::AdhocWifiMac [class] - module.add_class('AdhocWifiMac', allow_subclassing=True, parent=root_module['ns3::WifiMac']) + module.add_class('AdhocWifiMac', parent=root_module['ns3::WifiMac']) ## jakes-propagation-loss-model.h: ns3::JakesPropagationLossModel [class] - module.add_class('JakesPropagationLossModel', allow_subclassing=True, parent=root_module['ns3::PropagationLossModel']) + module.add_class('JakesPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## propagation-delay-model.h: ns3::ConstantSpeedPropagationDelayModel [class] - module.add_class('ConstantSpeedPropagationDelayModel', allow_subclassing=True, parent=root_module['ns3::PropagationDelayModel']) + module.add_class('ConstantSpeedPropagationDelayModel', parent=root_module['ns3::PropagationDelayModel']) ## wifi-net-device.h: ns3::WifiNetDevice [class] - module.add_class('WifiNetDevice', allow_subclassing=True, parent=root_module['ns3::NetDevice']) + module.add_class('WifiNetDevice', parent=root_module['ns3::NetDevice']) ## nqsta-wifi-mac.h: ns3::NqstaWifiMac [class] - module.add_class('NqstaWifiMac', allow_subclassing=True, parent=root_module['ns3::WifiMac']) + module.add_class('NqstaWifiMac', parent=root_module['ns3::WifiMac']) ## propagation-loss-model.h: ns3::RandomPropagationLossModel [class] - module.add_class('RandomPropagationLossModel', allow_subclassing=True, parent=root_module['ns3::PropagationLossModel']) + module.add_class('RandomPropagationLossModel', parent=root_module['ns3::PropagationLossModel']) ## propagation-delay-model.h: ns3::RandomPropagationDelayModel [class] - module.add_class('RandomPropagationDelayModel', allow_subclassing=True, parent=root_module['ns3::PropagationDelayModel']) + module.add_class('RandomPropagationDelayModel', parent=root_module['ns3::PropagationDelayModel']) ## amrr-wifi-manager.h: ns3::AmrrWifiManager [class] - module.add_class('AmrrWifiManager', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStationManager']) + module.add_class('AmrrWifiManager', parent=root_module['ns3::WifiRemoteStationManager']) ## rraa-wifi-manager.h: ns3::RraaWifiManager [class] - module.add_class('RraaWifiManager', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStationManager']) + module.add_class('RraaWifiManager', parent=root_module['ns3::WifiRemoteStationManager']) ## ideal-wifi-manager.h: ns3::IdealWifiManager [class] - module.add_class('IdealWifiManager', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStationManager']) + module.add_class('IdealWifiManager', parent=root_module['ns3::WifiRemoteStationManager']) ## arf-wifi-manager.h: ns3::ArfWifiManager [class] - module.add_class('ArfWifiManager', allow_subclassing=True, parent=root_module['ns3::WifiRemoteStationManager']) + module.add_class('ArfWifiManager', parent=root_module['ns3::WifiRemoteStationManager']) ## aarf-wifi-manager.h: ns3::AarfWifiManager [class] - module.add_class('AarfWifiManager', allow_subclassing=True, parent=root_module['ns3::ArfWifiManager']) + module.add_class('AarfWifiManager', parent=root_module['ns3::ArfWifiManager']) ## Register a nested module for the namespace internal @@ -1067,14 +1067,16 @@ def register_Ns3WifiNetDevice_methods(root_module, cls): cls.add_method('IsPointToPoint', 'bool', [], is_const=True, is_virtual=True) ## wifi-net-device.h: bool ns3::WifiNetDevice::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&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) + ## wifi-net-device.h: bool ns3::WifiNetDevice::SendFrom(ns3::Ptr packet, ns3::Address const & src, ns3::Address const & dest, uint16_t protocolNumber) [member function] + cls.add_method('SendFrom', 'bool', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address&', 'src', is_const=True), param('ns3::Address&', 'dest', is_const=True), param('uint16_t', 'protocolNumber')], is_virtual=True) ## wifi-net-device.h: ns3::Ptr ns3::WifiNetDevice::GetNode() const [member function] cls.add_method('GetNode', 'ns3::Ptr< ns3::Node >', [], is_const=True, is_virtual=True) ## wifi-net-device.h: void ns3::WifiNetDevice::SetNode(ns3::Ptr node) [member function] cls.add_method('SetNode', 'void', [param('ns3::Ptr< ns3::Node >', 'node')], is_virtual=True) ## wifi-net-device.h: bool ns3::WifiNetDevice::NeedsArp() const [member function] cls.add_method('NeedsArp', 'bool', [], is_const=True, is_virtual=True) - ## wifi-net-device.h: void ns3::WifiNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::empty, ns3::empty> cb) [member function] - cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## wifi-net-device.h: void ns3::WifiNetDevice::SetReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] + cls.add_method('SetReceiveCallback', 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet >, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType >', 'cb')], is_virtual=True) ## wifi-net-device.h: void ns3::WifiNetDevice::DoDispose() [member function] cls.add_method('DoDispose', 'void', [], visibility='private', is_virtual=True) return diff --git a/bindings/python/ns3modulegen_generated.py b/bindings/python/ns3modulegen_generated.py index ad3e8d947..2e700fe0d 100644 --- a/bindings/python/ns3modulegen_generated.py +++ b/bindings/python/ns3modulegen_generated.py @@ -22,6 +22,7 @@ import ns3_module_point_to_point import ns3_module_internet_stack import ns3_module_wifi import ns3_module_csma +import ns3_module_bridge import ns3_module_packet_sink import ns3_module_global_routing import ns3_module_onoff @@ -146,6 +147,17 @@ def register_types(module): ns3_module_csma__local.register_types(module) root_module.end_section('ns3_module_csma') + root_module.begin_section('ns3_module_bridge') + ns3_module_bridge.register_types(module) + + try: + import ns3_module_bridge__local + except ImportError: + pass + else: + ns3_module_bridge__local.register_types(module) + + root_module.end_section('ns3_module_bridge') root_module.begin_section('ns3_module_packet_sink') ns3_module_packet_sink.register_types(module) @@ -364,6 +376,17 @@ def register_methods(root_module): ns3_module_csma__local.register_methods(root_module) root_module.end_section('ns3_module_csma') + root_module.begin_section('ns3_module_bridge') + ns3_module_bridge.register_methods(root_module) + + try: + import ns3_module_bridge__local + except ImportError: + pass + else: + ns3_module_bridge__local.register_methods(root_module) + + root_module.end_section('ns3_module_bridge') root_module.begin_section('ns3_module_packet_sink') ns3_module_packet_sink.register_methods(root_module) @@ -544,6 +567,17 @@ def register_functions(root_module): ns3_module_csma__local.register_functions(root_module) root_module.end_section('ns3_module_csma') + root_module.begin_section('ns3_module_bridge') + ns3_module_bridge.register_functions(root_module) + + try: + import ns3_module_bridge__local + except ImportError: + pass + else: + ns3_module_bridge__local.register_functions(root_module) + + root_module.end_section('ns3_module_bridge') root_module.begin_section('ns3_module_packet_sink') ns3_module_packet_sink.register_functions(root_module)