From 0cc4077bd3e10bb93456ff2785309ec9237a5906 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Wed, 3 Jul 2019 14:16:53 +0200 Subject: [PATCH] modified error type to be a generic handle to capture different types of errors --- include/mqtt_client.h | 2 +- mqtt_client.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/mqtt_client.h b/include/mqtt_client.h index 8c6f7b4..12bb70c 100644 --- a/include/mqtt_client.h +++ b/include/mqtt_client.h @@ -82,7 +82,7 @@ typedef struct { int topic_len; /*!< Length of the topic for this event asociated with this event */ int msg_id; /*!< MQTT messaged id of message */ int session_present; /*!< MQTT session_present flag for connection event */ - esp_err_t last_err; /*!< MQTT last error captured in transports */ + void* error_handle; /*!< esp-tls error handle referencing last error/flags captured in transports */ } esp_mqtt_event_t; typedef esp_mqtt_event_t *esp_mqtt_event_handle_t; diff --git a/mqtt_client.c b/mqtt_client.c index 6c599a5..b06fdd6 100644 --- a/mqtt_client.c +++ b/mqtt_client.c @@ -995,9 +995,7 @@ static void esp_mqtt_task(void *pv) ESP_LOGE(TAG, "Error transport connect"); client->event.event_id = MQTT_EVENT_ERROR; #ifdef MQTT_SUPPORTED_FEATURE_TRANSPORT_ERR_REPORTING - client->event.last_err = get_and_clear_last_error(client->transport); -#else - client->event.last_err = ESP_FAIL; // In case reporting not supported, only report general error + client->event.error_handle = esp_transport_get_error_handle(client->transport); #endif esp_mqtt_dispatch_event_with_msgid(client); esp_mqtt_abort_connection(client);