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 'bugfix/fix_tcp_transport_exeception' into 'master'

Browse Source 
tcp_transport: fix tcp trasnport exception

See merge request espressif/esp-idf!16793
This commit is contained in:
David Čermák 2022-01-20 06:48:07 +00:00
commit d7d22ef0fd
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.c
View File

@ -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 <stdlib.h>
@ -310,7 +302,7 @@ esp_err_t esp_transport_set_parent_transport_func(esp_transport_handle_t t, payl
esp_tls_error_handle_t esp_transport_get_error_handle(esp_transport_handle_t t)
{
if (t) {
if (t && t->base && t->base->error_handle) {
return &t->base->error_handle->esp_tls_err_h_base;
}
return NULL;

1
tools/ci/check_copyright_ignore.txt
View File

@ -2041,7 +2041,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.c
components/tcp_transport/transport_ssl.c
components/tcp_transport/transport_utils.c
components/tcpip_adapter/include/tcpip_adapter.h