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

fix(listener): pass along the listener name 

The rigid `start_listener/3` does not allow to pass the original
`listener()` map forward, which contains the listener name needed for
OCSP SNI function to later find its required information.  To avoid
changing the arity of this exported function, we stuff the listener
name temporarily along with the esockd options...
This commit is contained in:
Thales Macedo Garitezi 2022-11-08 15:18:47 -03:00
parent cd053a28d4
commit 2e5e6af677
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/emqx_listeners.erl
View File

@ -41,7 +41,8 @@
, format_listen_on/1 , format_listen_on/1
]). ]).
-type(listener() :: #{ name := binary() -type(listener_name() :: binary()).
-type(listener() :: #{ name := listener_name()
, proto := esockd:proto() , proto := esockd:proto()
, listen_on := esockd:listen_on() , listen_on := esockd:listen_on()
, opts := [esockd:option()] , opts := [esockd:option()]
@ -105,10 +106,10 @@ ensure_all_started([L | Rest], Results) ->
format_listen_on(ListenOn) -> format(ListenOn). format_listen_on(ListenOn) -> format(ListenOn).
-spec(start_listener(listener()) -> ok). -spec(start_listener(listener()) -> ok).
start_listener(Listener = #{proto := Proto, name := Name, listen_on := ListenOn}) -> start_listener(#{proto := Proto, name := Name, listen_on := ListenOn, opts := Opts0}) ->
ID = identifier(Proto, Name), ID = identifier(Proto, Name),
Options = emqx_ocsp_cache:inject_sni_fun(Listener), Opts = [{listener_name, Name} | Opts0],
case start_listener(Proto, ListenOn, Options) of case start_listener(Proto, ListenOn, Opts) of
{ok, _} -> {ok, _} ->
console_print("Start ~s listener on ~s successfully.~n", [ID, format(ListenOn)]); console_print("Start ~s listener on ~s successfully.~n", [ID, format(ListenOn)]);
{error, Reason} -> {error, Reason} ->
@ -125,13 +126,22 @@ console_print(_Fmt, _Args) -> ok.
-endif. -endif.
%% Start MQTT/TCP listener %% Start MQTT/TCP listener
-spec(start_listener(esockd:proto(), esockd:listen_on(), [esockd:option()]) -spec(start_listener(esockd:proto(), esockd:listen_on(), [ esockd:option()
| {listener_name, listener_name()}])
-> {ok, pid()} | {error, term()}). -> {ok, pid()} | {error, term()}).
start_listener(tcp, ListenOn, Options) -> start_listener(tcp, ListenOn, Options) ->
start_mqtt_listener('mqtt:tcp', ListenOn, Options); start_mqtt_listener('mqtt:tcp', ListenOn, Options);
%% Start MQTT/TLS listener %% Start MQTT/TLS listener
start_listener(Proto, ListenOn, Options) when Proto == ssl; Proto == tls -> start_listener(Proto, ListenOn, Options0) when Proto == ssl; Proto == tls ->
Name = proplists:get_value(listener_name, Options0, <<"mqtt:ssl:external">>),
Options1 = proplists:delete(listener_name, Options0),
Listener = #{ name => Name
, proto => Proto
, listen_on => ListenOn
, opts => Options1
},
Options = emqx_ocsp_cache:inject_sni_fun(Listener),
start_mqtt_listener('mqtt:ssl', ListenOn, Options); start_mqtt_listener('mqtt:ssl', ListenOn, Options);
%% Start MQTT/WS listener %% Start MQTT/WS listener