The NDPU priority is now passed through the stack via apdu.c or h_apdu.c module so the MS/TP compare DER function can include the value in the comparison. (#1119)

CHANGELOG.md

@@ -132,6 +132,8 @@ The git repositories are hosted at the following sites:
 
 ### Fixed
 
+* Fixed the MS/TP compare DER function which can now include the NPDU network
+  priority in the comparison. (#1119)
 * Fixed basic program object internal datatype for reason-for-fault
   and change properties. (#1110)
 * Fixed compile errors in basic/server/device when BACAPP_TIMESTAMP

ports/at91sam7s/dlmstp.c

@@ -285,13 +285,9 @@ static bool dlmstp_compare_data_expecting_reply(const uint8_t *request_pdu,
         reply.npdu_data.protocol_version) {
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         return false;
     }

ports/bdk-atxx4-mstp/dlmstp.c

@@ -286,13 +286,9 @@ static bool dlmstp_compare_data_expecting_reply(const uint8_t *request_pdu,
         reply.npdu_data.protocol_version) {
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         return false;
     }

ports/bsd/dlmstp.c

@@ -292,15 +292,11 @@ static bool dlmstp_compare_data_expecting_reply(
                      "NPDU Protocol Version mismatch.\n");
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
-        debug_printf(
+        debug_printf("DLMSTP: DER Compare failed: "
-            "DLMSTP: DER Compare failed: " "NPDU Priority mismatch.\n");
+                     "NPDU Priority mismatch.\n");
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         debug_printf("DLMSTP: DER Compare failed: "
                      "BACnet Address mismatch.\n");

ports/bsd/dlmstp_port.c

@@ -563,15 +563,11 @@ static bool dlmstp_compare_data_expecting_reply(
                      "NPDU Protocol Version mismatch.\n");
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
-        debug_printf(
+        debug_printf("DLMSTP: DER Compare failed: "
-            "DLMSTP: DER Compare failed: " "NPDU Priority mismatch.\n");
+                     "NPDU Priority mismatch.\n");
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         debug_printf("DLMSTP: DER Compare failed: "
                      "BACnet Address mismatch.\n");

ports/linux/dlmstp.c

@@ -293,15 +293,11 @@ static bool dlmstp_compare_data_expecting_reply(
                      "NPDU Protocol Version mismatch.\n");
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
-        debug_printf(
+        debug_printf("DLMSTP: DER Compare failed: "
-            "DLMSTP: DER Compare failed: " "NPDU Priority mismatch.\n");
+                     "NPDU Priority mismatch.\n");
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         debug_printf("DLMSTP: DER Compare failed: "
                      "BACnet Address mismatch.\n");

ports/linux/dlmstp_port.c

@@ -507,15 +507,11 @@ static bool dlmstp_compare_data_expecting_reply(
                      "NPDU Protocol Version mismatch.\n");
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
-        debug_printf(
+        debug_printf("DLMSTP: DER Compare failed: "
-            "DLMSTP: DER Compare failed: " "NPDU Priority mismatch.\n");
+                     "NPDU Priority mismatch.\n");
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         debug_printf("DLMSTP: DER Compare failed: "
                      "BACnet Address mismatch.\n");

ports/pic18f6720/mstp.c

@@ -607,13 +607,9 @@ static bool mstp_compare_data_expecting_reply(uint8_t *request_pdu,
         reply.npdu_data.protocol_version) {
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         return false;
     }

ports/pic18f97j60/mstp.c

@@ -615,13 +615,9 @@ static bool mstp_compare_data_expecting_reply(uint8_t *request_pdu,
         reply.npdu_data.protocol_version) {
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         return false;
     }

ports/win32/dlmstp-mm.c

@@ -404,13 +404,9 @@ bool dlmstp_compare_data_expecting_reply(
         reply.npdu_data.protocol_version) {
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         return false;
     }

ports/win32/dlmstp.c

@@ -268,13 +268,9 @@ static bool dlmstp_compare_data_expecting_reply(
         reply.npdu_data.protocol_version) {
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         return false;
     }

src/bacnet/datalink/dlmstp.c

@@ -225,13 +225,9 @@ static bool MSTP_Compare_Data_Expecting_Reply(
         reply.npdu_data.protocol_version) {
         return false;
     }
-#if 0
-    /* the NDPU priority doesn't get passed through the stack, and
-       all outgoing messages have NORMAL priority */
     if (request.npdu_data.priority != reply.npdu_data.priority) {
         return false;
     }
-#endif
     if (!bacnet_address_same(&request.address, &reply.address)) {
         return false;
     }