MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem with string termination of incoming ethernet messages.

Browse Source
This commit is contained in:
Henrik Ekblad
2015-11-08 17:49:25 +01:00
parent 328d362598
commit e2c1f4e365
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MyGatewayTransportEthernet.cpp
+6 -8
View File
@@ -184,19 +184,17 @@ bool _readFromClient(uint8_t i) {
char inChar = clients[i].read();
if (inputString[i].idx < MY_GATEWAY_MAX_RECEIVE_LENGTH - 1) {
// if newline then command is complete
if (inChar == '\n') {
// a command was issued by the client
if (inChar == '\n' || inChar == '\r') {
// A command was issued by the client
// we will now try to send it to the actuator
// echo the string to the serial port
debug(PSTR("Client %d: %s\n"), i, inputString[i].string);
// clear the string:
inputString[i].idx = 0;
bool ret = protocolParse(_ethernetMsg, inputString[i].string);
// Add string terminator and prepare for the next message
inputString[i].string[inputString[i].idx] = 0;
if (ret) {
return ret;
inputString[i].idx = 0;
if (protocolParse(_ethernetMsg, inputString[i].string)) {
return true;
}
} else {