ns-3.24: comparison src/wave/bindings/modulegen__gcc

equal deleted inserted replaced

-:52c7ce21a0ca
+:a1f6f647d516
 module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT', 'WIFI_PREAMBLE_HT_MF', 'WIFI_PREAMBLE_HT_GF', 'WIFI_PREAMBLE_NONE'], import_from_module='ns.wifi')
 ## wifi-mode.h (module 'wifi'): 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'], import_from_module='ns.wifi')
 ## wifi-phy-standard.h (module 'wifi'): 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_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
+## wifi-mode.h (module 'wifi'): 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', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
 ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
 module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'], import_from_module='ns.wifi')
 ## channel-scheduler.h (module 'wave'): ns3::ChannelAccess [enumeration]
 module.add_enum('ChannelAccess', ['ContinuousAccess', 'AlternatingAccess', 'ExtendedAccess', 'DefaultCchAccess', 'NoAccess'])
 ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration]
 module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi')
 ## ctrl-headers.h (module 'wifi'): ns3::BlockAckType [enumeration]
 module.add_enum('BlockAckType', ['BASIC_BLOCK_ACK', 'COMPRESSED_BLOCK_ACK', 'MULTI_TID_BLOCK_ACK'], import_from_module='ns.wifi')
 ## vsa-manager.h (module 'wave'): ns3::VsaTransmitInterval [enumeration]
 module.add_enum('VsaTransmitInterval', ['VSA_TRANSMIT_IN_CCHI', 'VSA_TRANSMIT_IN_SCHI', 'VSA_TRANSMIT_IN_BOTHI'])
-## wifi-mode.h (module 'wifi'): 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', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
 ## address.h (module 'network'): ns3::Address [class]
 module.add_class('Address', import_from_module='ns.network')
 ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration]
 module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network')
 ## application-container.h (module 'network'): ns3::ApplicationContainer [class]
 module.add_class('Ipv6Prefix', import_from_module='ns.network')
 ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
 module.add_class('Mac48Address', import_from_module='ns.network')
 ## mac48-address.h (module 'network'): ns3::Mac48Address [class]
 root_module['ns3::Mac48Address'].implicitly_converts_to(root_module['ns3::Address'])
-## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener [class]
+## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener [class]
-module.add_class('MacLowBlockAckEventListener', allow_subclassing=True, import_from_module='ns.wifi')
+module.add_class('MacLowAggregationCapableTransmissionListener', allow_subclassing=True, import_from_module='ns.wifi')
 ## mac-low.h (module 'wifi'): ns3::MacLowDcfListener [class]
 module.add_class('MacLowDcfListener', allow_subclassing=True, import_from_module='ns.wifi')
 ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionListener [class]
 module.add_class('MacLowTransmissionListener', allow_subclassing=True, import_from_module='ns.wifi')
 ## mac-low.h (module 'wifi'): ns3::MacLowTransmissionParameters [class]
 module.add_class('ZetaRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
 ## random-variable-stream.h (module 'core'): ns3::ZipfRandomVariable [class]
 module.add_class('ZipfRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])
 ## ampdu-subframe-header.h (module 'wifi'): ns3::AmpduSubframeHeader [class]
 module.add_class('AmpduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
+## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader [class]
+module.add_class('AmsduSubframeHeader', import_from_module='ns.wifi', parent=root_module['ns3::Header'])
 ## application.h (module 'network'): ns3::Application [class]
 module.add_class('Application', import_from_module='ns.network', parent=root_module['ns3::Object'])
 ## attribute.h (module 'core'): ns3::AttributeAccessor [class]
 module.add_class('AttributeAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter<ns3::AttributeAccessor> >'])
 ## attribute.h (module 'core'): ns3::AttributeChecker [class]
 module.add_class('MgtBeaconHeader', import_from_module='ns.wifi', parent=root_module['ns3::MgtProbeResponseHeader'])
 ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class]
 module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object'])
 ## mpdu-aggregator.h (module 'wifi'): ns3::MpduAggregator [class]
 module.add_class('MpduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
+## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator [class]
+module.add_class('MsduAggregator', import_from_module='ns.wifi', parent=root_module['ns3::Object'])
 ## net-device.h (module 'network'): ns3::NetDevice [class]
 module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object'])
 ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration]
 module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network')
 ## nix-vector.h (module 'network'): ns3::NixVector [class]
 module.add_container('std::vector< unsigned int >', 'unsigned int', container_type=u'vector')
 module.add_container('ns3::WifiModeList', 'ns3::WifiMode', container_type=u'vector')
 module.add_container('ns3::WifiMcsList', 'unsigned char', container_type=u'vector')
 module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), 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('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('std::map< unsigned int, ns3::Ptr< ns3::OcbWifiMac > >', ('unsigned int', 'ns3::Ptr< ns3::OcbWifiMac >'), container_type=u'map')
 module.add_container('std::vector< ns3::Ptr< ns3::WifiPhy > >', 'ns3::Ptr< ns3::WifiPhy >', container_type=u'vector')
 typehandlers.add_type_alias(u'std::vector< unsigned char, std::allocator< unsigned char > >', u'ns3::WifiMcsList')
 typehandlers.add_type_alias(u'std::vector< unsigned char, std::allocator< unsigned char > >*', u'ns3::WifiMcsList*')
 typehandlers.add_type_alias(u'std::vector< unsigned char, std::allocator< unsigned char > >&', u'ns3::WifiMcsList&')
 register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
 register_Ns3Ipv6InterfaceAddress_methods(root_module, root_module['ns3::Ipv6InterfaceAddress'])
 register_Ns3Ipv6InterfaceContainer_methods(root_module, root_module['ns3::Ipv6InterfaceContainer'])
 register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
 register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
-register_Ns3MacLowBlockAckEventListener_methods(root_module, root_module['ns3::MacLowBlockAckEventListener'])
+register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, root_module['ns3::MacLowAggregationCapableTransmissionListener'])
 register_Ns3MacLowDcfListener_methods(root_module, root_module['ns3::MacLowDcfListener'])
 register_Ns3MacLowTransmissionListener_methods(root_module, root_module['ns3::MacLowTransmissionListener'])
 register_Ns3MacLowTransmissionParameters_methods(root_module, root_module['ns3::MacLowTransmissionParameters'])
 register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
 register_Ns3NodeContainer_methods(root_module, root_module['ns3::NodeContainer'])
 register_Ns3WifiRemoteStationManager_methods(root_module, root_module['ns3::WifiRemoteStationManager'])
 register_Ns3YansWavePhyHelper_methods(root_module, root_module['ns3::YansWavePhyHelper'])
 register_Ns3ZetaRandomVariable_methods(root_module, root_module['ns3::ZetaRandomVariable'])
 register_Ns3ZipfRandomVariable_methods(root_module, root_module['ns3::ZipfRandomVariable'])
 register_Ns3AmpduSubframeHeader_methods(root_module, root_module['ns3::AmpduSubframeHeader'])
+register_Ns3AmsduSubframeHeader_methods(root_module, root_module['ns3::AmsduSubframeHeader'])
 register_Ns3Application_methods(root_module, root_module['ns3::Application'])
 register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
 register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
 register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue'])
 register_Ns3BsmApplication_methods(root_module, root_module['ns3::BsmApplication'])
 register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue'])
 register_Ns3MacLow_methods(root_module, root_module['ns3::MacLow'])
 register_Ns3MgtBeaconHeader_methods(root_module, root_module['ns3::MgtBeaconHeader'])
 register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
 register_Ns3MpduAggregator_methods(root_module, root_module['ns3::MpduAggregator'])
+register_Ns3MsduAggregator_methods(root_module, root_module['ns3::MsduAggregator'])
 register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
 register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector'])
 register_Ns3Node_methods(root_module, root_module['ns3::Node'])
 register_Ns3NormalRandomVariable_methods(root_module, root_module['ns3::NormalRandomVariable'])
 register_Ns3NqosWaveMacHelper_methods(root_module, root_module['ns3::NqosWaveMacHelper'])
 'bool',
 [param('ns3::Address const &', 'address')],
 is_static=True)
 return
-def register_Ns3MacLowBlockAckEventListener_methods(root_module, cls):
+def register_Ns3MacLowAggregationCapableTransmissionListener_methods(root_module, cls):
-## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener(ns3::MacLowBlockAckEventListener const & arg0) [copy constructor]
+## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener(ns3::MacLowAggregationCapableTransmissionListener const & arg0) [copy constructor]
-cls.add_constructor([param('ns3::MacLowBlockAckEventListener const &', 'arg0')])
+cls.add_constructor([param('ns3::MacLowAggregationCapableTransmissionListener const &', 'arg0')])
-## mac-low.h (module 'wifi'): ns3::MacLowBlockAckEventListener::MacLowBlockAckEventListener() [constructor]
+## mac-low.h (module 'wifi'): ns3::MacLowAggregationCapableTransmissionListener::MacLowAggregationCapableTransmissionListener() [constructor]
 cls.add_constructor([])
-## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
+## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::BlockAckInactivityTimeout(ns3::Mac48Address originator, uint8_t tid) [member function]
 cls.add_method('BlockAckInactivityTimeout',
 'void',
 [param('ns3::Mac48Address', 'originator'), param('uint8_t', 'tid')],
 is_pure_virtual=True, is_virtual=True)
-## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
+## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteMpduTx(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader hdr, ns3::Time tstamp) [member function]
 cls.add_method('CompleteMpduTx',
 'void',
 [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader', 'hdr'), param('ns3::Time', 'tstamp')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
+## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::CompleteTransfer(ns3::Mac48Address address, uint8_t tid) [member function]
 cls.add_method('CompleteTransfer',
 'void',
 [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): bool ns3::MacLowBlockAckEventListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
+## mac-low.h (module 'wifi'): bool ns3::MacLowAggregationCapableTransmissionListener::GetBlockAckAgreementExists(ns3::Mac48Address address, uint8_t tid) [member function]
 cls.add_method('GetBlockAckAgreementExists',
 'bool',
 [param('ns3::Mac48Address', 'address'), param('uint8_t', 'tid')],
 is_pure_virtual=True, is_virtual=True)
-## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
+## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetDestAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+cls.add_method('GetDestAddressForAggregation',
+'ns3::Mac48Address',
+[param('ns3::WifiMacHeader const &', 'hdr')],
+is_virtual=True)
+## mac-low.h (module 'wifi'): ns3::Ptr<ns3::MsduAggregator> ns3::MacLowAggregationCapableTransmissionListener::GetMsduAggregator() const [member function]
+cls.add_method('GetMsduAggregator',
+'ns3::Ptr< ns3::MsduAggregator >',
+[],
+is_const=True, is_virtual=True)
+## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNOutstandingPackets(ns3::Mac48Address recipient, uint8_t tid) [member function]
 cls.add_method('GetNOutstandingPackets',
 'uint32_t',
 [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): uint32_t ns3::MacLowBlockAckEventListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
+## mac-low.h (module 'wifi'): uint32_t ns3::MacLowAggregationCapableTransmissionListener::GetNRetryNeededPackets(ns3::Mac48Address recipient, uint8_t tid) const [member function]
 cls.add_method('GetNRetryNeededPackets',
 'uint32_t',
 [param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid')],
 is_const=True, is_virtual=True)
-## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::GetNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
 cls.add_method('GetNextSequenceNumberfor',
 'uint16_t',
 [param('ns3::WifiMacHeader *', 'hdr')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowBlockAckEventListener::GetQueue() [member function]
+## mac-low.h (module 'wifi'): ns3::Ptr<ns3::WifiMacQueue> ns3::MacLowAggregationCapableTransmissionListener::GetQueue() [member function]
 cls.add_method('GetQueue',
 'ns3::Ptr< ns3::WifiMacQueue >',
 [],
 is_pure_virtual=True, is_virtual=True)
-## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowBlockAckEventListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
+## mac-low.h (module 'wifi'): ns3::Mac48Address ns3::MacLowAggregationCapableTransmissionListener::GetSrcAddressForAggregation(ns3::WifiMacHeader const & hdr) [member function]
+cls.add_method('GetSrcAddressForAggregation',
+'ns3::Mac48Address',
+[param('ns3::WifiMacHeader const &', 'hdr')],
+is_virtual=True)
+## mac-low.h (module 'wifi'): ns3::Ptr<ns3::Packet const> ns3::MacLowAggregationCapableTransmissionListener::PeekNextPacketInBaQueue(ns3::WifiMacHeader & header, ns3::Mac48Address recipient, uint8_t tid, ns3::Time * timestamp) [member function]
 cls.add_method('PeekNextPacketInBaQueue',
 'ns3::Ptr< ns3::Packet const >',
 [param('ns3::WifiMacHeader &', 'header'), param('ns3::Mac48Address', 'recipient'), param('uint8_t', 'tid'), param('ns3::Time *', 'timestamp')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): uint16_t ns3::MacLowBlockAckEventListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
+## mac-low.h (module 'wifi'): uint16_t ns3::MacLowAggregationCapableTransmissionListener::PeekNextSequenceNumberfor(ns3::WifiMacHeader * hdr) [member function]
 cls.add_method('PeekNextSequenceNumberfor',
 'uint16_t',
 [param('ns3::WifiMacHeader *', 'hdr')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
+## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::RemoveFromBaQueue(uint8_t tid, ns3::Mac48Address recipient, uint16_t seqnumber) [member function]
 cls.add_method('RemoveFromBaQueue',
 'void',
 [param('uint8_t', 'tid'), param('ns3::Mac48Address', 'recipient'), param('uint16_t', 'seqnumber')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): void ns3::MacLowBlockAckEventListener::SetAmpdu(bool ampdu) [member function]
+## mac-low.h (module 'wifi'): void ns3::MacLowAggregationCapableTransmissionListener::SetAmpdu(bool ampdu) [member function]
 cls.add_method('SetAmpdu',
 'void',
 [param('bool', 'ampdu')],
 is_virtual=True)
 return
 ## wifi-phy.h (module 'wifi'): int64_t ns3::WifiPhy::AssignStreams(int64_t stream) [member function]
 cls.add_method('AssignStreams',
 'int64_t',
 [param('int64_t', 'stream')],
 is_pure_virtual=True, is_virtual=True)
+## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculatePlcpDuration(ns3::WifiTxVector txvector, ns3::WifiPreamble preamble) [member function]
+cls.add_method('CalculatePlcpDuration',
+'ns3::Time',
+[param('ns3::WifiTxVector', 'txvector'), param('ns3::WifiPreamble', 'preamble')])
 ## wifi-phy.h (module 'wifi'): double ns3::WifiPhy::CalculateSnr(ns3::WifiMode txMode, double ber) const [member function]
 cls.add_method('CalculateSnr',
 'double',
 [param('ns3::WifiMode', 'txMode'), param('double', 'ber')],
 is_pure_virtual=True, is_const=True, is_virtual=True)
 ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
 cls.add_method('GetPlcpHeaderMode',
 'ns3::WifiMode',
 [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')],
 is_static=True)
-## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
+## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtSigHeaderDuration(ns3::WifiPreamble preamble) [member function]
 cls.add_method('GetPlcpHtSigHeaderDuration',
 'ns3::Time',
-[param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')],
+[param('ns3::WifiPreamble', 'preamble')],
 is_static=True)
 ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::GetPlcpHtTrainingSymbolDuration(ns3::WifiPreamble preamble, ns3::WifiTxVector txvector) [member function]
 cls.add_method('GetPlcpHtTrainingSymbolDuration',
 'ns3::Time',
 [param('ns3::WifiPreamble', 'preamble'), param('ns3::WifiTxVector', 'txvector')],
 [param('uint16_t', 'length')])
 ## ampdu-subframe-header.h (module 'wifi'): void ns3::AmpduSubframeHeader::SetSig() [member function]
 cls.add_method('SetSig',
 'void',
 [])
+return
+def register_Ns3AmsduSubframeHeader_methods(root_module, cls):
+## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader(ns3::AmsduSubframeHeader const & arg0) [copy constructor]
+cls.add_constructor([param('ns3::AmsduSubframeHeader const &', 'arg0')])
+## amsdu-subframe-header.h (module 'wifi'): ns3::AmsduSubframeHeader::AmsduSubframeHeader() [constructor]
+cls.add_constructor([])
+## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+cls.add_method('Deserialize',
+'uint32_t',
+[param('ns3::Buffer::Iterator', 'start')],
+is_virtual=True)
+## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetDestinationAddr() const [member function]
+cls.add_method('GetDestinationAddr',
+'ns3::Mac48Address',
+[],
+is_const=True)
+## amsdu-subframe-header.h (module 'wifi'): ns3::TypeId ns3::AmsduSubframeHeader::GetInstanceTypeId() const [member function]
+cls.add_method('GetInstanceTypeId',
+'ns3::TypeId',
+[],
+is_const=True, is_virtual=True)
+## amsdu-subframe-header.h (module 'wifi'): uint16_t ns3::AmsduSubframeHeader::GetLength() const [member function]
+cls.add_method('GetLength',
+'uint16_t',
+[],
+is_const=True)
+## amsdu-subframe-header.h (module 'wifi'): uint32_t ns3::AmsduSubframeHeader::GetSerializedSize() const [member function]
+cls.add_method('GetSerializedSize',
+'uint32_t',
+[],
+is_const=True, is_virtual=True)
+## amsdu-subframe-header.h (module 'wifi'): ns3::Mac48Address ns3::AmsduSubframeHeader::GetSourceAddr() const [member function]
+cls.add_method('GetSourceAddr',
+'ns3::Mac48Address',
+[],
+is_const=True)
+## amsdu-subframe-header.h (module 'wifi'): static ns3::TypeId ns3::AmsduSubframeHeader::GetTypeId() [member function]
+cls.add_method('GetTypeId',
+'ns3::TypeId',
+[],
+is_static=True)
+## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Print(std::ostream & os) const [member function]
+cls.add_method('Print',
+'void',
+[param('std::ostream &', 'os')],
+is_const=True, is_virtual=True)
+## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+cls.add_method('Serialize',
+'void',
+[param('ns3::Buffer::Iterator', 'start')],
+is_const=True, is_virtual=True)
+## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetDestinationAddr(ns3::Mac48Address to) [member function]
+cls.add_method('SetDestinationAddr',
+'void',
+[param('ns3::Mac48Address', 'to')])
+## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetLength(uint16_t arg0) [member function]
+cls.add_method('SetLength',
+'void',
+[param('uint16_t', 'arg0')])
+## amsdu-subframe-header.h (module 'wifi'): void ns3::AmsduSubframeHeader::SetSourceAddr(ns3::Mac48Address to) [member function]
+cls.add_method('SetSourceAddr',
+'void',
+[param('ns3::Mac48Address', 'to')])
 return
 def register_Ns3Application_methods(root_module, cls):
 ## application.h (module 'network'): ns3::Application::Application(ns3::Application const & arg0) [copy constructor]
 cls.add_constructor([param('ns3::Application const &', 'arg0')])
 [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('double', 'rxSnr')])
 ## mac-low.h (module 'wifi'): void ns3::MacLow::ReceiveOk(ns3::Ptr<ns3::Packet> packet, double rxSnr, ns3::WifiMode txMode, ns3::WifiPreamble preamble, bool ampduSubframe) [member function]
 cls.add_method('ReceiveOk',
 'void',
 [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble'), param('bool', 'ampduSubframe')])
-## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowAggregationCapableTransmissionListener * listener) [member function]
 cls.add_method('RegisterBlockAckListenerForAc',
 'void',
-[param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+[param('ns3::AcIndex', 'ac'), param('ns3::MacLowAggregationCapableTransmissionListener *', 'listener')])
 ## mac-low.h (module 'wifi'): void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
 cls.add_method('RegisterDcfListener',
 'void',
 [param('ns3::MacLowDcfListener *', 'listener')])
 ## mac-low.h (module 'wifi'): void ns3::MacLow::ResetPhy() [member function]
 ## mac-low.h (module 'wifi'): void ns3::MacLow::StartTransmission(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr, ns3::MacLowTransmissionParameters parameters, ns3::MacLowTransmissionListener * listener) [member function]
 cls.add_method('StartTransmission',
 'void',
 [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::WifiMacHeader const *', 'hdr'), param('ns3::MacLowTransmissionParameters', 'parameters'), param('ns3::MacLowTransmissionListener *', 'listener')],
 is_virtual=True)
-## mac-low.h (module 'wifi'): bool ns3::MacLow::StopAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
+## mac-low.h (module 'wifi'): bool ns3::MacLow::StopMpduAggregation(ns3::Ptr<ns3::Packet const> peekedPacket, ns3::WifiMacHeader peekedHdr, ns3::Ptr<ns3::Packet> aggregatedPacket, uint16_t size) const [member function]
-cls.add_method('StopAggregation',
+cls.add_method('StopMpduAggregation',
 'bool',
 [param('ns3::Ptr< ns3::Packet const >', 'peekedPacket'), param('ns3::WifiMacHeader', 'peekedHdr'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('uint16_t', 'size')],
 is_const=True)
 ## mac-low.h (module 'wifi'): ns3::WifiTxVector ns3::MacLow::GetDataTxVector(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const * hdr) const [member function]
 cls.add_method('GetDataTxVector',
 cls.add_method('Deaggregate',
 'std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmpduSubframeHeader > >',
 [param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')],
 is_static=True)
 ## mpdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MpduAggregator::GetTypeId() [member function]
+cls.add_method('GetTypeId',
+'ns3::TypeId',
+[],
+is_static=True)
+return
+def register_Ns3MsduAggregator_methods(root_module, cls):
+## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator() [constructor]
+cls.add_constructor([])
+## msdu-aggregator.h (module 'wifi'): ns3::MsduAggregator::MsduAggregator(ns3::MsduAggregator const & arg0) [copy constructor]
+cls.add_constructor([param('ns3::MsduAggregator const &', 'arg0')])
+## msdu-aggregator.h (module 'wifi'): bool ns3::MsduAggregator::Aggregate(ns3::Ptr<ns3::Packet const> packet, ns3::Ptr<ns3::Packet> aggregatedPacket, ns3::Mac48Address src, ns3::Mac48Address dest) [member function]
+cls.add_method('Aggregate',
+'bool',
+[param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket'), param('ns3::Mac48Address', 'src'), param('ns3::Mac48Address', 'dest')],
+is_pure_virtual=True, is_virtual=True)
+## msdu-aggregator.h (module 'wifi'): static std::list<std::pair<ns3::Ptr<ns3::Packet>, ns3::AmsduSubframeHeader>, std::allocator<std::pair<ns3::Ptr<ns3::Packet>, ns3::AmsduSubframeHeader> > > ns3::MsduAggregator::Deaggregate(ns3::Ptr<ns3::Packet> aggregatedPacket) [member function]
+cls.add_method('Deaggregate',
+'std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >',
+[param('ns3::Ptr< ns3::Packet >', 'aggregatedPacket')],
+is_static=True)
+## msdu-aggregator.h (module 'wifi'): static ns3::TypeId ns3::MsduAggregator::GetTypeId() [member function]
 cls.add_method('GetTypeId',
 'ns3::TypeId',
 [],
 is_static=True)
 return

changeset 11352	a1f6f647d516
parent 11207	05b028936933
child 11382	dbd2787c79f6