Skip to content

Commit 837b032

Browse files
TiejunZhou-CNTiejunZhou-CN
committed
Update on 23 Oct 2023. Expand to see details.
002a5890e Generated rtxp demo in netxduo/samples folder. c09d9da51 Add function header in .h for RTP and RTSP f5a96f35b Update function header and version for 6.3.0 0ff7a6809 Correct dhcpv6 server for ignoring lifetime fields in client request 9a2129c35 Fixed dhcpv6 server not update client record issue e59d2b5f1 Fix dhcp coverage test compile wanrning d00655d71 Fix infinite loop issue in TCP & UDP free port find function c194c74ca Optimize rtp_sender and fix pipeline reported issues b6df8dea0 Add RTxP feature 38e57e633 Added test case for _nx_snmp_utility_object_id_get(). 321c88bd9 Added check for pdu length. 36ffb7c39 Fixed packet double release. 92166d736 Fixed SNMP test cases for v4_small_build 67f071552 Improved buffer length verification for padding. 30cc5d8b2 Fix wait option used in FTP test case 098a97213 Avoid duplicate packet release when DTLS send fails 15313e868 Improved buffer length verification for _nx_snmp_utility_object_id_set(). ecd3904d3 Fixed MSRC 81018 caa004007 Fix the logic of handling close notify packet from peer 2b8c87685 Removed main.c into netxduo/samples folder, then all addons can use it. c72c66cdc Fixed MSARC 81019 and MSRC 81079 8169be7a6 Fixed MSRC81005 and MSRC81020 41389b76b Fixed packet double release issue in _nx_ftp_client_file_write 19348e408 Combined the functions of processing snmp v1 and v2. 9174b6457 Fixed icmpv6 ra buffer overwrite test case. 6bdc703d9 Fixed packet double release issue in _nx_nat_process_packet 403ecd128 Set nx_smtp_server_packet to NULL to avoided duplicate packet release in _nx_smtp_utility_read_server_code af5dd00c6 Disable FTP server MSS test case when packet chain is disabled beadbce12 Enable weekly pipeline build to avoid CodeQL expiration 5a3d88f97 Fixed MSRC 81528 df6a1fc57 unify the code. 18c13bfdb Fixed MSRC 80745. 2cce43f48 Fixed bug in utility/iperf/nx_iperf.c pointer used before set its value. 2477fb81c Update product owners 2f5734ada Fixed MSRC 80686 34e713e26 Fixed data length underflow when TCP MSS is less than 255 7097a7859 Improved the test cases for packet chain. 1ffa13cfa Fixed MSRC 80685 97e2b8d8e Set packet pointer to NULL after released to fix duplicate packet release issue c1e47efa7 Fix ICMPv6 NS buffer overwrite issue. c2770ea68 Add ICMPv6 NA buffer overwrite test case. 36bb05f85 Validated TCP header buffer to avoid span in multiple packets 84070bb2a Correct the length of packet buffer to avoid write overflow 5b3b3a10b Dropped packet chain for SNTP data to avoid write overflow 82699872d Onebranch build Image Update: Move pipelines to supported and compliant OneBranch container images a30171f93 Add a test case to demonstrate IGMP override caused by IP assembly. 72472ff4b Fix MSRC 80746 5d9f1266a Corrected the acked packet count when out of order is enabled b113ebdc9 Fixed DHCP server local variable type issue b70863299 Enable codeql in onebranch pipeline
1 parent 4d71251 commit 837b032

File tree

138 files changed

+14003
-3801
lines changed

Some content is hidden

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

138 files changed

+14003
-3801
lines changed

‎addons/BSD/nxd_bsd.c‎

Lines changed: 110 additions & 110 deletions
Large diffs are not rendered by default.

‎addons/BSD/nxd_bsd.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/* BSD DEFINITIONS RELEASE */
2626
/* */
2727
/* nxd_bsd.h PORTABLE C */
28-
/* 6.x */
28+
/* 6.3.0 */
2929
/* AUTHOR */
3030
/* */
3131
/* Yuxin Zhou, Microsoft Corporation */
@@ -50,10 +50,10 @@
5050
/* defined IP protocols for */
5151
/* ICMP, IGMP and ICMPv6, */
5252
/* resulting in version 6.1.9 */
53-
/* xx-xx-xxxx Chaoqiong Xiao Modified comment(s), and */
53+
/* 10-31-2023 Chaoqiong Xiao Modified comment(s), and */
5454
/* added option to enable */
5555
/* native APIs with prefix, */
56-
/* resulting in version 6.x */
56+
/* resulting in version 6.3.0 */
5757
/* */
5858
/**************************************************************************/
5959

‎addons/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ set(SOURCES
3636
${CMAKE_CURRENT_LIST_DIR}/web/nx_web_http_client.c
3737
${CMAKE_CURRENT_LIST_DIR}/web/nx_web_http_server.c
3838
${CMAKE_CURRENT_LIST_DIR}/websocket/nx_websocket_client.c
39+
${CMAKE_CURRENT_LIST_DIR}/rtp/nx_rtp_sender.c
40+
${CMAKE_CURRENT_LIST_DIR}/rtsp/nx_rtsp_server.c
3941

4042
# {{END_TARGET_SOURCES}}
4143
)
@@ -105,4 +107,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
105107
${CMAKE_CURRENT_LIST_DIR}/tftp
106108
${CMAKE_CURRENT_LIST_DIR}/web
107109
${CMAKE_CURRENT_LIST_DIR}/websocket
110+
${CMAKE_CURRENT_LIST_DIR}/rtp
111+
${CMAKE_CURRENT_LIST_DIR}/rtsp
108112
)

‎addons/azure_iot/samples/sample_azure_iot_embedded_sdk.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static TX_THREAD sample_device_twin_thread;
9999
static ULONG sample_device_twin_thread_stack[SAMPLE_STACK_SIZE / sizeof(ULONG)];
100100
#endif /* DISABLE_DEVICE_TWIN_SAMPLE */
101101

102-
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, NX_DNS *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time));
102+
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, VOID *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time));
103103
#ifdef ENABLE_DPS_SAMPLE
104104
static UINT sample_dps_entry(UCHAR **iothub_hostname, UINT *iothub_hostname_length,
105105
UCHAR **iothub_device_id, UINT *iothub_device_id_length);
@@ -283,15 +283,15 @@ static void log_callback(az_log_classification classification, UCHAR *msg, UINT
283283
}
284284
}
285285

286-
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, NX_DNS *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time))
286+
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, VOID *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time))
287287
{
288288
UINT status = 0;
289289
UINT loop = NX_TRUE;
290290

291291
nx_azure_iot_log_init(log_callback);
292292

293293
/* Create Azure IoT handler. */
294-
if ((status = nx_azure_iot_create(&nx_azure_iot, (UCHAR *)"Azure IoT", ip_ptr, pool_ptr, dns_ptr,
294+
if ((status = nx_azure_iot_create(&nx_azure_iot, (UCHAR *)"Azure IoT", ip_ptr, pool_ptr, (NX_DNS *)dns_ptr,
295295
nx_azure_iot_thread_stack, sizeof(nx_azure_iot_thread_stack),
296296
NX_AZURE_IOT_THREAD_PRIORITY, unix_time_callback)))
297297
{

‎addons/azure_iot/samples/sample_azure_iot_embedded_sdk_pnp.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static SAMPLE_CLIENT client;
6767
#define prov_client client.prov_client
6868
#endif /* ENABLE_DPS_SAMPLE */
6969

70-
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, NX_DNS *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time));
70+
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, VOID *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time));
7171

7272
#ifdef ENABLE_DPS_SAMPLE
7373
static UINT sample_dps_entry(NX_AZURE_IOT_PROVISIONING_CLIENT *prov_client_ptr,
@@ -984,7 +984,7 @@ static void log_callback(az_log_classification classification, UCHAR *msg, UINT
984984
}
985985
}
986986

987-
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, NX_DNS *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time))
987+
void sample_entry(NX_IP *ip_ptr, NX_PACKET_POOL *pool_ptr, VOID *dns_ptr, UINT (*unix_time_callback)(ULONG *unix_time))
988988
{
989989
UINT status = 0;
990990
UINT loop = NX_TRUE;
@@ -993,7 +993,7 @@ ULONG app_events;
993993
nx_azure_iot_log_init(log_callback);
994994

995995
/* Create Azure IoT handler. */
996-
if ((status = nx_azure_iot_create(&nx_azure_iot, (UCHAR *)"Azure IoT", ip_ptr, pool_ptr, dns_ptr,
996+
if ((status = nx_azure_iot_create(&nx_azure_iot, (UCHAR *)"Azure IoT", ip_ptr, pool_ptr, (NX_DNS *)dns_ptr,
997997
nx_azure_iot_thread_stack, sizeof(nx_azure_iot_thread_stack),
998998
NX_AZURE_IOT_THREAD_PRIORITY, unix_time_callback)))
999999
{

‎addons/dhcp/nxd_dhcp_client.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,7 +3552,7 @@ NX_DHCP_INTERFACE_RECORD *interface_record = NX_NULL;
35523552
/* FUNCTION RELEASE */
35533553
/* */
35543554
/* _nxe_dhcp_state_change_notify PORTABLE C */
3555-
/* 6.x */
3555+
/* 6.3.0 */
35563556
/* AUTHOR */
35573557
/* */
35583558
/* Yuxin Zhou, Microsoft Corporation */
@@ -3586,9 +3586,9 @@ NX_DHCP_INTERFACE_RECORD *interface_record = NX_NULL;
35863586
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
35873587
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
35883588
/* resulting in version 6.1 */
3589-
/* xx-xx-xxxx Haiqing Zhao Modified comment(s), and */
3589+
/* 10-31-2023 Haiqing Zhao Modified comment(s), and */
35903590
/* corrected caller checking, */
3591-
/* resulting in version 6.x */
3591+
/* resulting in version 6.3.0 */
35923592
/* */
35933593
/**************************************************************************/
35943594
UINT _nxe_dhcp_state_change_notify(NX_DHCP *dhcp_ptr, VOID (*dhcp_state_change_notify)(NX_DHCP *dhcp_ptr, UCHAR new_state))
@@ -6995,7 +6995,7 @@ UINT name_length;
69956995
/* FUNCTION RELEASE */
69966996
/* */
69976997
/* _nx_dhcp_client_send_with_zero_source_address PORTABLE C */
6998-
/* 6.x */
6998+
/* 6.3.0 */
69996999
/* AUTHOR */
70007000
/* */
70017001
/* Yuxin Zhou, Microsoft Corporation */
@@ -7042,9 +7042,9 @@ UINT name_length;
70427042
/* udp socket send and ip */
70437043
/* header add, */
70447044
/* resulting in version 6.1.12 */
7045-
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), */
7045+
/* 10-31-2023 Tiejun Zhou Modified comment(s), */
70467046
/* supported random IP id, */
7047-
/* resulting in version 6.x */
7047+
/* resulting in version 6.3.0 */
70487048
/* */
70497049
/**************************************************************************/
70507050
static UINT _nx_dhcp_client_send_with_zero_source_address(NX_DHCP *dhcp_ptr, UINT iface_index, NX_PACKET *packet_ptr)

‎addons/dhcp/nxd_dhcp_server.c‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2669,7 +2669,7 @@ CHAR *buffer;
26692669
/* FUNCTION RELEASE */
26702670
/* */
26712671
/* _nx_dhcp_server_packet_process PORTABLE C */
2672-
/* 6.1 */
2672+
/* 6.3.0 */
26732673
/* AUTHOR */
26742674
/* */
26752675
/* Yuxin Zhou, Microsoft Corporation */
@@ -2714,6 +2714,10 @@ CHAR *buffer;
27142714
/* 05-19-2020 Yuxin Zhou Initial Version 6.0 */
27152715
/* 09-30-2020 Yuxin Zhou Modified comment(s), */
27162716
/* resulting in version 6.1 */
2717+
/* 10-31-2023 Bo Chen Modified comment(s), corrected*/
2718+
/* the logic of verifying the */
2719+
/* incoming packet length, */
2720+
/* resulting in version 6.3.0 */
27172721
/* */
27182722
/**************************************************************************/
27192723
static UINT _nx_dhcp_server_packet_process(NX_DHCP_SERVER *dhcp_ptr, NX_PACKET *packet_ptr)
@@ -2778,6 +2782,10 @@ ULONG offset;
27782782
return(status);
27792783
}
27802784

2785+
/* Update the prepend pointer to make sure that the IP header and UDP header also are copied into new packet. */
2786+
packet_ptr -> nx_packet_prepend_ptr -= 28;
2787+
packet_ptr -> nx_packet_length += 28;
2788+
27812789
/* Verify the incoming packet does not exceed our DHCP Server packet payload. */
27822790
if ((ULONG)(new_packet_ptr -> nx_packet_data_end - new_packet_ptr -> nx_packet_prepend_ptr) < (packet_ptr -> nx_packet_length))
27832791
{
@@ -2790,10 +2798,6 @@ ULONG offset;
27902798

27912799
return(NX_DHCP_INADEQUATE_PACKET_POOL_PAYLOAD);
27922800
}
2793-
2794-
/* Update the prepend pointer to make sure that the IP header and UDP header also are copied into new packet. */
2795-
packet_ptr -> nx_packet_prepend_ptr -= 28;
2796-
packet_ptr -> nx_packet_length += 28;
27972801

27982802
/* Initialize the offset to the beginning of the packet buffer. */
27992803
offset = 0;
@@ -4812,7 +4816,7 @@ UINT lease_time;
48124816
/* FUNCTION RELEASE */
48134817
/* */
48144818
/* _nx_dhcp_server_extract_information PORTABLE C */
4815-
/* 6.1 */
4819+
/* 6.3.0 */
48164820
/* AUTHOR */
48174821
/* */
48184822
/* Yuxin Zhou, Microsoft Corporation */
@@ -4865,6 +4869,9 @@ UINT lease_time;
48654869
/* and write overflow, */
48664870
/* fixed compiler warnings, */
48674871
/* resulting in version 6.1 */
4872+
/* 10-31-2023 Haiqing Zhao Modified comment(s), and */
4873+
/* improved internal logic, */
4874+
/* resulting in version 6.3.0 */
48684875
/* */
48694876
/**************************************************************************/
48704877
static UINT _nx_dhcp_server_extract_information(NX_DHCP_SERVER *dhcp_ptr, NX_DHCP_CLIENT **dhcp_client_ptr,
@@ -4873,7 +4880,7 @@ static UINT _nx_dhcp_server_extract_information(NX_DHCP_SERVER *dhcp_ptr, NX_DH
48734880

48744881
UINT status;
48754882
ULONG value;
4876-
UINT size = 0;
4883+
ULONG size = 0;
48774884
ULONG xid;
48784885
UCHAR *work_ptr;
48794886
ULONG client_mac_msw;
@@ -5063,7 +5070,7 @@ NX_DHCP_CLIENT *temp_client_rec_ptr;
50635070
work_ptr++;
50645071

50655072
/* Get the option length. */
5066-
_nx_dhcp_server_get_data(work_ptr, 1, (ULONG *)&size);
5073+
_nx_dhcp_server_get_data(work_ptr, 1, &size);
50675074

50685075
/* Move up the buffer pointer to the next option. */
50695076
work_ptr++;
@@ -5083,7 +5090,7 @@ NX_DHCP_CLIENT *temp_client_rec_ptr;
50835090
{
50845091

50855092
/* Process as any other option. */
5086-
_nx_dhcp_process_option_data(temp_client_rec_ptr, (CHAR *)work_ptr, (UCHAR)value, NX_TRUE, size);
5093+
_nx_dhcp_process_option_data(temp_client_rec_ptr, (CHAR *)work_ptr, (UCHAR)value, NX_TRUE, (UINT)size);
50875094
}
50885095
}
50895096

0 commit comments

Comments
 (0)