diff --git a/mix.exs b/mix.exs index f3a0d0ec3..7134ac7a8 100644 --- a/mix.exs +++ b/mix.exs @@ -93,7 +93,7 @@ defmodule Ejabberd.Mixfile do {:stringprep, "~> 1.0"}, {:fast_yaml, "~> 1.0"}, {:fast_tls, "~> 1.1"}, - {:stun, "~> 1.0.34"}, + {:stun, "~> 1.0.41", override: true}, {:esip, "~> 1.0.32"}, {:p1_mysql, "~> 1.0"}, {:mqtree, "~> 1.0"}, diff --git a/mix.lock b/mix.lock index d4cd809ce..5551163f5 100644 --- a/mix.lock +++ b/mix.lock @@ -32,7 +32,7 @@ "pkix": {:hex, :pkix, "1.0.7", "a0b8c9011edeba702d7cb73fecef1eabe3ae89b3dcf4b8f33775e4f17a7a1304", [:rebar3], [], "hexpm", "104a9e0ecd9cc0e579d148a028189a6efe6420b241f3d319d8a65d898a078295"}, "sqlite3": {:hex, :sqlite3, "1.1.9", "10090161893843c9839d884855cafbb33c8ee3a2d6597443d66e6f94144dfd79", [:rebar3], [], "hexpm", "148ef74ee796efc13ffc6bb0e7f5feeb050f425e7335ff02c7415ca86819c0d0"}, "stringprep": {:hex, :stringprep, "1.0.24", "5a2c29785cdc1eaddcba0564cd86020e5e686fe9e66fa47a80a97333f3dc75ea", [:rebar3], [{:p1_utils, "1.0.21", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "aed7ac217493e5aa2f76066fb7bbfe0d4e94ca1ee72613dc954231422d911266"}, - "stun": {:hex, :stun, "1.0.40", "9cc25f667f4d36321a259521c3f4848a53bfebed989cf3d761790447daeec41d", [:rebar3], [{:fast_tls, "1.1.10", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.21", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "46073f5a05a5d6ca9de1339be990600648228c204b9a690f1b5f5dfd5a895b6a"}, + "stun": {:hex, :stun, "1.0.41", "d3d0a98a64d7d0840e467c88453b89dbf0b95746aab09363baa8559b307a1af8", [:rebar3], [{:fast_tls, "1.1.10", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.21", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "19196e4c1f36894ee495b5076c97c996cb5beaf8115108d475c95f2021b8447e"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm", "1d1848c40487cdb0b30e8ed975e34e025860c02e419cb615d255849f3427439d"}, "xmpp": {:hex, :xmpp, "1.5.1", "8e316aa75325c9e75351d1ab009c752775ff821834daaed3e6de5f862204173b", [:rebar3], [{:ezlib, "1.0.9", [hex: :ezlib, repo: "hexpm", optional: false]}, {:fast_tls, "1.1.10", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:fast_xml, "1.1.45", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.21", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "1.0.24", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm", "300f7627bd990d208ce5bf24e1ef15616780d1766778a70422910cc3fdfe138d"}, "yconf": {:hex, :yconf, "1.0.9", "32e922e47c3b18b1fa6f7502bfb433d3419e038123982fe7e478f3eb5d9aff0c", [:rebar3], [{:fast_yaml, "1.0.29", [hex: :fast_yaml, repo: "hexpm", optional: false]}], "hexpm", "97ab7b889f92f65447ed2db485324aba382447fa4ce8b57e466ab994da5f6233"}, diff --git a/rebar.config b/rebar.config index 875168349..d75e264fb 100644 --- a/rebar.config +++ b/rebar.config @@ -58,7 +58,7 @@ {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", {tag, "1.1.9"}}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.24"}}}, {if_var_true, stun, - {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.40"}}}}, + {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.41"}}}}, {xmpp, ".*", {git, "https://github.com/processone/xmpp", "04db675de509829a34d45d0f1ab30e92dda3ef0a"}}, {yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.9"}}} ]}. diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl index 415ab1048..f6d1e89a4 100644 --- a/src/ejabberd_stun.erl +++ b/src/ejabberd_stun.erl @@ -203,7 +203,7 @@ listen_options() -> {turn_max_port, 65535}, {turn_max_allocations, 10}, {turn_max_permissions, 10}, - {turn_blacklist, [<<"2001::/32">>, <<"2002::/16">>]}, % Teredo, 6to4. + {turn_blacklist, []}, {server_name, <<"ejabberd">>}]. -spec init_logger() -> ok.