From c29b7c953bd23384ffcf3e65c17506f47c0fbd61 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Mon, 15 May 2017 03:39:13 +0200 Subject: [PATCH] dsr: rescan bindings --- src/dsr/bindings/callbacks_list.py | 1 + src/dsr/bindings/modulegen__gcc_ILP32.py | 112 ++++++++++++++++++++--- src/dsr/bindings/modulegen__gcc_LP64.py | 112 ++++++++++++++++++++--- 3 files changed, 197 insertions(+), 28 deletions(-) diff --git a/src/dsr/bindings/callbacks_list.py b/src/dsr/bindings/callbacks_list.py index e92b31276..c512b5385 100644 --- a/src/dsr/bindings/callbacks_list.py +++ b/src/dsr/bindings/callbacks_list.py @@ -3,6 +3,7 @@ callback_classes = [ ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ipv4Address', 'unsigned char', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::WifiMacHeader const*', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ipv4Address', 'ns3::Ipv4Address', 'unsigned char', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff --git a/src/dsr/bindings/modulegen__gcc_ILP32.py b/src/dsr/bindings/modulegen__gcc_ILP32.py index 893dfd782..750fd1771 100644 --- a/src/dsr/bindings/modulegen__gcc_ILP32.py +++ b/src/dsr/bindings/modulegen__gcc_ILP32.py @@ -562,6 +562,10 @@ def register_types(module): module.add_class('SsidChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker']) ## ssid.h (module 'wifi'): ns3::SsidValue [class] module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue']) + ## string.h (module 'core'): ns3::StringChecker [class] + module.add_class('StringChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## string.h (module 'core'): ns3::StringValue [class] + module.add_class('StringValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class] module.add_class('SupportedRates', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement']) ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class] @@ -839,7 +843,6 @@ def register_types_ns3_dsr(module): module.add_container('std::list< std::vector< ns3::Ipv4Address > >', 'std::vector< ns3::Ipv4Address >', container_type=u'list') module.add_container('std::list< ns3::dsr::DsrRouteCacheEntry >', 'ns3::dsr::DsrRouteCacheEntry', container_type=u'list') module.add_container('std::vector< std::string >', 'std::string', container_type=u'vector') - module.add_container('std::map< ns3::Ipv4Address, ns3::dsr::RreqTableEntry >', ('ns3::Ipv4Address', 'ns3::dsr::RreqTableEntry'), container_type=u'map') module.add_container('std::vector< ns3::dsr::DsrSendBuffEntry >', 'ns3::dsr::DsrSendBuffEntry', container_type=u'vector') def register_types_ns3_internal(module): @@ -1061,6 +1064,8 @@ def register_methods(root_module): register_Ns3Ssid_methods(root_module, root_module['ns3::Ssid']) register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker']) register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) + register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker']) + register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue']) register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates']) register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) @@ -2103,10 +2108,10 @@ def register_Ns3InterferenceHelper_methods(root_module, cls): cls.add_constructor([param('ns3::InterferenceHelper const &', 'arg0')]) ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::InterferenceHelper() [constructor] cls.add_constructor([]) - ## interference-helper.h (module 'wifi'): ns3::Ptr ns3::InterferenceHelper::Add(uint32_t size, ns3::WifiTxVector txVector, ns3::Time duration, double rxPower) [member function] + ## interference-helper.h (module 'wifi'): ns3::Ptr ns3::InterferenceHelper::Add(ns3::Ptr packet, ns3::WifiTxVector txVector, ns3::Time duration, double rxPower) [member function] cls.add_method('Add', 'ns3::Ptr< ns3::InterferenceHelper::Event >', - [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txVector'), param('ns3::Time', 'duration'), param('double', 'rxPower')]) + [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiTxVector', 'txVector'), param('ns3::Time', 'duration'), param('double', 'rxPower')]) ## interference-helper.h (module 'wifi'): void ns3::InterferenceHelper::AddForeignSignal(ns3::Time duration, double rxPower) [member function] cls.add_method('AddForeignSignal', 'void', @@ -2123,10 +2128,11 @@ def register_Ns3InterferenceHelper_methods(root_module, cls): cls.add_method('EraseEvents', 'void', []) - ## interference-helper.h (module 'wifi'): ns3::Time ns3::InterferenceHelper::GetEnergyDuration(double energyW) [member function] + ## interference-helper.h (module 'wifi'): ns3::Time ns3::InterferenceHelper::GetEnergyDuration(double energyW) const [member function] cls.add_method('GetEnergyDuration', 'ns3::Time', - [param('double', 'energyW')]) + [param('double', 'energyW')], + is_const=True) ## interference-helper.h (module 'wifi'): ns3::Ptr ns3::InterferenceHelper::GetErrorRateModel() const [member function] cls.add_method('GetErrorRateModel', 'ns3::Ptr< ns3::ErrorRateModel >', @@ -3818,6 +3824,8 @@ def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls): return def register_Ns3Vector2D_methods(root_module, cls): + cls.add_binary_numeric_operator('+', root_module['ns3::Vector2D'], root_module['ns3::Vector2D'], param('ns3::Vector2D const &', u'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::Vector2D'], root_module['ns3::Vector2D'], param('ns3::Vector2D const &', u'right')) cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() ## vector.h (module 'core'): ns3::Vector2D::Vector2D(ns3::Vector2D const & arg0) [copy constructor] @@ -3826,6 +3834,11 @@ def register_Ns3Vector2D_methods(root_module, cls): cls.add_constructor([param('double', '_x'), param('double', '_y')]) ## vector.h (module 'core'): ns3::Vector2D::Vector2D() [constructor] cls.add_constructor([]) + ## vector.h (module 'core'): double ns3::Vector2D::GetLength() const [member function] + cls.add_method('GetLength', + 'double', + [], + is_const=True) ## vector.h (module 'core'): ns3::Vector2D::x [variable] cls.add_instance_attribute('x', 'double', is_const=False) ## vector.h (module 'core'): ns3::Vector2D::y [variable] @@ -3833,6 +3846,8 @@ def register_Ns3Vector2D_methods(root_module, cls): return def register_Ns3Vector3D_methods(root_module, cls): + cls.add_binary_numeric_operator('+', root_module['ns3::Vector3D'], root_module['ns3::Vector3D'], param('ns3::Vector3D const &', u'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::Vector3D'], root_module['ns3::Vector3D'], param('ns3::Vector3D const &', u'right')) cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() ## vector.h (module 'core'): ns3::Vector3D::Vector3D(ns3::Vector3D const & arg0) [copy constructor] @@ -3841,6 +3856,11 @@ def register_Ns3Vector3D_methods(root_module, cls): cls.add_constructor([param('double', '_x'), param('double', '_y'), param('double', '_z')]) ## vector.h (module 'core'): ns3::Vector3D::Vector3D() [constructor] cls.add_constructor([]) + ## vector.h (module 'core'): double ns3::Vector3D::GetLength() const [member function] + cls.add_method('GetLength', + 'double', + [], + is_const=True) ## vector.h (module 'core'): ns3::Vector3D::x [variable] cls.add_instance_attribute('x', 'double', is_const=False) ## vector.h (module 'core'): ns3::Vector3D::y [variable] @@ -7729,10 +7749,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'int64_t', [param('int64_t', 'stream')], is_virtual=True) - ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpPreambleAndHeaderDuration(ns3::WifiTxVector txVector) [member function] + ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculatePlcpPreambleAndHeaderDuration(ns3::WifiTxVector txVector) [member function] cls.add_method('CalculatePlcpPreambleAndHeaderDuration', 'ns3::Time', - [param('ns3::WifiTxVector', 'txVector')]) + [param('ns3::WifiTxVector', 'txVector')], + is_static=True) ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiTxVector txVector, double ber) const [member function] cls.add_method('CalculateSnr', 'double', @@ -7872,6 +7893,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::Ptr< ns3::ErrorRateModel >', [], is_const=True) + ## wifi-phy.h (module 'wifi'): ns3::Ptr ns3::WifiPhy::GetFrameCaptureModel() const [member function] + cls.add_method('GetFrameCaptureModel', + 'ns3::Ptr< ns3::FrameCaptureModel >', + [], + is_const=True) ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetFrequency() const [member function] cls.add_method('GetFrequency', 'uint16_t', @@ -8589,6 +8615,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): cls.add_method('SetErrorRateModel', 'void', [param('ns3::Ptr< ns3::ErrorRateModel >', 'rate')]) + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrameCaptureModel(ns3::Ptr rate) [member function] + cls.add_method('SetFrameCaptureModel', + 'void', + [param('ns3::Ptr< ns3::FrameCaptureModel >', 'rate')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint16_t freq) [member function] cls.add_method('SetFrequency', 'void', @@ -9838,10 +9868,15 @@ def register_Ns3ArpCacheEntry_methods(root_module, cls): cls.add_method('SetIpv4Address', 'void', [param('ns3::Ipv4Address', 'destination')]) + ## arp-cache.h (module 'internet'): void ns3::ArpCache::Entry::SetMacAddress(ns3::Address macAddress) [member function] + cls.add_method('SetMacAddress', + 'void', + [param('ns3::Address', 'macAddress')]) ## arp-cache.h (module 'internet'): void ns3::ArpCache::Entry::SetMacAddresss(ns3::Address macAddress) [member function] cls.add_method('SetMacAddresss', 'void', - [param('ns3::Address', 'macAddress')]) + [param('ns3::Address', 'macAddress')], + deprecated=True) ## arp-cache.h (module 'internet'): void ns3::ArpCache::Entry::UpdateSeen() [member function] cls.add_method('UpdateSeen', 'void', @@ -10441,6 +10476,10 @@ def register_Ns3DcaTxop_methods(root_module, cls): cls.add_method('SetMinCw', 'void', [param('uint32_t', 'minCw')]) + ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxDroppedCallback(ns3::Callback, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function] + cls.add_method('SetTxDroppedCallback', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxFailedCallback(ns3::Callback callback) [member function] cls.add_method('SetTxFailedCallback', 'void', @@ -10557,6 +10596,11 @@ def register_Ns3DcaTxop_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) + ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::TxDroppedPacket(ns3::Ptr item) [member function] + cls.add_method('TxDroppedPacket', + 'void', + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item')], + visibility='protected') return def register_Ns3DcfManager_methods(root_module, cls): @@ -14376,6 +14420,46 @@ def register_Ns3SsidValue_methods(root_module, cls): [param('ns3::Ssid const &', 'value')]) return +def register_Ns3StringChecker_methods(root_module, cls): + ## string.h (module 'core'): ns3::StringChecker::StringChecker() [constructor] + cls.add_constructor([]) + ## string.h (module 'core'): ns3::StringChecker::StringChecker(ns3::StringChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::StringChecker const &', 'arg0')]) + return + +def register_Ns3StringValue_methods(root_module, cls): + ## string.h (module 'core'): ns3::StringValue::StringValue() [constructor] + cls.add_constructor([]) + ## string.h (module 'core'): ns3::StringValue::StringValue(ns3::StringValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::StringValue const &', 'arg0')]) + ## string.h (module 'core'): ns3::StringValue::StringValue(std::string const & value) [constructor] + cls.add_constructor([param('std::string const &', 'value')]) + ## string.h (module 'core'): ns3::Ptr ns3::StringValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## string.h (module 'core'): bool ns3::StringValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## string.h (module 'core'): std::string ns3::StringValue::Get() const [member function] + cls.add_method('Get', + 'std::string', + [], + is_const=True) + ## string.h (module 'core'): std::string ns3::StringValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## string.h (module 'core'): void ns3::StringValue::Set(std::string const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string const &', 'value')]) + return + def register_Ns3SupportedRates_methods(root_module, cls): cls.add_output_stream_operator() ## supported-rates.h (module 'wifi'): ns3::SupportedRates::SupportedRates() [constructor] @@ -17149,10 +17233,10 @@ def register_Ns3DsrDsrRouteCache_methods(root_module, cls): cls.add_method('IsNeighbor', 'bool', [param('ns3::Ipv4Address', 'addr')]) - ## dsr-rcache.h (module 'dsr'): ns3::Mac48Address ns3::dsr::DsrRouteCache::LookupMacAddress(ns3::Ipv4Address arg0) [member function] + ## dsr-rcache.h (module 'dsr'): ns3::Mac48Address ns3::dsr::DsrRouteCache::LookupMacAddress(ns3::Ipv4Address addr) [member function] cls.add_method('LookupMacAddress', 'ns3::Mac48Address', - [param('ns3::Ipv4Address', 'arg0')]) + [param('ns3::Ipv4Address', 'addr')]) ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::DsrRouteCache::LookupRoute(ns3::Ipv4Address id, ns3::dsr::DsrRouteCacheEntry & rt) [member function] cls.add_method('LookupRoute', 'bool', @@ -17169,10 +17253,10 @@ def register_Ns3DsrDsrRouteCache_methods(root_module, cls): cls.add_method('PrintVector', 'void', [param('std::vector< ns3::Ipv4Address > &', 'vec')]) - ## dsr-rcache.h (module 'dsr'): void ns3::dsr::DsrRouteCache::ProcessTxError(ns3::WifiMacHeader const & arg0) [member function] + ## dsr-rcache.h (module 'dsr'): void ns3::dsr::DsrRouteCache::ProcessTxError(ns3::WifiMacHeader const & hdr) [member function] cls.add_method('ProcessTxError', 'void', - [param('ns3::WifiMacHeader const &', 'arg0')]) + [param('ns3::WifiMacHeader const &', 'hdr')]) ## dsr-rcache.h (module 'dsr'): void ns3::dsr::DsrRouteCache::Purge() [member function] cls.add_method('Purge', 'void', @@ -17805,10 +17889,10 @@ def register_Ns3DsrDsrRreqTable_methods(root_module, cls): cls.add_method('PurgeNeighbor', 'void', []) - ## dsr-rreq-table.h (module 'dsr'): void ns3::dsr::DsrRreqTable::RemoveLeastExpire(std::map, std::allocator > > & rreqDstMap) [member function] + ## dsr-rreq-table.h (module 'dsr'): void ns3::dsr::DsrRreqTable::RemoveLeastExpire() [member function] cls.add_method('RemoveLeastExpire', 'void', - [param('std::map< ns3::Ipv4Address, ns3::dsr::RreqTableEntry > &', 'rreqDstMap')]) + []) ## dsr-rreq-table.h (module 'dsr'): void ns3::dsr::DsrRreqTable::RemoveRreqEntry(ns3::Ipv4Address dst) [member function] cls.add_method('RemoveRreqEntry', 'void', diff --git a/src/dsr/bindings/modulegen__gcc_LP64.py b/src/dsr/bindings/modulegen__gcc_LP64.py index 893dfd782..750fd1771 100644 --- a/src/dsr/bindings/modulegen__gcc_LP64.py +++ b/src/dsr/bindings/modulegen__gcc_LP64.py @@ -562,6 +562,10 @@ def register_types(module): module.add_class('SsidChecker', import_from_module='ns.wifi', parent=root_module['ns3::AttributeChecker']) ## ssid.h (module 'wifi'): ns3::SsidValue [class] module.add_class('SsidValue', import_from_module='ns.wifi', parent=root_module['ns3::AttributeValue']) + ## string.h (module 'core'): ns3::StringChecker [class] + module.add_class('StringChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## string.h (module 'core'): ns3::StringValue [class] + module.add_class('StringValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## supported-rates.h (module 'wifi'): ns3::SupportedRates [class] module.add_class('SupportedRates', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement']) ## tcp-l4-protocol.h (module 'internet'): ns3::TcpL4Protocol [class] @@ -839,7 +843,6 @@ def register_types_ns3_dsr(module): module.add_container('std::list< std::vector< ns3::Ipv4Address > >', 'std::vector< ns3::Ipv4Address >', container_type=u'list') module.add_container('std::list< ns3::dsr::DsrRouteCacheEntry >', 'ns3::dsr::DsrRouteCacheEntry', container_type=u'list') module.add_container('std::vector< std::string >', 'std::string', container_type=u'vector') - module.add_container('std::map< ns3::Ipv4Address, ns3::dsr::RreqTableEntry >', ('ns3::Ipv4Address', 'ns3::dsr::RreqTableEntry'), container_type=u'map') module.add_container('std::vector< ns3::dsr::DsrSendBuffEntry >', 'ns3::dsr::DsrSendBuffEntry', container_type=u'vector') def register_types_ns3_internal(module): @@ -1061,6 +1064,8 @@ def register_methods(root_module): register_Ns3Ssid_methods(root_module, root_module['ns3::Ssid']) register_Ns3SsidChecker_methods(root_module, root_module['ns3::SsidChecker']) register_Ns3SsidValue_methods(root_module, root_module['ns3::SsidValue']) + register_Ns3StringChecker_methods(root_module, root_module['ns3::StringChecker']) + register_Ns3StringValue_methods(root_module, root_module['ns3::StringValue']) register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates']) register_Ns3TcpL4Protocol_methods(root_module, root_module['ns3::TcpL4Protocol']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) @@ -2103,10 +2108,10 @@ def register_Ns3InterferenceHelper_methods(root_module, cls): cls.add_constructor([param('ns3::InterferenceHelper const &', 'arg0')]) ## interference-helper.h (module 'wifi'): ns3::InterferenceHelper::InterferenceHelper() [constructor] cls.add_constructor([]) - ## interference-helper.h (module 'wifi'): ns3::Ptr ns3::InterferenceHelper::Add(uint32_t size, ns3::WifiTxVector txVector, ns3::Time duration, double rxPower) [member function] + ## interference-helper.h (module 'wifi'): ns3::Ptr ns3::InterferenceHelper::Add(ns3::Ptr packet, ns3::WifiTxVector txVector, ns3::Time duration, double rxPower) [member function] cls.add_method('Add', 'ns3::Ptr< ns3::InterferenceHelper::Event >', - [param('uint32_t', 'size'), param('ns3::WifiTxVector', 'txVector'), param('ns3::Time', 'duration'), param('double', 'rxPower')]) + [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiTxVector', 'txVector'), param('ns3::Time', 'duration'), param('double', 'rxPower')]) ## interference-helper.h (module 'wifi'): void ns3::InterferenceHelper::AddForeignSignal(ns3::Time duration, double rxPower) [member function] cls.add_method('AddForeignSignal', 'void', @@ -2123,10 +2128,11 @@ def register_Ns3InterferenceHelper_methods(root_module, cls): cls.add_method('EraseEvents', 'void', []) - ## interference-helper.h (module 'wifi'): ns3::Time ns3::InterferenceHelper::GetEnergyDuration(double energyW) [member function] + ## interference-helper.h (module 'wifi'): ns3::Time ns3::InterferenceHelper::GetEnergyDuration(double energyW) const [member function] cls.add_method('GetEnergyDuration', 'ns3::Time', - [param('double', 'energyW')]) + [param('double', 'energyW')], + is_const=True) ## interference-helper.h (module 'wifi'): ns3::Ptr ns3::InterferenceHelper::GetErrorRateModel() const [member function] cls.add_method('GetErrorRateModel', 'ns3::Ptr< ns3::ErrorRateModel >', @@ -3818,6 +3824,8 @@ def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls): return def register_Ns3Vector2D_methods(root_module, cls): + cls.add_binary_numeric_operator('+', root_module['ns3::Vector2D'], root_module['ns3::Vector2D'], param('ns3::Vector2D const &', u'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::Vector2D'], root_module['ns3::Vector2D'], param('ns3::Vector2D const &', u'right')) cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() ## vector.h (module 'core'): ns3::Vector2D::Vector2D(ns3::Vector2D const & arg0) [copy constructor] @@ -3826,6 +3834,11 @@ def register_Ns3Vector2D_methods(root_module, cls): cls.add_constructor([param('double', '_x'), param('double', '_y')]) ## vector.h (module 'core'): ns3::Vector2D::Vector2D() [constructor] cls.add_constructor([]) + ## vector.h (module 'core'): double ns3::Vector2D::GetLength() const [member function] + cls.add_method('GetLength', + 'double', + [], + is_const=True) ## vector.h (module 'core'): ns3::Vector2D::x [variable] cls.add_instance_attribute('x', 'double', is_const=False) ## vector.h (module 'core'): ns3::Vector2D::y [variable] @@ -3833,6 +3846,8 @@ def register_Ns3Vector2D_methods(root_module, cls): return def register_Ns3Vector3D_methods(root_module, cls): + cls.add_binary_numeric_operator('+', root_module['ns3::Vector3D'], root_module['ns3::Vector3D'], param('ns3::Vector3D const &', u'right')) + cls.add_binary_numeric_operator('-', root_module['ns3::Vector3D'], root_module['ns3::Vector3D'], param('ns3::Vector3D const &', u'right')) cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() ## vector.h (module 'core'): ns3::Vector3D::Vector3D(ns3::Vector3D const & arg0) [copy constructor] @@ -3841,6 +3856,11 @@ def register_Ns3Vector3D_methods(root_module, cls): cls.add_constructor([param('double', '_x'), param('double', '_y'), param('double', '_z')]) ## vector.h (module 'core'): ns3::Vector3D::Vector3D() [constructor] cls.add_constructor([]) + ## vector.h (module 'core'): double ns3::Vector3D::GetLength() const [member function] + cls.add_method('GetLength', + 'double', + [], + is_const=True) ## vector.h (module 'core'): ns3::Vector3D::x [variable] cls.add_instance_attribute('x', 'double', is_const=False) ## vector.h (module 'core'): ns3::Vector3D::y [variable] @@ -7729,10 +7749,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'int64_t', [param('int64_t', 'stream')], is_virtual=True) - ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpPreambleAndHeaderDuration(ns3::WifiTxVector txVector) [member function] + ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculatePlcpPreambleAndHeaderDuration(ns3::WifiTxVector txVector) [member function] cls.add_method('CalculatePlcpPreambleAndHeaderDuration', 'ns3::Time', - [param('ns3::WifiTxVector', 'txVector')]) + [param('ns3::WifiTxVector', 'txVector')], + is_static=True) ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiTxVector txVector, double ber) const [member function] cls.add_method('CalculateSnr', 'double', @@ -7872,6 +7893,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::Ptr< ns3::ErrorRateModel >', [], is_const=True) + ## wifi-phy.h (module 'wifi'): ns3::Ptr ns3::WifiPhy::GetFrameCaptureModel() const [member function] + cls.add_method('GetFrameCaptureModel', + 'ns3::Ptr< ns3::FrameCaptureModel >', + [], + is_const=True) ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetFrequency() const [member function] cls.add_method('GetFrequency', 'uint16_t', @@ -8589,6 +8615,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): cls.add_method('SetErrorRateModel', 'void', [param('ns3::Ptr< ns3::ErrorRateModel >', 'rate')]) + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrameCaptureModel(ns3::Ptr rate) [member function] + cls.add_method('SetFrameCaptureModel', + 'void', + [param('ns3::Ptr< ns3::FrameCaptureModel >', 'rate')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetFrequency(uint16_t freq) [member function] cls.add_method('SetFrequency', 'void', @@ -9838,10 +9868,15 @@ def register_Ns3ArpCacheEntry_methods(root_module, cls): cls.add_method('SetIpv4Address', 'void', [param('ns3::Ipv4Address', 'destination')]) + ## arp-cache.h (module 'internet'): void ns3::ArpCache::Entry::SetMacAddress(ns3::Address macAddress) [member function] + cls.add_method('SetMacAddress', + 'void', + [param('ns3::Address', 'macAddress')]) ## arp-cache.h (module 'internet'): void ns3::ArpCache::Entry::SetMacAddresss(ns3::Address macAddress) [member function] cls.add_method('SetMacAddresss', 'void', - [param('ns3::Address', 'macAddress')]) + [param('ns3::Address', 'macAddress')], + deprecated=True) ## arp-cache.h (module 'internet'): void ns3::ArpCache::Entry::UpdateSeen() [member function] cls.add_method('UpdateSeen', 'void', @@ -10441,6 +10476,10 @@ def register_Ns3DcaTxop_methods(root_module, cls): cls.add_method('SetMinCw', 'void', [param('uint32_t', 'minCw')]) + ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxDroppedCallback(ns3::Callback, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function] + cls.add_method('SetTxDroppedCallback', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')]) ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::SetTxFailedCallback(ns3::Callback callback) [member function] cls.add_method('SetTxFailedCallback', 'void', @@ -10557,6 +10596,11 @@ def register_Ns3DcaTxop_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) + ## dca-txop.h (module 'wifi'): void ns3::DcaTxop::TxDroppedPacket(ns3::Ptr item) [member function] + cls.add_method('TxDroppedPacket', + 'void', + [param('ns3::Ptr< ns3::WifiMacQueueItem const >', 'item')], + visibility='protected') return def register_Ns3DcfManager_methods(root_module, cls): @@ -14376,6 +14420,46 @@ def register_Ns3SsidValue_methods(root_module, cls): [param('ns3::Ssid const &', 'value')]) return +def register_Ns3StringChecker_methods(root_module, cls): + ## string.h (module 'core'): ns3::StringChecker::StringChecker() [constructor] + cls.add_constructor([]) + ## string.h (module 'core'): ns3::StringChecker::StringChecker(ns3::StringChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::StringChecker const &', 'arg0')]) + return + +def register_Ns3StringValue_methods(root_module, cls): + ## string.h (module 'core'): ns3::StringValue::StringValue() [constructor] + cls.add_constructor([]) + ## string.h (module 'core'): ns3::StringValue::StringValue(ns3::StringValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::StringValue const &', 'arg0')]) + ## string.h (module 'core'): ns3::StringValue::StringValue(std::string const & value) [constructor] + cls.add_constructor([param('std::string const &', 'value')]) + ## string.h (module 'core'): ns3::Ptr ns3::StringValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## string.h (module 'core'): bool ns3::StringValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## string.h (module 'core'): std::string ns3::StringValue::Get() const [member function] + cls.add_method('Get', + 'std::string', + [], + is_const=True) + ## string.h (module 'core'): std::string ns3::StringValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## string.h (module 'core'): void ns3::StringValue::Set(std::string const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string const &', 'value')]) + return + def register_Ns3SupportedRates_methods(root_module, cls): cls.add_output_stream_operator() ## supported-rates.h (module 'wifi'): ns3::SupportedRates::SupportedRates() [constructor] @@ -17149,10 +17233,10 @@ def register_Ns3DsrDsrRouteCache_methods(root_module, cls): cls.add_method('IsNeighbor', 'bool', [param('ns3::Ipv4Address', 'addr')]) - ## dsr-rcache.h (module 'dsr'): ns3::Mac48Address ns3::dsr::DsrRouteCache::LookupMacAddress(ns3::Ipv4Address arg0) [member function] + ## dsr-rcache.h (module 'dsr'): ns3::Mac48Address ns3::dsr::DsrRouteCache::LookupMacAddress(ns3::Ipv4Address addr) [member function] cls.add_method('LookupMacAddress', 'ns3::Mac48Address', - [param('ns3::Ipv4Address', 'arg0')]) + [param('ns3::Ipv4Address', 'addr')]) ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::DsrRouteCache::LookupRoute(ns3::Ipv4Address id, ns3::dsr::DsrRouteCacheEntry & rt) [member function] cls.add_method('LookupRoute', 'bool', @@ -17169,10 +17253,10 @@ def register_Ns3DsrDsrRouteCache_methods(root_module, cls): cls.add_method('PrintVector', 'void', [param('std::vector< ns3::Ipv4Address > &', 'vec')]) - ## dsr-rcache.h (module 'dsr'): void ns3::dsr::DsrRouteCache::ProcessTxError(ns3::WifiMacHeader const & arg0) [member function] + ## dsr-rcache.h (module 'dsr'): void ns3::dsr::DsrRouteCache::ProcessTxError(ns3::WifiMacHeader const & hdr) [member function] cls.add_method('ProcessTxError', 'void', - [param('ns3::WifiMacHeader const &', 'arg0')]) + [param('ns3::WifiMacHeader const &', 'hdr')]) ## dsr-rcache.h (module 'dsr'): void ns3::dsr::DsrRouteCache::Purge() [member function] cls.add_method('Purge', 'void', @@ -17805,10 +17889,10 @@ def register_Ns3DsrDsrRreqTable_methods(root_module, cls): cls.add_method('PurgeNeighbor', 'void', []) - ## dsr-rreq-table.h (module 'dsr'): void ns3::dsr::DsrRreqTable::RemoveLeastExpire(std::map, std::allocator > > & rreqDstMap) [member function] + ## dsr-rreq-table.h (module 'dsr'): void ns3::dsr::DsrRreqTable::RemoveLeastExpire() [member function] cls.add_method('RemoveLeastExpire', 'void', - [param('std::map< ns3::Ipv4Address, ns3::dsr::RreqTableEntry > &', 'rreqDstMap')]) + []) ## dsr-rreq-table.h (module 'dsr'): void ns3::dsr::DsrRreqTable::RemoveRreqEntry(ns3::Ipv4Address dst) [member function] cls.add_method('RemoveRreqEntry', 'void',