Move to new dependencies for SIP and STUN

diff --git a/mix.exs b/mix.exs
index 668773333ca344af993e4b825b2d97a5844ab833..1052e4c28190751fc3562f7d42b69e8f4dadf5b9 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -45,8 +45,8 @@ defmodule Ejabberd.Mixfile do
      {:fast_yaml, "~> 1.0"},
      {:p1_tls, git: "https://github.com/processone/tls", tag: "1.0.0"},
      {:p1_xml, git: "https://github.com/processone/xml", tag: "1.1.2"},
-     {:p1_stun, git: "https://github.com/processone/stun", tag: "0.9.1"},
-     {:esip, git: "https://github.com/processone/p1_sip", tag: "1.0.1"},
+     {:stun, "~> 1.0"},
+     {:esip, "~> 1.0"},
      {:jiffy, "~> 0.14.7"},
      {:p1_oauth2, "~> 0.6.1"},
      {:p1_xmlrpc, "~> 1.15"},

diff --git a/rebar.config b/rebar.config
index 0d413d249066ee77cc75c844ca974d048e946dea..ef89077f59bb8bfb73dc83aeff8c388892959950 100644 (file)
--- a/rebar.config
+++ b/rebar.config
@@ -13,8 +13,8 @@
         {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.2"}}},
         {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.2"}}},
-        {p1_stun, ".*", {git, "https://github.com/processone/stun", {tag, "0.9.1"}}},
-        {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.1"}},
+        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.0"}}},
+        {esip, ".*", {git, "https://github.com/processone/esip", "1.0.1"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.2"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2.git", {tag, "0.6.1"}}},

diff --git a/src/ejabberd_stun.erl b/src/ejabberd_stun.erl
index f7ae19cd416c6aee307f014fe3845a91174d17d2..3c91117d12ccf3201a3c575863e6b736c7c69420 100644 (file)
--- a/src/ejabberd_stun.erl
+++ b/src/ejabberd_stun.erl
@@ -38,11 +38,11 @@
 %%% API
 %%%===================================================================
 tcp_init(Socket, Opts) ->
-    ejabberd:start_app(p1_stun),
+    ejabberd:start_app(stun),
     stun:tcp_init(Socket, prepare_turn_opts(Opts)).
 
 udp_init(Socket, Opts) ->
-    ejabberd:start_app(p1_stun),
+    ejabberd:start_app(stun),
     stun:udp_init(Socket, prepare_turn_opts(Opts)).
 
 udp_recv(Socket, Addr, Port, Packet, Opts) ->