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_vcard.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 '')
| -rw-r--r-- | src/mod_vcard.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index 72dc4a2b9..0e97f81ae 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -131,8 +131,8 @@ handle_cast(Cast, State) -> ?WARNING_MSG("unexpected cast: ~p", [Cast]), {noreply, State}. -handle_info({route, From, To, Packet}, State) -> - case catch do_route(From, To, Packet) of +handle_info({route, Packet}, State) -> + case catch do_route(Packet) of {'EXIT', Reason} -> ?ERROR_MSG("~p", [Reason]); _ -> ok end, @@ -160,11 +160,9 @@ terminate(_Reason, #state{host = MyHost, server_host = Host}) -> code_change(_OldVsn, State, _Extra) -> {ok, State}. -do_route(From, To, #xmlel{name = <<"iq">>} = El) -> - ejabberd_router:process_iq(From, To, El); -do_route(From, To, #iq{} = IQ) -> - ejabberd_router:process_iq(From, To, IQ); -do_route(_, _, _) -> +do_route(#iq{} = IQ) -> + ejabberd_router:process_iq(IQ); +do_route(_) -> ok. -spec get_sm_features({error, stanza_error()} | empty | {result, [binary()]}, |