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)

This commit is contained in:
Steve Karg
2025-10-16 10:31:21 -05:00
committed by GitHub
parent d4d928a915
commit b726458ab9
12 changed files with 10 additions and 52 deletions
+2 -6
View File
@@ -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(
"DLMSTP: DER Compare failed: " "NPDU Priority mismatch.\n");
debug_printf("DLMSTP: DER Compare failed: "
"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");
+2 -6
View File
@@ -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(
"DLMSTP: DER Compare failed: " "NPDU Priority mismatch.\n");
debug_printf("DLMSTP: DER Compare failed: "
"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");