Sfoglia il codice sorgente

Merge branch 'bugfix/lwip_config_dhcp_client_id_v4.2' into 'release/v4.2'

lw-ip: Add config for DHCP client id; Fix DNS server idx assert issue (v4.2)

See merge request espressif/esp-idf!16174
Jiang Jiang Jian 4 anni fa
parent
commit
769099dd64

+ 9 - 0
components/lwip/Kconfig

@@ -228,6 +228,15 @@ menu "LWIP"
             Enabling this option performs a check (via ARP request) if the offered IP address
             Enabling this option performs a check (via ARP request) if the offered IP address
             is not already in use by another host on the network.
             is not already in use by another host on the network.
 
 
+    config LWIP_DHCP_DISABLE_CLIENT_ID
+        bool "DHCP: Disable Use of HW address as client identification"
+        default n
+        help
+            This option could be used to disable DHCP client identification with its MAC address.
+            (Client id is used by DHCP servers to uniquely identify clients and are included
+            in the DHCP packets as an option 61)
+            Set this option to "y" in order to exclude option 61 from DHCP packets.
+
     config LWIP_DHCP_RESTORE_LAST_IP
     config LWIP_DHCP_RESTORE_LAST_IP
         bool "DHCP: Restore last IP obtained from DHCP server"
         bool "DHCP: Restore last IP obtained from DHCP server"
         default n
         default n

+ 1 - 1
components/lwip/lwip

@@ -1 +1 @@
-Subproject commit 2c9c531f0a7e0ee536db9de4f9dc54e453712087
+Subproject commit 2195f7416fb3136831babf3e96c027a73075bd4f

+ 4 - 0
components/lwip/port/esp32/include/lwipopts.h

@@ -250,6 +250,10 @@
  */
  */
 #define DHCP_DOES_ARP_CHECK             CONFIG_LWIP_DHCP_DOES_ARP_CHECK
 #define DHCP_DOES_ARP_CHECK             CONFIG_LWIP_DHCP_DOES_ARP_CHECK
 
 
+/**
+ * LWIP_DHCP_DISABLE_CLIENT_ID==1: Do not add option 61 (client-id) to DHCP packets
+ */
+#define ESP_DHCP_DISABLE_CLIENT_ID      CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID
 
 
 /**
 /**
  * CONFIG_LWIP_DHCP_RESTORE_LAST_IP==1: Last valid IP address obtained from DHCP server
  * CONFIG_LWIP_DHCP_RESTORE_LAST_IP==1: Last valid IP address obtained from DHCP server