Updates and prepares to build for idf-release/v5.1

Author: HamzaHajeir

.github/workflows/push.yml

@@ -105,7 +105,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
         GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
-      run: bash ./build.sh
+      run: bash ./build.sh -I release/v5.1 -A idf-release/v5.1
     - name: Release
       uses: jason2866/[email protected]
       with:

components/lwip/CMakeLists.txt

@@ -100,8 +100,8 @@ set(srcs
     "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"
@@ -115,6 +115,7 @@ if (${CONFIG_LWIP_ALTCP_TLS})
 
     set(requires mbedtls)
 endif()
+
 if(CONFIG_LWIP_PPP_SUPPORT)
     list(APPEND srcs
         "lwip/src/netif/ppp/auth.c"
@@ -147,6 +148,10 @@ if(CONFIG_LWIP_PPP_SUPPORT)
         "lwip/src/netif/ppp/polarssl/md4.c"
         "lwip/src/netif/ppp/polarssl/md5.c"
         "lwip/src/netif/ppp/polarssl/sha1.c")
+
+    if(CONFIG_LWIP_NETIF_API)
+        list(APPEND srcs "port/if_index.c")
+    endif()
 endif()
 
 if(NOT ${target} STREQUAL "linux")

components/lwip/Kconfig

@@ -837,6 +837,27 @@ menu "LWIP"
         default 0x1 if LWIP_TCPIP_TASK_AFFINITY_CPU1
 
 
+    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

components/lwip/apps/dhcpserver/dhcpserver.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1331,7 +1331,7 @@ static void kill_oldest_dhcps_pool(dhcps_t *dhcps)
     assert(pre != NULL && pre->pnext != NULL); // Expect the list to have at least 2 nodes
     p = pre->pnext;
     minpre = pre;
-    minp = p;
+    minp = pre;
 
     while (p != NULL) {
         pdhcps_pool = p->pnode;
@@ -1345,8 +1345,11 @@ static void kill_oldest_dhcps_pool(dhcps_t *dhcps)
         pre = p;
         p = p->pnext;
     }
-
-    minpre->pnext = minp->pnext;
+    if (minp == dhcps->plist) {
+        dhcps->plist = minp->pnext;
+    } else {
+        minpre->pnext = minp->pnext;
+    }
     free(minp->pnode);
     minp->pnode = NULL;
     free(minp);

components/lwip/apps/ping/ping_sock.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -35,6 +35,8 @@ const static char *TAG = "ping_sock";
 #define PING_FLAGS_INIT (1 << 0)
 #define PING_FLAGS_START (1 << 1)
 
+#define IP_ICMP_HDR_SIZE (64)   // 64 bytes are enough to cover IP header and ICMP header
+
 typedef struct {
     int sock;
     struct sockaddr_storage target_addr;
@@ -85,50 +87,54 @@ static esp_err_t esp_ping_send(esp_ping_t *ep)
 
 static int esp_ping_receive(esp_ping_t *ep)
 {
-    char buf[64]; // 64 bytes are enough to cover IP header and ICMP header
+    char buf[IP_ICMP_HDR_SIZE];
     int len = 0;
     struct sockaddr_storage from;
     int fromlen = sizeof(from);
     uint16_t data_head = 0;
+    ip_addr_t recv_addr;
+    ip_addr_copy(recv_addr, *IP_ADDR_ANY);
 
     while ((len = recvfrom(ep->sock, buf, sizeof(buf), 0, (struct sockaddr *)&from, (socklen_t *)&fromlen)) > 0) {
 #if CONFIG_LWIP_IPV4
         if (from.ss_family == AF_INET) {
             // IPv4
             struct sockaddr_in *from4 = (struct sockaddr_in *)&from;
-            inet_addr_to_ip4addr(ip_2_ip4(&ep->recv_addr), &from4->sin_addr);
-            IP_SET_TYPE_VAL(ep->recv_addr, IPADDR_TYPE_V4);
+            inet_addr_to_ip4addr(ip_2_ip4(&recv_addr), &from4->sin_addr);
+            IP_SET_TYPE_VAL(recv_addr, IPADDR_TYPE_V4);
             data_head = (uint16_t)(sizeof(struct ip_hdr) + sizeof(struct icmp_echo_hdr));
         }
 #endif
 #if CONFIG_LWIP_IPV6
         if (from.ss_family == AF_INET6) {
             // IPv6
             struct sockaddr_in6 *from6 = (struct sockaddr_in6 *)&from;
-            inet6_addr_to_ip6addr(ip_2_ip6(&ep->recv_addr), &from6->sin6_addr);
-            IP_SET_TYPE_VAL(ep->recv_addr, IPADDR_TYPE_V6);
+            inet6_addr_to_ip6addr(ip_2_ip6(&recv_addr), &from6->sin6_addr);
+            IP_SET_TYPE_VAL(recv_addr, IPADDR_TYPE_V6);
             data_head = (uint16_t)(sizeof(struct ip6_hdr) + sizeof(struct icmp6_echo_hdr));
         }
 #endif
         if (len >= data_head) {
 #if CONFIG_LWIP_IPV4
-            if (IP_IS_V4_VAL(ep->recv_addr)) {              // Currently we process IPv4
+            if (IP_IS_V4_VAL(recv_addr)) {              // Currently we process IPv4
                 struct ip_hdr *iphdr = (struct ip_hdr *)buf;
-                struct icmp_echo_hdr *iecho = (struct icmp_echo_hdr *)(buf + (IPH_HL(iphdr) * 4));
+                struct icmp_echo_hdr *iecho = (struct icmp_echo_hdr *)(buf + (IPH_HL_BYTES(iphdr)));
                 if ((iecho->id == ep->packet_hdr->id) && (iecho->seqno == ep->packet_hdr->seqno)) {
+                    ip_addr_copy(ep->recv_addr, recv_addr);
                     ep->received++;
-                    ep->ttl = iphdr->_ttl;
-                    ep->tos = iphdr->_tos;
+                    ep->ttl = IPH_TTL(iphdr);
+                    ep->tos = IPH_TOS(iphdr);
                     ep->recv_len = lwip_ntohs(IPH_LEN(iphdr)) - data_head;  // The data portion of ICMP
                     return len;
                 }
             }
 #endif // CONFIG_LWIP_IPV4
 #if CONFIG_LWIP_IPV6
-            if (IP_IS_V6_VAL(ep->recv_addr)) {      // Currently we process IPv6
+            if (IP_IS_V6_VAL(recv_addr)) {      // Currently we process IPv6
                 struct ip6_hdr *iphdr = (struct ip6_hdr *)buf;
                 struct icmp6_echo_hdr *iecho6 = (struct icmp6_echo_hdr *)(buf + sizeof(struct ip6_hdr)); // IPv6 head length is 40
                 if ((iecho6->id == ep->packet_hdr->id) && (iecho6->seqno == ep->packet_hdr->seqno)) {
+                    ip_addr_copy(ep->recv_addr, recv_addr);
                     ep->received++;
                     ep->recv_len = IP6H_PLEN(iphdr) - sizeof(struct icmp6_echo_hdr); //The data portion of ICMPv6
                     return len;

components/lwip/apps/sntp/sntp.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -243,6 +243,20 @@ const ip_addr_t* esp_sntp_getserver(u8_t idx)
     return sntp_getserver(idx);
 }
 
+uint8_t esp_sntp_getreachability(uint8_t idx)
+{
+#if SNTP_MONITOR_SERVER_REACHABILITY
+    return sntp_getreachability(idx);
+#endif
+    LWIP_ERROR("sntp_getreachability() in not enabled in lwipopts", false, );
+    return 0;
+}
+
+esp_sntp_operatingmode_t esp_sntp_getoperatingmode(void)
+{
+    return (esp_sntp_operatingmode_t)sntp_getoperatingmode();
+}
+
 #if LWIP_DHCP_GET_NTP_SRV
 static void do_servermode_dhcp(void* ctx)
 {

components/lwip/include/apps/esp_sntp.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -218,6 +218,20 @@ const ip_addr_t* esp_sntp_getserver(u8_t idx);
  */
 bool esp_sntp_enabled(void);
 
+/**
+ * @brief Gets the server reachability shift register as described in RFC 5905.
+ * @param idx Index of the SNTP server
+ * @return reachability shift register
+ */
+uint8_t esp_sntp_getreachability(uint8_t idx);
+
+/**
+ * @brief Get the configured operating mode
+ *
+ * @return operating mode enum
+ */
+esp_sntp_operatingmode_t esp_sntp_getoperatingmode(void);
+
 #if LWIP_DHCP_GET_NTP_SRV
 /**
  * @brief Enable acquiring SNTP server from DHCP
@@ -269,6 +283,16 @@ const ip_addr_t* sntp_getserver(u8_t idx)
     return esp_sntp_getserver(idx);
 }
 
+static inline uint8_t sntp_getreachability(uint8_t idx)
+{
+    return esp_sntp_getreachability(idx);
+}
+
+static inline esp_sntp_operatingmode_t sntp_getoperatingmode(void)
+{
+    return esp_sntp_getoperatingmode();
+}
+
 #endif /* ESP_LWIP_COMPONENT_BUILD */
 
 

components/lwip/lwip

@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "lwip/if_api.h"
+
+unsigned int if_nametoindex(const char *ifname)
+{
+    return lwip_if_nametoindex(ifname);
+}
+
+char *if_indextoname(unsigned int ifindex, char *ifname)
+{
+    return lwip_if_indextoname(ifindex, ifname);
+}

components/lwip/port/if_index.c

@@ -1250,6 +1250,20 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
  */
 #define LWIP_ND6_NUM_NEIGHBORS          CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS
 
+/**
+ * LWIP_ND6_NUM_PREFIXES: Maximum number of entries in IPv6 on-link prefixes cache
+ */
+#define LWIP_ND6_NUM_PREFIXES          CONFIG_LWIP_IPV6_ND6_NUM_PREFIXES
+
+/**
+ * LWIP_ND6_NUM_ROUTERS: Maximum number of entries in IPv6 default routers cache
+ */
+#define LWIP_ND6_NUM_ROUTERS          CONFIG_LWIP_IPV6_ND6_NUM_ROUTERS
+
+/**
+ * LWIP_ND6_NUM_DESTINATIONS: Maximum number of entries in IPv6 destinations cache
+ */
+#define LWIP_ND6_NUM_DESTINATIONS          CONFIG_LWIP_IPV6_ND6_NUM_DESTINATIONS
 /*
    ---------------------------------------
    ---------- Hook options ---------------

components/lwip/port/include/lwipopts.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -294,8 +294,16 @@ void test_sntp_timestamps(int year, bool msb_flag)
     localtime_r(&now, &timeinfo);
     TEST_ASSERT_EQUAL(year, 1900 + timeinfo.tm_year);
 
+    // Check that the server 0 was reachable
+    TEST_ASSERT_EQUAL(1, esp_sntp_getreachability(0));
     // close the SNTP and the fake server
     esp_sntp_stop();
+
+    // Test some other SNTP APIs
+    TEST_ASSERT_EQUAL(0, esp_sntp_getreachability(0));
+    TEST_ASSERT_EQUAL(ESP_SNTP_OPMODE_POLL, esp_sntp_getoperatingmode());
+    const ip_addr_t *server_ip = esp_sntp_getserver(0);
+    TEST_ASSERT_EQUAL(PP_HTONL(IPADDR_LOOPBACK), server_ip->u_addr.ip4.addr);
     close(sock);
 }