From 2ffa82a3973f37e59e9552188003712872575efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Wed, 2 Feb 2022 14:36:01 +0100 Subject: [PATCH 1/2] Set success when closing socket Closes https://github.com/espressif/esp-idf/pull/8337 Closes IDFGH-6709 --- components/tcp_transport/transport_ssl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/tcp_transport/transport_ssl.c b/components/tcp_transport/transport_ssl.c index 988995ce56..6a665735b0 100644 --- a/components/tcp_transport/transport_ssl.c +++ b/components/tcp_transport/transport_ssl.c @@ -289,6 +289,7 @@ static int base_close(esp_transport_handle_t t) } else if (ssl && ssl->sockfd >= 0) { close(ssl->sockfd); ssl->sockfd = INVALID_SOCKET; + ret = 0; } return ret; } From e97b034b3efd407ae1e8da44436aa4e6166e22ad Mon Sep 17 00:00:00 2001 From: Mahavir Jain Date: Thu, 3 Feb 2022 18:15:11 +0530 Subject: [PATCH 2/2] transport_ssl: use return value from `close` for non-TLS case Also fix copyright header for this file --- components/tcp_transport/transport_ssl.c | 21 ++++++--------------- tools/ci/check_copyright_ignore.txt | 1 - 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/components/tcp_transport/transport_ssl.c b/components/tcp_transport/transport_ssl.c index 6a665735b0..8a8b2905bb 100644 --- a/components/tcp_transport/transport_ssl.c +++ b/components/tcp_transport/transport_ssl.c @@ -1,16 +1,8 @@ -// Copyright 2015-2018 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: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include @@ -287,9 +279,8 @@ static int base_close(esp_transport_handle_t t) ssl->ssl_initialized = false; ssl->sockfd = INVALID_SOCKET; } else if (ssl && ssl->sockfd >= 0) { - close(ssl->sockfd); + ret = close(ssl->sockfd); ssl->sockfd = INVALID_SOCKET; - ret = 0; } return ret; } diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 2ce8efe849..536d9960ff 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1950,7 +1950,6 @@ components/tcp_transport/test/tcp_transport_fixtures.h components/tcp_transport/test/test_transport_basic.c components/tcp_transport/test/test_transport_connect.c components/tcp_transport/test/test_transport_fixtures.c -components/tcp_transport/transport_ssl.c components/tcp_transport/transport_utils.c components/tcpip_adapter/include/tcpip_adapter.h components/tcpip_adapter/include/tcpip_adapter_compatible/tcpip_adapter_compat.h