summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBo Chen <[email protected]>2021-06-02 06:45:26 +0000
committerBo Chen <[email protected]>2021-06-02 06:45:26 +0000
commitc187d60014b149ee7c5e79b4d84c416caddbdef7 (patch)
tree72a504278f1d766a1014ad8ee237813e0644c72a /common
parent678fb5b540e93d85f8ddf4cb83c059d38fb04587 (diff)
Release 6.1.7v6.1.7_rel
Diffstat (limited to 'common')
-rw-r--r--common/inc/nx_api.h7
-rw-r--r--common/src/nx_tcp_socket_state_ack_check.c10
2 files changed, 14 insertions, 3 deletions
diff --git a/common/inc/nx_api.h b/common/inc/nx_api.h
index f552009f..824d9655 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.1.6 */
+/* 6.1.7 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
@@ -67,6 +67,9 @@
/* 04-02-2021 Yuxin Zhou Modified comment(s), and */
/* added functions for base64, */
/* resulting in version 6.1.6 */
+/* 06-02-2021 Yuxin Zhou Modified comment(s), and */
+/* updated product constants, */
+/* resulting in version 6.1.7 */
/* */
/**************************************************************************/
@@ -474,7 +477,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 1
-#define NETXDUO_PATCH_VERSION 6
+#define NETXDUO_PATCH_VERSION 7
/* Define the following symbols for backward compatibility */
#define EL_PRODUCT_NETXDUO
diff --git a/common/src/nx_tcp_socket_state_ack_check.c b/common/src/nx_tcp_socket_state_ack_check.c
index eafc92d1..b20e4424 100644
--- a/common/src/nx_tcp_socket_state_ack_check.c
+++ b/common/src/nx_tcp_socket_state_ack_check.c
@@ -40,7 +40,7 @@
/* FUNCTION RELEASE */
/* */
/* _nx_tcp_socket_state_ack_check PORTABLE C */
-/* 6.1 */
+/* 6.1.7 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
@@ -81,6 +81,9 @@
/* corrected the calculation of*/
/* ending packet sequence, */
/* resulting in version 6.1 */
+/* 06-02-2021 Yuxin Zhou Modified comment(s), */
+/* fixed compiler warnings, */
+/* resulting in version 6.1.7 */
/* */
/**************************************************************************/
UINT _nx_tcp_socket_state_ack_check(NX_TCP_SOCKET *socket_ptr, NX_TCP_HEADER *tcp_header_ptr)
@@ -132,6 +135,7 @@ UINT wrapped_flag = NX_FALSE;
search_header_ptr = (NX_TCP_HEADER *)(search_ptr -> nx_packet_ip_header +
sizeof(NX_IPV4_HEADER));
}
+ else
#endif /* NX_DISABLE_IPV4 */
#ifdef FEATURE_NX_IPV6
if (search_ptr -> nx_packet_ip_version == NX_IP_VERSION_V6)
@@ -141,7 +145,11 @@ UINT wrapped_flag = NX_FALSE;
search_header_ptr = (NX_TCP_HEADER *)(search_ptr -> nx_packet_ip_header +
sizeof(NX_IPV6_HEADER));
}
+ else
#endif /* FEATURE_NX_IPV6 */
+ {
+ return(NX_FALSE);
+ }
/* Determine the size of the TCP header. */
temp = search_header_ptr -> nx_tcp_header_word_3;