Skip to content

Commit 42d2a13

Browse files
david-cermakDavid Čermák
authored andcommitted
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.
1 parent 86089be commit 42d2a13

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

components/lwip/apps/ping/ping_sock.c

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,6 @@
2626
#include "ping/ping_sock.h"
2727
#include "esp_check.h"
2828

29-
#ifndef CONFIG_LWIP_NETIF_API
30-
// If POSIX NETIF_API not enabled, we need to supply the implementation of if_indextoname()
31-
// using tcpip_api_call()
32-
#include "lwip/priv/tcpip_priv.h"
33-
34-
struct tcpip_netif_name {
35-
struct tcpip_api_call_data call;
36-
u8_t ifindex;
37-
char *ifname;
38-
};
39-
40-
static err_t do_netif_index_to_name(struct tcpip_api_call_data *msg)
41-
{
42-
struct tcpip_netif_name *params = __containerof(msg, struct tcpip_netif_name, call);
43-
return netif_index_to_name(params->ifindex, params->ifname) ? ERR_OK : ERR_IF;
44-
}
45-
46-
char *if_indextoname(unsigned int ifindex, char *ifname)
47-
{
48-
struct tcpip_netif_name params = { .ifindex = ifindex, .ifname = ifname };
49-
if (tcpip_api_call(do_netif_index_to_name, &params.call) != ERR_OK) {
50-
return NULL;
51-
}
52-
return ifname;
53-
}
54-
#endif // CONFIG_LWIP_NETIF_API == 0
55-
5629
const static char *TAG = "ping_sock";
5730

5831
#define PING_TIME_DIFF_MS(_end, _start) ((uint32_t)(((_end).tv_sec - (_start).tv_sec) * 1000 + \

examples/protocols/sockets/tcp_client_multi_net/main/tcp_client_multiple.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@ static void app_multiple_handle(esp_ip4_addr_t *ip4_addr, esp_netif_t *esp_netif
4646
*/
4747
#if CONFIG_EXAMPLE_BIND_SOCKET_TO_NETIF_NAME
4848
struct ifreq ifr;
49-
#if !CONFIG_LWIP_NETIF_API
50-
esp_netif_get_netif_impl_name(esp_netif, ifr.ifr_name);
51-
#else
5249
if_indextoname(esp_netif_get_netif_impl_index(esp_netif), ifr.ifr_name);
53-
#endif
5450
int ret = setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, (void*)&ifr, sizeof(struct ifreq));
5551
if (ret < 0) {
5652
ESP_LOGE(TAG, "\"%s\" Unable to bind socket to specified interface: errno %d", netif_name, errno);

0 commit comments

Comments
 (0)