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

examples: remove unnecessary wifi settings

Browse Source
This commit is contained in:
Sébastien Deronne
2016-07-02 11:48:13 +02:00
parent 38b6955649
commit 8a19cbd288
16 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/wireless/80211n-mimo.cc
View File

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

3
examples/wireless/ht-wifi-network.cc
View File

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

1
examples/wireless/mixed-bg-network.cc
View File

@@ -102,7 +102,6 @@ Experiment::Run (bool enableProtection, bool enableShortSlotTime, bool enableSho
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"ShortSlotTimeSupported", BooleanValue (enableShortSlotTime));
// Configure the PLCP preamble type: long or short

3
examples/wireless/mixed-wireless.cc
View File

@@ -295,8 +295,7 @@ main (int argc, char *argv[])
wifiInfra.SetRemoteStationManager ("ns3::ArfWifiManager");
// setup stas
macInfra.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
NetDeviceContainer staDevices = wifiInfra.Install (wifiPhy, macInfra, stas);
// setup ap.
macInfra.SetType ("ns3::ApWifiMac",

3
examples/wireless/power-adaptation-distance.cc
View File

@@ -362,8 +362,7 @@ int main (int argc, char *argv[])
Ssid ssid = Ssid ("AP");
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
//Configure the AP node

4
examples/wireless/power-adaptation-interference.cc
View File

@@ -402,14 +402,12 @@ int main (int argc, char *argv[])
Ssid ssid = Ssid ("AP0");
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"MaxMissedBeacons", UintegerValue (1000));
wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
ssid = Ssid ("AP1");
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (1)));
//Configure the AP nodes

5
examples/wireless/rate-adaptation-distance.cc
View File

@@ -221,8 +221,7 @@ int main (int argc, char *argv[])
Ssid ssid = Ssid ("AP");
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
//Configure the AP node
@@ -252,7 +251,6 @@ int main (int argc, char *argv[])
Ssid ssid = Ssid ("AP");
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize));
wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));
@@ -276,7 +274,6 @@ int main (int argc, char *argv[])
Ssid ssid = Ssid ("AP");
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"BE_MaxAmpduSize", UintegerValue (BE_MaxAmpduSize));
wifiStaDevices.Add (wifi.Install (wifiPhy, wifiMac, wifiStaNodes.Get (0)));

2
examples/wireless/simple-ht-hidden-stations.cc
View File

@@ -99,7 +99,6 @@ int main (int argc, char *argv[])
Ssid ssid = Ssid ("simple-mpdu-aggregation");
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"BE_MaxAmpduSize", UintegerValue (maxAmpduSize));
NetDeviceContainer staDevices;
@@ -107,7 +106,6 @@ int main (int argc, char *argv[])
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid),
"BeaconInterval", TimeValue (MicroSeconds (102400)),
"BeaconGeneration", BooleanValue (true),
"BE_MaxAmpduSize", UintegerValue (maxAmpduSize));

3
examples/wireless/vht-wifi-network.cc
View File

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

10
examples/wireless/wifi-aggregation.cc
View File

@@ -100,13 +100,11 @@ int main (int argc, char *argv[])
ssid = Ssid ("network-A");
phy.Set ("ChannelNumber", UintegerValue(36));
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDeviceA = wifi.Install (phy, mac, wifiStaNode.Get(0));
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid),
"BeaconInterval", TimeValue (MicroSeconds (102400)),
"BeaconGeneration", BooleanValue (true));
apDeviceA = wifi.Install (phy, mac, wifiApNode.Get(0));
@@ -115,14 +113,12 @@ int main (int argc, char *argv[])
phy.Set ("ChannelNumber", UintegerValue(40));
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"BE_MaxAmpduSize", UintegerValue (0)); //Disable A-MPDU
staDeviceB = wifi.Install (phy, mac, wifiStaNode.Get(1));
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid),
"BeaconInterval", TimeValue (MicroSeconds (102400)),
"BeaconGeneration", BooleanValue (true));
apDeviceB = wifi.Install (phy, mac, wifiApNode.Get(1));
@@ -131,7 +127,6 @@ int main (int argc, char *argv[])
phy.Set ("ChannelNumber", UintegerValue(44));
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"BE_MaxAmpduSize", UintegerValue (0), //Disable A-MPDU
"BE_MaxAmsduSize", UintegerValue (7935)); //Enable A-MSDU with the highest maximum size allowed by the standard (7935 bytes)
@@ -139,7 +134,6 @@ int main (int argc, char *argv[])
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid),
"BeaconInterval", TimeValue (MicroSeconds (102400)),
"BeaconGeneration", BooleanValue (true));
apDeviceC = wifi.Install (phy, mac, wifiApNode.Get(2));
@@ -148,7 +142,6 @@ int main (int argc, char *argv[])
phy.Set ("ChannelNumber", UintegerValue(48));
mac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
"BE_MaxAmpduSize", UintegerValue (32768), //Enable A-MPDU with a smaller size than the default one
"BE_MaxAmsduSize", UintegerValue (3839)); //Enable A-MSDU with the smallest maximum size allowed by the standard (3839 bytes)
@@ -156,7 +149,6 @@ int main (int argc, char *argv[])
mac.SetType ("ns3::ApWifiMac",
"Ssid", SsidValue (ssid),
"BeaconInterval", TimeValue (MicroSeconds (102400)),
"BeaconGeneration", BooleanValue (true));
apDeviceD = wifi.Install (phy, mac, wifiApNode.Get(3));

3
examples/wireless/wifi-ap.cc
View File

@@ -150,8 +150,7 @@ int main (int argc, char *argv[])
wifi.SetRemoteStationManager ("ns3::ArfWifiManager");
// setup stas.
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDevs = wifi.Install (wifiPhy, wifiMac, stas);
// setup ap.
wifiMac.SetType ("ns3::ApWifiMac",

1
examples/wireless/wifi-blockack.cc
View File

@@ -72,7 +72,6 @@ int main (int argc, char const* argv[])
mac.SetType ("ns3::StaWifiMac",
"QosSupported", BooleanValue (true),
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false),
/* setting blockack threshold for sta's BE queue */
"BE_BlockAckThreshold", UintegerValue (2),
/* setting block inactivity timeout to 3*1024 = 3072 microseconds */

3
examples/wireless/wifi-simple-infra.cc
View File

@@ -157,8 +157,7 @@ int main (int argc, char *argv[])
Ssid ssid = Ssid ("wifi-default");
// setup sta.
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
NetDeviceContainer staDevice = wifi.Install (wifiPhy, wifiMac, c.Get (0));
NetDeviceContainer devices = staDevice;
// setup ap.

3
examples/wireless/wifi-tcp.cc
View File

@@ -124,8 +124,7 @@ main(int argc, char *argv[])
/* Configure STA */
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
NetDeviceContainer staDevices;
staDevices = wifiHelper.Install (wifiPhy, wifiMac, staWifiNode);

3
examples/wireless/wifi-timing-attributes.cc
View File

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

3
examples/wireless/wifi-wired-bridging.cc
View File

@@ -147,8 +147,7 @@ int main (int argc, char *argv[])
"Bounds", RectangleValue (Rectangle (wifiX, wifiX+5.0,0.0, (nStas+1)*5.0)));
mobility.Install (sta);
wifiMac.SetType ("ns3::StaWifiMac",
"Ssid", SsidValue (ssid),
"ActiveProbing", BooleanValue (false));
"Ssid", SsidValue (ssid));
staDev = wifi.Install (wifiPhy, wifiMac, sta);
staInterface = ip.Assign (staDev);