Corrected the NPDU encoding for the demo handlers.

bacnet-stack/demo/handler/s_awfs.c

@@ -32,6 +32,7 @@
 #include "bacdcode.h"
 #include "address.h"
 #include "tsm.h"
+#include "dcc.h"
 #include "npdu.h"
 #include "apdu.h"
 #include "device.h"
@@ -46,14 +47,20 @@ uint8_t Send_Atomic_Write_File_Stream(uint32_t device_id,
     int fileStartPosition, BACNET_OCTET_STRING * fileData)
 {
     BACNET_ADDRESS dest;
+    BACNET_ADDRESS my_address;
     BACNET_NPDU_DATA npdu_data;
     unsigned max_apdu = 0;
     uint8_t invoke_id = 0;
     bool status = false;
+    int len = 0;
     int pdu_len = 0;
     int bytes_sent = 0;
     BACNET_ATOMIC_WRITE_FILE_DATA data;
 
+    /* if we are forbidden to send, don't send! */
+    if (!dcc_communication_enabled())
+        return 0;
+
     /* is the device bound? */
     status = address_get_by_device(device_id, &max_apdu, &dest);
     /* is there a tsm available? */
@@ -67,16 +74,21 @@ uint8_t Send_Atomic_Write_File_Stream(uint32_t device_id,
         data.type.stream.fileStartPosition = fileStartPosition;
         status = octetstring_copy(&data.fileData, fileData);
         if (status) {
-            pdu_len = awf_encode_apdu(&Handler_Transmit_Buffer[0],
+            /* encode the NPDU portion of the packet */
+            datalink_get_my_address(&my_address);
+            npdu_encode_npdu_data(&npdu_data, true, MESSAGE_PRIORITY_NORMAL);
+            pdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0], &dest,
+                    &my_address, &npdu_data);
+            /* encode the APDU portion of the packet */
+            len = awf_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
                 invoke_id, &data);
+            pdu_len += len;
             /* will the APDU fit the target device?
                note: if there is a bottleneck router in between
                us and the destination, we won't know unless
                we have a way to check for that and update the
                max_apdu in the address binding table. */
             if ((unsigned) pdu_len <= max_apdu) {
-                npdu_encode_confirmed_apdu(&npdu_data,
-                    MESSAGE_PRIORITY_NORMAL);
                 tsm_set_confirmed_unsegmented_transaction(invoke_id, &dest,
                     &npdu_data, &Handler_Transmit_Buffer[0], pdu_len);
                 bytes_sent =