Network: fix TCP retry counter handling (#128)

furbanc · web-flow · commit d17989a78810 · 2026-03-03T12:13:17.000+01:00
diff --git a/Components/Network/Include/rl_net.h b/Components/Network/Include/rl_net.h
@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::Network
- * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2026 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    rl_net.h
  * Purpose: Network API
@@ -18,7 +18,7 @@
 /// Network component version
 #define MW_NET_VERSION_MAJOR    8
 #define MW_NET_VERSION_MINOR    2
-#define MW_NET_VERSION_PATCH    0
+#define MW_NET_VERSION_PATCH    1
 
 #ifdef __cplusplus
 extern "C"  {
diff --git a/Components/Network/Network.scvd b/Components/Network/Network.scvd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
-  <component name="Network" shortname="NET" version="8.2.0"/>    <!-- name and version of the component  -->
+  <component name="Network" shortname="NET" version="8.2.1"/>    <!-- name and version of the component  -->
 
   <typedefs>
     <!-- Network Library variant -->
diff --git a/Components/Network/Source/net_lib.h b/Components/Network/Source/net_lib.h
@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::Network
- * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2026 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    net_lib.h
  * Purpose: Network Library Definitions
@@ -225,7 +225,7 @@ typedef struct net_udp_info {
 typedef struct net_tcp_info {
   uint8_t  State;                       ///< Socket state
   uint8_t  Type;                        ///< Socket type
-  uint8_t  Flags;                       ///< State flags
+  uint16_t Flags;                       ///< State flags
   uint16_t LocPort;                     ///< Local TCP port
   uint8_t  Tos;                         ///< Type of Service for IPv4
   uint8_t  TClass;                      ///< Traffic class/packet priority for IPv6
diff --git a/Components/Network/Source/net_tcp.c b/Components/Network/Source/net_tcp.c
@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::Network
- * Copyright (c) 2004-2025 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2026 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    net_tcp.c
  * Purpose: Transmission Control Protocol
@@ -490,14 +490,18 @@ netStatus net_tcp_send (int32_t socket, uint8_t *buf, uint32_t len) {
 
   net_mem_shrink (frame, TCP_DATA_OFFS + len);
   tcp_s->Flags |= TCP_IFLAG_DACK;
+  /* Check queue retransmit status */
   if (!(tcp_s->Flags & TCP_IFLAG_RESEND)) {
-    /* Not in retransmit, send a frame now */
+    /* Not active, send a frame now */
     tcp_s->Flags     |=  TCP_IFLAG_PUSH;
     tcp_s->Flags     &= ~TCP_IFLAG_KALIVE;
     tcp_send_data (tcp_s, frame, len);
-    /* Calculate RTO and set a retransmit timer */
-    tcp_s->RetryTimer = (uint16_t)((tcp_s->RttSa >> 3) + tcp_s->RttSv);
-    tcp_s->Retries    = tcp->MaxRetry;
+    /* Check timeout recovery status */
+    if (!(tcp_s->Flags & TCP_IFLAG_TIMEOUT)) {
+      /* Inactive, set retry timer and counter */
+      tcp_s->RetryTimer = (uint16_t)((tcp_s->RttSa >> 3) + tcp_s->RttSv);
+      tcp_s->Retries    = tcp->MaxRetry;
+    }
     tcp_s->AliveTimer = tcp_s->ConnTout;
   }
   else {
@@ -1207,8 +1211,9 @@ void net_tcp_socket_run (void) {
           }
           /* Make sure fast recovery mode is not active */
           tcp_s->DupAcks = 0;
-          /* Retransmit all frames from the queue */
           tcp_s->Flags  &= ~TCP_IFLAG_FAST;
+          /* Initialize the queue for timeout recovery */
+          tcp_s->Flags  |=  TCP_IFLAG_TIMEOUT;
           tcp_que_init (tcp_s);
           tcp_que_resend (tcp_s);
           return;
@@ -2453,7 +2458,7 @@ static void tcp_proc_acknr (NET_TCP_INFO *tcp_s, uint32_t acknr) {
     tcp_s->SendChk = acknr;
   }
 
-  /* Release the acked data from the queue */
+  /* Calculate RTT estimation */
   next = tcp_s->unack_list;
   if (TCP_QUE(next)->ticks) {
     /* Timestamp exists, do RTT estimation calculations. This */
@@ -2470,12 +2475,17 @@ static void tcp_proc_acknr (NET_TCP_INFO *tcp_s, uint32_t acknr) {
     DEBUG_INFO (tcp_s);
     EvrNetTCP_ShowRttVariables (tcp_s->Id, tcp_s->RttSa, tcp_s->RttSv);
   }
-  tcp_s->unack_list = NULL;
   if (frame != NULL) {
-    /* Markup the release edge (next = NULL) */
+    /* Mark the release edge (next = NULL) */
     tcp_s->unack_list = TCP_QUE(frame)->next;
-    TCP_QUE(frame)->next= NULL;
+    TCP_QUE(frame)->next = NULL;
   }
+  else {
+    /* All data in the queue is acked */
+    tcp_s->unack_list = NULL;
+    tcp_s->Flags &= ~TCP_IFLAG_TIMEOUT;
+  }
+  /* Release the acked data from the queue */
   for (frame = next; frame; frame = next) {
     next = TCP_QUE(frame)->next;
     net_mem_free (frame);
diff --git a/Components/Network/Source/net_tcp.h b/Components/Network/Source/net_tcp.h
@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------------
  * MDK Middleware - Component ::Network
- * Copyright (c) 2004-2024 Arm Limited (or its affiliates). All rights reserved.
+ * Copyright (c) 2004-2026 Arm Limited (or its affiliates). All rights reserved.
  *------------------------------------------------------------------------------
  * Name:    net_tcp.h
  * Purpose: Transmission Control Protocol Definitions
@@ -44,14 +44,15 @@
 #define TCP_FLAG_URG        0x20        // Urgent Pointer Field significant
 
 /* TCP Internal Flags */
-#define TCP_IFLAG_CLOSING   0x01        // Socket Close pending
-#define TCP_IFLAG_KALIVE    0x02        // Keep alive recovery state
-#define TCP_IFLAG_RESEND    0x04        // Resend the buffered data
-#define TCP_IFLAG_FAST      0x08        // Fast Recovery active
-#define TCP_IFLAG_CBACK     0x10        // Callback context active
-#define TCP_IFLAG_DACK      0x20        // Callback ACK notification pending
-#define TCP_IFLAG_KSEG      0x40        // Send Keep Alive segment
-#define TCP_IFLAG_PUSH      0x80        // Push the data (set PSH flag)
+#define TCP_IFLAG_CLOSING   0x0001      // Socket Close pending
+#define TCP_IFLAG_KALIVE    0x0002      // Keep alive recovery state
+#define TCP_IFLAG_RESEND    0x0004      // Resend the buffered data
+#define TCP_IFLAG_FAST      0x0008      // Fast Recovery active
+#define TCP_IFLAG_CBACK     0x0010      // Callback context active
+#define TCP_IFLAG_DACK      0x0020      // Callback ACK notification pending
+#define TCP_IFLAG_KSEG      0x0040      // Send Keep Alive segment
+#define TCP_IFLAG_PUSH      0x0080      // Push the data (set PSH flag)
+#define TCP_IFLAG_TIMEOUT   0x0100      // Timeout Recovery active
 
 /* TCP Socket Types */
 #define TCP_TYPE_DELAY_ACK  0x01        // Delayed Acknowledge enabled
diff --git a/Documentation/Doxygen/General/src/revision_history.md b/Documentation/Doxygen/General/src/revision_history.md
@@ -9,6 +9,14 @@
     <th>Version</th>
     <th>Description</th>
   </tr>
+  <tr>
+    <td>V8.2.1</td>
+    <td>
+      - Network Component Version 8.2.1
+      - FileSystem Component Version 8.0.2 (unchanged)
+      - USB Component Version 8.0.1 (unchanged)
+    </td>
+  </tr>
   <tr>
     <td>V8.2.0</td>
     <td>
diff --git a/Documentation/Doxygen/Network/src/revision_history.md b/Documentation/Doxygen/Network/src/revision_history.md
@@ -5,6 +5,12 @@
       <th>Version</th>
       <th>Description</th>
     </tr>
+    <tr>
+      <td>V8.2.1</td>
+      <td>
+        - fixed TCP retry counter handling during timeout recovery in \ref netTCP_Send
+      </td>
+    </tr>
     <tr>
       <td>V8.2.0</td>
       <td>
diff --git a/Keil.MDK-Middleware.pdsc b/Keil.MDK-Middleware.pdsc
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package schemaVersion="1.7.36" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="https://raw.githubusercontent.com/Open-CMSIS-Pack/Open-CMSIS-Pack-Spec/v1.7.36/schema/PACK.xsd">
+<package schemaVersion="1.7.45" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="https://raw.githubusercontent.com/Open-CMSIS-Pack/Open-CMSIS-Pack-Spec/v1.7.45/schema/PACK.xsd">
   <vendor>Keil</vendor>
   <name>MDK-Middleware</name>
   <description overview="Documentation/README.md">Middleware for Arm based processors</description>
@@ -14,6 +14,8 @@
   <releases>
     <release version="8.2.1-dev">
       Active development ...
+      Network Component Version 8.2.1
+      - fixed TCP retry counter handling during timeout recovery in netTCP_Send
     </release>
     <release version="7.17.0" date="2024-01-17">
       Network Component Version 7.19.0
@@ -681,7 +683,7 @@
   <components>
 
     <!-- Network (MDK) -->
-    <bundle Cbundle="MDK" Cclass="Network" Cversion="8.2.0">
+    <bundle Cbundle="MDK" Cclass="Network" Cversion="8.2.1">
       <description>IPv4/IPv6 Networking using Ethernet or Serial protocols</description>
       <doc>Documentation/html/Network/index.html</doc>
       <component Cgroup="CORE" condition="CMSIS Core with RTOS">
