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

Payload for Stream now doesnt include the topic headers and msgid

Browse Source
This commit is contained in:
Mark Cheverton 2014-01-20 22:06:22 +00:00
parent 8abd634be7
commit edd167b81b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PubSubClient/PubSubClient.cpp
View File

@ -154,11 +154,23 @@ uint16_t PubSubClient::readPacket(uint8_t* lengthLength) {
multiplier *= 128; multiplier *= 128;
} while ((digit & 128) != 0); } while ((digit & 128) != 0);
*lengthLength = len-1; *lengthLength = len-1;
for (uint16_t i = 0;i<length;i++)
// 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];
if (buffer[0]&MQTTQOS1) {
// skip message id
skip += 2;
}
for (uint16_t i = 2;i<length;i++)
{ {
digit = readByte(); digit = readByte();
if(this->stream && ((buffer[0]&0xF0) == MQTTPUBLISH)) 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 {