Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

Fix shaper selection in ejabberd_c2s

Browse Source
This commit is contained in:
Evgeny Khramtsov 2019-06-22 10:19:17 +03:00
parent e9a78d0de7
commit 4f69325e3c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -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"}}},

4
src/ejabberd_c2s.erl
View File

@ -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,

2
src/ejabberd_s2s_in.erl
View File

@ -46,7 +46,7 @@
-include("xmpp.hrl").
-include("logger.hrl").
-type state() :: map().
-type state() :: xmpp_stream_in:state().
-export_type([state/0]).
%%%===================================================================

2
src/ejabberd_s2s_out.erl
View File

@ -44,7 +44,7 @@
-include("xmpp.hrl").
-include("logger.hrl").
-type state() :: map().
-type state() :: xmpp_stream_out:state().
-export_type([state/0]).
%%%===================================================================

2
src/ejabberd_service.erl
View File

@ -38,7 +38,7 @@
-include("xmpp.hrl").
-include("logger.hrl").
-type state() :: map().
-type state() :: xmpp_stream_in:state().
-export_type([state/0]).
%%%===================================================================