From 62b8ac6be73ddfb673bfc585dc2c10a64e2af030 Mon Sep 17 00:00:00 2001 From: hreintke Date: Sat, 29 Dec 2018 04:00:16 +0100 Subject: [PATCH] Fix LeamDNS examples (#5563) * Fix LeamDNS examples * Fix Style check error * Another style fix --- .../examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino | 16 ++++++++-------- .../mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino b/libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino index 0558f3f0d..ea8a60a05 100644 --- 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\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 b9a524c32..3823b1c39 100644 --- 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\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;