From 42d2a131f61fcf2801604e2daf84e5969445bae8 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Wed, 29 Jan 2025 17:06:23 +0100 Subject: [PATCH] fix(lwip): Remove if_indextoname() impl in favor of LWIP_NETIF_API ESP-IDF already hardcodes LWIP_NETIF_API=1, so the related netif APIs are defined unconditionally. --- components/lwip/apps/ping/ping_sock.c | 27 ------------------- .../main/tcp_client_multiple.c | 4 --- 2 files changed, 31 deletions(-) diff --git a/components/lwip/apps/ping/ping_sock.c b/components/lwip/apps/ping/ping_sock.c index 827f01e15e..8870eaaae7 100644 --- a/components/lwip/apps/ping/ping_sock.c +++ b/components/lwip/apps/ping/ping_sock.c @@ -26,33 +26,6 @@ #include "ping/ping_sock.h" #include "esp_check.h" -#ifndef CONFIG_LWIP_NETIF_API -// If POSIX NETIF_API not enabled, we need to supply the implementation of if_indextoname() -// using tcpip_api_call() -#include "lwip/priv/tcpip_priv.h" - -struct tcpip_netif_name { - struct tcpip_api_call_data call; - u8_t ifindex; - char *ifname; -}; - -static err_t do_netif_index_to_name(struct tcpip_api_call_data *msg) -{ - struct tcpip_netif_name *params = __containerof(msg, struct tcpip_netif_name, call); - return netif_index_to_name(params->ifindex, params->ifname) ? ERR_OK : ERR_IF; -} - -char *if_indextoname(unsigned int ifindex, char *ifname) -{ - struct tcpip_netif_name params = { .ifindex = ifindex, .ifname = ifname }; - if (tcpip_api_call(do_netif_index_to_name, ¶ms.call) != ERR_OK) { - return NULL; - } - return ifname; -} -#endif // CONFIG_LWIP_NETIF_API == 0 - const static char *TAG = "ping_sock"; #define PING_TIME_DIFF_MS(_end, _start) ((uint32_t)(((_end).tv_sec - (_start).tv_sec) * 1000 + \ diff --git a/examples/protocols/sockets/tcp_client_multi_net/main/tcp_client_multiple.c b/examples/protocols/sockets/tcp_client_multi_net/main/tcp_client_multiple.c index 2c91114600..059a969711 100644 --- a/examples/protocols/sockets/tcp_client_multi_net/main/tcp_client_multiple.c +++ b/examples/protocols/sockets/tcp_client_multi_net/main/tcp_client_multiple.c @@ -46,11 +46,7 @@ static void app_multiple_handle(esp_ip4_addr_t *ip4_addr, esp_netif_t *esp_netif */ #if CONFIG_EXAMPLE_BIND_SOCKET_TO_NETIF_NAME struct ifreq ifr; -#if !CONFIG_LWIP_NETIF_API - esp_netif_get_netif_impl_name(esp_netif, ifr.ifr_name); -#else if_indextoname(esp_netif_get_netif_impl_index(esp_netif), ifr.ifr_name); -#endif int ret = setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, (void*)&ifr, sizeof(struct ifreq)); if (ret < 0) { ESP_LOGE(TAG, "\"%s\" Unable to bind socket to specified interface: errno %d", netif_name, errno);