From cd93796cce9f5e23af18aa521f1b3da6a0c0b0bb Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Thu, 29 Dec 2022 15:29:23 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E6=AD=A3decrypted=20traffic?= =?UTF-8?q?=20steering=20debug=20log=E8=BE=93=E5=87=BA=E7=9A=84BEV=5FEVENT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/tcp_stream.cpp | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/platform/src/tcp_stream.cpp b/platform/src/tcp_stream.cpp index 70cdb1a..15a22be 100644 --- a/platform/src/tcp_stream.cpp +++ b/platform/src/tcp_stream.cpp @@ -136,6 +136,27 @@ static void call_plugin_close(struct tfe_stream_private * _stream) } } +static const char *bev_event_to_string(short events) +{ + switch (events) + { + case BEV_EVENT_READING: + return "BEV_EVENT_READING"; + case BEV_EVENT_WRITING: + return "BEV_EVENT_WRITING"; + case BEV_EVENT_EOF: + return "BEV_EVENT_EOF"; + case BEV_EVENT_ERROR: + return "BEV_EVENT_ERROR"; + case BEV_EVENT_TIMEOUT: + return "BEV_EVENT_TIMEOUT"; + case BEV_EVENT_CONNECTED: + return "BEV_EVENT_CONNECTED"; + default: + return ""; + } +} + /* ==================================================================================================================== * INTERFACE * ===================================================================================================================*/ @@ -886,7 +907,7 @@ static void __stream_bev_eventcb(struct bufferevent * bev, short events, void * TFE_LOG_DEBUG(__STREAM_LOGGER(_stream), "decrypted traffic steering, %s %s run eventcb, %s %s", _stream->str_stream_addr, bev == _stream->conn_downstream->bev ? "conn_downstream" : "conn_upstream", - events & BEV_EVENT_ERROR ? "BEV_EVENT_ERROR" : "BEV_EVENT_EOF", + bev_event_to_string(events), errno == 0 ? "" : strerror(errno) ); tfe_stream_destory(_stream); @@ -1136,7 +1157,7 @@ static void __steering_stream_bev_eventcb(struct bufferevent *bev, short events, TFE_LOG_DEBUG(__STREAM_LOGGER(_stream), "decrypted traffic steering, %s %s run eventcb, %s %s", _stream->str_stream_addr, bev == _stream->conn_fake_c->bev ? "conn_fake_c" : "conn_fake_s", - events & BEV_EVENT_ERROR ? "BEV_EVENT_ERROR" : "BEV_EVENT_EOF", + bev_event_to_string(events), errno == 0 ? "" : strerror(errno) ); tfe_stream_destory(_stream);