From a3838cb7b5853fc5d9614ad15fd3d012e9406860 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Thu, 15 Sep 2022 10:11:52 -0500 Subject: [PATCH] Fix BACnet/IP Forwarded NPDU to FDT entries --- src/bacnet/basic/bbmd/h_bbmd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bacnet/basic/bbmd/h_bbmd.c b/src/bacnet/basic/bbmd/h_bbmd.c index 49101bc0..9100a80c 100644 --- a/src/bacnet/basic/bbmd/h_bbmd.c +++ b/src/bacnet/basic/bbmd/h_bbmd.c @@ -937,10 +937,11 @@ int bvlc_bbmd_enabled_handler(BACNET_IP_ADDRESS *addr, /* In addition, the constructed BVLL Forwarded-NPDU message shall be unicast to each foreign device in the BBMD's FDT. */ - (void)bbmd_fdt_forward_npdu(&fwd_address, mtu, mtu_len, false); + offset = header_len + function_len - npdu_len; + npdu = &mtu[offset]; + (void)bbmd_fdt_forward_npdu(&fwd_address, npdu, npdu_len, false); /* prepare the message for me! */ bvlc_ip_address_to_bacnet_local(src, &fwd_address); - offset = header_len + function_len - npdu_len; debug_print_npdu("Forwarded-NPDU", offset, npdu_len); } break;