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

Merged revision(s) 2707 from branches/obvius/bacnet-stack:

Browse Source 
Fix: As a BBMD, when forwarding NPDU to the local subnet (as an IP broacast)
  we omit BVLC header, resulting in corrupt packet.

  bvlc_send_mpdu(&dest, &npdu[4 + 6], npdu_len); // bad
  bvlc_send_mpdu(&dest, &npdu[0], npdu_len+4+6); // good

Also added some debug_prints. To test, start bacserv, use VTS to add
yourself to the BDT, then send a Who-Is to bacserv as a Forwarded-NPDU.
Will be rebroadcast on local subnet but w/o BVLC header.

........
This commit is contained in:
skarg
2014-01-17 04:29:20 +00:00
parent 1738701f81
commit 3835dc8998
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/bvlc.c
+5 -1
View File
@@ -989,12 +989,16 @@ uint16_t bvlc_receive(
/* decode the 4 byte original address and 2 byte port */
bvlc_decode_bip_address(&npdu[4], &original_sin.sin_addr,
&original_sin.sin_port);
debug_printf("BVLC: Received Forwarded-NPDU from %s:%04X.\n",
inet_ntoa(original_sin.sin_addr), ntohs(original_sin.sin_port));
npdu_len -= 6;
/* Broadcast locally if received via unicast from a BDT member */
if (bvlc_bdt_member_mask_is_unicast(&sin)) {
dest.sin_addr.s_addr = bip_get_broadcast_addr();
dest.sin_port = bip_get_port();
bvlc_send_mpdu(&dest, &npdu[4 + 6], npdu_len);
debug_printf("BVLC: Received unicast from BDT member, re-broadcasting locally to %s:%04X.\n",
inet_ntoa(dest.sin_addr), ntohs(dest.sin_port));
bvlc_send_mpdu(&dest, &npdu[0], npdu_len+4+6);
}
/* use the original addr from the BVLC for src */
dest.sin_addr.s_addr = original_sin.sin_addr.s_addr;