From 8a7f93fed2dea71872f66871cda50aec6941426f Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 12 Sep 2019 16:25:40 +0000
Subject: [PATCH] Added more debug info for BBMD6 handling.

---
 bacnet-stack/demo/handler/h_bbmd6.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/bacnet-stack/demo/handler/h_bbmd6.c b/bacnet-stack/demo/handler/h_bbmd6.c
index 25ce9066..1554a05e 100644
--- a/bacnet-stack/demo/handler/h_bbmd6.c
+++ b/bacnet-stack/demo/handler/h_bbmd6.c
@@ -699,7 +699,7 @@ static int handler_bbmd6_for_non_bbmd(
                 debug_printf("BIP6: Received Original-Unicast-NPDU.\n");
                 if (bbmd6_address_match_self(addr)) {
                     /* ignore messages from my IPv6 address */
-                    offset = 0;
+                    debug_printf("BIP6: Original-Unicast-NPDU is me!.\n");
                 } else {
                     function_len = bvlc6_decode_original_unicast(
                         pdu, pdu_len,
@@ -713,7 +713,14 @@ static int handler_bbmd6_for_non_bbmd(
                             bbmd6_add_vmac(vmac_src, addr);
                             bvlc6_vmac_address_set(src, vmac_src);
                             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;
@@ -721,7 +728,7 @@ static int handler_bbmd6_for_non_bbmd(
                 debug_printf("BIP6: Received Original-Broadcast-NPDU.\n");
                 if (bbmd6_address_match_self(addr)) {
                     /* ignore messages from my IPv6 address */
-                    offset = 0;
+                    debug_printf("BIP6: Original-Broadcast-NPDU is me!\n");
                 } else {
                     function_len = bvlc6_decode_original_broadcast(
                         pdu, pdu_len,
@@ -734,6 +741,9 @@ static int handler_bbmd6_for_non_bbmd(
                         bbmd6_add_vmac(vmac_src, addr);
                         bvlc6_vmac_address_set(src, vmac_src);
                         offset = header_len + (function_len - npdu_len);
+                    } else {
+                        debug_printf(
+                            "BIP6: Original-Broadcast-NPDU: Unable to decode!\n");
                     }
                 }
                 break;
@@ -741,7 +751,7 @@ static int handler_bbmd6_for_non_bbmd(
                 debug_printf("BIP6: Received Forwarded-NPDU.\n");
                 if (bbmd6_address_match_self(addr)) {
                     /* ignore messages from my IPv6 address */
-                    offset = 0;
+                    debug_printf("BIP6: Forwarded-NPDU is me!\n");
                 } else {
                     function_len = bvlc6_decode_forwarded_npdu(
                         pdu, pdu_len,
@@ -754,6 +764,9 @@ static int handler_bbmd6_for_non_bbmd(
                         bbmd6_add_vmac(vmac_src, &fwd_address);
                         bvlc6_vmac_address_set(src, vmac_src);
                         offset = header_len + (function_len - npdu_len);
+                    } else {
+                        debug_printf(
+                            "BIP6: Forwarded-NPDU: Unable to decode!\n");
                     }
                 }
                 break;
@@ -862,6 +875,7 @@ static int handler_bbmd6_for_bbmd(
                    another B/IPv6 node or router. */
                 debug_printf("BIP6: Received Original-Unicast-NPDU.\n");
                 if (bbmd6_address_match_self(addr)) {
+                    debug_printf("BIP6: Dropped Original-Unicast-NPDU.\n");
                     /* ignore messages from my IPv6 address */
                     offset = 0;
                 } else {