diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-23 19:37:54 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-23 19:37:54 +0300 |
| commit | c2cbb4d87955ff4917581fedc93cbcd4edd1ce8a (patch) | |
| tree | a32481848d0487d67b68f3ea02388dc2c5358261 /src/ejabberd_s2s_out.erl | |
| parent | Avoid code duplication in gen_mod (diff) | |
Use correct virtual host for s2s options
Diffstat (limited to 'src/ejabberd_s2s_out.erl')
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 7d71cb38b..6f950841a 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -177,32 +177,32 @@ process_downgraded(State, _StreamStart) -> %%%=================================================================== %%% xmpp_stream_out callbacks %%%=================================================================== -tls_options(#{server := LServer}) -> - ejabberd_s2s:tls_options(LServer, []). +tls_options(#{server_host := ServerHost}) -> + ejabberd_s2s:tls_options(ServerHost, []). -tls_required(#{server := LServer}) -> - ejabberd_s2s:tls_required(LServer). +tls_required(#{server_host := ServerHost}) -> + ejabberd_s2s:tls_required(ServerHost). -tls_verify(#{server := LServer} = State) -> - ejabberd_hooks:run_fold(s2s_out_tls_verify, LServer, true, [State]). +tls_verify(#{server_host := ServerHost} = State) -> + ejabberd_hooks:run_fold(s2s_out_tls_verify, ServerHost, true, [State]). -tls_enabled(#{server := LServer}) -> - ejabberd_s2s:tls_enabled(LServer). +tls_enabled(#{server_host := ServerHost}) -> + ejabberd_s2s:tls_enabled(ServerHost). -connect_timeout(#{server := LServer}) -> - ejabberd_option:outgoing_s2s_timeout(LServer). +connect_timeout(#{server_host := ServerHost}) -> + ejabberd_option:outgoing_s2s_timeout(ServerHost). -default_port(#{server := LServer}) -> - ejabberd_option:outgoing_s2s_port(LServer). +default_port(#{server_host := ServerHost}) -> + ejabberd_option:outgoing_s2s_port(ServerHost). -address_families(#{server := LServer}) -> - ejabberd_option:outgoing_s2s_families(LServer). +address_families(#{server_host := ServerHost}) -> + ejabberd_option:outgoing_s2s_families(ServerHost). -dns_retries(#{server := LServer}) -> - ejabberd_option:s2s_dns_retries(LServer). +dns_retries(#{server_host := ServerHost}) -> + ejabberd_option:s2s_dns_retries(ServerHost). -dns_timeout(#{server := LServer}) -> - ejabberd_option:s2s_dns_timeout(LServer). +dns_timeout(#{server_host := ServerHost}) -> + ejabberd_option:s2s_dns_timeout(ServerHost). handle_auth_success(Mech, #{socket := Socket, ip := IP, remote_server := RServer, @@ -258,7 +258,7 @@ handle_timeout(#{on_route := Action, lang := Lang} = State) -> init([#{server := LServer, remote_server := RServer} = State, Opts]) -> ServerHost = ejabberd_router:host_of_route(LServer), - QueueType = ejabberd_s2s:queue_type(LServer), + QueueType = ejabberd_s2s:queue_type(ServerHost), QueueLimit = case lists:keyfind( max_queue, 1, ejabberd_config:fsm_limit_opts([])) of {_, N} -> N; @@ -373,8 +373,8 @@ get_delay() -> p1_rand:uniform(MaxDelay). -spec set_idle_timeout(state()) -> state(). -set_idle_timeout(#{on_route := send, server := LServer} = State) -> - Timeout = ejabberd_s2s:get_idle_timeout(LServer), +set_idle_timeout(#{on_route := send, server_host := ServerHost} = State) -> + Timeout = ejabberd_s2s:get_idle_timeout(ServerHost), xmpp_stream_out:set_timeout(State, Timeout); set_idle_timeout(State) -> State. |