Upstream/mbusd
1
0
Fork 0
mirror of https://github.com/3cky/mbusd.git synced 2024-11-22 11:35:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43 from temperednetworks/modbus-framing

Browse Source 
modbus: read only a single frame at a time
This commit is contained in:
Victor Antonovich 2019-01-28 11:42:05 +04:00 committed by GitHub
commit f8b6448b08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conn.c
View File

@ -767,7 +767,7 @@ conn_loop(void)
{
rc = conn_read(curconn->sd,
curconn->buf + curconn->ctr,
RQSTSIZE - curconn->ctr);
curconn->read_len - curconn->ctr);
if (rc <= 0)
{ /* error - drop this connection and go to next queue element */
curconn = conn_close(curconn);

1
src/conn.h
View File

@ -105,6 +105,7 @@ typedef struct conn_t
int timeout; /* timeout value, secs */
struct sockaddr_in sockaddr; /* connection structure */
int ctr; /* counter of data in the buffer */
int read_len; /* length of modbus frame to read */
unsigned char buf[HDRSIZE + BUFSIZE]; /* data buffer */
} conn_t;

4
src/modbus.c
View File

@ -32,6 +32,7 @@
*/
#include "modbus.h"
#include "conn.h"
/*
* Check CRC of MODBUS frame
@ -83,5 +84,6 @@ modbus_check_header(unsigned char *packet)
return (MB_FRAME(packet, MB_PROTO_ID_H) == 0 &&
MB_FRAME(packet, MB_PROTO_ID_L) == 0 &&
MB_FRAME(packet, MB_LENGTH_H) == 0 &&
MB_FRAME(packet, MB_LENGTH_L) > 0) ? RC_OK : RC_ERR;
MB_FRAME(packet, MB_LENGTH_L) > 0 &&
MB_FRAME(packet, MB_LENGTH_L) < BUFSIZE - CRCSIZE) ? RC_OK : RC_ERR;
}

2
src/state.c
View File

@ -74,12 +74,14 @@ state_conn_set(conn_t *conn, int state)
{
case CONN_HEADER:
conn->ctr = 0;
conn->read_len = HDRSIZE;
#ifdef DEBUG
logw(5, "conn[%s]: state now is CONN_HEADER",
inet_ntoa(conn->sockaddr.sin_addr));
#endif
break;
case CONN_RQST_FUNC:
conn->read_len = HDRSIZE + MB_FRAME(conn->buf, MB_LENGTH_L);
#ifdef DEBUG
logw(5, "conn[%s]: state now is CONN_RQST_FUNC",
inet_ntoa(conn->sockaddr.sin_addr));