From 462cea693f4140004b7a33dbcf9ceec7859f0f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sun, 29 Apr 2018 18:40:25 +0200 Subject: [PATCH] wifi: rescan bindings --- src/wifi/bindings/modulegen__gcc_ILP32.py | 95 ++++++++++++----------- src/wifi/bindings/modulegen__gcc_LP64.py | 95 ++++++++++++----------- 2 files changed, 96 insertions(+), 94 deletions(-) diff --git a/src/wifi/bindings/modulegen__gcc_ILP32.py b/src/wifi/bindings/modulegen__gcc_ILP32.py index a39e9b4e6..1f1cc2a03 100644 --- a/src/wifi/bindings/modulegen__gcc_ILP32.py +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py @@ -818,12 +818,13 @@ def register_types(module): module.add_container('ns3::SampleRate', 'std::vector< unsigned int >', container_type=u'vector') module.add_container('std::vector< double >', 'double', container_type=u'vector') module.add_container('ns3::Bands', 'ns3::BandInfo', container_type=u'vector') - module.add_container('std::vector< unsigned char >', 'unsigned char', container_type=u'vector') + module.add_container('std::vector< unsigned short >', 'short unsigned int', container_type=u'vector') module.add_container('std::map< ns3::Mac48Address, bool >', ('ns3::Mac48Address', 'bool'), container_type=u'map') module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') module.add_container('ns3::MpduAggregator::DeaggregatedMpdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') module.add_container('ns3::MsduAggregator::DeaggregatedMsdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') + module.add_container('std::vector< unsigned char >', 'unsigned char', container_type=u'vector') typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogTimePrinter') typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogTimePrinter*') typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogTimePrinter&') @@ -3484,7 +3485,7 @@ def register_Ns3McsGroup_methods(root_module, cls): ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::McsGroup(ns3::McsGroup const & arg0) [constructor] cls.add_constructor([param('ns3::McsGroup const &', 'arg0')]) ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::chWidth [variable] - cls.add_instance_attribute('chWidth', 'uint8_t', is_const=False) + cls.add_instance_attribute('chWidth', 'uint16_t', is_const=False) ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::isSupported [variable] cls.add_instance_attribute('isSupported', 'bool', is_const=False) ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::isVht [variable] @@ -4898,20 +4899,20 @@ def register_Ns3WifiMode_methods(root_module, cls): 'uint16_t', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint8_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint16_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] cls.add_method('GetDataRate', 'uint64_t', - [param('uint8_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], + [param('uint16_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], is_const=True) ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(ns3::WifiTxVector txVector) const [member function] cls.add_method('GetDataRate', 'uint64_t', [param('ns3::WifiTxVector', 'txVector')], is_const=True) - ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint8_t channelWidth) const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint16_t channelWidth) const [member function] cls.add_method('GetDataRate', 'uint64_t', - [param('uint8_t', 'channelWidth')], + [param('uint16_t', 'channelWidth')], is_const=True) ## wifi-mode.h (module 'wifi'): uint8_t ns3::WifiMode::GetMcsValue() const [member function] cls.add_method('GetMcsValue', @@ -4928,10 +4929,10 @@ def register_Ns3WifiMode_methods(root_module, cls): 'uint64_t', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate(uint8_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate(uint16_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] cls.add_method('GetPhyRate', 'uint64_t', - [param('uint8_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], + [param('uint16_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], is_const=True) ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate(ns3::WifiTxVector txVector) const [member function] cls.add_method('GetPhyRate', @@ -4948,10 +4949,10 @@ def register_Ns3WifiMode_methods(root_module, cls): 'std::string', [], is_const=True) - ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsAllowed(uint8_t channelWidth, uint8_t nss) const [member function] + ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsAllowed(uint16_t channelWidth, uint8_t nss) const [member function] cls.add_method('IsAllowed', 'bool', - [param('uint8_t', 'channelWidth'), param('uint8_t', 'nss')], + [param('uint16_t', 'channelWidth'), param('uint8_t', 'nss')], is_const=True) ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsHigherCodeRate(ns3::WifiMode mode) const [member function] cls.add_method('IsHigherCodeRate', @@ -5284,7 +5285,7 @@ def register_Ns3WifiRemoteStationState_methods(root_module, cls): ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_aggregation [variable] cls.add_instance_attribute('m_aggregation', 'bool', is_const=False) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_channelWidth [variable] - cls.add_instance_attribute('m_channelWidth', 'uint8_t', is_const=False) + cls.add_instance_attribute('m_channelWidth', 'uint16_t', is_const=False) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_greenfield [variable] cls.add_instance_attribute('m_greenfield', 'bool', is_const=False) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_guardInterval [variable] @@ -5351,11 +5352,11 @@ def register_Ns3WifiTxVector_methods(root_module, cls): cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')]) ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor] cls.add_constructor([]) - ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, ns3::WifiPreamble preamble, uint16_t guardInterval, uint8_t nTx, uint8_t nss, uint8_t ness, uint8_t channelWidth, bool aggregation, bool stbc) [constructor] - cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('ns3::WifiPreamble', 'preamble'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nTx'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('uint8_t', 'channelWidth'), param('bool', 'aggregation'), param('bool', 'stbc')]) - ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetChannelWidth() const [member function] + ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, ns3::WifiPreamble preamble, uint16_t guardInterval, uint8_t nTx, uint8_t nss, uint8_t ness, uint16_t channelWidth, bool aggregation, bool stbc) [constructor] + cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('ns3::WifiPreamble', 'preamble'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nTx'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('uint16_t', 'channelWidth'), param('bool', 'aggregation'), param('bool', 'stbc')]) + ## wifi-tx-vector.h (module 'wifi'): uint16_t ns3::WifiTxVector::GetChannelWidth() const [member function] cls.add_method('GetChannelWidth', - 'uint8_t', + 'uint16_t', [], is_const=True) ## wifi-tx-vector.h (module 'wifi'): uint16_t ns3::WifiTxVector::GetGuardInterval() const [member function] @@ -5412,10 +5413,10 @@ def register_Ns3WifiTxVector_methods(root_module, cls): cls.add_method('SetAggregation', 'void', [param('bool', 'aggregation')]) - ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetChannelWidth(uint8_t channelWidth) [member function] + ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetChannelWidth(uint16_t channelWidth) [member function] cls.add_method('SetChannelWidth', 'void', - [param('uint8_t', 'channelWidth')]) + [param('uint16_t', 'channelWidth')]) ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetGuardInterval(uint16_t guardInterval) [member function] cls.add_method('SetGuardInterval', 'void', @@ -8713,10 +8714,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): cls.add_constructor([param('ns3::WifiPhy const &', 'arg0')]) ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::WifiPhy() [constructor] cls.add_constructor([]) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::AddSupportedChannelWidth(uint8_t channelwidth) [member function] + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::AddSupportedChannelWidth(uint16_t channelwidth) [member function] cls.add_method('AddSupportedChannelWidth', 'void', - [param('uint8_t', 'channelwidth')]) + [param('uint16_t', 'channelwidth')]) ## wifi-phy.h (module 'wifi'): int64_t ns3::WifiPhy::AssignStreams(int64_t stream) [member function] cls.add_method('AssignStreams', 'int64_t', @@ -8745,10 +8746,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'void', [param('ns3::WifiPhyStandard', 'standard')], is_virtual=True) - ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::DefineChannelNumber(uint8_t channelNumber, ns3::WifiPhyStandard standard, uint16_t frequency, uint8_t channelWidth) [member function] + ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::DefineChannelNumber(uint8_t channelNumber, ns3::WifiPhyStandard standard, uint16_t frequency, uint16_t channelWidth) [member function] cls.add_method('DefineChannelNumber', 'bool', - [param('uint8_t', 'channelNumber'), param('ns3::WifiPhyStandard', 'standard'), param('uint16_t', 'frequency'), param('uint8_t', 'channelWidth')]) + [param('uint8_t', 'channelNumber'), param('ns3::WifiPhyStandard', 'standard'), param('uint16_t', 'frequency'), param('uint16_t', 'channelWidth')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::EndReceive(ns3::Ptr packet, ns3::WifiPreamble preamble, ns3::MpduType mpdutype, ns3::Ptr event) [member function] cls.add_method('EndReceive', 'void', @@ -8778,9 +8779,9 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::Time', [], is_const=True) - ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetChannelWidth() const [member function] + ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelWidth() const [member function] cls.add_method('GetChannelWidth', - 'uint8_t', + 'uint16_t', [], is_const=True) ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetDelayUntilIdle() [member function] @@ -9360,9 +9361,9 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'bool', [], is_const=True) - ## wifi-phy.h (module 'wifi'): std::vector > ns3::WifiPhy::GetSupportedChannelWidthSet() const [member function] + ## wifi-phy.h (module 'wifi'): std::vector > ns3::WifiPhy::GetSupportedChannelWidthSet() const [member function] cls.add_method('GetSupportedChannelWidthSet', - 'std::vector< unsigned char >', + 'std::vector< unsigned short >', [], is_const=True) ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxGain() const [member function] @@ -9546,10 +9547,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'void', [param('uint8_t', 'id')], is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelWidth(uint8_t channelwidth) [member function] + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelWidth(uint16_t channelwidth) [member function] cls.add_method('SetChannelWidth', 'void', - [param('uint8_t', 'channelwidth')], + [param('uint16_t', 'channelwidth')], is_virtual=True) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetDevice(ns3::Ptr const device) [member function] cls.add_method('SetDevice', @@ -9893,9 +9894,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): cls.add_method('GetBlockAckTxVector', 'ns3::WifiTxVector', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')]) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetChannelWidthSupported(ns3::Mac48Address address) const [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::GetChannelWidthSupported(ns3::Mac48Address address) const [member function] cls.add_method('GetChannelWidthSupported', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address')], is_const=True) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsToSelfTxVector(ns3::WifiMacHeader const * header, ns3::Ptr packet) [member function] @@ -10265,15 +10266,15 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'bool', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetChannelWidth(ns3::WifiRemoteStation const * station) const [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::GetChannelWidth(ns3::WifiRemoteStation const * station) const [member function] cls.add_method('GetChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') - ## wifi-remote-station-manager.h (module 'wifi'): static uint8_t ns3::WifiRemoteStationManager::GetChannelWidthForTransmission(ns3::WifiMode mode, uint8_t maxSupportedChannelWidth) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): static uint16_t ns3::WifiRemoteStationManager::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t maxSupportedChannelWidth) [member function] cls.add_method('GetChannelWidthForTransmission', - 'uint8_t', - [param('ns3::WifiMode', 'mode'), param('uint8_t', 'maxSupportedChannelWidth')], + 'uint16_t', + [param('ns3::WifiMode', 'mode'), param('uint16_t', 'maxSupportedChannelWidth')], is_static=True, visibility='protected') ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfield(ns3::WifiRemoteStation const * station) const [member function] cls.add_method('GetGreenfield', @@ -10370,9 +10371,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'ns3::WifiRemoteStation *', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] cls.add_method('DoGetAckTxChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], visibility='private', is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function] @@ -10395,9 +10396,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint8_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], visibility='private', is_virtual=True) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetBlockAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] cls.add_method('DoGetBlockAckTxChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], visibility='private', is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetBlockAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function] @@ -10420,9 +10421,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint8_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], visibility='private', is_virtual=True) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetCtsTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] cls.add_method('DoGetCtsTxChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], visibility='private', is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetCtsTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] @@ -17811,10 +17812,10 @@ def register_Ns3SpectrumWifiPhy_methods(root_module, cls): 'ns3::Ptr< ns3::Channel >', [], is_const=True, is_virtual=True) - ## spectrum-wifi-phy.h (module 'wifi'): uint8_t ns3::SpectrumWifiPhy::GetGuardBandwidth(uint8_t currentChannelWidth) const [member function] + ## spectrum-wifi-phy.h (module 'wifi'): uint16_t ns3::SpectrumWifiPhy::GetGuardBandwidth(uint16_t currentChannelWidth) const [member function] cls.add_method('GetGuardBandwidth', - 'uint8_t', - [param('uint8_t', 'currentChannelWidth')], + 'uint16_t', + [param('uint16_t', 'currentChannelWidth')], is_const=True) ## spectrum-wifi-phy.h (module 'wifi'): std::vector > ns3::SpectrumWifiPhy::GetOperationalChannelList() const [member function] cls.add_method('GetOperationalChannelList', @@ -17849,10 +17850,10 @@ def register_Ns3SpectrumWifiPhy_methods(root_module, cls): 'void', [param('uint8_t', 'id')], is_virtual=True) - ## spectrum-wifi-phy.h (module 'wifi'): void ns3::SpectrumWifiPhy::SetChannelWidth(uint8_t channelwidth) [member function] + ## spectrum-wifi-phy.h (module 'wifi'): void ns3::SpectrumWifiPhy::SetChannelWidth(uint16_t channelwidth) [member function] cls.add_method('SetChannelWidth', 'void', - [param('uint8_t', 'channelwidth')], + [param('uint16_t', 'channelwidth')], is_virtual=True) ## spectrum-wifi-phy.h (module 'wifi'): void ns3::SpectrumWifiPhy::SetFrequency(uint16_t freq) [member function] cls.add_method('SetFrequency', @@ -19101,9 +19102,9 @@ def register_Ns3ApWifiMac_methods(root_module, cls): 'bool', [], is_const=True) - ## ap-wifi-mac.h (module 'wifi'): uint8_t ns3::ApWifiMac::GetVhtOperationalChannelWidth() const [member function] + ## ap-wifi-mac.h (module 'wifi'): uint16_t ns3::ApWifiMac::GetVhtOperationalChannelWidth() const [member function] cls.add_method('GetVhtOperationalChannelWidth', - 'uint8_t', + 'uint16_t', [], is_const=True) ## ap-wifi-mac.h (module 'wifi'): int64_t ns3::ApWifiMac::AssignStreams(int64_t stream) [member function] diff --git a/src/wifi/bindings/modulegen__gcc_LP64.py b/src/wifi/bindings/modulegen__gcc_LP64.py index 601647cbf..41760360f 100644 --- a/src/wifi/bindings/modulegen__gcc_LP64.py +++ b/src/wifi/bindings/modulegen__gcc_LP64.py @@ -818,12 +818,13 @@ def register_types(module): module.add_container('ns3::SampleRate', 'std::vector< unsigned int >', container_type=u'vector') module.add_container('std::vector< double >', 'double', container_type=u'vector') module.add_container('ns3::Bands', 'ns3::BandInfo', container_type=u'vector') - module.add_container('std::vector< unsigned char >', 'unsigned char', container_type=u'vector') + module.add_container('std::vector< unsigned short >', 'short unsigned int', container_type=u'vector') module.add_container('std::map< ns3::Mac48Address, bool >', ('ns3::Mac48Address', 'bool'), container_type=u'map') module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') module.add_container('ns3::MpduAggregator::DeaggregatedMpdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader >', container_type=u'list') module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') module.add_container('ns3::MsduAggregator::DeaggregatedMsdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') + module.add_container('std::vector< unsigned char >', 'unsigned char', container_type=u'vector') typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogTimePrinter') typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogTimePrinter*') typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogTimePrinter&') @@ -3484,7 +3485,7 @@ def register_Ns3McsGroup_methods(root_module, cls): ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::McsGroup(ns3::McsGroup const & arg0) [constructor] cls.add_constructor([param('ns3::McsGroup const &', 'arg0')]) ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::chWidth [variable] - cls.add_instance_attribute('chWidth', 'uint8_t', is_const=False) + cls.add_instance_attribute('chWidth', 'uint16_t', is_const=False) ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::isSupported [variable] cls.add_instance_attribute('isSupported', 'bool', is_const=False) ## minstrel-ht-wifi-manager.h (module 'wifi'): ns3::McsGroup::isVht [variable] @@ -4898,20 +4899,20 @@ def register_Ns3WifiMode_methods(root_module, cls): 'uint16_t', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint8_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint16_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] cls.add_method('GetDataRate', 'uint64_t', - [param('uint8_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], + [param('uint16_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], is_const=True) ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(ns3::WifiTxVector txVector) const [member function] cls.add_method('GetDataRate', 'uint64_t', [param('ns3::WifiTxVector', 'txVector')], is_const=True) - ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint8_t channelWidth) const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetDataRate(uint16_t channelWidth) const [member function] cls.add_method('GetDataRate', 'uint64_t', - [param('uint8_t', 'channelWidth')], + [param('uint16_t', 'channelWidth')], is_const=True) ## wifi-mode.h (module 'wifi'): uint8_t ns3::WifiMode::GetMcsValue() const [member function] cls.add_method('GetMcsValue', @@ -4928,10 +4929,10 @@ def register_Ns3WifiMode_methods(root_module, cls): 'uint64_t', [], is_const=True) - ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate(uint8_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] + ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate(uint16_t channelWidth, uint16_t guardInterval, uint8_t nss) const [member function] cls.add_method('GetPhyRate', 'uint64_t', - [param('uint8_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], + [param('uint16_t', 'channelWidth'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nss')], is_const=True) ## wifi-mode.h (module 'wifi'): uint64_t ns3::WifiMode::GetPhyRate(ns3::WifiTxVector txVector) const [member function] cls.add_method('GetPhyRate', @@ -4948,10 +4949,10 @@ def register_Ns3WifiMode_methods(root_module, cls): 'std::string', [], is_const=True) - ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsAllowed(uint8_t channelWidth, uint8_t nss) const [member function] + ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsAllowed(uint16_t channelWidth, uint8_t nss) const [member function] cls.add_method('IsAllowed', 'bool', - [param('uint8_t', 'channelWidth'), param('uint8_t', 'nss')], + [param('uint16_t', 'channelWidth'), param('uint8_t', 'nss')], is_const=True) ## wifi-mode.h (module 'wifi'): bool ns3::WifiMode::IsHigherCodeRate(ns3::WifiMode mode) const [member function] cls.add_method('IsHigherCodeRate', @@ -5284,7 +5285,7 @@ def register_Ns3WifiRemoteStationState_methods(root_module, cls): ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_aggregation [variable] cls.add_instance_attribute('m_aggregation', 'bool', is_const=False) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_channelWidth [variable] - cls.add_instance_attribute('m_channelWidth', 'uint8_t', is_const=False) + cls.add_instance_attribute('m_channelWidth', 'uint16_t', is_const=False) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_greenfield [variable] cls.add_instance_attribute('m_greenfield', 'bool', is_const=False) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiRemoteStationState::m_guardInterval [variable] @@ -5351,11 +5352,11 @@ def register_Ns3WifiTxVector_methods(root_module, cls): cls.add_constructor([param('ns3::WifiTxVector const &', 'arg0')]) ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector() [constructor] cls.add_constructor([]) - ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, ns3::WifiPreamble preamble, uint16_t guardInterval, uint8_t nTx, uint8_t nss, uint8_t ness, uint8_t channelWidth, bool aggregation, bool stbc) [constructor] - cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('ns3::WifiPreamble', 'preamble'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nTx'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('uint8_t', 'channelWidth'), param('bool', 'aggregation'), param('bool', 'stbc')]) - ## wifi-tx-vector.h (module 'wifi'): uint8_t ns3::WifiTxVector::GetChannelWidth() const [member function] + ## wifi-tx-vector.h (module 'wifi'): ns3::WifiTxVector::WifiTxVector(ns3::WifiMode mode, uint8_t powerLevel, ns3::WifiPreamble preamble, uint16_t guardInterval, uint8_t nTx, uint8_t nss, uint8_t ness, uint16_t channelWidth, bool aggregation, bool stbc) [constructor] + cls.add_constructor([param('ns3::WifiMode', 'mode'), param('uint8_t', 'powerLevel'), param('ns3::WifiPreamble', 'preamble'), param('uint16_t', 'guardInterval'), param('uint8_t', 'nTx'), param('uint8_t', 'nss'), param('uint8_t', 'ness'), param('uint16_t', 'channelWidth'), param('bool', 'aggregation'), param('bool', 'stbc')]) + ## wifi-tx-vector.h (module 'wifi'): uint16_t ns3::WifiTxVector::GetChannelWidth() const [member function] cls.add_method('GetChannelWidth', - 'uint8_t', + 'uint16_t', [], is_const=True) ## wifi-tx-vector.h (module 'wifi'): uint16_t ns3::WifiTxVector::GetGuardInterval() const [member function] @@ -5412,10 +5413,10 @@ def register_Ns3WifiTxVector_methods(root_module, cls): cls.add_method('SetAggregation', 'void', [param('bool', 'aggregation')]) - ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetChannelWidth(uint8_t channelWidth) [member function] + ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetChannelWidth(uint16_t channelWidth) [member function] cls.add_method('SetChannelWidth', 'void', - [param('uint8_t', 'channelWidth')]) + [param('uint16_t', 'channelWidth')]) ## wifi-tx-vector.h (module 'wifi'): void ns3::WifiTxVector::SetGuardInterval(uint16_t guardInterval) [member function] cls.add_method('SetGuardInterval', 'void', @@ -8713,10 +8714,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): cls.add_constructor([param('ns3::WifiPhy const &', 'arg0')]) ## wifi-phy.h (module 'wifi'): ns3::WifiPhy::WifiPhy() [constructor] cls.add_constructor([]) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::AddSupportedChannelWidth(uint8_t channelwidth) [member function] + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::AddSupportedChannelWidth(uint16_t channelwidth) [member function] cls.add_method('AddSupportedChannelWidth', 'void', - [param('uint8_t', 'channelwidth')]) + [param('uint16_t', 'channelwidth')]) ## wifi-phy.h (module 'wifi'): int64_t ns3::WifiPhy::AssignStreams(int64_t stream) [member function] cls.add_method('AssignStreams', 'int64_t', @@ -8745,10 +8746,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'void', [param('ns3::WifiPhyStandard', 'standard')], is_virtual=True) - ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::DefineChannelNumber(uint8_t channelNumber, ns3::WifiPhyStandard standard, uint16_t frequency, uint8_t channelWidth) [member function] + ## wifi-phy.h (module 'wifi'): bool ns3::WifiPhy::DefineChannelNumber(uint8_t channelNumber, ns3::WifiPhyStandard standard, uint16_t frequency, uint16_t channelWidth) [member function] cls.add_method('DefineChannelNumber', 'bool', - [param('uint8_t', 'channelNumber'), param('ns3::WifiPhyStandard', 'standard'), param('uint16_t', 'frequency'), param('uint8_t', 'channelWidth')]) + [param('uint8_t', 'channelNumber'), param('ns3::WifiPhyStandard', 'standard'), param('uint16_t', 'frequency'), param('uint16_t', 'channelWidth')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::EndReceive(ns3::Ptr packet, ns3::WifiPreamble preamble, ns3::MpduType mpdutype, ns3::Ptr event) [member function] cls.add_method('EndReceive', 'void', @@ -8778,9 +8779,9 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::Time', [], is_const=True) - ## wifi-phy.h (module 'wifi'): uint8_t ns3::WifiPhy::GetChannelWidth() const [member function] + ## wifi-phy.h (module 'wifi'): uint16_t ns3::WifiPhy::GetChannelWidth() const [member function] cls.add_method('GetChannelWidth', - 'uint8_t', + 'uint16_t', [], is_const=True) ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetDelayUntilIdle() [member function] @@ -9360,9 +9361,9 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'bool', [], is_const=True) - ## wifi-phy.h (module 'wifi'): std::vector > ns3::WifiPhy::GetSupportedChannelWidthSet() const [member function] + ## wifi-phy.h (module 'wifi'): std::vector > ns3::WifiPhy::GetSupportedChannelWidthSet() const [member function] cls.add_method('GetSupportedChannelWidthSet', - 'std::vector< unsigned char >', + 'std::vector< unsigned short >', [], is_const=True) ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::GetTxGain() const [member function] @@ -9546,10 +9547,10 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'void', [param('uint8_t', 'id')], is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelWidth(uint8_t channelwidth) [member function] + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetChannelWidth(uint16_t channelwidth) [member function] cls.add_method('SetChannelWidth', 'void', - [param('uint8_t', 'channelwidth')], + [param('uint16_t', 'channelwidth')], is_virtual=True) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::SetDevice(ns3::Ptr const device) [member function] cls.add_method('SetDevice', @@ -9893,9 +9894,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): cls.add_method('GetBlockAckTxVector', 'ns3::WifiTxVector', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'dataMode')]) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetChannelWidthSupported(ns3::Mac48Address address) const [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::GetChannelWidthSupported(ns3::Mac48Address address) const [member function] cls.add_method('GetChannelWidthSupported', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address')], is_const=True) ## wifi-remote-station-manager.h (module 'wifi'): ns3::WifiTxVector ns3::WifiRemoteStationManager::GetCtsToSelfTxVector(ns3::WifiMacHeader const * header, ns3::Ptr packet) [member function] @@ -10265,15 +10266,15 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'bool', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::GetChannelWidth(ns3::WifiRemoteStation const * station) const [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::GetChannelWidth(ns3::WifiRemoteStation const * station) const [member function] cls.add_method('GetChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::WifiRemoteStation const *', 'station')], is_const=True, visibility='protected') - ## wifi-remote-station-manager.h (module 'wifi'): static uint8_t ns3::WifiRemoteStationManager::GetChannelWidthForTransmission(ns3::WifiMode mode, uint8_t maxSupportedChannelWidth) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): static uint16_t ns3::WifiRemoteStationManager::GetChannelWidthForTransmission(ns3::WifiMode mode, uint16_t maxSupportedChannelWidth) [member function] cls.add_method('GetChannelWidthForTransmission', - 'uint8_t', - [param('ns3::WifiMode', 'mode'), param('uint8_t', 'maxSupportedChannelWidth')], + 'uint16_t', + [param('ns3::WifiMode', 'mode'), param('uint16_t', 'maxSupportedChannelWidth')], is_static=True, visibility='protected') ## wifi-remote-station-manager.h (module 'wifi'): bool ns3::WifiRemoteStationManager::GetGreenfield(ns3::WifiRemoteStation const * station) const [member function] cls.add_method('GetGreenfield', @@ -10370,9 +10371,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'ns3::WifiRemoteStation *', [], is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] cls.add_method('DoGetAckTxChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], visibility='private', is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ackMode) [member function] @@ -10395,9 +10396,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint8_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ackMode')], visibility='private', is_virtual=True) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetBlockAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetBlockAckTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] cls.add_method('DoGetBlockAckTxChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], visibility='private', is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetBlockAckTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode blockAckMode) [member function] @@ -10420,9 +10421,9 @@ def register_Ns3WifiRemoteStationManager_methods(root_module, cls): 'uint8_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'blockAckMode')], visibility='private', is_virtual=True) - ## wifi-remote-station-manager.h (module 'wifi'): uint8_t ns3::WifiRemoteStationManager::DoGetCtsTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] + ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetCtsTxChannelWidth(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] cls.add_method('DoGetCtsTxChannelWidth', - 'uint8_t', + 'uint16_t', [param('ns3::Mac48Address', 'address'), param('ns3::WifiMode', 'ctsMode')], visibility='private', is_virtual=True) ## wifi-remote-station-manager.h (module 'wifi'): uint16_t ns3::WifiRemoteStationManager::DoGetCtsTxGuardInterval(ns3::Mac48Address address, ns3::WifiMode ctsMode) [member function] @@ -17811,10 +17812,10 @@ def register_Ns3SpectrumWifiPhy_methods(root_module, cls): 'ns3::Ptr< ns3::Channel >', [], is_const=True, is_virtual=True) - ## spectrum-wifi-phy.h (module 'wifi'): uint8_t ns3::SpectrumWifiPhy::GetGuardBandwidth(uint8_t currentChannelWidth) const [member function] + ## spectrum-wifi-phy.h (module 'wifi'): uint16_t ns3::SpectrumWifiPhy::GetGuardBandwidth(uint16_t currentChannelWidth) const [member function] cls.add_method('GetGuardBandwidth', - 'uint8_t', - [param('uint8_t', 'currentChannelWidth')], + 'uint16_t', + [param('uint16_t', 'currentChannelWidth')], is_const=True) ## spectrum-wifi-phy.h (module 'wifi'): std::vector > ns3::SpectrumWifiPhy::GetOperationalChannelList() const [member function] cls.add_method('GetOperationalChannelList', @@ -17849,10 +17850,10 @@ def register_Ns3SpectrumWifiPhy_methods(root_module, cls): 'void', [param('uint8_t', 'id')], is_virtual=True) - ## spectrum-wifi-phy.h (module 'wifi'): void ns3::SpectrumWifiPhy::SetChannelWidth(uint8_t channelwidth) [member function] + ## spectrum-wifi-phy.h (module 'wifi'): void ns3::SpectrumWifiPhy::SetChannelWidth(uint16_t channelwidth) [member function] cls.add_method('SetChannelWidth', 'void', - [param('uint8_t', 'channelwidth')], + [param('uint16_t', 'channelwidth')], is_virtual=True) ## spectrum-wifi-phy.h (module 'wifi'): void ns3::SpectrumWifiPhy::SetFrequency(uint16_t freq) [member function] cls.add_method('SetFrequency', @@ -19101,9 +19102,9 @@ def register_Ns3ApWifiMac_methods(root_module, cls): 'bool', [], is_const=True) - ## ap-wifi-mac.h (module 'wifi'): uint8_t ns3::ApWifiMac::GetVhtOperationalChannelWidth() const [member function] + ## ap-wifi-mac.h (module 'wifi'): uint16_t ns3::ApWifiMac::GetVhtOperationalChannelWidth() const [member function] cls.add_method('GetVhtOperationalChannelWidth', - 'uint8_t', + 'uint16_t', [], is_const=True) ## ap-wifi-mac.h (module 'wifi'): int64_t ns3::ApWifiMac::AssignStreams(int64_t stream) [member function]