Merge branch 'bugfix/ping_sock_0_valid' into 'master'

lw-ip: Fix ping socket create to allow for fd=0 See merge request espressif/esp-idf!15644
Merge branch 'docs/blink_update_supported_targets_on_readme' into 'master'
2025-03-09 09:09:10 -04:00 · 2021-10-26 14:27:45 +00:00 · 2021-10-26 13:14:01 +00:00 · 2021-10-26 08:19:26 +02:00 · 2021-10-22 10:44:56 +01:00
3 changed files with 7 additions and 16 deletions
--- a/components/lwip/apps/ping/ping_sock.c
+++ b/components/lwip/apps/ping/ping_sock.c
@ -1,16 +1,8 @@
-// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */

 #include <stdlib.h>
 #include <stdbool.h>
@ -267,7 +259,7 @@ esp_err_t esp_ping_new_session(const esp_ping_config_t *config, const esp_ping_c
        ep->sock = socket(AF_INET6, SOCK_RAW, IP6_NEXTH_ICMP6);
    }
 #endif
-    PING_CHECK(ep->sock > 0, "create socket failed: %d", err, ESP_FAIL, ep->sock);
+    PING_CHECK(ep->sock >= 0, "create socket failed: %d", err, ESP_FAIL, ep->sock);
    /* set if index */
    if(config->interface) {
        struct ifreq iface;
--- a/examples/get-started/blink/README.md
+++ b/examples/get-started/blink/README.md
@ -23,7 +23,7 @@ Some development boards use an addressable LED instead of a regular one. These d
 | ESP32-C3-DevKitM-1   | Addressable          | GPIO8                |
 | ESP32-S2-DevKitM-1   | Addressable          | GPIO18               |
 | ESP32-S2-Saola-1     | Addressable          | GPIO18               |
-| ESP32-S3-Addax-1     | Addressable          | GPIO48               |
+| ESP32-S3-DevKitC-1   | Addressable          | GPIO48               |

 See [Development Boards](https://www.espressif.com/en/products/devkits) for more information about it.

--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@ -1677,7 +1677,6 @@ components/log/log_linux.c
 components/lwip/apps/dhcpserver/dhcpserver.c
 components/lwip/apps/ping/esp_ping.c
 components/lwip/apps/ping/ping.c
-components/lwip/apps/ping/ping_sock.c
 components/lwip/apps/sntp/sntp.c
 components/lwip/include/apps/dhcpserver/dhcpserver.h
 components/lwip/include/apps/dhcpserver/dhcpserver_options.h
Author	SHA1	Message	Date
David Čermák	bcbef9a8db	Merge branch 'bugfix/ping_sock_0_valid' into 'master' lw-ip: Fix ping socket create to allow for fd=0 See merge request espressif/esp-idf!15644	2021-10-26 14:27:45 +00:00
Ivan Grokhotkov	b549523152	Merge branch 'docs/blink_update_supported_targets_on_readme' into 'master' example: Update on the README file to change from ESP32-S3-Addax-1 to ESP32-S3-DevKitC-1 See merge request espressif/esp-idf!15604	2021-10-26 13:14:01 +00:00
David Cermak	7b91343ca7	lwip: Fix ping socket create to allow for fd=0 0 is a valid socket description, so should be accepted after we create a socket. In IDF, though, it's just a theoretical issue, as customers have to configure: * FD_SETSIZE = CONFIG_LWIP_MAX_SOCKETS (from makefiles) * CONFIG_VFS_SUPPORT_IO = n (from menuconfig) (this configuration is currently broken, but if we adjust the IDF here and there we could reproduce the issue)	2021-10-26 08:19:26 +02:00
pedro.minatel	7a07f29d4f	example: Update on the README file to change from ESP32-S3-Addax-1 to ESP32-S3-DevKitC-1	2021-10-22 10:44:56 +01:00