Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Adopt code that uses parse_listener_portip after result change

This commit is contained in:
Paweł Chmielowski 2018-07-11 14:07:24 +02:00
parent f40f3a9da7
commit 48be8e7b1e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ejabberd_listener.erl
View File

@ -350,7 +350,7 @@ stop_listener({_, _, Transport} = PortIP, Module) ->
end. end.
add_listener(PortIP, Module, Opts) -> add_listener(PortIP, Module, Opts) ->
{Port, IPT, _, _, Proto, _} = parse_listener_portip(PortIP, Opts), {Port, IPT, _, Proto, _} = parse_listener_portip(PortIP, Opts),
PortIP1 = {Port, IPT, Proto}, PortIP1 = {Port, IPT, Proto},
case start_listener(PortIP1, Module, Opts) of case start_listener(PortIP1, Module, Opts) of
{ok, _Pid} -> {ok, _Pid} ->
@ -373,7 +373,7 @@ delete_listener(PortIP, Module) ->
%% Module = atom() %% Module = atom()
%% Opts = [term()] %% Opts = [term()]
delete_listener(PortIP, Module, Opts) -> delete_listener(PortIP, Module, Opts) ->
{Port, IPT, _, _, Proto, _} = parse_listener_portip(PortIP, Opts), {Port, IPT, _, Proto, _} = parse_listener_portip(PortIP, Opts),
PortIP1 = {Port, IPT, Proto}, PortIP1 = {Port, IPT, Proto},
stop_listener(PortIP1, Module). stop_listener(PortIP1, Module).

3
src/ejabberd_web_admin.erl
View File

@ -2242,8 +2242,9 @@ make_netprot_html(NetProt) ->
[<<"tcp">>, <<"udp">>]))). [<<"tcp">>, <<"udp">>]))).
get_port_data(PortIP, Opts) -> get_port_data(PortIP, Opts) ->
{Port, IPT, IPS, _IPV, NetProt, OptsClean} = {Port, IPT, _IPV, NetProt, OptsClean} =
ejabberd_listener:parse_listener_portip(PortIP, Opts), ejabberd_listener:parse_listener_portip(PortIP, Opts),
IPS = misc:ip_to_list(IPT),
SPort = integer_to_binary(Port), SPort = integer_to_binary(Port),
SSPort = list_to_binary( SSPort = list_to_binary(
lists:map(fun (N) -> lists:map(fun (N) ->