From 8049543e989c5b23d0d0d4f3829e385f08307d36 Mon Sep 17 00:00:00 2001 From: Takayuki 'January June' Suwa Date: Mon, 24 Dec 2018 00:57:34 +0900 Subject: [PATCH] mDNS: Add support for String arg to begin() (#5542) Analogous to commit dd6333ee8b26dd9cc82dea252ba150e85c0ebb11 --- libraries/ESP8266mDNS/src/ESP8266mDNS_Legacy.h | 6 ++++++ libraries/ESP8266mDNS/src/LEAmDNS.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libraries/ESP8266mDNS/src/ESP8266mDNS_Legacy.h b/libraries/ESP8266mDNS/src/ESP8266mDNS_Legacy.h index 6dc69048e4..6d241ae06e 100644 --- a/libraries/ESP8266mDNS/src/ESP8266mDNS_Legacy.h +++ b/libraries/ESP8266mDNS/src/ESP8266mDNS_Legacy.h @@ -66,12 +66,18 @@ class MDNSResponder { MDNSResponder(); ~MDNSResponder(); bool begin(const char* hostName); + bool begin(const String& hostName) { + return begin(hostName.c_str()); + } //for compatibility bool begin(const char* hostName, IPAddress ip, uint32_t ttl=120){ (void) ip; (void) ttl; return begin(hostName); } + bool begin(const String& hostName, IPAddress ip, uint32_t ttl=120) { + return begin(hostName.c_str(), ip, ttl); + } /* Application should call this whenever AP is configured/disabled */ void notifyAPChange(); void update(); diff --git a/libraries/ESP8266mDNS/src/LEAmDNS.h b/libraries/ESP8266mDNS/src/LEAmDNS.h index d017a884b8..fc98b541b3 100644 --- a/libraries/ESP8266mDNS/src/LEAmDNS.h +++ b/libraries/ESP8266mDNS/src/LEAmDNS.h @@ -173,10 +173,16 @@ class MDNSResponder { // Later call MDNS::update() in every 'loop' to run the process loop // (probing, announcing, responding, ...) bool begin(const char* p_pcHostname); + bool begin(const String& p_strHostname) {return begin(p_strHostname.c_str());} // for compatibility bool begin(const char* p_pcHostname, IPAddress p_IPAddress, // ignored uint32_t p_u32TTL = 120); // ignored + bool begin(const String& p_strHostname, + IPAddress p_IPAddress, // ignored + uint32_t p_u32TTL = 120) { // ignored + return begin(p_strHostname.c_str(), p_IPAddress, p_u32TTL); + } // Finish MDNS processing bool close(void);