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_caps.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_caps.erl')
| -rw-r--r-- | src/mod_caps.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mod_caps.erl b/src/mod_caps.erl index 85c301f6c..e23b66895 100644 --- a/src/mod_caps.erl +++ b/src/mod_caps.erl @@ -316,6 +316,8 @@ feature_request(Host, From, Caps, end, if NeedRequest -> IQ = #iq{type = get, + from = jid:make(Host), + to = From, sub_els = [#disco_info{node = <<Node/binary, "#", SubNode/binary>>}]}, cache_tab:insert(caps_features, NodePair, now_ts(), @@ -324,9 +326,7 @@ feature_request(Host, From, Caps, feature_response(IQReply, Host, From, Caps, SubNodes) end, - ejabberd_local:route_iq(jid:make(<<"">>, Host, - <<"">>), - From, IQ, F); + ejabberd_local:route_iq(IQ, F); true -> feature_request(Host, From, Caps, Tail) end end; |