espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-08-02 04:05:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/kconfig

Browse Source
This commit is contained in:
Tuan PM
2018-03-01 22:34:02 +07:00
parent 8fe50dda5f c06c24a947
commit 7090311476
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mqtt_msg.c
View File

@@ -49,7 +49,7 @@ struct __attribute((__packed__)) mqtt_connect_variable_header
{ {
uint8_t lengthMsb; uint8_t lengthMsb;
uint8_t lengthLsb; uint8_t lengthLsb;
#if defined(CONFIG_MQTT_PROTOCOL_311) #if defined(MQTT_PROTOCOL_311)
uint8_t magic[4]; uint8_t magic[4];
#else #else
uint8_t magic[6]; uint8_t magic[6];

13
mqtt_client.c
View File

@@ -125,14 +125,13 @@ static esp_err_t esp_mqtt_set_config(esp_mqtt_client_handle_t client, const esp_
client->connect_info.will_topic = strdup(config->lwt_topic); client->connect_info.will_topic = strdup(config->lwt_topic);
} }
if (config->lwt_msg[0]) { if (config->lwt_msg_len) {
client->connect_info.will_message = malloc(config->lwt_msg_len);
mem_assert(client->connect_info.will_message);
memcpy(client->connect_info.will_message, config->lwt_msg, config->lwt_msg_len);
} else if (config->lwt_msg[0]) {
client->connect_info.will_message = strdup(config->lwt_msg); client->connect_info.will_message = strdup(config->lwt_msg);
if (config->lwt_msg_len > 0) { client->connect_info.will_length = strlen(config->lwt_msg);
client->connect_info.will_length = config->lwt_msg_len;
}
else {
client->connect_info.will_length = strlen(config->lwt_msg);
}
} }
client->connect_info.will_qos = config->lwt_qos; client->connect_info.will_qos = config->lwt_qos;