diff options
Diffstat (limited to 'src/ejabberd_s2s_out.erl')
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 3904c7fad..4a6d5cb67 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -24,7 +24,7 @@ %% xmpp_stream_out callbacks -export([tls_options/1, tls_required/1, tls_verify/1, tls_enabled/1, - connect_timeout/1, address_families/1, default_port/1, + connect_options/3, connect_timeout/1, address_families/1, default_port/1, dns_retries/1, dns_timeout/1, handle_auth_success/2, handle_auth_failure/3, handle_packet/2, handle_stream_end/2, handle_stream_downgraded/2, @@ -187,6 +187,17 @@ tls_verify(#{server_host := ServerHost} = State) -> tls_enabled(#{server_host := ServerHost}) -> ejabberd_s2s:tls_enabled(ServerHost). +connect_options(Addr, Opts, #{server_host := ServerHost}) -> + Type = get_addr_type(Addr), + Bindaddr = case Type of + inet -> ejabberd_option:outgoing_s2s_ipv4_address(ServerHost); + inet6 -> ejabberd_option:outgoing_s2s_ipv6_address(ServerHost) + end, + case Bindaddr of + undefined -> Opts; + _ -> lists:append([Opts, [{ip, Bindaddr}]]) + end. + connect_timeout(#{server_host := ServerHost}) -> ejabberd_option:outgoing_s2s_timeout(ServerHost). @@ -318,6 +329,11 @@ code_change(_OldVsn, State, _Extra) -> %%%=================================================================== %%% Internal functions %%%=================================================================== + +-spec get_addr_type(inet:ip_address()) -> inet:address_family(). +get_addr_type({_, _, _, _}) -> inet; +get_addr_type({_, _, _, _, _, _, _, _}) -> inet6. + -spec resend_queue(state()) -> state(). resend_queue(State) -> queue_fold( |