From 1a679130d8d99e17dd921cfa918083b4260fdcb8 Mon Sep 17 00:00:00 2001
From: stefan123t <stefan.thieme@gmx.ch>
Date: Wed, 3 Aug 2022 18:58:45 +0200
Subject: [PATCH] fix #106 PubSubClient reconnect, which maintains a reference
 to char* mAddr

---
 tools/esp8266/mqtt.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/tools/esp8266/mqtt.h b/tools/esp8266/mqtt.h
index 89570344..8af53d83 100644
--- a/tools/esp8266/mqtt.h
+++ b/tools/esp8266/mqtt.h
@@ -16,6 +16,7 @@ class mqtt {
             mClient     = new PubSubClient(mEspClient);
             mAddressSet = false;
 
+            memset(mAddr,  0, MQTT_ADDR_LEN);
             memset(mUser,  0, MQTT_USER_LEN);
             memset(mPwd,   0, MQTT_PWD_LEN);
             memset(mTopic, 0, MQTT_TOPIC_LEN);
@@ -23,13 +24,14 @@ class mqtt {
 
         ~mqtt() { }
 
-        void setup(const char *broker, const char *topic, const char *user, const char *pwd, uint16_t port) {
+        void setup(const char *addr, const char *topic, const char *user, const char *pwd, uint16_t port) {
             DPRINTLN(DBG_VERBOSE, F("mqtt.h:setup"));
             mAddressSet = true;
-            mClient->setServer(broker, port);
+            mClient->setServer(addr, port);
             mClient->setBufferSize(MQTT_MAX_PACKET_SIZE);
 
             mPort = port;
+            snprintf(mAddr, MQTT_ADDR_LEN, "%s", addr);
             snprintf(mUser, MQTT_USER_LEN, "%s", user);
             snprintf(mPwd, MQTT_PWD_LEN, "%s", pwd);
             snprintf(mTopic, MQTT_TOPIC_LEN, "%s", topic);
@@ -58,6 +60,11 @@ class mqtt {
             return mClient->connected();
         }
 
+        char *getAddr(void) {
+            //DPRINTLN(DBG_VERBOSE, F("mqtt.h:getAddr"));
+            return mAddr;
+        }
+
         char *getUser(void) {
             //DPRINTLN(DBG_VERBOSE, F("mqtt.h:getUser"));
             return mUser;
@@ -88,10 +95,12 @@ class mqtt {
         void reconnect(void) {
             //DPRINTLN(DBG_VERBOSE, F("mqtt.h:reconnect"));
             if(!mClient->connected()) {
-                if((strlen(mUser) > 0) && (strlen(mPwd) > 0))
-                    mClient->connect(DEF_DEVICE_NAME, mUser, mPwd);
-                else
-                    mClient->connect(DEF_DEVICE_NAME);
+                if(strlen(mAddr) > 0) {
+                    if((strlen(mUser) > 0) && (strlen(mPwd) > 0))
+                        mClient->connect(mAddr, mUser, mPwd);
+                    else
+                        mClient->connect(mAddr);
+                }
             }
         }
 
@@ -100,6 +109,7 @@ class mqtt {
 
         bool mAddressSet;
         uint16_t mPort;
+        char mAddr[MQTT_ADDR_LEN];
         char mUser[MQTT_USER_LEN];
         char mPwd[MQTT_PWD_LEN];
         char mTopic[MQTT_TOPIC_LEN];