Merge branch 'master' into poc-cache-config

mhightower83 · web-flow · commit 17ceceb48dc7 · 2020-02-06T17:16:48.000-08:00
diff --git a/libraries/ESP8266mDNS/src/LEAmDNS.cpp b/libraries/ESP8266mDNS/src/LEAmDNS.cpp
@@ -114,33 +114,20 @@ bool MDNSResponder::begin(const char* p_pcHostname, const IPAddress& p_IPAddress
                 IPAddress sta = WiFi.localIP();
                 IPAddress ap = WiFi.softAPIP();
 
-                if (!sta.isSet() && !ap.isSet())
+                if (sta.isSet())
                 {
-
-                    DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] internal interfaces (STA, AP) are not set (none was specified)\n")));
-                    return false;
+                    DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] STA interface selected\n")));
+                    ipAddress = sta;
                 }
-
-                if (ap.isSet())
+                else if (ap.isSet())
                 {
-
-                    if (sta.isSet())
-                    {
-                        DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface AP selected over STA (none was specified)\n")));
-                    }
-                    else
-                    {
-                        DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface AP selected\n")));
-                    }
+                    DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] AP interface selected\n")));
                     ipAddress = ap;
-
                 }
                 else
                 {
-
-                    DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] default interface STA selected (none was specified)\n")));
-                    ipAddress = sta;
-
+                    DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] standard interfaces are not up, please specify one in ::begin()\n")));
+                    return false;
                 }
 
                 // continue to ensure interface is UP
diff --git a/tests/common.sh b/tests/common.sh
@@ -165,7 +165,7 @@ function install_ide()
             wget -nv https://www.python.org/ftp/python/3.8.1/python-3.8.1-embed-win32.zip
             unzip -q python-3.8.1-embed-win32.zip
             cp "python.exe" "python3.exe"
-            wget -nv -O sed.exe https://github.com/mbuilov/sed-windows/raw/master/sed-4.7-x64.exe
+            wget -nv -O sed.exe https://github.com/mbuilov/sed-windows/raw/master/sed-4.8-x64.exe
             #wget -nv https://fossies.org/windows/misc/unz600xn.exe
             #unzip -q ./unz600xn.exe
         popd
