diff options
author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-04-01 16:53:28 +0300 |
---|---|---|
committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-04-01 16:53:28 +0300 |
commit | ed2abe471ab31ec0b1cf6a5a51322118ffa10472 (patch) | |
tree | 36b7e07370b2dcf6a72d174bbcb517ad37f40609 /src/ejabberd_s2s_in.erl | |
parent | Fix issue with creating HostMatch in mod_mam_sql (diff) |
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.
Diffstat (limited to 'src/ejabberd_s2s_in.erl')
-rw-r--r-- | src/ejabberd_s2s_in.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index db7655ef8..be2f85370 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -24,7 +24,7 @@ -behaviour(ejabberd_listener). %% ejabberd_listener callbacks --export([start/2, start_link/2, accept/1, listen_opt_type/1, listen_options/0]). +-export([start/3, start_link/3, accept/1, listen_opt_type/1, listen_options/0]). %% xmpp_stream_in callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -50,12 +50,12 @@ %%%=================================================================== %%% API %%%=================================================================== -start(SockData, Opts) -> - xmpp_stream_in:start(?MODULE, [SockData, Opts], +start(SockMod, Socket, Opts) -> + xmpp_stream_in:start(?MODULE, [{SockMod, Socket}, Opts], ejabberd_config:fsm_limit_opts(Opts)). -start_link(SockData, Opts) -> - xmpp_stream_in:start_link(?MODULE, [SockData, Opts], +start_link(SockMod, Socket, Opts) -> + xmpp_stream_in:start_link(?MODULE, [{SockMod, Socket}, Opts], ejabberd_config:fsm_limit_opts(Opts)). close(Ref) -> |