From ded1157e2589decc80ce77b51757550c156d328e Mon Sep 17 00:00:00 2001 From: hreintke Date: Fri, 28 Dec 2018 15:45:29 +0100 Subject: [PATCH 1/3] Fix LeamDNS examples --- .../examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino | 8 ++++---- .../LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino index 0558f3f0d4..cafb4f2fe6 100644 --- a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino +++ b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino @@ -189,7 +189,8 @@ bool MDNSProbeResultCallback(MDNSResponder* p_pMDNSResponder, p_pMDNSResponder->setDynamicServiceTxtCallback(hMDNSService, MDNSDynamicServiceTxtCallback, 0); } } - } else { + } + } else { // Change hostname, use '-' as divider between base name and index if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) { p_pMDNSResponder->setHostname(pcHostDomain); @@ -197,7 +198,6 @@ bool MDNSProbeResultCallback(MDNSResponder* p_pMDNSResponder, Serial.println("MDNSProbeResultCallback: FAILED to update hostname!"); } } - } } return true; } @@ -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\r\nHello from ESP8266 at "; - s += ipStr; + s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n\r\nHello 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 index b9a524c324..85eea1956c 100644 --- a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino +++ b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino @@ -233,7 +233,8 @@ bool MDNSProbeResultCallback(MDNSResponder* p_pMDNSResponder, } } } - } else { + } + } else { // Change hostname, use '-' as divider between base name and index if (MDNSResponder::indexDomain(pcHostDomain, "-", 0)) { p_pMDNSResponder->setHostname(pcHostDomain); @@ -241,7 +242,6 @@ bool MDNSProbeResultCallback(MDNSResponder* p_pMDNSResponder, Serial.println("MDNSProbeResultCallback: FAILED to update hostname!"); } } - } } return true; } @@ -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\r\nHello from ESP8266 at "; - s += ipStr; + s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n\r\nHello from "; + s += WiFi.hostname() + " at " + ipStr; // Simple addition of the current time s += "
Local HTTP services:
"; s += strHTTPServices; From e698f1e10d8548c113b6e22bd32cd816c53f5038 Mon Sep 17 00:00:00 2001 From: hreintke Date: Fri, 28 Dec 2018 16:26:27 +0100 Subject: [PATCH 2/3] Fix Style check error --- .../examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino index cafb4f2fe6..4fc11f93b5 100644 --- a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino +++ b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino @@ -191,13 +191,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 { - Serial.println("MDNSProbeResultCallback: FAILED to update hostname!"); - } - } + // 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!"); + } + } } return true; } From 308ce5432a04aaed892c79f2927bba60e7be3028 Mon Sep 17 00:00:00 2001 From: hreintke Date: Fri, 28 Dec 2018 17:38:28 +0100 Subject: [PATCH 3/3] Another style fix --- .../examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino | 14 +++++++------- .../mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino index 4fc11f93b5..ea8a60a05c 100644 --- a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino +++ b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino @@ -191,13 +191,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 { - Serial.println("MDNSProbeResultCallback: FAILED to update hostname!"); - } - } + // 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!"); + } + } } return true; } diff --git a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino index 85eea1956c..3823b1c391 100644 --- a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino +++ b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino @@ -235,13 +235,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 { - Serial.println("MDNSProbeResultCallback: FAILED to update hostname!"); - } + // 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!"); } + } } return true; }