Fix to memory leak on failed MQTT connections. (#105)

* Fix to memory memory leak on failed MQTT connections. * Change MQTT topic name max length from 32 to 48 characters. * Update CONF:FANx:SOURCE documentation.
tjko · Aug 12, 2024 · 1da4b58 · 1da4b58
1 parent f4344b2
commit 1da4b58
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/commands.md b/commands.md
@@ -448,6 +448,7 @@ Configure source for the PWM signal of a fan.
 Source types:
 * MBFAN (set fan to follow duty cycle from motherboard fan port)
 * SENSOR (set fan to follow temperature based duty cycle)
+* VSENSOR (set fan to follow temperature based duty cycle)
 * FAN (set fan to follow another FAN output duty cycle)
 * FIXED (set fan to run on fixed duty cycle)
 

diff --git a/src/fanpico.h b/src/fanpico.h
@@ -59,7 +59,7 @@
 #define WIFI_PASSWD_MAX_LEN   64
 #define WIFI_COUNTRY_MAX_LEN  3
 
-#define MQTT_MAX_TOPIC_LEN            33
+#define MQTT_MAX_TOPIC_LEN            49
 #define MQTT_MAX_USERNAME_LEN         81
 #define MQTT_MAX_PASSWORD_LEN         65
 #define DEFAULT_MQTT_STATUS_INTERVAL  600

diff --git a/src/lwipopts.h b/src/lwipopts.h
@@ -124,7 +124,7 @@ void pico_set_system_time(long int sec);
 #define DHCP_DEBUG                  LWIP_DBG_OFF
 #define SNTP_DEBUG                  LWIP_DBG_OFF
 #define HTTPD_DEBUG                 LWIP_DBG_OFF
-#define MQTT_DEBUG                  LWIP_DBG_OFF
+#define MQTT_DEBUG                  LWIP_DBG_ON
 #define ALTCP_MBEDTLS_DEBUG         LWIP_DBG_ON
 #define ALTCP_MBEDTLS_MEM_DEBUG     LWIP_DBG_ON
 #define ALTCP_MBEDTLS_LIB_DEBUG     LWIP_DBG_ON

diff --git a/src/mqtt.c b/src/mqtt.c
@@ -268,6 +268,9 @@ static void mqtt_dns_resolve_cb(const char *name, const ip_addr_t *ipaddr, void
 
 void mqtt_connect(mqtt_client_t *client)
 {
+#if TLS_SUPPORT
+	static struct altcp_tls_config *tlsconfig = NULL;
+#endif
 	struct mqtt_connect_client_info_t ci;
 	char client_id[32];
 	uint16_t port = MQTT_PORT;
@@ -304,11 +307,14 @@ void mqtt_connect(mqtt_client_t *client)
 	ci.will_qos = 0;
 #if TLS_SUPPORT
 	if (cfg->mqtt_tls) {
-		cyw43_arch_lwip_begin();
-		ci.tls_config = altcp_tls_create_config_client(NULL, 0);
-		cyw43_arch_lwip_end();
-		if (!ci.tls_config)
-			log_msg(LOG_WARNING, "altcp_tls_create_config_client(): failed");
+		if (!tlsconfig) {
+			cyw43_arch_lwip_begin();
+			tlsconfig = altcp_tls_create_config_client(NULL, 0);
+			cyw43_arch_lwip_end();
+			if (!tlsconfig)
+				log_msg(LOG_WARNING, "altcp_tls_create_config_client(): failed");
+		}
+		ci.tls_config = tlsconfig;
 		port = MQTT_TLS_PORT;
 	}
 #endif