restyle

esp8266 · d-a-v · Jun 8, 2022 · May 27, 2022 · May 27, 2022 · May 31, 2022
commit ad7faf70b877e6dedee8eba863be7bf8c91eec01
diff --git a/cores/esp8266/LwipDhcpServer.h b/cores/esp8266/LwipDhcpServer.h
@@ -220,7 +220,7 @@ class DhcpServer
     ip4_addr_t      server_address {};
     ip4_addr_t      client_address {};
 
-    uint32_t        lease_time = DefaultLeaseTime;
+    uint32_t lease_time = DefaultLeaseTime;
 
     bool       offer_router = true;
     ip4_addr_t dns_address {};

diff --git a/libraries/ESP8266WiFi/examples/CustomOffer/CustomOffer.ino b/libraries/ESP8266WiFi/examples/CustomOffer/CustomOffer.ino
@@ -1,11 +1,16 @@
 #include <Arduino.h>
 #include <ESP8266WiFi.h>
-#include <LwipDhcpServer.h>
 
 void setup() {
-  dhcpSoftAP.onSendOptions([](const DhcpServer&, auto& options) {
-    options.add(43, { 0xca, 0xfe, 0xca, 0xfe, 0xfe })  // VENDOR is... vendor specific
-      .add(114, "https://192.168.4.1");                // Captive portal
+ 
A1C1
 auto& server = WiFi.softAPDhcpServer();
+  server.onSendOptions([](const DhcpServer& server, auto& options) {
+    // VENDOR is... vendor specific
+    options.add(43, { 0xca, 0xfe, 0xca, 0xfe, 0xfe });
+
+    // Captive Portal URI
+    const IPAddress gateway = netif_ip4_addr(server.getNetif());
+    const String captive = F("http://") + gateway.toString();
+    options.add(114, captive.c_str(), captive.length());
   });
   WiFi.softAP("TEST", "testtesttest");
 }

diff --git a/tests/host/common/DhcpServer.cpp b/tests/host/common/DhcpServer.cpp
@@ -51,5 +51,4 @@ extern "C"
         (void)please;
         return true;
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,5 +51,4 @@ extern "C" @@
             (void)please;
             return true;
         }
     }