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();