From 4c19674b16a0dfbb1927cfe13c5653e35ef1e79d Mon Sep 17 00:00:00 2001 From: Tony Date: Mon, 6 Aug 2018 08:18:12 +0200 Subject: [PATCH] Adding disconnection if no PINGRESP (#54) * 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 --- mqtt_client.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mqtt_client.c b/mqtt_client.c index 8264024..7c9c4fb 100644 --- a/mqtt_client.c +++ b/mqtt_client.c @@ -67,6 +67,7 @@ struct esp_mqtt_client { int auto_reconnect; esp_mqtt_event_t event; bool run; + bool wait_for_ping_resp; outbox_handle_t outbox; 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) { int write_len, read_len, connect_rsp_code; + client->wait_for_ping_resp = false; mqtt_msg_init(&client->mqtt_state.mqtt_connection, client->mqtt_state.out_buffer, 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; ESP_LOGI(TAG, "Reconnect after %d ms", client->wait_timeout_ms); client->event.event_id = MQTT_EVENT_DISCONNECTED; + client->wait_for_ping_resp = false; esp_mqtt_dispatch_event(client); 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->reconnect_tick = platform_tick_get_ms(); - + client->wait_for_ping_resp = false; int buffer_size = config->buffer_size; if (buffer_size <= 0) { buffer_size = MQTT_BUFFER_SIZE_BYTE; @@ -636,7 +639,7 @@ static esp_err_t mqtt_process_receive(esp_mqtt_client_handle_t client) break; case MQTT_MSG_TYPE_PINGRESP: ESP_LOGD(TAG, "MQTT_MSG_TYPE_PINGRESP"); - // Ignore + client->wait_for_ping_resp = false; 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 (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); break; + } else { + client->wait_for_ping_resp = true; } + ESP_LOGD(TAG, "PING sent"); } //Delete mesaage after 30 senconds