From f668fcadb24a1411defa66b679719c868554cf62 Mon Sep 17 00:00:00 2001
From: Kirill Andreev <andreev@iitp.ru>
Date: Wed, 2 Dec 2009 19:58:59 +0300
Subject: [PATCH] Mesh:Dot11s: fixed airtime metric

---
 src/devices/mesh/dot11s/airtime-metric.cc     |  34 ++++++++++++++----
 src/devices/mesh/dot11s/airtime-metric.h      |   2 ++
 src/devices/mesh/dot11s/hwmp-protocol.cc      |   1 +
 .../hwmp-proactive-regression-test-0-1.pcap   | Bin 8082 -> 8082 bytes
 .../hwmp-proactive-regression-test-1-1.pcap   | Bin 13024 -> 13024 bytes
 .../hwmp-proactive-regression-test-2-1.pcap   | Bin 14332 -> 14332 bytes
 .../hwmp-proactive-regression-test-3-1.pcap   | Bin 13660 -> 13660 bytes
 .../hwmp-proactive-regression-test-4-1.pcap   | Bin 8790 -> 8790 bytes
 .../hwmp-reactive-regression-test-0-1.pcap    | Bin 10772 -> 10772 bytes
 .../hwmp-reactive-regression-test-1-1.pcap    | Bin 15544 -> 15544 bytes
 .../hwmp-reactive-regression-test-2-1.pcap    | Bin 13894 -> 13894 bytes
 .../hwmp-reactive-regression-test-3-1.pcap    | Bin 9793 -> 9793 bytes
 .../hwmp-reactive-regression-test-4-1.pcap    | Bin 11487 -> 11487 bytes
 .../hwmp-reactive-regression-test-5-1.pcap    | Bin 9280 -> 9280 bytes
 ...hwmp-target-flags-regression-test-0-1.pcap | Bin 10632 -> 10632 bytes
 ...hwmp-target-flags-regression-test-1-1.pcap | Bin 14952 -> 14952 bytes
 ...hwmp-target-flags-regression-test-2-1.pcap | Bin 13418 -> 13418 bytes
 ...hwmp-target-flags-regression-test-3-1.pcap | Bin 7392 -> 7392 bytes
 src/devices/mesh/mesh-wifi-interface-mac.cc   |  10 ++++--
 src/devices/mesh/mesh-wifi-interface-mac.h    |   4 ++-
 20 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/devices/mesh/dot11s/airtime-metric.cc b/src/devices/mesh/dot11s/airtime-metric.cc
index b1b6e2863..127430df9 100644
--- a/src/devices/mesh/dot11s/airtime-metric.cc
+++ b/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 ();
diff --git a/src/devices/mesh/dot11s/airtime-metric.h b/src/devices/mesh/dot11s/airtime-metric.h
index 0f98cc480..0440ea9e1 100644
--- a/src/devices/mesh/dot11s/airtime-metric.h
+++ b/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
diff --git a/src/devices/mesh/dot11s/hwmp-protocol.cc b/src/devices/mesh/dot11s/hwmp-protocol.cc
index ae9b39765..f9c5eb90c 100644
--- a/src/devices/mesh/dot11s/hwmp-protocol.cc
+++ b/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
diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-0-1.pcap
index eaa0c63cf1d103a95680959a2425e450a21ee15b..cbe7163ed62b1c9ceefe2f0a0ba15522fb0db8a6 100644
GIT binary patch
delta 76
zcmbPaKgoW>R~E)4lfSX-Wt={F3u_Rg^=5W9duGP<lifK%LabatjBcAFxLO4!e`OJw
f{84HZP|!g}bn-@NTSm*t@1+A6r*C$U31S8SGx-|7

delta 79
zcmbPaKgoW>R~E)alfSX-Wt=*B3u_Rg`DS)DduGP9lifK%Labatj82;)xLO667BEcy
iAT2ietJE@}xPy%7<c-p{jHZ*{O9wDc-RvL}#0&s+&Kq3-

diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-1-1.pcap
index 1747c6bc3cc02268926de48557841f03a181a58c..96730b748f0ae6e0eb23583b80a14481c39ec34f 100644
GIT binary patch
delta 93
zcmaEm`XF_~26o0JlQ**OWt=`apQC`$dh-L0eQb>DfkMKQKk%_k-p0QSDD{C~baIhE
tG?N?S<OTd<o1Y5&m72VPU1ah%?Nvb8g*riumXp8e<bm0un=5oPSOF2TB`*K~

delta 97
zcmaEm`XF_~2KLF1v_&Q#VPC~Kb#gvO0i*fm2ORs@7}rkT$Syqj10T!eZT!oCQXlw5
vCl?7sGdVF%UcfK5`KiEPDaHk0HQ%&BS{LdBF`7>PqLT+^i*Bya&0qxpyQL<{

diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-2-1.pcap
index dd04cebe74ad62642987b775918cf7fead77cade..6563289d62c2d75d5d642be16db1de99dc0ed70f 100644
GIT binary patch
delta 80
zcmey9|0jRLKX%6HlmD~dWn41ZkzIW97mjeo>6?8x3pg0p0|kU9Ul3dcR8TEcz_<s>
bXPL|_3{n&=tSQHsHM!L=2gvzk$i)T#GT$B4

delta 80
zcmey9|0jRLKX%5clmD~dWn47bkzIW97mjeoshfQ`3pg0p0tJL8Ul3dcR8TEcz_<&_
bXPL|_3{n&=tSQHsF}c++2gvzk$i)T#FdrSl

diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-3-1.pcap
index af181764ae3ab86bbf1e545bb30370ebdb975b73..87b257b5c4b5f7b67e2f63398b62219cb14b01d0 100644
GIT binary patch
delta 83
zcmcbUbth|sB?se@$s2`*C;M`&Vw^tt2S)*uHRI#}HnGhOoCaKsdw_C#f#Ufh1&r~V
kABfzPWZVc=epYW4W7gyf{UAoa$*1)L7_&CZ7&x#305A(4djJ3c

delta 83
zcmcbUbth|sB?sf8$s2`*C;M`&Vw^hp2S)*uIpgF2HnGhOoCaKsyMS_gf#Ufh1&q;~
kABfzPWLytcepYW4W5(nP{UAoK$*1)L7&A7@7&x#304y^eVE_OC

diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap b/src/devices/mesh/dot11s/test/hwmp-proactive-regression-test-4-1.pcap
index e44c60329d97c0708555a148312ca8b18bb273e3..dee2051207d8c2a70461ff584f3723fde9a2ec42 100644
GIT binary patch
delta 79
zcmccSa?NFf6D#AA$<C~M8K+NXWD8=n-W<ZF$IiHCax*VT$dNCIF@EzDz6^e*jSQ3d
i<;5n8$Sq^cnj9}LI{AW}Eu-ILKKTH~tj+QA-<bduGZ{Dl

delta 79
zcmccSa?NFf6D#AQ$<C~M8K+KWWD8<6-yFiG$IiHGax*VT$dNCIF?#b9z6^e*^$e5w
i<;5n8$Sq^cm>e%JI{AW}Eu+_DKKTH~jLq@#-<bdqDH$FB

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-0-1.pcap
index 8459963684121c8860acfb426d40885330effb08..8e2ed37dec32e1f59030b01dd8edd0e370c09e35 100644
GIT binary patch
delta 24
gcmbOdG9_e#3m@aE$sc&dC&%!GGZt;$!j~Wo0CqVD+yDRo

delta 24
gcmbOdG9_e#3m@Z($sc&dC&%!GGiGhx!j~Wo0CnjI(f|Me

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
index 6a66fb7a897c8bc060c30d7117467ae921af3732..de77ff16d124ac9b8ebddbd8cbc32bca1e21d0e0 100644
GIT binary patch
delta 41
zcmV+^0M`GwdAND7(-Q%zlYbKzlj{>b0zm<jfD;yzKonO2%#)ZDYyon!1r@U=T7wS$

delta 41
zcmV+^0M`GwdAND7(-Q%xlYbKzlj{>b0zCnffD;yzKonO2#*>&7YyoPs1r@U=S#1vL

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-2-1.pcap
index 19de55c7264109cec230d698ff6a3041f5f216cc..b5d6c17f1b04ee17136bb6b0fc68c273b4bdf941 100644
GIT binary patch
delta 44
ycmX?>b1Y|rfH32#$%4WmjE<AjfaHzIyM^-@O($!K<S?F@JRL|DZDtX5QUm~GdJe<@

delta 44
ycmX?>b1Y|rfH32V$%4WmjJA{0faImgyM^-@4JT`f<S-taJRL}8ZDtX5QUm~EY7V9V

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
index 07dfd5dee389bbfa4813a5cbe0f5c2a5ca9708f1..d8bf4dc1cb514a0c6a1821f9f07db26d6dbb20e5 100644
GIT binary patch
delta 44
zcmX@;bI@l)qY$Ix<R+mI#v7Bb1Ihf!I>LF3^Cr(0&S5m2%psD)cxH2{$QeNZcjXWF

delta 44
zcmX@;bI@l)qY$I*<R+mI#!Hj01IhHsI>LF3b0*Ig&S5m1%psD)cx-d2$QeNZb!iXT

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-4-1.pcap
index c0d4880a42bb885c146b8bbea33138bd2f97423f..8598cdad95612fc96bb1b4fa1b560ad0ea36f268 100644
GIT binary patch
delta 117
zcmcZ~c|UT)7ZJuAlfR0DFy>G865Y!<Z!?G3Np8lx$sg5)Cr?mh+5A$`gb|5rstn_9
fu2s1OmD!xF24#wGj@5uF5Z}B~6R!577ECPwm@O=&

delta 117
zcmcZ~c|UT)7ZJuwlfR0DFs4uT65Y!<XETS`Np8lR$sg5)Cr?mh+5A$`gb|5rstn_9
fu2s1OmD!xF24#wGj@5uF5Z}B~6R!577ECPwj@2xM

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
index 08326518574e428d84b80b16dce30c833db14790..76da658c2c4c930cafcf2392aa815a98e007f6ec 100644
GIT binary patch
delta 102
zcmX@$alm84F@DDU$;bKkGS1uFDzKJ=F>i9cl=x;ZNfSoKyv_Ae-XQ9<^ji?MQx-%`
mo~Izbd7nH;9?axY1S_>yddn!1$H2hA$Oa@B7+Aq1kN^Nj!W}ID

delta 102
zcmX@$alm84F@DDM$;bKkGS1oDDzKJ=F=ukUl=x;ZNfSoKoXz!8-XQ9<^ji?MQx-%`
mo~Izbd7nH;9?axY1S_>yddn!1!@$76$Oa@B7+Aq1kN^Nc`W+Jh

diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
index 3b6768ae5645a68725176bdb04725eaea78fa8b0..3f42ab2263edc198b500ccdc13d580faea316b74 100644
GIT binary patch
delta 33
rcmV++0N($IQ;1Wrwg&;1leY(M0j9Gi2(JnOI+NBCy#bfAloRw7-{TD`

delta 33
rcmV++0N($IQ;1Wrwg&-~leY(M0i?4g2(JnOHj~y8y#bZ8loRw7-%kx7

diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-1-1.pcap
index bee8105d8ccd4105c884c4b84e6199356c8f0dda..f8e75cdee126aec09121ccf8a1cf738644901404 100644
GIT binary patch
delta 51
zcmaD+@}guz8yDmB$?aTw8JBH#<<8}0w4S_KA_yqNCK<wLH91;xFOV%MmBVPUxlQVk
FJOBvw5_SLp

delta 51
zcmaD+@}guz8yDl$$?aTw8JBE!<<8}0G@ra#A_yqNCK<wLHaS{yFOV%MmBVPVxlQVk
FJOBqZ5@G-V

diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-2-1.pcap
index 51140c84239c307dc30e5c254ad3b727b457758c..fcd2dce3b538ffecaf7b3eea524a6178f12583ca 100644
GIT binary patch
delta 60
zcmaEr@hW439~a~F$^Kk>8JA67z$Lm_iQAf+(Ry;6SOHM@yjTd6731U!Vq%l6#VvsX
PrQ$h^7MmZ5cgO$$oWT^j

delta 60
zcmaEr@hW439~a})$^Kk>8JA36z$Lm_iQAf+(R^~8SOHM@yjTd68RO&&Vq%l6#VvsX
PrQ$h^CYv9LcgO$$nyVD1

diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-3-1.pcap
index 53683489cbf7e590d1e6722e52f06d866ca17601..78232ddfe01405594332e3a318a2ff9861e9e464 100644
GIT binary patch
delta 26
icmaE0`M`2RBM+nX<R+d1#_5wk^PFO|*u0Ndi5~!z6ABps

delta 26
icmaE0`M`2RBM+nb<R+d1#;KD(^PFNd*}RWei5~!yn+gvA

diff --git a/src/devices/mesh/mesh-wifi-interface-mac.cc b/src/devices/mesh/mesh-wifi-interface-mac.cc
index 4e53a1378..e5404cbaa 100644
--- a/src/devices/mesh/mesh-wifi-interface-mac.cc
+++ b/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
 
diff --git a/src/devices/mesh/mesh-wifi-interface-mac.h b/src/devices/mesh/mesh-wifi-interface-mac.h
index 99bffce06..60bb5b0c5 100644
--- a/src/devices/mesh/mesh-wifi-interface-mac.h
+++ b/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