diff options
| author | Frédéric Desbiens <[email protected]> | 2025-10-06 13:52:13 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-10-06 13:52:13 -0400 |
| commit | e306027c2f60db4653e120460da523ec561edd1d (patch) | |
| tree | b386dd1a5276569de47396bd4f0c915617b10c54 | |
| parent | 8d84ebe7038e2b6114236c284093910558550492 (diff) | |
| parent | c1ca6382e23a9887aceeb7e8b165116816f224e3 (diff) | |
Merge pull request #346 from eclipse-threadx/hotfix-av6.4.4.202503a
Merge changes for v6.4.4.202503a
17 files changed, 53 insertions, 10 deletions
diff --git a/addons/mqtt/nxd_mqtt_client.c b/addons/mqtt/nxd_mqtt_client.c index 950a4be8..4016e86b 100644 --- a/addons/mqtt/nxd_mqtt_client.c +++ b/addons/mqtt/nxd_mqtt_client.c @@ -2509,6 +2509,7 @@ UINT status; client_ptr -> nxd_mqtt_client_websocket_host, client_ptr -> nxd_mqtt_client_websocket_host_length, client_ptr -> nxd_mqtt_client_websocket_uri_path, client_ptr -> nxd_mqtt_client_websocket_uri_path_length, (UCHAR *)NXD_MQTT_OVER_WEBSOCKET_PROTOCOL, sizeof(NXD_MQTT_OVER_WEBSOCKET_PROTOCOL) - 1, + client_ptr -> nxd_mqtt_client_websocket_bearer, client_ptr -> nxd_mqtt_client_websocket_bearer_length, NX_NO_WAIT); if (status != NX_IN_PROGRESS) @@ -2616,6 +2617,7 @@ UINT status; client_ptr -> nxd_mqtt_client_websocket_host, client_ptr -> nxd_mqtt_client_websocket_host_length, client_ptr -> nxd_mqtt_client_websocket_uri_path, client_ptr -> nxd_mqtt_client_websocket_uri_path_length, (UCHAR *)NXD_MQTT_OVER_WEBSOCKET_PROTOCOL, sizeof(NXD_MQTT_OVER_WEBSOCKET_PROTOCOL) - 1, + client_ptr -> nxd_mqtt_client_websocket_bearer, client_ptr -> nxd_mqtt_client_websocket_bearer_length, NX_NO_WAIT); if (status == NX_IN_PROGRESS) @@ -4156,6 +4158,7 @@ UINT old_priority; client_ptr -> nxd_mqtt_client_websocket_host, client_ptr -> nxd_mqtt_client_websocket_host_length, client_ptr -> nxd_mqtt_client_websocket_uri_path, client_ptr -> nxd_mqtt_client_websocket_uri_path_length, (UCHAR *)NXD_MQTT_OVER_WEBSOCKET_PROTOCOL, sizeof(NXD_MQTT_OVER_WEBSOCKET_PROTOCOL) - 1, + client_ptr -> nxd_mqtt_client_websocket_bearer, client_ptr -> nxd_mqtt_client_websocket_bearer_length, wait_option); } else @@ -4165,6 +4168,7 @@ UINT old_priority; client_ptr -> nxd_mqtt_client_websocket_host, client_ptr -> nxd_mqtt_client_websocket_host_length, client_ptr -> nxd_mqtt_client_websocket_uri_path, client_ptr -> nxd_mqtt_client_websocket_uri_path_length, (UCHAR *)NXD_MQTT_OVER_WEBSOCKET_PROTOCOL, sizeof(NXD_MQTT_OVER_WEBSOCKET_PROTOCOL) - 1, + client_ptr -> nxd_mqtt_client_websocket_bearer, client_ptr -> nxd_mqtt_client_websocket_bearer_length, wait_option); } @@ -6502,7 +6506,7 @@ NXD_MQTT_CLIENT *client_ptr = (NXD_MQTT_CLIENT *)context; /* 10-31-2022 Yuxin Zhou Initial Version 6.2.0 */ /* */ /**************************************************************************/ -UINT _nxd_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length) +UINT _nxd_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, UCHAR *bearer, UINT bearer_length) { UINT status; @@ -6519,6 +6523,8 @@ UINT status; client_ptr -> nxd_mqtt_client_websocket_host_length = host_length; client_ptr -> nxd_mqtt_client_websocket_uri_path = uri_path; client_ptr -> nxd_mqtt_client_websocket_uri_path_length = uri_path_length; + client_ptr -> nxd_mqtt_client_websocket_bearer = bearer; + client_ptr -> nxd_mqtt_client_websocket_bearer_length = bearer_length; /* Create WebSocket. */ status = nx_websocket_client_create(&client_ptr -> nxd_mqtt_client_websocket, (UCHAR *)"", @@ -6580,7 +6586,7 @@ UINT status; /* 10-31-2022 Yuxin Zhou Initial Version 6.2.0 */ /* */ /**************************************************************************/ -UINT _nxde_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length) +UINT _nxde_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, UCHAR *bearer, UINT bearer_length) { /* Validate the parameters. */ @@ -6590,6 +6596,6 @@ UINT _nxde_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, U return(NX_PTR_ERROR); } - return(_nxd_mqtt_client_websocket_set(client_ptr, host, host_length, uri_path, uri_path_length)); + return(_nxd_mqtt_client_websocket_set(client_ptr, host, host_length, uri_path, uri_path_length, bearer, bearer_length)); } #endif /* NXD_MQTT_OVER_WEBSOCKET */ diff --git a/addons/mqtt/nxd_mqtt_client.h b/addons/mqtt/nxd_mqtt_client.h index 43a56f5a..7a00915a 100644 --- a/addons/mqtt/nxd_mqtt_client.h +++ b/addons/mqtt/nxd_mqtt_client.h @@ -392,6 +392,8 @@ typedef struct NXD_MQTT_CLIENT_STRUCT UINT nxd_mqtt_client_websocket_host_length; UCHAR *nxd_mqtt_client_websocket_uri_path; UINT nxd_mqtt_client_websocket_uri_path_length; + UCHAR *nxd_mqtt_client_websocket_bearer; + UINT nxd_mqtt_client_websocket_bearer_length; #endif /* NXD_MQTT_OVER_WEBSOCKET */ } NXD_MQTT_CLIENT; @@ -553,8 +555,8 @@ UINT _nxde_mqtt_client_secure_connect(NXD_MQTT_CLIENT *client_ptr, NXD_ADDRESS * #endif /* NX_SECURE_ENABLE */ #ifdef NXD_MQTT_OVER_WEBSOCKET -UINT _nxd_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length); -UINT _nxde_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length); +UINT _nxd_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, UCHAR *bearer, UINT bearer_length); +UINT _nxde_mqtt_client_websocket_set(NXD_MQTT_CLIENT *client_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, UCHAR *bearer, UINT bearer_length); VOID _nxd_mqtt_client_websocket_connection_status_callback(NX_WEBSOCKET_CLIENT *websocket_client_ptr, VOID *context, UINT status); #endif /* NXD_MQTT_OVER_WEBSOCKET */ diff --git a/addons/websocket/nx_websocket_client.h b/addons/websocket/nx_websocket_client.h index bad5c93f..135d6c71 100644 --- a/addons/websocket/nx_websocket_client.h +++ b/addons/websocket/nx_websocket_client.h @@ -265,12 +265,14 @@ UINT nx_websocket_client_packet_allocate(NX_WEBSOCKET_CLIENT *client_ptr, NX_PA UINT nx_websocket_client_connect(NX_WEBSOCKET_CLIENT *client_ptr, NX_TCP_SOCKET *socket_ptr, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, - UCHAR *protocol, UINT protocol_length,UINT wait_option); + UCHAR *protocol, UINT protocol_length, + UCHAR *bearer, UINT bearer_length, UINT wait_option); #ifdef NX_SECURE_ENABLE UINT nx_websocket_client_secure_connect(NX_WEBSOCKET_CLIENT *client_ptr, NX_SECURE_TLS_SESSION *tls_session, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, - UCHAR *protocol, UINT protocol_length,UINT wait_option); + UCHAR *protocol, UINT protocol_length, + UCHAR *bearer, UINT bearer_length, UINT wait_option); #endif /* NX_SECURE_ENABLE */ UINT nx_websocket_client_disconnect(NX_WEBSOCKET_CLIENT *client_ptr, UINT wait_option); UINT nx_websocket_client_send(NX_WEBSOCKET_CLIENT *client_ptr, NX_PACKET *packet_ptr, UINT code, UINT is_final, UINT wait_option); @@ -302,11 +304,13 @@ UINT _nx_websocket_client_connect(NX_WEBSOCKET_CLIENT *client_ptr, NX_TCP_SOCKE UINT _nxe_websocket_client_secure_connect(NX_WEBSOCKET_CLIENT *client_ptr, NX_SECURE_TLS_SESSION *tls_session, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, - UCHAR *protocol, UINT protocol_length,UINT wait_option); + UCHAR *protocol, UINT protocol_length, + UCHAR *bearer, UINT bearer_length, UINT wait_option); UINT _nx_websocket_client_secure_connect(NX_WEBSOCKET_CLIENT *client_ptr, NX_SECURE_TLS_SESSION *tls_session, UCHAR *host, UINT host_length, UCHAR *uri_path, UINT uri_path_length, - UCHAR *protocol, UINT protocol_length,UINT wait_option); + UCHAR *protocol, UINT protocol_length, + UCHAR *bearer, UINT bearer_length, UINT wait_option); #endif /* NX_SECURE_ENABLE */ UINT _nxe_websocket_client_disconnect(NX_WEBSOCKET_CLIENT *client_ptr, UINT wait_option); UINT _nx_websocket_client_disconnect(NX_WEBSOCKET_CLIENT *client_ptr, UINT wait_option); diff --git a/common/inc/nx_api.h b/common/inc/nx_api.h index 0f1a5778..fcc973ec 100644 --- a/common/inc/nx_api.h +++ b/common/inc/nx_api.h @@ -531,7 +531,7 @@ VOID _nx_trace_event_update(TX_TRACE_BUFFER_ENTRY *event, ULONG timestamp, ULONG #define NETXDUO_MINOR_VERSION 4 #define NETXDUO_PATCH_VERSION 4 #define NETXDUO_BUILD_VERSION 202503 -#define NETXDUO_HOTFIX_VERSION '' +#define NETXDUO_HOTFIX_VERSION 'a' /* Define the following symbols for backward compatibility */ #define EL_PRODUCT_NETXDUO diff --git a/common/src/nx_ip_packet_receive.c b/common/src/nx_ip_packet_receive.c index 153e903d..0eef603d 100644 --- a/common/src/nx_ip_packet_receive.c +++ b/common/src/nx_ip_packet_receive.c @@ -101,6 +101,7 @@ UCHAR version_byte; packet_ptr -> nx_packet_address.nx_packet_interface_ptr = &(ip_ptr -> nx_ip_interface[0]); } +#ifndef NX_DISABLE_IPV4 /* GHSA-pf5q-r6q5-6j2f: This is an IPv4 packet. Therefore the header length must be at least 20 bytes. Validate the payload size before accessing the IP header. */ @@ -113,6 +114,7 @@ UCHAR version_byte; return; } +#endif /* It's assumed that the IP link driver has positioned the top pointer in the packet to the start of the IP address... so that's where we will start. */ diff --git a/test/regression/websocket_test/netx_websocket_16_bit_payload_length_test.c b/test/regression/websocket_test/netx_websocket_16_bit_payload_length_test.c index 3ae2b047..c0fa75a0 100644 --- a/test/regression/websocket_test/netx_websocket_16_bit_payload_length_test.c +++ b/test/regression/websocket_test/netx_websocket_16_bit_payload_length_test.c @@ -47,6 +47,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -322,6 +323,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status) diff --git a/test/regression/websocket_test/netx_websocket_connect_test.c b/test/regression/websocket_test/netx_websocket_connect_test.c index 59619e98..f29c86bc 100644 --- a/test/regression/websocket_test/netx_websocket_connect_test.c +++ b/test/regression/websocket_test/netx_websocket_connect_test.c @@ -71,6 +71,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR bad_server_switch_101[] = { @@ -314,6 +315,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); /* The first time is to test whether the bad response from server will be checked and found */ @@ -325,6 +327,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status || client_websocket.nx_websocket_client_mutex.tx_mutex_ownership_count != 0) SET_ERROR_COUNTER(&error_counter, __FILE__, __LINE__); @@ -348,6 +351,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status || client_websocket.nx_websocket_client_mutex.tx_mutex_ownership_count != 0) SET_ERROR_COUNTER(&error_counter, __FILE__, __LINE__); diff --git a/test/regression/websocket_test/netx_websocket_delete_test.c b/test/regression/websocket_test/netx_websocket_delete_test.c index a5be9cd6..de7c1c99 100644 --- a/test/regression/websocket_test/netx_websocket_delete_test.c +++ b/test/regression/websocket_test/netx_websocket_delete_test.c @@ -48,6 +48,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -226,6 +227,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status) diff --git a/test/regression/websocket_test/netx_websocket_disconnect_test.c b/test/regression/websocket_test/netx_websocket_disconnect_test.c index 449407c2..63723ef2 100644 --- a/test/regression/websocket_test/netx_websocket_disconnect_test.c +++ b/test/regression/websocket_test/netx_websocket_disconnect_test.c @@ -48,6 +48,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -229,6 +230,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status) diff --git a/test/regression/websocket_test/netx_websocket_fin_test.c b/test/regression/websocket_test/netx_websocket_fin_test.c index 82dadf7c..5a45e71b 100644 --- a/test/regression/websocket_test/netx_websocket_fin_test.c +++ b/test/regression/websocket_test/netx_websocket_fin_test.c @@ -47,6 +47,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -233,6 +234,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if(status) diff --git a/test/regression/websocket_test/netx_websocket_mask_test.c b/test/regression/websocket_test/netx_websocket_mask_test.c index dadbe8ec..e4784e22 100644 --- a/test/regression/websocket_test/netx_websocket_mask_test.c +++ b/test/regression/websocket_test/netx_websocket_mask_test.c @@ -49,6 +49,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -235,6 +236,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if(status) diff --git a/test/regression/websocket_test/netx_websocket_multi_instance_test.c b/test/regression/websocket_test/netx_websocket_multi_instance_test.c index 6641ad84..3c75b0cd 100644 --- a/test/regression/websocket_test/netx_websocket_multi_instance_test.c +++ b/test/regression/websocket_test/netx_websocket_multi_instance_test.c @@ -48,6 +48,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -293,6 +294,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status || client_websocket.nx_websocket_client_mutex.tx_mutex_ownership_count != 0) @@ -486,6 +488,7 @@ UINT code; TEST1_HOST_NAME, sizeof(TEST1_HOST_NAME) - 1, (UCHAR *)TEST1_URI_PATH, sizeof(TEST1_URI_PATH) - 1, (UCHAR *)TEST1_PROTOCOL, sizeof(TEST1_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status || client1_websocket.nx_websocket_client_mutex.tx_mutex_ownership_count != 0) diff --git a/test/regression/websocket_test/netx_websocket_non_block_test.c b/test/regression/websocket_test/netx_websocket_non_block_test.c index 5e93ffab..b3eb6a85 100644 --- a/test/regression/websocket_test/netx_websocket_non_block_test.c +++ b/test/regression/websocket_test/netx_websocket_non_block_test.c @@ -74,6 +74,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -325,6 +326,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_NO_WAIT); /* Set 0 to do non-blocking test */ if (status != NX_IN_PROGRESS || client_websocket.nx_websocket_client_mutex.tx_mutex_ownership_count != 0) SET_ERROR_COUNTER(&error_counter, __FILE__, __LINE__); @@ -376,6 +378,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_NO_WAIT); if (status != NX_IN_PROGRESS || client_websocket.nx_websocket_client_mutex.tx_mutex_ownership_count != 0) SET_ERROR_COUNTER(&error_counter, __FILE__, __LINE__); diff --git a/test/regression/websocket_test/netx_websocket_one_frame_in_packets_test.c b/test/regression/websocket_test/netx_websocket_one_frame_in_packets_test.c index 5325323b..447eec11 100644 --- a/test/regression/websocket_test/netx_websocket_one_frame_in_packets_test.c +++ b/test/regression/websocket_test/netx_websocket_one_frame_in_packets_test.c @@ -47,6 +47,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -233,6 +234,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status) diff --git a/test/regression/websocket_test/netx_websocket_one_packet_with_multi_frames_test.c b/test/regression/websocket_test/netx_websocket_one_packet_with_multi_frames_test.c index ea865117..7310062a 100644 --- a/test/regression/websocket_test/netx_websocket_one_packet_with_multi_frames_test.c +++ b/test/regression/websocket_test/netx_websocket_one_packet_with_multi_frames_test.c @@ -47,6 +47,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -293,6 +294,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status || client_websocket.nx_websocket_client_mutex.tx_mutex_ownership_count != 0) diff --git a/test/regression/websocket_test/netx_websocket_opcode_test.c b/test/regression/websocket_test/netx_websocket_opcode_test.c index 02d9d471..07b10cdf 100644 --- a/test/regression/websocket_test/netx_websocket_opcode_test.c +++ b/test/regression/websocket_test/netx_websocket_opcode_test.c @@ -15,6 +15,7 @@ extern void test_control_return(UINT); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" /* Define device drivers. */ extern void _nx_ram_network_driver_1024(NX_IP_DRIVER *driver_req_ptr); @@ -47,6 +48,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_SERVER_ADDRESS IP_ADDRESS(1,2,3,4) #define TEST_CLIENT_ADDRESS IP_ADDRESS(1,2,3,5) #define TEST_SERVER_PORT 80 +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -233,6 +235,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if(status) diff --git a/test/regression/websocket_test/netx_websocket_send_chain_packets_test.c b/test/regression/websocket_test/netx_websocket_send_chain_packets_test.c index 81d021b1..218c236f 100644 --- a/test/regression/websocket_test/netx_websocket_send_chain_packets_test.c +++ b/test/regression/websocket_test/netx_websocket_send_chain_packets_test.c @@ -47,6 +47,7 @@ static void thread_server_entry(ULONG thread_input); #define TEST_HOST_NAME "1.2.3.4" #define TEST_URI_PATH "/test" #define TEST_PROTOCOL "test" +#define TEST_BEARER "" static UCHAR server_switch_101[] = { @@ -265,6 +266,7 @@ UINT code; TEST_HOST_NAME, sizeof(TEST_HOST_NAME) - 1, (UCHAR *)TEST_URI_PATH, sizeof(TEST_URI_PATH) - 1, (UCHAR *)TEST_PROTOCOL, sizeof(TEST_PROTOCOL) - 1, + (UCHAR *)TEST_BEARER, sizeof(TEST_BEARER) -1, NX_WAIT_FOREVER); if (status) |
