Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity

fixes race condition in wait_caps/note_caps (EJAB-1054)

Browse Source 
SVN Revision: 2632
This commit is contained in:
Evgeniy Khramtsov 2009-09-25 11:47:21 +00:00
parent a126a1883e
commit 6fa0f68239
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod_caps.erl
View File

@ -147,15 +147,8 @@ get_user_resources(LUser, LServer) ->
%% information. Host is the host that asks, From is the full JID that %% information. Host is the host that asks, From is the full JID that
%% sent the caps packet, and Caps is what read_caps returned. %% sent the caps packet, and Caps is what read_caps returned.
note_caps(Host, From, Caps) -> note_caps(Host, From, Caps) ->
case Caps of Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
nothing -> gen_server:cast(Proc, {note_caps, From, Caps}).
BJID = jid_to_binary(From),
catch mnesia:dirty_delete({user_caps, BJID}),
ok;
_ ->
Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
gen_server:cast(Proc, {note_caps, From, Caps})
end.
%% wait_caps should be called just before note_caps %% wait_caps should be called just before note_caps
%% it allows to lock get_caps usage for code using presence_probe %% it allows to lock get_caps usage for code using presence_probe
@ -318,6 +311,10 @@ handle_call({get_features, Caps}, From, State) ->
handle_call(stop, _From, State) -> handle_call(stop, _From, State) ->
{stop, normal, ok, State}. {stop, normal, ok, State}.
handle_cast({note_caps, From, nothing}, State) ->
BJID = jid_to_binary(From),
catch mnesia:dirty_delete({user_caps, BJID}),
{noreply, State};
handle_cast({note_caps, From, handle_cast({note_caps, From,
#caps{node = Node, version = Version, exts = Exts} = Caps}, #caps{node = Node, version = Version, exts = Exts} = Caps},
#state{host = Host, disco_requests = Requests} = State) -> #state{host = Host, disco_requests = Requests} = State) ->