move dhcp server getter to WiFi

more... arduino'ish? we ahve object as namespace, plus everything else
related to softAP is there
redundant includes, redundant mock impl (out-of-scope here to fix)

Author: mcspr

cores/esp8266/LwipDhcpServer-NonOS.h

@@ -13,7 +13,6 @@
 #include <ESP8266WiFi.h>
 #include <lwip/napt.h>
 #include <lwip/dns.h>
-#include <LwipDhcpServer.h>
 
 #define NAPT 1000
 #define NAPT_PORT 10
@@ -54,7 +53,7 @@ void setup() {
   Serial.printf("\nSTA: %s (dns: %s / %s)\n", WiFi.localIP().toString().c_str(), WiFi.dnsIP(0).toString().c_str(), WiFi.dnsIP(1).toString().c_str());
 
   // give DNS servers to AP side
-  auto& server = dhcpSoftAP();
+  auto& server = WiFi.softAPDhcpServer();
   server.dhcps_set_dns(0, WiFi.dnsIP(0));
   server.dhcps_set_dns(1, WiFi.dnsIP(1));
 

libraries/ESP8266WiFi/examples/RangeExtender-NAPT/RangeExtender-NAPT.ino

@@ -4,7 +4,6 @@
 #include <ESP8266WiFi.h>
 #include <WiFiClient.h>
 #include <ESP8266WebServer.h>
-#include <LwipDhcpServer.h>
 
 /* Set these to your desired credentials. */
 const char *ssid = "ESPap";
@@ -76,7 +75,7 @@ void setup() {
      ...
      any client not listed will use next IP address available from the range (here 192.168.0.102 and more)
   */
-  auto &dhcpServer = dhcpSoftAP();
+  auto &dhcpServer = WiFi.softAPDhcpServer();
   dhcpServer.add_dhcps_lease(mac_CAM);  // always 192.168.0.100
   dhcpServer.add_dhcps_lease(mac_PC);   // always 192.168.0.101
   /* Start Access Point. You can remove the password parameter if you want the AP to be open. */

libraries/ESP8266WiFi/examples/StaticLease/StaticLease.ino

@@ -1,59 +1,58 @@
 /*
-    lwIPDhcpServer-NonOS - DHCP server wrapper
+    NonOS DHCP server helpers
 
-    Copyright (c) 2020 esp8266 arduino. All rights reserved.
+    Copyright (c) 2020-2022 esp8266 arduino. All rights reserved.
     This file is part of the esp8266 core for Arduino environment.
-
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) any later version.
-
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
-
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-// STARTS/STOPS DHCP SERVER ON WIFI AP INTERFACE
-// these functions must exists as-is with "C" interface,
-// nonos-sdk calls them at boot time and later
-
-#include "LwipDhcpServer-NonOS.h"
+#include "ESP8266WiFi.h"
+#include "ESP8266WiFiAP.h"
 
+#include <lwip/init.h>
 #include <lwip/netif.h>
 
 // Global static DHCP instance for softAP interface
 // (since the netif object never goes away, even when AP is disabled)
 // Initial version fully emulates nonos-sdk api in DhcpServer class,
 // before trying to further change it and possibly break legacy behaviour
-DhcpServer& dhcpSoftAP()
+static DhcpServer& getNonOSDhcpServer()
 {
     extern netif      netif_git[2];
     static DhcpServer server(&netif_git[SOFTAP_IF]);
     return server;
 }
 
+DhcpServer& ESP8266WiFiAPClass::softAPDhcpServer()
+{
+    return getNonOSDhcpServer();
+}
+
 extern "C"
 {
     // `ip_info` is useless, since we get the information from the netif directly
     // `netif` would be netif_git[SOFTAP_IF], which we get from the lwip2 glue
     void dhcps_start(ip_info*, netif*)
     {
-        auto& server = dhcpSoftAP();
+        auto& server = getNonOSDhcpServer();
         if (!server.isRunning())
         {
             server.begin();
         }
     }
 
-    void dhcps_stop()
-    {
-        auto& server = dhcpSoftAP();
+    void dhcps_stop() {
+        auto& server = getNonOSDhcpServer();
         if (server.isRunning())
         {
             server.end();
@@ -64,38 +63,40 @@ extern "C"
 
     bool wifi_softap_set_dhcps_lease(dhcps_lease* please)
     {
-        auto& server = dhcpSoftAP();
+        auto& server = getNonOSDhcpServer();
         return server.set_dhcps_lease(please);
     }
 
     bool wifi_softap_get_dhcps_lease(dhcps_lease* please)
     {
-        auto& server = dhcpSoftAP();
+        auto& server = getNonOSDhcpServer();
         return server.get_dhcps_lease(please);
     }
 
     uint32 wifi_softap_get_dhcps_lease_time()
     {
-        auto& server = dhcpSoftAP();
+        auto& server = getNonOSDhcpServer();
         return server.get_dhcps_lease_time();
     }
 
     bool wifi_softap_set_dhcps_lease_time(uint32 minutes)
     {
-        auto& server = dhcpSoftAP();
+        auto& server = getNonOSDhcpServer();
         return server.set_dhcps_lease_time(minutes);
     }
 
     bool wifi_softap_reset_dhcps_lease_time()
     {
-        auto& server = dhcpSoftAP();
+        auto& server = getNonOSDhcpServer();
         return server.reset_dhcps_lease_time();
     }
 
     bool wifi_softap_add_dhcps_lease(uint8* macaddr)
     {
-        auto& server = dhcpSoftAP();
+        auto& server = getNonOSDhcpServer();
         return server.add_dhcps_lease(macaddr);
     }
 
 }  // extern "C"
+
+

cores/esp8266/LwipDhcpServer-NonOS.cpp renamed to libraries/ESP8266WiFi/src/ESP8266WiFiAP-DhcpServer.cpp

@@ -38,8 +38,6 @@ extern "C" {
 
 #include "debug.h"
 
-#include <LwipDhcpServer.h>
-
 // -----------------------------------------------------------------------------------------------------------------------
 // ---------------------------------------------------- Private functions ------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------------------
@@ -167,7 +165,7 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* psk, int channel,
         DEBUG_WIFI("[AP] softap config unchanged\n");
     }
 
-    auto& server = dhcpSoftAP();
+    auto& server = softAPDhcpServer();
     server.end();
 
     // check IP config
@@ -247,7 +245,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
     dhcp_lease.end_ip.addr = ip.v4();
     DEBUG_WIFI("[APConfig] DHCP IP end: %s\n", ip.toString().c_str());
 
-    auto& server = dhcpSoftAP();
+    auto& server = softAPDhcpServer();
     if(!server.set_dhcps_lease(&dhcp_lease))
     {
         DEBUG_WIFI("[APConfig] wifi_set_ip_info failed!\n");

libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp

@@ -27,7 +27,7 @@
 #include "ESP8266WiFiType.h"
 #include "ESP8266WiFiGeneric.h"
 
-#include <LwipDhcpServer-NonOS.h>
+#include <LwipDhcpServer.h>
 
 class ESP8266WiFiAPClass {
 
@@ -49,8 +49,10 @@ class ESP8266WiFiAPClass {
         uint8_t* softAPmacAddress(uint8_t* mac);
         String softAPmacAddress(void);
 
-	String softAPSSID() const;
-	String softAPPSK() const;
+        String softAPSSID() const;
+        String softAPPSK() const;
+
+        static DhcpServer& softAPDhcpServer();
 
     protected:
 

libraries/ESP8266WiFi/src/ESP8266WiFiAP.h

@@ -76,12 +76,6 @@ DhcpServer::~DhcpServer()
     end();
 }
 
-DhcpServer& dhcpSoftAP()
-{
-    static DhcpServer server(nullptr);
-    return server;
-}
-
 extern "C"
 {
 #include <user_interface.h>

tests/host/common/user_interface.cpp

@@ -385,7 +385,7 @@ bool wifi_softap_dhcps_stop(void);
 // esp8266/Arduino notice:
 // these dhcp functions are no longer provided by the lwip lib
 // only way to include them is to build our NonOS LwipDhcpServer helpers
-// (ref. cores/esp8266/LwipDhcpServer-NonOS.cpp)
+// (ref. libraries/ESP8266WiFi/src/ESP8266WiFiAP-DhcpServer.cpp)
 
 bool wifi_softap_set_dhcps_lease(struct dhcps_lease *please);
 bool wifi_softap_get_dhcps_lease(struct dhcps_lease *please);