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

Added more debug info for BBMD6 handling.

Browse Source
This commit is contained in:
skarg
2019-09-12 16:25:40 +00:00
parent a76dca8d5c
commit 8a7f93fed2
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_bbmd6.c
+17 -3
View File
@@ -699,7 +699,7 @@ static int handler_bbmd6_for_non_bbmd(
debug_printf("BIP6: Received Original-Unicast-NPDU.\n"); debug_printf("BIP6: Received Original-Unicast-NPDU.\n");
if (bbmd6_address_match_self(addr)) { if (bbmd6_address_match_self(addr)) {
/* ignore messages from my IPv6 address */ /* ignore messages from my IPv6 address */
offset = 0; debug_printf("BIP6: Original-Unicast-NPDU is me!.\n");
} else { } else {
function_len = bvlc6_decode_original_unicast( function_len = bvlc6_decode_original_unicast(
pdu, pdu_len, pdu, pdu_len,
@@ -713,7 +713,14 @@ static int handler_bbmd6_for_non_bbmd(
bbmd6_add_vmac(vmac_src, addr); bbmd6_add_vmac(vmac_src, addr);
bvlc6_vmac_address_set(src, vmac_src); bvlc6_vmac_address_set(src, vmac_src);
offset = header_len + (function_len - npdu_len); offset = header_len + (function_len - npdu_len);
} else {
debug_printf(
"BIP6: Original-Unicast-NPDU: "
"VMAC is not me!\n");
} }
} else {
debug_printf(
"BIP6: Original-Unicast-NPDU: Unable to decode!\n");
} }
} }
break; break;
@@ -721,7 +728,7 @@ static int handler_bbmd6_for_non_bbmd(
debug_printf("BIP6: Received Original-Broadcast-NPDU.\n"); debug_printf("BIP6: Received Original-Broadcast-NPDU.\n");
if (bbmd6_address_match_self(addr)) { if (bbmd6_address_match_self(addr)) {
/* ignore messages from my IPv6 address */ /* ignore messages from my IPv6 address */
offset = 0; debug_printf("BIP6: Original-Broadcast-NPDU is me!\n");
} else { } else {
function_len = bvlc6_decode_original_broadcast( function_len = bvlc6_decode_original_broadcast(
pdu, pdu_len, pdu, pdu_len,
@@ -734,6 +741,9 @@ static int handler_bbmd6_for_non_bbmd(
bbmd6_add_vmac(vmac_src, addr); bbmd6_add_vmac(vmac_src, addr);
bvlc6_vmac_address_set(src, vmac_src); bvlc6_vmac_address_set(src, vmac_src);
offset = header_len + (function_len - npdu_len); offset = header_len + (function_len - npdu_len);
} else {
debug_printf(
"BIP6: Original-Broadcast-NPDU: Unable to decode!\n");
} }
} }
break; break;
@@ -741,7 +751,7 @@ static int handler_bbmd6_for_non_bbmd(
debug_printf("BIP6: Received Forwarded-NPDU.\n"); debug_printf("BIP6: Received Forwarded-NPDU.\n");
if (bbmd6_address_match_self(addr)) { if (bbmd6_address_match_self(addr)) {
/* ignore messages from my IPv6 address */ /* ignore messages from my IPv6 address */
offset = 0; debug_printf("BIP6: Forwarded-NPDU is me!\n");
} else { } else {
function_len = bvlc6_decode_forwarded_npdu( function_len = bvlc6_decode_forwarded_npdu(
pdu, pdu_len, pdu, pdu_len,
@@ -754,6 +764,9 @@ static int handler_bbmd6_for_non_bbmd(
bbmd6_add_vmac(vmac_src, &fwd_address); bbmd6_add_vmac(vmac_src, &fwd_address);
bvlc6_vmac_address_set(src, vmac_src); bvlc6_vmac_address_set(src, vmac_src);
offset = header_len + (function_len - npdu_len); offset = header_len + (function_len - npdu_len);
} else {
debug_printf(
"BIP6: Forwarded-NPDU: Unable to decode!\n");
} }
} }
break; break;
@@ -862,6 +875,7 @@ static int handler_bbmd6_for_bbmd(
another B/IPv6 node or router. */ another B/IPv6 node or router. */
debug_printf("BIP6: Received Original-Unicast-NPDU.\n"); debug_printf("BIP6: Received Original-Unicast-NPDU.\n");
if (bbmd6_address_match_self(addr)) { if (bbmd6_address_match_self(addr)) {
debug_printf("BIP6: Dropped Original-Unicast-NPDU.\n");
/* ignore messages from my IPv6 address */ /* ignore messages from my IPv6 address */
offset = 0; offset = 0;
} else { } else {