Release 6.2.1 on 08 Mar 2023. Expand to see details.v6.2.1_rel

29eee6fe8 Update function header and version to 6.2.1
e22a02169 Fix compile errors in TLS
3e0a14c1c Fix network driver for regression test.
442f3adfa Fix compiler warnings in NetXDuo

7 files changed, 45 insertions, 22 deletions

diff --git a/common/inc/nx_api.h b/common/inc/nx_api.h
index 9b20cf8c..8a102381 100644
--- a/common/inc/nx_api.h
+++ b/common/inc/nx_api.h
@@ -26,7 +26,7 @@
 /*  APPLICATION INTERFACE DEFINITION                       RELEASE        */
 /*                                                                        */
 /*    nx_api.h                                            PORTABLE C      */
-/*                                                           6.2.0        */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -97,6 +97,9 @@
 /*  10-31-2022     Wenhui Xie               Modified comment(s), and      */
 /*                                            supported HTTP Proxy,       */
 /*                                            resulting in version 6.2.0  */
+/*  03-08-2023     Tiejun Zhou              Modified comment(s), and      */
+/*                                            updated product constants,  */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 
@@ -513,7 +516,7 @@ VOID _nx_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, ULONG
 #define AZURE_RTOS_NETXDUO
 #define NETXDUO_MAJOR_VERSION                    6
 #define NETXDUO_MINOR_VERSION                    2
-#define NETXDUO_PATCH_VERSION                    0
+#define NETXDUO_PATCH_VERSION                    1
 
 /* Define the following symbols for backward compatibility */
 #define EL_PRODUCT_NETXDUO
diff --git a/common/src/nx_icmpv6_send_queued_packets.c b/common/src/nx_icmpv6_send_queued_packets.c
index 7d68b938..88167e3b 100644
--- a/common/src/nx_icmpv6_send_queued_packets.c
+++ b/common/src/nx_icmpv6_send_queued_packets.c
@@ -34,7 +34,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _nx_icmpv6_send_queued_packets                      PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -61,7 +61,7 @@
 /*                                                                        */
 /*  CALLED BY                                                             */
 /*                                                                        */
-/*    _nx_icmp_packet_process               Main ICMP packet pocess       */
+/*    _nx_icmp_packet_process               Main ICMP packet process      */
 /*                                                                        */
 /*  RELEASE HISTORY                                                       */
 /*                                                                        */
@@ -70,6 +70,9 @@
 /*  05-19-2020     Yuxin Zhou               Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  03-08-2023     Tiejun Zhou              Modified comment(s), and      */
+/*                                            fixed compiler warnings,    */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 VOID _nx_icmpv6_send_queued_packets(NX_IP *ip_ptr, ND_CACHE_ENTRY *nd_entry)
@@ -79,13 +82,11 @@ NX_IP_DRIVER driver_request;
 UCHAR       *mac_addr;
 NX_PACKET   *queued_list_head, *ip_packet_ptr;
 UINT         next_hop_mtu;
-#ifndef NX_DISABLE_FRAGMENTATION
 #ifdef NX_ENABLE_IPV6_PATH_MTU_DISCOVERY
 NX_IPV6_DESTINATION_ENTRY *dest_entry_ptr;
 NX_IPV6_HEADER            *ip_header_ptr;
 ULONG                      status;
 #endif  /* NX_ENABLE_IPV6_PATH_MTU_DISCOVERY */
-#endif  /* NX_DISABLE_FRAGMENTATION */
 
 TX_INTERRUPT_SAVE_AREA
 
diff --git a/common/src/nx_ip_interface_status_check.c b/common/src/nx_ip_interface_status_check.c
index e45731c7..15206926 100644
--- a/common/src/nx_ip_interface_status_check.c
+++ b/common/src/nx_ip_interface_status_check.c
@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _nx_ip_interface_status_check                       PORTABLE C      */
-/*                                                           6.x          */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -79,9 +79,9 @@
 /*  05-19-2020     Yuxin Zhou               Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
-/*  xx-xx-xxxx     Yajun Xia                Modified comment(s),          */
+/*  03-08-2023     Yajun Xia                Modified comment(s),          */
 /*                                            added driver entry check,   */
-/*                                            resulting in version 6.x    */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _nx_ip_interface_status_check(NX_IP *ip_ptr, UINT interface_index, ULONG needed_status,
diff --git a/common/src/nx_ip_packet_checksum_compute.c b/common/src/nx_ip_packet_checksum_compute.c
index d9e53e88..637b19c9 100644
--- a/common/src/nx_ip_packet_checksum_compute.c
+++ b/common/src/nx_ip_packet_checksum_compute.c
@@ -39,7 +39,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _nx_ip_packet_checksum_compute                      PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -75,6 +75,9 @@
 /*  05-19-2020     Yuxin Zhou               Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  03-08-2023     Tiejun Zhou              Modified comment(s), and      */
+/*                                            fixed compiler warnings,    */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 VOID  _nx_ip_packet_checksum_compute(NX_PACKET *packet_ptr)
@@ -84,15 +87,17 @@ UCHAR            *org_prepend_ptr;
 ULONG             checksum;
 ULONG             val;
 UCHAR             is_done = NX_FALSE;
-ULONG             ip_header_length;
 ULONG             ip_src_addr[4];
 ULONG             ip_dst_addr[4];
 ULONG             data_length = 0;
-NX_IPV4_HEADER   *ip_header_ptr;
 NX_TCP_HEADER    *tcp_header_ptr;
 NX_UDP_HEADER    *udp_header_ptr;
+#ifndef NX_DISABLE_IPV4
+ULONG             ip_header_length;
+NX_IPV4_HEADER   *ip_header_ptr;
 NX_ICMP_HEADER   *icmpv4_header_ptr;
 NX_IGMP_HEADER   *igmp_header_ptr;
+#endif /* NX_DISABLE_IPV4 */
 #ifdef FEATURE_NX_IPV6
 USHORT            short_val;
 NX_ICMPV6_HEADER *icmpv6_header_ptr;
@@ -100,14 +105,14 @@ NX_IPV6_HEADER   *ipv6_header_ptr;
 #endif
 
     /* Get IP version. */
-#ifdef FEATURE_NX_IPV6
+#ifndef NX_DISABLE_IPV4
     if (packet_ptr -> nx_packet_ip_version == NX_IP_VERSION_V4)
     {
-#endif
         next_protocol = NX_PROTOCOL_IPV4;
-#ifdef FEATURE_NX_IPV6
     }
-    else
+#endif /* NX_DISABLE_IPV4 */
+#ifdef FEATURE_NX_IPV6
+    if (packet_ptr -> nx_packet_ip_version == NX_IP_VERSION_V6)
     {
         next_protocol = NX_PROTOCOL_IPV6;
     }
@@ -121,6 +126,7 @@ NX_IPV6_HEADER   *ipv6_header_ptr;
     {
         switch (next_protocol)
         {
+#ifndef NX_DISABLE_IPV4
         case NX_PROTOCOL_IPV4:
         {
 
@@ -178,6 +184,7 @@ NX_IPV6_HEADER   *ipv6_header_ptr;
             data_length = packet_ptr -> nx_packet_length - (ip_header_length << 2);
             break;
         }
+#endif /* NX_DISABLE_IPV4 */
 
         case NX_PROTOCOL_TCP:
         {
@@ -241,6 +248,7 @@ NX_IPV6_HEADER   *ipv6_header_ptr;
             break;
         }
 
+#ifndef NX_DISABLE_IPV4
         case NX_PROTOCOL_ICMP:
         {
 
@@ -316,6 +324,7 @@ NX_IPV6_HEADER   *ipv6_header_ptr;
             is_done = NX_TRUE;
             break;
         }
+#endif /* NX_DISABLE_IPV4 */
 
 #ifdef FEATURE_NX_IPV6
         case NX_PROTOCOL_ICMPV6:
@@ -382,7 +391,7 @@ NX_IPV6_HEADER   *ipv6_header_ptr;
     }
 
 
-    /* Restore origianl prepend_ptr. */
+    /* Restore original prepend_ptr. */
     packet_ptr -> nx_packet_prepend_ptr = org_prepend_ptr;
     return;
 }
diff --git a/common/src/nxd_ipv6_stateless_address_autoconfig_disable.c b/common/src/nxd_ipv6_stateless_address_autoconfig_disable.c
index e20578e0..990ad7a4 100644
--- a/common/src/nxd_ipv6_stateless_address_autoconfig_disable.c
+++ b/common/src/nxd_ipv6_stateless_address_autoconfig_disable.c
@@ -34,7 +34,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _nxd_ipv6_stateless_address_autoconfig_disable      PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -70,6 +70,9 @@
 /*  05-19-2020     Yuxin Zhou               Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  03-08-2023     Tiejun Zhou              Modified comment(s), and      */
+/*                                            fixed compiler warnings,    */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _nxd_ipv6_stateless_address_autoconfig_disable(NX_IP *ip_ptr, UINT interface_index)
@@ -98,8 +101,10 @@ NX_INTERFACE *interface_ptr;
     /* Install IPv6 packet receive processing function pointer */
     interface_ptr -> nx_ipv6_stateless_address_autoconfig_status = NX_STATELESS_ADDRESS_AUTOCONFIG_DISABLED;
 
+#ifndef NX_DISABLE_ICMPV6_ROUTER_SOLICITATION
     /* Reset the RS count. */
     interface_ptr -> nx_ipv6_rtr_solicitation_count = 0;
+#endif /* NX_DISABLE_ICMPV6_ROUTER_SOLICITATION */
 
     /* Release the IP protection. */
     tx_mutex_put(&(ip_ptr -> nx_ip_protection));
diff --git a/common/src/nxd_ipv6_stateless_address_autoconfig_enable.c b/common/src/nxd_ipv6_stateless_address_autoconfig_enable.c
index d836275e..1710459c 100644
--- a/common/src/nxd_ipv6_stateless_address_autoconfig_enable.c
+++ b/common/src/nxd_ipv6_stateless_address_autoconfig_enable.c
@@ -35,7 +35,7 @@
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _nxd_ipv6_stateless_address_autoconfig_enable       PORTABLE C      */
-/*                                                           6.1          */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -70,6 +70,9 @@
 /*  05-19-2020     Yuxin Zhou               Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
+/*  03-08-2023     Tiejun Zhou              Modified comment(s), and      */
+/*                                            fixed compiler warnings,    */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _nxd_ipv6_stateless_address_autoconfig_enable(NX_IP *ip_ptr, UINT interface_index)
@@ -98,10 +101,12 @@ NX_INTERFACE *interface_ptr;
     /* Install IPv6 packet receive processing function pointer */
     interface_ptr -> nx_ipv6_stateless_address_autoconfig_status = NX_STATELESS_ADDRESS_AUTOCONFIG_ENABLED;
 
+#ifndef NX_DISABLE_ICMPV6_ROUTER_SOLICITATION
     /* Reset the RS count. */
     interface_ptr -> nx_ipv6_rtr_solicitation_count = ip_ptr -> nx_ip_interface[interface_index].nx_ipv6_rtr_solicitation_max;
 
     interface_ptr -> nx_ipv6_rtr_solicitation_timer = NX_ICMPV6_RTR_SOLICITATION_DELAY;
+#endif /* NX_DISABLE_ICMPV6_ROUTER_SOLICITATION */
 
     /* Release the IP protection. */
     tx_mutex_put(&(ip_ptr -> nx_ip_protection));
diff --git a/common/src/nxe_tcp_socket_receive_notify.c b/common/src/nxe_tcp_socket_receive_notify.c
index 936efece..2508e292 100644
--- a/common/src/nxe_tcp_socket_receive_notify.c
+++ b/common/src/nxe_tcp_socket_receive_notify.c
@@ -38,7 +38,7 @@ NX_CALLER_CHECKING_EXTERNS
 /*  FUNCTION                                               RELEASE        */
 /*                                                                        */
 /*    _nxe_tcp_socket_receive_notify                      PORTABLE C      */
-/*                                                           6.x          */
+/*                                                           6.2.1        */
 /*  AUTHOR                                                                */
 /*                                                                        */
 /*    Yuxin Zhou, Microsoft Corporation                                   */
@@ -75,9 +75,9 @@ NX_CALLER_CHECKING_EXTERNS
 /*  05-19-2020     Yuxin Zhou               Initial Version 6.0           */
 /*  09-30-2020     Yuxin Zhou               Modified comment(s),          */
 /*                                            resulting in version 6.1    */
-/*  xx-xx-xxxx     Yajun Xia                Modified comment(s),          */
+/*  03-08-2023     Yajun Xia                Modified comment(s),          */
 /*                                            removed invalid check,      */
-/*                                            resulting in version 6.x    */
+/*                                            resulting in version 6.2.1  */
 /*                                                                        */
 /**************************************************************************/
 UINT  _nxe_tcp_socket_receive_notify(NX_TCP_SOCKET *socket_ptr,