diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2020-11-04 13:12:06 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2020-11-04 13:12:06 +0100 |
| commit | 23a18b1a6088709d74d71cd637a6e9b58325fe30 (patch) | |
| tree | d8786f40e5b46976dbb31baf2e64e31e567faf97 /src/ejabberd_s2s_out.erl | |
| parent | Merge remote-tracking branch 'processone/pr/3396' (diff) | |
Apply cosmetic changes to outgoing s2s IP options
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 4a6d5cb67..ae298b51c 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -188,14 +188,17 @@ 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}]]) + BindAddr = case get_addr_type(Addr) of + inet -> + ejabberd_option:outgoing_s2s_ipv4_address(ServerHost); + inet6 -> + ejabberd_option:outgoing_s2s_ipv6_address(ServerHost) + end, + case BindAddr of + undefined -> + Opts; + _ -> + [{ip, BindAddr} | Opts] end. connect_timeout(#{server_host := ServerHost}) -> @@ -329,7 +332,6 @@ 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. |