Add MQTT_DeleteClient method.

You can use it to safe delete MQTT connection, and free all memory.

mqtt/include/mqtt.h

@@ -81,7 +81,9 @@ typedef enum {
 	MQTT_SUBSCIBE_SENDING,
 	MQTT_DATA,
 	MQTT_PUBLISH_RECV,
-	MQTT_PUBLISHING
+	MQTT_PUBLISHING,
+	MQTT_DELETING,
+	MQTT_DELETED,
 } tConnState;
 
 typedef void (*MqttCallback)(uint32_t *args);
@@ -127,6 +129,7 @@ typedef struct  {
 
 void ICACHE_FLASH_ATTR MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8_t security);
 void ICACHE_FLASH_ATTR MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_user, uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession);
+void ICACHE_FLASH_ATTR MQTT_DeleteClient(MQTT_Client *mqttClient);
 void ICACHE_FLASH_ATTR MQTT_InitLWT(MQTT_Client *mqttClient, uint8_t* will_topic, uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain);
 void ICACHE_FLASH_ATTR MQTT_OnConnected(MQTT_Client *mqttClient, MqttCallback connectedCb);
 void ICACHE_FLASH_ATTR MQTT_OnDisconnected(MQTT_Client *mqttClient, MqttCallback disconnectedCb);

mqtt/mqtt.c

@@ -115,22 +115,75 @@ deliver_publish(MQTT_Client* client, uint8_t* message, int length)
 
 /**
   * @brief  Delete tcp client and free all memory
-  * @param  mqttClient: The mqtt client
+  * @param  mqttClient: The mqtt client which contain TCP client
   * @retval None
   */
 void ICACHE_FLASH_ATTR
 mqtt_tcpclient_delete(MQTT_Client *mqttClient)
 {
-	if (mqttClient->pCon) {
+	if (mqttClient->pCon != NULL) {
-		INFO("Free memory\r\n");
+		INFO("Free memory\r\n");	
-		espconn_disconnect(mqttClient->pCon);
+		espconn_delete(mqttClient->pCon);
 		if (mqttClient->pCon->proto.tcp)
 			os_free(mqttClient->pCon->proto.tcp);
 		os_free(mqttClient->pCon);
 		mqttClient->pCon = NULL;
 	}
+}
 
-	os_timer_disarm(&mqttClient->mqttTimer);
+/**
+  * @brief  Delete MQTT client and free all memory
+  * @param  mqttClient: The mqtt client
+  * @retval None
+  */
+void ICACHE_FLASH_ATTR
+mqtt_client_delete(MQTT_Client *mqttClient)
+{
+	mqtt_tcpclient_delete(mqttClient);
+	if (mqttClient->host != NULL) {
+		os_free(mqttClient->host);
+		mqttClient->host = NULL;
+	}
+
+	if (mqttClient->user_data != NULL) {
+		os_free(mqttClient->user_data);
+		mqttClient->user_data = NULL;
+	}
+
+	if(mqttClient->connect_info.client_id != NULL) {
+		os_free(mqttClient->connect_info.client_id);
+		mqttClient->connect_info.client_id = NULL;
+	}
+
+	if(mqttClient->connect_info.username != NULL) {
+		os_free(mqttClient->connect_info.username);
+		mqttClient->connect_info.username = NULL;
+	}
+
+	if(mqttClient->connect_info.password != NULL) {
+		os_free(mqttClient->connect_info.password);
+		mqttClient->connect_info.password = NULL;
+	}
+
+	if(mqttClient->connect_info.will_topic != NULL) {
+		os_free(mqttClient->connect_info.will_topic);
+		mqttClient->connect_info.will_topic = NULL;
+	}
+
+	if(mqttClient->connect_info.will_message != NULL) {
+		os_free(mqttClient->connect_info.will_message);
+		mqttClient->connect_info.will_message = NULL;
+	}
+
+	if(mqttClient->mqtt_state.in_buffer != NULL) {
+		os_free(mqttClient->mqtt_state.in_buffer);
+		mqttClient->mqtt_state.in_buffer = NULL;
+	}
+
+	if(mqttClient->mqtt_state.out_buffer != NULL) {
+		os_free(mqttClient->mqtt_state.out_buffer);
+		mqttClient->mqtt_state.out_buffer = NULL;
+	}
 }
 
 
@@ -348,6 +401,9 @@ mqtt_tcpclient_discon_cb(void *arg)
 	if(TCP_DISCONNECTING == client->connState) {
 		client->connState = TCP_DISCONNECTED;
 	}
+	else if(MQTT_DELETING == client->connState) {
+		client->connState = MQTT_DELETED;
+	}
 	else {
 		client->connState = TCP_RECONNECT_REQ;
 	}
@@ -525,6 +581,7 @@ MQTT_Task(os_event_t *e)
 		INFO("TCP: Reconnect to: %s:%d\r\n", client->host, client->port);
 		client->connState = TCP_CONNECTING;
 		break;
+	case MQTT_DELETING:
 	case TCP_DISCONNECTING:
 		if (client->security) {
 #ifdef MQTT_SSL_ENABLE
@@ -539,14 +596,11 @@ MQTT_Task(os_event_t *e)
 		break;
 	case TCP_DISCONNECTED:
 		INFO("MQTT: Disconnected\r\n");
-		if (client->pCon != NULL) {
+		mqtt_tcpclient_delete(client);
-			INFO("Free memory\r\n");	
+		break;
-			espconn_delete(client->pCon);
+	case MQTT_DELETED:
-			if (client->pCon->proto.tcp)
+		INFO("MQTT: Deleted client\r\n");		
-				os_free(client->pCon->proto.tcp);
+		mqtt_client_delete(client);
-			os_free(client->pCon);
-			client->pCon = NULL;
-		}
 		break;
 	case MQTT_DATA:
 		if (QUEUE_IsEmpty(&client->msgQueue) || client->sendTimeout != 0) {
@@ -723,6 +777,15 @@ MQTT_Disconnect(MQTT_Client *mqttClient)
 	system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient);
 	os_timer_disarm(&mqttClient->mqttTimer);
 }
+
+void ICACHE_FLASH_ATTR
+MQTT_DeleteClient(MQTT_Client *mqttClient)
+{
+	mqttClient->connState = MQTT_DELETING;
+	system_os_post(MQTT_TASK_PRIO, 0, (os_param_t)mqttClient);
+	os_timer_disarm(&mqttClient->mqttTimer);
+}
+
 void ICACHE_FLASH_ATTR
 MQTT_OnConnected(MQTT_Client *mqttClient, MqttCallback connectedCb)
 {