Skip to content

Commit

Permalink
Release 6.2.1 on 08 Mar 2023. Expand to see details.
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@TiejunMS
TiejunMS committed Mar 8, 2023
1 parent a4fec08 commit e054d6a
Show file tree
Hide file tree
Showing 127 changed files with 349 additions and 319 deletions.
6 changes: 3 additions & 3 deletions addons/BSD/nxd_bsd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5266,7 +5266,7 @@ NX_BSD_SOCKET *bsd_socket_ptr;
/* FUNCTION RELEASE */
/* */
/* ioctl PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -5308,9 +5308,9 @@ NX_BSD_SOCKET *bsd_socket_ptr;
/* 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 Wenhui Xie Modified comment(s), corrected*/
/* 03-08-2023 Wenhui Xie Modified comment(s), corrected*/
/* the result of FIONREAD, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
INT ioctl(INT sockID, INT command, INT *result)
Expand Down
6 changes: 3 additions & 3 deletions addons/cloud/nx_cloud.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ ULONG registered_event;
/* FUNCTION RELEASE */
/* */
/* _nxe_cloud_module_event_clear PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -926,9 +926,9 @@ ULONG registered_event;
/* DATE NAME DESCRIPTION */
/* */
/* 09-30-2020 Yuxin Zhou Initial Version 6.1 */
/* xx-xx-xxxx Bo Chen Modified comment(s), fixed */
/* 03-08-2023 Bo Chen Modified comment(s), fixed */
/* event clear function, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _nxe_cloud_module_event_clear(NX_CLOUD_MODULE *cloud_module, ULONG module_own_event)
Expand Down
6 changes: 3 additions & 3 deletions addons/ftp/nxd_ftp_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ UINT status;
/* FUNCTION RELEASE */
/* */
/* _nx_ftp_client_delete PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -1140,9 +1140,9 @@ UINT status;
/* 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 Wenhui Xie Modified comment(s), */
/* 03-08-2023 Wenhui Xie Modified comment(s), */
/* cleared the client ID, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _nx_ftp_client_delete(NX_FTP_CLIENT *ftp_client_ptr)
Expand Down
12 changes: 6 additions & 6 deletions addons/sntp/nxd_sntp_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static ULONG process_timerticks = 0;
/* FUNCTION RELEASE */
/* */
/* _nxe_sntp_client_create PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -126,9 +126,9 @@ static ULONG process_timerticks = 0;
/* 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 Wenhui Xie Modified comment(s), */
/* 03-08-2023 Wenhui Xie Modified comment(s), */
/* checked the client ID, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _nxe_sntp_client_create(NX_SNTP_CLIENT *client_ptr, NX_IP *ip_ptr, UINT iface_index, NX_PACKET_POOL *packet_pool_ptr,
Expand Down Expand Up @@ -460,7 +460,7 @@ UINT status;
/* FUNCTION RELEASE */
/* */
/* _nx_sntp_client_delete PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -500,9 +500,9 @@ UINT status;
/* 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 Wenhui Xie Modified comment(s), */
/* 03-08-2023 Wenhui Xie Modified comment(s), */
/* cleared the client ID, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _nx_sntp_client_delete(NX_SNTP_CLIENT *client_ptr)
Expand Down
6 changes: 3 additions & 3 deletions addons/telnet/nxd_telnet_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ UINT status;
/* FUNCTION RELEASE */
/* */
/* _nx_telnet_client_delete PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -600,9 +600,9 @@ UINT status;
/* 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 Wenhui Xie Modified comment(s), */
/* 03-08-2023 Wenhui Xie Modified comment(s), */
/* cleared the client ID, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _nx_telnet_client_delete(NX_TELNET_CLIENT *client_ptr)
Expand Down
6 changes: 3 additions & 3 deletions addons/telnet/nxd_telnet_server.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ UINT status;
/* FUNCTION RELEASE */
/* */
/* _nx_telnet_server_disconnect PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -631,10 +631,10 @@ UINT status;
/* 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 Wenhui Xie Modified comment(s), and */
/* 03-08-2023 Wenhui Xie Modified comment(s), and */
/* corrected the processing of */
/* disconnection, */
/* resulting in version 6.x */
/* resulting in version 6.2.1 */
/* */
/**************************************************************************/
UINT _nx_telnet_server_disconnect(NX_TELNET_SERVER *server_ptr, UINT logical_connection)
Expand Down
7 changes: 5 additions & 2 deletions common/inc/nx_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/* APPLICATION INTERFACE DEFINITION RELEASE */
/* */
/* nx_api.h PORTABLE C */
/* 6.2.0 */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -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 */
/* */
/**************************************************************************/

Expand Down Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions common/src/nx_icmpv6_send_queued_packets.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/* FUNCTION RELEASE */
/* */
/* _nx_icmpv6_send_queued_packets PORTABLE C */
/* 6.1 */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand All @@ -61,7 +61,7 @@
/* */
/* CALLED BY */
/* */
/* _nx_icmp_packet_process Main ICMP packet pocess */
/* _nx_icmp_packet_process Main ICMP packet process */
/* */
/* RELEASE HISTORY */
/* */
Expand All @@ -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)
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions common/src/nx_ip_interface_status_check.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/* FUNCTION RELEASE */
/* */
/* _nx_ip_interface_status_check PORTABLE C */
/* 6.x */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -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,
Expand Down
25 changes: 17 additions & 8 deletions common/src/nx_ip_packet_checksum_compute.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/* FUNCTION RELEASE */
/* */
/* _nx_ip_packet_checksum_compute PORTABLE C */
/* 6.1 */
/* 6.2.1 */
/* AUTHOR */
/* */
/* Yuxin Zhou, Microsoft Corporation */
Expand Down Expand Up @@ -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)
Expand All @@ -84,30 +87,32 @@ 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;
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;
}
Expand All @@ -121,6 +126,7 @@ NX_IPV6_HEADER *ipv6_header_ptr;
{
switch (next_protocol)
{
#ifndef NX_DISABLE_IPV4
case NX_PROTOCOL_IPV4:
{

Expand Down Expand Up @@ -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:
{
Expand Down Expand Up @@ -241,6 +248,7 @@ NX_IPV6_HEADER *ipv6_header_ptr;
break;
}

#ifndef NX_DISABLE_IPV4
case NX_PROTOCOL_ICMP:
{

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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;
}
Expand Down
Loading

0 comments on commit e054d6a

Please sign in to comment.