zigbee: Fix malformed RREP command (missing command options)

Author: Alberto Gallegos Ramonet

CHANGES.md

@@ -29,6 +29,7 @@ This file is a best-effort approach to solving this issue; we will do our best b
 ### Changed behavior
 
 * (core) `RealTimeSimulatorImpl::Now` uses real time instead of the time of the last event call.
+* (zigbee) Adjust pedantic link cost requirement in ``NeighborTable::LookUpForBestParent``, a minimum link cost of 3 is not required now.
 
 ## Changes from ns-3.43 to ns-3.44
 

RELEASE_NOTES.md

@@ -35,6 +35,7 @@ been tested on Linux. As of this release, the latest known version to work with
 ### Bugs fixed
 
 - (wifi) #2368 - Fix various issues related to Content Channels and RU allocation. Fixes mostly covers cases where OFDMA is used with central 26 tones, where a single user is being assigned the whole PPDU bandwidth or where a RU is larger than 20 MHz.
+- (zigbee) !2383 - Fix malformed RREP command with missing command options field.
 
 ## Release 3.44
 

src/zigbee/model/zigbee-nwk-payload-header.cc

@@ -372,10 +372,29 @@ void
 ZigbeePayloadRouteReplyCommand::Serialize(Buffer::Iterator start) const
 {
     Buffer::Iterator i = start;
+
+    uint8_t cmdOption = 0;
+    if (m_cmdOptOrigIeeeAddr)
+    {
+        cmdOption |= (1 << 4);
+    }
+
+    if (m_cmdOptRespIeeeAddr)
+    {
+        cmdOption |= (1 << 5);
+    }
+
+    if (m_cmdOptMcst)
+    {
+        cmdOption |= (1 << 6);
+    }
+    i.WriteU8(cmdOption);
+
     i.WriteU8(m_routeReqId);
     WriteTo(i, m_origAddr);
     WriteTo(i, m_respAddr);
     i.WriteU8(m_pathCost);
+
     if (m_cmdOptOrigIeeeAddr)
     {
         WriteTo(i, m_origIeeeAddr);
@@ -391,10 +410,17 @@ uint32_t
 ZigbeePayloadRouteReplyCommand::Deserialize(Buffer::Iterator start)
 {
     Buffer::Iterator i = start;
+
+    uint8_t cmdOption = i.ReadU8();
+    m_cmdOptOrigIeeeAddr = (cmdOption & (1 << 4)) != 0;
+    m_cmdOptRespIeeeAddr = (cmdOption & (1 << 5)) != 0;
+    m_cmdOptMcst = (cmdOption & (1 << 6)) != 0;
+
     m_routeReqId = (i.ReadU8());
     ReadFrom(i, m_origAddr);
     ReadFrom(i, m_respAddr);
     m_pathCost = (i.ReadU8());
+
     if (m_cmdOptOrigIeeeAddr)
     {
         ReadFrom(i, m_origIeeeAddr);