alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ping_sock: Fix esp_ping_new_session may return ESP_OK when the error occured

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/7363
This commit is contained in:
yuanjm 2021-08-05 10:25:07 +08:00 committed by bot
parent 1fd56e0b87
commit e9dab3203e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lwip/apps/ping/ping_sock.c
View File

@ -214,7 +214,7 @@ static void esp_ping_thread(void *args)
esp_err_t esp_ping_new_session(const esp_ping_config_t *config, const esp_ping_callbacks_t *cbs, esp_ping_handle_t *hdl_out) esp_err_t esp_ping_new_session(const esp_ping_config_t *config, const esp_ping_callbacks_t *cbs, esp_ping_handle_t *hdl_out)
{ {
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_FAIL;
esp_ping_t *ep = NULL; esp_ping_t *ep = NULL;
PING_CHECK(config, "ping config can't be null", err, ESP_ERR_INVALID_ARG); PING_CHECK(config, "ping config can't be null", err, ESP_ERR_INVALID_ARG);
PING_CHECK(hdl_out, "ping handle can't be null", err, ESP_ERR_INVALID_ARG); PING_CHECK(hdl_out, "ping handle can't be null", err, ESP_ERR_INVALID_ARG);
@ -272,10 +272,12 @@ esp_err_t esp_ping_new_session(const esp_ping_config_t *config, const esp_ping_c
if(config->interface) { if(config->interface) {
struct ifreq iface; struct ifreq iface;
if(netif_index_to_name(config->interface, iface.ifr_name) == NULL) { if(netif_index_to_name(config->interface, iface.ifr_name) == NULL) {
goto err; ESP_LOGE(TAG, "fail to find interface name with netif index %d", config->interface);
goto err;
} }
if(setsockopt(ep->sock, SOL_SOCKET, SO_BINDTODEVICE, &iface, sizeof(iface) !=0)) { if(setsockopt(ep->sock, SOL_SOCKET, SO_BINDTODEVICE, &iface, sizeof(iface) !=0)) {
goto err; ESP_LOGE(TAG, "fail to setsockopt SO_BINDTODEVICE");
goto err;
} }
} }
struct timeval timeout; struct timeval timeout;