forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ESP8266 - Fixed MQTT packetId check

Browse source
This commit is contained in:
Jan Gromeš 2018-07-10 12:34:42 +02:00
parent a56f0122d6
commit bd5828de49
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/modules/ESP8266.cpp
View file

@ -404,7 +404,7 @@ uint8_t ESP8266::MqttConnect(const char* host, const char* clientId, const char*
uint8_t* response = new uint8_t[numBytes]; uint8_t* response = new uint8_t[numBytes];
receive(response, numBytes); receive(response, numBytes);
if((response[0] == MQTT_CONNACK << 4) && (response[1] == 2)) { if((response[0] == MQTT_CONNACK << 4) && (response[1] == 2)) {
uint8_t returnCode = response[0x03]; uint8_t returnCode = response[3];
delete[] response; delete[] response;
return(returnCode); return(returnCode);
} }
@ -505,7 +505,7 @@ uint8_t ESP8266::MqttSubscribe(const char* topicFilter) {
return(state); return(state);
} }
// get the response length (MQTT SUBACK response has to be 5 bytes long) // get the response length (MQTT SUBACK response has to be 5 bytes long for single subscription)
uint16_t numBytes = getNumBytes(); uint16_t numBytes = getNumBytes();
if(numBytes != 5) { if(numBytes != 5) {
return(ERR_RESPONSE_MALFORMED_AT); return(ERR_RESPONSE_MALFORMED_AT);
@ -514,9 +514,14 @@ uint8_t ESP8266::MqttSubscribe(const char* topicFilter) {
// read the response // read the response
uint8_t* response = new uint8_t[numBytes]; uint8_t* response = new uint8_t[numBytes];
receive(response, numBytes); receive(response, numBytes);
if((response[0] == MQTT_SUBACK << 4) && (response[2] == packetId)) { if((response[0] == MQTT_SUBACK << 4) && (response[1] == 3)) {
uint8_t returnCode = response[0x04]; // check packet ID
uint16_t receivedId = response[3] | response[2] << 8;
uint8_t returnCode = response[4];
delete[] response; delete[] response;
if(receivedId != packetId) {
return(ERR_MQTT_UNEXPECTED_PACKET_ID);
}
return(returnCode); return(returnCode);
} }
@ -570,10 +575,10 @@ uint8_t ESP8266::MqttUnsubscribe(const char* topicFilter) {
receive(response, numBytes); receive(response, numBytes);
if((response[0] == MQTT_UNSUBACK << 4) && (response[1] == 2)) { if((response[0] == MQTT_UNSUBACK << 4) && (response[1] == 2)) {
// check packet ID // check packet ID
uint16_t receivedId = response[2] | response[3] << 8; uint16_t receivedId = response[3] | response[2] << 8;
delete[] response; delete[] response;
if(receivedId != packetId) { if(receivedId != packetId) {
return(ERR_RESPONSE_MALFORMED); return(ERR_MQTT_UNEXPECTED_PACKET_ID);
} }
return(ERR_NONE); return(ERR_NONE);
} }