Fix shaper selection in ejabberd_c2s

diff --git a/rebar.config b/rebar.config
index 5fb25a029c5ed2f49c2fd4517bed42348609739c..7af805f6e3e4f32ba2b0fc477caa9a2ee67a01de 100644 (file)
--- a/rebar.config
+++ b/rebar.config
@@ -24,7 +24,7 @@
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.1"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.16"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.36"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.3.4"}}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "8614cd2b9cacc1429d2b2451e15465bc4703ba11"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}},
        {yconf, ".*", {git, "https://github.com/processone/yconf", "f9c235faf828f52bb01881b172646960d5a8d523"}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 55f3111c0d918daed06542554f54178e7fa3ebf9..820e9bbf72dcac509faa29878268f73a62e77aa3 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -55,7 +55,7 @@
 
 -define(SETS, gb_sets).
 
--type state() :: map().
+-type state() :: xmpp_stream_in:state().
 -export_type([state/0]).
 
 %%%===================================================================
@@ -926,7 +926,7 @@ fix_from_to(Pkt, _State) ->
     Pkt.
 
 -spec change_shaper(state()) -> state().
-change_shaper(#{shaper := ShaperName, ip := IP, lserver := LServer,
+change_shaper(#{shaper := ShaperName, ip := {IP, _}, lserver := LServer,
                user := U, server := S, resource := R} = State) ->
     JID = jid:make(U, S, R),
     Shaper = ejabberd_shaper:match(LServer, ShaperName,

diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 8b56d440eeae05cf11745c5b72d7e62a8c1ee4c5..b7b8fa1bf6f33eb23896da54e4c5dac178269fc9 100644 (file)
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -46,7 +46,7 @@
 -include("xmpp.hrl").
 -include("logger.hrl").
 
--type state() :: map().
+-type state() :: xmpp_stream_in:state().
 -export_type([state/0]).
 
 %%%===================================================================

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 5b27f96c4386dd4189a9b3ecd943782c4be275d2..818d16a5f50a991f17b915c88fc1bf6be30ca34b 100644 (file)
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -44,7 +44,7 @@
 -include("xmpp.hrl").
 -include("logger.hrl").
 
--type state() :: map().
+-type state() :: xmpp_stream_out:state().
 -export_type([state/0]).
 
 %%%===================================================================

diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
index 2662d04d0753a8e152d8113eed261e33c0f82d2e..2710422a5d9d1fb70725b35803e3eb502f3b5bc2 100644 (file)
--- a/src/ejabberd_service.erl
+++ b/src/ejabberd_service.erl
@@ -38,7 +38,7 @@
 -include("xmpp.hrl").
 -include("logger.hrl").
 
--type state() :: map().
+-type state() :: xmpp_stream_in:state().
 -export_type([state/0]).
 
 %%%===================================================================