Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

address check in single register / coil responses added #463

Merged
merged 2 commits into from
Jul 19, 2022
Merged

address check in single register / coil responses added #463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
539f8e4
address check in single register / coil responses added
Dec 13, 2018
ff8afd5
Move variable declaration to beginning of block
bachp Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/modbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,8 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req,
function < 0x80) {
int req_nb_value;
int rsp_nb_value;
int resp_addr_ok = TRUE;
int resp_data_ok = TRUE;

/* Check function code */
if (function != req[offset]) {
Expand Down Expand Up @@ -592,6 +594,10 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req,
break;
case MODBUS_FC_WRITE_MULTIPLE_COILS:
case MODBUS_FC_WRITE_MULTIPLE_REGISTERS:
/* address in request and response must be equal */
if ((req[offset + 1] != rsp[offset + 1]) || (req[offset + 2] != rsp[offset + 2])) {
resp_addr_ok = FALSE;
}
/* N Write functions */
req_nb_value = (req[offset + 3] << 8) + req[offset + 4];
rsp_nb_value = (rsp[offset + 3] << 8) | rsp[offset + 4];
Expand All @@ -600,17 +606,31 @@ static int check_confirmation(modbus_t *ctx, uint8_t *req,
/* Report slave ID (bytes received) */
req_nb_value = rsp_nb_value = rsp[offset + 1];
break;
case MODBUS_FC_WRITE_SINGLE_COIL:
case MODBUS_FC_WRITE_SINGLE_REGISTER:
/* address in request and response must be equal */
if ((req[offset + 1] != rsp[offset + 1]) || (req[offset + 2] != rsp[offset + 2])) {
resp_addr_ok = FALSE;
}
/* data in request and response must be equal */
if ((req[offset + 3] != rsp[offset + 3]) || (req[offset + 4] != rsp[offset + 4])) {
resp_data_ok = FALSE;
}
/* 1 Write functions & others */
req_nb_value = rsp_nb_value = 1;
break;
default:
/* 1 Write functions & others */
req_nb_value = rsp_nb_value = 1;
break;
}

if (req_nb_value == rsp_nb_value) {
if ((req_nb_value == rsp_nb_value) && (resp_addr_ok == TRUE) && (resp_data_ok == TRUE)) {
rc = rsp_nb_value;
} else {
if (ctx->debug) {
fprintf(stderr,
"Quantity not corresponding to the request (%d != %d)\n",
"Received data not corresponding to the request (%d != %d)\n",
rsp_nb_value, req_nb_value);
}

Expand Down