diff --git a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py index 87ce918db..851219054 100644 --- a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py +++ b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py @@ -1,6 +1,6 @@ callback_classes = [ - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Address const&', 'ns3::Address const&', 'unsigned short', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py index a58d25fd8..c71e3b90b 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_contrib.py @@ -17,8 +17,6 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') - ## gtk-config-store.h: ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -140,7 +138,6 @@ def register_methods(root_module): register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) - register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -365,21 +362,6 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py index c498931bd..997fd5ae3 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py @@ -17,7 +17,7 @@ def register_types(module): module.add_class('EventId') ## global-value.h: ns3::GlobalValue [class] module.add_class('GlobalValue') - ## high-precision-cairo.h: ns3::HighPrecision [class] + ## high-precision-128.h: ns3::HighPrecision [class] module.add_class('HighPrecision') ## int-to-type.h: ns3::IntToType<0> [struct] module.add_class('IntToType', template_parameters=['0']) @@ -294,14 +294,14 @@ def register_types(module): module.add_container('std::list< ns3::Ptr< ns3::UanTransducer > >', 'ns3::Ptr< ns3::UanTransducer >', container_type='list') module.add_container('std::vector< ns3::Ptr< ns3::NetDevice > >', 'ns3::Ptr< ns3::NetDevice >', container_type='vector') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') - typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') - typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') - typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') - module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') typehandlers.add_type_alias('ns3::Time', 'ns3::TimeInvert') typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeInvert*') typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeInvert&') module.add_typedef(root_module['ns3::Time'], 'TimeInvert') + typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') + typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') + typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') + module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') typehandlers.add_type_alias('ns3::Time', 'ns3::TimeSquare') typehandlers.add_type_alias('ns3::Time*', 'ns3::TimeSquare*') typehandlers.add_type_alias('ns3::Time&', 'ns3::TimeSquare&') @@ -741,65 +741,67 @@ def register_Ns3GlobalValue_methods(root_module, cls): def register_Ns3HighPrecision_methods(root_module, cls): cls.add_output_stream_operator() - ## high-precision-cairo.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')]) - ## high-precision-cairo.h: ns3::HighPrecision::HighPrecision() [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor] + cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')]) + ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor] cls.add_constructor([]) - ## high-precision-cairo.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')]) - ## high-precision-cairo.h: ns3::HighPrecision::HighPrecision(double value) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor] cls.add_constructor([param('double', 'value')]) - ## high-precision-cairo.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] cls.add_method('Add', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-cairo.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] + ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] cls.add_method('Compare', 'int', [param('ns3::HighPrecision const &', 'o')], is_const=True) - ## high-precision-cairo.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] cls.add_method('Div', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-cairo.h: double ns3::HighPrecision::GetDouble() const [member function] + ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function] cls.add_method('GetDouble', 'double', [], is_const=True) - ## high-precision-cairo.h: int64_t ns3::HighPrecision::GetHigh() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function] cls.add_method('GetHigh', 'int64_t', [], is_const=True) - ## high-precision-cairo.h: int64_t ns3::HighPrecision::GetInteger() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function] cls.add_method('GetInteger', 'int64_t', [], is_const=True) - ## high-precision-cairo.h: uint64_t ns3::HighPrecision::GetLow() const [member function] + ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function] cls.add_method('GetLow', 'uint64_t', [], is_const=True) - ## high-precision-cairo.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] cls.add_method('Invert', 'ns3::HighPrecision', [param('uint64_t', 'v')], is_static=True) - ## high-precision-cairo.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] cls.add_method('Mul', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-cairo.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] cls.add_method('MulByInvert', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-cairo.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] cls.add_method('Sub', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-cairo.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] cls.add_method('Zero', 'ns3::HighPrecision', [], @@ -1628,13 +1630,13 @@ def register_Ns3TestSuite_methods(root_module, cls): def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right')) + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_network.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_network.py index c6525f097..0288870d9 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_network.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_network.py @@ -244,12 +244,12 @@ def register_types(module): typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndErrorCallback&') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndOkCallback&') diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py index 6a88b4b14..fc5607a51 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_spectrum.py @@ -86,15 +86,15 @@ def register_types(module): typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >', 'ns3::TxSpectrumModelInfoMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >*', 'ns3::TxSpectrumModelInfoMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::TxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::TxSpectrumModelInfo > > >&', 'ns3::TxSpectrumModelInfoMap_t&') - typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >', 'ns3::Bands') - typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >*', 'ns3::Bands*') - typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >&', 'ns3::Bands&') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >', 'ns3::RxSpectrumModelInfoMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >*', 'ns3::RxSpectrumModelInfoMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::RxSpectrumModelInfo, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::RxSpectrumModelInfo > > >&', 'ns3::RxSpectrumModelInfoMap_t&') typehandlers.add_type_alias('uint32_t', 'ns3::SpectrumModelUid_t') typehandlers.add_type_alias('uint32_t*', 'ns3::SpectrumModelUid_t*') typehandlers.add_type_alias('uint32_t&', 'ns3::SpectrumModelUid_t&') + typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >', 'ns3::Bands') + typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >*', 'ns3::Bands*') + typehandlers.add_type_alias('std::vector< ns3::BandInfo, std::allocator< ns3::BandInfo > >&', 'ns3::Bands&') ## Register a nested module for the namespace Config diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py index 3f2f24d8e..01bfdf7b9 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py @@ -19,8 +19,6 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) - ## sqlite-data-output.h: ns3::SqliteDataOutput [class] - module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] @@ -133,7 +131,6 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) - register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -478,23 +475,6 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3SqliteDataOutput_methods(root_module, cls): - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] - cls.add_constructor([]) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] - cls.add_method('Output', - 'void', - [param('ns3::DataCollector &', 'dc')], - is_virtual=True) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py index 202d8a026..6f291da57 100644 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py @@ -9,14 +9,14 @@ def register_types(module): module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT']) ## wifi-mode.h: ns3::WifiModulationClass [enumeration] module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT']) + ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration] + module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH']) ## qos-utils.h: ns3::AcIndex [enumeration] module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF']) ## ctrl-headers.h: ns3::BlockAckType [enumeration] module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK']) ## qos-tag.h: ns3::UserPriority [enumeration] module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC']) - ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration] - module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH']) ## wifi-mode.h: ns3::WifiCodeRate [enumeration] module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2']) ## edca-txop-n.h: ns3::TypeOfStation [enumeration] @@ -204,6 +204,9 @@ def register_types(module): ## dca-txop.h: ns3::DcaTxop [class] module.add_class('DcaTxop', parent=root_module['ns3::Dcf']) module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type='vector') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') + typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId') typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*') typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&') @@ -213,9 +216,6 @@ def register_types(module): typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*') typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', 'ns3::WifiModeList') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', 'ns3::WifiModeList*') - typehandlers.add_type_alias('std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', 'ns3::WifiModeList&') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >', 'ns3::SampleRate') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >*', 'ns3::SampleRate*') typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >&', 'ns3::SampleRate&') diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_click.py b/bindings/python/apidefs/gcc-LP64/ns3_module_click.py new file mode 100644 index 000000000..1ec689daf --- /dev/null +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_click.py @@ -0,0 +1,159 @@ +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers + +def register_types(module): + root_module = module.get_root() + + ## ipv4-l3-click-protocol.h: ns3::Ipv4L3ClickProtocol [class] + module.add_class('Ipv4L3ClickProtocol', parent=root_module['ns3::Ipv4']) + ## ipv4-click-routing.h: ns3::Ipv4ClickRouting [class] + module.add_class('Ipv4ClickRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) + + ## Register a nested module for the namespace Config + + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) + + + ## Register a nested module for the namespace FatalImpl + + nested_module = module.add_cpp_namespace('FatalImpl') + register_types_ns3_FatalImpl(nested_module) + + + ## Register a nested module for the namespace addressUtils + + nested_module = module.add_cpp_namespace('addressUtils') + register_types_ns3_addressUtils(nested_module) + + + ## Register a nested module for the namespace aodv + + nested_module = module.add_cpp_namespace('aodv') + register_types_ns3_aodv(nested_module) + + + ## Register a nested module for the namespace dot11s + + nested_module = module.add_cpp_namespace('dot11s') + register_types_ns3_dot11s(nested_module) + + + ## Register a nested module for the namespace dsdv + + nested_module = module.add_cpp_namespace('dsdv') + register_types_ns3_dsdv(nested_module) + + + ## Register a nested module for the namespace flame + + nested_module = module.add_cpp_namespace('flame') + register_types_ns3_flame(nested_module) + + + ## Register a nested module for the namespace internal + + nested_module = module.add_cpp_namespace('internal') + register_types_ns3_internal(nested_module) + + + ## Register a nested module for the namespace olsr + + nested_module = module.add_cpp_namespace('olsr') + register_types_ns3_olsr(nested_module) + + +def register_types_ns3_Config(module): + root_module = module.get_root() + + +def register_types_ns3_FatalImpl(module): + root_module = module.get_root() + + +def register_types_ns3_addressUtils(module): + root_module = module.get_root() + + +def register_types_ns3_aodv(module): + root_module = module.get_root() + + +def register_types_ns3_dot11s(module): + root_module = module.get_root() + + +def register_types_ns3_dsdv(module): + root_module = module.get_root() + + +def register_types_ns3_flame(module): + root_module = module.get_root() + + +def register_types_ns3_internal(module): + root_module = module.get_root() + + +def register_types_ns3_olsr(module): + root_module = module.get_root() + + +def register_methods(root_module): + register_Ns3Ipv4L3ClickProtocol_methods(root_module, root_module['ns3::Ipv4L3ClickProtocol']) + register_Ns3Ipv4ClickRouting_methods(root_module, root_module['ns3::Ipv4ClickRouting']) + return + +def register_Ns3Ipv4L3ClickProtocol_methods(root_module, cls): + ## ipv4-l3-click-protocol.h: ns3::Ipv4L3ClickProtocol::Ipv4L3ClickProtocol() [constructor] + cls.add_constructor([]) + ## ipv4-l3-click-protocol.h: ns3::Ipv4L3ClickProtocol::Ipv4L3ClickProtocol(ns3::Ipv4L3ClickProtocol const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4L3ClickProtocol const &', 'arg0')]) + return + +def register_Ns3Ipv4ClickRouting_methods(root_module, cls): + ## ipv4-click-routing.h: ns3::Ipv4ClickRouting::Ipv4ClickRouting() [constructor] + cls.add_constructor([]) + ## ipv4-click-routing.h: ns3::Ipv4ClickRouting::Ipv4ClickRouting(ns3::Ipv4ClickRouting const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4ClickRouting const &', 'arg0')]) + return + +def register_functions(root_module): + module = root_module + register_functions_ns3_Config(module.get_submodule('Config'), root_module) + register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) + register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module) + register_functions_ns3_aodv(module.get_submodule('aodv'), root_module) + register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module) + register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module) + register_functions_ns3_flame(module.get_submodule('flame'), root_module) + register_functions_ns3_internal(module.get_submodule('internal'), root_module) + register_functions_ns3_olsr(module.get_submodule('olsr'), root_module) + return + +def register_functions_ns3_Config(module, root_module): + return + +def register_functions_ns3_FatalImpl(module, root_module): + return + +def register_functions_ns3_addressUtils(module, root_module): + return + +def register_functions_ns3_aodv(module, root_module): + return + +def register_functions_ns3_dot11s(module, root_module): + return + +def register_functions_ns3_dsdv(module, root_module): + return + +def register_functions_ns3_flame(module, root_module): + return + +def register_functions_ns3_internal(module, root_module): + return + +def register_functions_ns3_olsr(module, root_module): + return + diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py index a58d25fd8..c71e3b90b 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_contrib.py @@ -17,8 +17,6 @@ def register_types(module): module.add_class('GnuplotCollection') ## gnuplot.h: ns3::GnuplotDataset [class] module.add_class('GnuplotDataset') - ## gtk-config-store.h: ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h: ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## config-store.h: ns3::ConfigStore [class] @@ -140,7 +138,6 @@ def register_methods(root_module): register_Ns3Gnuplot_methods(root_module, root_module['ns3::Gnuplot']) register_Ns3GnuplotCollection_methods(root_module, root_module['ns3::GnuplotCollection']) register_Ns3GnuplotDataset_methods(root_module, root_module['ns3::GnuplotDataset']) - register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ConfigStore_methods(root_module, root_module['ns3::ConfigStore']) register_Ns3FlowIdTag_methods(root_module, root_module['ns3::FlowIdTag']) @@ -365,21 +362,6 @@ def register_Ns3GnuplotDataset_methods(root_module, cls): visibility='protected') return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h: ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h: void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h: ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py index 72c735465..185056b8e 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py @@ -17,7 +17,7 @@ def register_types(module): module.add_class('EventId') ## global-value.h: ns3::GlobalValue [class] module.add_class('GlobalValue') - ## high-precision-double.h: ns3::HighPrecision [class] + ## high-precision-128.h: ns3::HighPrecision [class] module.add_class('HighPrecision') ## int-to-type.h: ns3::IntToType<0> [struct] module.add_class('IntToType', template_parameters=['0']) @@ -741,65 +741,67 @@ def register_Ns3GlobalValue_methods(root_module, cls): def register_Ns3HighPrecision_methods(root_module, cls): cls.add_output_stream_operator() - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(ns3::HighPrecision const & arg0) [copy constructor] cls.add_constructor([param('ns3::HighPrecision const &', 'arg0')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision() [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t high, uint64_t low) [constructor] + cls.add_constructor([param('int64_t', 'high'), param('uint64_t', 'low')]) + ## high-precision-128.h: ns3::HighPrecision::HighPrecision() [constructor] cls.add_constructor([]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(int64_t value, bool dummy) [constructor] cls.add_constructor([param('int64_t', 'value'), param('bool', 'dummy')]) - ## high-precision-double.h: ns3::HighPrecision::HighPrecision(double value) [constructor] + ## high-precision-128.h: ns3::HighPrecision::HighPrecision(double value) [constructor] cls.add_constructor([param('double', 'value')]) - ## high-precision-double.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Add(ns3::HighPrecision const & o) [member function] cls.add_method('Add', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] + ## high-precision-128.h: int ns3::HighPrecision::Compare(ns3::HighPrecision const & o) const [member function] cls.add_method('Compare', 'int', [param('ns3::HighPrecision const &', 'o')], is_const=True) - ## high-precision-double.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Div(ns3::HighPrecision const & o) [member function] cls.add_method('Div', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: double ns3::HighPrecision::GetDouble() const [member function] + ## high-precision-128.h: double ns3::HighPrecision::GetDouble() const [member function] cls.add_method('GetDouble', 'double', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetHigh() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetHigh() const [member function] cls.add_method('GetHigh', 'int64_t', [], is_const=True) - ## high-precision-double.h: int64_t ns3::HighPrecision::GetInteger() const [member function] + ## high-precision-128.h: int64_t ns3::HighPrecision::GetInteger() const [member function] cls.add_method('GetInteger', 'int64_t', [], is_const=True) - ## high-precision-double.h: uint64_t ns3::HighPrecision::GetLow() const [member function] + ## high-precision-128.h: uint64_t ns3::HighPrecision::GetLow() const [member function] cls.add_method('GetLow', 'uint64_t', [], is_const=True) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Invert(uint64_t v) [member function] cls.add_method('Invert', 'ns3::HighPrecision', [param('uint64_t', 'v')], is_static=True) - ## high-precision-double.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Mul(ns3::HighPrecision const & o) [member function] cls.add_method('Mul', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::MulByInvert(ns3::HighPrecision const & o) [member function] cls.add_method('MulByInvert', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] + ## high-precision-128.h: void ns3::HighPrecision::Sub(ns3::HighPrecision const & o) [member function] cls.add_method('Sub', 'void', [param('ns3::HighPrecision const &', 'o')]) - ## high-precision-double.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] + ## high-precision-128.h: static ns3::HighPrecision ns3::HighPrecision::Zero() [member function] cls.add_method('Zero', 'ns3::HighPrecision', [], diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py b/bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py index d67d5d53f..58438ce84 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py @@ -151,6 +151,8 @@ def register_types(module): module.add_class('Ipv4MulticastRoute', parent=root_module['ns3::SimpleRefCount< ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter >']) ## ipv4-raw-socket-factory.h: ns3::Ipv4RawSocketFactory [class] module.add_class('Ipv4RawSocketFactory', parent=root_module['ns3::SocketFactory']) + ## ipv4-raw-socket-impl.h: ns3::Ipv4RawSocketImpl [class] + module.add_class('Ipv4RawSocketImpl', parent=root_module['ns3::Socket']) ## ipv4-route.h: ns3::Ipv4Route [class] module.add_class('Ipv4Route', parent=root_module['ns3::SimpleRefCount< ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter >']) ## ipv4-routing-protocol.h: ns3::Ipv4RoutingProtocol [class] @@ -344,6 +346,7 @@ def register_methods(root_module): register_Ns3Ipv4L4Protocol_methods(root_module, root_module['ns3::Ipv4L4Protocol']) register_Ns3Ipv4MulticastRoute_methods(root_module, root_module['ns3::Ipv4MulticastRoute']) register_Ns3Ipv4RawSocketFactory_methods(root_module, root_module['ns3::Ipv4RawSocketFactory']) + register_Ns3Ipv4RawSocketImpl_methods(root_module, root_module['ns3::Ipv4RawSocketImpl']) register_Ns3Ipv4Route_methods(root_module, root_module['ns3::Ipv4Route']) register_Ns3Ipv4RoutingProtocol_methods(root_module, root_module['ns3::Ipv4RoutingProtocol']) register_Ns3Ipv6_methods(root_module, root_module['ns3::Ipv6']) @@ -3332,6 +3335,11 @@ def register_Ns3Ipv4_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## ipv4.h: void ns3::Ipv4::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_pure_virtual=True, is_virtual=True) ## ipv4.h: bool ns3::Ipv4::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] cls.add_method('IsDestinationAddress', 'bool', @@ -3357,6 +3365,11 @@ def register_Ns3Ipv4_methods(root_module, cls): 'ns3::Ipv4Address', [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], is_pure_virtual=True, is_virtual=True) + ## ipv4.h: void ns3::Ipv4::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_pure_virtual=True, is_virtual=True) ## ipv4.h: void ns3::Ipv4::SetDown(uint32_t interface) [member function] cls.add_method('SetDown', 'void', @@ -3538,7 +3551,8 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] cls.add_method('Insert', 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) ## ipv4-l3-protocol.h: ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] cls.add_method('GetProtocol', 'ns3::Ptr< ns3::Ipv4L4Protocol >', @@ -3559,7 +3573,8 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] cls.add_method('Send', 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] cls.add_method('SendWithHeader', 'void', @@ -3797,6 +3812,130 @@ def register_Ns3Ipv4RawSocketFactory_methods(root_module, cls): is_static=True) return +def register_Ns3Ipv4RawSocketImpl_methods(root_module, cls): + ## ipv4-raw-socket-impl.h: ns3::Ipv4RawSocketImpl::Ipv4RawSocketImpl(ns3::Ipv4RawSocketImpl const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Ipv4RawSocketImpl const &', 'arg0')]) + ## ipv4-raw-socket-impl.h: ns3::Ipv4RawSocketImpl::Ipv4RawSocketImpl() [constructor] + cls.add_constructor([]) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::Bind(ns3::Address const & address) [member function] + cls.add_method('Bind', + 'int', + [param('ns3::Address const &', 'address')], + is_virtual=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::Bind() [member function] + cls.add_method('Bind', + 'int', + [], + is_virtual=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::Close() [member function] + cls.add_method('Close', + 'int', + [], + is_virtual=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::Connect(ns3::Address const & address) [member function] + cls.add_method('Connect', + 'int', + [param('ns3::Address const &', 'address')], + is_virtual=True) + ## ipv4-raw-socket-impl.h: bool ns3::Ipv4RawSocketImpl::ForwardUp(ns3::Ptr p, ns3::Ipv4Header ipHeader, ns3::Ptr incomingInterface) [member function] + cls.add_method('ForwardUp', + 'bool', + [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Interface >', 'incomingInterface')]) + ## ipv4-raw-socket-impl.h: bool ns3::Ipv4RawSocketImpl::GetAllowBroadcast() const [member function] + cls.add_method('GetAllowBroadcast', + 'bool', + [], + is_const=True, is_virtual=True) + ## ipv4-raw-socket-impl.h: ns3::Socket::SocketErrno ns3::Ipv4RawSocketImpl::GetErrno() const [member function] + cls.add_method('GetErrno', + 'ns3::Socket::SocketErrno', + [], + is_const=True, is_virtual=True) + ## ipv4-raw-socket-impl.h: ns3::Ptr ns3::Ipv4RawSocketImpl::GetNode() const [member function] + cls.add_method('GetNode', + 'ns3::Ptr< ns3::Node >', + [], + is_const=True, is_virtual=True) + ## ipv4-raw-socket-impl.h: uint32_t ns3::Ipv4RawSocketImpl::GetRxAvailable() const [member function] + cls.add_method('GetRxAvailable', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::GetSockName(ns3::Address & address) const [member function] + cls.add_method('GetSockName', + 'int', + [param('ns3::Address &', 'address')], + is_const=True, is_virtual=True) + ## ipv4-raw-socket-impl.h: ns3::Socket::SocketType ns3::Ipv4RawSocketImpl::GetSocketType() const [member function] + cls.add_method('GetSocketType', + 'ns3::Socket::SocketType', + [], + is_const=True, is_virtual=True) + ## ipv4-raw-socket-impl.h: uint32_t ns3::Ipv4RawSocketImpl::GetTxAvailable() const [member function] + cls.add_method('GetTxAvailable', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## ipv4-raw-socket-impl.h: static ns3::TypeId ns3::Ipv4RawSocketImpl::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::Listen() [member function] + cls.add_method('Listen', + 'int', + [], + is_virtual=True) + ## ipv4-raw-socket-impl.h: ns3::Ptr ns3::Ipv4RawSocketImpl::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_virtual=True) + ## ipv4-raw-socket-impl.h: ns3::Ptr ns3::Ipv4RawSocketImpl::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_virtual=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::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_virtual=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::SendTo(ns3::Ptr p, uint32_t flags, ns3::Address const & toAddress) [member function] + cls.add_method('SendTo', + 'int', + [param('ns3::Ptr< ns3::Packet >', 'p'), param('uint32_t', 'flags'), param('ns3::Address const &', 'toAddress')], + is_virtual=True) + ## ipv4-raw-socket-impl.h: bool ns3::Ipv4RawSocketImpl::SetAllowBroadcast(bool allowBroadcast) [member function] + cls.add_method('SetAllowBroadcast', + 'bool', + [param('bool', 'allowBroadcast')], + is_virtual=True) + ## ipv4-raw-socket-impl.h: void ns3::Ipv4RawSocketImpl::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-raw-socket-impl.h: void ns3::Ipv4RawSocketImpl::SetProtocol(uint16_t protocol) [member function] + cls.add_method('SetProtocol', + 'void', + [param('uint16_t', 'protocol')]) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::ShutdownRecv() [member function] + cls.add_method('ShutdownRecv', + 'int', + [], + is_virtual=True) + ## ipv4-raw-socket-impl.h: int ns3::Ipv4RawSocketImpl::ShutdownSend() [member function] + cls.add_method('ShutdownSend', + 'int', + [], + is_virtual=True) + ## ipv4-raw-socket-impl.h: void ns3::Ipv4RawSocketImpl::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='private', is_virtual=True) + return + def register_Ns3Ipv4Route_methods(root_module, cls): cls.add_output_stream_operator() ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route(ns3::Ipv4Route const & arg0) [copy constructor] diff --git a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py index 3f2f24d8e..01bfdf7b9 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py @@ -19,8 +19,6 @@ def register_types(module): module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface']) ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class] module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) - ## sqlite-data-output.h: ns3::SqliteDataOutput [class] - module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface']) ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class] module.add_class('TimeMinMaxAvgTotalCalculator', parent=root_module['ns3::DataCalculator']) ## basic-data-calculators.h: ns3::CounterCalculator [class] @@ -133,7 +131,6 @@ def register_methods(root_module): register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >']) register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput']) register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator']) - register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput']) register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator']) register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >']) register_Ns3PacketCounterCalculator_methods(root_module, root_module['ns3::PacketCounterCalculator']) @@ -478,23 +475,6 @@ def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls): visibility='protected', is_virtual=True) return -def register_Ns3SqliteDataOutput_methods(root_module, cls): - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')]) - ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput() [constructor] - cls.add_constructor([]) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::Output(ns3::DataCollector & dc) [member function] - cls.add_method('Output', - 'void', - [param('ns3::DataCollector &', 'dc')], - is_virtual=True) - ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function] - cls.add_method('DoDispose', - 'void', - [], - visibility='protected', is_virtual=True) - return - def register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, cls): ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator::TimeMinMaxAvgTotalCalculator(ns3::TimeMinMaxAvgTotalCalculator const & arg0) [copy constructor] cls.add_constructor([param('ns3::TimeMinMaxAvgTotalCalculator const &', 'arg0')]) diff --git a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py index e7b00fc17..bbfe38b87 100644 --- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py +++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py @@ -36,6 +36,7 @@ import ns3_module_virtual_net_device import ns3_module_wifi import ns3_module_wimax import ns3_module_aodv +import ns3_module_click import ns3_module_flow_monitor import ns3_module_nix_vector_routing import ns3_module_ping6 @@ -327,6 +328,17 @@ def register_types(module): ns3_module_aodv__local.register_types(module) root_module.end_section('ns3_module_aodv') + root_module.begin_section('ns3_module_click') + ns3_module_click.register_types(module) + + try: + import ns3_module_click__local + except ImportError: + pass + else: + ns3_module_click__local.register_types(module) + + root_module.end_section('ns3_module_click') root_module.begin_section('ns3_module_flow_monitor') ns3_module_flow_monitor.register_types(module) @@ -912,6 +924,17 @@ def register_methods(root_module): ns3_module_aodv__local.register_methods(root_module) root_module.end_section('ns3_module_aodv') + root_module.begin_section('ns3_module_click') + ns3_module_click.register_methods(root_module) + + try: + import ns3_module_click__local + except ImportError: + pass + else: + ns3_module_click__local.register_methods(root_module) + + root_module.end_section('ns3_module_click') root_module.begin_section('ns3_module_flow_monitor') ns3_module_flow_monitor.register_methods(root_module) @@ -1389,6 +1412,17 @@ def register_functions(root_module): ns3_module_aodv__local.register_functions(root_module) root_module.end_section('ns3_module_aodv') + root_module.begin_section('ns3_module_click') + ns3_module_click.register_functions(root_module) + + try: + import ns3_module_click__local + except ImportError: + pass + else: + ns3_module_click__local.register_functions(root_module) + + root_module.end_section('ns3_module_click') root_module.begin_section('ns3_module_flow_monitor') ns3_module_flow_monitor.register_functions(root_module)