From c2bc4d3797192e5c25feb2e4c66923b50228f19c Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Mon, 9 Dec 2024 18:35:29 +0100
Subject: [PATCH] fix(lwip): Fix ping session calling thread unsafe API

Closes https://github.com/espressif/esp-idf/issues/14982
---
 components/lwip/apps/ping/ping_sock.c         | 32 ++++++++++++++++++-
 .../icmp_echo/main/echo_example_main.c        |  8 +++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/components/lwip/apps/ping/ping_sock.c b/components/lwip/apps/ping/ping_sock.c
index fc302cfa73..e0b18087ab 100644
--- a/components/lwip/apps/ping/ping_sock.c
+++ b/components/lwip/apps/ping/ping_sock.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <sys/time.h>
+#include <net/if.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "lwip/opt.h"
@@ -25,6 +26,35 @@
 #include "ping/ping_sock.h"
 #include "esp_check.h"
 
+#ifndef CONFIG_LWIP_NETIF_API
+
+#include "lwip/priv/tcpip_priv.h"
+// If POSIX NETIF_API not enabled, we need to supply the implementation of if_indextoname()
+// using tcpip_callback()
+
+struct tcpip_netif_name {
+    struct tcpip_api_call_data call;
+    u8_t ifindex;
+    char *ifname;
+    err_t err;
+};
+
+static void do_netif_index_to_name(void *ctx)
+{
+    struct tcpip_netif_name *params = ctx;
+    params->err = 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_callback(do_netif_index_to_name, &params) != ERR_OK || params.err != 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 + \
@@ -267,7 +297,7 @@ esp_err_t esp_ping_new_session(const esp_ping_config_t *config, const esp_ping_c
     /* set if index */
     if(config->interface) {
         struct ifreq iface;
-        if(netif_index_to_name(config->interface, iface.ifr_name) == NULL) {
+        if (if_indextoname(config->interface, iface.ifr_name) == NULL) {
             ESP_LOGE(TAG, "fail to find interface name with netif index %" PRIu32, config->interface);
             goto err;
         }
diff --git a/examples/protocols/icmp_echo/main/echo_example_main.c b/examples/protocols/icmp_echo/main/echo_example_main.c
index 67f68093d2..4e54bde864 100644
--- a/examples/protocols/icmp_echo/main/echo_example_main.c
+++ b/examples/protocols/icmp_echo/main/echo_example_main.c
@@ -19,6 +19,9 @@
 #include "argtable3/argtable3.h"
 #include "protocol_examples_common.h"
 #include "ping/ping_sock.h"
+#include "esp_check.h"
+
+const static char *TAG = "echo_example";
 
 static void cmd_ping_on_ping_success(esp_ping_handle_t hdl, void *args)
 {
@@ -170,9 +173,8 @@ static int do_ping_cmd(int argc, char **argv)
         .on_ping_end = cmd_ping_on_ping_end
     };
     esp_ping_handle_t ping;
-    esp_ping_new_session(&config, &cbs, &ping);
-    esp_ping_start(ping);
-
+    ESP_RETURN_ON_FALSE(esp_ping_new_session(&config, &cbs, &ping) == ESP_OK, -1, TAG, "esp_ping_new_session failed");
+    ESP_RETURN_ON_FALSE(esp_ping_start(ping) == ESP_OK, -1, TAG, "esp_ping_start() failed");
     return 0;
 }