From ced0a2e349785c33ba608cb649ef9f9d568eebc5 Mon Sep 17 00:00:00 2001
From: Stefano Avallone <stavallo@unina.it>
Date: Fri, 12 Mar 2021 17:43:05 +0100
Subject: [PATCH] doc: Update wifi documentation

---
 CHANGES.html                                  |   4 +-
 RELEASE_NOTES                                 |   4 +
 doc/models/Makefile                           |   2 +
 src/wifi/doc/Makefile                         |   4 +-
 src/wifi/doc/source/figures/FemHierarchy.dia  | Bin 0 -> 1392 bytes
 .../doc/source/figures/WifiArchitecture.dia   | Bin 4134 -> 4232 bytes
 src/wifi/doc/source/wifi-design.rst           | 130 ++++++++++++------
 7 files changed, 99 insertions(+), 45 deletions(-)
 create mode 100644 src/wifi/doc/source/figures/FemHierarchy.dia

diff --git a/CHANGES.html b/CHANGES.html
index 928c4514c..117bb38d2 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -56,10 +56,11 @@ us a note on ns-developers mailing list.</p>
 <ul>
 <li>Added <b>FqCobalt</b> queue disc with L4S features and set associative hash.</li>
 <li>Added <b>FqPIE</b> queue disc with <b>L4S</b> mode</li>
+<li>Added the ability to configure the primary 20 MHz channel for 802.11 devices operating on channels of width greater than 20 MHz.</li>
 </ul>
 <h2>Changes to existing API:</h2>
 <ul>
-<li></li>
+<li>The WifiAckPolicySelector class has been replaced by the WifiAckManager class. Correspondingly, the ConstantWifiAckPolicySelector has been replaced by the WifiDefaultAckManager class. A new WifiProtectionManager abstract base class and WifiDefaultProtectionManager concrete class have been added to implement different protection policies.</li>
 </ul>
 <h2>Changes to build system:</h2>
 <ul>
@@ -69,6 +70,7 @@ us a note on ns-developers mailing list.</p>
 <ul>
 <li>The default <b>TCP congestion control</b> has been changed from NewReno to CUBIC.</li>
 <li>The PHY layer of the wifi module has been refactored: the amendment-specific logic has been ported to <b>PhyEntity</b> classes and <b>WifiPpdu</b> classes.</li>
+<li>The MAC layer of the wifi module has been refactored. The MacLow class has been replaced by a hierarchy of FrameExchangeManager classes, each adding support for the frame exchange sequences introduced by a given amendment.</li>
 <li>The 802.11a-like PHY configuration known as <b>Holland</b> has been removed from the wifi module. It was added in the 2005 timeframe for Wi-Fi rate control research but hasn't been used for quite some time.</li>
 <li>Support for <b>Greenfield mode</b> (aka <b>HT_GF</b>) has been dropped from wifi.</li>
 <li>Some wifi/src/model files were moved to <b>non-ht</b>, <b>ht</b>, <b>vht</b>, <b>he</b>, and <b>rate-control</b> subfolders.</li>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index d51d88823..f6f8ab53d 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -28,9 +28,13 @@ New user-visible features
 -------------------------
 - (sixlowpan) Added support for stateful (i.e., context-based) RFC6282 compression.
 - (wifi) The PHY layer has been refactored: the amendment-specific logic has been ported to PhyEntity classes and WifiPpdu classes
+- (wifi) The MAC layer has been refactored. The MacLow class has been replaced by a hierarchy of FrameExchangeManager classes, each adding support for the frame exchange sequences introduced by a given amendment.
 - (wifi) Holland PHY configuration has been removed from the model
 - (wifi) HT Greenfield (HT_GF) preamble support has been removed from the model
+- (wifi) Added the ability to configure the primary 20 MHz channel for 802.11 devices operating on channels of width greater than 20 MHz
 - (wifi) Some wifi/src/model files were moved to the relevant subfolders (non-ht, ht, vht, he, and rate-control)
+- (wifi) Stations perform TXOP recovery if the transmission of a non-initial MPDU in a TXOP fails
+- (wifi) Stations keep track of the TXOP holder and ignore the NAV when they receive an RTS frame from the TXOP holder
 - (traffic-control) Added FqCobalt queue disc with L4S features and set associative hash.
 - (traffic-control) Added FqPIE queue disc with L4S mode.
 
diff --git a/doc/models/Makefile b/doc/models/Makefile
index 7b2494ff7..11c682548 100644
--- a/doc/models/Makefile
+++ b/doc/models/Makefile
@@ -139,6 +139,7 @@ SOURCEFIGS = \
 	$(SRC)/wifi/doc/source/figures/WifiArchitecture.dia \
 	$(SRC)/wifi/doc/source/figures/PhyEntityHierarchy.dia \
 	$(SRC)/wifi/doc/source/figures/WifiPpduHierarchy.dia \
+	$(SRC)/wifi/doc/source/figures/FemHierarchy.dia \
 	$(SRC)/wifi/doc/source/figures/snir.dia \
 	$(SRC)/wifi/doc/source/figures/clear-channel.eps \
 	$(SRC)/wifi/doc/source/figures/nist-frame-success-rate.eps \
@@ -358,6 +359,7 @@ IMAGES_EPS = \
 	$(FIGURES)/WifiArchitecture.eps \
 	$(FIGURES)/PhyEntityHierarchy.eps \
 	$(FIGURES)/WifiPpduHierarchy.eps \
+	$(FIGURES)/FemHierarchy.eps \
 	$(FIGURES)/snir.eps \
 	$(FIGURES)/WimaxArchitecture.eps \
 	$(FIGURES)/epc-ctrl-arch.eps \
diff --git a/src/wifi/doc/Makefile b/src/wifi/doc/Makefile
index 310e3c21c..a43ffb2dd 100644
--- a/src/wifi/doc/Makefile
+++ b/src/wifi/doc/Makefile
@@ -12,7 +12,8 @@ IMAGES_DIA = \
 	$(FIGURES)/snir.dia \
 	$(FIGURES)/WifiArchitecture.dia \
 	$(FIGURES)/PhyEntityHierarchy.dia \
-	$(FIGURES)/WifiPpduHierarchy.dia
+	$(FIGURES)/WifiPpduHierarchy.dia \
+	$(FIGURES)/FemHierarchy.dia
 
 # specify eps figures from which .png and .pdf figures need to be built
 
@@ -21,6 +22,7 @@ IMAGES_EPS = \
 	$(FIGURES)/WifiArchitecture.eps \
 	$(FIGURES)/PhyEntityHierarchy.eps \
 	$(FIGURES)/WifiPpduHierarchy.eps \
+	$(FIGURES)/FemHierarchy.eps \
         $(FIGURES)/clear-channel.eps \
         $(FIGURES)/nist-frame-success-rate.eps \
         $(FIGURES)/nist-frame-success-rate-n.eps \
diff --git a/src/wifi/doc/source/figures/FemHierarchy.dia b/src/wifi/doc/source/figures/FemHierarchy.dia
new file mode 100644
index 0000000000000000000000000000000000000000..5ee5fef3d641de9894ac3fab1993996f2f0446c1
GIT binary patch
literal 1392
zcmV-$1&{h4iwFP!000021MOQ~Z=*OAeebV8^tIy{3>ao69ciTP&clpWEA8xS<ph_o
zL+r>nZL<&i+sAx#8z3YEhqP0H)Jis&du(H$bFXneetKLc#yu5j%-Phm05lEC<~)p9
zG&R5fb@R?QKV4sZ3}f<M{Y8Q-4fO;|v(nUDNV$4HnLIo^fMk;r$puK_HAv~?KawP5
zqKqcy^@U+<I|zv+SzTF6q!jUNEvdoCl1|MTng56cU$f9GtV+8%Pq;AdNisDr@AAu>
zlx`*!KYM(yNJM9Xk{|7^p}K;gkLwi`b+^kEPh({wH>-w8i=XWOmQ87uDkBzMUw)-h
zQgK-{tE_zXx2v(OKypb$6tgCl8lR*X3>&y8$S%+FT?B26p2p>PxY>E(lJmle^TNgH
z?TQO2NGzL>GtLuASb-|Vn)b&@=Oj^6Y+tvm{@(9mDfxl+-;pHk(t)D-{}p%a>WxGk
z?q9qWixw{raVQtJj{^-?;e9iZ_xm`FX9?Za`k2X+x!;_|ef{m^4F3GM=4>duwMs<j
zQ<u8OOGLDeLz*6#W>uROPm9uQa%j}+c3lUisHzEe4v~-z6{Y*n&r)raFSukJgUn@o
z|5Vx<6F&Qg&Slxz@87-}?~LCmqeAh_zeK7a#N3KTOd}4b<{z*+Wc5xemx>J=W47YY
z6AJ;)wcRTlg1|<8eK?wA(grh|)lr1%4PjA2OC%fkut4%L@;_J(aPu+(5ISx@<Rz8F
zJg@-5crJVPODI;!2dmc*?lHB2jXmp-DL%>&;ok2r>n9g6WwPE+%GS$W6jZ$j_uR8I
z+C<hWZsw}8-mHB>cnpf9kMcGnu(fDTqiW;}VLu2JCD4H(YJqVjEZ!LqALBe#Q8ne+
zQaTyLoHM4#K`~j{7?Gzt#)7agBTbcdNv^2QHjU@I*|cxWxg8H%<-=C>VY^BDwH6iC
z1tqs}^i9Ga<_jXEV(QQQaf_Z|NzaxpJ^KLbuI(<|tYGXM#?FY@2c9Z9d8r>LP3Th1
zdBK`V-AOx_<K)3#vx858UjT5heffa~)`G^-LbiihAb^#tC;O!f{&2e^-9Mbi9D}kV
zVOY&!YTbdr?a!-+bh&2JN<X5WX4UBDPoCbWP>lZes1_rO=r_Vh)VdR}Cwy+p#W<6@
z@Uwd3jx6J3qnb%rY8t8Bl$2FG`h_O<RK|0%%~i*@pfT%qzAC>u^Pr;#S|z4Ek%#&Z
zeLbvdR?$%*`v9p}I$}$@`-Qf|I{Ol?T{%Nr-g6Q~v2_(C0LZ<v0sx1N_7%*P5|RKH
zf&yU?ALC&aMZa@h6h-MHbhZ`68x`eEDat4(FC`~s9&Nj$pqxoikiMWmOT9D~;J%wU
z9aEIR%VE60%@hS;Rl-?mSV7V4T(=Yj!AgpPM?ra0g7QU<lJbHXil+k4z#bLlJc{Dz
zZ+iJ&76$~tvOF}XrubF?1U(OBs^Z#8R*;pKhu!+p?_xJ)@ho?H$=Rc_yeVb*dofDO
z3rY)u0J+c|rR6-*;_6FFp!nSej*kaUR&o@Tq-3h%I9JHYOT%i4Zr{2oii0ZOQ`}Ke
z-d3(cM?rZ(K|ui979IuV6oS(65S4d|LsU5XVr~!nnLfj@vkz_#wCxWT%D>vX00+PL
z>8TxKr*EjUA=%|T)OhA;Jo7a4nI}u<%o7^o%u`27#iyavY$s;eEuex@RT^hG4lXGb
zWxq$jzdWZl22bBmD{&f0btKi-K&p-osk$#ns{V=MR1Ca9Kh>6Dss}Je&Qq8g0IT<&
y`YVc4Yh$Nvr}d3vWYm#SUjw5e9Y%F@8MP?qKfb!YsQfzX`r;>^ft>@zJpcfHCZ}5f

literal 0
HcmV?d00001

diff --git a/src/wifi/doc/source/figures/WifiArchitecture.dia b/src/wifi/doc/source/figures/WifiArchitecture.dia
index e41cd96dadb5ec7b663711812312a0f265b0c86e..f5da3832d8d40f881a70712c70633947a079ab5f 100644
GIT binary patch
literal 4232
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

literal 4134
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

diff --git a/src/wifi/doc/source/wifi-design.rst b/src/wifi/doc/source/wifi-design.rst
index c93d7f6a5..f89d3c2ac 100644
--- a/src/wifi/doc/source/wifi-design.rst
+++ b/src/wifi/doc/source/wifi-design.rst
@@ -51,9 +51,9 @@ The implementation is modular and provides roughly three sublayers of models:
 * the **PHY layer models**: they model amendment-specific and common
   PHY layer operations and functions.
 * the so-called **MAC low models**: they model functions such as medium
-  access (DCF and EDCA), RTS/CTS and ACK.  In |ns3|, the lower-level MAC
-  is further subdivided into a **MAC low** and **MAC middle** sublayering,
-  with channel access grouped into the **MAC middle**.   
+  access (DCF and EDCA), frame protection (RTS/CTS) and acknowledgment (ACK/BlockAck).
+  In |ns3|, the lower-level MAC is comprised of a **Frame Exchange Manager** hierarchy,
+  a **Channel Access Manager** and a **MAC middle** entity.
 * the so-called **MAC high models**: they implement non-time-critical processes
   in Wifi such as the MAC-level beacon generation, probing, and association 
   state machines, and a set of **Rate control algorithms**.  In the literature,
@@ -102,17 +102,16 @@ MAC low layer
 
 The **MAC low layer** is split into three main components:
 
-#. ``ns3::MacLow`` which takes care of RTS/CTS/DATA/ACK transactions and also
-   performs MPDU aggregation.
-#. ``ns3::ChannelAccessManager`` and ``ns3::DcfState`` which implements the DCF and EDCAF
+#. ``ns3::FrameExchangeManager`` a class hierarchy which implement the frame exchange
+   sequences introduced by the supported IEEE 802.11 amendments. It also handles
+   frame aggregation, frame retransmissions, protection and acknowledgment.
+#. ``ns3::ChannelAccessManager`` which implements the DCF and EDCAF
    functions.
-#. ``ns3::Txop`` and ``ns3::QosTxop`` which handle the packet queue,
-   packet fragmentation, and packet retransmissions if they are needed.
+#. ``ns3::Txop`` and ``ns3::QosTxop`` which handle the packet queue.
    The ``ns3::Txop`` object is used by high MACs that are not QoS-enabled,
    and for transmission of frames (e.g., of type Management)
    that the standard says should access the medium using the DCF. 
-   ``ns3::QosTxop`` is is used by QoS-enabled high MACs and also
-   performs MSDU aggregation.
+   ``ns3::QosTxop`` is used by QoS-enabled high MACs.
 
 PHY layer models
 ================
@@ -845,6 +844,84 @@ deal with:
 * MSDU aggregation,
 * etc.
 
+Frame Exchange Managers
+#######################
+As the IEEE 802.11 standard evolves, more and more features are added and it is
+more and more difficult to have a single component handling all of the allowed
+frame exchange sequences. A hierarchy of FrameExchangeManager classes has been
+introduced to make the code clean and scalable, while avoiding code duplication.
+Each FrameExchangeManager class handles the frame exchange sequences introduced
+by a given amendment. The FrameExchangeManager hierarchy is depicted in Figure
+:ref:`fem-hierarchy`.
+
+.. _fem-hierarchy:
+
+.. figure:: figures/FemHierarchy.*
+
+   *FrameExchangeManager hierarchy*
+
+The features supported by every FrameExchangeManager class are as follows:
+
+* ``FrameExchangeManager`` is the base class. It handles the basic sequences
+  for non-QoS stations: MPDU followed by Normal Ack, RTS/CTS and CTS-to-self,
+  NAV setting and resetting, MPDU fragmentation
+* ``QosFrameExchangeManager`` adds TXOP support: multiple protection setting,
+  TXOP truncation via CF-End, TXOP recovery, ignore NAV when responding to an
+  RTS sent by the TXOP holder
+* ``HtFrameExchangeManager`` adds support for Block Ack (compressed variant),
+  A-MSDU and A-MPDU aggregation, Implicit Block Ack Request policy
+* ``VhtFrameExchangeManager`` adds support for S-MPDUs
+* ``HeFrameExchangeManager`` is empty for now
+
+Ack manager
+###########
+
+Since the introduction of the IEEE 802.11e amendment, multiple acknowledgment policies
+are available, which are coded in the Ack Policy subfield in the QoS Control field of
+QoS Data frames (see Section 9.2.4.5.4 of the IEEE 802.11-2016 standard). For instance,
+an A-MPDU can be sent with the *Normal Ack or Implicit Block Ack Request* policy, in which
+case the receiver replies with a Normal Ack or a Block Ack depending on whether the A-MPDU
+contains a single MPDU or multiple MPDUs, or with the *Block Ack* policy, in which case
+the receiver waits to receive a Block Ack Request in the future to which it replies with
+a Block Ack.
+
+``WifiAckManager`` is the abstract base class introduced to provide an interface
+for multiple ack managers. Currently, the default ack manager is
+the ``WifiDefaultAckManager``.
+
+WifiDefaultAckManager
+#####################
+
+The ``WifiDefaultAckManager`` allows to determine which acknowledgment policy
+to use depending on the value of its attributes:
+
+* UseExplicitBar: used to determine the ack policy to use when a response is needed from
+  the recipient and the current transmission includes multiple frames (A-MPDU) or there are
+  frames transmitted previously for which an acknowledgment is needed. If this attribute is
+  true, the *Block Ack* policy is used. Otherwise, the *Implicit Block Ack Request* policy is used.
+* BaThreshold: used to determine when the originator of a Block Ack agreement needs to
+  request a response from the recipient. A value of zero means that a response is requested
+  at every frame transmission. Otherwise, a non-zero value (less than or equal to 1) means
+  that a response is requested upon transmission of a frame whose sequence number is distant
+  at least BaThreshold multiplied by the transmit window size from the starting sequence
+  number of the transmit window.
+
+Protection manager
+##################
+
+The protection manager is in charge of determining the protection mechanism to use,
+if any, when sending a frame.
+
+``WifiProtectionManager`` is the abstract base class introduced to provide an interface
+for multiple protection managers. Currently, the default protection manager is
+the ``WifiDefaultProtectionManager``.
+
+WifiDefaultProtectionManager
+############################
+
+The ``WifiDefaultProtectionManager`` selects a protection mechanism based on the
+information provided by the remote station manager.
+
 Rate control algorithms
 #######################
 
@@ -954,39 +1031,6 @@ MinstrelHtWifiManager
 
 This is the extension of minstrel for 802.11n/ac/ax.
 
-Ack policy selection
-####################
-
-Since the introduction of the IEEE 802.11e amendment, multiple acknowledgment policies
-are available, which are coded in the Ack Policy subfield in the QoS Control field of
-QoS Data frames (see Section 9.2.4.5.4 of the IEEE 802.11-2016 standard). For instance,
-an A-MPDU can be sent with the *Normal Ack or Implicit Block Ack Request* policy, in which
-case the receiver replies with a Normal Ack or a Block Ack depending on whether the A-MPDU
-contains a single MPDU or multiple MPDUs, or with the *Block Ack* policy, in which case
-the receiver waits to receive a Block Ack Request in the future to which it replies with
-a Block Ack.
-
-``WifiAckPolicySelector`` is the abstract base class introduced to provide an interface
-for multiple ack policy selectors. Currently, the default ack policy selector is
-the ``ConstantWifiAckPolicySelector``.
-
-ConstantWifiAckPolicySelector
-#############################
-
-The ``ConstantWifiAckPolicySelector`` allows to determine which acknowledgment policy
-to use depending on the value of its attributes:
-
-* UseExplicitBar: used to determine the ack policy to use when a response is needed from
-  the recipient and the current transmission includes multiple frames (A-MPDU) or there are
-  frames transmitted previously for which an acknowledgment is needed. If this attribute is
-  true, the *Block Ack* policy is used. Otherwise, the *Implicit Block Ack Request* policy is used.
-* BaThreshold: used to determine when the originator of a Block Ack agreement needs to
-  request a response from the recipient. A value of zero means that a response is requested
-  at every frame transmission. Otherwise, a non-zero value (less than or equal to 1) means
-  that a response is requested upon transmission of a frame whose sequence number is distant
-  at least BaThreshold multiplied by the transmit window size from the starting sequence
-  number of the transmit window.
-
 802.11ax OBSS PD spatial reuse
 ##############################