dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix/win32 build warnings (#936)

Browse Source 
* Changed win32 port of localtime to use secure OS API functions when compiled with MSVC

* Changed all the sprintf to use snprintf instead in BSC tests to ensure null string endings.
This commit is contained in:
Steve Karg
2025-03-03 10:32:28 -06:00
committed by GitHub
parent b0a26cf2cd
commit 7e725ce028
21 changed files with 317 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/datalink/bsc-datalink/src/main.c
+45 -32
View File
@@ -9995,12 +9995,12 @@ static void test_sc_parameters(void)
memset(&hubf_uuid, 0x1, sizeof(hubf_uuid));
memset(&hubf_vmac, 0x2, sizeof(hubf_vmac));
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
// prepare
bacfile_init();
@@ -10132,15 +10132,26 @@ static void test_sc_datalink(void)
memset(&uuid3, 0x35, sizeof(uuid3));
memset(&vmac3, 0x36, sizeof(vmac3));
sprintf(primary_url3, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
secondary_url3, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(primary_url2, "wss://%s:%d", BACNET_LOCALHOST, BACNET_HUB_PORT);
sprintf(secondary_url2, "wss://%s:%d", BACNET_LOCALHOST, BACNET_HUB_PORT);
sprintf(primary_url1, "wss://%s:%d", BACNET_LOCALHOST, BACNET_HUB_PORT);
sprintf(secondary_url1, "wss://%s:%d", BACNET_LOCALHOST, BACNET_HUB_PORT);
sprintf(
direct_url, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
primary_url3, sizeof(primary_url3), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
secondary_url3, sizeof(secondary_url3), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
primary_url2, sizeof(primary_url2), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_HUB_PORT);
snprintf(
secondary_url2, sizeof(secondary_url2), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_HUB_PORT);
snprintf(
primary_url1, sizeof(primary_url1), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_HUB_PORT);
snprintf(
secondary_url1, sizeof(secondary_url1), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_HUB_PORT);
snprintf(
direct_url, sizeof(direct_url), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_DIRECT_SERVER_PORT);
bacfile_init();
@@ -10383,26 +10394,26 @@ static void test_sc_datalink_properties(void)
memset(&uuid4, 0x7, sizeof(uuid4));
memset(&vmac4, 0x8, sizeof(vmac4));
sprintf(
primary_url3, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
primary_url3, sizeof(primary_url3), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_HUB_SERVER_PORT);
sprintf(
secondary_url3, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
secondary_url3, sizeof(secondary_url3), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_HUB_SERVER_PORT);
sprintf(
primary_url2, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
primary_url2, sizeof(primary_url2), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_HUB_SERVER_PORT);
sprintf(
secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
secondary_url2, sizeof(secondary_url2), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_HUB_SERVER_PORT);
sprintf(
primary_url1, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
primary_url1, sizeof(primary_url1), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_HUB_SERVER_PORT);
sprintf(
secondary_url1, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
secondary_url1, sizeof(secondary_url1), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_HUB_SERVER_PORT);
sprintf(
direct_url, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
direct_url, sizeof(direct_url), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_DIRECT_SERVER_PORT);
bacfile_init();
@@ -10709,9 +10720,11 @@ static void test_sc_datalink_failed_requests(void)
memset(&uuid2, 0x43, sizeof(uuid2));
memset(&vmac2, 0x42, sizeof(vmac2));
sprintf(primary_url2, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
primary_url2, sizeof(primary_url2), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
secondary_url2, sizeof(secondary_url2), "wss://%s:%d", BACNET_LOCALHOST,
SC_NETPORT_HUB_SERVER_PORT);
bacfile_init();
test/bacnet/datalink/bsc-node/src/main.c
+138 -121
View File
@@ -11268,8 +11268,12 @@ static void test_node_start_stop(void)
char primary_url[128] = { 0 };
char secondary_url[128] = { 0 };
sprintf(primary_url, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(secondary_url, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
conf.ca_cert_chain = ca_cert;
conf.ca_cert_chain_size = sizeof(ca_cert);
@@ -11375,18 +11379,18 @@ static void test_node_duplicated_vmac(void)
memset(&node_uuid2, 0x3, sizeof(node_uuid2));
memset(&node_vmac2, 0x2, sizeof(node_vmac2));
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT2);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT2);
sprintf(
node_primary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT2);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT2);
snprintf(
node_primary_url2, sizeof(node_primary_url2), BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url2, sizeof(node_secondary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
conf.ca_cert_chain = ca_cert;
conf.ca_cert_chain_size = sizeof(ca_cert);
@@ -11476,10 +11480,12 @@ static void test_node_duplicated_vmac(void)
memset(&node_uuid2, 0x3, sizeof(node_uuid2));
memset(&node_vmac2, 0x2, sizeof(node_vmac2));
sprintf(
url1, "wss://%s:%d", BACNET_LOCALHOST, BACNET_NODE_LOCAL_DIRECT_PORT);
sprintf(
url2, "wss://%s:%d", BACNET_LOCALHOST, BACNET_NODE_LOCAL_DIRECT_PORT);
snprintf(
url1, sizeof(url1), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT);
snprintf(
url2, sizeof(url2), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT);
conf.primaryURL = NULL;
conf.failoverURL = NULL;
@@ -11560,18 +11566,18 @@ static void test_node_send(void)
memset(&node_uuid3, 0x5, sizeof(node_uuid3));
memset(&node_vmac3, 0x6, sizeof(node_vmac3));
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT2);
sprintf(
node_primary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT2);
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT2);
snprintf(
node_primary_url2, sizeof(node_primary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url2, sizeof(node_secondary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT2);
conf.ca_cert_chain = ca_cert;
conf.ca_cert_chain_size = sizeof(ca_cert);
@@ -11805,12 +11811,12 @@ static void test_node_local_hub_function(void)
memset(&node_vmac3, 0x6, sizeof(node_vmac3));
memset(&broadcast.address[0], 0xff, sizeof(broadcast.address));
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
conf.ca_cert_chain = ca_cert;
conf.ca_cert_chain_size = sizeof(ca_cert);
@@ -12007,23 +12013,24 @@ static void test_node_direct_connection(void)
memset(&node_vmac3, 0x6, sizeof(node_vmac2));
memset(&broadcast.address[0], 0xff, sizeof(broadcast.address));
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url3, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url3, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url2, sizeof(node_primary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url2, sizeof(node_secondary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url3, sizeof(node_primary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url3, sizeof(node_secondary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
conf.ca_cert_chain = ca_cert;
conf.ca_cert_chain_size = sizeof(ca_cert);
@@ -12054,8 +12061,8 @@ static void test_node_direct_connection(void)
conf.direct_connection_accept_uris_len = 0;
conf.event_func = node_event;
sprintf(
uris, "wss://%s:%d wss://%s:%d", BACNET_LOCALHOST,
snprintf(
uris, sizeof(uris), "wss://%s:%d wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2, BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2);
conf2.ca_cert_chain = ca_cert;
@@ -12262,9 +12269,12 @@ static void test_node_direct_connection(void)
wait_for_connection_to_hub(&node_ev3, node3);
wait_for_connection_to_hub(&node_ev2, node2);
sprintf(url1, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
url2, "wss://%s:%d", BACNET_LOCALHOST, BACNET_NODE_LOCAL_DIRECT_PORT2);
snprintf(
url1, sizeof(url1), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
url2, sizeof(url2), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2);
ret = bsc_node_connect_direct(node3, NULL, urls, 2);
zassert_equal(ret == BSC_SC_SUCCESS, true, 0);
zassert_equal(
@@ -12421,11 +12431,12 @@ static void test_node_direct_connection(void)
wait_specific_node_ev(&node_ev2, BSC_NODE_EVENT_STOPPED, node2);
// bad case test (when one url in bsc_node_connect_direct() is incorrect)
sprintf(
url1, "w3sdfsdfsdfss://%s:%d", BACNET_LOCALHOST,
snprintf(
url1, sizeof(url1), "w3sdfsdfsdfss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2);
snprintf(
url2, sizeof(url2), "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2);
sprintf(
url2, "wss://%s:%d", BACNET_LOCALHOST, BACNET_NODE_LOCAL_DIRECT_PORT2);
ret = bsc_node_start(node);
zassert_equal(ret == BSC_SC_SUCCESS, true, 0);
zassert_equal(
@@ -12474,11 +12485,11 @@ static void test_node_direct_connection(void)
// bad URLs test
sprintf(
url1, "w3sdfsdfsdfss://%s:%d", BACNET_LOCALHOST,
snprintf(
url1, sizeof(url1), "w3sdfsdfsdfss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2);
sprintf(
url2, "wssdfsdfsdfs://%s:%d", BACNET_LOCALHOST,
snprintf(
url2, sizeof(url2), "wssdfsdfsdfs://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2);
ret = bsc_node_init(&conf, &node);
zassert_equal(ret == BSC_SC_SUCCESS, true, 0);
@@ -12514,21 +12525,24 @@ static void test_node_direct_connection(void)
ret = bsc_node_deinit(node3);
zassert_equal(ret == BSC_SC_SUCCESS, true, 0);
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url2, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
node_secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url3, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
node_secondary_url3, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url2, sizeof(node_primary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_secondary_url2, sizeof(node_secondary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url3, sizeof(node_primary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_secondary_url3, sizeof(node_secondary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
ret = bsc_node_init(&conf, &node);
zassert_equal(ret == BSC_SC_SUCCESS, true, 0);
@@ -12566,23 +12580,24 @@ static void test_node_direct_connection(void)
conf.address_resolution_freshness_timeout_s = 1;
conf2.address_resolution_freshness_timeout_s = 1;
conf3.address_resolution_freshness_timeout_s = 1;
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url3, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url3, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url2, sizeof(node_primary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url2, sizeof(node_secondary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url3, sizeof(node_primary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url3, sizeof(node_secondary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
ret = bsc_node_init(&conf, &node);
zassert_equal(ret == BSC_SC_SUCCESS, true, 0);
ret = bsc_node_init(&conf2, &node2);
@@ -12701,23 +12716,24 @@ static void test_node_direct_connection_unsupported(void)
memset(&node_uuid3, 0x5, sizeof(node_uuid2));
memset(&node_vmac3, 0x6, sizeof(node_vmac2));
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url2, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
sprintf(
node_primary_url3, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_HUB_PORT);
sprintf(
node_secondary_url3, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url2, sizeof(node_primary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url2, sizeof(node_secondary_url2), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_primary_url3, sizeof(node_primary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_NODE_LOCAL_HUB_PORT);
snprintf(
node_secondary_url3, sizeof(node_secondary_url3), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
conf.ca_cert_chain = ca_cert;
conf.ca_cert_chain_size = sizeof(ca_cert);
@@ -12748,8 +12764,8 @@ static void test_node_direct_connection_unsupported(void)
conf.direct_connection_accept_uris_len = 0;
conf.event_func = node_event;
sprintf(
uris, "wss://%s:%d wss://%s:%d", BACNET_LOCALHOST,
snprintf(
uris, sizeof(uris), "wss://%s:%d wss://%s:%d", BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2, BACNET_LOCALHOST,
BACNET_NODE_LOCAL_DIRECT_PORT2);
conf2.ca_cert_chain = ca_cert;
@@ -12917,11 +12933,12 @@ static void test_node_bad_cases(void)
memset(big_url, 0x22, sizeof(big_url) - 1);
memset(t, 0x22, sizeof(t) - 1);
sprintf(
node_primary_url, "wss://%s:%d", BACNET_LOCALHOST, BACNET_CLOSED_PORT);
sprintf(
node_secondary_url, "wss://%s:%d", BACNET_LOCALHOST,
BACNET_CLOSED_PORT);
snprintf(
node_primary_url, sizeof(node_primary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
snprintf(
node_secondary_url, sizeof(node_secondary_url), "wss://%s:%d",
BACNET_LOCALHOST, BACNET_CLOSED_PORT);
conf.ca_cert_chain = ca_cert;
conf.ca_cert_chain_size = sizeof(ca_cert);
test/bacnet/datalink/bsc-socket/src/main.c
+12 -12
View File
@@ -9942,8 +9942,8 @@ static void test_simple(void)
memset(&server_vmac, 0x2, sizeof(server_vmac));
memset(&client_uuid, 0x3, sizeof(server_uuid));
memset(&client_vmac, 0x4, sizeof(server_vmac));
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
bsc_init_ctx_cfg(
@@ -10073,8 +10073,8 @@ static void test_duplicated_vmac_on_server(void)
memset(&client_uuid2, 0x4, sizeof(server_uuid));
memset(&client_vmac2, 0x5, sizeof(server_vmac));
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
bsc_init_ctx_cfg(
@@ -10177,8 +10177,8 @@ static void test_duplicated_vmac_on_server2(void)
memset(&client_uuid, 0x3, sizeof(server_uuid));
memset(&client_vmac, 0x2, sizeof(server_vmac));
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
bsc_init_ctx_cfg(
@@ -10274,8 +10274,8 @@ static void test_duplicated_uuid_on_server(void)
memset(&client_uuid2, 0x3, sizeof(server_uuid));
memset(&client_vmac2, 0x5, sizeof(server_vmac));
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
bsc_init_ctx_cfg(
@@ -10372,8 +10372,8 @@ static void test_bad_params(void)
memset(&server_vmac, 0x2, sizeof(server_vmac));
memset(&client_uuid, 0x3, sizeof(server_uuid));
memset(&client_vmac, 0x4, sizeof(server_vmac));
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
init_sock_ev(&srv_ev);
@@ -10528,8 +10528,8 @@ static void test_error_case1(void)
memset(&server_vmac, 0x2, sizeof(server_vmac));
memset(&client_uuid, 0x3, sizeof(server_uuid));
memset(&client_vmac, 0x4, sizeof(server_vmac));
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
bsc_init_ctx_cfg(
test/bacnet/datalink/bvlc-sc/src/main.c
+3 -1
View File
@@ -2770,7 +2770,9 @@ static void test_ADDRESS_RESOLUTION_ACK(void)
const char *err_desc = NULL;
web_socket_uris[0] = 0;
sprintf(web_socket_uris, "%s %s", "web_socket_uri1", "web_socket_uri2");
snprintf(
web_socket_uris, sizeof(web_socket_uris), "%s %s", "web_socket_uri1",
"web_socket_uri2");
memset(&origin.address, 0x91, BVLC_SC_VMAC_SIZE);
memset(&dest.address, 0xef, BVLC_SC_VMAC_SIZE);
test/bacnet/datalink/hub-sc/src/main.c
+53 -52
View File
@@ -1540,19 +1540,19 @@ static void test_hub_connector_url(bool primary)
memset(npdu, 0x11, sizeof(npdu));
if (primary) {
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
} else {
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
}
init_hubc_ev(&hubc);
@@ -1701,12 +1701,12 @@ static void test_hub_connector_bad_primary_url(void)
memset(&hubc_uuid, 0x3, sizeof(hubc_uuid));
memset(&hubc_vmac, 0x4, sizeof(hubc_vmac));
sprintf(
primary_url, "wsssdsdfsdf://sdsdf%s:sdfsdf%d",
snprintf(
primary_url, sizeof(primary_url), "wsssdsdfsdf://sdsdf%s:sdfsdf%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
init_hubc_ev(&hubc);
init_hubf_ev(&hubf);
@@ -1780,12 +1780,12 @@ static void test_hub_bad_params(void)
memset(&hubc_vmac, 0x4, sizeof(hubc_vmac));
memset(&hubc_uuid2, 0x5, sizeof(hubc_uuid));
memset(&hubc_vmac2, 0x6, sizeof(hubc_vmac));
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
init_hubc_ev(&hubc);
@@ -1824,12 +1824,13 @@ static void test_hub_bad_params(void)
hub_connector_event, &hubc_uuid, &hubc_h);
zassert_equal(ret, BSC_SC_BAD_PARAM, 0);
sprintf(
primary_url, "wsssdsdfsdf://sdsdf%s:sdfsdf%d",
snprintf(
primary_url, sizeof(primary_url), "wsssdsdfsdf://sdsdf%s:sdfsdf%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss23413r234://sdfsdfsdf%s:r234%2d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
secondary_url, sizeof(secondary_url),
"wss23413r234://sdfsdfsdf%s:r234%2d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
ret = bsc_hub_connector_start(
ca_cert, sizeof(ca_cert), client_cert, sizeof(client_cert), CLIENT_KEY,
sizeof(CLIENT_KEY), &hubc_uuid, &hubc_vmac, MAX_BVLC_LEN, MAX_NDPU_LEN,
@@ -1841,13 +1842,13 @@ static void test_hub_bad_params(void)
hub_connector_event, &hubc_uuid, &hubc_h);
zassert_equal(ret, BSC_SC_BAD_PARAM, 0);
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
ret = bsc_hub_connector_start(
ca_cert, sizeof(ca_cert), client_cert, sizeof(client_cert), CLIENT_KEY,
@@ -1941,12 +1942,12 @@ static void test_hub_connector_reconnect(void)
memset(&hubc_uuid, 0x5, sizeof(hubc_uuid));
memset(&hubc_vmac, 0x6, sizeof(hubc_vmac));
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
init_hubc_ev(&hubc);
init_hubf_ev(&hubf);
@@ -2093,12 +2094,12 @@ static void test_hub_connector_duplicated_vmac(void)
memset(&hubc_uuid, 0x3, sizeof(hubc_uuid));
memset(&hubc_vmac, 0x2, sizeof(hubc_vmac));
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
init_hubc_ev(&hubc);
init_hubf_ev(&hubf);
@@ -2248,12 +2249,12 @@ static void test_hub_function_duplicated_uuid(void)
memset(&hubc_uuid2, 0x3, sizeof(hubc_uuid2));
memset(&hubc_vmac2, 0x6, sizeof(hubc_vmac2));
sprintf(
primary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
sprintf(
secondary_url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT2);
snprintf(
primary_url, sizeof(primary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT);
snprintf(
secondary_url, sizeof(secondary_url), "wss://%s:%d",
BACNET_WEBSOCKET_SERVER_ADDR, BACNET_WEBSOCKET_SERVER_PORT2);
init_hubc_ev(&hubc);
init_hubf_ev(&hubf);
test/bacnet/datalink/websockets/src/main.c
+4 -5
View File
@@ -8143,8 +8143,8 @@ static void test_simple(void)
memset(&srv_ctx, 0, sizeof(srv_ctx));
srv_ctx.ev = -1;
srv_ctx.h = BSC_WEBSOCKET_INVALID_HANDLE;
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
ret = bws_srv_start(
@@ -8211,10 +8211,9 @@ static void test_onoff(void)
memset(&srv_ctx, 0, sizeof(srv_ctx));
srv_ctx.ev = -1;
srv_ctx.h = BSC_WEBSOCKET_INVALID_HANDLE;
sprintf(
url, "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
snprintf(
url, sizeof(url), "wss://%s:%d", BACNET_WEBSOCKET_SERVER_ADDR,
BACNET_WEBSOCKET_SERVER_PORT);
ret = bws_srv_start(
BSC_WEBSOCKET_HUB_PROTOCOL, BACNET_WEBSOCKET_SERVER_PORT, NULL, ca_cert,
sizeof(ca_cert), server_cert, sizeof(server_cert), server_key,