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

Merge branch 'contrib/github_pr_8337' into 'master'

Browse Source 
Set success when closing socket (GitHub PR)

Closes IDFGH-6709

See merge request espressif/esp-idf!17022
This commit is contained in:
Mahavir Jain 2022-02-08 04:41:26 +00:00
commit 79d95455de
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/tcp_transport/transport_ssl.c
View File

@ -1,16 +1,8 @@
// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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.
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -287,7 +279,7 @@ static int base_close(esp_transport_handle_t t)
ssl->ssl_initialized = false; ssl->ssl_initialized = false;
ssl->sockfd = INVALID_SOCKET; ssl->sockfd = INVALID_SOCKET;
} else if (ssl && ssl->sockfd >= 0) { } else if (ssl && ssl->sockfd >= 0) {
close(ssl->sockfd); ret = close(ssl->sockfd);
ssl->sockfd = INVALID_SOCKET; ssl->sockfd = INVALID_SOCKET;
} }
return ret; return ret;

1
tools/ci/check_copyright_ignore.txt
View File

@ -1936,7 +1936,6 @@ components/tcp_transport/test/tcp_transport_fixtures.h
components/tcp_transport/test/test_transport_basic.c components/tcp_transport/test/test_transport_basic.c
components/tcp_transport/test/test_transport_connect.c components/tcp_transport/test/test_transport_connect.c
components/tcp_transport/test/test_transport_fixtures.c components/tcp_transport/test/test_transport_fixtures.c
components/tcp_transport/transport_ssl.c
components/tcp_transport/transport_utils.c components/tcp_transport/transport_utils.c
components/tcpip_adapter/include/tcpip_adapter.h components/tcpip_adapter/include/tcpip_adapter.h
components/tcpip_adapter/include/tcpip_adapter_compatible/tcpip_adapter_compat.h components/tcpip_adapter/include/tcpip_adapter_compatible/tcpip_adapter_compat.h