Removed check for NPDU Priority on MS/TP outgoing matching messages since the stack currently doesn't support passing the NDPU Priority through, and every outgoing message is NORMAL. This was causing Reply-Postponed, which is not a good thing for high priority messages. Thank you, Ettore Colicchio!
This commit is contained in:
@@ -334,9 +334,13 @@ static bool dlmstp_compare_data_expecting_reply(
|
|||||||
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -333,9 +333,13 @@ static bool dlmstp_compare_data_expecting_reply(
|
|||||||
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -482,6 +482,9 @@ static bool dlmstp_compare_data_expecting_reply(
|
|||||||
#endif
|
#endif
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
#if PRINT_ENABLED
|
#if PRINT_ENABLED
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
@@ -489,6 +492,7 @@ static bool dlmstp_compare_data_expecting_reply(
|
|||||||
#endif
|
#endif
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
#if PRINT_ENABLED
|
#if PRINT_ENABLED
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
|
|||||||
@@ -534,6 +534,9 @@ bool dlmstp_compare_data_expecting_reply(
|
|||||||
#endif
|
#endif
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
#if PRINT_ENABLED
|
#if PRINT_ENABLED
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
@@ -541,6 +544,7 @@ bool dlmstp_compare_data_expecting_reply(
|
|||||||
#endif
|
#endif
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
#if PRINT_ENABLED
|
#if PRINT_ENABLED
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
|
|||||||
@@ -650,9 +650,13 @@ static bool mstp_compare_data_expecting_reply(
|
|||||||
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -351,9 +351,13 @@ static bool dlmstp_compare_data_expecting_reply(
|
|||||||
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -413,9 +413,13 @@ bool dlmstp_compare_data_expecting_reply(
|
|||||||
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -401,9 +401,13 @@ static bool dlmstp_compare_data_expecting_reply(
|
|||||||
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -329,9 +329,13 @@ static bool dlmstp_compare_data_expecting_reply(uint8_t * request_pdu,
|
|||||||
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
if (request.npdu_data.protocol_version != reply.npdu_data.protocol_version) {
|
||||||
return false;
|
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) {
|
if (request.npdu_data.priority != reply.npdu_data.priority) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (!bacnet_address_same(&request.address, &reply.address)) {
|
if (!bacnet_address_same(&request.address, &reply.address)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user