Fix config issue

Author: bloft

src/Config.cpp

@@ -84,7 +84,9 @@ char * Config::set(const char *key, const char *value){
   struct element * ele = elements;
   while(ele) {
     if(strcmp(key, ele->key) == 0) {
-      free(ele->value);
+      if(ele->value) {
+        free(ele->value);
+      }
       ele->value = (char*)malloc(strlen(value)+1);
       strcpy(ele->value, value);
       return ele->value;

src/EasyMqtt.cpp

@@ -16,7 +16,7 @@ void EasyMqtt::connectWiFi() {
     debug("Connecting to wifi");
     WiFi.mode(WIFI_STA);
 
-    WiFi.begin(wifi_ssid, wifi_password);
+    WiFi.begin(config().get("wifi.ssid", ""), config().get("wifi.password", ""));
 
 #ifdef DEBUG
     WiFi.printDiag(Serial);
@@ -38,7 +38,7 @@ void EasyMqtt::connectWiFi() {
       debug("IP address", WiFi.softAPIP().toString());
     }
     debug("devideId", deviceId);
-    webPortal.setup(*this, config(), ntp());
+    webPortal.setup(this, &config(), &ntp());
   }
 }
 
@@ -64,9 +64,9 @@ void EasyMqtt::connectMqtt() {
       });
     });
 
-    mqttClient.setServer(mqtt_host, mqtt_port);
+    mqttClient.setServer(config().get("mqtt.host", ""), config().getInt("mqtt.port", 1883));
 
-    if (mqttClient.connect(deviceId.c_str(), mqtt_username, mqtt_password), get("$system")["online"].getTopic().c_str(), 1, 1, "OFF") {
+    if (mqttClient.connect(deviceId.c_str(), config().get("mqtt.username", ""), config().get("mqtt.password", ""), get("$system")["online"].getTopic().c_str(), 1, 1, "OFF")) {
       debug("Connected to MQTT");
 
       setPublishFunction([&](Entry* entry, String message){
@@ -186,8 +186,6 @@ NTPClient & EasyMqtt::ntp() {
 void EasyMqtt::wifi(const char* ssid, const char* password) {
   config().get("wifi.ssid", ssid);
   config().get("wifi.password", password);
-  wifi_ssid = ssid;
-  wifi_password = password;
 }
 
 /**
@@ -199,10 +197,6 @@ void EasyMqtt::mqtt(const char* host, int port, const char* username, const char
   config().get("mqtt.port", String(port).c_str());
   config().get("mqtt.username", username);
   config().get("mqtt.password", password);
-  mqtt_host = host;
-  mqtt_port = port;
-  mqtt_username = username;
-  mqtt_password = password;
 }
 
 /**

src/EasyMqtt.h

@@ -20,14 +20,6 @@ class EasyMqtt : public Entry {
     String deviceId = "deviceId";
     long mqttDelay = 0;
 
-    const char* wifi_ssid = "N/A";
-    const char* wifi_password = "N/A";
-
-    const char* mqtt_host = "N/A";
-    int         mqtt_port = 1883;
-    const char* mqtt_username = "N/A";
-    const char* mqtt_password = "N/A";
-
   protected:
     /**
        Handle connections to wifi

src/Entry.cpp

@@ -168,7 +168,9 @@ char *Entry::getValue() {
 
 void Entry::setValue(const char *value) {
   lastUpdate = millis();
-  free(lastValue);
+  if(lastValue) {
+    free(lastValue);
+  }
   lastValue = (char*)malloc(strlen(value)+1);
   strcpy(lastValue, value);
   publish(value);

src/Entry.h

@@ -15,7 +15,7 @@ class Entry {
     int interval = -1;
     int forceUpdate = -1;
     unsigned long lastUpdate = 0;
-    char* lastValue = "";
+    char* lastValue = NULL;
 
     Entry* parent = NULL;
     Entry* next = NULL;

src/WebPortal.cpp

@@ -18,10 +18,10 @@ String WebPortal::getRestPath(Entry* entry) {
 WebPortal::WebPortal() {
 }
 
-void WebPortal::setup(Entry& mqttEntry, Config& config, NTPClient& ntpClient) {
-  mqtt = &mqttEntry;
-  ntp = &ntpClient;
-  config = config;
+void WebPortal::setup(Entry *mqttEntry, Config *config, NTPClient *ntpClient) {
+  WebPortal::mqtt = mqttEntry;
+  WebPortal::config = config;
+  WebPortal::ntp = ntpClient;
   mqtt->debug("Setup Web Portal");
   webServer.reset(new ESP8266WebServer(80));
   webServer->on("/", std::bind(&WebPortal::handleRoot, this));

src/WebPortal.h

@@ -30,7 +30,7 @@ class WebPortal {
   public:
     WebPortal();
 
-    void setup(Entry& mqttEntry, Config& config, NTPClient& ntp);
+    void setup(Entry *mqttEntry, Config *config, NTPClient *ntp);
 
     void handleRoot();
     void handleRest();