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

Carbons: Handle unavailable resource like bare JID

Browse Source 
As the session manager handles messages sent to unavailable resources
just like messages sent to bare JIDs, mod_carboncopy must do that, too.
That is, forward them only to those carbon-copy-enabled resources that
don't have a top priority, in order to avoid duplicates.
This commit is contained in:
Holger Weiss 2014-04-08 23:32:30 +02:00
parent 9d5426315f
commit b3b12effbc
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mod_carboncopy.erl
View File

@ -181,12 +181,21 @@ remove_connection(User, Server, Resource, _Status)->
%% Direction = received | sent <received xmlns='urn:xmpp:carbons:1'/> %% Direction = received | sent <received xmlns='urn:xmpp:carbons:1'/>
send_copies(JID, To, Packet, Direction)-> send_copies(JID, To, Packet, Direction)->
{U, S, R} = jlib:jid_tolower(JID), {U, S, R} = jlib:jid_tolower(JID),
PrioRes = ejabberd_sm:get_user_present_resources(U, S),
IsBareTo = case {Direction, To} of
{received, #jid{lresource = <<>>}} -> true;
{received, #jid{lresource = LRes}} ->
%% unavailable resources are handled like bare JIDs
case lists:keyfind(LRes, 2, PrioRes) of
false -> true;
_ -> false
end;
_ -> false
end,
%% list of JIDs that should receive a carbon copy of this message (excluding the %% list of JIDs that should receive a carbon copy of this message (excluding the
%% receiver(s) of the original message %% receiver(s) of the original message
TargetJIDs = case {Direction, To} of TargetJIDs = if IsBareTo ->
{received, #jid{resource = <<>>}} ->
PrioRes = ejabberd_sm:get_user_present_resources(U, S),
MaxPrio = case catch lists:max(PrioRes) of MaxPrio = case catch lists:max(PrioRes) of
{Prio, _Res} -> Prio; {Prio, _Res} -> Prio;
_ -> 0 _ -> 0
@ -194,7 +203,7 @@ send_copies(JID, To, Packet, Direction)->
OrigTo = fun(Res) -> lists:member({MaxPrio, Res}, PrioRes) end, OrigTo = fun(Res) -> lists:member({MaxPrio, Res}, PrioRes) end,
[ {jlib:make_jid({U, S, CCRes}), CC_Version} [ {jlib:make_jid({U, S, CCRes}), CC_Version}
|| {CCRes, CC_Version} <- list(U, S), not OrigTo(CCRes) ]; || {CCRes, CC_Version} <- list(U, S), not OrigTo(CCRes) ];
_ -> true ->
[ {jlib:make_jid({U, S, CCRes}), CC_Version} [ {jlib:make_jid({U, S, CCRes}), CC_Version}
|| {CCRes, CC_Version} <- list(U, S), CCRes /= R ] || {CCRes, CC_Version} <- list(U, S), CCRes /= R ]
%TargetJIDs = lists:delete(JID, [ jlib:make_jid({U, S, CCRes}) || CCRes <- list(U, S) ]), %TargetJIDs = lists:delete(JID, [ jlib:make_jid({U, S, CCRes}) || CCRes <- list(U, S) ]),