diff -r 7d6c1139be2f examples/wireless/ht-wifi-network.cc
--- a/examples/wireless/ht-wifi-network.cc	Thu Jan 29 19:03:22 2015 -0800
+++ b/examples/wireless/ht-wifi-network.cc	Fri Jan 30 10:13:43 2015 -0800
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Author: Mirko Banchi <mk.banchi@gmail.com>
+ * Authors: Mirko Banchi <mk.banchi@gmail.com>
+ *          Sebastien Deronne <sebastien.deronne@gmail.com>
  */
 #include "ns3/core-module.h"
 #include "ns3/network-module.h"
@@ -25,220 +26,353 @@
 #include "ns3/ipv4-global-routing-helper.h"
 #include "ns3/internet-module.h"
 
-//This is a simple example in order to show how 802.11n frame aggregation feature (A-MSDU) works.
+//This is a simple example of an IEEE 802.11n Wi-Fi network.
 //
 //Network topology:
-// 
+//
 //  Wifi 192.168.1.0
-// 
-//             AP
-//   *    *    *
-//   |    |    |
-//   n1   n2   n3 
+//
+//         AP
+//    *    *
+//    |    |
+//    n1   n2
 //
 //Packets in this simulation aren't marked with a QosTag so they are considered
 //belonging to BestEffort Access Class (AC_BE).
 
 using namespace ns3;
 
-NS_LOG_COMPONENT_DEFINE ("DataRates");
-
-double rxBytessum=0;
-double throughput=0;
-
-
-//===========================================================================
-//Set position of the nodes
-//===========================================================================
-static void
-SetPosition (Ptr<Node> node, Vector position)
-{
-  Ptr<MobilityModel> mobility = node->GetObject<MobilityModel> ();
-  mobility->SetPosition (position);
-}
-
-//==========================================================================
-//==========================================================================
+NS_LOG_COMPONENT_DEFINE ("ht-wifi-network");
 
 int main (int argc, char *argv[])
 {
-  std::cout << "DataRate" <<"  " << "Throughput" << '\n';
   bool udp = true;
-  int i=2;
-  for (;i <= 2; i++)
-  {
-    uint32_t nWifi = 1;
-    CommandLine cmd;
-    cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
-    cmd.Parse (argc,argv);
-    Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("990000"));
-    // disable rts cts all the time.
-    Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("99000"));
-    NodeContainer wifiNodes;
-    wifiNodes.Create (1);
-    NodeContainer wifiApNode;
-    wifiApNode.Create (1);
- 
-    YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
-    YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
-    phy.SetChannel (channel.Create ());
-    if (i ==3 || i == 4)
-      phy.Set ("ShortGuardEnabled",BooleanValue(true));
-      //phy.Set ("GreenfieldEnabled",BooleanValue(true));
+  double simulationTime = 10; //seconds
+  CommandLine cmd;
+  cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
+  cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
+  cmd.Parse (argc,argv);
 
-    WifiHelper wifi = WifiHelper::Default ();
-    wifi.SetStandard (WIFI_PHY_STANDARD_80211n_2_4GHZ);
-    HtWifiMacHelper mac = HtWifiMacHelper::Default ();
- 
+  for (int mcs = 0; mcs <= 31; mcs++)
+    {
+      uint32_t payloadSize; //1500 byte IP packet
+      if (udp)
+        {
+          payloadSize = 1472; //bytes
+        }
+      else
+        {
+          payloadSize = 1448; //bytes
+          Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (payloadSize));
+        }
 
-    Ssid ssid = Ssid ("ns380211n");
-    double datarate = 0;
-    StringValue DataRate;
-    if (i==0)
-      {
-        DataRate = StringValue("OfdmRate6_5MbpsBW20MHz");
-        datarate = 6.5;
-      }
-    else if (i==1)
-      {
-        DataRate = StringValue("OfdmRate58_5MbpsBW20MHz");
-        datarate = 58.5;
-      }
-    else if (i == 2)
-      {
-        DataRate = StringValue("OfdmRate65MbpsBW20MHz");
-        datarate = 65;
-      }
-    else if (i == 3)
-      {
-        DataRate = StringValue("OfdmRate57_8MbpsBW20MHz");
-        datarate = 57.8;
-      }
-    else if (i == 4)
-      {
-        DataRate = StringValue("OfdmRate72_2MbpsBW20MHz");
-        datarate = 72.2;
-      }
+      NodeContainer wifiStaNode;
+      wifiStaNode.Create (1);
+      NodeContainer wifiApNode;
+      wifiApNode.Create (1);
 
-    wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,
-                                   "ControlMode", DataRate);
-    mac.SetType ("ns3::StaWifiMac",
-                 "Ssid", SsidValue (ssid),
-                 "ActiveProbing", BooleanValue (false));
-    
-    NetDeviceContainer staDevices;
-    staDevices = wifi.Install (phy, mac, wifiNodes);
+      YansWifiChannelHelper channel = YansWifiChannelHelper::Default ();
+      YansWifiPhyHelper phy = YansWifiPhyHelper::Default ();
+      phy.SetChannel (channel.Create ());
 
-    mac.SetType ("ns3::ApWifiMac",
-                 "Ssid", SsidValue (ssid));
-   
-    NetDeviceContainer apDevice;
-    apDevice = wifi.Install (phy, mac, wifiApNode);
-   /* Ptr<WifiRemoteStationManager> apStationManager =
-              DynamicCast<WifiNetDevice>(apDevice.Get (0))->GetRemoteStationManager ();
-    apStationManager->AddBasicMode (WifiMode ("OfdmRate13MbpsBW20MHz"));
-    apStationManager->AddBasicMode (WifiMode ("OfdmRate19_5MbpsBW20MHz"));
-    apStationManager->AddBasicMode (WifiMode ("OfdmRate26MbpsBW20MHz"));
-    apStationManager->AddBasicMode (WifiMode ("OfdmRate39MbpsBW20MHz"));
-    Ptr<WifiRemoteStationManager> staStationManager =
-              DynamicCast<WifiNetDevice> (staDevices.Get (0))->GetRemoteStationManager ();
-    staStationManager->AddBasicMode (WifiMode ("OfdmRate13MbpsBW20MHz"));
-    staStationManager->AddBasicMode (WifiMode ("OfdmRate19_5MbpsBW20MHz"));
-    staStationManager->AddBasicMode (WifiMode ("OfdmRate26MbpsBW20MHz"));
-    staStationManager->AddBasicMode (WifiMode ("OfdmRate39MbpsBW20MHz"));*/
-              
-   // mobility.
-   MobilityHelper mobility;
-   mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
-   mobility.Install (wifiNodes);
-   mobility.Install (wifiApNode);
-    
-   SetPosition (wifiNodes.Get(0), Vector (1.0,0.0,0.0));
-   SetPosition (wifiApNode.Get(0), Vector (0.0,0.0,0.0));
- 
+      if (mcs <= 7)
+        {
+          phy.Set ("ShortGuardEnabled", BooleanValue (false));
+          phy.Set ("ChannelBonding", BooleanValue (false));
+        }
+      else if (mcs > 7 && mcs <= 15)
+        {
+          phy.Set ("ShortGuardEnabled", BooleanValue (true));
+          phy.Set ("ChannelBonding", BooleanValue (false));
+        }
+      else if (mcs > 15 && mcs <= 23)
+        {
+          phy.Set ("ShortGuardEnabled", BooleanValue (false));
+          phy.Set ("ChannelBonding", BooleanValue (true));
+        }
+      else
+        {
+          phy.Set ("ShortGuardEnabled", BooleanValue (true));
+          phy.Set ("ChannelBonding", BooleanValue (true));
+        }
 
-   /* Internet stack*/
-   InternetStackHelper stack;
-   stack.Install (wifiApNode);
-   stack.Install (wifiNodes);
+      WifiHelper wifi = WifiHelper::Default ();
+      wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);
+      HtWifiMacHelper mac = HtWifiMacHelper::Default ();
 
-   Ipv4AddressHelper address;
+      Ssid ssid = Ssid ("ns380211n");
 
-   address.SetBase ("10.1.3.0", "255.255.255.0");
-   Ipv4InterfaceContainer wifiNodesInterfaces;
-   Ipv4InterfaceContainer apNodeInterface;
+      double datarate = 0;
+      StringValue DataRate;
+      if (mcs == 0)
+        {
+          DataRate = StringValue ("OfdmRate6_5MbpsBW20MHz");
+          datarate = 6.5;
+        }
+      else if (mcs == 1)
+        {
+          DataRate = StringValue ("OfdmRate13MbpsBW20MHz");
+          datarate = 13;
+        }
+      else if (mcs == 2)
+        {
+          DataRate = StringValue ("OfdmRate19_5MbpsBW20MHz");
+          datarate = 19.5;
+        }
+      else if (mcs == 3)
+        {
+          DataRate = StringValue ("OfdmRate26MbpsBW20MHz");
+          datarate = 26;
+        }
+      else if (mcs == 4)
+        {
+          DataRate = StringValue ("OfdmRate39MbpsBW20MHz");
+          datarate = 39;
+        }
+      else if (mcs == 5)
+        {
+          DataRate = StringValue ("OfdmRate52MbpsBW20MHz");
+          datarate = 52;
+        }
+      else if (mcs == 6)
+        {
+          DataRate = StringValue ("OfdmRate58_5MbpsBW20MHz");
+          datarate = 58.5;
+        }
+      else if (mcs == 7)
+        {
+          DataRate = StringValue ("OfdmRate65MbpsBW20MHz");
+          datarate = 65;
+        }
+      else if (mcs == 8)
+        {
+          DataRate = StringValue ("OfdmRate7_2MbpsBW20MHz");
+          datarate = 7.2;
+        }
+      else if (mcs == 9)
+        {
+          DataRate = StringValue ("OfdmRate14_4MbpsBW20MHz");
+          datarate = 14.4;
+        }
+      else if (mcs == 10)
+        {
+          DataRate = StringValue ("OfdmRate21_7MbpsBW20MHz");
+          datarate = 21.7;
+        }
+      else if (mcs == 11)
+        {
+          DataRate = StringValue ("OfdmRate28_9MbpsBW20MHz");
+          datarate = 28.9;
+        }
+      else if (mcs == 12)
+        {
+          DataRate = StringValue ("OfdmRate43_3MbpsBW20MHz");
+          datarate = 43.3;
+        }
+      else if (mcs == 13)
+        {
+          DataRate = StringValue ("OfdmRate57_8MbpsBW20MHz");
+          datarate = 57.8;
+        }
+      else if (mcs == 14)
+        {
+          DataRate = StringValue ("OfdmRate65MbpsBW20MHzShGi");
+          datarate = 65;
+        }
+      else if (mcs == 15)
+        {
+          DataRate = StringValue ("OfdmRate72_2MbpsBW20MHz");
+          datarate = 72.2;
+        }
+      else if (mcs == 16)
+        {
+          DataRate = StringValue ("OfdmRate13_5MbpsBW40MHz");
+          datarate = 13.5;
+        }
+      else if (mcs == 17)
+        {
+          DataRate = StringValue ("OfdmRate27MbpsBW40MHz");
+          datarate = 27;
+        }
+      else if (mcs == 18)
+        {
+          DataRate = StringValue ("OfdmRate40_5MbpsBW40MHz");
+          datarate = 40.5;
+        }
+      else if (mcs == 19)
+        {
+          DataRate = StringValue ("OfdmRate54MbpsBW40MHz");
+          datarate = 54;
+        }
+      else if (mcs == 20)
+        {
+          DataRate = StringValue ("OfdmRate81MbpsBW40MHz");
+          datarate = 81;
+        }
+      else if (mcs == 21)
+        {
+          DataRate = StringValue ("OfdmRate108MbpsBW40MHz");
+          datarate = 108;
+        }
+      else if (mcs == 22)
+        {
+          DataRate = StringValue ("OfdmRate121_5MbpsBW40MHz");
+          datarate = 121.5;
+        }
+      else if (mcs == 23)
+        {
+          DataRate = StringValue ("OfdmRate135MbpsBW40MHz");
+          datarate = 135;
+        }
+      else if (mcs == 24)
+        {
+          DataRate = StringValue ("OfdmRate15MbpsBW40MHz");
+          datarate = 15;
+        }
+      else if (mcs == 25)
+        {
+          DataRate = StringValue ("OfdmRate30MbpsBW40MHz");
+          datarate = 30;
+        }
+      else if (mcs == 26)
+        {
+          DataRate = StringValue ("OfdmRate45MbpsBW40MHz");
+          datarate = 45;
+        }
+      else if (mcs == 27)
+        {
+          DataRate = StringValue ("OfdmRate60MbpsBW40MHz");
+          datarate = 60;
+        }
+      else if (mcs == 28)
+        {
+          DataRate = StringValue ("OfdmRate90MbpsBW40MHz");
+          datarate = 90;
+        }
+      else if (mcs == 29)
+        {
+          DataRate = StringValue ("OfdmRate120MbpsBW40MHz");
+          datarate = 120;
+        }
+      else if (mcs == 30)
+        {
+          DataRate = StringValue ("OfdmRate135MbpsBW40MHzShGi");
+          datarate = 135;
+        }
+      else
+        {
+          DataRate = StringValue ("OfdmRate150MbpsBW40MHz");
+          datarate = 150;
+        }
 
-   wifiNodesInterfaces = address.Assign (staDevices);
-   apNodeInterface = address.Assign (apDevice);
+      wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,
+                                    "ControlMode", DataRate);
+      mac.SetType ("ns3::StaWifiMac",
+                   "Ssid", SsidValue (ssid),
+                   "ActiveProbing", BooleanValue (false));
 
-   ApplicationContainer serverApps,sink1App;
+      NetDeviceContainer staDevices;
+      staDevices = wifi.Install (phy, mac, wifiStaNode);
 
-   double t=10;
+      mac.SetType ("ns3::ApWifiMac",
+                   "Ssid", SsidValue (ssid));
 
-   /* Setting applications */
-   if (udp)
-     {
-       UdpServerHelper myServer (9);
-       serverApps = myServer.Install (wifiNodes.Get (0));
-       serverApps.Start (Seconds (0.0));
-       serverApps.Stop (Seconds (t));
+      NetDeviceContainer apDevice;
+      apDevice = wifi.Install (phy, mac, wifiApNode);
 
-       UdpClientHelper myClient (wifiNodesInterfaces.GetAddress (0), 9);
-       myClient.SetAttribute ("MaxPackets", UintegerValue (64707202));
-       myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002")));
-       myClient.SetAttribute ("PacketSize", UintegerValue (1500));
- 
-       ApplicationContainer clientApps = myClient.Install (wifiApNode.Get (0));
-       clientApps.Start (Seconds (0.0));
-       clientApps.Stop (Seconds (t));
-     }
-   else
-     {
+      // mobility.
+      MobilityHelper mobility;
+      Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
 
-       //TCP flow
-       uint16_t port = 50000;
-       Address apLocalAddress (InetSocketAddress (Ipv4Address::GetAny (), port));
-       PacketSinkHelper packetSinkHelper ("ns3::TcpSocketFactory", apLocalAddress);
-       sink1App = packetSinkHelper.Install (wifiNodes.Get (0));
+      positionAlloc->Add (Vector (0.0, 0.0, 0.0));
+      positionAlloc->Add (Vector (1.0, 0.0, 0.0));
+      mobility.SetPositionAllocator (positionAlloc);
 
-       sink1App.Start (Seconds (0.0));
-       sink1App.Stop (Seconds (t));
-            
-       OnOffHelper onoff ("ns3::TcpSocketFactory",Ipv4Address::GetAny ());
-       onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=30.0]")); //in seconds
-       onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0.0]"));
-       onoff.SetAttribute ("PacketSize", UintegerValue (1500-30));//1024
-       onoff.SetAttribute ("DataRate", DataRateValue (100000000));//51200
-       ApplicationContainer apps;
+      mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
 
-       AddressValue remoteAddress (InetSocketAddress (wifiNodesInterfaces.GetAddress(0), port));
-       onoff.SetAttribute ("Remote", remoteAddress);
-       apps.Add (onoff.Install (wifiApNode.Get (0)));
-       apps.Start (Seconds (0.0));
-       apps.Stop (Seconds (t));
-     }
+      mobility.Install (wifiApNode);
+      mobility.Install (wifiStaNode);
 
-  
-   Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+      /* Internet stack*/
+      InternetStackHelper stack;
+      stack.Install (wifiApNode);
+      stack.Install (wifiStaNode);
 
-   Simulator::Stop (Seconds (t));
-   Simulator::Run ();
-   Simulator::Destroy ();
+      Ipv4AddressHelper address;
 
-   //UDP
-   if (udp)
-     {
-       uint32_t totalPacketsThrough = DynamicCast<UdpServer>(serverApps.Get (0))->GetReceived ();
-       throughput=totalPacketsThrough*1500*8/(t*1000000.0);
-     }
-   else
-     {
-       //TCP
-       uint32_t totalPacketsThrough = DynamicCast<PacketSink>(sink1App.Get (0))->GetTotalRx ();
-       throughput=totalPacketsThrough*8/((t-3)*1000000.0);
-     }
-  
-   std::cout << datarate <<"  " << throughput << '\n';
-   }
+      address.SetBase ("192.168.1.0", "255.255.255.0");
+      Ipv4InterfaceContainer wifiNodesInterfaces;
+      Ipv4InterfaceContainer apNodeInterface;
+
+      wifiNodesInterfaces = address.Assign (staDevices);
+      apNodeInterface = address.Assign (apDevice);
+
+      ApplicationContainer serverApps,sink1App;
+
+      /* Setting applications */
+      if (udp)
+        {
+          //UDP flow
+          UdpServerHelper myServer (9);
+          serverApps = myServer.Install (wifiStaNode.Get (0));
+          serverApps.Start (Seconds (0.0));
+          serverApps.Stop (Seconds (simulationTime));
+
+          UdpClientHelper myClient (wifiNodesInterfaces.GetAddress (0), 9);
+          myClient.SetAttribute ("MaxPackets", UintegerValue (4294967295));
+          myClient.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
+          myClient.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+
+          ApplicationContainer clientApps = myClient.Install (wifiApNode.Get (0));
+          clientApps.Start (Seconds (1.0));
+          clientApps.Stop (Seconds (simulationTime));
+        }
+      else
+        {
+          //TCP flow
+          uint16_t port = 50000;
+          Address apLocalAddress (InetSocketAddress (Ipv4Address::GetAny (), port));
+          PacketSinkHelper packetSinkHelper ("ns3::TcpSocketFactory", apLocalAddress);
+          sink1App = packetSinkHelper.Install (wifiStaNode.Get (0));
+
+          sink1App.Start (Seconds (0.0));
+          sink1App.Stop (Seconds (simulationTime));
+
+          OnOffHelper onoff ("ns3::TcpSocketFactory",Ipv4Address::GetAny ());
+          onoff.SetAttribute ("OnTime",  StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
+          onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
+          onoff.SetAttribute ("PacketSize", UintegerValue (payloadSize));
+          onoff.SetAttribute ("DataRate", DataRateValue (500000000)); //bit/s
+          ApplicationContainer apps;
+
+          AddressValue remoteAddress (InetSocketAddress (wifiNodesInterfaces.GetAddress (0), port));
+          onoff.SetAttribute ("Remote", remoteAddress);
+          apps.Add (onoff.Install (wifiApNode.Get (0)));
+          apps.Start (Seconds (1.0));
+          apps.Stop (Seconds (simulationTime));
+        }
+
+      Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+      Simulator::Stop (Seconds (simulationTime));
+      Simulator::Run ();
+      Simulator::Destroy ();
+
+      double throughput = 0;
+      if (udp)
+        {
+          //UDP
+          uint32_t totalPacketsThrough = DynamicCast<UdpServer> (serverApps.Get (0))->GetReceived ();
+          throughput = totalPacketsThrough * payloadSize * 8 / ((simulationTime - 1) * 1000000.0); //Mbit/s
+        }
+      else
+        {
+          //TCP
+          uint32_t totalPacketsThrough = DynamicCast<PacketSink> (sink1App.Get (0))->GetTotalRx ();
+          throughput = totalPacketsThrough * 8 / ((simulationTime - 1) * 1000000.0); //Mbit/s
+        }
+      std::cout << "DataRate" << "\t" << "Throughput" << '\n';
+      std::cout << datarate << "\t\t" << throughput << " Mbit/s" << std::endl;
+    }
   return 0;
-} 
+}