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

wifi: Cleanup unneeded methods

Browse Source
This commit is contained in:
Stefano Avallone
2020-06-20 15:33:48 +02:00
parent fa9429046e
commit ea3c08b108
11 changed files with 42 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,21 +57,13 @@ int main (int argc, char *argv[])
{
uint32_t slot = 9; //slot time in microseconds
uint32_t sifs = 10; //SIFS duration in microseconds
uint32_t ackTimeout = 88; //Ack timeout duration in microseconds
uint32_t ctsTimeout = 88; //CTS timeout duration in microseconds
uint32_t rifs = 2; //RIFS duration in microseconds
uint32_t basicBlockAckTimeout = 286; //Basic BlockAck timeout duration in microseconds
uint32_t compressedBlockAckTimeout = 112; //Compressed BlockAck timeout duration in microseconds
double simulationTime = 10; //simulation time in seconds
CommandLine cmd (__FILE__);
cmd.AddValue ("slot", "Slot time in microseconds", slot);
cmd.AddValue ("sifs", "SIFS duration in microseconds", sifs);
cmd.AddValue ("ackTimeout", "Ack timeout duration in microseconds", ackTimeout);
cmd.AddValue ("ctsTimeout", "CTS timeout duration in microseconds", ctsTimeout);
cmd.AddValue ("rifs", "RIFS duration in microseconds", rifs);
cmd.AddValue ("basicBlockAckTimeoutTimeout", "Basic BlockAck timeout duration in microseconds", basicBlockAckTimeout);
cmd.AddValue ("compressedBlockAckTimeoutTimeout", "Compressed BlockAck timeout duration in microseconds", compressedBlockAckTimeout);
cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
cmd.Parse (argc,argv);
@@ -114,10 +106,7 @@ int main (int argc, char *argv[])
//Once install is done, we overwrite the standard timing values
Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/Slot", TimeValue (MicroSeconds (slot)));
Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/Sifs", TimeValue (MicroSeconds (sifs)));
Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/AckTimeout", TimeValue (MicroSeconds (ackTimeout)));
Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/Rifs", TimeValue (MicroSeconds (rifs)));
Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/BasicBlockAckTimeout", TimeValue (MicroSeconds (basicBlockAckTimeout)));
Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Mac/CompressedBlockAckTimeout", TimeValue (MicroSeconds (compressedBlockAckTimeout)));
//Mobility
MobilityHelper mobility;