aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_option.erl
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2020-11-04 12:19:49 +0100
committerHolger Weiss <holger@zedat.fu-berlin.de>2020-11-04 12:19:49 +0100
commit0a88f9c8a98ff3061bffb68c1526b6efaf55c971 (patch)
treef9337d2b5ba8aac91cb382e3c29ba2b12d0d01c8 /src/ejabberd_option.erl
parentMake sure that jid used as base in mam xml_compress is bare (diff)
parentAdd outbound s2s out interface (ipv4/ipv6) (diff)
Merge remote-tracking branch 'processone/pr/3396'
* processone/pr/3396: Add outbound s2s out interface (ipv4/ipv6)
Diffstat (limited to 'src/ejabberd_option.erl')
-rw-r--r--src/ejabberd_option.erl16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/ejabberd_option.erl b/src/ejabberd_option.erl
index 907272761..fd056b761 100644
--- a/src/ejabberd_option.erl
+++ b/src/ejabberd_option.erl
@@ -90,6 +90,8 @@
-export([oom_killer/0]).
-export([oom_queue/0]).
-export([oom_watermark/0]).
+-export([outgoing_s2s_ipv4_address/0,outgoing_s2s_ipv4_address/1]).
+-export([outgoing_s2s_ipv6_address/0,outgoing_s2s_ipv6_address/1]).
-export([outgoing_s2s_families/0, outgoing_s2s_families/1]).
-export([outgoing_s2s_port/0, outgoing_s2s_port/1]).
-export([outgoing_s2s_timeout/0, outgoing_s2s_timeout/1]).
@@ -667,6 +669,20 @@ outgoing_s2s_families() ->
outgoing_s2s_families(Host) ->
ejabberd_config:get_option({outgoing_s2s_families, Host}).
+-spec outgoing_s2s_ipv4_address() -> inet:ip4_address().
+outgoing_s2s_ipv4_address() ->
+ outgoing_s2s_ipv4_address(global).
+-spec outgoing_s2s_ipv4_address(global | binary()) -> inet:ip4_address().
+outgoing_s2s_ipv4_address(Host) ->
+ ejabberd_config:get_option({outgoing_s2s_ipv4_address, Host}).
+
+-spec outgoing_s2s_ipv6_address() -> inet:ip6_address().
+outgoing_s2s_ipv6_address() ->
+ outgoing_s2s_ipv6_address(global).
+-spec outgoing_s2s_ipv6_address(global | binary()) -> inet:ip6_address().
+outgoing_s2s_ipv6_address(Host) ->
+ ejabberd_config:get_option({outgoing_s2s_ipv6_address, Host}).
+
-spec outgoing_s2s_port() -> 1..1114111.
outgoing_s2s_port() ->
outgoing_s2s_port(global).