diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-22 10:19:17 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-22 10:19:17 +0300 |
| commit | 4f69325e3c8f8ad842527d36385c3108436b94f3 (patch) | |
| tree | b4a91e914d7376c13c8cca46a04427a7d6d3bc90 | |
| parent | e9a78d0de71ce14b9f7146b2a9295315eedb23bc (diff) | |
Fix shaper selection in ejabberd_c2s
| -rw-r--r-- | rebar.config | 2 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 4 | ||||
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_service.erl | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/rebar.config b/rebar.config index 5fb25a029..7af805f6e 100644 --- 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 55f3111c0..820e9bbf7 100644 --- 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 8b56d440e..b7b8fa1bf 100644 --- 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 5b27f96c4..818d16a5f 100644 --- 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 2662d04d0..2710422a5 100644 --- 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]). %%%=================================================================== |