...move things back, still expose as WiFi method

Author: mcspr

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

@@ -16,8 +16,7 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "ESP8266WiFi.h"
-#include "ESP8266WiFiAP.h"
+#include "LwipDhcpServer-NonOS.h"
 
 #include <lwip/init.h>
 #include <lwip/netif.h>
@@ -26,18 +25,13 @@
 // (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
-static DhcpServer& getNonOSDhcpServer()
+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
@@ -98,5 +92,3 @@ extern "C"
     }
 
 }  // extern "C"
-
-

cores/esp8266/LwipDhcpServer-NonOS.h

@@ -0,0 +1,24 @@
+/*
+    NonOS DHCP server helpers
+
+    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
+*/
+
+#pragma once
+
+#include "LwipDhcpServer.h"
+
+// Global static DHCP instance for softAP interface
+DhcpServer& getNonOSDhcpServer();

libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp

@@ -391,3 +391,11 @@ String ESP8266WiFiAPClass::softAPPSK() const {
 
     return psk;
 }
+
+/**
+ * Get the static DHCP server instance attached to the softAP interface
+ * @return DhcpServer instance.
+ */
+DhcpServer& ESP8266WiFiAPClass::softAPDhcpServer() {
+    return getNonOSDhcpServer();
+}