mathieu/Adafruit_MQTT_Library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing reversal of topic/packet identifier (topic should come first)

Browse Source
This commit is contained in:
Malachi Burke 2015-12-14 20:10:00 -08:00
parent 0f9627c73c
commit f36ec4cf85
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Adafruit_MQTT.cpp
View File

@ -490,6 +490,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
return len; return len;
} }
// as per http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718040
uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic, uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
const char *data, uint8_t qos) { const char *data, uint8_t qos) {
uint8_t *p = packet; uint8_t *p = packet;
@ -499,6 +500,9 @@ uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
// fill in packet[1] last // fill in packet[1] last
p+=2; p+=2;
// topic comes before packet identifier
p = stringprint_P(p, topic);
// add packet identifier. used for checking PUBACK in QOS > 0 // add packet identifier. used for checking PUBACK in QOS > 0
if(qos > 0) { if(qos > 0) {
p[0] = (packet_id_counter >> 8) & 0xFF; p[0] = (packet_id_counter >> 8) & 0xFF;
@ -509,8 +513,6 @@ uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
packet_id_counter++; packet_id_counter++;
} }
p = stringprint_P(p, topic);
memcpy(p, data, strlen(data)); memcpy(p, data, strlen(data));
p+=strlen(data); p+=strlen(data);
len = p - packet; len = p - packet;