nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check max length of Databytes (Master/Slave) added.

Browse Source
This commit is contained in:
Roland Jax
2014-02-06 23:36:58 +01:00
parent 36758f5f0e
commit 0bba5aa74d
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ebus-bus.c
+12 -2
View File
@@ -1071,6 +1071,11 @@ eb_cyc_data_process(const unsigned char *buf, int buflen)
/* calc crc vom master */
mlen = 5 + (int) msg[4];
if (((int) msg[4]) > EBUS_MSG_MASTER_MAX_DB_LEN)
log_print(L_WAR, "%s", "Master DB Len Error");
return -2;
}
memset(hlp, '\0', sizeof(hlp));
memcpy(hlp, msg, mlen);
@@ -1097,7 +1102,7 @@ eb_cyc_data_process(const unsigned char *buf, int buflen)
if (acks == EBUS_NAK) {
log_print(L_WAR, "%s", "Slave ACK Error");
//~ return -2;
return -2;
}
/* set len */
@@ -1110,6 +1115,11 @@ eb_cyc_data_process(const unsigned char *buf, int buflen)
/* calc crc vom slave */
slen = 1 + (int) msg[mlen + 2];
if (((int) msg[mlen + 2]) > EBUS_MSG_SLAVE_MAX_DB_LEN)
log_print(L_WAR, "%s", "Slave DB Len Error");
return -2;
}
memset(hlp, '\0', sizeof(hlp));
memcpy(hlp, &msg[mlen + 2], slen);
hlplen = slen;
@@ -1129,7 +1139,7 @@ eb_cyc_data_process(const unsigned char *buf, int buflen)
if (ackm == EBUS_NAK) {
log_print(L_WAR, "%s", "Master ACK Error");
//~ return -2;
return -2;
}
/* set len */
lib/ebus-common.h
+3
View File
@@ -55,6 +55,9 @@
#define EBUS_MSG_MASTER_SLAVE_TXT "MS"
#define EBUS_MSG_MASTER_SLAVE 3
#define EBUS_MSG_MASTER_MAX_DB_LEN 12
#define EBUS_MSG_SLAVE_MAX_DB_LEN 12
#define SERIAL_DEVICE "/dev/ttyUSB0"
#define SERIAL_BAUDRATE B2400
#define SERIAL_BUFSIZE 100