From aec5b6ffda6cea28bcc99efe50dfa2616d6a0924 Mon Sep 17 00:00:00 2001 From: Josh Pelkey Date: Thu, 16 Dec 2010 21:00:18 -0500 Subject: [PATCH] rescan python bindings --- .../apidefs/gcc-ILP32/callbacks_list.py | 4 +- .../apidefs/gcc-ILP32/ns3_module_aodv.py | 18 ++ .../apidefs/gcc-ILP32/ns3_module_bulk_send.py | 164 ++++++++++++++++++ .../apidefs/gcc-ILP32/ns3_module_common.py | 2 +- .../apidefs/gcc-ILP32/ns3_module_contrib.py | 18 ++ .../apidefs/gcc-ILP32/ns3_module_core.py | 10 +- .../apidefs/gcc-ILP32/ns3_module_dot11s.py | 12 +- .../apidefs/gcc-ILP32/ns3_module_helper.py | 29 ++++ .../apidefs/gcc-ILP32/ns3_module_node.py | 27 +-- .../apidefs/gcc-ILP32/ns3_module_simulator.py | 22 +-- .../apidefs/gcc-ILP32/ns3_module_spectrum.py | 6 +- .../apidefs/gcc-ILP32/ns3_module_stats.py | 26 ++- .../apidefs/gcc-ILP32/ns3_module_wifi.py | 14 +- .../gcc-ILP32/ns3modulegen_generated.py | 74 +++++--- .../python/apidefs/gcc-LP64/callbacks_list.py | 4 +- .../apidefs/gcc-LP64/ns3_module_aodv.py | 18 ++ .../apidefs/gcc-LP64/ns3_module_bulk_send.py | 164 ++++++++++++++++++ .../apidefs/gcc-LP64/ns3_module_common.py | 2 +- .../apidefs/gcc-LP64/ns3_module_contrib.py | 18 ++ .../apidefs/gcc-LP64/ns3_module_core.py | 10 +- .../apidefs/gcc-LP64/ns3_module_dot11s.py | 12 +- .../apidefs/gcc-LP64/ns3_module_helper.py | 29 ++++ .../apidefs/gcc-LP64/ns3_module_node.py | 27 +-- .../apidefs/gcc-LP64/ns3_module_simulator.py | 22 +-- .../apidefs/gcc-LP64/ns3_module_spectrum.py | 6 +- .../apidefs/gcc-LP64/ns3_module_stats.py | 26 ++- .../apidefs/gcc-LP64/ns3_module_wifi.py | 14 +- .../gcc-LP64/ns3modulegen_generated.py | 74 +++++--- 28 files changed, 716 insertions(+), 136 deletions(-) create mode 100644 bindings/python/apidefs/gcc-ILP32/ns3_module_bulk_send.py create mode 100644 bindings/python/apidefs/gcc-LP64/ns3_module_bulk_send.py diff --git a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py index 6e3afd259..2f9c3cc27 100644 --- a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py +++ b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py @@ -1,7 +1,6 @@ callback_classes = [ - ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::Address const&', 'unsigned short', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'double', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], @@ -25,6 +24,7 @@ callback_classes = [ ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py index 31c2e37da..44445b8ce 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_aodv.py @@ -442,6 +442,16 @@ def register_Ns3AodvRoutingProtocol_methods(root_module, cls): 'bool', [], is_const=True) + ## aodv-routing-protocol.h: uint32_t ns3::aodv::RoutingProtocol::GetMaxQueueLen() const [member function] + cls.add_method('GetMaxQueueLen', + 'uint32_t', + [], + is_const=True) + ## aodv-routing-protocol.h: ns3::Time ns3::aodv::RoutingProtocol::GetMaxQueueTime() const [member function] + cls.add_method('GetMaxQueueTime', + 'ns3::Time', + [], + is_const=True) ## aodv-routing-protocol.h: static ns3::TypeId ns3::aodv::RoutingProtocol::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -498,6 +508,14 @@ def register_Ns3AodvRoutingProtocol_methods(root_module, cls): 'void', [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], is_virtual=True) + ## aodv-routing-protocol.h: void ns3::aodv::RoutingProtocol::SetMaxQueueLen(uint32_t len) [member function] + cls.add_method('SetMaxQueueLen', + 'void', + [param('uint32_t', 'len')]) + ## aodv-routing-protocol.h: void ns3::aodv::RoutingProtocol::SetMaxQueueTime(ns3::Time t) [member function] + cls.add_method('SetMaxQueueTime', + 'void', + [param('ns3::Time', 't')]) ## aodv-routing-protocol.h: ns3::aodv::RoutingProtocol::AODV_PORT [variable] cls.add_static_attribute('AODV_PORT', 'uint32_t const', is_const=True) return diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_bulk_send.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_bulk_send.py new file mode 100644 index 000000000..b40a5ac12 --- /dev/null +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_bulk_send.py @@ -0,0 +1,164 @@ +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers + +def register_types(module): + root_module = module.get_root() + + ## bulk-send-application.h: ns3::BulkSendApplication [class] + module.add_class('BulkSendApplication', parent=root_module['ns3::Application']) + + ## 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 FatalImpl + + nested_module = module.add_cpp_namespace('FatalImpl') + register_types_ns3_FatalImpl(nested_module) + + + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + + ## Register a nested module for the namespace aodv + + nested_module = module.add_cpp_namespace('aodv') + register_types_ns3_aodv(nested_module) + + + ## Register a nested module for the namespace dot11s + + nested_module = module.add_cpp_namespace('dot11s') + register_types_ns3_dot11s(nested_module) + + + ## Register a nested module for the namespace flame + + nested_module = module.add_cpp_namespace('flame') + register_types_ns3_flame(nested_module) + + + ## Register a nested module for the namespace internal + + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) + + + ## Register a nested module for the namespace olsr + + nested_module = module.add_cpp_namespace('olsr') + register_types_ns3_olsr(nested_module) + + +def register_types_ns3_Config(module): + root_module = module.get_root() + + +def register_types_ns3_FatalImpl(module): + root_module = module.get_root() + + +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + +def register_types_ns3_aodv(module): + root_module = module.get_root() + + +def register_types_ns3_dot11s(module): + root_module = module.get_root() + + +def register_types_ns3_flame(module): + root_module = module.get_root() + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + +def register_types_ns3_olsr(module): + root_module = module.get_root() + + +def register_methods(root_module): + register_Ns3BulkSendApplication_methods(root_module, root_module['ns3::BulkSendApplication']) + return + +def register_Ns3BulkSendApplication_methods(root_module, cls): + ## bulk-send-application.h: ns3::BulkSendApplication::BulkSendApplication(ns3::BulkSendApplication const & arg0) [copy constructor] + cls.add_constructor([param('ns3::BulkSendApplication const &', 'arg0')]) + ## bulk-send-application.h: ns3::BulkSendApplication::BulkSendApplication() [constructor] + cls.add_constructor([]) + ## bulk-send-application.h: ns3::Ptr ns3::BulkSendApplication::GetSocket() const [member function] + cls.add_method('GetSocket', + 'ns3::Ptr< ns3::Socket >', + [], + is_const=True) + ## bulk-send-application.h: static ns3::TypeId ns3::BulkSendApplication::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## bulk-send-application.h: void ns3::BulkSendApplication::SetMaxBytes(uint32_t maxBytes) [member function] + cls.add_method('SetMaxBytes', + 'void', + [param('uint32_t', 'maxBytes')]) + ## bulk-send-application.h: void ns3::BulkSendApplication::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + ## bulk-send-application.h: void ns3::BulkSendApplication::StartApplication() [member function] + cls.add_method('StartApplication', + 'void', + [], + visibility='private', is_virtual=True) + ## bulk-send-application.h: void ns3::BulkSendApplication::StopApplication() [member function] + cls.add_method('StopApplication', + 'void', + [], + visibility='private', is_virtual=True) + return + +def register_functions(root_module): + module = root_module + register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) + register_functions_ns3_aodv(module.get_submodule('aodv'), root_module) + register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module) + register_functions_ns3_flame(module.get_submodule('flame'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) + register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) + return + +def register_functions_ns3_Config(module, root_module): + return + +def register_functions_ns3_FatalImpl(module, root_module): + return + +def register_functions_ns3_addressUtils(module, root_module): + return + +def register_functions_ns3_aodv(module, root_module): + return + +def register_functions_ns3_dot11s(module, root_module): + return + +def register_functions_ns3_flame(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + +def register_functions_ns3_olsr(module, root_module): + return + diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py index 856142cc8..98708ee94 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py @@ -1456,6 +1456,7 @@ def register_Ns3SpectrumPropagationLossModel_methods(root_module, cls): return def register_Ns3SpectrumValue_methods(root_module, cls): + cls.add_output_stream_operator() cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) @@ -1465,7 +1466,6 @@ def register_Ns3SpectrumValue_methods(root_module, cls): cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) - cls.add_output_stream_operator() cls.add_inplace_numeric_operator('*=', param('ns3::SpectrumValue const &', 'right')) cls.add_inplace_numeric_operator('*=', param('double', 'right')) cls.add_inplace_numeric_operator('+=', param('ns3::SpectrumValue const &', 'right')) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py index 4025a5e7e..4ededd58b 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py @@ -17,6 +17,8 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') + ## gtk-config-store.h: ns3::GtkConfigStore [class] + module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -128,6 +130,7 @@ def register_methods(root_module): register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) + register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -352,6 +355,21 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return +def register_Ns3GtkConfigStore_methods(root_module, cls): + ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] + cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) + ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] + cls.add_constructor([]) + ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] + cls.add_method('ConfigureAttributes', + 'void', + []) + ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] + cls.add_method('ConfigureDefaults', + 'void', + []) + return + def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py index b680cd39a..34cd4c261 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py @@ -224,6 +224,10 @@ def register_types(module): module.add_container('std::list< ns3::Ptr< ns3::UanTransducer > >', 'ns3::Ptr< ns3::UanTransducer >', container_type='list') module.add_container('std::vector< ns3::Ptr< ns3::NetDevice > >', 'ns3::Ptr< ns3::NetDevice >', container_type='vector') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') + typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') + typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') + typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') + module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -232,10 +236,6 @@ def register_types(module): typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') - typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') - typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') - typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') - module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') ## Register a nested module for the namespace Config @@ -1351,9 +1351,9 @@ def register_Ns3TriangularVariable_methods(root_module, cls): def register_Ns3TypeId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## type-id.h: ns3::TypeId::TypeId(char const * name) [constructor] cls.add_constructor([param('char const *', 'name')]) ## type-id.h: ns3::TypeId::TypeId() [constructor] diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py index d29bd3557..d3ab1cc2c 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py @@ -73,18 +73,18 @@ def register_types_ns3_aodv(module): def register_types_ns3_dot11s(module): root_module = module.get_root() + ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration] + module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL']) + ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration] + module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionProtocol [enumeration] module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sSynchronizationProtocolIdentifier [enumeration] module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL']) - ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration] - module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL']) - ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] - module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration] module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED']) - ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration] - module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE']) + ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] + module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class] module.add_class('Dot11sMeshCapability') ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class] diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py index 5811cb0c5..01da6372f 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py @@ -19,6 +19,8 @@ def register_types(module): module.add_class('AsciiTraceHelperForIpv6', allow_subclassing=True) ## athstats-helper.h: ns3::AthstatsHelper [class] module.add_class('AthstatsHelper') + ## bulk-send-helper.h: ns3::BulkSendHelper [class] + module.add_class('BulkSendHelper') ## csma-star-helper.h: ns3::CsmaStarHelper [class] module.add_class('CsmaStarHelper') ## ipv4-address-helper.h: ns3::Ipv4AddressHelper [class] @@ -229,6 +231,7 @@ def register_methods(root_module): register_Ns3AsciiTraceHelperForIpv4_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv4']) register_Ns3AsciiTraceHelperForIpv6_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv6']) register_Ns3AthstatsHelper_methods(root_module, root_module['ns3::AthstatsHelper']) + register_Ns3BulkSendHelper_methods(root_module, root_module['ns3::BulkSendHelper']) register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper']) register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper']) register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer']) @@ -667,6 +670,32 @@ def register_Ns3AthstatsHelper_methods(root_module, cls): [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')]) return +def register_Ns3BulkSendHelper_methods(root_module, cls): + ## bulk-send-helper.h: ns3::BulkSendHelper::BulkSendHelper(ns3::BulkSendHelper const & arg0) [copy constructor] + cls.add_constructor([param('ns3::BulkSendHelper const &', 'arg0')]) + ## bulk-send-helper.h: ns3::BulkSendHelper::BulkSendHelper(std::string protocol, ns3::Address address) [constructor] + cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')]) + ## bulk-send-helper.h: ns3::ApplicationContainer ns3::BulkSendHelper::Install(ns3::NodeContainer c) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::NodeContainer', 'c')], + is_const=True) + ## bulk-send-helper.h: ns3::ApplicationContainer ns3::BulkSendHelper::Install(ns3::Ptr node) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## bulk-send-helper.h: ns3::ApplicationContainer ns3::BulkSendHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('std::string', 'nodeName')], + is_const=True) + ## bulk-send-helper.h: void ns3::BulkSendHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('SetAttribute', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + return + def register_Ns3CsmaStarHelper_methods(root_module, cls): ## csma-star-helper.h: ns3::CsmaStarHelper::CsmaStarHelper(ns3::CsmaStarHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::CsmaStarHelper const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py index 088b943ba..7727925ae 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py @@ -103,6 +103,8 @@ def register_types(module): 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', 'ERROR_NODEV', 'ERROR_ADDRNOTAVAIL', 'SOCKET_ERRNO_LAST'], outer_class=root_module['ns3::Socket']) + ## socket.h: ns3::Socket::SocketType [enumeration] + module.add_enum('SocketType', ['SOCK_STREAM', 'SOCK_SEQPACKET', 'SOCK_DGRAM', 'SOCK_RAW'], outer_class=root_module['ns3::Socket']) ## socket.h: ns3::SocketAddressTag [class] module.add_class('SocketAddressTag', parent=root_module['ns3::Tag']) ## socket-factory.h: ns3::SocketFactory [class] @@ -212,21 +214,21 @@ def register_types(module): module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set') module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector') module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndErrorCallback&') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndOkCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxStartCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&') ## Register a nested module for the namespace Config @@ -390,9 +392,9 @@ def register_methods(root_module): def register_Ns3Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## address.h: ns3::Address::Address() [constructor] cls.add_constructor([]) ## address.h: ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor] @@ -578,9 +580,9 @@ def register_Ns3InetSocketAddress_methods(root_module, cls): def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')]) ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address() [constructor] @@ -862,9 +864,9 @@ def register_Ns3Ipv4Mask_methods(root_module, cls): def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address() [constructor] cls.add_constructor([]) ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(char const * address) [constructor] @@ -1129,9 +1131,9 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): def register_Ns3Mac48Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## mac48-address.h: ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')]) ## mac48-address.h: ns3::Mac48Address::Mac48Address() [constructor] @@ -2217,6 +2219,11 @@ def register_Ns3Socket_methods(root_module, cls): 'int', [param('ns3::Address &', 'address')], is_pure_virtual=True, is_const=True, is_virtual=True) + ## socket.h: ns3::Socket::SocketType ns3::Socket::GetSocketType() const [member function] + cls.add_method('GetSocketType', + 'ns3::Socket::SocketType', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) ## socket.h: uint32_t ns3::Socket::GetTxAvailable() const [member function] cls.add_method('GetTxAvailable', 'uint32_t', diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py index afbbbc2f2..de199a31c 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py @@ -67,14 +67,14 @@ def register_types(module): module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker']) ## nstime.h: ns3::TimeValue [class] module.add_class('TimeValue', parent=root_module['ns3::AttributeValue']) - typehandlers.add_type_alias('ns3::Time', 'ns3::TimeSquare') - typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeSquare*') - typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeSquare&') - module.add_typedef(root_module['ns3::Time'], 'TimeSquare') typehandlers.add_type_alias('ns3::Time', 'ns3::TimeInvert') typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeInvert*') typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeInvert&') module.add_typedef(root_module['ns3::Time'], 'TimeInvert') + typehandlers.add_type_alias('ns3::Time', 'ns3::TimeSquare') + typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeSquare*') + typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeSquare&') + module.add_typedef(root_module['ns3::Time'], 'TimeSquare') ## Register a nested module for the namespace Config @@ -390,20 +390,20 @@ def register_Ns3Simulator_methods(root_module, cls): def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right')) + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') + cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_comparison_operator('<') + cls.add_binary_comparison_operator('>') ## nstime.h: ns3::Time::Time() [constructor] cls.add_constructor([]) ## nstime.h: ns3::Time::Time(ns3::Time const & o) [copy constructor] diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py index 01c285f31..879b4b75c 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py @@ -39,15 +39,15 @@ def register_types(module): module.add_class('MultiModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel']) ## single-model-spectrum-channel.h: ns3::SingleModelSpectrumChannel [class] module.add_class('SingleModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel']) + typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') + typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') + typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >', 'ns3::TxSpectrumModelInfoMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >*', 'ns3::TxSpectrumModelInfoMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >&', 'ns3::TxSpectrumModelInfoMap_t&') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >', 'ns3::RxSpectrumModelInfoMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >*', 'ns3::RxSpectrumModelInfoMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >&', 'ns3::RxSpectrumModelInfoMap_t&') - typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') - typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') - typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') ## Register a nested module for the namespace Config diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py index 9ecf39d16..8d8860bf0 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py @@ -19,18 +19,20 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) + ## sqlite-data-output.h: ns3::SqliteDataOutput [class] + module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator']) ## packet-data-calculators.h: ns3::PacketCounterCalculator [class] module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >']) - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') ## Register a nested module for the namespace Config @@ -121,6 +123,7 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) + register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -465,6 +468,23 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return +def register_Ns3SqliteDataOutput_methods(root_module, cls): + ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) + ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] + cls.add_constructor([]) + ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] + cls.add_method('Output', + 'void', + [param('ns3::DataCollector &', 'dc')], + is_virtual=True) + ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + return + def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py index 2ee642cbf..5a9a76b30 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py @@ -11,16 +11,16 @@ def register_types(module): module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT']) ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration] module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH']) - ## qos-tag.h: ns3::UserPriority [enumeration] - module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC']) ## qos-utils.h: ns3::AcIndex [enumeration] module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF']) - ## edca-txop-n.h: ns3::TypeOfStation [enumeration] - module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH']) ## ctrl-headers.h: ns3::BlockAckType [enumeration] module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK']) + ## qos-tag.h: ns3::UserPriority [enumeration] + module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC']) ## wifi-mode.h: ns3::WifiCodeRate [enumeration] module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2']) + ## edca-txop-n.h: ns3::TypeOfStation [enumeration] + module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH']) ## block-ack-manager.h: ns3::Bar [struct] module.add_class('Bar') ## block-ack-agreement.h: ns3::BlockAckAgreement [class] @@ -204,6 +204,9 @@ def register_types(module): ## dca-txop.h: ns3::DcaTxop [class] module.add_class('DcaTxop', parent=root_module['ns3::Dcf']) module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId') typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*') typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&') @@ -213,9 +216,6 @@ def register_types(module): typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >', 'ns3::SampleRate') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >*', 'ns3::SampleRate*') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >&', 'ns3::SampleRate&') diff --git a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py index 783084f7e..dc46734fe 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py @@ -22,6 +22,7 @@ import ns3_module_common import ns3_module_contrib import ns3_module_node import ns3_module_bridge +import ns3_module_bulk_send import ns3_module_csma import ns3_module_emu import ns3_module_energy @@ -171,6 +172,17 @@ def register_types(module): ns3_module_bridge__local.register_types(module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_bulk_send') + ns3_module_bulk_send.register_types(module) + + try: + import ns3_module_bulk_send__local + except ImportError: + pass + else: + ns3_module_bulk_send__local.register_types(module) + + root_module.end_section('ns3_module_bulk_send') root_module.begin_section('ns3_module_csma') ns3_module_csma.register_types(module) @@ -896,39 +908,39 @@ def register_types_ns3_olsr(module): module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector') module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector') module.add_container('std::vector< ns3::olsr::RoutingTableEntry >', 'ns3::olsr::RoutingTableEntry', container_type='vector') - typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >*', 'ns3::olsr::NeighborSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >&', 'ns3::olsr::NeighborSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >', 'ns3::olsr::AssociationSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >*', 'ns3::olsr::AssociationSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >&', 'ns3::olsr::AssociationSet&') typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet') typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >*', 'ns3::olsr::TopologySet*') typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >&', 'ns3::olsr::TopologySet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >*', 'ns3::olsr::LinkSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >&', 'ns3::olsr::LinkSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations') - typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*') - typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&') typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet') typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >*', 'ns3::olsr::MprSet*') typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >&', 'ns3::olsr::MprSet&') typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet') typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >*', 'ns3::olsr::MprSelectorSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >&', 'ns3::olsr::MprSelectorSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList') - typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*') - typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&') + typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations') + typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*') + typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&') typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet') typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >*', 'ns3::olsr::IfaceAssocSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >&', 'ns3::olsr::IfaceAssocSet&') typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet') typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >*', 'ns3::olsr::TwoHopNeighborSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >&', 'ns3::olsr::TwoHopNeighborSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList') + typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*') + typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&') + typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >*', 'ns3::olsr::NeighborSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >&', 'ns3::olsr::NeighborSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >', 'ns3::olsr::AssociationSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >*', 'ns3::olsr::AssociationSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >&', 'ns3::olsr::AssociationSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >*', 'ns3::olsr::LinkSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >&', 'ns3::olsr::LinkSet&') def register_methods(root_module): register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper']) @@ -1157,6 +1169,17 @@ def register_methods(root_module): ns3_module_bridge__local.register_methods(root_module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_bulk_send') + ns3_module_bulk_send.register_methods(root_module) + + try: + import ns3_module_bulk_send__local + except ImportError: + pass + else: + ns3_module_bulk_send__local.register_methods(root_module) + + root_module.end_section('ns3_module_bulk_send') root_module.begin_section('ns3_module_csma') ns3_module_csma.register_methods(root_module) @@ -2754,9 +2777,9 @@ def register_Ns3Tap_methods(root_module, cls): def register_Ns3UanAddress_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## uan-address.h: ns3::UanAddress::UanAddress(ns3::UanAddress const & arg0) [copy constructor] cls.add_constructor([param('ns3::UanAddress const &', 'arg0')]) ## uan-address.h: ns3::UanAddress::UanAddress() [constructor] @@ -5444,8 +5467,8 @@ def register_Ns3Ipv4FlowClassifier_methods(root_module, cls): return def register_Ns3Ipv4FlowClassifierFiveTuple_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple() [constructor] cls.add_constructor([]) ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple(ns3::Ipv4FlowClassifier::FiveTuple const & arg0) [copy constructor] @@ -7454,6 +7477,17 @@ def register_functions(root_module): ns3_module_bridge__local.register_functions(root_module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_bulk_send') + ns3_module_bulk_send.register_functions(root_module) + + try: + import ns3_module_bulk_send__local + except ImportError: + pass + else: + ns3_module_bulk_send__local.register_functions(root_module) + + root_module.end_section('ns3_module_bulk_send') root_module.begin_section('ns3_module_csma') ns3_module_csma.register_functions(root_module) diff --git a/bindings/python/apidefs/gcc-LP64/callbacks_list.py b/bindings/python/apidefs/gcc-LP64/callbacks_list.py index 99a4aedcd..282ab815b 100644 --- a/bindings/python/apidefs/gcc-LP64/callbacks_list.py +++ b/bindings/python/apidefs/gcc-LP64/callbacks_list.py @@ -1,7 +1,6 @@ callback_classes = [ - ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::Address const&', 'unsigned short', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'double', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], @@ -25,6 +24,7 @@ callback_classes = [ ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py b/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py index 31c2e37da..44445b8ce 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_aodv.py @@ -442,6 +442,16 @@ def register_Ns3AodvRoutingProtocol_methods(root_module, cls): 'bool', [], is_const=True) + ## aodv-routing-protocol.h: uint32_t ns3::aodv::RoutingProtocol::GetMaxQueueLen() const [member function] + cls.add_method('GetMaxQueueLen', + 'uint32_t', + [], + is_const=True) + ## aodv-routing-protocol.h: ns3::Time ns3::aodv::RoutingProtocol::GetMaxQueueTime() const [member function] + cls.add_method('GetMaxQueueTime', + 'ns3::Time', + [], + is_const=True) ## aodv-routing-protocol.h: static ns3::TypeId ns3::aodv::RoutingProtocol::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', @@ -498,6 +508,14 @@ def register_Ns3AodvRoutingProtocol_methods(root_module, cls): 'void', [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], is_virtual=True) + ## aodv-routing-protocol.h: void ns3::aodv::RoutingProtocol::SetMaxQueueLen(uint32_t len) [member function] + cls.add_method('SetMaxQueueLen', + 'void', + [param('uint32_t', 'len')]) + ## aodv-routing-protocol.h: void ns3::aodv::RoutingProtocol::SetMaxQueueTime(ns3::Time t) [member function] + cls.add_method('SetMaxQueueTime', + 'void', + [param('ns3::Time', 't')]) ## aodv-routing-protocol.h: ns3::aodv::RoutingProtocol::AODV_PORT [variable] cls.add_static_attribute('AODV_PORT', 'uint32_t const', is_const=True) return diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_bulk_send.py b/bindings/python/apidefs/gcc-LP64/ns3_module_bulk_send.py new file mode 100644 index 000000000..b40a5ac12 --- /dev/null +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_bulk_send.py @@ -0,0 +1,164 @@ +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers + +def register_types(module): + root_module = module.get_root() + + ## bulk-send-application.h: ns3::BulkSendApplication [class] + module.add_class('BulkSendApplication', parent=root_module['ns3::Application']) + + ## 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 FatalImpl + + nested_module = module.add_cpp_namespace('FatalImpl') + register_types_ns3_FatalImpl(nested_module) + + + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + + ## Register a nested module for the namespace aodv + + nested_module = module.add_cpp_namespace('aodv') + register_types_ns3_aodv(nested_module) + + + ## Register a nested module for the namespace dot11s + + nested_module = module.add_cpp_namespace('dot11s') + register_types_ns3_dot11s(nested_module) + + + ## Register a nested module for the namespace flame + + nested_module = module.add_cpp_namespace('flame') + register_types_ns3_flame(nested_module) + + + ## Register a nested module for the namespace internal + + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) + + + ## Register a nested module for the namespace olsr + + nested_module = module.add_cpp_namespace('olsr') + register_types_ns3_olsr(nested_module) + + +def register_types_ns3_Config(module): + root_module = module.get_root() + + +def register_types_ns3_FatalImpl(module): + root_module = module.get_root() + + +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + +def register_types_ns3_aodv(module): + root_module = module.get_root() + + +def register_types_ns3_dot11s(module): + root_module = module.get_root() + + +def register_types_ns3_flame(module): + root_module = module.get_root() + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + +def register_types_ns3_olsr(module): + root_module = module.get_root() + + +def register_methods(root_module): + register_Ns3BulkSendApplication_methods(root_module, root_module['ns3::BulkSendApplication']) + return + +def register_Ns3BulkSendApplication_methods(root_module, cls): + ## bulk-send-application.h: ns3::BulkSendApplication::BulkSendApplication(ns3::BulkSendApplication const & arg0) [copy constructor] + cls.add_constructor([param('ns3::BulkSendApplication const &', 'arg0')]) + ## bulk-send-application.h: ns3::BulkSendApplication::BulkSendApplication() [constructor] + cls.add_constructor([]) + ## bulk-send-application.h: ns3::Ptr ns3::BulkSendApplication::GetSocket() const [member function] + cls.add_method('GetSocket', + 'ns3::Ptr< ns3::Socket >', + [], + is_const=True) + ## bulk-send-application.h: static ns3::TypeId ns3::BulkSendApplication::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## bulk-send-application.h: void ns3::BulkSendApplication::SetMaxBytes(uint32_t maxBytes) [member function] + cls.add_method('SetMaxBytes', + 'void', + [param('uint32_t', 'maxBytes')]) + ## bulk-send-application.h: void ns3::BulkSendApplication::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + ## bulk-send-application.h: void ns3::BulkSendApplication::StartApplication() [member function] + cls.add_method('StartApplication', + 'void', + [], + visibility='private', is_virtual=True) + ## bulk-send-application.h: void ns3::BulkSendApplication::StopApplication() [member function] + cls.add_method('StopApplication', + 'void', + [], + visibility='private', is_virtual=True) + return + +def register_functions(root_module): + module = root_module + register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) + register_functions_ns3_aodv(module.get_submodule('aodv'), root_module) + register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module) + register_functions_ns3_flame(module.get_submodule('flame'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) + register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) + return + +def register_functions_ns3_Config(module, root_module): + return + +def register_functions_ns3_FatalImpl(module, root_module): + return + +def register_functions_ns3_addressUtils(module, root_module): + return + +def register_functions_ns3_aodv(module, root_module): + return + +def register_functions_ns3_dot11s(module, root_module): + return + +def register_functions_ns3_flame(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + +def register_functions_ns3_olsr(module, root_module): + return + diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py index 856142cc8..98708ee94 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py @@ -1456,6 +1456,7 @@ def register_Ns3SpectrumPropagationLossModel_methods(root_module, cls): return def register_Ns3SpectrumValue_methods(root_module, cls): + cls.add_output_stream_operator() cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) @@ -1465,7 +1466,6 @@ def register_Ns3SpectrumValue_methods(root_module, cls): cls.add_binary_numeric_operator('-', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('double', 'right')) cls.add_binary_numeric_operator('/', root_module['ns3::SpectrumValue'], root_module['ns3::SpectrumValue'], param('ns3::SpectrumValue const &', 'right')) - cls.add_output_stream_operator() cls.add_inplace_numeric_operator('*=', param('ns3::SpectrumValue const &', 'right')) cls.add_inplace_numeric_operator('*=', param('double', 'right')) cls.add_inplace_numeric_operator('+=', param('ns3::SpectrumValue const &', 'right')) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py index 4025a5e7e..4ededd58b 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py @@ -17,6 +17,8 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') + ## gtk-config-store.h: ns3::GtkConfigStore [class] + module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -128,6 +130,7 @@ def register_methods(root_module): register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) + register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -352,6 +355,21 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return +def register_Ns3GtkConfigStore_methods(root_module, cls): + ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] + cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) + ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] + cls.add_constructor([]) + ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] + cls.add_method('ConfigureAttributes', + 'void', + []) + ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] + cls.add_method('ConfigureDefaults', + 'void', + []) + return + def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py index a52c9802d..7a7c10d9e 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py @@ -224,6 +224,10 @@ def register_types(module): module.add_container('std::list< ns3::Ptr< ns3::UanTransducer > >', 'ns3::Ptr< ns3::UanTransducer >', container_type='list') module.add_container('std::vector< ns3::Ptr< ns3::NetDevice > >', 'ns3::Ptr< ns3::NetDevice >', container_type='vector') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') + typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') + typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') + typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') + module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -232,10 +236,6 @@ def register_types(module): typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') - typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') - typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') - typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') - module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') ## Register a nested module for the namespace Config @@ -1351,9 +1351,9 @@ def register_Ns3TriangularVariable_methods(root_module, cls): def register_Ns3TypeId_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## type-id.h: ns3::TypeId::TypeId(char const * name) [constructor] cls.add_constructor([param('char const *', 'name')]) ## type-id.h: ns3::TypeId::TypeId() [constructor] diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py b/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py index 4326a6ba7..6491e05eb 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py @@ -73,18 +73,18 @@ def register_types_ns3_aodv(module): def register_types_ns3_dot11s(module): root_module = module.get_root() - ## ie-dot11s-configuration.h: ns3::dot11s::dot11sSynchronizationProtocolIdentifier [enumeration] - module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration] module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL']) - ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] - module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) - ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration] - module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionProtocol [enumeration] module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP']) ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration] module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE']) + ## ie-dot11s-configuration.h: ns3::dot11s::dot11sSynchronizationProtocolIdentifier [enumeration] + module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL']) + ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration] + module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED']) + ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration] + module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME']) ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class] module.add_class('Dot11sMeshCapability') ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class] diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py index 5811cb0c5..01da6372f 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py @@ -19,6 +19,8 @@ def register_types(module): module.add_class('AsciiTraceHelperForIpv6', allow_subclassing=True) ## athstats-helper.h: ns3::AthstatsHelper [class] module.add_class('AthstatsHelper') + ## bulk-send-helper.h: ns3::BulkSendHelper [class] + module.add_class('BulkSendHelper') ## csma-star-helper.h: ns3::CsmaStarHelper [class] module.add_class('CsmaStarHelper') ## ipv4-address-helper.h: ns3::Ipv4AddressHelper [class] @@ -229,6 +231,7 @@ def register_methods(root_module): register_Ns3AsciiTraceHelperForIpv4_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv4']) register_Ns3AsciiTraceHelperForIpv6_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv6']) register_Ns3AthstatsHelper_methods(root_module, root_module['ns3::AthstatsHelper']) + register_Ns3BulkSendHelper_methods(root_module, root_module['ns3::BulkSendHelper']) register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper']) register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper']) register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer']) @@ -667,6 +670,32 @@ def register_Ns3AthstatsHelper_methods(root_module, cls): [param('std::string', 'filename'), param('ns3::NodeContainer', 'n')]) return +def register_Ns3BulkSendHelper_methods(root_module, cls): + ## bulk-send-helper.h: ns3::BulkSendHelper::BulkSendHelper(ns3::BulkSendHelper const & arg0) [copy constructor] + cls.add_constructor([param('ns3::BulkSendHelper const &', 'arg0')]) + ## bulk-send-helper.h: ns3::BulkSendHelper::BulkSendHelper(std::string protocol, ns3::Address address) [constructor] + cls.add_constructor([param('std::string', 'protocol'), param('ns3::Address', 'address')]) + ## bulk-send-helper.h: ns3::ApplicationContainer ns3::BulkSendHelper::Install(ns3::NodeContainer c) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::NodeContainer', 'c')], + is_const=True) + ## bulk-send-helper.h: ns3::ApplicationContainer ns3::BulkSendHelper::Install(ns3::Ptr node) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## bulk-send-helper.h: ns3::ApplicationContainer ns3::BulkSendHelper::Install(std::string nodeName) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('std::string', 'nodeName')], + is_const=True) + ## bulk-send-helper.h: void ns3::BulkSendHelper::SetAttribute(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('SetAttribute', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + return + def register_Ns3CsmaStarHelper_methods(root_module, cls): ## csma-star-helper.h: ns3::CsmaStarHelper::CsmaStarHelper(ns3::CsmaStarHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::CsmaStarHelper const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_node.py b/bindings/python/apidefs/gcc-LP64/ns3_module_node.py index 088b943ba..7727925ae 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_node.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_node.py @@ -103,6 +103,8 @@ def register_types(module): 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', 'ERROR_NODEV', 'ERROR_ADDRNOTAVAIL', 'SOCKET_ERRNO_LAST'], outer_class=root_module['ns3::Socket']) + ## socket.h: ns3::Socket::SocketType [enumeration] + module.add_enum('SocketType', ['SOCK_STREAM', 'SOCK_SEQPACKET', 'SOCK_DGRAM', 'SOCK_RAW'], outer_class=root_module['ns3::Socket']) ## socket.h: ns3::SocketAddressTag [class] module.add_class('SocketAddressTag', parent=root_module['ns3::Tag']) ## socket-factory.h: ns3::SocketFactory [class] @@ -212,21 +214,21 @@ def register_types(module): module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set') module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector') module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type='vector') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndErrorCallback&') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndOkCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxStartCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&') ## Register a nested module for the namespace Config @@ -390,9 +392,9 @@ def register_methods(root_module): def register_Ns3Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## address.h: ns3::Address::Address() [constructor] cls.add_constructor([]) ## address.h: ns3::Address::Address(uint8_t type, uint8_t const * buffer, uint8_t len) [constructor] @@ -578,9 +580,9 @@ def register_Ns3InetSocketAddress_methods(root_module, cls): def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4Address const &', 'arg0')]) ## ipv4-address.h: ns3::Ipv4Address::Ipv4Address() [constructor] @@ -862,9 +864,9 @@ def register_Ns3Ipv4Mask_methods(root_module, cls): def register_Ns3Ipv6Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address() [constructor] cls.add_constructor([]) ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(char const * address) [constructor] @@ -1129,9 +1131,9 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): def register_Ns3Mac48Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## mac48-address.h: ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')]) ## mac48-address.h: ns3::Mac48Address::Mac48Address() [constructor] @@ -2217,6 +2219,11 @@ def register_Ns3Socket_methods(root_module, cls): 'int', [param('ns3::Address &', 'address')], is_pure_virtual=True, is_const=True, is_virtual=True) + ## socket.h: ns3::Socket::SocketType ns3::Socket::GetSocketType() const [member function] + cls.add_method('GetSocketType', + 'ns3::Socket::SocketType', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) ## socket.h: uint32_t ns3::Socket::GetTxAvailable() const [member function] cls.add_method('GetTxAvailable', 'uint32_t', diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py index afbbbc2f2..de199a31c 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py @@ -67,14 +67,14 @@ def register_types(module): module.add_class('TimeChecker', parent=root_module['ns3::AttributeChecker']) ## nstime.h: ns3::TimeValue [class] module.add_class('TimeValue', parent=root_module['ns3::AttributeValue']) - typehandlers.add_type_alias('ns3::Time', 'ns3::TimeSquare') - typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeSquare*') - typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeSquare&') - module.add_typedef(root_module['ns3::Time'], 'TimeSquare') typehandlers.add_type_alias('ns3::Time', 'ns3::TimeInvert') typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeInvert*') typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeInvert&') module.add_typedef(root_module['ns3::Time'], 'TimeInvert') + typehandlers.add_type_alias('ns3::Time', 'ns3::TimeSquare') + typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeSquare*') + typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeSquare&') + module.add_typedef(root_module['ns3::Time'], 'TimeSquare') ## Register a nested module for the namespace Config @@ -390,20 +390,20 @@ def register_Ns3Simulator_methods(root_module, cls): def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) - cls.add_binary_comparison_operator('<') - cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right')) + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') + cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_numeric_operator('/', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) + cls.add_binary_comparison_operator('<') + cls.add_binary_comparison_operator('>') ## nstime.h: ns3::Time::Time() [constructor] cls.add_constructor([]) ## nstime.h: ns3::Time::Time(ns3::Time const & o) [copy constructor] diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_spectrum.py b/bindings/python/apidefs/gcc-LP64/ns3_module_spectrum.py index 01c285f31..879b4b75c 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_spectrum.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_spectrum.py @@ -39,15 +39,15 @@ def register_types(module): module.add_class('MultiModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel']) ## single-model-spectrum-channel.h: ns3::SingleModelSpectrumChannel [class] module.add_class('SingleModelSpectrumChannel', parent=root_module['ns3::SpectrumChannel']) + typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') + typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') + typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >', 'ns3::TxSpectrumModelInfoMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >*', 'ns3::TxSpectrumModelInfoMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >&', 'ns3::TxSpectrumModelInfoMap_t&') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >', 'ns3::RxSpectrumModelInfoMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >*', 'ns3::RxSpectrumModelInfoMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >&', 'ns3::RxSpectrumModelInfoMap_t&') - typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') - typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') - typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') ## Register a nested module for the namespace Config diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py index 9ecf39d16..8d8860bf0 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py @@ -19,18 +19,20 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) + ## sqlite-data-output.h: ns3::SqliteDataOutput [class] + module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator']) ## packet-data-calculators.h: ns3::PacketCounterCalculator [class] module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >']) - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') - typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >*', 'ns3::MetadataList*') typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >&', 'ns3::MetadataList&') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >*', 'ns3::DataCalculatorList*') + typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >&', 'ns3::DataCalculatorList&') ## Register a nested module for the namespace Config @@ -121,6 +123,7 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) + register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -465,6 +468,23 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return +def register_Ns3SqliteDataOutput_methods(root_module, cls): + ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) + ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] + cls.add_constructor([]) + ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] + cls.add_method('Output', + 'void', + [param('ns3::DataCollector &', 'dc')], + is_virtual=True) + ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + return + def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py index 2ee642cbf..5a9a76b30 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py @@ -11,16 +11,16 @@ def register_types(module): module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT']) ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration] module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH']) - ## qos-tag.h: ns3::UserPriority [enumeration] - module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC']) ## qos-utils.h: ns3::AcIndex [enumeration] module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF']) - ## edca-txop-n.h: ns3::TypeOfStation [enumeration] - module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH']) ## ctrl-headers.h: ns3::BlockAckType [enumeration] module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK']) + ## qos-tag.h: ns3::UserPriority [enumeration] + module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC']) ## wifi-mode.h: ns3::WifiCodeRate [enumeration] module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2']) + ## edca-txop-n.h: ns3::TypeOfStation [enumeration] + module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH']) ## block-ack-manager.h: ns3::Bar [struct] module.add_class('Bar') ## block-ack-agreement.h: ns3::BlockAckAgreement [class] @@ -204,6 +204,9 @@ def register_types(module): ## dca-txop.h: ns3::DcaTxop [class] module.add_class('DcaTxop', parent=root_module['ns3::Dcf']) module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId') typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*') typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&') @@ -213,9 +216,6 @@ def register_types(module): typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >', 'ns3::SampleRate') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >*', 'ns3::SampleRate*') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >&', 'ns3::SampleRate&') diff --git a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py index 84f0a372f..4095c0d05 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py +++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py @@ -22,6 +22,7 @@ import ns3_module_common import ns3_module_contrib import ns3_module_node import ns3_module_bridge +import ns3_module_bulk_send import ns3_module_csma import ns3_module_emu import ns3_module_energy @@ -171,6 +172,17 @@ def register_types(module): ns3_module_bridge__local.register_types(module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_bulk_send') + ns3_module_bulk_send.register_types(module) + + try: + import ns3_module_bulk_send__local + except ImportError: + pass + else: + ns3_module_bulk_send__local.register_types(module) + + root_module.end_section('ns3_module_bulk_send') root_module.begin_section('ns3_module_csma') ns3_module_csma.register_types(module) @@ -896,39 +908,39 @@ def register_types_ns3_olsr(module): module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector') module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector') module.add_container('std::vector< ns3::olsr::RoutingTableEntry >', 'ns3::olsr::RoutingTableEntry', container_type='vector') - typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >*', 'ns3::olsr::NeighborSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >&', 'ns3::olsr::NeighborSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >', 'ns3::olsr::AssociationSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >*', 'ns3::olsr::AssociationSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >&', 'ns3::olsr::AssociationSet&') typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet') typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >*', 'ns3::olsr::TopologySet*') typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >&', 'ns3::olsr::TopologySet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet') - typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >*', 'ns3::olsr::LinkSet*') - typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >&', 'ns3::olsr::LinkSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations') - typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*') - typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&') typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet') typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >*', 'ns3::olsr::MprSet*') typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >&', 'ns3::olsr::MprSet&') typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet') typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >*', 'ns3::olsr::MprSelectorSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >&', 'ns3::olsr::MprSelectorSet&') - typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList') - typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*') - typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&') + typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >', 'ns3::olsr::Associations') + typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >*', 'ns3::olsr::Associations*') + typehandlers.add_type_alias('std::vector< ns3::olsr::Association, std::allocator< ns3::olsr::Association > >&', 'ns3::olsr::Associations&') typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet') typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >*', 'ns3::olsr::IfaceAssocSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >&', 'ns3::olsr::IfaceAssocSet&') typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet') typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >*', 'ns3::olsr::TwoHopNeighborSet*') typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >&', 'ns3::olsr::TwoHopNeighborSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >*', 'ns3::olsr::DuplicateSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >&', 'ns3::olsr::DuplicateSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList') + typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >*', 'ns3::olsr::MessageList*') + typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >&', 'ns3::olsr::MessageList&') + typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >*', 'ns3::olsr::NeighborSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >&', 'ns3::olsr::NeighborSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >', 'ns3::olsr::AssociationSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >*', 'ns3::olsr::AssociationSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::AssociationTuple, std::allocator< ns3::olsr::AssociationTuple > >&', 'ns3::olsr::AssociationSet&') + typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet') + typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >*', 'ns3::olsr::LinkSet*') + typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >&', 'ns3::olsr::LinkSet&') def register_methods(root_module): register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper']) @@ -1157,6 +1169,17 @@ def register_methods(root_module): ns3_module_bridge__local.register_methods(root_module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_bulk_send') + ns3_module_bulk_send.register_methods(root_module) + + try: + import ns3_module_bulk_send__local + except ImportError: + pass + else: + ns3_module_bulk_send__local.register_methods(root_module) + + root_module.end_section('ns3_module_bulk_send') root_module.begin_section('ns3_module_csma') ns3_module_csma.register_methods(root_module) @@ -2754,9 +2777,9 @@ def register_Ns3Tap_methods(root_module, cls): def register_Ns3UanAddress_methods(root_module, cls): cls.add_binary_comparison_operator('!=') - cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## uan-address.h: ns3::UanAddress::UanAddress(ns3::UanAddress const & arg0) [copy constructor] cls.add_constructor([param('ns3::UanAddress const &', 'arg0')]) ## uan-address.h: ns3::UanAddress::UanAddress() [constructor] @@ -5444,8 +5467,8 @@ def register_Ns3Ipv4FlowClassifier_methods(root_module, cls): return def register_Ns3Ipv4FlowClassifierFiveTuple_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('==') + cls.add_binary_comparison_operator('<') ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple() [constructor] cls.add_constructor([]) ## ipv4-flow-classifier.h: ns3::Ipv4FlowClassifier::FiveTuple::FiveTuple(ns3::Ipv4FlowClassifier::FiveTuple const & arg0) [copy constructor] @@ -7454,6 +7477,17 @@ def register_functions(root_module): ns3_module_bridge__local.register_functions(root_module) root_module.end_section('ns3_module_bridge') + root_module.begin_section('ns3_module_bulk_send') + ns3_module_bulk_send.register_functions(root_module) + + try: + import ns3_module_bulk_send__local + except ImportError: + pass + else: + ns3_module_bulk_send__local.register_functions(root_module) + + root_module.end_section('ns3_module_bulk_send') root_module.begin_section('ns3_module_csma') ns3_module_csma.register_functions(root_module)