gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tfe_stream_addr_create_by_fd放到tfe_types.h供ssl_stream调用。

Browse Source
This commit is contained in:
zhengchao
2018-09-30 11:01:18 +08:00
parent 319ecfeabb
commit 966d36b526
4 changed files with 76 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/src/ssl_stream.cpp
View File

@@ -1275,8 +1275,12 @@ retry:
if (ctx->retries++ >= MAX_NET_RETRIES)
{
TFE_LOG_ERROR(logger, "Failed to shutdown SSL connection cleanly: "
"Max retries reached. Closing fd.\n");
struct tfe_stream_addr* addr=tfe_stream_addr_create_by_fd(fd);
char* addr_string=tfe_stream_addr_to_str(addr);
TFE_LOG_ERROR(logger, "Failed to shutdown SSL connection cleanly: %s"
"Max retries reached. Closing fd %d.", addr_string, fd);
tfe_stream_addr_free(addr);
free(addr_string);
goto complete;
}
@@ -1289,7 +1293,7 @@ retry:
else
{
TFE_LOG_ERROR(logger, "Failed to shutdown SSL connection cleanly: "
"Cannot create event. Closing fd.\n");
"Cannot create event. Closing fd %d.", fd);
}
return;
complete:

4
platform/src/tcp_stream.cpp
View File

@@ -890,10 +890,10 @@ int tfe_stream_init_by_fds(struct tfe_stream * stream, evutil_socket_t fd_downst
__stream_fd_option_setup(_stream, fd_downstream);
__stream_fd_option_setup(_stream, fd_upstream);
_stream->head.addr = __stream_addr_create_by_fds(stream, fd_downstream);
_stream->head.addr = tfe_stream_addr_create_by_fd(fd_downstream);
if (unlikely(_stream->head.addr == NULL))
{
TFE_LOG_ERROR(_stream->stream_logger, "Failed to fetch address for fd %d, %d, terminate fds.",
TFE_LOG_ERROR(_stream->stream_logger, "Failed to create address from fd %d, %d, terminate fds.",
fd_downstream, fd_upstream); goto __errout;
}