diff --git a/bindings/python/callbacks_list.py b/bindings/python/callbacks_list.py index 2ee31e7b7..95447443d 100644 --- a/bindings/python/callbacks_list.py +++ b/bindings/python/callbacks_list.py @@ -1,10 +1,10 @@ callback_classes = [ ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Ptr', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType'], diff --git a/bindings/python/ns3_module_bridge.py b/bindings/python/ns3_module_bridge.py index f7c276862..db78c6d34 100644 --- a/bindings/python/ns3_module_bridge.py +++ b/bindings/python/ns3_module_bridge.py @@ -8,10 +8,10 @@ def register_types(module): ## bridge-net-device.h: ns3::BridgeNetDevice [class] module.add_class('BridgeNetDevice', parent=root_module['ns3::NetDevice']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -20,10 +20,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -32,7 +32,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -40,7 +40,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -208,6 +208,11 @@ def register_Ns3BridgeNetDevice_methods(root_module, cls): 'bool', [], is_const=True, is_virtual=True) + ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_const=True, is_virtual=True) ## bridge-net-device.h: void ns3::BridgeNetDevice::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -242,21 +247,21 @@ def register_Ns3BridgeNetDevice_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_common.py b/bindings/python/ns3_module_common.py index e4d4aff67..7877692dd 100644 --- a/bindings/python/ns3_module_common.py +++ b/bindings/python/ns3_module_common.py @@ -54,10 +54,10 @@ def register_types(module): ## error-model.h: ns3::RateErrorModel [class] module.add_class('RateErrorModel', parent=root_module['ns3::ErrorModel']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -66,10 +66,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -78,7 +78,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -86,7 +86,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -1118,21 +1118,21 @@ def register_functions(root_module): module.add_function('MakeDataRateChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_contrib.py b/bindings/python/ns3_module_contrib.py index 2858acfe5..69d47be3b 100644 --- a/bindings/python/ns3_module_contrib.py +++ b/bindings/python/ns3_module_contrib.py @@ -20,10 +20,10 @@ def register_types(module): ## config-store.h: ns3::ConfigStore [class] module.add_class('ConfigStore', parent=root_module['ns3::ObjectBase']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -32,10 +32,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -44,7 +44,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -52,7 +52,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -184,21 +184,21 @@ def register_Ns3ConfigStore_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_core.py b/bindings/python/ns3_module_core.py index 96ade8fc4..ae2b37ec8 100644 --- a/bindings/python/ns3_module_core.py +++ b/bindings/python/ns3_module_core.py @@ -164,10 +164,10 @@ def register_types(module): ## traced-value.h: ns3::TracedValue [class] root_module['ns3::TracedValue< unsigned int >'].implicitly_converts_to(root_module['ns3::EnumValue']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -176,10 +176,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -188,14 +188,6 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): - root_module = module.get_root() - - -def register_types_ns3_TimeStepPrecision(module): - root_module = module.get_root() - - def register_types_ns3_Config(module): root_module = module.get_root() @@ -203,6 +195,14 @@ def register_types_ns3_Config(module): module.add_class('MatchContainer') module.add_container('std::vector< ns3::Ptr< ns3::Object > >', 'ns3::Ptr< ns3::Object >', container_type='vector') +def register_types_ns3_TimeStepPrecision(module): + root_module = module.get_root() + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + def register_types_ns3_olsr(module): root_module = module.get_root() @@ -1879,7 +1879,7 @@ def register_Ns3TracedValue__Unsigned_int_methods(root_module, cls): cls.add_method('ConnectWithoutContext', 'void', [param('ns3::CallbackBase const &', 'cb')]) - ## traced-value.h: void ns3::TracedValue::Connect(ns3::CallbackBase const & cb, std::basic_string,std::allocator > path) [member function] + ## traced-value.h: void ns3::TracedValue::Connect(ns3::CallbackBase const & cb, std::string path) [member function] cls.add_method('Connect', 'void', [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')]) @@ -1887,7 +1887,7 @@ def register_Ns3TracedValue__Unsigned_int_methods(root_module, cls): cls.add_method('DisconnectWithoutContext', 'void', [param('ns3::CallbackBase const &', 'cb')]) - ## traced-value.h: void ns3::TracedValue::Disconnect(ns3::CallbackBase const & cb, std::basic_string,std::allocator > path) [member function] + ## traced-value.h: void ns3::TracedValue::Disconnect(ns3::CallbackBase const & cb, std::string path) [member function] cls.add_method('Disconnect', 'void', [param('ns3::CallbackBase const &', 'cb'), param('std::string', 'path')]) @@ -1963,10 +1963,64 @@ def register_Ns3ConfigMatchContainer_methods(root_module, cls): def register_functions(root_module): module = root_module + ## breakpoint.h: extern void ns3::BreakpointFallback() [free function] + module.add_function('BreakpointFallback', + 'void', + []) + ## ptr.h: extern ns3::Ptr ns3::Create() [free function] + module.add_function('Create', + 'ns3::Ptr< ns3::ObjectVectorValue >', + [], + template_parameters=['ns3::ObjectVectorValue']) + ## ptr.h: extern ns3::Ptr ns3::Create() [free function] + module.add_function('Create', + 'ns3::Ptr< ns3::PointerValue >', + [], + template_parameters=['ns3::PointerValue']) + ## log.h: extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function] + module.add_function('LogComponentDisable', + 'void', + [param('char const *', 'name'), param('ns3::LogLevel', 'level')]) + ## log.h: extern void ns3::LogComponentDisableAll(ns3::LogLevel level) [free function] + module.add_function('LogComponentDisableAll', + 'void', + [param('ns3::LogLevel', 'level')]) + ## log.h: extern void ns3::LogComponentEnable(char const * name, ns3::LogLevel level) [free function] + module.add_function('LogComponentEnable', + 'void', + [param('char const *', 'name'), param('ns3::LogLevel', 'level')]) + ## log.h: extern void ns3::LogComponentEnableAll(ns3::LogLevel level) [free function] + module.add_function('LogComponentEnableAll', + 'void', + [param('ns3::LogLevel', 'level')]) ## boolean.h: extern ns3::Ptr ns3::MakeBooleanChecker() [free function] module.add_function('MakeBooleanChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) + ## callback.h: extern ns3::Ptr ns3::MakeCallbackChecker() [free function] + module.add_function('MakeCallbackChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) + ## enum.h: extern ns3::Ptr ns3::MakeEnumChecker(int v1, std::string n1, int v2=0, std::string n2="", int v3=0, std::string n3="", int v4=0, std::string n4="", int v5=0, std::string n5="", int v6=0, std::string n6="", int v7=0, std::string n7="", int v8=0, std::string n8="", int v9=0, std::string n9="", int v10=0, std::string n10="", int v11=0, std::string n11="", int v12=0, std::string n12="") [free function] + module.add_function('MakeEnumChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('int', 'v1'), param('std::string', 'n1'), param('int', 'v2', default_value='0'), param('std::string', 'n2', default_value='""'), param('int', 'v3', default_value='0'), param('std::string', 'n3', default_value='""'), param('int', 'v4', default_value='0'), param('std::string', 'n4', default_value='""'), param('int', 'v5', default_value='0'), param('std::string', 'n5', default_value='""'), param('int', 'v6', default_value='0'), param('std::string', 'n6', default_value='""'), param('int', 'v7', default_value='0'), param('std::string', 'n7', default_value='""'), param('int', 'v8', default_value='0'), param('std::string', 'n8', default_value='""'), param('int', 'v9', default_value='0'), param('std::string', 'n9', default_value='""'), param('int', 'v10', default_value='0'), param('std::string', 'n10', default_value='""'), param('int', 'v11', default_value='0'), param('std::string', 'n11', default_value='""'), param('int', 'v12', default_value='0'), param('std::string', 'n12', default_value='""')]) + ## object-factory.h: extern ns3::Ptr ns3::MakeObjectFactoryChecker() [free function] + module.add_function('MakeObjectFactoryChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) + ## random-variable.h: extern ns3::Ptr ns3::MakeRandomVariableChecker() [free function] + module.add_function('MakeRandomVariableChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) + ## string.h: extern ns3::Ptr ns3::MakeStringChecker() [free function] + module.add_function('MakeStringChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) + ## type-id.h: extern ns3::Ptr ns3::MakeTypeIdChecker() [free function] + module.add_function('MakeTypeIdChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) ## type-name.h: extern std::string ns3::TypeNameGet() [free function] module.add_function('TypeNameGet', 'std::string', @@ -2017,141 +2071,87 @@ def register_functions(root_module): 'std::string', [], template_parameters=['unsigned char']) - ## string.h: extern ns3::Ptr ns3::MakeStringChecker() [free function] - module.add_function('MakeStringChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) - ## enum.h: extern ns3::Ptr ns3::MakeEnumChecker(int v1, std::string n1, int v2=0, std::string n2="", int v3=0, std::string n3="", int v4=0, std::string n4="", int v5=0, std::string n5="", int v6=0, std::string n6="", int v7=0, std::string n7="", int v8=0, std::string n8="", int v9=0, std::string n9="", int v10=0, std::string n10="", int v11=0, std::string n11="", int v12=0, std::string n12="") [free function] - module.add_function('MakeEnumChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - [param('int', 'v1'), param('std::string', 'n1'), param('int', 'v2', default_value='0'), param('std::string', 'n2', default_value='""'), param('int', 'v3', default_value='0'), param('std::string', 'n3', default_value='""'), param('int', 'v4', default_value='0'), param('std::string', 'n4', default_value='""'), param('int', 'v5', default_value='0'), param('std::string', 'n5', default_value='""'), param('int', 'v6', default_value='0'), param('std::string', 'n6', default_value='""'), param('int', 'v7', default_value='0'), param('std::string', 'n7', default_value='""'), param('int', 'v8', default_value='0'), param('std::string', 'n8', default_value='""'), param('int', 'v9', default_value='0'), param('std::string', 'n9', default_value='""'), param('int', 'v10', default_value='0'), param('std::string', 'n10', default_value='""'), param('int', 'v11', default_value='0'), param('std::string', 'n11', default_value='""'), param('int', 'v12', default_value='0'), param('std::string', 'n12', default_value='""')]) - ## type-id.h: extern ns3::Ptr ns3::MakeTypeIdChecker() [free function] - module.add_function('MakeTypeIdChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) - ## log.h: extern void ns3::LogComponentEnableAll(ns3::LogLevel level) [free function] - module.add_function('LogComponentEnableAll', - 'void', - [param('ns3::LogLevel', 'level')]) - ## ptr.h: extern ns3::Ptr ns3::Create() [free function] - module.add_function('Create', - 'ns3::Ptr< ns3::PointerValue >', - [], - template_parameters=['ns3::PointerValue']) - ## ptr.h: extern ns3::Ptr ns3::Create() [free function] - module.add_function('Create', - 'ns3::Ptr< ns3::ObjectVectorValue >', - [], - template_parameters=['ns3::ObjectVectorValue']) - ## object-factory.h: extern ns3::Ptr ns3::MakeObjectFactoryChecker() [free function] - module.add_function('MakeObjectFactoryChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) - ## log.h: extern void ns3::LogComponentDisableAll(ns3::LogLevel level) [free function] - module.add_function('LogComponentDisableAll', - 'void', - [param('ns3::LogLevel', 'level')]) - ## callback.h: extern ns3::Ptr ns3::MakeCallbackChecker() [free function] - module.add_function('MakeCallbackChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) - ## breakpoint.h: extern void ns3::BreakpointFallback() [free function] - module.add_function('BreakpointFallback', - 'void', - []) - ## random-variable.h: extern ns3::Ptr ns3::MakeRandomVariableChecker() [free function] - module.add_function('MakeRandomVariableChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) - ## log.h: extern void ns3::LogComponentDisable(char const * name, ns3::LogLevel level) [free function] - module.add_function('LogComponentDisable', - 'void', - [param('char const *', 'name'), param('ns3::LogLevel', 'level')]) - ## log.h: extern void ns3::LogComponentEnable(char const * name, ns3::LogLevel level) [free function] - module.add_function('LogComponentEnable', - 'void', - [param('char const *', 'name'), param('ns3::LogLevel', 'level')]) - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - ## uinteger.h: extern ns3::Ptr ns3::internal::MakeUintegerChecker(uint64_t min, uint64_t max, std::string name) [free function] - module.add_function('MakeUintegerChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - [param('uint64_t', 'min'), param('uint64_t', 'max'), param('std::string', 'name')]) - ## integer.h: extern ns3::Ptr ns3::internal::MakeIntegerChecker(int64_t min, int64_t max, std::string name) [free function] - module.add_function('MakeIntegerChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - [param('int64_t', 'min'), param('int64_t', 'max'), param('std::string', 'name')]) - ## double.h: extern ns3::Ptr ns3::internal::MakeDoubleChecker(double min, double max, std::string name) [free function] - module.add_function('MakeDoubleChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - [param('double', 'min'), param('double', 'max'), param('std::string', 'name')]) - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): - ## config.h: extern bool ns3::Config::SetDefaultFailSafe(std::string name, ns3::AttributeValue const & value) [free function] - module.add_function('SetDefaultFailSafe', - 'bool', - [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) - ## config.h: extern void ns3::Config::DisconnectWithoutContext(std::string path, ns3::CallbackBase const & cb) [free function] - module.add_function('DisconnectWithoutContext', - 'void', - [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) - ## config.h: extern void ns3::Config::SetDefault(std::string name, ns3::AttributeValue const & value) [free function] - module.add_function('SetDefault', - 'void', - [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) - ## config.h: extern ns3::Config::MatchContainer ns3::Config::LookupMatches(std::string path) [free function] - module.add_function('LookupMatches', - 'ns3::Config::MatchContainer', - [param('std::string', 'path')]) ## config.h: extern void ns3::Config::Connect(std::string path, ns3::CallbackBase const & cb) [free function] module.add_function('Connect', 'void', [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h: extern void ns3::Config::ConnectWithoutContext(std::string path, ns3::CallbackBase const & cb) [free function] + module.add_function('ConnectWithoutContext', + 'void', + [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h: extern void ns3::Config::Disconnect(std::string path, ns3::CallbackBase const & cb) [free function] + module.add_function('Disconnect', + 'void', + [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h: extern void ns3::Config::DisconnectWithoutContext(std::string path, ns3::CallbackBase const & cb) [free function] + module.add_function('DisconnectWithoutContext', + 'void', + [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) ## config.h: extern ns3::Ptr ns3::Config::GetRootNamespaceObject(uint32_t i) [free function] module.add_function('GetRootNamespaceObject', 'ns3::Ptr< ns3::Object >', [param('uint32_t', 'i')]) - ## config.h: extern void ns3::Config::ConnectWithoutContext(std::string path, ns3::CallbackBase const & cb) [free function] - module.add_function('ConnectWithoutContext', - 'void', - [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) - ## config.h: extern void ns3::Config::UnregisterRootNamespaceObject(ns3::Ptr obj) [free function] - module.add_function('UnregisterRootNamespaceObject', - 'void', - [param('ns3::Ptr< ns3::Object >', 'obj')]) - ## config.h: extern bool ns3::Config::SetGlobalFailSafe(std::string name, ns3::AttributeValue const & value) [free function] - module.add_function('SetGlobalFailSafe', - 'bool', - [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) ## config.h: extern uint32_t ns3::Config::GetRootNamespaceObjectN() [free function] module.add_function('GetRootNamespaceObjectN', 'uint32_t', []) - ## config.h: extern void ns3::Config::Set(std::string path, ns3::AttributeValue const & value) [free function] - module.add_function('Set', - 'void', - [param('std::string', 'path'), param('ns3::AttributeValue const &', 'value')]) - ## config.h: extern void ns3::Config::SetGlobal(std::string name, ns3::AttributeValue const & value) [free function] - module.add_function('SetGlobal', - 'void', - [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## config.h: extern ns3::Config::MatchContainer ns3::Config::LookupMatches(std::string path) [free function] + module.add_function('LookupMatches', + 'ns3::Config::MatchContainer', + [param('std::string', 'path')]) ## config.h: extern void ns3::Config::RegisterRootNamespaceObject(ns3::Ptr obj) [free function] module.add_function('RegisterRootNamespaceObject', 'void', [param('ns3::Ptr< ns3::Object >', 'obj')]) - ## config.h: extern void ns3::Config::Disconnect(std::string path, ns3::CallbackBase const & cb) [free function] - module.add_function('Disconnect', + ## config.h: extern void ns3::Config::Set(std::string path, ns3::AttributeValue const & value) [free function] + module.add_function('Set', 'void', - [param('std::string', 'path'), param('ns3::CallbackBase const &', 'cb')]) + [param('std::string', 'path'), param('ns3::AttributeValue const &', 'value')]) + ## config.h: extern void ns3::Config::SetDefault(std::string name, ns3::AttributeValue const & value) [free function] + module.add_function('SetDefault', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## config.h: extern bool ns3::Config::SetDefaultFailSafe(std::string name, ns3::AttributeValue const & value) [free function] + module.add_function('SetDefaultFailSafe', + 'bool', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## config.h: extern void ns3::Config::SetGlobal(std::string name, ns3::AttributeValue const & value) [free function] + module.add_function('SetGlobal', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## config.h: extern bool ns3::Config::SetGlobalFailSafe(std::string name, ns3::AttributeValue const & value) [free function] + module.add_function('SetGlobalFailSafe', + 'bool', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## config.h: extern void ns3::Config::UnregisterRootNamespaceObject(ns3::Ptr obj) [free function] + module.add_function('UnregisterRootNamespaceObject', + 'void', + [param('ns3::Ptr< ns3::Object >', 'obj')]) + return + +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + ## double.h: extern ns3::Ptr ns3::internal::MakeDoubleChecker(double min, double max, std::string name) [free function] + module.add_function('MakeDoubleChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('double', 'min'), param('double', 'max'), param('std::string', 'name')]) + ## integer.h: extern ns3::Ptr ns3::internal::MakeIntegerChecker(int64_t min, int64_t max, std::string name) [free function] + module.add_function('MakeIntegerChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('int64_t', 'min'), param('int64_t', 'max'), param('std::string', 'name')]) + ## uinteger.h: extern ns3::Ptr ns3::internal::MakeUintegerChecker(uint64_t min, uint64_t max, std::string name) [free function] + module.add_function('MakeUintegerChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + [param('uint64_t', 'min'), param('uint64_t', 'max'), param('std::string', 'name')]) return def register_functions_ns3_olsr(module, root_module): diff --git a/bindings/python/ns3_module_csma.py b/bindings/python/ns3_module_csma.py index e9e6295a5..db2b1ed43 100644 --- a/bindings/python/ns3_module_csma.py +++ b/bindings/python/ns3_module_csma.py @@ -16,10 +16,10 @@ def register_types(module): ## csma-net-device.h: ns3::CsmaNetDevice::EncapsulationMode [enumeration] module.add_enum('EncapsulationMode', ['ILLEGAL', 'DIX', 'LLC'], outer_class=root_module['ns3::CsmaNetDevice']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -28,10 +28,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -40,7 +40,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -48,7 +48,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -378,6 +378,11 @@ def register_Ns3CsmaNetDevice_methods(root_module, cls): 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## csma-net-device.h: ns3::Address ns3::CsmaNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_const=True, is_virtual=True) ## csma-net-device.h: void ns3::CsmaNetDevice::SetPromiscReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] cls.add_method('SetPromiscReceiveCallback', 'void', @@ -412,21 +417,21 @@ def register_Ns3CsmaNetDevice_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_emu.py b/bindings/python/ns3_module_emu.py index 7b0ba7f58..695272767 100644 --- a/bindings/python/ns3_module_emu.py +++ b/bindings/python/ns3_module_emu.py @@ -6,10 +6,10 @@ def register_types(module): ## emu-net-device.h: ns3::EmuNetDevice [class] module.add_class('EmuNetDevice', parent=root_module['ns3::NetDevice']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -18,10 +18,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -30,7 +30,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -38,7 +38,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -150,6 +150,11 @@ def register_Ns3EmuNetDevice_methods(root_module, cls): 'ns3::Address', [param('ns3::Ipv4Address', 'multicastGroup')], is_const=True, is_virtual=True) + ## emu-net-device.h: ns3::Address ns3::EmuNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_const=True, is_virtual=True) ## emu-net-device.h: bool ns3::EmuNetDevice::IsPointToPoint() const [member function] cls.add_method('IsPointToPoint', 'bool', @@ -204,21 +209,21 @@ def register_Ns3EmuNetDevice_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_global_routing.py b/bindings/python/ns3_module_global_routing.py index 67de0a1ab..8d435718d 100644 --- a/bindings/python/ns3_module_global_routing.py +++ b/bindings/python/ns3_module_global_routing.py @@ -18,10 +18,10 @@ def register_types(module): ## global-router-interface.h: ns3::GlobalRouter [class] module.add_class('GlobalRouter', is_singleton=True, parent=root_module['ns3::Object']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -30,10 +30,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -42,7 +42,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -50,7 +50,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -260,21 +260,21 @@ def register_Ns3GlobalRouter_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_helper.py b/bindings/python/ns3_module_helper.py index 0b79ea5b0..16d317f70 100644 --- a/bindings/python/ns3_module_helper.py +++ b/bindings/python/ns3_module_helper.py @@ -46,10 +46,10 @@ def register_types(module): ## wifi-helper.h: ns3::WifiHelper [class] module.add_class('WifiHelper', allow_subclassing=False) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -58,10 +58,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -70,7 +70,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -78,7 +78,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -115,6 +115,8 @@ def register_Ns3ApplicationContainer_methods(root_module, cls): cls.add_constructor([param('ns3::ApplicationContainer const &', 'arg0')]) ## application-container.h: ns3::ApplicationContainer::ApplicationContainer() [constructor] cls.add_constructor([]) + ## application-container.h: ns3::ApplicationContainer::ApplicationContainer(ns3::Ptr application) [constructor] + cls.add_constructor([param('ns3::Ptr< ns3::Application >', 'application')]) ## application-container.h: __gnu_cxx::__normal_iterator*,std::vector, std::allocator > > > ns3::ApplicationContainer::Begin() const [member function] cls.add_method('Begin', '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Application > const, std::vector< ns3::Ptr< ns3::Application > > >', @@ -235,14 +237,26 @@ def register_Ns3CsmaHelper_methods(root_module, cls): 'void', [param('std::ostream &', 'os')], is_static=True) - ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c) [member function] + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', - [param('ns3::NodeContainer const &', 'c')]) - ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, ns3::Ptr channel) [member function] + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr node, ns3::Ptr channel) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', - [param('ns3::NodeContainer const &', 'c'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')]) + [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], + is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::NodeContainer const &', 'c')], + is_const=True) + ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, ns3::Ptr channel) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::NodeContainer const &', 'c'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], + is_const=True) ## csma-helper.h: void ns3::CsmaHelper::InstallStar(ns3::Ptr hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function] cls.add_method('InstallStar', 'void', @@ -302,10 +316,16 @@ def register_Ns3EmuHelper_methods(root_module, cls): 'void', [param('std::ostream &', 'os')], is_static=True) - ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::NodeContainer const & c) [member function] + ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', - [param('ns3::NodeContainer const &', 'c')]) + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::NodeContainer const & c) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::NodeContainer const &', 'c')], + is_const=True) return def register_Ns3InternetStackHelper_methods(root_module, cls): @@ -313,10 +333,16 @@ def register_Ns3InternetStackHelper_methods(root_module, cls): cls.add_constructor([param('ns3::InternetStackHelper const &', 'arg0')]) ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper() [constructor] cls.add_constructor([]) - ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::NodeContainer c) [member function] + ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'void', - [param('ns3::NodeContainer', 'c')]) + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::NodeContainer c) const [member function] + cls.add_method('Install', + 'void', + [param('ns3::NodeContainer', 'c')], + is_const=True) ## internet-stack-helper.h: void ns3::InternetStackHelper::SetNscStack(std::string soname) [member function] cls.add_method('SetNscStack', 'void', @@ -410,10 +436,16 @@ def register_Ns3MobilityHelper_methods(root_module, cls): 'std::string', [], is_const=True) - ## mobility-helper.h: void ns3::MobilityHelper::Install(ns3::NodeContainer container) [member function] + ## mobility-helper.h: void ns3::MobilityHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'void', - [param('ns3::NodeContainer', 'container')]) + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## mobility-helper.h: void ns3::MobilityHelper::Install(ns3::NodeContainer container) const [member function] + cls.add_method('Install', + 'void', + [param('ns3::NodeContainer', 'container')], + is_const=True) ## mobility-helper.h: void ns3::MobilityHelper::InstallAll() [member function] cls.add_method('InstallAll', 'void', @@ -570,10 +602,16 @@ def register_Ns3OnOffHelper_methods(root_module, cls): cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) - ## on-off-helper.h: ns3::ApplicationContainer ns3::OnOffHelper::Install(ns3::NodeContainer c) [member function] + ## on-off-helper.h: ns3::ApplicationContainer ns3::OnOffHelper::Install(ns3::NodeContainer c) const [member function] cls.add_method('Install', 'ns3::ApplicationContainer', - [param('ns3::NodeContainer', 'c')]) + [param('ns3::NodeContainer', 'c')], + is_const=True) + ## on-off-helper.h: ns3::ApplicationContainer ns3::OnOffHelper::Install(ns3::Ptr node) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) return def register_Ns3PacketSinkHelper_methods(root_module, cls): @@ -585,10 +623,16 @@ def register_Ns3PacketSinkHelper_methods(root_module, cls): cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) - ## packet-sink-helper.h: ns3::ApplicationContainer ns3::PacketSinkHelper::Install(ns3::NodeContainer c) [member function] + ## packet-sink-helper.h: ns3::ApplicationContainer ns3::PacketSinkHelper::Install(ns3::NodeContainer c) const [member function] cls.add_method('Install', 'ns3::ApplicationContainer', - [param('ns3::NodeContainer', 'c')]) + [param('ns3::NodeContainer', 'c')], + is_const=True) + ## packet-sink-helper.h: ns3::ApplicationContainer ns3::PacketSinkHelper::Install(ns3::Ptr node) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) return def register_Ns3PacketSocketHelper_methods(root_module, cls): @@ -596,10 +640,16 @@ def register_Ns3PacketSocketHelper_methods(root_module, cls): cls.add_constructor([param('ns3::PacketSocketHelper const &', 'arg0')]) ## packet-socket-helper.h: ns3::PacketSocketHelper::PacketSocketHelper() [constructor] cls.add_constructor([]) - ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(ns3::NodeContainer c) [member function] + ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'void', - [param('ns3::NodeContainer', 'c')]) + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(ns3::NodeContainer c) const [member function] + cls.add_method('Install', + 'void', + [param('ns3::NodeContainer', 'c')], + is_const=True) return def register_Ns3PointToPointHelper_methods(root_module, cls): @@ -711,10 +761,16 @@ def register_Ns3UdpEchoClientHelper_methods(root_module, cls): cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) - ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(ns3::NodeContainer c) [member function] + ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'ns3::ApplicationContainer', - [param('ns3::NodeContainer', 'c')]) + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(ns3::NodeContainer c) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::NodeContainer', 'c')], + is_const=True) return def register_Ns3UdpEchoServerHelper_methods(root_module, cls): @@ -726,10 +782,16 @@ def register_Ns3UdpEchoServerHelper_methods(root_module, cls): cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) - ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(ns3::NodeContainer c) [member function] + ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'ns3::ApplicationContainer', - [param('ns3::NodeContainer', 'c')]) + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) + ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(ns3::NodeContainer c) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::NodeContainer', 'c')], + is_const=True) return def register_Ns3V4PingHelper_methods(root_module, cls): @@ -741,10 +803,16 @@ def register_Ns3V4PingHelper_methods(root_module, cls): cls.add_method('SetAttribute', 'void', [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) - ## v4ping-helper.h: ns3::ApplicationContainer ns3::V4PingHelper::Install(ns3::NodeContainer nodes) [member function] + ## v4ping-helper.h: ns3::ApplicationContainer ns3::V4PingHelper::Install(ns3::NodeContainer nodes) const [member function] cls.add_method('Install', 'ns3::ApplicationContainer', - [param('ns3::NodeContainer', 'nodes')]) + [param('ns3::NodeContainer', 'nodes')], + is_const=True) + ## v4ping-helper.h: ns3::ApplicationContainer ns3::V4PingHelper::Install(ns3::Ptr node) const [member function] + cls.add_method('Install', + 'ns3::ApplicationContainer', + [param('ns3::Ptr< ns3::Node >', 'node')], + is_const=True) return def register_Ns3WifiHelper_methods(root_module, cls): @@ -804,35 +872,45 @@ def register_Ns3WifiHelper_methods(root_module, cls): 'void', [param('std::ostream &', 'os')], is_static=True) - ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::NodeContainer c) const [member function] + ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::Ptr node) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', - [param('ns3::NodeContainer', 'c')], + [param('ns3::Ptr< ns3::Node >', 'node')], is_const=True) - ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::NodeContainer c, ns3::Ptr channel) const [member function] + ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::Ptr node, ns3::Ptr channel) const [member function] cls.add_method('Install', 'ns3::NetDeviceContainer', - [param('ns3::NodeContainer', 'c'), param('ns3::Ptr< ns3::WifiChannel >', 'channel')], + [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::WifiChannel >', 'channel')], + is_const=True) + ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::NodeContainer const & c) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::NodeContainer const &', 'c')], + is_const=True) + ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::NodeContainer const & c, ns3::Ptr channel) const [member function] + cls.add_method('Install', + 'ns3::NetDeviceContainer', + [param('ns3::NodeContainer const &', 'c'), param('ns3::Ptr< ns3::WifiChannel >', 'channel')], is_const=True) return def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_internet_stack.py b/bindings/python/ns3_module_internet_stack.py index 687d37841..303d893af 100644 --- a/bindings/python/ns3_module_internet_stack.py +++ b/bindings/python/ns3_module_internet_stack.py @@ -30,10 +30,10 @@ def register_types(module): ## ipv4-static-routing.h: ns3::Ipv4StaticRouting [class] module.add_class('Ipv4StaticRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -42,10 +42,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -54,7 +54,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -62,7 +62,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -910,21 +910,21 @@ def register_functions(root_module): module.add_function('AddNscInternetStack', 'void', [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string const &', 'soname')]) - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_mobility.py b/bindings/python/ns3_module_mobility.py index 0b3cbb75e..48a316457 100644 --- a/bindings/python/ns3_module_mobility.py +++ b/bindings/python/ns3_module_mobility.py @@ -48,10 +48,10 @@ def register_types(module): ## hierarchical-mobility-model.h: ns3::HierarchicalMobilityModel [class] module.add_class('HierarchicalMobilityModel', parent=root_module['ns3::MobilityModel']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -60,10 +60,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -72,7 +72,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -80,7 +80,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -692,33 +692,33 @@ def register_Ns3HierarchicalMobilityModel_methods(root_module, cls): def register_functions(root_module): module = root_module - ## rectangle.h: extern ns3::Ptr ns3::MakeRectangleChecker() [free function] - module.add_function('MakeRectangleChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) ## vector.h: extern double ns3::CalculateDistance(ns3::Vector const & a, ns3::Vector const & b) [free function] module.add_function('CalculateDistance', 'double', [param('ns3::Vector const &', 'a'), param('ns3::Vector const &', 'b')]) + ## rectangle.h: extern ns3::Ptr ns3::MakeRectangleChecker() [free function] + module.add_function('MakeRectangleChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) ## vector.h: extern ns3::Ptr ns3::MakeVectorChecker() [free function] module.add_function('MakeVectorChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_node.py b/bindings/python/ns3_module_node.py index 741874ec9..3e6866124 100644 --- a/bindings/python/ns3_module_node.py +++ b/bindings/python/ns3_module_node.py @@ -9,6 +9,10 @@ def register_types(module): module.add_class('Address') ## address.h: ns3::Address::MaxSize_e [enumeration] module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address']) + ## inet6-socket-address.h: ns3::Inet6SocketAddress [class] + module.add_class('Inet6SocketAddress') + ## inet6-socket-address.h: ns3::Inet6SocketAddress [class] + root_module['ns3::Inet6SocketAddress'].implicitly_converts_to(root_module['ns3::Address']) ## inet-socket-address.h: ns3::InetSocketAddress [class] module.add_class('InetSocketAddress') ## inet-socket-address.h: ns3::InetSocketAddress [class] @@ -25,6 +29,12 @@ def register_types(module): module.add_class('Ipv4MulticastRoute') ## ipv4-route.h: ns3::Ipv4Route [class] module.add_class('Ipv4Route') + ## ipv6-address.h: ns3::Ipv6Address [class] + module.add_class('Ipv6Address') + ## ipv6-address.h: ns3::Ipv6Address [class] + root_module['ns3::Ipv6Address'].implicitly_converts_to(root_module['ns3::Address']) + ## ipv6-address.h: ns3::Ipv6Prefix [class] + module.add_class('Ipv6Prefix') ## mac48-address.h: ns3::Mac48Address [class] module.add_class('Mac48Address') ## mac48-address.h: ns3::Mac48Address [class] @@ -49,6 +59,18 @@ def register_types(module): module.add_class('Ipv4MaskChecker', parent=root_module['ns3::AttributeChecker']) ## ipv4-address.h: ns3::Ipv4MaskValue [class] module.add_class('Ipv4MaskValue', parent=root_module['ns3::AttributeValue']) + ## ipv6-address.h: ns3::Ipv6AddressChecker [class] + module.add_class('Ipv6AddressChecker', parent=root_module['ns3::AttributeChecker']) + ## ipv6-address.h: ns3::Ipv6AddressValue [class] + module.add_class('Ipv6AddressValue', parent=root_module['ns3::AttributeValue']) + ## ipv6-header.h: ns3::Ipv6Header [class] + module.add_class('Ipv6Header', parent=root_module['ns3::Header']) + ## ipv6-header.h: ns3::Ipv6Header::NextHeader_e [enumeration] + module.add_enum('NextHeader_e', ['IPV6_EXT_HOP_BY_HOP', 'IPV6_IPV4', 'IPV6_TCP', 'IPV6_UDP', 'IPV6_IPV6', 'IPV6_EXT_ROUTING', 'IPV6_EXT_FRAGMENTATION', 'IPV6_EXT_CONFIDENTIALITY', 'IPV6_EXT_AUTHENTIFICATION', 'IPV6_ICMPV6', 'IPV6_EXT_END', 'IPV6_EXT_DESTINATION', 'IPV6_SCTP', 'IPV6_EXT_MOBILITY', 'IPV6_UDP_LITE'], outer_class=root_module['ns3::Ipv6Header']) + ## ipv6-address.h: ns3::Ipv6PrefixChecker [class] + module.add_class('Ipv6PrefixChecker', parent=root_module['ns3::AttributeChecker']) + ## ipv6-address.h: ns3::Ipv6PrefixValue [class] + module.add_class('Ipv6PrefixValue', parent=root_module['ns3::AttributeValue']) ## llc-snap-header.h: ns3::LlcSnapHeader [class] module.add_class('LlcSnapHeader', parent=root_module['ns3::Header']) ## mac48-address.h: ns3::Mac48AddressChecker [class] @@ -91,6 +113,8 @@ def register_types(module): module.add_class('EthernetHeader', parent=root_module['ns3::Header']) ## ethernet-trailer.h: ns3::EthernetTrailer [class] module.add_class('EthernetTrailer', parent=root_module['ns3::Trailer']) + ## icmp-socket.h: ns3::IcmpSocket [class] + module.add_class('IcmpSocket', parent=root_module['ns3::Socket']) ## ipv4.h: ns3::Ipv4 [class] module.add_class('Ipv4', parent=root_module['ns3::Object']) ## ipv4-raw-socket-factory.h: ns3::Ipv4RawSocketFactory [class] @@ -110,10 +134,10 @@ def register_types(module): ## simple-net-device.h: ns3::SimpleNetDevice [class] module.add_class('SimpleNetDevice', parent=root_module['ns3::NetDevice']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -122,10 +146,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -134,7 +158,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -142,7 +166,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -153,12 +177,15 @@ def register_types_ns3_olsr(module): def register_methods(root_module): register_Ns3Address_methods(root_module, root_module['ns3::Address']) + register_Ns3Inet6SocketAddress_methods(root_module, root_module['ns3::Inet6SocketAddress']) register_Ns3InetSocketAddress_methods(root_module, root_module['ns3::InetSocketAddress']) register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address']) register_Ns3Ipv4AddressGenerator_methods(root_module, root_module['ns3::Ipv4AddressGenerator']) register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv4MulticastRoute_methods(root_module, root_module['ns3::Ipv4MulticastRoute']) register_Ns3Ipv4Route_methods(root_module, root_module['ns3::Ipv4Route']) + register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) + register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3Mac64Address_methods(root_module, root_module['ns3::Mac64Address']) register_Ns3NodeList_methods(root_module, root_module['ns3::NodeList']) @@ -168,6 +195,11 @@ def register_methods(root_module): register_Ns3Ipv4Header_methods(root_module, root_module['ns3::Ipv4Header']) register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker']) register_Ns3Ipv4MaskValue_methods(root_module, root_module['ns3::Ipv4MaskValue']) + register_Ns3Ipv6AddressChecker_methods(root_module, root_module['ns3::Ipv6AddressChecker']) + register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) + register_Ns3Ipv6Header_methods(root_module, root_module['ns3::Ipv6Header']) + register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker']) + register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) register_Ns3LlcSnapHeader_methods(root_module, root_module['ns3::LlcSnapHeader']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) @@ -188,6 +220,7 @@ def register_methods(root_module): register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue']) register_Ns3EthernetHeader_methods(root_module, root_module['ns3::EthernetHeader']) register_Ns3EthernetTrailer_methods(root_module, root_module['ns3::EthernetTrailer']) + register_Ns3IcmpSocket_methods(root_module, root_module['ns3::IcmpSocket']) register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4']) register_Ns3Ipv4RawSocketFactory_methods(root_module, root_module['ns3::Ipv4RawSocketFactory']) register_Ns3Ipv4RoutingProtocol_methods(root_module, root_module['ns3::Ipv4RoutingProtocol']) @@ -268,6 +301,49 @@ def register_Ns3Address_methods(root_module, cls): is_const=True) return +def register_Ns3Inet6SocketAddress_methods(root_module, cls): + ## inet6-socket-address.h: ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Inet6SocketAddress const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Inet6SocketAddress const &', 'arg0')]) + ## inet6-socket-address.h: ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Ipv6Address ipv6, uint16_t port) [constructor] + cls.add_constructor([param('ns3::Ipv6Address', 'ipv6'), param('uint16_t', 'port')]) + ## inet6-socket-address.h: ns3::Inet6SocketAddress::Inet6SocketAddress(ns3::Ipv6Address ipv6) [constructor] + cls.add_constructor([param('ns3::Ipv6Address', 'ipv6')]) + ## inet6-socket-address.h: ns3::Inet6SocketAddress::Inet6SocketAddress(uint16_t port) [constructor] + cls.add_constructor([param('uint16_t', 'port')]) + ## inet6-socket-address.h: ns3::Inet6SocketAddress::Inet6SocketAddress(char const * ipv6, uint16_t port) [constructor] + cls.add_constructor([param('char const *', 'ipv6'), param('uint16_t', 'port')]) + ## inet6-socket-address.h: ns3::Inet6SocketAddress::Inet6SocketAddress(char const * ipv6) [constructor] + cls.add_constructor([param('char const *', 'ipv6')]) + ## inet6-socket-address.h: uint16_t ns3::Inet6SocketAddress::GetPort() const [member function] + cls.add_method('GetPort', + 'uint16_t', + [], + is_const=True) + ## inet6-socket-address.h: void ns3::Inet6SocketAddress::SetPort(uint16_t port) [member function] + cls.add_method('SetPort', + 'void', + [param('uint16_t', 'port')]) + ## inet6-socket-address.h: ns3::Ipv6Address ns3::Inet6SocketAddress::GetIpv6() const [member function] + cls.add_method('GetIpv6', + 'ns3::Ipv6Address', + [], + is_const=True) + ## inet6-socket-address.h: void ns3::Inet6SocketAddress::SetIpv6(ns3::Ipv6Address ipv6) [member function] + cls.add_method('SetIpv6', + 'void', + [param('ns3::Ipv6Address', 'ipv6')]) + ## inet6-socket-address.h: static bool ns3::Inet6SocketAddress::IsMatchingType(ns3::Address const & addr) [member function] + cls.add_method('IsMatchingType', + 'bool', + [param('ns3::Address const &', 'addr')], + is_static=True) + ## inet6-socket-address.h: static ns3::Inet6SocketAddress ns3::Inet6SocketAddress::ConvertFrom(ns3::Address const & addr) [member function] + cls.add_method('ConvertFrom', + 'ns3::Inet6SocketAddress', + [param('ns3::Address const &', 'addr')], + is_static=True) + return + def register_Ns3InetSocketAddress_methods(root_module, cls): ## inet-socket-address.h: ns3::InetSocketAddress::InetSocketAddress(ns3::InetSocketAddress const & arg0) [copy constructor] cls.add_constructor([param('ns3::InetSocketAddress const &', 'arg0')]) @@ -644,6 +720,203 @@ def register_Ns3Ipv4Route_methods(root_module, cls): is_const=True) return +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('==') + ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address() [constructor] + cls.add_constructor([]) + ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(char const * address) [constructor] + cls.add_constructor([param('char const *', 'address')]) + ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(uint8_t * address) [constructor] + cls.add_constructor([param('uint8_t *', 'address')]) + ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const & addr) [copy constructor] + cls.add_constructor([param('ns3::Ipv6Address const &', 'addr')]) + ## ipv6-address.h: ns3::Ipv6Address::Ipv6Address(ns3::Ipv6Address const * addr) [constructor] + cls.add_constructor([param('ns3::Ipv6Address const *', 'addr')]) + ## ipv6-address.h: ns3::Ipv6Address ns3::Ipv6Address::CombinePrefix(ns3::Ipv6Prefix const & prefix) [member function] + cls.add_method('CombinePrefix', + 'ns3::Ipv6Address', + [param('ns3::Ipv6Prefix const &', 'prefix')]) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::ConvertFrom(ns3::Address const & address) [member function] + cls.add_method('ConvertFrom', + 'ns3::Ipv6Address', + [param('ns3::Address const &', 'address')], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::Deserialize(uint8_t const * buf) [member function] + cls.add_method('Deserialize', + 'ns3::Ipv6Address', + [param('uint8_t const *', 'buf')], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::GetAllHostsMulticast() [member function] + cls.add_method('GetAllHostsMulticast', + 'ns3::Ipv6Address', + [], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::GetAllNodesMulticast() [member function] + cls.add_method('GetAllNodesMulticast', + 'ns3::Ipv6Address', + [], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::GetAllRoutersMulticast() [member function] + cls.add_method('GetAllRoutersMulticast', + 'ns3::Ipv6Address', + [], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::GetAny() [member function] + cls.add_method('GetAny', + 'ns3::Ipv6Address', + [], + is_static=True) + ## ipv6-address.h: void ns3::Ipv6Address::GetBytes(uint8_t * buf) const [member function] + cls.add_method('GetBytes', + 'void', + [param('uint8_t *', 'buf')], + is_const=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::GetLoopback() [member function] + cls.add_method('GetLoopback', + 'ns3::Ipv6Address', + [], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::GetZero() [member function] + cls.add_method('GetZero', + 'ns3::Ipv6Address', + [], + is_static=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsAllHostsMulticast() const [member function] + cls.add_method('IsAllHostsMulticast', + 'bool', + [], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsAllNodesMulticast() const [member function] + cls.add_method('IsAllNodesMulticast', + 'bool', + [], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsAllRoutersMulticast() const [member function] + cls.add_method('IsAllRoutersMulticast', + 'bool', + [], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsAny() const [member function] + cls.add_method('IsAny', + 'bool', + [], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsEqual(ns3::Ipv6Address const & other) const [member function] + cls.add_method('IsEqual', + 'bool', + [param('ns3::Ipv6Address const &', 'other')], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsLinkLocal() const [member function] + cls.add_method('IsLinkLocal', + 'bool', + [], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsLocalhost() const [member function] + cls.add_method('IsLocalhost', + 'bool', + [], + is_const=True) + ## ipv6-address.h: static bool ns3::Ipv6Address::IsMatchingType(ns3::Address const & address) [member function] + cls.add_method('IsMatchingType', + 'bool', + [param('ns3::Address const &', 'address')], + is_static=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsMulticast() const [member function] + cls.add_method('IsMulticast', + 'bool', + [], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Address::IsSolicitedMulticast() const [member function] + cls.add_method('IsSolicitedMulticast', + 'bool', + [], + is_const=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredAddress(ns3::Mac48Address addr, ns3::Ipv6Address prefix) [member function] + cls.add_method('MakeAutoconfiguredAddress', + 'ns3::Ipv6Address', + [param('ns3::Mac48Address', 'addr'), param('ns3::Ipv6Address', 'prefix')], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::MakeAutoconfiguredLinkLocalAddress(ns3::Mac48Address mac) [member function] + cls.add_method('MakeAutoconfiguredLinkLocalAddress', + 'ns3::Ipv6Address', + [param('ns3::Mac48Address', 'mac')], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Address ns3::Ipv6Address::MakeSolicitedAddress(ns3::Ipv6Address addr) [member function] + cls.add_method('MakeSolicitedAddress', + 'ns3::Ipv6Address', + [param('ns3::Ipv6Address', 'addr')], + is_static=True) + ## ipv6-address.h: void ns3::Ipv6Address::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## ipv6-address.h: void ns3::Ipv6Address::Serialize(uint8_t * buf) const [member function] + cls.add_method('Serialize', + 'void', + [param('uint8_t *', 'buf')], + is_const=True) + ## ipv6-address.h: void ns3::Ipv6Address::Set(char const * address) [member function] + cls.add_method('Set', + 'void', + [param('char const *', 'address')]) + ## ipv6-address.h: void ns3::Ipv6Address::Set(uint8_t * address) [member function] + cls.add_method('Set', + 'void', + [param('uint8_t *', 'address')]) + return + +def register_Ns3Ipv6Prefix_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') + cls.add_output_stream_operator() + cls.add_binary_comparison_operator('==') + ## ipv6-address.h: ns3::Ipv6Prefix::Ipv6Prefix() [constructor] + cls.add_constructor([]) + ## ipv6-address.h: ns3::Ipv6Prefix::Ipv6Prefix(uint8_t * prefix) [constructor] + cls.add_constructor([param('uint8_t *', 'prefix')]) + ## ipv6-address.h: ns3::Ipv6Prefix::Ipv6Prefix(char const * prefix) [constructor] + cls.add_constructor([param('char const *', 'prefix')]) + ## ipv6-address.h: ns3::Ipv6Prefix::Ipv6Prefix(uint8_t prefix) [constructor] + cls.add_constructor([param('uint8_t', 'prefix')]) + ## ipv6-address.h: ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const & prefix) [copy constructor] + cls.add_constructor([param('ns3::Ipv6Prefix const &', 'prefix')]) + ## ipv6-address.h: ns3::Ipv6Prefix::Ipv6Prefix(ns3::Ipv6Prefix const * prefix) [constructor] + cls.add_constructor([param('ns3::Ipv6Prefix const *', 'prefix')]) + ## ipv6-address.h: void ns3::Ipv6Prefix::GetBytes(uint8_t * buf) const [member function] + cls.add_method('GetBytes', + 'void', + [param('uint8_t *', 'buf')], + is_const=True) + ## ipv6-address.h: static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetLoopback() [member function] + cls.add_method('GetLoopback', + 'ns3::Ipv6Prefix', + [], + is_static=True) + ## ipv6-address.h: static ns3::Ipv6Prefix ns3::Ipv6Prefix::GetZero() [member function] + cls.add_method('GetZero', + 'ns3::Ipv6Prefix', + [], + is_static=True) + ## ipv6-address.h: bool ns3::Ipv6Prefix::IsEqual(ns3::Ipv6Prefix const & other) const [member function] + cls.add_method('IsEqual', + 'bool', + [param('ns3::Ipv6Prefix const &', 'other')], + is_const=True) + ## ipv6-address.h: bool ns3::Ipv6Prefix::IsMatch(ns3::Ipv6Address a, ns3::Ipv6Address b) const [member function] + cls.add_method('IsMatch', + 'bool', + [param('ns3::Ipv6Address', 'a'), param('ns3::Ipv6Address', 'b')], + is_const=True) + ## ipv6-address.h: void ns3::Ipv6Prefix::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + return + def register_Ns3Mac48Address_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_binary_comparison_operator('<') @@ -684,6 +957,16 @@ def register_Ns3Mac48Address_methods(root_module, cls): 'ns3::Mac48Address', [param('ns3::Ipv4Address', 'address')], is_static=True) + ## mac48-address.h: static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv6Address address) [member function] + cls.add_method('GetMulticast', + 'ns3::Mac48Address', + [param('ns3::Ipv6Address', 'address')], + is_static=True) + ## mac48-address.h: static ns3::Mac48Address ns3::Mac48Address::GetMulticast6Prefix() [member function] + cls.add_method('GetMulticast6Prefix', + 'ns3::Mac48Address', + [], + is_static=True) ## mac48-address.h: static ns3::Mac48Address ns3::Mac48Address::GetMulticastPrefix() [member function] cls.add_method('GetMulticastPrefix', 'ns3::Mac48Address', @@ -1056,6 +1339,191 @@ def register_Ns3Ipv4MaskValue_methods(root_module, cls): is_virtual=True) return +def register_Ns3Ipv6AddressChecker_methods(root_module, cls): + ## ipv6-address.h: ns3::Ipv6AddressChecker::Ipv6AddressChecker(ns3::Ipv6AddressChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv6AddressChecker const &', 'arg0')]) + ## ipv6-address.h: ns3::Ipv6AddressChecker::Ipv6AddressChecker() [constructor] + cls.add_constructor([]) + return + +def register_Ns3Ipv6AddressValue_methods(root_module, cls): + ## ipv6-address.h: ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6AddressValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv6AddressValue const &', 'arg0')]) + ## ipv6-address.h: ns3::Ipv6AddressValue::Ipv6AddressValue() [constructor] + cls.add_constructor([]) + ## ipv6-address.h: ns3::Ipv6AddressValue::Ipv6AddressValue(ns3::Ipv6Address const & value) [constructor] + cls.add_constructor([param('ns3::Ipv6Address const &', 'value')]) + ## ipv6-address.h: void ns3::Ipv6AddressValue::Set(ns3::Ipv6Address const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Ipv6Address const &', 'value')]) + ## ipv6-address.h: ns3::Ipv6Address ns3::Ipv6AddressValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Ipv6Address', + [], + is_const=True) + ## ipv6-address.h: ns3::Ptr ns3::Ipv6AddressValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## ipv6-address.h: std::string ns3::Ipv6AddressValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## ipv6-address.h: bool ns3::Ipv6AddressValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + return + +def register_Ns3Ipv6Header_methods(root_module, cls): + ## ipv6-header.h: ns3::Ipv6Header::Ipv6Header(ns3::Ipv6Header const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv6Header const &', 'arg0')]) + ## ipv6-header.h: static ns3::TypeId ns3::Ipv6Header::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv6-header.h: ns3::TypeId ns3::Ipv6Header::GetInstanceTypeId() const [member function] + cls.add_method('GetInstanceTypeId', + 'ns3::TypeId', + [], + is_const=True, is_virtual=True) + ## ipv6-header.h: ns3::Ipv6Header::Ipv6Header() [constructor] + cls.add_constructor([]) + ## ipv6-header.h: void ns3::Ipv6Header::SetTrafficClass(uint8_t traffic) [member function] + cls.add_method('SetTrafficClass', + 'void', + [param('uint8_t', 'traffic')]) + ## ipv6-header.h: uint8_t ns3::Ipv6Header::GetTrafficClass() const [member function] + cls.add_method('GetTrafficClass', + 'uint8_t', + [], + is_const=True) + ## ipv6-header.h: void ns3::Ipv6Header::SetFlowLabel(uint32_t flow) [member function] + cls.add_method('SetFlowLabel', + 'void', + [param('uint32_t', 'flow')]) + ## ipv6-header.h: uint32_t ns3::Ipv6Header::GetFlowLabel() const [member function] + cls.add_method('GetFlowLabel', + 'uint32_t', + [], + is_const=True) + ## ipv6-header.h: void ns3::Ipv6Header::SetPayloadLength(uint16_t len) [member function] + cls.add_method('SetPayloadLength', + 'void', + [param('uint16_t', 'len')]) + ## ipv6-header.h: uint16_t ns3::Ipv6Header::GetPayloadLength() const [member function] + cls.add_method('GetPayloadLength', + 'uint16_t', + [], + is_const=True) + ## ipv6-header.h: void ns3::Ipv6Header::SetNextHeader(uint8_t next) [member function] + cls.add_method('SetNextHeader', + 'void', + [param('uint8_t', 'next')]) + ## ipv6-header.h: uint8_t ns3::Ipv6Header::GetNextHeader() const [member function] + cls.add_method('GetNextHeader', + 'uint8_t', + [], + is_const=True) + ## ipv6-header.h: void ns3::Ipv6Header::SetHopLimit(uint8_t limit) [member function] + cls.add_method('SetHopLimit', + 'void', + [param('uint8_t', 'limit')]) + ## ipv6-header.h: uint8_t ns3::Ipv6Header::GetHopLimit() const [member function] + cls.add_method('GetHopLimit', + 'uint8_t', + [], + is_const=True) + ## ipv6-header.h: void ns3::Ipv6Header::SetSourceAddress(ns3::Ipv6Address src) [member function] + cls.add_method('SetSourceAddress', + 'void', + [param('ns3::Ipv6Address', 'src')]) + ## ipv6-header.h: ns3::Ipv6Address ns3::Ipv6Header::GetSourceAddress() const [member function] + cls.add_method('GetSourceAddress', + 'ns3::Ipv6Address', + [], + is_const=True) + ## ipv6-header.h: void ns3::Ipv6Header::SetDestinationAddress(ns3::Ipv6Address dst) [member function] + cls.add_method('SetDestinationAddress', + 'void', + [param('ns3::Ipv6Address', 'dst')]) + ## ipv6-header.h: ns3::Ipv6Address ns3::Ipv6Header::GetDestinationAddress() const [member function] + cls.add_method('GetDestinationAddress', + 'ns3::Ipv6Address', + [], + is_const=True) + ## ipv6-header.h: std::string ns3::Ipv6Header::GetName() const [member function] + cls.add_method('GetName', + 'std::string', + [], + is_const=True) + ## ipv6-header.h: void ns3::Ipv6Header::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_const=True, is_virtual=True) + ## ipv6-header.h: uint32_t ns3::Ipv6Header::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## ipv6-header.h: void ns3::Ipv6Header::Serialize(ns3::Buffer::Iterator start) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::Buffer::Iterator', 'start')], + is_const=True, is_virtual=True) + ## ipv6-header.h: uint32_t ns3::Ipv6Header::Deserialize(ns3::Buffer::Iterator start) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('ns3::Buffer::Iterator', 'start')], + is_virtual=True) + return + +def register_Ns3Ipv6PrefixChecker_methods(root_module, cls): + ## ipv6-address.h: ns3::Ipv6PrefixChecker::Ipv6PrefixChecker(ns3::Ipv6PrefixChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv6PrefixChecker const &', 'arg0')]) + ## ipv6-address.h: ns3::Ipv6PrefixChecker::Ipv6PrefixChecker() [constructor] + cls.add_constructor([]) + return + +def register_Ns3Ipv6PrefixValue_methods(root_module, cls): + ## ipv6-address.h: ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6PrefixValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv6PrefixValue const &', 'arg0')]) + ## ipv6-address.h: ns3::Ipv6PrefixValue::Ipv6PrefixValue() [constructor] + cls.add_constructor([]) + ## ipv6-address.h: ns3::Ipv6PrefixValue::Ipv6PrefixValue(ns3::Ipv6Prefix const & value) [constructor] + cls.add_constructor([param('ns3::Ipv6Prefix const &', 'value')]) + ## ipv6-address.h: void ns3::Ipv6PrefixValue::Set(ns3::Ipv6Prefix const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Ipv6Prefix const &', 'value')]) + ## ipv6-address.h: ns3::Ipv6Prefix ns3::Ipv6PrefixValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Ipv6Prefix', + [], + is_const=True) + ## ipv6-address.h: ns3::Ptr ns3::Ipv6PrefixValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## ipv6-address.h: std::string ns3::Ipv6PrefixValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## ipv6-address.h: bool ns3::Ipv6PrefixValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + return + def register_Ns3LlcSnapHeader_methods(root_module, cls): ## llc-snap-header.h: ns3::LlcSnapHeader::LlcSnapHeader(ns3::LlcSnapHeader const & arg0) [copy constructor] cls.add_constructor([param('ns3::LlcSnapHeader const &', 'arg0')]) @@ -2041,6 +2509,98 @@ def register_Ns3EthernetTrailer_methods(root_module, cls): is_virtual=True) return +def register_Ns3IcmpSocket_methods(root_module, cls): + ## icmp-socket.h: ns3::IcmpSocket::IcmpSocket(ns3::IcmpSocket const & arg0) [copy constructor] + cls.add_constructor([param('ns3::IcmpSocket const &', 'arg0')]) + ## icmp-socket.h: static ns3::TypeId ns3::IcmpSocket::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## icmp-socket.h: ns3::IcmpSocket::IcmpSocket() [constructor] + cls.add_constructor([]) + ## icmp-socket.h: ns3::Socket::SocketErrno ns3::IcmpSocket::GetErrno() const [member function] + cls.add_method('GetErrno', + 'ns3::Socket::SocketErrno', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## icmp-socket.h: ns3::Ptr ns3::IcmpSocket::GetNode() const [member function] + cls.add_method('GetNode', + 'ns3::Ptr< ns3::Node >', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::Bind() [member function] + cls.add_method('Bind', + 'int', + [], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::Bind(ns3::Address const & addr) [member function] + cls.add_method('Bind', + 'int', + [param('ns3::Address const &', 'addr')], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::Close() [member function] + cls.add_method('Close', + 'int', + [], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::ShutdownSend() [member function] + cls.add_method('ShutdownSend', + 'int', + [], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::ShutdownRecv() [member function] + cls.add_method('ShutdownRecv', + 'int', + [], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::Connect(ns3::Address const & addr) [member function] + cls.add_method('Connect', + 'int', + [param('ns3::Address const &', 'addr')], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::Send(ns3::Ptr p, uint32_t flags) [member function] + cls.add_method('Send', + 'int', + [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint32_t', 'flags')], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: uint32_t ns3::IcmpSocket::GetTxAvailable() const [member function] + cls.add_method('GetTxAvailable', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## icmp-socket.h: int ns3::IcmpSocket::SendTo(ns3::Ptr p, uint32_t flags, ns3::Address const & addr) [member function] + cls.add_method('SendTo', + 'int', + [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint32_t', 'flags'), param('ns3::Address const &', 'addr')], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: ns3::Ptr ns3::IcmpSocket::Recv(uint32_t maxSize, uint32_t flags) [member function] + cls.add_method('Recv', + 'ns3::Ptr< ns3::Packet >', + [param('uint32_t', 'maxSize'), param('uint32_t', 'flags')], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: ns3::Ptr ns3::IcmpSocket::RecvFrom(uint32_t maxSize, uint32_t flags, ns3::Address & fromAddress) [member function] + cls.add_method('RecvFrom', + 'ns3::Ptr< ns3::Packet >', + [param('uint32_t', 'maxSize'), param('uint32_t', 'flags'), param('ns3::Address &', 'fromAddress')], + is_pure_virtual=True, is_virtual=True) + ## icmp-socket.h: uint32_t ns3::IcmpSocket::GetRxAvailable() const [member function] + cls.add_method('GetRxAvailable', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## icmp-socket.h: uint32_t ns3::IcmpSocket::GetRcvBufSize() const [member function] + cls.add_method('GetRcvBufSize', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## icmp-socket.h: void ns3::IcmpSocket::SetRcvBufSize(uint32_t rcvBufSize) [member function] + cls.add_method('SetRcvBufSize', + 'void', + [param('uint32_t', 'rcvBufSize')], + is_pure_virtual=True, visibility='private', is_virtual=True) + return + def register_Ns3Ipv4_methods(root_module, cls): ## ipv4.h: ns3::Ipv4::Ipv4(ns3::Ipv4 const & arg0) [copy constructor] cls.add_constructor([param('ns3::Ipv4 const &', 'arg0')]) @@ -2344,6 +2904,11 @@ def register_Ns3NetDevice_methods(root_module, cls): 'ns3::Address', [param('ns3::Ipv4Address', 'multicastGroup')], is_pure_virtual=True, is_const=True, is_virtual=True) + ## net-device.h: ns3::Address ns3::NetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_pure_virtual=True, is_const=True, is_virtual=True) ## net-device.h: bool ns3::NetDevice::IsPointToPoint() const [member function] cls.add_method('IsPointToPoint', 'bool', @@ -2635,6 +3200,11 @@ def register_Ns3SimpleNetDevice_methods(root_module, cls): 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## simple-net-device.h: ns3::Address ns3::SimpleNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_const=True, is_virtual=True) ## simple-net-device.h: void ns3::SimpleNetDevice::SetPromiscReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] cls.add_method('SetPromiscReceiveCallback', 'void', @@ -2654,38 +3224,30 @@ def register_Ns3SimpleNetDevice_methods(root_module, cls): def register_functions(root_module): module = root_module - ## mac48-address.h: extern ns3::Ptr ns3::MakeMac48AddressChecker() [free function] - module.add_function('MakeMac48AddressChecker', + ## address.h: extern ns3::Ptr ns3::MakeAddressChecker() [free function] + module.add_function('MakeAddressChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) ## ipv4-address.h: extern ns3::Ptr ns3::MakeIpv4AddressChecker() [free function] module.add_function('MakeIpv4AddressChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## address-utils.h: extern void ns3::WriteTo(ns3::Buffer::Iterator & i, ns3::Mac48Address ad) [free function] - module.add_function('WriteTo', - 'void', - [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address', 'ad')]) - ## address-utils.h: extern void ns3::WriteTo(ns3::Buffer::Iterator & i, ns3::Address const & ad) [free function] - module.add_function('WriteTo', - 'void', - [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Address const &', 'ad')]) - ## address-utils.h: extern void ns3::WriteTo(ns3::Buffer::Iterator & i, ns3::Ipv4Address ad) [free function] - module.add_function('WriteTo', - 'void', - [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Ipv4Address', 'ad')]) - ## address.h: extern ns3::Ptr ns3::MakeAddressChecker() [free function] - module.add_function('MakeAddressChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) ## ipv4-address.h: extern ns3::Ptr ns3::MakeIpv4MaskChecker() [free function] module.add_function('MakeIpv4MaskChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Mac48Address & ad) [free function] - module.add_function('ReadFrom', - 'void', - [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address &', 'ad')]) + ## ipv6-address.h: extern ns3::Ptr ns3::MakeIpv6AddressChecker() [free function] + module.add_function('MakeIpv6AddressChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) + ## ipv6-address.h: extern ns3::Ptr ns3::MakeIpv6PrefixChecker() [free function] + module.add_function('MakeIpv6PrefixChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) + ## mac48-address.h: extern ns3::Ptr ns3::MakeMac48AddressChecker() [free function] + module.add_function('MakeMac48AddressChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Address & ad, uint32_t len) [free function] module.add_function('ReadFrom', 'void', @@ -2694,21 +3256,45 @@ def register_functions(root_module): module.add_function('ReadFrom', 'void', [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Ipv4Address &', 'ad')]) - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Ipv6Address & ad) [free function] + module.add_function('ReadFrom', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Ipv6Address &', 'ad')]) + ## address-utils.h: extern void ns3::ReadFrom(ns3::Buffer::Iterator & i, ns3::Mac48Address & ad) [free function] + module.add_function('ReadFrom', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address &', 'ad')]) + ## address-utils.h: extern void ns3::WriteTo(ns3::Buffer::Iterator & i, ns3::Address const & ad) [free function] + module.add_function('WriteTo', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Address const &', 'ad')]) + ## address-utils.h: extern void ns3::WriteTo(ns3::Buffer::Iterator & i, ns3::Ipv4Address ad) [free function] + module.add_function('WriteTo', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Ipv4Address', 'ad')]) + ## address-utils.h: extern void ns3::WriteTo(ns3::Buffer::Iterator & i, ns3::Ipv6Address ad) [free function] + module.add_function('WriteTo', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Ipv6Address', 'ad')]) + ## address-utils.h: extern void ns3::WriteTo(ns3::Buffer::Iterator & i, ns3::Mac48Address ad) [free function] + module.add_function('WriteTo', + 'void', + [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address', 'ad')]) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_olsr.py b/bindings/python/ns3_module_olsr.py index bf1df20c9..9ee264a50 100644 --- a/bindings/python/ns3_module_olsr.py +++ b/bindings/python/ns3_module_olsr.py @@ -4,31 +4,31 @@ def register_types(module): root_module = module.get_root() - ## Register a nested module for the namespace internal - - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) - - - ## Register a nested module for the namespace TimeStepPrecision - - nested_module = module.add_cpp_namespace('TimeStepPrecision') - register_types_ns3_TimeStepPrecision(nested_module) - - ## Register a nested module for the namespace Config nested_module = module.add_cpp_namespace('Config') register_types_ns3_Config(nested_module) + ## Register a nested module for the namespace TimeStepPrecision + + nested_module = module.add_cpp_namespace('TimeStepPrecision') + register_types_ns3_TimeStepPrecision(nested_module) + + + ## Register a nested module for the namespace internal + + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) + + ## Register a nested module for the namespace olsr nested_module = module.add_cpp_namespace('olsr') register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -36,7 +36,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -533,19 +533,19 @@ def register_Ns3OlsrRoutingTableEntry_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): +def register_functions_ns3_Config(module, root_module): return def register_functions_ns3_TimeStepPrecision(module, root_module): return -def register_functions_ns3_Config(module, root_module): +def register_functions_ns3_internal(module, root_module): return def register_functions_ns3_olsr(module, root_module): diff --git a/bindings/python/ns3_module_onoff.py b/bindings/python/ns3_module_onoff.py index 57833a570..2d253ec6d 100644 --- a/bindings/python/ns3_module_onoff.py +++ b/bindings/python/ns3_module_onoff.py @@ -6,10 +6,10 @@ def register_types(module): ## onoff-application.h: ns3::OnOffApplication [class] module.add_class('OnOffApplication', parent=root_module['ns3::Application']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -18,10 +18,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -30,7 +30,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -38,7 +38,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -83,21 +83,21 @@ def register_Ns3OnOffApplication_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_packet_sink.py b/bindings/python/ns3_module_packet_sink.py index 291f43a11..8478d79c4 100644 --- a/bindings/python/ns3_module_packet_sink.py +++ b/bindings/python/ns3_module_packet_sink.py @@ -6,10 +6,10 @@ def register_types(module): ## packet-sink.h: ns3::PacketSink [class] module.add_class('PacketSink', parent=root_module['ns3::Application']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -18,10 +18,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -30,7 +30,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -38,7 +38,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -79,21 +79,21 @@ def register_Ns3PacketSink_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_point_to_point.py b/bindings/python/ns3_module_point_to_point.py index 5ac314a59..d302894e3 100644 --- a/bindings/python/ns3_module_point_to_point.py +++ b/bindings/python/ns3_module_point_to_point.py @@ -8,10 +8,10 @@ def register_types(module): ## point-to-point-net-device.h: ns3::PointToPointNetDevice [class] module.add_class('PointToPointNetDevice', parent=root_module['ns3::NetDevice']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -20,10 +20,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -32,7 +32,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -40,7 +40,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -240,6 +240,11 @@ def register_Ns3PointToPointNetDevice_methods(root_module, cls): 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## point-to-point-net-device.h: ns3::Address ns3::PointToPointNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_const=True, is_virtual=True) ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::SetPromiscReceiveCallback(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType> cb) [member function] cls.add_method('SetPromiscReceiveCallback', 'void', @@ -259,21 +264,21 @@ def register_Ns3PointToPointNetDevice_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_simulator.py b/bindings/python/ns3_module_simulator.py index 679733f08..72d683694 100644 --- a/bindings/python/ns3_module_simulator.py +++ b/bindings/python/ns3_module_simulator.py @@ -58,10 +58,10 @@ def register_types(module): ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration] module.add_enum('SynchronizationMode', ['SYNC_BEST_EFFORT', 'SYNC_HARD_LIMIT'], outer_class=root_module['ns3::RealtimeSimulatorImpl']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -70,10 +70,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -82,7 +82,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -92,7 +92,7 @@ def register_types_ns3_TimeStepPrecision(module): ## nstime.h: ns3::TimeStepPrecision::precision_t [enumeration] module.add_enum('precision_t', ['S', 'MS', 'US', 'NS', 'PS', 'FS']) -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -1404,81 +1404,81 @@ def register_Ns3RealtimeSimulatorImpl_methods(root_module, cls): def register_functions(root_module): module = root_module - ## high-precision.h: extern ns3::HighPrecision ns3::Max(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function] - module.add_function('Max', - 'ns3::HighPrecision', - [param('ns3::HighPrecision const &', 'a'), param('ns3::HighPrecision const &', 'b')]) - ## nstime.h: extern ns3::Time ns3::FemtoSeconds(uint64_t fs) [free function] - module.add_function('FemtoSeconds', - 'ns3::Time', - [param('uint64_t', 'fs')]) - ## nstime.h: extern ns3::Time ns3::MicroSeconds(uint64_t us) [free function] - module.add_function('MicroSeconds', - 'ns3::Time', - [param('uint64_t', 'us')]) - ## simulator.h: extern ns3::Time ns3::Now() [free function] - module.add_function('Now', - 'ns3::Time', - []) - ## nstime.h: extern ns3::Time ns3::MilliSeconds(uint64_t ms) [free function] - module.add_function('MilliSeconds', - 'ns3::Time', - [param('uint64_t', 'ms')]) - ## nstime.h: extern ns3::Time ns3::NanoSeconds(uint64_t ns) [free function] - module.add_function('NanoSeconds', - 'ns3::Time', - [param('uint64_t', 'ns')]) ## high-precision.h: extern ns3::HighPrecision ns3::Abs(ns3::HighPrecision const & value) [free function] module.add_function('Abs', 'ns3::HighPrecision', [param('ns3::HighPrecision const &', 'value')]) - ## nstime.h: extern ns3::Ptr ns3::MakeTimeChecker() [free function] - module.add_function('MakeTimeChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) - ## nstime.h: extern ns3::Time ns3::Seconds(double seconds) [free function] - module.add_function('Seconds', + ## nstime.h: extern ns3::Time ns3::FemtoSeconds(uint64_t fs) [free function] + module.add_function('FemtoSeconds', 'ns3::Time', - [param('double', 'seconds')]) + [param('uint64_t', 'fs')]) ## make-event.h: extern ns3::EventImpl * ns3::MakeEvent(void (*)( ) * f) [free function] module.add_function('MakeEvent', 'ns3::EventImpl *', [param('void ( * ) ( ) *', 'f')]) - ## nstime.h: extern ns3::Time ns3::PicoSeconds(uint64_t ps) [free function] - module.add_function('PicoSeconds', + ## nstime.h: extern ns3::Ptr ns3::MakeTimeChecker() [free function] + module.add_function('MakeTimeChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) + ## high-precision.h: extern ns3::HighPrecision ns3::Max(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function] + module.add_function('Max', + 'ns3::HighPrecision', + [param('ns3::HighPrecision const &', 'a'), param('ns3::HighPrecision const &', 'b')]) + ## nstime.h: extern ns3::Time ns3::MicroSeconds(uint64_t us) [free function] + module.add_function('MicroSeconds', 'ns3::Time', - [param('uint64_t', 'ps')]) + [param('uint64_t', 'us')]) + ## nstime.h: extern ns3::Time ns3::MilliSeconds(uint64_t ms) [free function] + module.add_function('MilliSeconds', + 'ns3::Time', + [param('uint64_t', 'ms')]) ## high-precision.h: extern ns3::HighPrecision ns3::Min(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function] module.add_function('Min', 'ns3::HighPrecision', [param('ns3::HighPrecision const &', 'a'), param('ns3::HighPrecision const &', 'b')]) + ## nstime.h: extern ns3::Time ns3::NanoSeconds(uint64_t ns) [free function] + module.add_function('NanoSeconds', + 'ns3::Time', + [param('uint64_t', 'ns')]) + ## simulator.h: extern ns3::Time ns3::Now() [free function] + module.add_function('Now', + 'ns3::Time', + []) + ## nstime.h: extern ns3::Time ns3::PicoSeconds(uint64_t ps) [free function] + module.add_function('PicoSeconds', + 'ns3::Time', + [param('uint64_t', 'ps')]) + ## nstime.h: extern ns3::Time ns3::Seconds(double seconds) [free function] + module.add_function('Seconds', + 'ns3::Time', + [param('double', 'seconds')]) ## nstime.h: extern ns3::Time ns3::TimeStep(uint64_t ts) [free function] module.add_function('TimeStep', 'ns3::Time', [param('uint64_t', 'ts')]) - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - ## nstime.h: extern void ns3::TimeStepPrecision::Set(ns3::TimeStepPrecision::precision_t precision) [free function] - module.add_function('Set', - 'void', - [param('ns3::TimeStepPrecision::precision_t', 'precision')]) - ## nstime.h: extern ns3::TimeStepPrecision::precision_t ns3::TimeStepPrecision::Get() [free function] - module.add_function('Get', - 'ns3::TimeStepPrecision::precision_t', - []) - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + ## nstime.h: extern ns3::TimeStepPrecision::precision_t ns3::TimeStepPrecision::Get() [free function] + module.add_function('Get', + 'ns3::TimeStepPrecision::precision_t', + []) + ## nstime.h: extern void ns3::TimeStepPrecision::Set(ns3::TimeStepPrecision::precision_t precision) [free function] + module.add_function('Set', + 'void', + [param('ns3::TimeStepPrecision::precision_t', 'precision')]) + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_stats.py b/bindings/python/ns3_module_stats.py index 21503c2a0..6da736fe1 100644 --- a/bindings/python/ns3_module_stats.py +++ b/bindings/python/ns3_module_stats.py @@ -26,10 +26,10 @@ def register_types(module): ## packet-data-calculators.h: ns3::PacketCounterCalculator [class] module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -38,10 +38,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -50,7 +50,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -58,7 +58,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -417,21 +417,21 @@ def register_Ns3PacketCounterCalculator_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_udp_echo.py b/bindings/python/ns3_module_udp_echo.py index c4fb73c46..dae92a56e 100644 --- a/bindings/python/ns3_module_udp_echo.py +++ b/bindings/python/ns3_module_udp_echo.py @@ -8,10 +8,10 @@ def register_types(module): ## udp-echo-server.h: ns3::UdpEchoServer [class] module.add_class('UdpEchoServer', parent=root_module['ns3::Application']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -20,10 +20,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -32,7 +32,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -40,7 +40,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -113,21 +113,21 @@ def register_Ns3UdpEchoServer_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_v4ping.py b/bindings/python/ns3_module_v4ping.py index f08635870..ec2bc2357 100644 --- a/bindings/python/ns3_module_v4ping.py +++ b/bindings/python/ns3_module_v4ping.py @@ -6,10 +6,10 @@ def register_types(module): ## v4ping.h: ns3::V4Ping [class] module.add_class('V4Ping', parent=root_module['ns3::Application']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -18,10 +18,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -30,7 +30,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -38,7 +38,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -79,21 +79,21 @@ def register_Ns3V4Ping_methods(root_module, cls): def register_functions(root_module): module = root_module - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3_module_wifi.py b/bindings/python/ns3_module_wifi.py index 8d6f69235..e1c62fc99 100644 --- a/bindings/python/ns3_module_wifi.py +++ b/bindings/python/ns3_module_wifi.py @@ -96,10 +96,10 @@ def register_types(module): ## aarf-wifi-manager.h: ns3::AarfWifiManager [class] module.add_class('AarfWifiManager', parent=root_module['ns3::ArfWifiManager']) - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -108,10 +108,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -120,7 +120,7 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() @@ -128,7 +128,7 @@ def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() @@ -2501,6 +2501,11 @@ def register_Ns3WifiNetDevice_methods(root_module, cls): 'void', [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::empty, ns3::empty >', 'cb')], is_virtual=True) + ## wifi-net-device.h: ns3::Address ns3::WifiNetDevice::GetMulticast(ns3::Ipv6Address addr) const [member function] + cls.add_method('GetMulticast', + 'ns3::Address', + [param('ns3::Ipv6Address', 'addr')], + is_const=True, is_virtual=True) ## wifi-net-device.h: bool ns3::WifiNetDevice::SendFrom(ns3::Ptr packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function] cls.add_method('SendFrom', 'bool', @@ -2542,29 +2547,29 @@ def register_Ns3AarfWifiManager_methods(root_module, cls): def register_functions(root_module): module = root_module - ## wifi-mode.h: extern ns3::Ptr ns3::MakeWifiModeChecker() [free function] - module.add_function('MakeWifiModeChecker', - 'ns3::Ptr< ns3::AttributeChecker const >', - []) ## ssid.h: extern ns3::Ptr ns3::MakeSsidChecker() [free function] module.add_function('MakeSsidChecker', 'ns3::Ptr< ns3::AttributeChecker const >', []) - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + ## wifi-mode.h: extern ns3::Ptr ns3::MakeWifiModeChecker() [free function] + module.add_function('MakeWifiModeChecker', + 'ns3::Ptr< ns3::AttributeChecker const >', + []) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): - return - -def register_functions_ns3_TimeStepPrecision(module, root_module): - return - def register_functions_ns3_Config(module, root_module): return +def register_functions_ns3_TimeStepPrecision(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + def register_functions_ns3_olsr(module, root_module): return diff --git a/bindings/python/ns3modulegen_generated.py b/bindings/python/ns3modulegen_generated.py index d77922001..8212f6548 100644 --- a/bindings/python/ns3modulegen_generated.py +++ b/bindings/python/ns3modulegen_generated.py @@ -263,10 +263,10 @@ def register_types(module): module.add_container('std::vector< unsigned int >', 'unsigned int', container_type='vector') module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') - ## Register a nested module for the namespace internal + ## Register a nested module for the namespace Config - nested_module = module.add_cpp_namespace('internal') - register_types_ns3_internal(nested_module) + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) ## Register a nested module for the namespace TimeStepPrecision @@ -275,10 +275,10 @@ def register_types(module): register_types_ns3_TimeStepPrecision(nested_module) - ## Register a nested module for the namespace Config + ## Register a nested module for the namespace internal - nested_module = module.add_cpp_namespace('Config') - register_types_ns3_Config(nested_module) + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) ## Register a nested module for the namespace olsr @@ -287,18 +287,18 @@ def register_types(module): register_types_ns3_olsr(nested_module) -def register_types_ns3_internal(module): +def register_types_ns3_Config(module): root_module = module.get_root() + module.add_container('std::vector< std::string >', 'std::string', container_type='vector') def register_types_ns3_TimeStepPrecision(module): root_module = module.get_root() -def register_types_ns3_Config(module): +def register_types_ns3_internal(module): root_module = module.get_root() - module.add_container('std::vector< std::string >', 'std::string', container_type='vector') def register_types_ns3_olsr(module): root_module = module.get_root() @@ -749,19 +749,19 @@ def register_functions(root_module): ns3_module_helper__local.register_functions(root_module) root_module.end_section('ns3_module_helper') - register_functions_ns3_internal(module.get_submodule('internal'), root_module) - register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) return -def register_functions_ns3_internal(module, root_module): +def register_functions_ns3_Config(module, root_module): return def register_functions_ns3_TimeStepPrecision(module, root_module): return -def register_functions_ns3_Config(module, root_module): +def register_functions_ns3_internal(module, root_module): return def register_functions_ns3_olsr(module, root_module): diff --git a/bindings/python/wscript b/bindings/python/wscript index cab9e6b56..62baaeaf7 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -22,7 +22,7 @@ else: os.environ['PYTHONPATH'] = LOCAL_PYBINDGEN_PATH ## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 9, 0, 600) +REQUIRED_PYBINDGEN_VERSION = (0, 9, 0, 603) REQUIRED_PYGCCXML_VERSION = (0, 9, 5)