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

Fix BACnet/IP builds for BBMD clients without BBMD tables. (#523)

Browse Source 
* Fix BACnet/IP builds for BBMD clients without BBMD tables.

* added BBMD=client to pipeline build

---------

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-10-31 10:57:44 -05:00
committed by GitHub
parent c1464a1660
commit 2536d5a350
7 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/bbmd/h_bbmd.c
+5 -2
View File
@@ -77,11 +77,12 @@ static bool BVLC_NAT_Handling = false;
static BACNET_IP_ADDRESS Remote_BBMD;
/** if we are a foreign device, store the Time-To-Live Seconds here */
static uint16_t Remote_BBMD_TTL_Seconds;
#if BBMD_ENABLED
#if BBMD_ENABLED || BBMD_CLIENT_ENABLED
/* local buffer & length for sending */
static uint8_t BVLC_Buffer[BIP_MPDU_MAX];
static uint16_t BVLC_Buffer_Len;
/* Broadcast Distribution Table */
#endif
#if BBMD_ENABLED/* Broadcast Distribution Table */
#ifndef MAX_BBMD_ENTRIES
#define MAX_BBMD_ENTRIES 128
#endif
@@ -255,6 +256,8 @@ void bvlc_maintenance_timer(uint16_t seconds)
{
#if BBMD_ENABLED
bvlc_foreign_device_table_maintenance_timer(&FD_Table[0], seconds);
#else
(void)seconds;
#endif
}
src/bacnet/basic/object/netport.c
+4
View File
@@ -2618,6 +2618,7 @@ bool Network_Port_Read_Range(
#if defined(BACDL_BIP) && BBMD_ENABLED
case PROP_BBMD_ACCEPT_FD_REGISTRATIONS:
#endif
(void)pInfo;
pRequest->error_class = ERROR_CLASS_SERVICES;
pRequest->error_code = ERROR_CODE_PROPERTY_IS_NOT_A_LIST;
break;
@@ -2627,6 +2628,7 @@ bool Network_Port_Read_Range(
pInfo->Handler = Network_Port_Read_Range_BDT;
status = true;
#else
(void)pInfo;
pRequest->error_class = ERROR_CLASS_PROPERTY;
pRequest->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
#endif
@@ -2637,11 +2639,13 @@ bool Network_Port_Read_Range(
pInfo->Handler = Network_Port_Read_Range_FDT;
status = true;
#else
(void)pInfo;
pRequest->error_class = ERROR_CLASS_PROPERTY;
pRequest->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
#endif
break;
default:
(void)pInfo;
pRequest->error_class = ERROR_CLASS_PROPERTY;
pRequest->error_code = ERROR_CODE_UNKNOWN_PROPERTY;
break;