branch merge

src/devices/mesh/dot11s/airtime-metric.cc

@@ -30,12 +30,6 @@ AirtimeLinkMetricCalculator::GetTypeId ()
   static TypeId tid = TypeId ("ns3::dot11s::AirtimeLinkMetricCalculator")
     .SetParent<Object> ()
     .AddConstructor<AirtimeLinkMetricCalculator> ()
-    .AddAttribute ( "OverheadNanosec",
-                    "Overhead expressed in nanoseconds:DIFS+ SIFS + 2 * PREAMBLE + ACK",
-                    UintegerValue (108000),
-                    MakeUintegerAccessor (&AirtimeLinkMetricCalculator::m_overheadNanosec),
-                    MakeUintegerChecker<uint32_t> (1)
-                  )
     .AddAttribute ( "TestLength",
                     "Rate should be estimated using test length.",
                      UintegerValue (1024),
@@ -60,7 +54,32 @@ AirtimeLinkMetricCalculator::GetTypeId ()
                   ;
   return tid;
 }
-
+AirtimeLinkMetricCalculator::AirtimeLinkMetricCalculator () :
+  m_overheadNanosec (0)
+{}
+void
+AirtimeLinkMetricCalculator::SetPhyStandard (WifiPhyStandard standard)
+{
+  switch (standard) {
+  case WIFI_PHY_STANDARD_80211a:
+  case WIFI_PHY_STANDARD_holland:
+    // 2 * PREAMBLE + DIFS + SIFS + ACK
+    m_overheadNanosec = (2 * 16 + 34 + 16 + 44) * 1000;
+    break;
+  case WIFI_PHY_STANDARD_80211b:
+    m_overheadNanosec = (2 * 144 + 50 + 16 + 304) * 1000;
+    break;
+  case WIFI_PHY_STANDARD_80211_10Mhz: 
+    m_overheadNanosec = (2 * 32 + 58 + 32 + 88) * 1000;
+    break;
+  case WIFI_PHY_STANDARD_80211_5Mhz:
+    m_overheadNanosec = (2 * 64 + 106 + 64 + 176) * 1000;
+    break;
+  default:
+    NS_ASSERT (false);
+    break;
+  }
+}
 uint32_t
 AirtimeLinkMetricCalculator::CalculateMetric (Mac48Address peerAddress, Ptr<MeshWifiInterfaceMac> mac)
 {
@@ -80,6 +99,7 @@ AirtimeLinkMetricCalculator::CalculateMetric (Mac48Address peerAddress, Ptr<Mesh
 
   WifiRemoteStation * station = mac->GetStationManager ()->Lookup (peerAddress);
   NS_ASSERT (station != 0);
+  NS_ASSERT (m_overheadNanosec != 0);
   Ptr<Packet> test_frame = Create<Packet> (m_testLength + m_meshHeaderLength);
   uint32_t rate =
       station->GetDataMode (test_frame, m_testLength + m_meshHeaderLength).GetDataRate ();

src/devices/mesh/dot11s/airtime-metric.h

@@ -42,7 +42,9 @@ namespace dot11s {
 class AirtimeLinkMetricCalculator : public Object
 {
 public:
+  AirtimeLinkMetricCalculator ();
   static TypeId GetTypeId ();
+  void SetPhyStandard (WifiPhyStandard standard);
   uint32_t CalculateMetric (Mac48Address peerAddress, Ptr<MeshWifiInterfaceMac> mac);
 private:
   /// Overhead expressed in nanoseconds:DIFS + SIFS + 2 * PREAMBLE + ACK

src/devices/mesh/dot11s/hwmp-protocol.cc

@@ -710,6 +710,7 @@ HwmpProtocol::Install (Ptr<MeshPointDevice> mp)
       //Installing airtime link metric:
       Ptr<AirtimeLinkMetricCalculator> metric = CreateObject <AirtimeLinkMetricCalculator> ();
       mac->SetLinkMetricCallback (MakeCallback (&AirtimeLinkMetricCalculator::CalculateMetric, metric));
+      metric->SetPhyStandard (mac->GetPhyStandard ());
     }
   mp->SetRoutingProtocol (this);
   // Mesh point aggregates all installed protocols

src/devices/mesh/mesh-wifi-interface-mac.cc

@@ -81,7 +81,8 @@ MeshWifiInterfaceMac::GetTypeId ()
                   ;
   return tid;
 }
-MeshWifiInterfaceMac::MeshWifiInterfaceMac ()
+MeshWifiInterfaceMac::MeshWifiInterfaceMac () :
+  m_standard (WIFI_PHY_STANDARD_80211a)
 {
   NS_LOG_FUNCTION (this);
 
@@ -747,7 +748,12 @@ MeshWifiInterfaceMac::FinishConfigureStandard (enum WifiPhyStandard standard)
       NS_ASSERT (false);
       break;
     }
+  m_standard = standard;
+}
+WifiPhyStandard
+MeshWifiInterfaceMac::GetPhyStandard () const
+{
+  return m_standard;
 }
-
 } // namespace ns3
 

src/devices/mesh/mesh-wifi-interface-mac.h

@@ -159,6 +159,7 @@ public:
   /// Enable/disable beacons
   void SetBeaconGeneration (bool enable);
   void SetQueue (AccessClass ac);
+  WifiPhyStandard GetPhyStandard () const;
   virtual void FinishConfigureStandard (enum WifiPhyStandard standard);
 private:
   /// Frame receive handler
@@ -246,7 +247,8 @@ private:
   ///\}
   TracedCallback<WifiMacHeader const &> m_txOkCallback;
   TracedCallback<WifiMacHeader const &> m_txErrCallback;
-
+  /// Current PHY standard: needed to configure metric
+  WifiPhyStandard m_standard;
 };
 
 } // namespace ns3