1.1 --- a/bindings/python/ns3_module_core.py Thu Jul 16 15:56:42 2009 +0400
1.2 +++ b/bindings/python/ns3_module_core.py Thu Jul 16 15:57:19 2009 +0400
1.3 @@ -442,6 +442,16 @@
1.4 '__gnu_cxx::__normal_iterator< ns3::GlobalValue * const *, std::vector< ns3::GlobalValue * > >',
1.5 [],
1.6 is_static=True)
1.7 + ## global-value.h: static bool ns3::GlobalValue::GetValueByNameFailSafe(std::string name, ns3::AttributeValue & value) [member function]
1.8 + cls.add_method('GetValueByNameFailSafe',
1.9 + 'bool',
1.10 + [param('std::string', 'name'), param('ns3::AttributeValue &', 'value')],
1.11 + is_static=True)
1.12 + ## global-value.h: static void ns3::GlobalValue::GetValueByName(std::string name, ns3::AttributeValue & value) [member function]
1.13 + cls.add_method('GetValueByName',
1.14 + 'void',
1.15 + [param('std::string', 'name'), param('ns3::AttributeValue &', 'value')],
1.16 + is_static=True)
1.17 return
1.18
1.19 def register_Ns3IntToType__0_methods(root_module, cls):
2.1 --- a/bindings/python/ns3_module_csma.py Thu Jul 16 15:56:42 2009 +0400
2.2 +++ b/bindings/python/ns3_module_csma.py Thu Jul 16 15:57:19 2009 +0400
2.3 @@ -205,13 +205,11 @@
2.4 ## csma-channel.h: ns3::DataRate ns3::CsmaChannel::GetDataRate() [member function]
2.5 cls.add_method('GetDataRate',
2.6 'ns3::DataRate',
2.7 - [],
2.8 - is_virtual=True)
2.9 + [])
2.10 ## csma-channel.h: ns3::Time ns3::CsmaChannel::GetDelay() [member function]
2.11 cls.add_method('GetDelay',
2.12 'ns3::Time',
2.13 - [],
2.14 - is_virtual=True)
2.15 + [])
2.16 return
2.17
2.18 def register_Ns3CsmaNetDevice_methods(root_module, cls):
3.1 --- a/bindings/python/ns3_module_global_routing.py Thu Jul 16 15:56:42 2009 +0400
3.2 +++ b/bindings/python/ns3_module_global_routing.py Thu Jul 16 15:57:19 2009 +0400
3.3 @@ -83,17 +83,32 @@
3.4 cls.add_method('PopulateRoutingTables',
3.5 'void',
3.6 [],
3.7 - is_static=True)
3.8 + is_static=True, deprecated=True)
3.9 ## global-route-manager.h: static void ns3::GlobalRouteManager::RecomputeRoutingTables() [member function]
3.10 cls.add_method('RecomputeRoutingTables',
3.11 'void',
3.12 [],
3.13 - is_static=True)
3.14 + is_static=True, deprecated=True)
3.15 ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function]
3.16 cls.add_method('AllocateRouterId',
3.17 'uint32_t',
3.18 [],
3.19 is_static=True)
3.20 + ## global-route-manager.h: static void ns3::GlobalRouteManager::DeleteGlobalRoutes() [member function]
3.21 + cls.add_method('DeleteGlobalRoutes',
3.22 + 'void',
3.23 + [],
3.24 + is_static=True)
3.25 + ## global-route-manager.h: static void ns3::GlobalRouteManager::BuildGlobalRoutingDatabase() [member function]
3.26 + cls.add_method('BuildGlobalRoutingDatabase',
3.27 + 'void',
3.28 + [],
3.29 + is_static=True)
3.30 + ## global-route-manager.h: static void ns3::GlobalRouteManager::InitializeRoutes() [member function]
3.31 + cls.add_method('InitializeRoutes',
3.32 + 'void',
3.33 + [],
3.34 + is_static=True)
3.35 return
3.36
3.37 def register_Ns3GlobalRoutingLSA_methods(root_module, cls):
3.38 @@ -160,6 +175,11 @@
3.39 'ns3::Ipv4Mask',
3.40 [],
3.41 is_const=True)
3.42 + ## global-router-interface.h: ns3::Ptr<ns3::Node> ns3::GlobalRoutingLSA::GetNode() const [member function]
3.43 + cls.add_method('GetNode',
3.44 + 'ns3::Ptr< ns3::Node >',
3.45 + [],
3.46 + is_const=True)
3.47 ## global-router-interface.h: ns3::GlobalRoutingLSA::SPFStatus ns3::GlobalRoutingLSA::GetStatus() const [member function]
3.48 cls.add_method('GetStatus',
3.49 'ns3::GlobalRoutingLSA::SPFStatus',
3.50 @@ -191,6 +211,10 @@
3.51 cls.add_method('SetNetworkLSANetworkMask',
3.52 'void',
3.53 [param('ns3::Ipv4Mask', 'mask')])
3.54 + ## global-router-interface.h: void ns3::GlobalRoutingLSA::SetNode(ns3::Ptr<ns3::Node> node) [member function]
3.55 + cls.add_method('SetNode',
3.56 + 'void',
3.57 + [param('ns3::Ptr< ns3::Node >', 'node')])
3.58 ## global-router-interface.h: void ns3::GlobalRoutingLSA::SetStatus(ns3::GlobalRoutingLSA::SPFStatus status) [member function]
3.59 cls.add_method('SetStatus',
3.60 'void',
4.1 --- a/bindings/python/ns3_module_wifi.py Thu Jul 16 15:56:42 2009 +0400
4.2 +++ b/bindings/python/ns3_module_wifi.py Thu Jul 16 15:57:19 2009 +0400
4.3 @@ -8,7 +8,7 @@
4.4 ## wifi-preamble.h: ns3::WifiPreamble [enumeration]
4.5 module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT'])
4.6 ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration]
4.7 - module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_holland'])
4.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'])
4.9 ## qos-utils.h: ns3::AccessClass [enumeration]
4.10 module.add_enum('AccessClass', ['AC_VO', 'AC_VI', 'AC_BE', 'AC_BK', 'AC_UNDEF'])
4.11 ## edca-txop-n.h: ns3::TypeOfStation [enumeration]
4.12 @@ -264,19 +264,11 @@
4.13 cls.add_method('CalculateSnrPer',
4.14 'ns3::InterferenceHelper::SnrPer',
4.15 [param('ns3::Ptr< ns3::InterferenceHelper::Event >', 'event')])
4.16 - ## interference-helper.h: ns3::Time ns3::InterferenceHelper::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) const [member function]
4.17 + ## interference-helper.h: static ns3::Time ns3::InterferenceHelper::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
4.18 cls.add_method('CalculateTxDuration',
4.19 'ns3::Time',
4.20 [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')],
4.21 - is_const=True)
4.22 - ## interference-helper.h: void ns3::InterferenceHelper::Configure80211aParameters() [member function]
4.23 - cls.add_method('Configure80211aParameters',
4.24 - 'void',
4.25 - [])
4.26 - ## interference-helper.h: void ns3::InterferenceHelper::Configure80211bParameters() [member function]
4.27 - cls.add_method('Configure80211bParameters',
4.28 - 'void',
4.29 - [])
4.30 + is_static=True)
4.31 ## interference-helper.h: ns3::Time ns3::InterferenceHelper::GetEnergyDuration(double energyW) [member function]
4.32 cls.add_method('GetEnergyDuration',
4.33 'ns3::Time',
4.34 @@ -291,6 +283,26 @@
4.35 'double',
4.36 [],
4.37 is_const=True)
4.38 + ## interference-helper.h: static uint32_t ns3::InterferenceHelper::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function]
4.39 + cls.add_method('GetPayloadDurationMicroSeconds',
4.40 + 'uint32_t',
4.41 + [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')],
4.42 + is_static=True)
4.43 + ## interference-helper.h: static uint32_t ns3::InterferenceHelper::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
4.44 + cls.add_method('GetPlcpHeaderDurationMicroSeconds',
4.45 + 'uint32_t',
4.46 + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')],
4.47 + is_static=True)
4.48 + ## interference-helper.h: static ns3::WifiMode ns3::InterferenceHelper::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function]
4.49 + cls.add_method('GetPlcpHeaderMode',
4.50 + 'ns3::WifiMode',
4.51 + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')],
4.52 + is_static=True)
4.53 + ## interference-helper.h: static uint32_t ns3::InterferenceHelper::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode mode, ns3::WifiPreamble preamble) [member function]
4.54 + cls.add_method('GetPlcpPreambleDurationMicroSeconds',
4.55 + 'uint32_t',
4.56 + [param('ns3::WifiMode', 'mode'), param('ns3::WifiPreamble', 'preamble')],
4.57 + is_static=True)
4.58 ## interference-helper.h: void ns3::InterferenceHelper::SetErrorRateModel(ns3::Ptr<ns3::ErrorRateModel> rate) [member function]
4.59 cls.add_method('SetErrorRateModel',
4.60 'void',
4.61 @@ -457,6 +469,11 @@
4.62 'uint32_t',
4.63 [],
4.64 is_const=True)
4.65 + ## wifi-mode.h: ns3::WifiPhyStandard ns3::WifiMode::GetStandard() const [member function]
4.66 + cls.add_method('GetStandard',
4.67 + 'ns3::WifiPhyStandard',
4.68 + [],
4.69 + is_const=True)
4.70 ## wifi-mode.h: uint32_t ns3::WifiMode::GetUid() const [member function]
4.71 cls.add_method('GetUid',
4.72 'uint32_t',
4.73 @@ -487,25 +504,25 @@
4.74 def register_Ns3WifiModeFactory_methods(root_module, cls):
4.75 ## wifi-mode.h: ns3::WifiModeFactory::WifiModeFactory(ns3::WifiModeFactory const & arg0) [copy constructor]
4.76 cls.add_constructor([param('ns3::WifiModeFactory const &', 'arg0')])
4.77 - ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateBpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate) [member function]
4.78 + ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateBpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, ns3::WifiPhyStandard standard) [member function]
4.79 cls.add_method('CreateBpsk',
4.80 'ns3::WifiMode',
4.81 - [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate')],
4.82 + [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('ns3::WifiPhyStandard', 'standard')],
4.83 is_static=True)
4.84 - ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateQam(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, uint8_t constellationSize) [member function]
4.85 + ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateQam(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, uint8_t constellationSize, ns3::WifiPhyStandard standard) [member function]
4.86 cls.add_method('CreateQam',
4.87 'ns3::WifiMode',
4.88 - [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('uint8_t', 'constellationSize')],
4.89 + [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('uint8_t', 'constellationSize'), param('ns3::WifiPhyStandard', 'standard')],
4.90 is_static=True)
4.91 - ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateDbpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate) [member function]
4.92 + ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateDbpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, ns3::WifiPhyStandard standard) [member function]
4.93 cls.add_method('CreateDbpsk',
4.94 'ns3::WifiMode',
4.95 - [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate')],
4.96 + [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('ns3::WifiPhyStandard', 'standard')],
4.97 is_static=True)
4.98 - ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateDqpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate) [member function]
4.99 + ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateDqpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, ns3::WifiPhyStandard standard) [member function]
4.100 cls.add_method('CreateDqpsk',
4.101 'ns3::WifiMode',
4.102 - [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate')],
4.103 + [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('ns3::WifiPhyStandard', 'standard')],
4.104 is_static=True)
4.105 return
4.106
4.107 @@ -1470,6 +1487,10 @@
4.108 cls.add_method('NotifyRxDrop',
4.109 'void',
4.110 [param('ns3::Ptr< ns3::Packet const >', 'packet')])
4.111 + ## wifi-mac.h: void ns3::WifiMac::SetStandard(ns3::WifiPhyStandard standard) [member function]
4.112 + cls.add_method('SetStandard',
4.113 + 'void',
4.114 + [param('ns3::WifiPhyStandard', 'standard')])
4.115 return
4.116
4.117 def register_Ns3WifiMacHeader_methods(root_module, cls):
4.118 @@ -2053,6 +2074,86 @@
4.119 'ns3::WifiMode',
4.120 [],
4.121 is_static=True)
4.122 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get3mb10Mhz() [member function]
4.123 + cls.add_method('Get3mb10Mhz',
4.124 + 'ns3::WifiMode',
4.125 + [],
4.126 + is_static=True)
4.127 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get4_5mb10Mhz() [member function]
4.128 + cls.add_method('Get4_5mb10Mhz',
4.129 + 'ns3::WifiMode',
4.130 + [],
4.131 + is_static=True)
4.132 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get6mb10Mhz() [member function]
4.133 + cls.add_method('Get6mb10Mhz',
4.134 + 'ns3::WifiMode',
4.135 + [],
4.136 + is_static=True)
4.137 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get9mb10Mhz() [member function]
4.138 + cls.add_method('Get9mb10Mhz',
4.139 + 'ns3::WifiMode',
4.140 + [],
4.141 + is_static=True)
4.142 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get12mb10Mhz() [member function]
4.143 + cls.add_method('Get12mb10Mhz',
4.144 + 'ns3::WifiMode',
4.145 + [],
4.146 + is_static=True)
4.147 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get18mb10Mhz() [member function]
4.148 + cls.add_method('Get18mb10Mhz',
4.149 + 'ns3::WifiMode',
4.150 + [],
4.151 + is_static=True)
4.152 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get24mb10Mhz() [member function]
4.153 + cls.add_method('Get24mb10Mhz',
4.154 + 'ns3::WifiMode',
4.155 + [],
4.156 + is_static=True)
4.157 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get27mb10Mhz() [member function]
4.158 + cls.add_method('Get27mb10Mhz',
4.159 + 'ns3::WifiMode',
4.160 + [],
4.161 + is_static=True)
4.162 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get1_5mb5Mhz() [member function]
4.163 + cls.add_method('Get1_5mb5Mhz',
4.164 + 'ns3::WifiMode',
4.165 + [],
4.166 + is_static=True)
4.167 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get2_25mb5Mhz() [member function]
4.168 + cls.add_method('Get2_25mb5Mhz',
4.169 + 'ns3::WifiMode',
4.170 + [],
4.171 + is_static=True)
4.172 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get3mb5Mhz() [member function]
4.173 + cls.add_method('Get3mb5Mhz',
4.174 + 'ns3::WifiMode',
4.175 + [],
4.176 + is_static=True)
4.177 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get4_5mb5Mhz() [member function]
4.178 + cls.add_method('Get4_5mb5Mhz',
4.179 + 'ns3::WifiMode',
4.180 + [],
4.181 + is_static=True)
4.182 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get6mb5Mhz() [member function]
4.183 + cls.add_method('Get6mb5Mhz',
4.184 + 'ns3::WifiMode',
4.185 + [],
4.186 + is_static=True)
4.187 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get9mb5Mhz() [member function]
4.188 + cls.add_method('Get9mb5Mhz',
4.189 + 'ns3::WifiMode',
4.190 + [],
4.191 + is_static=True)
4.192 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get12mb5Mhz() [member function]
4.193 + cls.add_method('Get12mb5Mhz',
4.194 + 'ns3::WifiMode',
4.195 + [],
4.196 + is_static=True)
4.197 + ## wifi-phy.h: static ns3::WifiMode ns3::WifiPhy::Get13_5mb5Mhz() [member function]
4.198 + cls.add_method('Get13_5mb5Mhz',
4.199 + 'ns3::WifiMode',
4.200 + [],
4.201 + is_static=True)
4.202 ## wifi-phy.h: void ns3::WifiPhy::NotifyTxBegin(ns3::Ptr<ns3::Packet const> packet) [member function]
4.203 cls.add_method('NotifyTxBegin',
4.204 'void',
4.205 @@ -3128,6 +3229,16 @@
4.206 cls.add_method('SetNOscillators',
4.207 'void',
4.208 [param('uint8_t', 'nOscillators')])
4.209 + ## jakes-propagation-loss-model.h: uint8_t ns3::JakesPropagationLossModel::GetNRays() const [member function]
4.210 + cls.add_method('GetNRays',
4.211 + 'uint8_t',
4.212 + [],
4.213 + is_const=True)
4.214 + ## jakes-propagation-loss-model.h: uint8_t ns3::JakesPropagationLossModel::GetNOscillators() const [member function]
4.215 + cls.add_method('GetNOscillators',
4.216 + 'uint8_t',
4.217 + [],
4.218 + is_const=True)
4.219 ## jakes-propagation-loss-model.h: double ns3::JakesPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr<ns3::MobilityModel> a, ns3::Ptr<ns3::MobilityModel> b) const [member function]
4.220 cls.add_method('DoCalcRxPower',
4.221 'double',
5.1 --- a/src/devices/wifi/interference-helper.cc Thu Jul 16 15:56:42 2009 +0400
5.2 +++ b/src/devices/wifi/interference-helper.cc Thu Jul 16 15:57:19 2009 +0400
5.3 @@ -372,8 +372,11 @@
5.4 case WIFI_PHY_STANDARD_80211b:
5.5 NS_FATAL_ERROR("can't happen here");
5.6 symbolDurationUs = 0; // quiet compiler
5.7 + break;
5.8 default:
5.9 NS_FATAL_ERROR("unknown standard");
5.10 + symbolDurationUs = 0; // quiet compiler
5.11 + break;
5.12 }
5.13
5.14 // IEEE Std 802.11-2007, section 17.3.2.2, table 17-3