Switch AP to the new interface

Author: me-no-dev

CMakeLists.txt

@@ -218,7 +218,8 @@ set(ARDUINO_LIBRARY_WiFi_SRCS
   libraries/WiFi/src/WiFiMulti.cpp
   libraries/WiFi/src/WiFiScan.cpp
   libraries/WiFi/src/WiFiSTA.cpp
-  libraries/WiFi/src/STA.cpp)
+  libraries/WiFi/src/STA.cpp
+  libraries/WiFi/src/AP.cpp)
 
 set(ARDUINO_LIBRARY_WiFiProv_SRCS libraries/WiFiProv/src/WiFiProv.cpp)
 

libraries/Networking/src/ESP_Network_Events.cpp

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include "ESP_Network_Events.h"
 #include "ESP_Network_Manager.h"
 #include "esp_task.h"

libraries/Networking/src/ESP_Network_Events.h

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include "soc/soc_caps.h"
@@ -156,6 +161,7 @@ class ESP_Network_Events {
     friend class ETHClass;
 #if SOC_WIFI_SUPPORTED
     friend class STAClass;
+    friend class APClass;
     friend class WiFiGenericClass;
 #endif
 

libraries/Networking/src/ESP_Network_Interface.cpp

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include "ESP_Network_Interface.h"
 #include "esp_netif.h"
 #include "esp_netif_defaults.h"
@@ -366,12 +371,14 @@ bool ESP_Network_Interface::config(IPAddress local_ip, IPAddress gateway, IPAddr
         }
 
         // Set DNS Server
-        esp_netif_set_dns_info(_esp_netif, ESP_NETIF_DNS_MAIN, &d1);
+        if(d2.ip.u_addr.ip4.addr != 0){
+            esp_netif_set_dns_info(_esp_netif, ESP_NETIF_DNS_MAIN, &d2);
+        }
 
         dhcps_lease_t lease;
         lease.enable = true;
         uint8_t CIDR = calculateSubnetCIDR(subnet);
-        log_v("SoftAP: %s | Gateway: %s | DHCP Start: %s | Netmask: %s", local_ip.toString().c_str(), gateway.toString().c_str(), dns2.toString().c_str(), subnet.toString().c_str());
+        log_v("SoftAP: %s | Gateway: %s | DHCP Start: %s | Netmask: %s", local_ip.toString().c_str(), gateway.toString().c_str(), dns1.toString().c_str(), subnet.toString().c_str());
         // netmask must have room for at least 12 IP addresses (AP + GW + 10 DHCP Leasing addresses)
         // netmask also must be limited to the last 8 bits of IPv4, otherwise this function won't work
         // IDF NETIF checks netmask for the 3rd byte: https://github.com/espressif/esp-idf/blob/master/components/esp_netif/lwip/esp_netif_lwip.c#L1857-L1862
@@ -383,7 +390,7 @@ bool ESP_Network_Interface::config(IPAddress local_ip, IPAddress gateway, IPAddr
         // The code below is ready for any netmask, not limited to 255.255.255.0
         uint32_t netmask = _byte_swap32(info.netmask.addr);
         uint32_t ap_ipaddr = _byte_swap32(info.ip.addr);
-        uint32_t dhcp_ipaddr = _byte_swap32(static_cast<uint32_t>(dns2));
+        uint32_t dhcp_ipaddr = _byte_swap32(static_cast<uint32_t>(dns1));
         dhcp_ipaddr = dhcp_ipaddr == 0 ? ap_ipaddr + 1 : dhcp_ipaddr;
         uint32_t leaseStartMax = ~netmask - 10;
         // there will be 10 addresses for DHCP to lease

libraries/Networking/src/ESP_Network_Interface.h

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include "esp_netif_types.h"
@@ -30,7 +35,7 @@ class ESP_Network_Interface: public Printable {
         ESP_Network_Interface();
         virtual ~ESP_Network_Interface();
 
-        // For server interfaces (WiFi AP), dns1 is the DNS and dns2 is the lease range start
+        // For server interfaces (WiFi AP), dns1 is the DHCP lease range start and dns2 is the DNS. dns3 is not used
         bool config(IPAddress local_ip = (uint32_t)0x00000000, IPAddress gateway = (uint32_t)0x00000000, IPAddress subnet = (uint32_t)0x00000000, IPAddress dns1 = (uint32_t)0x00000000, IPAddress dns2 = (uint32_t)0x00000000, IPAddress dns3 = (uint32_t)0x00000000);
         bool dnsIP(uint8_t dns_no, IPAddress ip);
 

libraries/Networking/src/ESP_Network_Manager.cpp

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #include "ESP_Network_Manager.h"
 #include "esp_netif.h"
 #include "lwip/ip_addr.h"

libraries/Networking/src/ESP_Network_Manager.h

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include "ESP_Network_Events.h"

libraries/Networking/src/Networking.h

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #pragma once
 
 #include "ESP_Network_Interface.h"