diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-16 11:00:26 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-02-16 11:10:24 +0300 |
| commit | 8b2d3084986defd6045a0c02706415e0e7ae4b3f (patch) | |
| tree | 419b64fc2d07646d221fdfa2f526e057fb34c6d2 /src/mod_admin_extra.erl | |
| parent | Merge branch 'master' of github.com:processone/ejabberd (diff) | |
Change routing API
Now 'From' and 'To' arguments must be omitted in functions
and structures related to routing.
The commit deprecates the following functions:
ejabberd_router:route/3 in favor of ejabberd_router:route/1
ejabberd_router:route_error/4 in favor of ejabberd_router:route_error/2
ejabberd_local:route_iq/4 in favor of ejabberd_local:route_iq/2
ejabberd_local:route_iq/5 in favor of ejabberd_local:route_iq/3
The format of {route, From, To, Packet} is changed in favor of {route, Packet}
Diffstat (limited to 'src/mod_admin_extra.erl')
| -rw-r--r-- | src/mod_admin_extra.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index 9139f1e47..c9b87c177 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -1037,7 +1037,7 @@ set_presence(User, Host, Resource, Type, Show, Status, Priority0) -> show = jlib:binary_to_atom(Show), status = xmpp:mk_text(Status), priority = Priority}, - Pid ! {route, From, To, Presence}, + Pid ! {route, Presence}, ok end. @@ -1312,7 +1312,8 @@ push_roster_item(LU, LS, R, U, S, Action) -> ejabberd_sm:route(LJID, BroadcastEl), Item = build_roster_item(U, S, Action), ResIQ = build_iq_roster_push(Item), - ejabberd_router:route(jid:remove_resource(LJID), LJID, ResIQ). + ejabberd_router:route( + xmpp:set_from_to(ResIQ, jid:remove_resource(LJID), LJID)). build_roster_item(U, S, {add, Nick, Subs, Group}) -> Groups = binary:split(Group,<<";">>, [global]), @@ -1448,7 +1449,7 @@ send_message(Type, From, To, Subject, Body) -> FromJID = jid:from_string(From), ToJID = jid:from_string(To), Packet = build_packet(Type, Subject, Body), - ejabberd_router:route(FromJID, ToJID, Packet). + ejabberd_router:route(xmpp:set_from_to(Packet, FromJID, ToJID)). build_packet(Type, Subject, Body) -> #message{type = jlib:binary_to_atom(Type), @@ -1461,7 +1462,7 @@ send_stanza(FromString, ToString, Stanza) -> #jid{} = From = jid:from_string(FromString), #jid{} = To = jid:to_string(ToString), Pkt = xmpp:decode(El, ?NS_CLIENT, [ignore_els]), - ejabberd_router:route(From, To, Pkt) + ejabberd_router:route(xmpp:set_from_to(Pkt, From, To)) catch _:{xmpp_codec, Why} -> io:format("incorrect stanza: ~s~n", [xmpp:format_error(Why)]), {error, Why}; |