Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-12 21:52:07 +02:00
Code Releases Activity

Call ejabberd_router:route/3 instead of sending a message (EJAB-1114)

Browse Source 
SVN Revision: 2783
This commit is contained in:
Badlop 2009-12-04 16:32:20 +00:00
parent c3df4f3eb0
commit 182f4b008b
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_pubsub/mod_pubsub.erl
View File

@ -1552,7 +1552,7 @@ send_authorization_request(#pubsub_node{owners = Owners, nodeid = {Host, Node}},
[#xmlel{ns = ?NS_DATA_FORMS, name = 'value', children = [#xmlcdata{cdata = <<"false">>}]}]}]}]},
lists:foreach(fun(Owner) ->
{U, S, R} = Owner,
ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(U, S, R), Stanza}
ejabberd_router:route(service_jid(Host), exmpp_jid:make(U, S, R), Stanza)
end, Owners).
find_authorization_response(Packet) ->
@ -1597,7 +1597,7 @@ send_authorization_approval(Host, JID, SNode, Subscription) ->
[#xmlel{ns = ?NS_PUBSUB_EVENT, name = 'subscription', attrs =
[ ?XMLATTR('jid', exmpp_jid:to_binary(JID)) | nodeAttr(SNode)] ++ SubAttrs
}]),
ejabberd_router ! {route, service_jid(Host), JID, Stanza}.
ejabberd_router:route(service_jid(Host), JID, Stanza).
handle_authorization_response(Host, From, To, Packet, XFields) ->
case {lists:keysearch("pubsub#node", 1, XFields),
@ -2379,7 +2379,7 @@ send_items(Host, Node, NodeId, Type, LJID, last) ->
[#xmlel{ns = ?NS_PUBSUB_EVENT, name = 'items', attrs = nodeAttr(Node),
children = itemsEls(LastItem)}], ModifNow, ModifLjid),
{U, S, R} = LJID,
ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(U, S, R), Stanza}
ejabberd_router:route(service_jid(Host), exmpp_jid:make(U, S, R), Stanza)
end;
send_items(Host, Node, NodeId, Type, {LU, LS, LR} = LJID, Number) ->
ToSend = case node_action(Host, Type, get_items, [NodeId, LJID]) of
@ -2404,7 +2404,7 @@ send_items(Host, Node, NodeId, Type, {LU, LS, LR} = LJID, Number) ->
[#xmlel{ns = ?NS_PUBSUB_EVENT, name = 'items', attrs = nodeAttr(Node), children =
itemsEls(ToSend)}])
end,
ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(LU, LS, LR), Stanza}.
ejabberd_router:route(service_jid(Host), exmpp_jid:make(LU, LS, LR), Stanza).
%% @spec (Host, JID, Plugins) -> {error, Reason} | {result, Response}
%% Host = host()
@ -2818,7 +2818,7 @@ set_subscriptions(Host, Node, From, EntitiesEls) ->
name = 'subscription',
attrs = [?XMLATTR('jid', exmpp_jid:to_binary(JID)),
?XMLATTR('subsription', subscription_to_string(Sub)) | nodeAttr(Node)]}]}]},
ejabberd_router ! {route, service_jid(Host), JID, Stanza}
ejabberd_router:route(service_jid(Host), JID, Stanza)
end,
Action = fun(#pubsub_node{owners = Owners, type = Type, id = NodeId}) ->
case lists:member(Owner, Owners) of
@ -3173,7 +3173,7 @@ broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTyp
SHIMStanza = add_headers(Stanza, collection_shim(Node, Nodes)),
lists:foreach(fun(To) ->
{TU, TS, TR} = To,
ejabberd_router ! {route, From, exmpp_jid:make(TU, TS, TR), SHIMStanza}
ejabberd_router:route(From, exmpp_jid:make(TU, TS, TR), SHIMStanza)
end, LJIDs)
end, NodesByJID),
%% Handles implicit presence subscriptions
@ -3206,7 +3206,7 @@ broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTyp
end
end, [], user_resources(U, S)),
lists:foreach(fun(R) ->
ejabberd_router ! {route, Sender, exmpp_jid:make(U, S, R), Stanza}
ejabberd_router:route(Sender, exmpp_jid:make(U, S, R), Stanza)
end, Rs)
end)
end, Contacts);

14
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -1363,7 +1363,7 @@ send_authorization_request(#pubsub_node{nodeid = {Host, Node}, type = Type, id =
[#xmlel{ns = ?NS_DATA_FORMS, name = 'value', children = [#xmlcdata{cdata = <<"false">>}]}]}]}]},
lists:foreach(fun(Owner) ->
{U, S, R} = Owner,
ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(U, S, R), Stanza}
ejabberd_router:route(service_jid(Host), exmpp_jid:make(U, S, R), Stanza)
end, node_owners(Host, Type, NodeId)).
find_authorization_response(Packet) ->
@ -1408,7 +1408,7 @@ send_authorization_approval(Host, JID, SNode, Subscription) ->
[#xmlel{ns = ?NS_PUBSUB_EVENT, name = 'subscription', attrs =
[?XMLATTR('jid', exmpp_jid:to_binary(JID)) | nodeAttr(SNode)] ++ SubAttrs
}]),
ejabberd_router ! {route, service_jid(Host), JID, Stanza}.
ejabberd_router:route(service_jid(Host), JID, Stanza).
handle_authorization_response(Host, From, To, Packet, XFields) ->
case {lists:keysearch("pubsub#node", 1, XFields),
@ -2207,7 +2207,7 @@ send_items(Host, Node, NodeId, Type, LJID, last) ->
children = itemsEls(LastItem)}], ModifNow, ModifLjid)
end,
{U, S, R} = LJID,
ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(U, S, R), Stanza};
ejabberd_router:route(service_jid(Host), exmpp_jid:make(U, S, R), Stanza);
send_items(Host, Node, NodeId, Type, {LU, LS, LR} = LJID, Number) ->
ToSend = case node_action(Host, Type, get_items, [NodeId, LJID]) of
{result, []} ->
@ -2231,7 +2231,7 @@ send_items(Host, Node, NodeId, Type, {LU, LS, LR} = LJID, Number) ->
[#xmlel{ns = ?NS_PUBSUB_EVENT, name = 'items', attrs = nodeAttr(Node), children =
itemsEls(ToSend)}])
end,
ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(LU, LS, LR), Stanza}.
ejabberd_router:route(service_jid(Host), exmpp_jid:make(LU, LS, LR), Stanza).
%% @spec (Host, JID, Plugins) -> {error, Reason} | {result, Response}
%% Host = host()
@ -2628,7 +2628,7 @@ set_subscriptions(Host, Node, From, EntitiesEls) ->
name = 'subscription',
attrs = [?XMLATTR('jid', exmpp_jid:to_binary(JID)),
?XMLATTR('subsription', subscription_to_string(Sub)) | nodeAttr(Node)]}]}]},
ejabberd_router ! {route, service_jid(Host), JID, Stanza}
ejabberd_router:route(service_jid(Host), JID, Stanza)
end,
Action = fun(#pubsub_node{type = Type, id = NodeId}) ->
case lists:member(Owner, node_owners_call(Type, NodeId)) of
@ -2983,7 +2983,7 @@ broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTyp
SHIMStanza = add_headers(Stanza, collection_shim(Node, Nodes)),
lists:foreach(fun(To) ->
{TU, TS, TR} = To,
ejabberd_router ! {route, From, exmpp_jid:make(TU, TS, TR), SHIMStanza}
ejabberd_router:route(From, exmpp_jid:make(TU, TS, TR), SHIMStanza)
end, LJIDs)
end, NodesByJID),
%% Handles implicit presence subscriptions
@ -3016,7 +3016,7 @@ broadcast_stanza(Host, Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTyp
end
end, [], user_resources(U, S)),
lists:foreach(fun(R) ->
ejabberd_router ! {route, Sender, exmpp_jid:make(U, S, R), Stanza}
ejabberd_router:route(Sender, exmpp_jid:make(U, S, R), Stanza)
end, Rs)
end)
end, Contacts);

10
src/mod_pubsub/pubsub_odbc.patch
View File

@ -457,7 +457,7 @@
@@ -1553,7 +1364,7 @@
lists:foreach(fun(Owner) ->
{U, S, R} = Owner,
ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(U, S, R), Stanza}
ejabberd_router:route(service_jid(Host), exmpp_jid:make(U, S, R), Stanza)
- end, Owners).
+ end, node_owners(Host, Type, NodeId)).
@ -470,7 +470,7 @@
- [ ?XMLATTR('jid', exmpp_jid:to_binary(JID)) | nodeAttr(SNode)] ++ SubAttrs
+ [?XMLATTR('jid', exmpp_jid:to_binary(JID)) | nodeAttr(SNode)] ++ SubAttrs
}]),
ejabberd_router ! {route, service_jid(Host), JID, Stanza}.
ejabberd_router:route(service_jid(Host), JID, Stanza).
@@ -1606,14 +1417,14 @@
{{value, {_, [SNode]}}, {value, {_, [SSubscriber]}},
@ -594,12 +594,12 @@
[#xmlel{ns = ?NS_PUBSUB_EVENT, name = 'items', attrs = nodeAttr(Node),
- children = itemsEls(LastItem)}], ModifNow, ModifLjid),
- {U, S, R} = LJID,
- ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(U, S, R), Stanza}
- ejabberd_router:route(service_jid(Host), exmpp_jid:make(U, S, R), Stanza)
- end;
+ children = itemsEls(LastItem)}], ModifNow, ModifLjid)
+ end,
+ {U, S, R} = LJID,
+ ejabberd_router ! {route, service_jid(Host), exmpp_jid:make(U, S, R), Stanza};
+ ejabberd_router:route(service_jid(Host), exmpp_jid:make(U, S, R), Stanza);
send_items(Host, Node, NodeId, Type, {LU, LS, LR} = LJID, Number) ->
ToSend = case node_action(Host, Type, get_items, [NodeId, LJID]) of
{result, []} ->
@ -670,7 +670,7 @@
{result, _} ->
@@ -2820,8 +2630,8 @@
?XMLATTR('subsription', subscription_to_string(Sub)) | nodeAttr(Node)]}]}]},
ejabberd_router ! {route, service_jid(Host), JID, Stanza}
ejabberd_router:route(service_jid(Host), JID, Stanza)
end,
- Action = fun(#pubsub_node{owners = Owners, type = Type, id = NodeId}) ->
- case lists:member(Owner, Owners) of

2
src/mod_vcard.erl
View File

@ -316,7 +316,7 @@ do_route(ServerHost, From, To, Packet) ->
if
(User /= undefined) or (Resource /= undefined) ->
Err = exmpp_stanza:reply_with_error(Packet, 'service-unavailable'),
ejabberd_router ! {route, To, From, Err};
ejabberd_router:route(To, From, Err);
true ->
try
Request = exmpp_iq:get_request(Packet),