Merge branch 'bugfix/fix_issues_in_mesh_and_scan_v5.1' into 'release/…

…v5.1' fix issues in wifi and lwip (v5.1) See merge request espressif/esp-idf!29187
espressif · Mar 5, 2024 · 69c8490 · 69c8490
2 parents 50eea05 + 594c61a
commit 69c8490
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 6 deletions.
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -36,7 +36,7 @@ wDev_ProcessRxSucData = 0x400017f4;
 pm_tx_data_done_process = 0x40001808;
 ppMapWaitTxq = 0x40001810;
 ieee80211_encap_esfbuf = 0x4000185c;
-sta_input = 0x40001870;
+/*sta_input = 0x40001870;*/
 ieee80211_crypto_decap = 0x4000189c;
 ieee80211_decap = 0x400018a0;
 coex_core_timer_idx_get = 0x400018d0;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
@@ -681,7 +681,7 @@ menu "LWIP"
                 Control the number of out-of-order pbufs to ensure that the MAC layer
                 has enough RX buffer to receive packets.
 
-                In the Wi-Fi scenario,recommended OOSEQ PBUFS Range:
+                In the Wi-Fi scenario, recommended OOSEQ PBUFS Range:
                 0 <= TCP_OOSEQ_MAX_PBUFS <= CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM/(MAX_TCP_NUMBER + 1)
 
                 In the Ethernet scenario,recommended Ethernet OOSEQ PBUFS Range:
@@ -1022,6 +1022,33 @@ menu "LWIP"
 
     endmenu # SNTP
 
+    menu "DNS"
+
+        config LWIP_DNS_MAX_SERVERS
+            int "Maximum number of DNS servers"
+            default 3
+            range 1 4
+            help
+                Set maximum number of DNS servers.
+                If fallback DNS servers are supported,
+                the number of DNS servers needs to be greater than or equal to 3.
+
+        config LWIP_FALLBACK_DNS_SERVER_SUPPORT
+            bool "Enable DNS fallback server support"
+            default n
+            depends on LWIP_DNS_MAX_SERVERS >= 3
+            help
+                Enable this feature to support DNS fallback server.
+
+        config LWIP_FALLBACK_DNS_SERVER_ADDRESS
+            string "DNS fallback server address"
+            default "114.114.114.114"
+            depends on LWIP_FALLBACK_DNS_SERVER_SUPPORT
+            help
+                This option allows you to config dns fallback server address.
+
+    endmenu # DNS
+
     config LWIP_BRIDGEIF_MAX_PORTS
         int "Maximum number of bridge ports"
         default 7

diff --git a/components/lwip/lwip b/components/lwip/lwip
diff --git a/components/lwip/port/include/lwipopts.h b/components/lwip/port/include/lwipopts.h
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * SPDX-FileContributor: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileContributor: 2015-2024 Espressif Systems (Shanghai) CO LTD
  */
 #ifndef LWIP_HDR_ESP_LWIPOPTS_H
 #define LWIP_HDR_ESP_LWIPOPTS_H
@@ -459,7 +459,7 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 
 /** The maximum of DNS servers
  */
-#define DNS_MAX_SERVERS                 3
+#define DNS_MAX_SERVERS                 CONFIG_LWIP_DNS_MAX_SERVERS
 
 /** ESP specific option only applicable if ESP_DNS=1
  *
@@ -468,6 +468,14 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
  */
 #define DNS_FALLBACK_SERVER_INDEX       (DNS_MAX_SERVERS - 1)
 
+#ifdef CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT
+#define FALLBACK_DNS_SERVER_ADDRESS(address)                           \
+        do {    ip_addr_t *server_dns = address;                            \
+                char server_ip[] = CONFIG_LWIP_FALLBACK_DNS_SERVER_ADDRESS; \
+                ipaddr_aton(server_ip, server_dns);                         \
+        } while (0)
+#endif /* CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT */
+
 /**
  * LWIP_DNS_SUPPORT_MDNS_QUERIES==1: Enable mDNS queries in hostname resolution.
  * This option is set via menuconfig.
@@ -1563,6 +1571,7 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 #define ESP_LWIP_LOCK                   1
 #define ESP_THREAD_PROTECTION           1
 #define LWIP_SUPPORT_CUSTOM_PBUF        1
+#define ESP_LWIP_FALLBACK_DNS_PREFER_IPV4 0
 
 /*
    -----------------------------------------

diff --git a/components/lwip/test_apps/sdkconfig.ci.lwip_debug b/components/lwip/test_apps/sdkconfig.ci.lwip_debug
@@ -0,0 +1,25 @@
+# Included for build test with LWIP debug enabled.
+
+CONFIG_LWIP_IP_FORWARD=y
+CONFIG_LWIP_IPV4_NAPT=y
+CONFIG_LWIP_DEBUG=y
+CONFIG_LWIP_DEBUG_ESP_LOG=y
+CONFIG_LWIP_NETIF_DEBUG=y
+CONFIG_LWIP_PBUF_DEBUG=y
+CONFIG_LWIP_ETHARP_DEBUG=y
+CONFIG_LWIP_API_LIB_DEBUG=y
+CONFIG_LWIP_SOCKETS_DEBUG=y
+CONFIG_LWIP_IP_DEBUG=y
+CONFIG_LWIP_ICMP_DEBUG=y
+CONFIG_LWIP_DHCP_STATE_DEBUG=y
+CONFIG_LWIP_DHCP_DEBUG=y
+CONFIG_LWIP_IP6_DEBUG=y
+CONFIG_LWIP_ICMP6_DEBUG=y
+CONFIG_LWIP_TCP_DEBUG=y
+CONFIG_LWIP_UDP_DEBUG=y
+CONFIG_LWIP_SNTP_DEBUG=y
+CONFIG_LWIP_DNS_DEBUG=y
+CONFIG_LWIP_NAPT_DEBUG=y
+CONFIG_LWIP_BRIDGEIF_DEBUG=y
+CONFIG_LWIP_BRIDGEIF_FDB_DEBUG=y
+CONFIG_LWIP_BRIDGEIF_FW_DEBUG=y