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

Fix BBMD_Result handling to avoid false positive error message when no registration is requested. (#1305)

Browse Source
This commit is contained in:
Steve Karg
2026-04-20 11:52:44 -05:00
committed by GitHub
parent b9149dd639
commit 1c3506403d
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/datalink/dlenv.c
+18 -13
View File
@@ -45,7 +45,12 @@ static uint16_t BBMD_TTL_Seconds = 60000;
/* BBMD variables */ /* BBMD variables */
static BACNET_IP_ADDRESS BBMD_Address; static BACNET_IP_ADDRESS BBMD_Address;
static bool BBMD_Address_Valid; static bool BBMD_Address_Valid;
static uint16_t BBMD_Result = 0; /** BBMD Result:
* Positive number (of bytes sent) if registration was successful,
* 0 if no registration request was made, or
* -1 if registration attempt failed.
*/
static int BBMD_Result;
#if defined(BACDL_BIP) && BBMD_ENABLED #if defined(BACDL_BIP) && BBMD_ENABLED
static BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY BBMD_Table_Entry; static BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY BBMD_Table_Entry;
#endif #endif
@@ -130,7 +135,7 @@ int dlenv_bbmd_result(void)
*/ */
static int bbmd_register_as_foreign_device(void) static int bbmd_register_as_foreign_device(void)
{ {
int retval = -1; int registration = 0;
#if defined(BACDL_BIP) && BBMD_CLIENT_ENABLED #if defined(BACDL_BIP) && BBMD_CLIENT_ENABLED
char *pEnv = NULL; char *pEnv = NULL;
long long_value = 0; long long_value = 0;
@@ -176,8 +181,8 @@ static int bbmd_register_as_foreign_device(void)
(unsigned)BBMD_Address.address[3], (unsigned)BBMD_Address.port, (unsigned)BBMD_Address.address[3], (unsigned)BBMD_Address.port,
(unsigned)BBMD_TTL_Seconds); (unsigned)BBMD_TTL_Seconds);
} }
retval = bvlc_register_with_bbmd(&BBMD_Address, BBMD_TTL_Seconds); registration = bvlc_register_with_bbmd(&BBMD_Address, BBMD_TTL_Seconds);
if (retval < 0) { if (registration < 0) {
fprintf( fprintf(
stderr, "FAILED to Register with BBMD at %u.%u.%u.%u:%u\n", stderr, "FAILED to Register with BBMD at %u.%u.%u.%u:%u\n",
(unsigned)BBMD_Address.address[0], (unsigned)BBMD_Address.address[0],
@@ -266,9 +271,9 @@ static int bbmd_register_as_foreign_device(void)
} }
#endif #endif
#endif #endif
BBMD_Result = retval; BBMD_Result = registration;
return retval; return registration;
} }
/** Register as a Foreign Device with the designated BBMD. /** Register as a Foreign Device with the designated BBMD.
@@ -287,7 +292,7 @@ static int bbmd_register_as_foreign_device(void)
*/ */
static int bbmd6_register_as_foreign_device(void) static int bbmd6_register_as_foreign_device(void)
{ {
int retval = -1; int registration = 0;
#if defined(BACDL_BIP6) && BBMD6_ENABLED #if defined(BACDL_BIP6) && BBMD6_ENABLED
char *pEnv = NULL; char *pEnv = NULL;
long long_value = 0; long long_value = 0;
@@ -315,8 +320,8 @@ static int bbmd6_register_as_foreign_device(void)
stderr, "Registering with BBMD6 at %s:0x%04x for %u seconds\n", stderr, "Registering with BBMD6 at %s:0x%04x for %u seconds\n",
pEnv, (unsigned)bip6_port, (unsigned)BBMD_TTL_Seconds); pEnv, (unsigned)bip6_port, (unsigned)BBMD_TTL_Seconds);
} }
retval = bvlc6_register_with_bbmd(&bip6_addr, BBMD_TTL_Seconds); registration = bvlc6_register_with_bbmd(&bip6_addr, BBMD_TTL_Seconds);
if (retval < 0) { if (registration < 0) {
fprintf( fprintf(
stderr, "FAILED to Register with BBMD6 at %s:%u\n", pEnv, stderr, "FAILED to Register with BBMD6 at %s:%u\n", pEnv,
(unsigned)BBMD_Address.port); (unsigned)BBMD_Address.port);
@@ -324,9 +329,9 @@ static int bbmd6_register_as_foreign_device(void)
BBMD_Timer_Seconds = BBMD_TTL_Seconds; BBMD_Timer_Seconds = BBMD_TTL_Seconds;
} }
#endif #endif
BBMD_Result = retval; BBMD_Result = registration;
return retval; return registration;
} }
/** /**
@@ -902,10 +907,10 @@ void dlenv_maintenance_timer(uint16_t elapsed_seconds)
} }
if (BBMD_Timer_Seconds == 0) { if (BBMD_Timer_Seconds == 0) {
if (Network_Port_Type(Network_Port_Instance) == PORT_TYPE_BIP) { if (Network_Port_Type(Network_Port_Instance) == PORT_TYPE_BIP) {
bbmd_register_as_foreign_device(); (void)bbmd_register_as_foreign_device();
} else if ( } else if (
Network_Port_Type(Network_Port_Instance) == PORT_TYPE_BIP6) { Network_Port_Type(Network_Port_Instance) == PORT_TYPE_BIP6) {
bbmd6_register_as_foreign_device(); (void)bbmd6_register_as_foreign_device();
} }
/* If that failed (negative), maybe just a network issue. /* If that failed (negative), maybe just a network issue.
* If nothing happened (0), may be un/misconfigured. * If nothing happened (0), may be un/misconfigured.