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

Added FD BBMD Address encoding. (#269)

Browse Source 
* Added FD BBMD Address encoder and decoder

* Added FD BBMD address to bacapp

* Added FD BBMD address to network port object

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-05-10 17:06:51 -05:00
committed by GitHub
parent 89a81447cc
commit e08680044e
14 changed files with 581 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacapp.c
+75
View File
@@ -51,6 +51,9 @@
#include "bacnet/datetime.h"
#include "bacnet/bacstr.h"
#include "bacnet/lighting.h"
#if defined(BACAPP_HOST_N_PORT)
#include "bacnet/datalink/datalink.h"
#endif
/** @file bacapp.c Utilities for the BACnet_Application_Data_Value */
@@ -150,6 +153,13 @@ int bacapp_encode_application_data(
&apdu[0], &value->type.Lighting_Command);
break;
#endif
#if defined(BACAPP_HOST_N_PORT)
case BACNET_APPLICATION_TAG_HOST_N_PORT:
apdu_len = bvlc_foreign_device_bbmd_host_address_encode(
&apdu[0], MAX_APDU, &value->type.IP_Address);
break;
#endif
#if defined(BACAPP_DEVICE_OBJECT_PROP_REF)
case BACNET_APPLICATION_TAG_DEVICE_OBJECT_PROPERTY_REFERENCE:
/* BACnetDeviceObjectPropertyReference */
@@ -271,6 +281,14 @@ int bacapp_decode_data(uint8_t *apdu,
len = lighting_command_decode(
&apdu[0], len_value_type, &value->type.Lighting_Command);
break;
#endif
#if defined(BACAPP_HOST_N_PORT)
case BACNET_APPLICATION_TAG_HOST_N_PORT: {
BACNET_ERROR_CODE error_code;
len = bvlc_foreign_device_bbmd_host_address_decode(
&apdu[0], len_value_type, &error_code,
&value->type.IP_Address);
} break;
#endif
default:
break;
@@ -566,6 +584,16 @@ int bacapp_encode_context_data_value(uint8_t *apdu,
apdu_len = lighting_command_encode_context(&apdu[0],
context_tag_number, &value->type.Lighting_Command);
break;
#endif
#if defined(BACAPP_HOST_N_PORT)
case BACNET_APPLICATION_TAG_HOST_N_PORT:
apdu_len = encode_opening_tag(&apdu[0], context_tag_number);
apdu_len += bvlc_foreign_device_bbmd_host_address_encode(
&apdu[apdu_len], MAX_APDU-apdu_len,
&value->type.IP_Address);
apdu_len += encode_closing_tag(&apdu[apdu_len],
context_tag_number);
break;
#endif
default:
break;
@@ -918,6 +946,13 @@ bool bacapp_copy(BACNET_APPLICATION_DATA_VALUE *dest_value,
lighting_command_copy(&dest_value->type.Lighting_Command,
&src_value->type.Lighting_Command);
break;
#endif
#if defined(BACAPP_HOST_N_PORT)
case BACNET_APPLICATION_TAG_HOST_N_PORT:
status =
bvlc_address_copy(&dest_value->type.IP_Address,
&src_value->type.IP_Address);
break;
#endif
default:
status = false;
@@ -1436,6 +1471,16 @@ int bacapp_snprintf_value(
/* bytes were written. */
ret_val = str_len - rem_str_len;
break;
#endif
#if defined(BACAPP_HOST_N_PORT)
case BACNET_APPLICATION_TAG_HOST_N_PORT:
ret_val = snprintf(str, str_len, "%u.%u.%u.%u:%u",
(unsigned)value->type.IP_Address.address[0],
(unsigned)value->type.IP_Address.address[1],
(unsigned)value->type.IP_Address.address[2],
(unsigned)value->type.IP_Address.address[3],
(unsigned)value->type.IP_Address.port);
break;
#endif
default:
ret_val = 0;
@@ -1503,6 +1548,9 @@ bool bacapp_parse_application_data(BACNET_APPLICATION_TAG tag_number,
unsigned long unsigned_long_value = 0;
double double_value = 0.0;
int count = 0;
#if defined(BACAPP_HOST_N_PORT)
unsigned a[4] = { 0 }, p = 0;
#endif
if (value && (tag_number < MAX_BACNET_APPLICATION_TAG)) {
status = true;
@@ -1620,6 +1668,26 @@ bool bacapp_parse_application_data(BACNET_APPLICATION_TAG tag_number,
case BACNET_APPLICATION_TAG_LIGHTING_COMMAND:
/* FIXME: add parsing for lighting command */
break;
#endif
#if defined(BACAPP_HOST_N_PORT)
case BACNET_APPLICATION_TAG_HOST_N_PORT:
count = sscanf(argv, "%3u.%3u.%3u.%3u:%5u",
&a[0], &a[1], &a[2], &a[3], &p);
if ((count == 4) || (count == 5)) {
value->type.IP_Address.address[0] = a[0];
value->type.IP_Address.address[1] = a[1];
value->type.IP_Address.address[2] = a[2];
value->type.IP_Address.address[3] = a[3];
if (count == 4) {
value->type.IP_Address.port = 0xBAC0U;
} else {
value->type.IP_Address.port = (uint16_t)p;
}
status = true;
} else {
status = false;
}
break;
#endif
default:
break;
@@ -1797,6 +1865,13 @@ bool bacapp_same_value(BACNET_APPLICATION_DATA_VALUE *value,
status = lighting_command_same(&value->type.Lighting_Command,
&test_value->type.Lighting_Command);
break;
#endif
#if defined(BACAPP_HOST_N_PORT)
case BACNET_APPLICATION_TAG_HOST_N_PORT:
status =
!bvlc_address_different(&value->type.IP_Address,
&value->type.IP_Address);
break;
#endif
default:
status = false;