--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py Fri Jun 04 18:33:07 2010 -0400
@@ -47,6 +47,8 @@
module.add_class('Chunk', parent=root_module['ns3::ObjectBase'])
## header.h: ns3::Header [class]
module.add_class('Header', parent=root_module['ns3::Chunk'])
+ ## packet-burst.h: ns3::PacketBurst [class]
+ module.add_class('PacketBurst', parent=root_module['ns3::Object'])
## pcap-file-wrapper.h: ns3::PcapFileWrapper [class]
module.add_class('PcapFileWrapper', parent=root_module['ns3::Object'])
## propagation-delay-model.h: ns3::PropagationDelayModel [class]
@@ -205,6 +207,7 @@
register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+ register_Ns3PacketBurst_methods(root_module, root_module['ns3::PacketBurst'])
register_Ns3PcapFileWrapper_methods(root_module, root_module['ns3::PcapFileWrapper'])
register_Ns3PropagationDelayModel_methods(root_module, root_module['ns3::PropagationDelayModel'])
register_Ns3PropagationLossModel_methods(root_module, root_module['ns3::PropagationLossModel'])
@@ -278,10 +281,10 @@
'ns3::Buffer',
[],
is_const=True)
- ## buffer.h: uint32_t ns3::Buffer::Deserialize(uint8_t * buffer, uint32_t size) [member function]
+ ## buffer.h: uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
cls.add_method('Deserialize',
'uint32_t',
- [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+ [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
## buffer.h: ns3::Buffer::Iterator ns3::Buffer::End() const [member function]
cls.add_method('End',
'ns3::Buffer::Iterator',
@@ -640,10 +643,10 @@
'ns3::PacketMetadata',
[param('uint32_t', 'start'), param('uint32_t', 'end')],
is_const=True)
- ## packet-metadata.h: uint32_t ns3::PacketMetadata::Deserialize(uint8_t * buffer, uint32_t size) [member function]
+ ## packet-metadata.h: uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
cls.add_method('Deserialize',
'uint32_t',
- [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+ [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
## packet-metadata.h: static void ns3::PacketMetadata::Enable() [member function]
cls.add_method('Enable',
'void',
@@ -1034,6 +1037,57 @@
is_pure_virtual=True, is_const=True, is_virtual=True)
return
+def register_Ns3PacketBurst_methods(root_module, cls):
+ ## packet-burst.h: ns3::PacketBurst::PacketBurst(ns3::PacketBurst const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::PacketBurst const &', 'arg0')])
+ ## packet-burst.h: ns3::PacketBurst::PacketBurst() [constructor]
+ cls.add_constructor([])
+ ## packet-burst.h: void ns3::PacketBurst::AddPacket(ns3::Ptr<ns3::Packet> packet) [member function]
+ cls.add_method('AddPacket',
+ 'void',
+ [param('ns3::Ptr< ns3::Packet >', 'packet')])
+ ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::Begin() const [member function]
+ cls.add_method('Begin',
+ 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
+ [],
+ is_const=True)
+ ## packet-burst.h: ns3::Ptr<ns3::PacketBurst> ns3::PacketBurst::Copy() const [member function]
+ cls.add_method('Copy',
+ 'ns3::Ptr< ns3::PacketBurst >',
+ [],
+ is_const=True)
+ ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::End() const [member function]
+ cls.add_method('End',
+ 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
+ [],
+ is_const=True)
+ ## packet-burst.h: uint32_t ns3::PacketBurst::GetNPackets() const [member function]
+ cls.add_method('GetNPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## packet-burst.h: std::list<ns3::Ptr<ns3::Packet>, std::allocator<ns3::Ptr<ns3::Packet> > > ns3::PacketBurst::GetPackets() const [member function]
+ cls.add_method('GetPackets',
+ 'std::list< ns3::Ptr< ns3::Packet > >',
+ [],
+ is_const=True)
+ ## packet-burst.h: uint32_t ns3::PacketBurst::GetSize() const [member function]
+ cls.add_method('GetSize',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## packet-burst.h: static ns3::TypeId ns3::PacketBurst::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## packet-burst.h: void ns3::PacketBurst::DoDispose() [member function]
+ cls.add_method('DoDispose',
+ 'void',
+ [],
+ visibility='private', is_virtual=True)
+ return
+
def register_Ns3PcapFileWrapper_methods(root_module, cls):
## pcap-file-wrapper.h: static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function]
cls.add_method('GetTypeId',
@@ -1682,10 +1736,10 @@
'ns3::Ptr< ns3::NixVector >',
[],
is_const=True)
- ## nix-vector.h: uint32_t ns3::NixVector::Deserialize(uint32_t * buffer, uint32_t size) [member function]
+ ## nix-vector.h: uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function]
cls.add_method('Deserialize',
'uint32_t',
- [param('uint32_t *', 'buffer'), param('uint32_t', 'size')])
+ [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')])
## nix-vector.h: void ns3::NixVector::DumpNixVector(std::ostream & os) const [member function]
cls.add_method('DumpNixVector',
'void',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_flow_monitor.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_flow_monitor.py Fri Jun 04 18:33:07 2010 -0400
@@ -26,7 +26,7 @@
## ipv4-flow-probe.h: ns3::Ipv4FlowProbe [class]
module.add_class('Ipv4FlowProbe', parent=root_module['ns3::FlowProbe'])
## ipv4-flow-probe.h: ns3::Ipv4FlowProbe::DropReason [enumeration]
- module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe'])
+ module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_QUEUE', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe'])
module.add_container('std::map< unsigned int, ns3::FlowMonitor::FlowStats >', ('unsigned int', 'ns3::FlowMonitor::FlowStats'), container_type='map')
module.add_container('std::map< unsigned int, ns3::FlowProbe::FlowStats >', ('unsigned int', 'ns3::FlowProbe::FlowStats'), container_type='map')
typehandlers.add_type_alias('uint32_t', 'ns3::FlowPacketId')
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py Fri Jun 04 18:33:07 2010 -0400
@@ -2423,10 +2423,18 @@
'ns3::QosWifiMacHelper',
[],
is_static=True)
- ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetMsduAggregatorForAc(ns3::AccessClass accessClass, std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue()) [member function]
+ ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetBlockAckInactivityTimeoutForAc(ns3::AcIndex ac, uint16_t timeout) [member function]
+ cls.add_method('SetBlockAckInactivityTimeoutForAc',
+ 'void',
+ [param('ns3::AcIndex', 'ac'), param('uint16_t', 'timeout')])
+ ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetBlockAckThresholdForAc(ns3::AcIndex ac, uint8_t threshold) [member function]
+ cls.add_method('SetBlockAckThresholdForAc',
+ 'void',
+ [param('ns3::AcIndex', 'ac'), param('uint8_t', 'threshold')])
+ ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetMsduAggregatorForAc(ns3::AcIndex ac, std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue()) [member function]
cls.add_method('SetMsduAggregatorForAc',
'void',
- [param('ns3::AccessClass', 'accessClass'), param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()')])
+ [param('ns3::AcIndex', 'ac'), param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()')])
## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
cls.add_method('SetType',
'void',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_internet_stack.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_internet_stack.py Fri Jun 04 18:33:07 2010 -0400
@@ -2461,6 +2461,10 @@
cls.add_method('Send',
'void',
[param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')])
+ ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Send(ns3::Ptr<ns3::Packet> packet, ns3::Ipv4Header ipHeader, ns3::Ptr<ns3::Ipv4Route> route) [member function]
+ cls.add_method('Send',
+ 'void',
+ [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')])
## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr<ns3::NetDevice> device) [member function]
cls.add_method('AddInterface',
'uint32_t',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_mesh.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_mesh.py Fri Jun 04 18:33:07 2010 -0400
@@ -463,10 +463,10 @@
'void',
[param('ns3::Time', 'pifs')],
is_virtual=True)
- ## mesh-wifi-interface-mac.h: void ns3::MeshWifiInterfaceMac::SetQueue(ns3::AccessClass ac) [member function]
+ ## mesh-wifi-interface-mac.h: void ns3::MeshWifiInterfaceMac::SetQueue(ns3::AcIndex ac) [member function]
cls.add_method('SetQueue',
'void',
- [param('ns3::AccessClass', 'ac')])
+ [param('ns3::AcIndex', 'ac')])
## mesh-wifi-interface-mac.h: void ns3::MeshWifiInterfaceMac::SetRandomStartDelay(ns3::Time interval) [member function]
cls.add_method('SetRandomStartDelay',
'void',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py Fri Jun 04 18:33:07 2010 -0400
@@ -11,8 +11,8 @@
module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_UNKNOWN'])
## qos-tag.h: ns3::UserPriority [enumeration]
module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
- ## qos-utils.h: ns3::AccessClass [enumeration]
- module.add_enum('AccessClass', ['AC_VO', 'AC_VI', 'AC_BE', 'AC_BK', 'AC_BE_NQOS', 'AC_UNDEF'])
+ ## qos-utils.h: ns3::AcIndex [enumeration]
+ module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'])
## edca-txop-n.h: ns3::TypeOfStation [enumeration]
module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA'])
## ctrl-headers.h: ns3::BlockAckType [enumeration]
@@ -47,6 +47,8 @@
module.add_class('OriginatorBlockAckAgreement', parent=root_module['ns3::BlockAckAgreement'])
## originator-block-ack-agreement.h: ns3::OriginatorBlockAckAgreement::State [enumeration]
module.add_enum('State', ['PENDING', 'ESTABLISHED', 'INACTIVE', 'UNSUCCESSFUL'], outer_class=root_module['ns3::OriginatorBlockAckAgreement'])
+ ## minstrel-wifi-manager.h: ns3::RateInfo [struct]
+ module.add_class('RateInfo')
## ssid.h: ns3::Ssid [class]
module.add_class('Ssid')
## status-code.h: ns3::StatusCode [class]
@@ -190,6 +192,12 @@
## dca-txop.h: ns3::DcaTxop [class]
module.add_class('DcaTxop', parent=root_module['ns3::Dcf'])
module.add_container('std::vector< ns3::WifiMode >', 'ns3::WifiMode', container_type='vector')
+ typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate')
+ typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*')
+ typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&')
+ typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >', 'ns3::SampleRate')
+ typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >*', 'ns3::SampleRate*')
+ typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >&', 'ns3::SampleRate&')
## Register a nested module for the namespace Config
@@ -286,6 +294,7 @@
register_Ns3MacLowTransmissionParameters_methods(root_module, root_module['ns3::MacLowTransmissionParameters'])
register_Ns3MacRxMiddle_methods(root_module, root_module['ns3::MacRxMiddle'])
register_Ns3OriginatorBlockAckAgreement_methods(root_module, root_module['ns3::OriginatorBlockAckAgreement'])
+ register_Ns3RateInfo_methods(root_module, root_module['ns3::RateInfo'])
register_Ns3Ssid_methods(root_module, root_module['ns3::Ssid'])
register_Ns3StatusCode_methods(root_module, root_module['ns3::StatusCode'])
register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates'])
@@ -1111,6 +1120,37 @@
[param('ns3::OriginatorBlockAckAgreement::State', 'state')])
return
+def register_Ns3RateInfo_methods(root_module, cls):
+ ## minstrel-wifi-manager.h: ns3::RateInfo::RateInfo() [constructor]
+ cls.add_constructor([])
+ ## minstrel-wifi-manager.h: ns3::RateInfo::RateInfo(ns3::RateInfo const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::RateInfo const &', 'arg0')])
+ ## minstrel-wifi-manager.h: ns3::RateInfo::adjustedRetryCount [variable]
+ cls.add_instance_attribute('adjustedRetryCount', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::attemptHist [variable]
+ cls.add_instance_attribute('attemptHist', 'uint64_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::ewmaProb [variable]
+ cls.add_instance_attribute('ewmaProb', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::numRateAttempt [variable]
+ cls.add_instance_attribute('numRateAttempt', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::numRateSuccess [variable]
+ cls.add_instance_attribute('numRateSuccess', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::perfectTxTime [variable]
+ cls.add_instance_attribute('perfectTxTime', 'ns3::Time', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::prevNumRateAttempt [variable]
+ cls.add_instance_attribute('prevNumRateAttempt', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::prevNumRateSuccess [variable]
+ cls.add_instance_attribute('prevNumRateSuccess', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::prob [variable]
+ cls.add_instance_attribute('prob', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::retryCount [variable]
+ cls.add_instance_attribute('retryCount', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::successHist [variable]
+ cls.add_instance_attribute('successHist', 'uint64_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::throughput [variable]
+ cls.add_instance_attribute('throughput', 'uint32_t', is_const=False)
+ return
+
def register_Ns3Ssid_methods(root_module, cls):
cls.add_output_stream_operator()
## ssid.h: ns3::Ssid::Ssid(ns3::Ssid const & arg0) [copy constructor]
@@ -2225,15 +2265,15 @@
'bool',
[],
is_pure_virtual=True, is_const=True, is_virtual=True)
- ## wifi-mac.h: void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AccessClass ac) [member function]
+ ## wifi-mac.h: void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
cls.add_method('ConfigureCCHDcf',
'void',
- [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AccessClass', 'ac')],
+ [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],
visibility='protected')
- ## wifi-mac.h: void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AccessClass ac) [member function]
+ ## wifi-mac.h: void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
cls.add_method('ConfigureDcf',
'void',
- [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AccessClass', 'ac')],
+ [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],
visibility='protected')
## wifi-mac.h: void ns3::WifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
cls.add_method('FinishConfigureStandard',
@@ -4566,10 +4606,10 @@
cls.add_method('GetFragmentPacket',
'ns3::Ptr< ns3::Packet >',
[param('ns3::WifiMacHeader *', 'hdr')])
- ## edca-txop-n.h: void ns3::EdcaTxopN::SetAccessClass(ns3::AccessClass ac) [member function]
- cls.add_method('SetAccessClass',
- 'void',
- [param('ns3::AccessClass', 'ac')])
+ ## edca-txop-n.h: void ns3::EdcaTxopN::SetAccessCategory(ns3::AcIndex ac) [member function]
+ cls.add_method('SetAccessCategory',
+ 'void',
+ [param('ns3::AcIndex', 'ac')])
## edca-txop-n.h: void ns3::EdcaTxopN::Queue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
cls.add_method('Queue',
'void',
@@ -4595,6 +4635,10 @@
'uint8_t',
[],
is_const=True)
+ ## edca-txop-n.h: void ns3::EdcaTxopN::SetBlockAckInactivityTimeout(uint16_t timeout) [member function]
+ cls.add_method('SetBlockAckInactivityTimeout',
+ 'void',
+ [param('uint16_t', 'timeout')])
## edca-txop-n.h: void ns3::EdcaTxopN::SendDelbaFrame(ns3::Mac48Address addr, uint8_t tid, bool byOriginator) [member function]
cls.add_method('SendDelbaFrame',
'void',
@@ -4775,10 +4819,10 @@
cls.add_method('ReceiveOk',
'void',
[param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
- ## mac-low.h: void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AccessClass ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+ ## mac-low.h: void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
cls.add_method('RegisterBlockAckListenerForAc',
'void',
- [param('ns3::AccessClass', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+ [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
## mac-low.h: void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
cls.add_method('RegisterDcfListener',
'void',
@@ -6367,9 +6411,9 @@
module.add_function('QosUtilsMapSeqControlToUniqueInteger',
'uint32_t',
[param('uint16_t', 'seqControl'), param('uint16_t', 'endSequence')])
- ## qos-utils.h: extern ns3::AccessClass ns3::QosUtilsMapTidToAc(uint8_t tid) [free function]
+ ## qos-utils.h: extern ns3::AcIndex ns3::QosUtilsMapTidToAc(uint8_t tid) [free function]
module.add_function('QosUtilsMapTidToAc',
- 'ns3::AccessClass',
+ 'ns3::AcIndex',
[param('uint8_t', 'tid')])
register_functions_ns3_Config(module.get_submodule('Config'), root_module)
register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wimax.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wimax.py Fri Jun 04 18:33:07 2010 -0400
@@ -99,8 +99,6 @@
module.add_class('OfdmSendParams', parent=root_module['ns3::SendParams'])
## ul-mac-messages.h: ns3::OfdmUcdChannelEncodings [class]
module.add_class('OfdmUcdChannelEncodings', parent=root_module['ns3::UcdChannelEncodings'])
- ## packet-burst.h: ns3::PacketBurst [class]
- module.add_class('PacketBurst', parent=root_module['ns3::Object'])
## wimax-tlv.h: ns3::PortRangeTlvValue [class]
module.add_class('PortRangeTlvValue', parent=root_module['ns3::TlvValue'])
## wimax-tlv.h: ns3::PortRangeTlvValue::PortRange [struct]
@@ -348,7 +346,6 @@
register_Ns3OfdmDownlinkFramePrefix_methods(root_module, root_module['ns3::OfdmDownlinkFramePrefix'])
register_Ns3OfdmSendParams_methods(root_module, root_module['ns3::OfdmSendParams'])
register_Ns3OfdmUcdChannelEncodings_methods(root_module, root_module['ns3::OfdmUcdChannelEncodings'])
- register_Ns3PacketBurst_methods(root_module, root_module['ns3::PacketBurst'])
register_Ns3PortRangeTlvValue_methods(root_module, root_module['ns3::PortRangeTlvValue'])
register_Ns3PortRangeTlvValuePortRange_methods(root_module, root_module['ns3::PortRangeTlvValue::PortRange'])
register_Ns3PriorityUlJob_methods(root_module, root_module['ns3::PriorityUlJob'])
@@ -2564,57 +2561,6 @@
is_const=True, visibility='private', is_virtual=True)
return
-def register_Ns3PacketBurst_methods(root_module, cls):
- ## packet-burst.h: ns3::PacketBurst::PacketBurst(ns3::PacketBurst const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PacketBurst const &', 'arg0')])
- ## packet-burst.h: ns3::PacketBurst::PacketBurst() [constructor]
- cls.add_constructor([])
- ## packet-burst.h: void ns3::PacketBurst::AddPacket(ns3::Ptr<ns3::Packet> packet) [member function]
- cls.add_method('AddPacket',
- 'void',
- [param('ns3::Ptr< ns3::Packet >', 'packet')])
- ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::Begin() const [member function]
- cls.add_method('Begin',
- 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
- [],
- is_const=True)
- ## packet-burst.h: ns3::Ptr<ns3::PacketBurst> ns3::PacketBurst::Copy() const [member function]
- cls.add_method('Copy',
- 'ns3::Ptr< ns3::PacketBurst >',
- [],
- is_const=True)
- ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::End() const [member function]
- cls.add_method('End',
- 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
- [],
- is_const=True)
- ## packet-burst.h: uint32_t ns3::PacketBurst::GetNPackets() const [member function]
- cls.add_method('GetNPackets',
- 'uint32_t',
- [],
- is_const=True)
- ## packet-burst.h: std::list<ns3::Ptr<ns3::Packet>, std::allocator<ns3::Ptr<ns3::Packet> > > ns3::PacketBurst::GetPackets() const [member function]
- cls.add_method('GetPackets',
- 'std::list< ns3::Ptr< ns3::Packet > >',
- [],
- is_const=True)
- ## packet-burst.h: uint32_t ns3::PacketBurst::GetSize() const [member function]
- cls.add_method('GetSize',
- 'uint32_t',
- [],
- is_const=True)
- ## packet-burst.h: static ns3::TypeId ns3::PacketBurst::GetTypeId() [member function]
- cls.add_method('GetTypeId',
- 'ns3::TypeId',
- [],
- is_static=True)
- ## packet-burst.h: void ns3::PacketBurst::DoDispose() [member function]
- cls.add_method('DoDispose',
- 'void',
- [],
- visibility='private', is_virtual=True)
- return
-
def register_Ns3PortRangeTlvValue_methods(root_module, cls):
## wimax-tlv.h: ns3::PortRangeTlvValue::PortRangeTlvValue(ns3::PortRangeTlvValue const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PortRangeTlvValue const &', 'arg0')])
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py Fri Jun 04 18:33:07 2010 -0400
@@ -47,6 +47,8 @@
module.add_class('Chunk', parent=root_module['ns3::ObjectBase'])
## header.h: ns3::Header [class]
module.add_class('Header', parent=root_module['ns3::Chunk'])
+ ## packet-burst.h: ns3::PacketBurst [class]
+ module.add_class('PacketBurst', parent=root_module['ns3::Object'])
## pcap-file-wrapper.h: ns3::PcapFileWrapper [class]
module.add_class('PcapFileWrapper', parent=root_module['ns3::Object'])
## propagation-delay-model.h: ns3::PropagationDelayModel [class]
@@ -205,6 +207,7 @@
register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+ register_Ns3PacketBurst_methods(root_module, root_module['ns3::PacketBurst'])
register_Ns3PcapFileWrapper_methods(root_module, root_module['ns3::PcapFileWrapper'])
register_Ns3PropagationDelayModel_methods(root_module, root_module['ns3::PropagationDelayModel'])
register_Ns3PropagationLossModel_methods(root_module, root_module['ns3::PropagationLossModel'])
@@ -278,10 +281,10 @@
'ns3::Buffer',
[],
is_const=True)
- ## buffer.h: uint32_t ns3::Buffer::Deserialize(uint8_t * buffer, uint32_t size) [member function]
+ ## buffer.h: uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
cls.add_method('Deserialize',
'uint32_t',
- [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+ [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
## buffer.h: ns3::Buffer::Iterator ns3::Buffer::End() const [member function]
cls.add_method('End',
'ns3::Buffer::Iterator',
@@ -640,10 +643,10 @@
'ns3::PacketMetadata',
[param('uint32_t', 'start'), param('uint32_t', 'end')],
is_const=True)
- ## packet-metadata.h: uint32_t ns3::PacketMetadata::Deserialize(uint8_t * buffer, uint32_t size) [member function]
+ ## packet-metadata.h: uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function]
cls.add_method('Deserialize',
'uint32_t',
- [param('uint8_t *', 'buffer'), param('uint32_t', 'size')])
+ [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')])
## packet-metadata.h: static void ns3::PacketMetadata::Enable() [member function]
cls.add_method('Enable',
'void',
@@ -1034,6 +1037,57 @@
is_pure_virtual=True, is_const=True, is_virtual=True)
return
+def register_Ns3PacketBurst_methods(root_module, cls):
+ ## packet-burst.h: ns3::PacketBurst::PacketBurst(ns3::PacketBurst const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::PacketBurst const &', 'arg0')])
+ ## packet-burst.h: ns3::PacketBurst::PacketBurst() [constructor]
+ cls.add_constructor([])
+ ## packet-burst.h: void ns3::PacketBurst::AddPacket(ns3::Ptr<ns3::Packet> packet) [member function]
+ cls.add_method('AddPacket',
+ 'void',
+ [param('ns3::Ptr< ns3::Packet >', 'packet')])
+ ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::Begin() const [member function]
+ cls.add_method('Begin',
+ 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
+ [],
+ is_const=True)
+ ## packet-burst.h: ns3::Ptr<ns3::PacketBurst> ns3::PacketBurst::Copy() const [member function]
+ cls.add_method('Copy',
+ 'ns3::Ptr< ns3::PacketBurst >',
+ [],
+ is_const=True)
+ ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::End() const [member function]
+ cls.add_method('End',
+ 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
+ [],
+ is_const=True)
+ ## packet-burst.h: uint32_t ns3::PacketBurst::GetNPackets() const [member function]
+ cls.add_method('GetNPackets',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## packet-burst.h: std::list<ns3::Ptr<ns3::Packet>, std::allocator<ns3::Ptr<ns3::Packet> > > ns3::PacketBurst::GetPackets() const [member function]
+ cls.add_method('GetPackets',
+ 'std::list< ns3::Ptr< ns3::Packet > >',
+ [],
+ is_const=True)
+ ## packet-burst.h: uint32_t ns3::PacketBurst::GetSize() const [member function]
+ cls.add_method('GetSize',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## packet-burst.h: static ns3::TypeId ns3::PacketBurst::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## packet-burst.h: void ns3::PacketBurst::DoDispose() [member function]
+ cls.add_method('DoDispose',
+ 'void',
+ [],
+ visibility='private', is_virtual=True)
+ return
+
def register_Ns3PcapFileWrapper_methods(root_module, cls):
## pcap-file-wrapper.h: static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function]
cls.add_method('GetTypeId',
@@ -1682,10 +1736,10 @@
'ns3::Ptr< ns3::NixVector >',
[],
is_const=True)
- ## nix-vector.h: uint32_t ns3::NixVector::Deserialize(uint32_t * buffer, uint32_t size) [member function]
+ ## nix-vector.h: uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function]
cls.add_method('Deserialize',
'uint32_t',
- [param('uint32_t *', 'buffer'), param('uint32_t', 'size')])
+ [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')])
## nix-vector.h: void ns3::NixVector::DumpNixVector(std::ostream & os) const [member function]
cls.add_method('DumpNixVector',
'void',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_flow_monitor.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_flow_monitor.py Fri Jun 04 18:33:07 2010 -0400
@@ -26,7 +26,7 @@
## ipv4-flow-probe.h: ns3::Ipv4FlowProbe [class]
module.add_class('Ipv4FlowProbe', parent=root_module['ns3::FlowProbe'])
## ipv4-flow-probe.h: ns3::Ipv4FlowProbe::DropReason [enumeration]
- module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe'])
+ module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_QUEUE', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe'])
module.add_container('std::map< unsigned int, ns3::FlowMonitor::FlowStats >', ('unsigned int', 'ns3::FlowMonitor::FlowStats'), container_type='map')
module.add_container('std::map< unsigned int, ns3::FlowProbe::FlowStats >', ('unsigned int', 'ns3::FlowProbe::FlowStats'), container_type='map')
typehandlers.add_type_alias('uint32_t', 'ns3::FlowPacketId')
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py Fri Jun 04 18:33:07 2010 -0400
@@ -2423,10 +2423,18 @@
'ns3::QosWifiMacHelper',
[],
is_static=True)
- ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetMsduAggregatorForAc(ns3::AccessClass accessClass, std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue()) [member function]
+ ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetBlockAckInactivityTimeoutForAc(ns3::AcIndex ac, uint16_t timeout) [member function]
+ cls.add_method('SetBlockAckInactivityTimeoutForAc',
+ 'void',
+ [param('ns3::AcIndex', 'ac'), param('uint16_t', 'timeout')])
+ ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetBlockAckThresholdForAc(ns3::AcIndex ac, uint8_t threshold) [member function]
+ cls.add_method('SetBlockAckThresholdForAc',
+ 'void',
+ [param('ns3::AcIndex', 'ac'), param('uint8_t', 'threshold')])
+ ## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetMsduAggregatorForAc(ns3::AcIndex ac, std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue()) [member function]
cls.add_method('SetMsduAggregatorForAc',
'void',
- [param('ns3::AccessClass', 'accessClass'), param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()')])
+ [param('ns3::AcIndex', 'ac'), param('std::string', 'type'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()')])
## qos-wifi-mac-helper.h: void ns3::QosWifiMacHelper::SetType(std::string type, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function]
cls.add_method('SetType',
'void',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_internet_stack.py Fri Jun 04 18:33:07 2010 -0400
@@ -2461,6 +2461,10 @@
cls.add_method('Send',
'void',
[param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')])
+ ## ipv4-l3-protocol.h: void ns3::Ipv4L3Protocol::Send(ns3::Ptr<ns3::Packet> packet, ns3::Ipv4Header ipHeader, ns3::Ptr<ns3::Ipv4Route> route) [member function]
+ cls.add_method('Send',
+ 'void',
+ [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')])
## ipv4-l3-protocol.h: uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr<ns3::NetDevice> device) [member function]
cls.add_method('AddInterface',
'uint32_t',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_mesh.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_mesh.py Fri Jun 04 18:33:07 2010 -0400
@@ -463,10 +463,10 @@
'void',
[param('ns3::Time', 'pifs')],
is_virtual=True)
- ## mesh-wifi-interface-mac.h: void ns3::MeshWifiInterfaceMac::SetQueue(ns3::AccessClass ac) [member function]
+ ## mesh-wifi-interface-mac.h: void ns3::MeshWifiInterfaceMac::SetQueue(ns3::AcIndex ac) [member function]
cls.add_method('SetQueue',
'void',
- [param('ns3::AccessClass', 'ac')])
+ [param('ns3::AcIndex', 'ac')])
## mesh-wifi-interface-mac.h: void ns3::MeshWifiInterfaceMac::SetRandomStartDelay(ns3::Time interval) [member function]
cls.add_method('SetRandomStartDelay',
'void',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py Fri Jun 04 18:33:07 2010 -0400
@@ -11,8 +11,8 @@
module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_UNKNOWN'])
## qos-tag.h: ns3::UserPriority [enumeration]
module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
- ## qos-utils.h: ns3::AccessClass [enumeration]
- module.add_enum('AccessClass', ['AC_VO', 'AC_VI', 'AC_BE', 'AC_BK', 'AC_BE_NQOS', 'AC_UNDEF'])
+ ## qos-utils.h: ns3::AcIndex [enumeration]
+ module.add_enum('AcIndex', ['AC_BE', 'AC_BK', 'AC_VI', 'AC_VO', 'AC_BE_NQOS', 'AC_UNDEF'])
## edca-txop-n.h: ns3::TypeOfStation [enumeration]
module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA'])
## ctrl-headers.h: ns3::BlockAckType [enumeration]
@@ -47,6 +47,8 @@
module.add_class('OriginatorBlockAckAgreement', parent=root_module['ns3::BlockAckAgreement'])
## originator-block-ack-agreement.h: ns3::OriginatorBlockAckAgreement::State [enumeration]
module.add_enum('State', ['PENDING', 'ESTABLISHED', 'INACTIVE', 'UNSUCCESSFUL'], outer_class=root_module['ns3::OriginatorBlockAckAgreement'])
+ ## minstrel-wifi-manager.h: ns3::RateInfo [struct]
+ module.add_class('RateInfo')
## ssid.h: ns3::Ssid [class]
module.add_class('Ssid')
## status-code.h: ns3::StatusCode [class]
@@ -190,6 +192,12 @@
## dca-txop.h: ns3::DcaTxop [class]
module.add_class('DcaTxop', parent=root_module['ns3::Dcf'])
module.add_container('std::vector< ns3::WifiMode >', 'ns3::WifiMode', container_type='vector')
+ typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >', 'ns3::MinstrelRate')
+ typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >*', 'ns3::MinstrelRate*')
+ typehandlers.add_type_alias('std::vector< ns3::RateInfo, std::allocator< ns3::RateInfo > >&', 'ns3::MinstrelRate&')
+ typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >', 'ns3::SampleRate')
+ typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >*', 'ns3::SampleRate*')
+ typehandlers.add_type_alias('std::vector< std::vector< unsigned int, std::allocator< unsigned int > >, std::allocator< std::vector< unsigned int, std::allocator< unsigned int > > > >&', 'ns3::SampleRate&')
## Register a nested module for the namespace Config
@@ -286,6 +294,7 @@
register_Ns3MacLowTransmissionParameters_methods(root_module, root_module['ns3::MacLowTransmissionParameters'])
register_Ns3MacRxMiddle_methods(root_module, root_module['ns3::MacRxMiddle'])
register_Ns3OriginatorBlockAckAgreement_methods(root_module, root_module['ns3::OriginatorBlockAckAgreement'])
+ register_Ns3RateInfo_methods(root_module, root_module['ns3::RateInfo'])
register_Ns3Ssid_methods(root_module, root_module['ns3::Ssid'])
register_Ns3StatusCode_methods(root_module, root_module['ns3::StatusCode'])
register_Ns3SupportedRates_methods(root_module, root_module['ns3::SupportedRates'])
@@ -1111,6 +1120,37 @@
[param('ns3::OriginatorBlockAckAgreement::State', 'state')])
return
+def register_Ns3RateInfo_methods(root_module, cls):
+ ## minstrel-wifi-manager.h: ns3::RateInfo::RateInfo() [constructor]
+ cls.add_constructor([])
+ ## minstrel-wifi-manager.h: ns3::RateInfo::RateInfo(ns3::RateInfo const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::RateInfo const &', 'arg0')])
+ ## minstrel-wifi-manager.h: ns3::RateInfo::adjustedRetryCount [variable]
+ cls.add_instance_attribute('adjustedRetryCount', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::attemptHist [variable]
+ cls.add_instance_attribute('attemptHist', 'uint64_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::ewmaProb [variable]
+ cls.add_instance_attribute('ewmaProb', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::numRateAttempt [variable]
+ cls.add_instance_attribute('numRateAttempt', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::numRateSuccess [variable]
+ cls.add_instance_attribute('numRateSuccess', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::perfectTxTime [variable]
+ cls.add_instance_attribute('perfectTxTime', 'ns3::Time', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::prevNumRateAttempt [variable]
+ cls.add_instance_attribute('prevNumRateAttempt', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::prevNumRateSuccess [variable]
+ cls.add_instance_attribute('prevNumRateSuccess', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::prob [variable]
+ cls.add_instance_attribute('prob', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::retryCount [variable]
+ cls.add_instance_attribute('retryCount', 'uint32_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::successHist [variable]
+ cls.add_instance_attribute('successHist', 'uint64_t', is_const=False)
+ ## minstrel-wifi-manager.h: ns3::RateInfo::throughput [variable]
+ cls.add_instance_attribute('throughput', 'uint32_t', is_const=False)
+ return
+
def register_Ns3Ssid_methods(root_module, cls):
cls.add_output_stream_operator()
## ssid.h: ns3::Ssid::Ssid(ns3::Ssid const & arg0) [copy constructor]
@@ -2225,15 +2265,15 @@
'bool',
[],
is_pure_virtual=True, is_const=True, is_virtual=True)
- ## wifi-mac.h: void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AccessClass ac) [member function]
+ ## wifi-mac.h: void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
cls.add_method('ConfigureCCHDcf',
'void',
- [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AccessClass', 'ac')],
+ [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],
visibility='protected')
- ## wifi-mac.h: void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AccessClass ac) [member function]
+ ## wifi-mac.h: void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
cls.add_method('ConfigureDcf',
'void',
- [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AccessClass', 'ac')],
+ [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],
visibility='protected')
## wifi-mac.h: void ns3::WifiMac::FinishConfigureStandard(ns3::WifiPhyStandard standard) [member function]
cls.add_method('FinishConfigureStandard',
@@ -4566,10 +4606,10 @@
cls.add_method('GetFragmentPacket',
'ns3::Ptr< ns3::Packet >',
[param('ns3::WifiMacHeader *', 'hdr')])
- ## edca-txop-n.h: void ns3::EdcaTxopN::SetAccessClass(ns3::AccessClass ac) [member function]
- cls.add_method('SetAccessClass',
- 'void',
- [param('ns3::AccessClass', 'ac')])
+ ## edca-txop-n.h: void ns3::EdcaTxopN::SetAccessCategory(ns3::AcIndex ac) [member function]
+ cls.add_method('SetAccessCategory',
+ 'void',
+ [param('ns3::AcIndex', 'ac')])
## edca-txop-n.h: void ns3::EdcaTxopN::Queue(ns3::Ptr<ns3::Packet const> packet, ns3::WifiMacHeader const & hdr) [member function]
cls.add_method('Queue',
'void',
@@ -4595,6 +4635,10 @@
'uint8_t',
[],
is_const=True)
+ ## edca-txop-n.h: void ns3::EdcaTxopN::SetBlockAckInactivityTimeout(uint16_t timeout) [member function]
+ cls.add_method('SetBlockAckInactivityTimeout',
+ 'void',
+ [param('uint16_t', 'timeout')])
## edca-txop-n.h: void ns3::EdcaTxopN::SendDelbaFrame(ns3::Mac48Address addr, uint8_t tid, bool byOriginator) [member function]
cls.add_method('SendDelbaFrame',
'void',
@@ -4775,10 +4819,10 @@
cls.add_method('ReceiveOk',
'void',
[param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'rxSnr'), param('ns3::WifiMode', 'txMode'), param('ns3::WifiPreamble', 'preamble')])
- ## mac-low.h: void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AccessClass ac, ns3::MacLowBlockAckEventListener * listener) [member function]
+ ## mac-low.h: void ns3::MacLow::RegisterBlockAckListenerForAc(ns3::AcIndex ac, ns3::MacLowBlockAckEventListener * listener) [member function]
cls.add_method('RegisterBlockAckListenerForAc',
'void',
- [param('ns3::AccessClass', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
+ [param('ns3::AcIndex', 'ac'), param('ns3::MacLowBlockAckEventListener *', 'listener')])
## mac-low.h: void ns3::MacLow::RegisterDcfListener(ns3::MacLowDcfListener * listener) [member function]
cls.add_method('RegisterDcfListener',
'void',
@@ -6367,9 +6411,9 @@
module.add_function('QosUtilsMapSeqControlToUniqueInteger',
'uint32_t',
[param('uint16_t', 'seqControl'), param('uint16_t', 'endSequence')])
- ## qos-utils.h: extern ns3::AccessClass ns3::QosUtilsMapTidToAc(uint8_t tid) [free function]
+ ## qos-utils.h: extern ns3::AcIndex ns3::QosUtilsMapTidToAc(uint8_t tid) [free function]
module.add_function('QosUtilsMapTidToAc',
- 'ns3::AccessClass',
+ 'ns3::AcIndex',
[param('uint8_t', 'tid')])
register_functions_ns3_Config(module.get_submodule('Config'), root_module)
register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_wimax.py Thu Jun 03 22:38:44 2010 -0700
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_wimax.py Fri Jun 04 18:33:07 2010 -0400
@@ -99,8 +99,6 @@
module.add_class('OfdmSendParams', parent=root_module['ns3::SendParams'])
## ul-mac-messages.h: ns3::OfdmUcdChannelEncodings [class]
module.add_class('OfdmUcdChannelEncodings', parent=root_module['ns3::UcdChannelEncodings'])
- ## packet-burst.h: ns3::PacketBurst [class]
- module.add_class('PacketBurst', parent=root_module['ns3::Object'])
## wimax-tlv.h: ns3::PortRangeTlvValue [class]
module.add_class('PortRangeTlvValue', parent=root_module['ns3::TlvValue'])
## wimax-tlv.h: ns3::PortRangeTlvValue::PortRange [struct]
@@ -348,7 +346,6 @@
register_Ns3OfdmDownlinkFramePrefix_methods(root_module, root_module['ns3::OfdmDownlinkFramePrefix'])
register_Ns3OfdmSendParams_methods(root_module, root_module['ns3::OfdmSendParams'])
register_Ns3OfdmUcdChannelEncodings_methods(root_module, root_module['ns3::OfdmUcdChannelEncodings'])
- register_Ns3PacketBurst_methods(root_module, root_module['ns3::PacketBurst'])
register_Ns3PortRangeTlvValue_methods(root_module, root_module['ns3::PortRangeTlvValue'])
register_Ns3PortRangeTlvValuePortRange_methods(root_module, root_module['ns3::PortRangeTlvValue::PortRange'])
register_Ns3PriorityUlJob_methods(root_module, root_module['ns3::PriorityUlJob'])
@@ -2564,57 +2561,6 @@
is_const=True, visibility='private', is_virtual=True)
return
-def register_Ns3PacketBurst_methods(root_module, cls):
- ## packet-burst.h: ns3::PacketBurst::PacketBurst(ns3::PacketBurst const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PacketBurst const &', 'arg0')])
- ## packet-burst.h: ns3::PacketBurst::PacketBurst() [constructor]
- cls.add_constructor([])
- ## packet-burst.h: void ns3::PacketBurst::AddPacket(ns3::Ptr<ns3::Packet> packet) [member function]
- cls.add_method('AddPacket',
- 'void',
- [param('ns3::Ptr< ns3::Packet >', 'packet')])
- ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::Begin() const [member function]
- cls.add_method('Begin',
- 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
- [],
- is_const=True)
- ## packet-burst.h: ns3::Ptr<ns3::PacketBurst> ns3::PacketBurst::Copy() const [member function]
- cls.add_method('Copy',
- 'ns3::Ptr< ns3::PacketBurst >',
- [],
- is_const=True)
- ## packet-burst.h: std::_List_const_iterator<ns3::Ptr<ns3::Packet> > ns3::PacketBurst::End() const [member function]
- cls.add_method('End',
- 'std::_List_const_iterator< ns3::Ptr< ns3::Packet > >',
- [],
- is_const=True)
- ## packet-burst.h: uint32_t ns3::PacketBurst::GetNPackets() const [member function]
- cls.add_method('GetNPackets',
- 'uint32_t',
- [],
- is_const=True)
- ## packet-burst.h: std::list<ns3::Ptr<ns3::Packet>, std::allocator<ns3::Ptr<ns3::Packet> > > ns3::PacketBurst::GetPackets() const [member function]
- cls.add_method('GetPackets',
- 'std::list< ns3::Ptr< ns3::Packet > >',
- [],
- is_const=True)
- ## packet-burst.h: uint32_t ns3::PacketBurst::GetSize() const [member function]
- cls.add_method('GetSize',
- 'uint32_t',
- [],
- is_const=True)
- ## packet-burst.h: static ns3::TypeId ns3::PacketBurst::GetTypeId() [member function]
- cls.add_method('GetTypeId',
- 'ns3::TypeId',
- [],
- is_static=True)
- ## packet-burst.h: void ns3::PacketBurst::DoDispose() [member function]
- cls.add_method('DoDispose',
- 'void',
- [],
- visibility='private', is_virtual=True)
- return
-
def register_Ns3PortRangeTlvValue_methods(root_module, cls):
## wimax-tlv.h: ns3::PortRangeTlvValue::PortRangeTlvValue(ns3::PortRangeTlvValue const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PortRangeTlvValue const &', 'arg0')])