wn/pubsubclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

readPacket assumed all packets had a topic

Browse Source 
Fixes #37
This commit is contained in:
Nick O'Leary
2014-02-02 14:28:57 +00:00
parent bcead02903
commit 6c82bdcf8a
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
PubSubClient/PubSubClient.cpp
View File

@ -147,6 +147,9 @@ uint16_t PubSubClient::readPacket(uint8_t* lengthLength) {
uint32_t multiplier = 1; uint32_t multiplier = 1;
uint16_t length = 0; uint16_t length = 0;
uint8_t digit = 0; uint8_t digit = 0;
uint16_t skip = 0;
uint8_t start = 0;
do { do {
digit = readByte(); digit = readByte();
buffer[len++] = digit; buffer[len++] = digit;
@ -155,26 +158,27 @@ uint16_t PubSubClient::readPacket(uint8_t* lengthLength) {
} while ((digit & 128) != 0); } while ((digit & 128) != 0);
*lengthLength = len-1; *lengthLength = len-1;
// Read in topic length to calculate bytes to skip over for Stream writing if ((buffer[0]&0xF0) == MQTTPUBLISH) {
buffer[len++] = readByte(); // Read in topic length to calculate bytes to skip over for Stream writing
buffer[len++] = readByte(); buffer[len++] = readByte();
uint16_t skip = (buffer[*lengthLength+1]<<8)+buffer[*lengthLength+2]; buffer[len++] = readByte();
skip = (buffer[*lengthLength+1]<<8)+buffer[*lengthLength+2];
if (buffer[0]&MQTTQOS1) { start = 2;
// skip message id if (buffer[0]&MQTTQOS1) {
skip += 2; // skip message id
skip += 2;
}
} }
for (uint16_t i = 2;i<length;i++) for (uint16_t i = start;i<length;i++) {
{
digit = readByte(); digit = readByte();
if(this->stream && ((buffer[0]&0xF0) == MQTTPUBLISH) && len-*lengthLength-2>skip) { if(this->stream && ((buffer[0]&0xF0) == MQTTPUBLISH) && len-*lengthLength-2>skip) {
this->stream->write(digit); this->stream->write(digit);
} }
if (len < MQTT_MAX_PACKET_SIZE) { if (len < MQTT_MAX_PACKET_SIZE) {
buffer[len++] = digit; buffer[len++] = digit;
} else { } else if (!this->stream) {
if(!this->stream) len = 0; // This will cause the packet to be ignored. len = 0; // This will cause the packet to be ignored.
} }
} }