Update the esp-lwip to 2.2.0-release/v5.4 with appropriate wrap edits matching esp-idf branch

Author: HamzaHajeir

components/lwip/CMakeLists.txt

@@ -102,9 +102,8 @@ if(CONFIG_LWIP_ENABLE)
         "port/debug/lwip_debug.c"
         "port/sockets_ext.c"
         "port/freertos/sys_arch.c")
-    
-    if (${CONFIG_LWIP_ALTCP_TLS})
 
+    if (${CONFIG_LWIP_ALTCP_TLS})
         list(APPEND srcs 
         "lwip/src/core/altcp_alloc.c"
         "lwip/src/core/altcp_tcp.c"
@@ -150,7 +149,13 @@ if(CONFIG_LWIP_ENABLE)
             "lwip/src/netif/ppp/vj.c")
     endif()
 
-    if(NOT ${target} STREQUAL "linux")
+    if(CONFIG_LWIP_DHCP_DOES_ARP_CHECK)
+        list(APPEND srcs "port/acd_dhcp_check.c")
+    elseif(CONFIG_LWIP_DHCP_DOES_ACD_CHECK)
+        list(APPEND srcs "lwip/src/core/ipv4/acd.c")
+    endif()
+
+if(NOT ${target} STREQUAL "linux")
         # Support for vfs and linker fragments only for target builds
         set(linker_fragments linker.lf)
         if(CONFIG_VFS_SUPPORT_IO)
@@ -237,10 +242,6 @@ if(CONFIG_LWIP_ENABLE)
         idf_component_optional_requires(PRIVATE openthread)
     endif()
 
-    if(CONFIG_ETH_ENABLED)
-        idf_component_optional_requires(PRIVATE esp_eth)
-    endif()
-
     if(CONFIG_LWIP_DHCP_RESTORE_LAST_IP)
         idf_component_optional_requires(PRIVATE nvs_flash)
     endif()

components/lwip/Kconfig

@@ -135,13 +135,19 @@ menu "LWIP"
 
     config LWIP_MAX_SOCKETS
         int "Max number of open sockets"
-        range 1 16
+        range 1 253
         default 10
         help
+            The practical maximum limit is
+            determined by available heap memory at runtime.
+
             Sockets take up a certain amount of memory, and allowing fewer
             sockets to be open at the same time conserves memory. Specify
             the maximum amount of sockets here. The valid value is from 1
-            to 16.
+            to 253. If using value above 61, update CMakeLists defining
+            FD_SETSIZE to the number of sockets used plus the
+            expected open files (minimum of +3 for stdout, stderr and stdin).
+
 
     config LWIP_USE_ONLY_LWIP_SELECT
         bool "Support LWIP socket select() only (DEPRECATED)"
@@ -312,13 +318,29 @@ menu "LWIP"
             Set TCPIP task receive mail box size. Generally bigger value means higher throughput
             but more memory. The value should be bigger than UDP/TCP mail box size.
 
-    config LWIP_DHCP_DOES_ARP_CHECK
-        bool "DHCP: Perform ARP check on any offered address"
-        default y
+    choice LWIP_DHCP_CHECKS_OFFERED_ADDRESS
+        prompt "Choose how DHCP validates offered IP"
+        default LWIP_DHCP_DOES_ARP_CHECK
         depends on LWIP_IPV4
         help
-            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.
+            Choose the preferred way of DHCP client to check if the offered address
+            is available:
+            * Using Address Conflict Detection (ACD) module assures that the offered IP address
+            is properly probed and announced before binding in DHCP. This conforms to RFC5227,
+            but takes several seconds.
+            * Using ARP check, we only send two ARP requests to check for replies. This process
+            lasts 1 - 2 seconds.
+            * No conflict detection: We directly bind the offered address.
+
+        config LWIP_DHCP_DOES_ARP_CHECK
+            bool "DHCP provides simple ARP check"
+            depends on !LWIP_AUTOIP
+        config LWIP_DHCP_DOES_ACD_CHECK
+            bool "DHCP provides Address Conflict Detection (ACD)"
+        config LWIP_DHCP_DOES_NOT_CHECK_OFFERED_IP
+            bool "DHCP does not detect conflict on the offered IP"
+
+    endchoice
 
     config LWIP_DHCP_DISABLE_CLIENT_ID
         bool "DHCP: Disable Use of HW address as client identification"
@@ -411,6 +433,20 @@ menu "LWIP"
                 Enabling this option allows DHCP server to support temporary static ARP entries
                 for DHCP Client. This will help the DHCP server to send the DHCP OFFER and DHCP ACK using IP unicast.
 
+        config LWIP_DHCPS_ADD_DNS
+            bool "Always add DNS option in DHCP responses"
+            default y
+            depends on LWIP_DHCPS
+            help
+                This allows the DNS option to be optional in the DHCP offers,
+                depending on the server's runtime configuration.
+                When enabled, the DHCP server will always add the DNS option to DHCP responses.
+                If a DNS server is not explicitly configured, the server's IP address will be used
+                as the fallback for the DNS option.
+                When disabled, the DHCP server will only include the DNS option in responses
+                if a DNS server has been explicitly configured.
+                This option will be removed in IDF v6.x
+
     endmenu # DHCPS
 
     menuconfig LWIP_AUTOIP
@@ -708,8 +744,8 @@ menu "LWIP"
             int "The maximum number of pbufs queued on OOSEQ per pcb"
             depends on LWIP_TCP_QUEUE_OOSEQ
             range 0 12
-            default 4 if !SPIRAM_TRY_ALLOCATE_WIFI_LWIP
-            default 0 if SPIRAM_TRY_ALLOCATE_WIFI_LWIP
+            default 4 if !(SPIRAM_TRY_ALLOCATE_WIFI_LWIP && !SPIRAM_IGNORE_NOTFOUND)
+            default 0 if (SPIRAM_TRY_ALLOCATE_WIFI_LWIP && !SPIRAM_IGNORE_NOTFOUND)
             help
                 If LWIP_TCP_OOSEQ_MAX_PBUFS = 0, TCP will not control the number of OOSEQ pbufs.
 
@@ -765,7 +801,7 @@ menu "LWIP"
 
         config LWIP_WND_SCALE
             bool "Support TCP window scale"
-            depends on SPIRAM_TRY_ALLOCATE_WIFI_LWIP
+            depends on (SPIRAM_TRY_ALLOCATE_WIFI_LWIP && !SPIRAM_IGNORE_NOTFOUND)
             default n
             help
                 Enable this feature to support TCP window scaling.
@@ -876,13 +912,58 @@ menu "LWIP"
         default 0x0 if LWIP_TCPIP_TASK_AFFINITY_CPU0
         default 0x1 if LWIP_TCPIP_TASK_AFFINITY_CPU1
 
+    config LWIP_IPV6_MEMP_NUM_ND6_QUEUE
+        int "Max number of IPv6 packets to queue during MAC resolution"
+        depends on LWIP_IPV6
+        range 3 20
+        default 3
+        help
+            Config max number of IPv6 packets to queue during MAC resolution.
+
+    config LWIP_IPV6_ND6_NUM_NEIGHBORS
+        int "Max number of entries in IPv6 neighbor cache"
+        depends on LWIP_IPV6
+        range 3 10
+        default 5
+        help
+            Config max number of entries in IPv6 neighbor cache
+
+    config LWIP_IPV6_ND6_NUM_PREFIXES
+        int "Max number of entries in IPv6 on-link prefixes cache"
+        depends on LWIP_IPV6
+        default 5
+        help
+            Maximum number of entries in IPv6 on-link prefixes cache
+
+    config LWIP_IPV6_ND6_NUM_ROUTERS
+        int "Max number of entries in IPv6 default routers cache"
+        depends on LWIP_IPV6
+        default 3
+        help
+            Maximum number of entries in IPv6 default routers cache
+
+    config LWIP_IPV6_ND6_NUM_DESTINATIONS
+        int "Max number of entries in IPv6 destinations cache"
+        depends on LWIP_IPV6
+        default 10
+        help
+            Maximum number of entries in IPv6 destinations cache
 
     menuconfig LWIP_PPP_SUPPORT
         bool "Enable PPP support"
         default n
         help
             Enable PPP stack. Now only PPP over serial is possible.
 
+    config LWIP_PPP_ENABLE_IPV4
+        bool "Enable IPV4 support for PPP connections (IPCP)"
+        depends on LWIP_PPP_SUPPORT && LWIP_IPV4
+        default y
+        help
+            Enable IPCP protocol in PPP negotiations, which assigns IPv4 addresses to the PPP client,
+            as well as IPv4 DNS servers.
+            You can disable this if your modem supports IPv6 only.
+
     config LWIP_PPP_ENABLE_IPV6
         bool "Enable IPV6 support for PPP connections (IPV6CP)"
         depends on LWIP_PPP_SUPPORT && LWIP_IPV6
@@ -894,22 +975,6 @@ menu "LWIP"
             This would in turn fail the configuration for the whole link.
             If your modem is not responding correctly to PPP Phase Network, try to disable IPV6 support.
 
-    config LWIP_IPV6_MEMP_NUM_ND6_QUEUE
-        int "Max number of IPv6 packets to queue during MAC resolution"
-        depends on LWIP_IPV6
-        range 3 20
-        default 3
-        help
-            Config max number of IPv6 packets to queue during MAC resolution.
-
-    config LWIP_IPV6_ND6_NUM_NEIGHBORS
-        int "Max number of entries in IPv6 neighbor cache"
-        depends on LWIP_IPV6
-        range 3 10
-        default 5
-        help
-            Config max number of entries in IPv6 neighbor cache
-
     config LWIP_PPP_NOTIFY_PHASE_SUPPORT
         bool "Enable Notify Phase Callback"
         depends on LWIP_PPP_SUPPORT
@@ -1304,11 +1369,15 @@ menu "LWIP"
         choice LWIP_HOOK_IP6_INPUT
             prompt "IPv6 packet input"
             depends on LWIP_IPV6
-            default LWIP_HOOK_IP6_INPUT_NONE
+            default LWIP_HOOK_IP6_INPUT_DEFAULT
             help
                 Enables custom IPv6 packet input.
-                Setting this to "default" provides weak implementation
-                stub that could be overwritten in application code.
+                Setting this to "default" provides weak IDF implementation,
+                which drops all incoming IPv6 traffic if the interface has no link local address.
+                (this default implementation is "weak" and could be still overwritten
+                in the application if some additional IPv6 input packet filtering is needed)
+                Setting this to "none" removes this default filter and conforms to the lwIP
+                implementation (which accepts multicasts even if the interface has no link local address)
                 Setting this to "custom" provides hook's declaration
                 only and expects the application to implement it.
 

components/lwip/apps/dhcpserver/dhcpserver.c

@@ -60,6 +60,7 @@
 #define DHCP_OPTION_PERFORM_ROUTER_DISCOVERY 31
 #define DHCP_OPTION_BROADCAST_ADDRESS 28
 #define DHCP_OPTION_REQ_LIST     55
+#define DHCP_OPTION_CAPTIVEPORTAL_URI 114
 #define DHCP_OPTION_END         255
 
 //#define USE_CLASS_B_NET 1
@@ -135,6 +136,7 @@ struct dhcps_t {
     dhcps_time_t dhcps_lease_time;
     dhcps_offer_t dhcps_offer;
     dhcps_offer_t dhcps_dns;
+    char *dhcps_captiveportal_uri;
     dhcps_cb_t dhcps_cb;
     void* dhcps_cb_arg;
     struct udp_pcb *dhcps_pcb;
@@ -164,6 +166,7 @@ dhcps_t *dhcps_new(void)
     dhcps->dhcps_lease_time = DHCPS_LEASE_TIME_DEF;
     dhcps->dhcps_offer = 0xFF;
     dhcps->dhcps_dns = 0x00;
+    dhcps->dhcps_captiveportal_uri = NULL;
     dhcps->dhcps_pcb = NULL;
     dhcps->state = DHCPS_HANDLE_CREATED;
     return dhcps;
@@ -238,6 +241,10 @@ void *dhcps_option_info(dhcps_t *dhcps, u8_t op_id, u32_t opt_len)
                 option_arg = &dhcps->dhcps_mask;
             }
 
+            break;
+        case CAPTIVEPORTAL_URI:
+            option_arg = &dhcps->dhcps_captiveportal_uri;
+
             break;
         default:
             break;
@@ -292,6 +299,11 @@ err_t dhcps_set_option_info(dhcps_t *dhcps, u8_t op_id, void *opt_info, u32_t op
                 dhcps->dhcps_mask = *(ip4_addr_t *)opt_info;
             }
 
+            break;
+
+        case CAPTIVEPORTAL_URI:
+            dhcps->dhcps_captiveportal_uri = (char *)opt_info;
+            break;
 
         default:
             break;
@@ -400,6 +412,7 @@ static u8_t *add_msg_type(u8_t *optptr, u8_t type)
 *******************************************************************************/
 static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
 {
+    u32_t i;
     ip4_addr_t ipadd;
 
     ipadd.addr = *((u32_t *) &dhcps->server_address);
@@ -441,18 +454,22 @@ static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
         }
     }
 
-    *optptr++ = DHCP_OPTION_DNS_SERVER;
-    *optptr++ = 4;
     if (dhcps_dns_enabled(dhcps->dhcps_dns)) {
+        *optptr++ = DHCP_OPTION_DNS_SERVER;
+        *optptr++ = 4;
         *optptr++ = ip4_addr1(&dhcps->dns_server);
         *optptr++ = ip4_addr2(&dhcps->dns_server);
         *optptr++ = ip4_addr3(&dhcps->dns_server);
         *optptr++ = ip4_addr4(&dhcps->dns_server);
+#ifdef CONFIG_LWIP_DHCPS_ADD_DNS
     }else {
+        *optptr++ = DHCP_OPTION_DNS_SERVER;
+        *optptr++ = 4;
         *optptr++ = ip4_addr1(&ipadd);
         *optptr++ = ip4_addr2(&ipadd);
         *optptr++ = ip4_addr3(&ipadd);
         *optptr++ = ip4_addr4(&ipadd);
+#endif /* CONFIG_LWIP_DHCPS_ADD_DNS */
     }
 
     ip4_addr_t broadcast_addr = { .addr = (ipadd.addr & dhcps->dhcps_mask.addr) | ~dhcps->dhcps_mask.addr };
@@ -468,6 +485,17 @@ static u8_t *add_offer_options(dhcps_t *dhcps, u8_t *optptr)
     *optptr++ = 0x05;
     *optptr++ = 0xdc;
 
+    if (dhcps->dhcps_captiveportal_uri) {
+        size_t length = strlen(dhcps->dhcps_captiveportal_uri);
+
+        *optptr++ = DHCP_OPTION_CAPTIVEPORTAL_URI;
+        *optptr++ = length;
+        for (i = 0; i < length; i++)
+        {
+            *optptr++ = dhcps->dhcps_captiveportal_uri[i];
+        }
+    }
+
     *optptr++ = DHCP_OPTION_PERFORM_ROUTER_DISCOVERY;
     *optptr++ = 1;
     *optptr++ = 0x00;
@@ -1335,6 +1363,7 @@ err_t dhcps_start(dhcps_t *dhcps, struct netif *netif, ip4_addr_t ip)
 
     dhcps->client_address_plus.addr = dhcps->dhcps_poll.start_ip.addr;
 
+    udp_bind_netif(dhcps->dhcps_pcb, dhcps->dhcps_netif);
     udp_bind(dhcps->dhcps_pcb, &netif->ip_addr, DHCPS_SERVER_PORT);
     udp_recv(dhcps->dhcps_pcb, handle_dhcp, dhcps);
 #if DHCPS_DEBUG