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

wifi: (fixes #2116 and #2213) Refactor helpers and APIs

Browse Source
This commit is contained in:
Sébastien Deronne
2016-02-05 21:48:25 +01:00
parent a091991735
commit 4f54ca4f1e
78 changed files with 1281 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/aodv/test/loopback.cc
View File

@@ -36,7 +36,7 @@
#include "ns3/pcap-file.h"
#include "ns3/aodv-helper.h"
#include "ns3/v4ping.h"
#include "ns3/nqos-wifi-mac-helper.h"
#include "ns3/default-mac-helper.h"
#include "ns3/config.h"
#include "ns3/constant-position-mobility-model.h"
#include "ns3/names.h"
@@ -118,12 +118,12 @@ LoopbackTestCase::DoRun ()
m->SetPosition (Vector (0, 0, 0));
nodes.Get (0)->AggregateObject (m);
// Setup WiFi
NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
WifiMacHelper wifiMac;
wifiMac.SetType ("ns3::AdhocWifiMac");
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
wifiPhy.SetChannel (wifiChannel.Create ());
WifiHelper wifi = WifiHelper::Default ();
WifiHelper wifi;
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"));
NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, nodes);