aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2020-05-19 20:22:58 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2020-05-19 20:22:58 +0200
commit858bfb4b8080aa75389f2dbf6a14b6a4ee189deb (patch)
tree6eaf5391ba283325e0c3fbd66fc7c5eeafbc2351
parentFix hardcoded URL to register.css and URLS to sections (#3281) (diff)
Let ejabberd_stun listen on IPv6 sockets
The stun application now allows IPv6 clients to perform STUN requests and to allocate TURN relays.
-rw-r--r--ejabberd.yml.example1
-rw-r--r--mix.exs2
-rw-r--r--rebar.config2
-rw-r--r--src/ejabberd_stun.erl2
4 files changed, 4 insertions, 3 deletions
diff --git a/ejabberd.yml.example b/ejabberd.yml.example
index 139b5710a..ba1a5a77b 100644
--- a/ejabberd.yml.example
+++ b/ejabberd.yml.example
@@ -59,6 +59,7 @@ listen:
/.well-known/acme-challenge: ejabberd_acme
-
port: 3478
+ ip: "::"
transport: udp
module: ejabberd_stun
use_turn: true
diff --git a/mix.exs b/mix.exs
index 0c3173886..8cb2c097d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -90,7 +90,7 @@ defmodule Ejabberd.Mixfile do
{:stringprep, "~> 1.0"},
{:fast_yaml, "~> 1.0"},
{:fast_tls, "~> 1.1"},
- {:stun, "~> 1.0"},
+ {:stun, git: "https://github.com/processone/stun", ref: "cb6549387e23737f39f44ba7656a351fd7b88c14", override: true},
{:esip, "~> 1.0.32"},
{:p1_mysql, "~> 1.0"},
{:mqtree, "~> 1.0"},
diff --git a/rebar.config b/rebar.config
index c1d3d9e6c..214ccc192 100644
--- a/rebar.config
+++ b/rebar.config
@@ -36,7 +36,7 @@
{mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.7"}}},
{p1_acme, ".*", {git, "https://github.com/processone/p1_acme.git", {tag, "1.0.5"}}},
{base64url, ".*", {git, "https://github.com/dvv/base64url.git", {tag, "v1.0"}}},
- {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.32"}}}},
+ {if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", "cb6549387e23737f39f44ba7656a351fd7b88c14"}}},
{if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.33"}}}},
{if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
{tag, "1.0.15"}}}},
diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl
index 92552cc8a..459697255 100644
--- a/src/ejabberd_stun.erl
+++ b/src/ejabberd_stun.erl
@@ -160,7 +160,7 @@ set_certfile(Opts) ->
listen_opt_type(use_turn) ->
econf:bool();
listen_opt_type(ip) ->
- econf:ipv4();
+ econf:ip();
listen_opt_type(turn_ip) ->
econf:ipv4();
listen_opt_type(auth_type) ->