From cf6f540d5371b8b9c349ddcc5daeaff7cb778972 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Mon, 25 Jun 2018 15:28:02 +0300 Subject: [PATCH] Don't pass sockmod to xmpp_stream_out --- src/ejabberd_s2s_out.erl | 4 ++-- src/xmpp_stream_out.erl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 765c00d65..2aa71fb12 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -60,12 +60,12 @@ start(From, To, Opts) -> Res -> Res end; _ -> - xmpp_stream_out:start(?MODULE, [xmpp_socket, From, To, Opts], + xmpp_stream_out:start(?MODULE, [From, To, Opts], ejabberd_config:fsm_limit_opts([])) end. start_link(From, To, Opts) -> - xmpp_stream_out:start_link(?MODULE, [xmpp_socket, From, To, Opts], + xmpp_stream_out:start_link(?MODULE, [From, To, Opts], ejabberd_config:fsm_limit_opts([])). -spec connect(pid()) -> ok. diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl index d0360d0c8..5856fa58a 100644 --- a/src/xmpp_stream_out.erl +++ b/src/xmpp_stream_out.erl @@ -253,7 +253,7 @@ format_error(Err) -> %%% gen_server callbacks %%%=================================================================== -spec init(list()) -> {ok, state(), timeout()} | {stop, term()} | ignore. -init([Mod, _SockMod, From, To, Opts]) -> +init([Mod, From, To, Opts]) -> Time = p1_time_compat:monotonic_time(milli_seconds), State = #{owner => self(), mod => Mod,