outbox: Cleanup all items when connection closes

espressif · Jun 24, 2021 · 1a94efe · 1a94efe
1 parent 2e15c9a
commit 1a94efe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/lib/include/mqtt_outbox.h b/lib/include/mqtt_outbox.h
@@ -58,6 +58,7 @@ esp_err_t outbox_set_tick(outbox_handle_t outbox, int msg_id, outbox_tick_t tick
 int outbox_get_size(outbox_handle_t outbox);
 esp_err_t outbox_cleanup(outbox_handle_t outbox, int max_size);
 void outbox_destroy(outbox_handle_t outbox);
+void outbox_delete_all_items(outbox_handle_t outbox);
 
 #ifdef  __cplusplus
 }

diff --git a/lib/mqtt_outbox.c b/lib/mqtt_outbox.c
@@ -224,14 +224,18 @@ esp_err_t outbox_cleanup(outbox_handle_t outbox, int max_size)
     return ESP_OK;
 }
 
-void outbox_destroy(outbox_handle_t outbox)
+void outbox_delete_all_items(outbox_handle_t outbox)
 {
     outbox_item_handle_t item, tmp;
     STAILQ_FOREACH_SAFE(item, outbox, next, tmp) {
         STAILQ_REMOVE(outbox, item, outbox_item, next);
         free(item->buffer);
         free(item);
     }
+}
+void outbox_destroy(outbox_handle_t outbox)
+{
+    outbox_delete_all_items(outbox);
     free(outbox);
 }
 

diff --git a/mqtt_client.c b/mqtt_client.c
@@ -1494,6 +1494,7 @@ static void esp_mqtt_task(void *pv)
 
     }
     esp_transport_close(client->transport);
+    outbox_delete_all_items(client->outbox);
     xEventGroupSetBits(client->status_bits, STOPPED_BIT);
 
     vTaskDelete(NULL);