From 8baa823231618e34e49b7a09aee22ec607e92aff Mon Sep 17 00:00:00 2001 From: luqiuwen Date: Thu, 12 Sep 2019 11:46:08 +0800 Subject: [PATCH] =?UTF-8?q?#166=20=E4=BF=AE=E6=AD=A3tcp=5Fstream=5Fdestroy?= =?UTF-8?q?=E5=91=BD=E4=B8=ADassert=E7=9A=84=E9=97=AE=E9=A2=98=20*=20?= =?UTF-8?q?=E5=8E=9F=E5=AE=9E=E7=8E=B0=E5=9C=A8TCP=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E4=B8=BAPASSTHROUGH=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=B8=85=E7=A9=BAdefer=5Fupstream?= =?UTF-8?q?=5Ffd=E5=92=8Cdefer=5Fdownstream=5Ffd=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E8=BF=9E=E6=8E=A5=E9=94=80=E6=AF=81=E6=97=B6=E5=91=BD?= =?UTF-8?q?=E4=B8=ADassert;=20*=20=E7=8E=B0=E4=BF=AE=E6=AD=A3=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E8=AE=BE=E7=BD=AE=E8=BF=9E=E6=8E=A5=E4=B8=BAPASSTHROU?= =?UTF-8?q?GH=E6=97=B6=EF=BC=8C=E6=B8=85=E7=A9=BAdefer=5Fupstream=5Ffd?= =?UTF-8?q?=E5=92=8Cdefer=5Fdownstream=5Ffd=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/tcp_stream.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/src/tcp_stream.cpp b/platform/src/tcp_stream.cpp index c2c1486..f031f1b 100644 --- a/platform/src/tcp_stream.cpp +++ b/platform/src/tcp_stream.cpp @@ -994,15 +994,17 @@ void ssl_downstream_create_on_fail(enum e_future_error err, const char * what, v void ssl_upstream_create_on_success(future_result_t * result, void * user) { struct tfe_stream_private * _stream = (struct tfe_stream_private *) user; - evutil_socket_t fd = -1; enum ssl_stream_action ssl_action = ssl_upstream_create_result_release_action(result); if (SSL_ACTION_PASSTHROUGH == ssl_action) { - _stream->tcp_passthough = 1; _stream->conn_upstream = __conn_private_create_by_fd(_stream, _stream->defer_fd_upstream); _stream->conn_downstream = __conn_private_create_by_fd(_stream, _stream->defer_fd_downstream); __conn_private_enable(_stream->conn_downstream); __conn_private_enable(_stream->conn_upstream); + + _stream->tcp_passthough = 1; + _stream->defer_fd_downstream = 0; + _stream->defer_fd_upstream = 0; } else if (SSL_ACTION_SHUTDOWN == ssl_action) {