From ed2abe471ab31ec0b1cf6a5a51322118ffa10472 Mon Sep 17 00:00:00 2001 From: Evgeny Khramtsov Date: Mon, 1 Apr 2019 16:53:28 +0300 Subject: Rename listening callback from start/2 to start/3 This will prevent conflicts in callback names in mod_mqtt Old callback function is still supported. --- src/ejabberd_stun.erl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/ejabberd_stun.erl') diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl index 24f3e696b..159c576f4 100644 --- a/src/ejabberd_stun.erl +++ b/src/ejabberd_stun.erl @@ -30,7 +30,7 @@ -ifndef(STUN). -include("logger.hrl"). --export([accept/1, start/2, start_link/2, listen_options/0]). +-export([accept/1, start/3, start_link/3, listen_options/0]). fail() -> ?CRITICAL_MSG("Listening module ~s is not available: " "ejabberd is not compiled with STUN/TURN support", @@ -40,13 +40,13 @@ accept(_) -> fail(). listen_options() -> fail(). -start(_, _) -> +start(_, _, _) -> fail(). -start_link(_, _) -> +start_link(_, _, _) -> fail(). -else. --export([tcp_init/2, udp_init/2, udp_recv/5, start/2, - start_link/2, accept/1, listen_opt_type/1, listen_options/0]). +-export([tcp_init/2, udp_init/2, udp_recv/5, start/3, + start_link/3, accept/1, listen_opt_type/1, listen_options/0]). -include("logger.hrl"). @@ -64,11 +64,11 @@ udp_init(Socket, Opts) -> udp_recv(Socket, Addr, Port, Packet, Opts) -> stun:udp_recv(Socket, Addr, Port, Packet, Opts). -start(Opaque, Opts) -> - stun:start(Opaque, Opts). +start(SockMod, Socket, Opts) -> + stun:start({SockMod, Socket}, Opts). -start_link({gen_tcp, Sock}, Opts) -> - stun:start_link(Sock, Opts). +start_link(_SockMod, Socket, Opts) -> + stun:start_link(Socket, Opts). accept(_Pid) -> ok. -- cgit v1.2.3