From c878c73395f0ac779d741c2facee85b9b6b8e5c4 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 20 Jul 2021 11:04:00 +0800 Subject: [PATCH] fix(exproto): fix bad socket type * fix(exproto): fix bad socket type * chore(exproto): update appup.src --- apps/emqx_exproto/src/emqx_exproto.app.src | 2 +- apps/emqx_exproto/src/emqx_exproto.appup.src | 15 +++++++++++++++ apps/emqx_exproto/src/emqx_exproto_conn.erl | 8 +++++++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 apps/emqx_exproto/src/emqx_exproto.appup.src diff --git a/apps/emqx_exproto/src/emqx_exproto.app.src b/apps/emqx_exproto/src/emqx_exproto.app.src index 52ce96a54..b450bf16f 100644 --- a/apps/emqx_exproto/src/emqx_exproto.app.src +++ b/apps/emqx_exproto/src/emqx_exproto.app.src @@ -1,6 +1,6 @@ {application, emqx_exproto, [{description, "EMQ X Extension for Protocol"}, - {vsn, "4.3.0"}, %% strict semver + {vsn, "4.3.1"}, %% strict semver {modules, []}, {registered, []}, {mod, {emqx_exproto_app, []}}, diff --git a/apps/emqx_exproto/src/emqx_exproto.appup.src b/apps/emqx_exproto/src/emqx_exproto.appup.src new file mode 100644 index 000000000..6634cbc53 --- /dev/null +++ b/apps/emqx_exproto/src/emqx_exproto.appup.src @@ -0,0 +1,15 @@ +%% -*-: erlang -*- +{VSN, + [ + {"4.3.0", [ + {load_module, emqx_exproto_conn, brutal_purge, soft_purge, []} + ]}, + {<<".*">>, []} + ], + [ + {"4.3.0", [ + {load_module, emqx_exproto_conn, brutal_purge, soft_purge, []} + ]}, + {<<".*">>, []} + ] +}. diff --git a/apps/emqx_exproto/src/emqx_exproto_conn.erl b/apps/emqx_exproto/src/emqx_exproto_conn.erl index da655bcb4..15bf3ee2e 100644 --- a/apps/emqx_exproto/src/emqx_exproto_conn.erl +++ b/apps/emqx_exproto/src/emqx_exproto_conn.erl @@ -17,6 +17,7 @@ %% TCP/TLS/UDP/DTLS Connection -module(emqx_exproto_conn). +-include_lib("esockd/include/esockd.hrl"). -include_lib("emqx/include/types.hrl"). -include_lib("emqx/include/logger.hrl"). @@ -195,7 +196,12 @@ esockd_ensure_ok_or_exit(Fun, {esockd_transport, Socket}) -> esockd_type({udp, _, _}) -> udp; esockd_type({esockd_transport, Socket}) -> - esockd_transport:type(Socket). + case esockd_transport:type(Socket) of + proxy -> + esockd_transport:type(Socket#proxy_socket.socket); + Type -> + Type + end. esockd_setopts({udp, _, _}, _) -> ok;