F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples: remove useless wifi settings in wireless examples

Browse Source
This commit is contained in:
Sébastien Deronne
2017-10-21 11:15:50 +02:00
parent 4bbd4f6021
commit f53b87e610
6 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/wireless/mixed-wired-wireless.py
View File

@@ -262,15 +262,13 @@ def main(argv):
wifiInfra.SetRemoteStationManager('ns3::ArfWifiManager')
macInfra = ns.wifi.WifiMacHelper();
macInfra.SetType("ns3::StaWifiMac",
"Ssid", ns.wifi.SsidValue(ssid),
"ActiveProbing", ns.core.BooleanValue(False))
"Ssid", ns.wifi.SsidValue(ssid))
# setup stas
staDevices = wifiInfra.Install(wifiPhy, macInfra, stas)
# setup ap.
macInfra.SetType("ns3::ApWifiMac",
"Ssid", ns.wifi.SsidValue(ssid),
"BeaconGeneration", ns.core.BooleanValue(True),
"BeaconInterval", ns.core.TimeValue(ns.core.Seconds(2.5)))
apDevices = wifiInfra.Install(wifiPhy, macInfra, backbone.Get(i))
# Collect all of these new devices

4
examples/wireless/wifi-ap.py
View File

@@ -128,13 +128,11 @@ def main(argv):
# setup stas.
wifiMac.SetType("ns3::StaWifiMac",
"Ssid", ns.wifi.SsidValue(ssid),
"ActiveProbing", ns.core.BooleanValue(False))
"Ssid", ns.wifi.SsidValue(ssid))
staDevs = wifi.Install(wifiPhy, wifiMac, stas)
# setup ap.
wifiMac.SetType("ns3::ApWifiMac",
"Ssid", ns.wifi.SsidValue(ssid),
"BeaconGeneration", ns.core.BooleanValue(True),
"BeaconInterval", ns.core.TimeValue(ns.core.Seconds(2.5)))
wifi.Install(wifiPhy, wifiMac, ap)

3
examples/wireless/wifi-backward-compatibility.cc
View File

@@ -123,8 +123,7 @@ int main (int argc, char *argv[])
wifi.SetRemoteStationManager ("ns3::" + staRaa + "WifiManager");
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
NetDeviceContainer staDevice;
staDevice = wifi.Install (phy, mac, wifiStaNode);

6
examples/wireless/wifi-spectrum-per-example.cc
View File

@@ -415,8 +415,7 @@ int main (int argc, char *argv[])
if (wifiType == "ns3::YansWifiPhy")
{
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDevice = wifi.Install (phy, mac, wifiStaNode);
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid));
@@ -426,8 +425,7 @@ int main (int argc, char *argv[])
else if (wifiType == "ns3::SpectrumWifiPhy")
{
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDevice = wifi.Install (spectrumPhy, mac, wifiStaNode);
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid));

6
examples/wireless/wifi-spectrum-per-interference.cc
View File

@@ -441,8 +441,7 @@ int main (int argc, char *argv[])
if (wifiType == "ns3::YansWifiPhy")
{
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDevice = wifi.Install (phy, mac, wifiStaNode);
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid));
@@ -452,8 +451,7 @@ int main (int argc, char *argv[])
else if (wifiType == "ns3::SpectrumWifiPhy")
{
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDevice = wifi.Install (spectrumPhy, mac, wifiStaNode);
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid));

6
examples/wireless/wifi-spectrum-saturation-example.cc
View File

@@ -614,8 +614,7 @@ int main (int argc, char *argv[])
if (wifiType == "ns3::YansWifiPhy")
{
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDevice = wifi.Install (phy, mac, wifiStaNode);
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid));
@@ -625,8 +624,7 @@ int main (int argc, char *argv[])
else if (wifiType == "ns3::SpectrumWifiPhy")
{
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDevice = wifi.Install (spectrumPhy, mac, wifiStaNode);
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid));