Fix LeamDNS examples (#5563)

hreintke · devyte · commit 62b8ac6be73d · 2018-12-29T00:00:16.000-03:00
* Fix LeamDNS examples

* Fix Style check error

* Another style fix
diff --git a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino
@@ -189,13 +189,13 @@ bool MDNSProbeResultCallback(MDNSResponder* p_pMDNSResponder,
             p_pMDNSResponder->setDynamicServiceTxtCallback(hMDNSService, MDNSDynamicServiceTxtCallback, 0);
           }
         }
+      }
+    } else {
+      // Change hostname, use '-' as divider between base name and index
+      if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) {
+        p_pMDNSResponder->setHostname(pcHostDomain);
       } else {
-        // Change hostname, use '-' as divider between base name and index
-        if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) {
-          p_pMDNSResponder->setHostname(pcHostDomain);
-        } else {
-          Serial.println("MDNSProbeResultCallback: FAILED to update hostname!");
-        }
+        Serial.println("MDNSProbeResultCallback: FAILED to update hostname!");
       }
     }
   }
@@ -241,8 +241,8 @@ void handleHTTPClient(WiFiClient& client) {
   if (req == "/") {
     IPAddress ip = WiFi.localIP();
     String ipStr = String(ip[0]) + '.' + String(ip[1]) + '.' + String(ip[2]) + '.' + String(ip[3]);
-    s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>Hello from ESP8266 at ";
-    s += ipStr;
+    s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>Hello from ";
+    s += WiFi.hostname() + " at " + ipStr;
     // Simple addition of the current time
     s += "\r\nCurrent time is: ";
     s += getTimeString();
diff --git a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino
@@ -233,13 +233,13 @@ bool MDNSProbeResultCallback(MDNSResponder* p_pMDNSResponder,
             }
           }
         }
+      }
+    } else {
+      // Change hostname, use '-' as divider between base name and index
+      if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) {
+        p_pMDNSResponder->setHostname(pcHostDomain);
       } else {
-        // Change hostname, use '-' as divider between base name and index
-        if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) {
-          p_pMDNSResponder->setHostname(pcHostDomain);
-        } else {
-          Serial.println("MDNSProbeResultCallback: FAILED to update hostname!");
-        }
+        Serial.println("MDNSProbeResultCallback: FAILED to update hostname!");
       }
     }
   }
@@ -280,8 +280,8 @@ void handleHTTPClient(WiFiClient& client) {
   if (req == "/") {
     IPAddress ip = WiFi.localIP();
     String ipStr = String(ip[0]) + '.' + String(ip[1]) + '.' + String(ip[2]) + '.' + String(ip[3]);
-    s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>Hello from ESP8266 at ";
-    s += ipStr;
+    s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>Hello from ";
+    s += WiFi.hostname() + " at " + ipStr;
     // Simple addition of the current time
     s += "<br/>Local HTTP services:<br/>";
     s += strHTTPServices;

Original file line number	Diff line number	Diff line change
`@@ -233,13 +233,13 @@ bool MDNSProbeResultCallback(MDNSResponder* p_pMDNSResponder,`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`	`}`
	`236`	`+ }`
	`237`	`+ } else {`
	`238`	`+ // Change hostname, use '-' as divider between base name and index`
	`239`	`+ if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) {`
	`240`	`+ p_pMDNSResponder->setHostname(pcHostDomain);`
`236`	`241`	`} else {`
`237`		`- // Change hostname, use '-' as divider between base name and index`
`238`		`- if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) {`
`239`		`- p_pMDNSResponder->setHostname(pcHostDomain);`
`240`		`- } else {`
`241`		`- Serial.println("MDNSProbeResultCallback: FAILED to update hostname!");`
`242`		`- }`
	`242`	`+ Serial.println("MDNSProbeResultCallback: FAILED to update hostname!");`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`}`
`@@ -280,8 +280,8 @@ void handleHTTPClient(WiFiClient& client) {`
`280`	`280`	`if (req == "/") {`
`281`	`281`	`IPAddress ip = WiFi.localIP();`
`282`	`282`	`String ipStr = String(ip[0]) + '.' + String(ip[1]) + '.' + String(ip[2]) + '.' + String(ip[3]);`
`283`		`- s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>Hello from ESP8266 at ";`
`284`		`- s += ipStr;`
	`283`	`+ s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>Hello from ";`
	`284`	`+ s += WiFi.hostname() + " at " + ipStr;`
`285`	`285`	`// Simple addition of the current time`
`286`	`286`	`s += "<br/>Local HTTP services:<br/>";`
`287`	`287`	`s += strHTTPServices;`