espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-30 10:48:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adding disconnection if no PINGRESP (#54)

Browse Source 
* Adding disconnection if no pingresp

* Initializing wait_for_ping_resp to false

* Setting wait_for_ping_resp to false if aborting connection or when sending connect
This commit is contained in:
Tony
2018-08-06 08:18:12 +02:00
committed by Tuan
parent da573b482b
commit 4c19674b16
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mqtt_client.c
View File

@ -67,6 +67,7 @@ struct esp_mqtt_client {
int auto_reconnect; int auto_reconnect;
esp_mqtt_event_t event; esp_mqtt_event_t event;
bool run; bool run;
bool wait_for_ping_resp;
outbox_handle_t outbox; outbox_handle_t outbox;
EventGroupHandle_t status_bits; EventGroupHandle_t status_bits;
}; };
@ -190,6 +191,7 @@ static esp_err_t esp_mqtt_destroy_config(esp_mqtt_client_handle_t client)
static esp_err_t esp_mqtt_connect(esp_mqtt_client_handle_t client, int timeout_ms) static esp_err_t esp_mqtt_connect(esp_mqtt_client_handle_t client, int timeout_ms)
{ {
int write_len, read_len, connect_rsp_code; int write_len, read_len, connect_rsp_code;
client->wait_for_ping_resp = false;
mqtt_msg_init(&client->mqtt_state.mqtt_connection, mqtt_msg_init(&client->mqtt_state.mqtt_connection,
client->mqtt_state.out_buffer, client->mqtt_state.out_buffer,
client->mqtt_state.out_buffer_length); client->mqtt_state.out_buffer_length);
@ -255,6 +257,7 @@ static esp_err_t esp_mqtt_abort_connection(esp_mqtt_client_handle_t client)
client->state = MQTT_STATE_WAIT_TIMEOUT; client->state = MQTT_STATE_WAIT_TIMEOUT;
ESP_LOGI(TAG, "Reconnect after %d ms", client->wait_timeout_ms); ESP_LOGI(TAG, "Reconnect after %d ms", client->wait_timeout_ms);
client->event.event_id = MQTT_EVENT_DISCONNECTED; client->event.event_id = MQTT_EVENT_DISCONNECTED;
client->wait_for_ping_resp = false;
esp_mqtt_dispatch_event(client); esp_mqtt_dispatch_event(client);
return ESP_OK; return ESP_OK;
} }
@ -326,7 +329,7 @@ esp_mqtt_client_handle_t esp_mqtt_client_init(const esp_mqtt_client_config_t *co
client->keepalive_tick = platform_tick_get_ms(); client->keepalive_tick = platform_tick_get_ms();
client->reconnect_tick = platform_tick_get_ms(); client->reconnect_tick = platform_tick_get_ms();
client->wait_for_ping_resp = false;
int buffer_size = config->buffer_size; int buffer_size = config->buffer_size;
if (buffer_size <= 0) { if (buffer_size <= 0) {
buffer_size = MQTT_BUFFER_SIZE_BYTE; buffer_size = MQTT_BUFFER_SIZE_BYTE;
@ -636,7 +639,7 @@ static esp_err_t mqtt_process_receive(esp_mqtt_client_handle_t client)
break; break;
case MQTT_MSG_TYPE_PINGRESP: case MQTT_MSG_TYPE_PINGRESP:
ESP_LOGD(TAG, "MQTT_MSG_TYPE_PINGRESP"); ESP_LOGD(TAG, "MQTT_MSG_TYPE_PINGRESP");
// Ignore client->wait_for_ping_resp = false;
break; break;
} }
@ -698,10 +701,21 @@ static void esp_mqtt_task(void *pv)
} }
if (platform_tick_get_ms() - client->keepalive_tick > client->connect_info.keepalive * 1000 / 2) { if (platform_tick_get_ms() - client->keepalive_tick > client->connect_info.keepalive * 1000 / 2) {
if (esp_mqtt_client_ping(client) == ESP_FAIL) { //No ping resp from last ping => Disconnected
if(client->wait_for_ping_resp){
ESP_LOGE(TAG, "No PING_RESP, disconnected");
esp_mqtt_abort_connection(client);
client->wait_for_ping_resp = false;
break;
}
if (esp_mqtt_client_ping(client) == ESP_FAIL) {
ESP_LOGE(TAG, "Can't send ping, disconnected");
esp_mqtt_abort_connection(client); esp_mqtt_abort_connection(client);
break; break;
} else {
client->wait_for_ping_resp = true;
} }
ESP_LOGD(TAG, "PING sent");
} }
//Delete mesaage after 30 senconds //Delete mesaage after 30 senconds