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

Per the BTL test cases for 14.1.7, 14.1.x1, and 14.1.8, the device should respond back with an original-broadcast-npdu for a Forward-NPDU and an Original-Broadcast-NPDU; this makes this so for BACnet/IP.

Browse Source 
Minor fixes for build errors and warnings.
This commit is contained in:
tbrennan3
2011-10-19 18:48:24 +00:00
parent 4a779febca
commit 416eee50fe
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/gateway/main.c
+1 -1
View File
@@ -328,7 +328,7 @@ int main(
dlenv_maintenance_timer(elapsed_seconds); dlenv_maintenance_timer(elapsed_seconds);
Load_Control_State_Machine_Handler(); Load_Control_State_Machine_Handler();
elapsed_milliseconds = elapsed_seconds * 1000; elapsed_milliseconds = elapsed_seconds * 1000;
handler_cov_task(elapsed_seconds); handler_cov_task();
tsm_timer_milliseconds(elapsed_milliseconds); tsm_timer_milliseconds(elapsed_milliseconds);
} }
/* output */ /* output */
bacnet-stack/demo/handler/h_routed_npdu.c
+4
View File
@@ -43,6 +43,10 @@
#if PRINT_ENABLED #if PRINT_ENABLED
#include <stdio.h> #include <stdio.h>
#endif #endif
#if defined(BACDL_BIP)
#include "bvlc.h"
#endif
/** @file h_routed_npdu.c Handles messages at the NPDU level of the BACnet stack, /** @file h_routed_npdu.c Handles messages at the NPDU level of the BACnet stack,
* including routing and network control messages. */ * including routing and network control messages. */
bacnet-stack/src/bip.c
+5 -1
View File
@@ -170,6 +170,7 @@ int bip_send_pdu(
/* addr and port in host format */ /* addr and port in host format */
struct in_addr address; struct in_addr address;
uint16_t port = 0; uint16_t port = 0;
BACNET_BVLC_FUNCTION function;
(void) npdu_data; (void) npdu_data;
@@ -179,7 +180,10 @@ int bip_send_pdu(
mtu[0] = BVLL_TYPE_BACNET_IP; mtu[0] = BVLL_TYPE_BACNET_IP;
bip_dest.sin_family = AF_INET; bip_dest.sin_family = AF_INET;
if (dest->net == BACNET_BROADCAST_NETWORK) { function = bvlc_get_function_code(); /* What type of BVLC was it? */
if ( (dest->net == BACNET_BROADCAST_NETWORK) ||
(function == BVLC_FORWARDED_NPDU) ||
(function == BVLC_ORIGINAL_BROADCAST_NPDU) ) {
/* broadcast */ /* broadcast */
address.s_addr = BIP_Broadcast_Address.s_addr; address.s_addr = BIP_Broadcast_Address.s_addr;
port = BIP_Port; port = BIP_Port;