moved cleanup into the libmqtt

Arduino/mqtt_server.h

@@ -24,6 +24,10 @@ bool MQTT_local_publish(uint8_t* topic, uint8_t* data, uint16_t data_length, uin
 bool MQTT_local_subscribe(uint8_t* topic, uint8_t qos);
 bool MQTT_local_unsubscribe(uint8_t* topic);
 
+// Interface to cleanup after STA disconnect
+
+void MQTT_server_cleanupClientCons();
+
 // Interface for persistence of retained topics
 // Topics can be serialized to a buffer and reinitialized later after reboot
 // Application is responsible for saving and restoring that buffer (i.e. to/from flash)

README.md

@@ -279,6 +279,12 @@ If an *MqttAuthCallback* function is registered with MQTT_server_onAuth(), it is
 
 The *MqttConnectCallback* function does a similar check for the connection, but it is called right after the connect request before the MQTT connect request is processed. This is done in order to reject requests from unautorized clients in an early stage. The number of currently connected clients (incl. the current one) is given in the *client_count* paramater. With this info you can reject too many concurrent connections.
 
+If you want to force a cleanup when the broker as a WiFi client (WIFI_STA mode) has lost connectivity to the AP, call:
+```c
+void MQTT_server_cleanupClientCons();
+```
+This will remove all broken connections, publishing LWT if defined.
+
 # Limitations on the number of clients
 To adjust memory consumption of one MQTT connection and thus the max number of concurrent connections you can redefine MQTT_BUF_SIZE and QUEUE_BUFFER_SIZE in "user_config.h". MQTT_BUF_SIZE is the max. size of pending inbound messages for one connection (and thus also the max. size of a single MQTT message) and QUEUE_BUFFER_SIZE is the max. size of all pending outbound messages for one connection. Currently these parameters are set to 1024 resp. 2048 bytes, resulting in a memory consumption of about 4 KB per connection and a max number of connections of about 8-9 (depending on the memory usage of the rest of the program). When you reduce buffer sizes, e.g. to 512 and 1024 bytes, a single connection requires only about 2.5 KB resulting in up to 13 possible concurrent MQTT connections. In any case you have to increase the number of TCP connections (default 5) first by calling "espconn_tcp_set_max_con(n)" with n, the max. number of concurrent TCP connections, less or equal to 15.
 

firmware/sha1sums

@@ -1,2 +1,2 @@
-4bc31b324e50df7c9a27dd1fd25989b91683b5ce  0x00000.bin
-d8421d85140ee997f675adeecc1b6ff52499e498  0x10000.bin
+c50dd78b2343c1a3c899a54d55fca90b9d13ea84  0x00000.bin
+f72c7c5d01d946b3639edfb50e4539706fd45b4d  0x10000.bin

mqtt/include/mqtt_server.h

@@ -43,6 +43,7 @@ extern MQTT_ClientCon *clientcon_list;
 uint16_t MQTT_server_countClientCon();
 void MQTT_server_disconnectClientCon(MQTT_ClientCon *mqttClientCon);
 bool MQTT_server_deleteClientCon(MQTT_ClientCon *mqttClientCon);
+void MQTT_server_cleanupClientCons();
 
 bool MQTT_server_start(uint16_t portno, uint16_t max_subscriptions, uint16_t max_retained_topics);
 void MQTT_server_onConnect(MqttConnectCallback connectCb);

mqtt/mqtt_server.c

@@ -258,6 +258,17 @@ bool ICACHE_FLASH_ATTR MQTT_server_deleteClientCon(MQTT_ClientCon * mqttClientCo
     return true;
 }
 
+void ICACHE_FLASH_ATTR MQTT_server_cleanupClientCons() {
+    MQTT_ClientCon *clientcon, *clientcon_tmp;
+    for (clientcon = clientcon_list; clientcon != NULL; ) {
+	clientcon_tmp = clientcon;
+	clientcon = clientcon->next;
+	if (clientcon_tmp->pCon->state == ESPCONN_CLOSE) {
+	    MQTT_server_deleteClientCon(clientcon_tmp);
+	}
+    }
+}
+
 void ICACHE_FLASH_ATTR MQTT_server_disconnectClientCon(MQTT_ClientCon * mqttClientCon) {
     MQTT_INFO("MQTT:ServerDisconnect\r\n");
 

user/user_main.c

@@ -1505,14 +1505,7 @@ void wifi_handle_event_cb(System_Event_t * evt) {
 		  evt->event_info.disconnected.ssid, evt->event_info.disconnected.reason);
 	connected = false;
 
-	MQTT_ClientCon *clientcon, *clientcon_tmp;
-	for (clientcon = clientcon_list; clientcon != NULL; ) {
-	    clientcon_tmp = clientcon;
-	    clientcon = clientcon->next;
-	    if (clientcon_tmp->pCon->state == ESPCONN_CLOSE) {
-		MQTT_server_deleteClientCon(clientcon_tmp);
-	    }
-	}
+	MQTT_server_cleanupClientCons();
 
 #ifdef MQTT_CLIENT
 	if (mqtt_enabled)