yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(exproto): fix peername for udp socket

This commit is contained in:
JianBo He 2021-07-21 16:08:13 +08:00
parent fbaf2646f9
commit b1d190fd3b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/emqx_exproto/src/emqx_exproto_conn.erl
View File

@ -38,7 +38,7 @@
]). ]).
%% Callback %% Callback
-export([init/3]). -export([init/4]).
%% Sys callbacks %% Sys callbacks
-export([ system_continue/3 -export([ system_continue/3
@ -100,14 +100,14 @@
]}). ]}).
%% udp %% udp
start_link(Socket = {udp, _SockPid, _Sock}, _Peername, Options) -> start_link(Socket = {udp, _SockPid, _Sock}, Peername, Options) ->
Args = [self(), Socket, Options], Args = [self(), Socket, Peername, Options],
{ok, proc_lib:spawn_link(?MODULE, init, Args)}; {ok, proc_lib:spawn_link(?MODULE, init, Args)};
%% tcp/ssl/dtls %% tcp/ssl/dtls
start_link(esockd_transport, Sock, Options) -> start_link(esockd_transport, Sock, Options) ->
Socket = {esockd_transport, Sock}, Socket = {esockd_transport, Sock},
Args = [self(), Socket, Options], Args = [self(), Socket, undefined, Options],
{ok, proc_lib:spawn_link(?MODULE, init, Args)}. {ok, proc_lib:spawn_link(?MODULE, init, Args)}.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
@ -167,6 +167,12 @@ stop(Pid) ->
%% Wrapped funcs %% Wrapped funcs
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
esockd_peername({udp, _SockPid, _Sock}, Peername) ->
Peername;
esockd_peername({esockd_transport, Sock}, _Peername) ->
{ok, Peername} = esockd_transport:ensure_ok_or_exit(peername, [Sock]),
Peername.
esockd_wait(Socket = {udp, _SockPid, _Sock}) -> esockd_wait(Socket = {udp, _SockPid, _Sock}) ->
{ok, Socket}; {ok, Socket};
esockd_wait({esockd_transport, Sock}) -> esockd_wait({esockd_transport, Sock}) ->
@ -223,10 +229,10 @@ send(Data, #state{socket = {esockd_transport, Sock}}) ->
-define(DEFAULT_IDLE_TIMEOUT, 30000). -define(DEFAULT_IDLE_TIMEOUT, 30000).
-define(DEFAULT_OOM_POLICY, #{max_heap_size => 4194304,message_queue_len => 32000}). -define(DEFAULT_OOM_POLICY, #{max_heap_size => 4194304,message_queue_len => 32000}).
init(Parent, WrappedSock, Options) -> init(Parent, WrappedSock, Peername0, Options) ->
case esockd_wait(WrappedSock) of case esockd_wait(WrappedSock) of
{ok, NWrappedSock} -> {ok, NWrappedSock} ->
{ok, Peername} = esockd_ensure_ok_or_exit(peername, NWrappedSock), Peername = esockd_peername(NWrappedSock, Peername0),
run_loop(Parent, init_state(NWrappedSock, Peername, Options)); run_loop(Parent, init_state(NWrappedSock, Peername, Options));
{error, Reason} -> {error, Reason} ->
ok = esockd_close(WrappedSock), ok = esockd_close(WrappedSock),