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

Fixed network port object to accept host name option of host-n-port writes. (#997)

Browse Source
This commit is contained in:
Steve Karg
2025-05-20 15:44:47 -05:00
committed by GitHub
parent 524fd162f9
commit b3fd374c84
9 changed files with 1077 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/hostnport/src/main.c
+111 -1
View File
@@ -12,6 +12,43 @@
#include <bacnet/bacdest.h>
#include <bacnet/hostnport.h>
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(create_object_tests, test_HostNPortMinimal_Init)
#else
static void test_HostNPortMinimal_Init(void)
#endif
{
BACNET_HOST_N_PORT_MINIMAL test_data_1 = { 0 }, test_data_2 = { 0 };
BACNET_HOST_N_PORT host_n_port = { 0 };
uint8_t address[IP6_ADDRESS_MAX] = { 1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16 };
uint16_t port = 0xBAC0;
/* test the init */
host_n_port_minimal_ip_init(&test_data_1, port, address, sizeof(address));
zassert_equal(test_data_1.tag, BACNET_HOST_ADDRESS_TAG_IP_ADDRESS, NULL);
zassert_equal(test_data_1.port, port, NULL);
zassert_equal(test_data_1.host.ip_address.length, sizeof(address), NULL);
zassert_mem_equal(
test_data_1.host.ip_address.address, address, sizeof(address), NULL);
host_n_port_from_minimal(&host_n_port, &test_data_1);
host_n_port_to_minimal(&test_data_2, &host_n_port);
zassert_true(
host_n_port_minimal_same(&test_data_1, &test_data_2),
"test_data_1 != test_data_2");
}
static void test_HostNPortMinimal_Copy(BACNET_HOST_N_PORT *data)
{
BACNET_HOST_N_PORT_MINIMAL test_data_1 = { 0 }, test_data_2 = { 0 };
host_n_port_to_minimal(&test_data_1, data);
host_n_port_minimal_copy(&test_data_2, &test_data_1);
zassert_true(
host_n_port_minimal_same(&test_data_1, &test_data_2),
"test_data_1 != test_data_2");
}
static void test_HostNPortCodec(BACNET_HOST_N_PORT *data)
{
uint8_t apdu[MAX_APDU] = { 0 };
@@ -72,12 +109,82 @@ static void test_HostNPort(void)
data.host_name = false;
data.port = 0xBAC0;
test_HostNPortCodec(&data);
test_HostNPortMinimal_Copy(&data);
/* Host Name */
characterstring_init_ansi(&data.host.name, "bacnet.org");
data.host_ip_address = false;
data.host_name = true;
data.port = 0xBAC0;
test_HostNPortCodec(&data);
test_HostNPortMinimal_Copy(&data);
}
#if defined(CONFIG_ZTEST_NEW_API)
ZTEST(create_object_tests, test_is_valid_hostname)
#else
static void test_is_valid_hostname(void)
#endif
{
bool status = false;
BACNET_CHARACTER_STRING hostname;
status = characterstring_init_ansi(&hostname, "valid.host.name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_true(status, NULL);
status = characterstring_init_ansi(&hostname, "invalid..host.name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_false(status, NULL);
status = characterstring_init_ansi(&hostname, "-invalid.host.name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_false(status, NULL);
status = characterstring_init_ansi(&hostname, "valid.host-name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_true(status, NULL);
status = characterstring_init_ansi(&hostname, "invalid.host--name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_false(status, NULL);
status = characterstring_init_ansi(&hostname, "invalid.host name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_false(status, NULL);
status = characterstring_init_ansi(&hostname, "valid.host.123.name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_true(status, NULL);
{
char too_long_label[65] = { 0 };
memset(too_long_label, 'l', sizeof(too_long_label) - 1);
status = characterstring_init_ansi(&hostname, too_long_label);
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_false(status, NULL);
}
{
char max_length_label[64] = { 0 };
memset(max_length_label, 'l', sizeof(max_length_label) - 1);
status = characterstring_init_ansi(&hostname, max_length_label);
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_true(status, NULL);
}
status = characterstring_init_ansi(&hostname, "non-alpanumer!c.host name");
zassert_true(status, NULL);
status = bacnet_is_valid_hostname(&hostname);
zassert_false(status, NULL);
}
#if defined(CONFIG_ZTEST_NEW_API)
@@ -85,7 +192,10 @@ ZTEST_SUITE(host_n_port_tests, NULL, NULL, NULL, NULL, NULL);
#else
void test_main(void)
{
ztest_test_suite(host_n_port_tests, ztest_unit_test(test_HostNPort));
ztest_test_suite(
host_n_port_tests, ztest_unit_test(test_HostNPort),
ztest_unit_test(test_HostNPortMinimal_Init),
ztest_unit_test(test_is_valid_hostname));
ztest_run_test_suite(host_n_port_tests);
}