Skip to content

fixed rtu message recevie in Windows Platform #854

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

Open
BenCuiCui wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed rtu message recevie in Windows Platform #854

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 41 additions & 31 deletions src/modbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,17 +383,21 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
return -1;
}

/* Add a file descriptor to the set */
FD_ZERO(&rset);
if (ctx->s < 0 || ctx->s >= FD_SETSIZE) {
if (ctx->debug) {
fprintf(stderr, "ERROR Invalid socket descriptor %d\n", ctx->s);
#ifdef _WIN32
if (ctx->backend->backend_type != _MODBUS_BACKEND_TYPE_RTU)
#endif
{
/* Add a file descriptor to the set */
FD_ZERO(&rset);
if (ctx->s < 0 || ctx->s >= FD_SETSIZE) {
if (ctx->debug) {
fprintf(stderr, "ERROR Invalid socket descriptor %d\n", ctx->s);
}
errno = EINVAL;
return -1;
}
errno = EINVAL;
return -1;
FD_SET(ctx->s, &rset);
}
FD_SET(ctx->s, &rset);

/* We need to analyse the message step by step. At the first step, we want
* to reach the function code because all packets contain this
* information. */
Expand All @@ -419,32 +423,39 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)
}

while (length_to_read != 0) {
rc = ctx->backend->select(ctx, &rset, p_tv, length_to_read);
if (rc == -1) {
_error_print(ctx, "select");
if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_LINK) {
#ifdef _WIN32
wsa_err = WSAGetLastError();
if (ctx->backend->backend_type != _MODBUS_BACKEND_TYPE_RTU) {
Sleep(1);
rc = 1; // 模拟就绪
} else {
#endif
rc = ctx->backend->select(ctx, &rset, p_tv, length_to_read);
if (rc == -1) {
_error_print(ctx, "select");
if (ctx->error_recovery & MODBUS_ERROR_RECOVERY_LINK) {
#ifdef _WIN32
wsa_err = WSAGetLastError();

// no equivalent to ETIMEDOUT when select fails on Windows
if (wsa_err == WSAENETDOWN || wsa_err == WSAENOTSOCK) {
modbus_close(ctx);
modbus_connect(ctx);
}
// no equivalent to ETIMEDOUT when select fails on Windows
if (wsa_err == WSAENETDOWN || wsa_err == WSAENOTSOCK) {
modbus_close(ctx);
modbus_connect(ctx);
}
#else
int saved_errno = errno;

if (errno == ETIMEDOUT) {
_sleep_response_timeout(ctx);
modbus_flush(ctx);
} else if (errno == EBADF) {
modbus_close(ctx);
modbus_connect(ctx);
}
errno = saved_errno;
int saved_errno = errno;

if (errno == ETIMEDOUT) {
_sleep_response_timeout(ctx);
modbus_flush(ctx);
} else if (errno == EBADF) {
modbus_close(ctx);
modbus_connect(ctx);
}
errno = saved_errno;
#endif
}
return -1;
}
return -1;
}

rc = ctx->backend->recv(ctx, msg + msg_length, length_to_read);
Expand Down Expand Up @@ -532,7 +543,6 @@ int _modbus_receive_msg(modbus_t *ctx, uint8_t *msg, msg_type_t msg_type)

return ctx->backend->check_integrity(ctx, msg, msg_length);
}

/* Receive the request from a modbus master */
int modbus_receive(modbus_t *ctx, uint8_t *req)
{
Expand Down