From f53b87e610687a2ba99def1c9857bb355d9124ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sat, 21 Oct 2017 11:15:50 +0200 Subject: [PATCH] examples: remove useless wifi settings in wireless examples --- examples/wireless/mixed-wired-wireless.py | 4 +--- examples/wireless/wifi-ap.py | 4 +--- examples/wireless/wifi-backward-compatibility.cc | 3 +-- examples/wireless/wifi-spectrum-per-example.cc | 6 ++---- examples/wireless/wifi-spectrum-per-interference.cc | 6 ++---- examples/wireless/wifi-spectrum-saturation-example.cc | 6 ++---- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/examples/wireless/mixed-wired-wireless.py b/examples/wireless/mixed-wired-wireless.py index 0bc410714..53095a03c 100644 --- a/examples/wireless/mixed-wired-wireless.py +++ b/examples/wireless/mixed-wired-wireless.py @@ -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 diff --git a/examples/wireless/wifi-ap.py b/examples/wireless/wifi-ap.py index 5978c7490..edfed05f9 100644 --- a/examples/wireless/wifi-ap.py +++ b/examples/wireless/wifi-ap.py @@ -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) diff --git a/examples/wireless/wifi-backward-compatibility.cc b/examples/wireless/wifi-backward-compatibility.cc index bbf7caf1d..be7273eb6 100644 --- a/examples/wireless/wifi-backward-compatibility.cc +++ b/examples/wireless/wifi-backward-compatibility.cc @@ -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); diff --git a/examples/wireless/wifi-spectrum-per-example.cc b/examples/wireless/wifi-spectrum-per-example.cc index f428b0466..139711643 100644 --- a/examples/wireless/wifi-spectrum-per-example.cc +++ b/examples/wireless/wifi-spectrum-per-example.cc @@ -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)); diff --git a/examples/wireless/wifi-spectrum-per-interference.cc b/examples/wireless/wifi-spectrum-per-interference.cc index 4ef07ced9..600b63b79 100644 --- a/examples/wireless/wifi-spectrum-per-interference.cc +++ b/examples/wireless/wifi-spectrum-per-interference.cc @@ -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)); diff --git a/examples/wireless/wifi-spectrum-saturation-example.cc b/examples/wireless/wifi-spectrum-saturation-example.cc index 148fcef4b..8d72a2dde 100644 --- a/examples/wireless/wifi-spectrum-saturation-example.cc +++ b/examples/wireless/wifi-spectrum-saturation-example.cc @@ -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));