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

improve waiting caps clean (EJAB-1054)

Browse Source 
SVN Revision: 2629
This commit is contained in:
Christophe Romain 2009-09-24 19:52:46 +00:00
parent b168cd7cf2
commit 2f5211ab74
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod_caps.erl
View File

@ -142,6 +142,8 @@ get_user_resources(U, S) ->
note_caps(Host, From, Caps) -> note_caps(Host, From, Caps) ->
case Caps of case Caps of
nothing -> nothing ->
BJID = exmpp_jid:to_binary(From),
catch mnesia:dirty_delete({user_caps, BJID}),
ok; ok;
_ -> _ ->
Proc = gen_mod:get_module_proc(Host, ?PROCNAME), Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
@ -352,9 +354,8 @@ handle_cast({note_caps, From,
Stanza = exmpp_iq:get(?NS_JABBER_CLIENT, Query, ID), Stanza = exmpp_iq:get(?NS_JABBER_CLIENT, Query, ID),
ejabberd_local:register_iq_response_handler ejabberd_local:register_iq_response_handler
(list_to_binary(Host), ID, ?MODULE, handle_disco_response), (list_to_binary(Host), ID, ?MODULE, handle_disco_response),
ejabberd_router:route(exmpp_jid:make(Host), ejabberd_router:route(exmpp_jid:make(Host), From, Stanza),
From, Stanza), timer:send_after(?CAPS_QUERY_TIMEOUT, self(), {disco_timeout, ID, BJID}),
timer:send_after(?CAPS_QUERY_TIMEOUT, self(), {disco_timeout, ID}),
?DICT:store(ID, node_to_binary(Node, SubNode), Dict) ?DICT:store(ID, node_to_binary(Node, SubNode), Dict)
end, Requests, Missing), end, Requests, Missing),
{noreply, State#state{disco_requests = NewRequests}} {noreply, State#state{disco_requests = NewRequests}}
@ -399,10 +400,11 @@ handle_cast({disco_response, From, _To, #iq{id = ID, type = Type, payload = Payl
end, end,
NewRequests = ?DICT:erase(ID, Requests), NewRequests = ?DICT:erase(ID, Requests),
{noreply, State#state{disco_requests = NewRequests}}; {noreply, State#state{disco_requests = NewRequests}};
handle_cast({disco_timeout, ID}, #state{host = Host, disco_requests = Requests} = State) -> handle_cast({disco_timeout, ID, BJID}, #state{host = Host, disco_requests = Requests} = State) ->
%% do not wait a response anymore for this IQ, client certainly will never answer %% do not wait a response anymore for this IQ, client certainly will never answer
NewRequests = case ?DICT:is_key(ID, Requests) of NewRequests = case ?DICT:is_key(ID, Requests) of
true -> true ->
catch mnesia:dirty_delete({user_caps, BJID}),
ejabberd_local:unregister_iq_response_handler(list_to_binary(Host), ID), ejabberd_local:unregister_iq_response_handler(list_to_binary(Host), ID),
?DICT:erase(ID, Requests); ?DICT:erase(ID, Requests);
false -> false ->