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

Added Who-Is-Router process for Notification Class recipient unknown router addresses. (#1243)

Browse Source 
* Added Who-Is-Router-To-Network process in basic Notification Class when recipient address is missing the router MAC address.

* Added buffer_length parameter to octet string buffer decode functions

* Fixed BACnet address handling for I-Am-Router address updating the recipient list address for the next hop router.

* Changed VMAC encoding and decoding to use octet string buffer API to reduce stack RAM.
This commit is contained in:
Steve Karg
2026-02-25 09:58:38 -06:00
committed by GitHub
parent e11cd319da
commit cf4f62f7e0
14 changed files with 225 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/nc.c
+35 -4
View File
@@ -90,6 +90,33 @@ void Notification_Class_Writable_Property_List(
}
}
/**
* @brief Handle I-Am router to network for out of network recipients
* @param src - source address of the router
* @param network - network number of the router
*/
static void Notification_Class_I_Am_Router_To_Network_Handler(
BACNET_ADDRESS *src, uint16_t network)
{
NOTIFICATION_CLASS_INFO *notification;
BACNET_DESTINATION *destination;
BACNET_RECIPIENT *recipient;
unsigned i, j;
for (i = 0; i < MAX_NOTIFICATION_CLASSES; i++) {
notification = &NC_Info[i];
for (j = 0; j < NC_MAX_RECIPIENTS; j++) {
destination = &notification->Recipient_List[j];
recipient = &destination->Recipient;
/* update recipient addresses for this network */
if ((recipient->tag == BACNET_RECIPIENT_TAG_ADDRESS) &&
(recipient->type.address.net == network)) {
bacnet_address_router_set(&recipient->type.address, src);
}
}
}
}
void Notification_Class_Init(void)
{
uint8_t NotifyIdx = 0;
@@ -111,6 +138,8 @@ void Notification_Class_Init(void)
bacnet_destination_default_init(destination);
}
}
npdu_set_i_am_router_to_network_handler(
Notification_Class_I_Am_Router_To_Network_Handler);
return;
}
@@ -727,12 +756,11 @@ void Notification_Class_common_reporting_function(
"Notification Class[%u]: send notification to ADDR\n",
event_data->notificationClass);
/* send notification to the address indicated */
bacnet_address_copy(&dest, &pBacDest->Recipient.type.address);
if (pBacDest->ConfirmedNotify == true) {
if (address_get_device_id(&dest, &device_id)) {
Send_CEvent_Notify(device_id, event_data);
}
Send_CEvent_Notify_Address(
Event_Buffer, sizeof(Event_Buffer), event_data, &dest);
} else {
dest = pBacDest->Recipient.type.address;
Send_UEvent_Notify(Event_Buffer, event_data, &dest);
}
}
@@ -764,6 +792,9 @@ void Notification_Class_find_recipient(void)
address of device is unknown. */
Send_WhoIs(device_id, device_id);
}
} else if (bacnet_recipient_address_router_unknown(recipient)) {
Send_Who_Is_Router_To_Network(
NULL, recipient->type.address.net);
}
}
}