Skip to content

Commit e054d6a

Browse files
TiejunZhou-CNTiejunZhou-CN
committed
Release 6.2.1 on 08 Mar 2023. Expand to see details.
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
1 parent a4fec08 commit e054d6a

File tree

127 files changed

+349
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+349
-319
lines changed

‎addons/BSD/nxd_bsd.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5266,7 +5266,7 @@ NX_BSD_SOCKET *bsd_socket_ptr;
52665266
/* FUNCTION RELEASE */
52675267
/* */
52685268
/* ioctl PORTABLE C */
5269-
/* 6.x */
5269+
/* 6.2.1 */
52705270
/* AUTHOR */
52715271
/* */
52725272
/* Yuxin Zhou, Microsoft Corporation */
@@ -5308,9 +5308,9 @@ NX_BSD_SOCKET *bsd_socket_ptr;
53085308
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
53095309
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
53105310
/* resulting in version 6.1 */
5311-
/* xx-xx-xxxx Wenhui Xie Modified comment(s), corrected*/
5311+
/* 03-08-2023 Wenhui Xie Modified comment(s), corrected*/
53125312
/* the result of FIONREAD, */
5313-
/* resulting in version 6.x */
5313+
/* resulting in version 6.2.1 */
53145314
/* */
53155315
/**************************************************************************/
53165316
INT ioctl(INT sockID, INT command, INT *result)

‎addons/cloud/nx_cloud.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ ULONG registered_event;
892892
/* FUNCTION RELEASE */
893893
/* */
894894
/* _nxe_cloud_module_event_clear PORTABLE C */
895-
/* 6.x */
895+
/* 6.2.1 */
896896
/* AUTHOR */
897897
/* */
898898
/* Yuxin Zhou, Microsoft Corporation */
@@ -926,9 +926,9 @@ ULONG registered_event;
926926
/* DATE NAME DESCRIPTION */
927927
/* */
928928
/* 09-30-2020 Yuxin Zhou Initial Version 6.1 */
929-
/* xx-xx-xxxx Bo Chen Modified comment(s), fixed */
929+
/* 03-08-2023 Bo Chen Modified comment(s), fixed */
930930
/* event clear function, */
931-
/* resulting in version 6.x */
931+
/* resulting in version 6.2.1 */
932932
/* */
933933
/**************************************************************************/
934934
UINT _nxe_cloud_module_event_clear(NX_CLOUD_MODULE *cloud_module, ULONG module_own_event)

‎addons/ftp/nxd_ftp_client.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ UINT status;
11061106
/* FUNCTION RELEASE */
11071107
/* */
11081108
/* _nx_ftp_client_delete PORTABLE C */
1109-
/* 6.x */
1109+
/* 6.2.1 */
11101110
/* AUTHOR */
11111111
/* */
11121112
/* Yuxin Zhou, Microsoft Corporation */
@@ -1140,9 +1140,9 @@ UINT status;
11401140
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
11411141
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
11421142
/* resulting in version 6.1 */
1143-
/* xx-xx-xxxx Wenhui Xie Modified comment(s), */
1143+
/* 03-08-2023 Wenhui Xie Modified comment(s), */
11441144
/* cleared the client ID, */
1145-
/* resulting in version 6.x */
1145+
/* resulting in version 6.2.1 */
11461146
/* */
11471147
/**************************************************************************/
11481148
UINT _nx_ftp_client_delete(NX_FTP_CLIENT *ftp_client_ptr)

‎addons/sntp/nxd_sntp_client.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static ULONG process_timerticks = 0;
8585
/* FUNCTION RELEASE */
8686
/* */
8787
/* _nxe_sntp_client_create PORTABLE C */
88-
/* 6.x */
88+
/* 6.2.1 */
8989
/* AUTHOR */
9090
/* */
9191
/* Yuxin Zhou, Microsoft Corporation */
@@ -126,9 +126,9 @@ static ULONG process_timerticks = 0;
126126
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
127127
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
128128
/* resulting in version 6.1 */
129-
/* xx-xx-xxxx Wenhui Xie Modified comment(s), */
129+
/* 03-08-2023 Wenhui Xie Modified comment(s), */
130130
/* checked the client ID, */
131-
/* resulting in version 6.x */
131+
/* resulting in version 6.2.1 */
132132
/* */
133133
/**************************************************************************/
134134
UINT _nxe_sntp_client_create(NX_SNTP_CLIENT *client_ptr, NX_IP *ip_ptr, UINT iface_index, NX_PACKET_POOL *packet_pool_ptr,
@@ -460,7 +460,7 @@ UINT status;
460460
/* FUNCTION RELEASE */
461461
/* */
462462
/* _nx_sntp_client_delete PORTABLE C */
463-
/* 6.x */
463+
/* 6.2.1 */
464464
/* AUTHOR */
465465
/* */
466466
/* Yuxin Zhou, Microsoft Corporation */
@@ -500,9 +500,9 @@ UINT status;
500500
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
501501
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
502502
/* resulting in version 6.1 */
503-
/* xx-xx-xxxx Wenhui Xie Modified comment(s), */
503+
/* 03-08-2023 Wenhui Xie Modified comment(s), */
504504
/* cleared the client ID, */
505-
/* resulting in version 6.x */
505+
/* resulting in version 6.2.1 */
506506
/* */
507507
/**************************************************************************/
508508
UINT _nx_sntp_client_delete(NX_SNTP_CLIENT *client_ptr)

‎addons/telnet/nxd_telnet_client.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ UINT status;
567567
/* FUNCTION RELEASE */
568568
/* */
569569
/* _nx_telnet_client_delete PORTABLE C */
570-
/* 6.x */
570+
/* 6.2.1 */
571571
/* AUTHOR */
572572
/* */
573573
/* Yuxin Zhou, Microsoft Corporation */
@@ -600,9 +600,9 @@ UINT status;
600600
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
601601
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
602602
/* resulting in version 6.1 */
603-
/* xx-xx-xxxx Wenhui Xie Modified comment(s), */
603+
/* 03-08-2023 Wenhui Xie Modified comment(s), */
604604
/* cleared the client ID, */
605-
/* resulting in version 6.x */
605+
/* resulting in version 6.2.1 */
606606
/* */
607607
/**************************************************************************/
608608
UINT _nx_telnet_client_delete(NX_TELNET_CLIENT *client_ptr)

‎addons/telnet/nxd_telnet_server.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ UINT status;
595595
/* FUNCTION RELEASE */
596596
/* */
597597
/* _nx_telnet_server_disconnect PORTABLE C */
598-
/* 6.x */
598+
/* 6.2.1 */
599599
/* AUTHOR */
600600
/* */
601601
/* Yuxin Zhou, Microsoft Corporation */
@@ -631,10 +631,10 @@ UINT status;
631631
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
632632
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
633633
/* resulting in version 6.1 */
634-
/* xx-xx-xxxx Wenhui Xie Modified comment(s), and */
634+
/* 03-08-2023 Wenhui Xie Modified comment(s), and */
635635
/* corrected the processing of */
636636
/* disconnection, */
637-
/* resulting in version 6.x */
637+
/* resulting in version 6.2.1 */
638638
/* */
639639
/**************************************************************************/
640640
UINT _nx_telnet_server_disconnect(NX_TELNET_SERVER *server_ptr, UINT logical_connection)

‎common/inc/nx_api.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/* APPLICATION INTERFACE DEFINITION RELEASE */
2727
/* */
2828
/* nx_api.h PORTABLE C */
29-
/* 6.2.0 */
29+
/* 6.2.1 */
3030
/* AUTHOR */
3131
/* */
3232
/* Yuxin Zhou, Microsoft Corporation */
@@ -97,6 +97,9 @@
9797
/* 10-31-2022 Wenhui Xie Modified comment(s), and */
9898
/* supported HTTP Proxy, */
9999
/* resulting in version 6.2.0 */
100+
/* 03-08-2023 Tiejun Zhou Modified comment(s), and */
101+
/* updated product constants, */
102+
/* resulting in version 6.2.1 */
100103
/* */
101104
/**************************************************************************/
102105

@@ -513,7 +516,7 @@ VOID _nx_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, ULONG
513516
#define AZURE_RTOS_NETXDUO
514517
#define NETXDUO_MAJOR_VERSION 6
515518
#define NETXDUO_MINOR_VERSION 2
516-
#define NETXDUO_PATCH_VERSION 0
519+
#define NETXDUO_PATCH_VERSION 1
517520

518521
/* Define the following symbols for backward compatibility */
519522
#define EL_PRODUCT_NETXDUO

‎common/src/nx_icmpv6_send_queued_packets.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/* FUNCTION RELEASE */
3535
/* */
3636
/* _nx_icmpv6_send_queued_packets PORTABLE C */
37-
/* 6.1 */
37+
/* 6.2.1 */
3838
/* AUTHOR */
3939
/* */
4040
/* Yuxin Zhou, Microsoft Corporation */
@@ -61,7 +61,7 @@
6161
/* */
6262
/* CALLED BY */
6363
/* */
64-
/* _nx_icmp_packet_process Main ICMP packet pocess */
64+
/* _nx_icmp_packet_process Main ICMP packet process */
6565
/* */
6666
/* RELEASE HISTORY */
6767
/* */
@@ -70,6 +70,9 @@
7070
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
7171
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
7272
/* resulting in version 6.1 */
73+
/* 03-08-2023 Tiejun Zhou Modified comment(s), and */
74+
/* fixed compiler warnings, */
75+
/* resulting in version 6.2.1 */
7376
/* */
7477
/**************************************************************************/
7578
VOID _nx_icmpv6_send_queued_packets(NX_IP *ip_ptr, ND_CACHE_ENTRY *nd_entry)
@@ -79,13 +82,11 @@ NX_IP_DRIVER driver_request;
7982
UCHAR *mac_addr;
8083
NX_PACKET *queued_list_head, *ip_packet_ptr;
8184
UINT next_hop_mtu;
82-
#ifndef NX_DISABLE_FRAGMENTATION
8385
#ifdef NX_ENABLE_IPV6_PATH_MTU_DISCOVERY
8486
NX_IPV6_DESTINATION_ENTRY *dest_entry_ptr;
8587
NX_IPV6_HEADER *ip_header_ptr;
8688
ULONG status;
8789
#endif /* NX_ENABLE_IPV6_PATH_MTU_DISCOVERY */
88-
#endif /* NX_DISABLE_FRAGMENTATION */
8990

9091
TX_INTERRUPT_SAVE_AREA
9192

‎common/src/nx_ip_interface_status_check.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* FUNCTION RELEASE */
3636
/* */
3737
/* _nx_ip_interface_status_check PORTABLE C */
38-
/* 6.x */
38+
/* 6.2.1 */
3939
/* AUTHOR */
4040
/* */
4141
/* Yuxin Zhou, Microsoft Corporation */
@@ -79,9 +79,9 @@
7979
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
8080
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
8181
/* resulting in version 6.1 */
82-
/* xx-xx-xxxx Yajun Xia Modified comment(s), */
82+
/* 03-08-2023 Yajun Xia Modified comment(s), */
8383
/* added driver entry check, */
84-
/* resulting in version 6.x */
84+
/* resulting in version 6.2.1 */
8585
/* */
8686
/**************************************************************************/
8787
UINT _nx_ip_interface_status_check(NX_IP *ip_ptr, UINT interface_index, ULONG needed_status,

‎common/src/nx_ip_packet_checksum_compute.c‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/* FUNCTION RELEASE */
4040
/* */
4141
/* _nx_ip_packet_checksum_compute PORTABLE C */
42-
/* 6.1 */
42+
/* 6.2.1 */
4343
/* AUTHOR */
4444
/* */
4545
/* Yuxin Zhou, Microsoft Corporation */
@@ -75,6 +75,9 @@
7575
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
7676
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
7777
/* resulting in version 6.1 */
78+
/* 03-08-2023 Tiejun Zhou Modified comment(s), and */
79+
/* fixed compiler warnings, */
80+
/* resulting in version 6.2.1 */
7881
/* */
7982
/**************************************************************************/
8083
VOID _nx_ip_packet_checksum_compute(NX_PACKET *packet_ptr)
@@ -84,30 +87,32 @@ UCHAR *org_prepend_ptr;
8487
ULONG checksum;
8588
ULONG val;
8689
UCHAR is_done = NX_FALSE;
87-
ULONG ip_header_length;
8890
ULONG ip_src_addr[4];
8991
ULONG ip_dst_addr[4];
9092
ULONG data_length = 0;
91-
NX_IPV4_HEADER *ip_header_ptr;
9293
NX_TCP_HEADER *tcp_header_ptr;
9394
NX_UDP_HEADER *udp_header_ptr;
95+
#ifndef NX_DISABLE_IPV4
96+
ULONG ip_header_length;
97+
NX_IPV4_HEADER *ip_header_ptr;
9498
NX_ICMP_HEADER *icmpv4_header_ptr;
9599
NX_IGMP_HEADER *igmp_header_ptr;
100+
#endif /* NX_DISABLE_IPV4 */
96101
#ifdef FEATURE_NX_IPV6
97102
USHORT short_val;
98103
NX_ICMPV6_HEADER *icmpv6_header_ptr;
99104
NX_IPV6_HEADER *ipv6_header_ptr;
100105
#endif
101106

102107
/* Get IP version. */
103-
#ifdef FEATURE_NX_IPV6
108+
#ifndef NX_DISABLE_IPV4
104109
if (packet_ptr -> nx_packet_ip_version == NX_IP_VERSION_V4)
105110
{
106-
#endif
107111
next_protocol = NX_PROTOCOL_IPV4;
108-
#ifdef FEATURE_NX_IPV6
109112
}
110-
else
113+
#endif /* NX_DISABLE_IPV4 */
114+
#ifdef FEATURE_NX_IPV6
115+
if (packet_ptr -> nx_packet_ip_version == NX_IP_VERSION_V6)
111116
{
112117
next_protocol = NX_PROTOCOL_IPV6;
113118
}
@@ -121,6 +126,7 @@ NX_IPV6_HEADER *ipv6_header_ptr;
121126
{
122127
switch (next_protocol)
123128
{
129+
#ifndef NX_DISABLE_IPV4
124130
case NX_PROTOCOL_IPV4:
125131
{
126132

@@ -178,6 +184,7 @@ NX_IPV6_HEADER *ipv6_header_ptr;
178184
data_length = packet_ptr -> nx_packet_length - (ip_header_length << 2);
179185
break;
180186
}
187+
#endif /* NX_DISABLE_IPV4 */
181188

182189
case NX_PROTOCOL_TCP:
183190
{
@@ -241,6 +248,7 @@ NX_IPV6_HEADER *ipv6_header_ptr;
241248
break;
242249
}
243250

251+
#ifndef NX_DISABLE_IPV4
244252
case NX_PROTOCOL_ICMP:
245253
{
246254

@@ -316,6 +324,7 @@ NX_IPV6_HEADER *ipv6_header_ptr;
316324
is_done = NX_TRUE;
317325
break;
318326
}
327+
#endif /* NX_DISABLE_IPV4 */
319328

320329
#ifdef FEATURE_NX_IPV6
321330
case NX_PROTOCOL_ICMPV6:
@@ -382,7 +391,7 @@ NX_IPV6_HEADER *ipv6_header_ptr;
382391
}
383392

384393

385-
/* Restore origianl prepend_ptr. */
394+
/* Restore original prepend_ptr. */
386395
packet_ptr -> nx_packet_prepend_ptr = org_prepend_ptr;
387396
return;
388397
}

0 commit comments

Comments
 (0)