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

XEP-0198: Handle timeouts during stream resumption

Browse Source 
If session resumption failed because requesting the #state from the old
c2s process took too long, the new c2s process will usually receive the
response.  Let the new process handle that case gracefully.
This commit is contained in:
Holger Weiss 2016-08-03 02:28:46 +02:00
parent 3c1e4f0dfd
commit 78fa9e08a5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ejabberd_c2s.erl
View File

@ -1318,7 +1318,7 @@ handle_sync_event({resume_session, Time}, _From, _StateName,
StateData#state.user, StateData#state.user,
StateData#state.server, StateData#state.server,
StateData#state.resource), StateData#state.resource),
{stop, normal, {ok, StateData}, StateData#state{mgmt_state = resumed}}; {stop, normal, {resume, StateData}, StateData#state{mgmt_state = resumed}};
handle_sync_event({resume_session, _Time}, _From, StateName, handle_sync_event({resume_session, _Time}, _From, StateName,
StateData) -> StateData) ->
{reply, {error, <<"Previous session not found">>}, StateName, StateData}; {reply, {error, <<"Previous session not found">>}, StateName, StateData};
@ -1745,6 +1745,13 @@ handle_info({broadcast, Type, From, Packet}, StateName, StateData) ->
fsm_next_state(StateName, StateData); fsm_next_state(StateName, StateData);
handle_info(dont_ask_offline, StateName, StateData) -> handle_info(dont_ask_offline, StateName, StateData) ->
fsm_next_state(StateName, StateData#state{ask_offline = false}); fsm_next_state(StateName, StateData#state{ask_offline = false});
handle_info({_Ref, {resume, OldStateData}}, StateName, StateData) ->
%% This happens if the resume_session/1 request timed out; the new session
%% now receives the late response.
?DEBUG("Received old session state for ~s after failed resumption",
[jid:to_string(OldStateData#state.jid)]),
handle_unacked_stanzas(OldStateData#state{mgmt_resend = false}),
fsm_next_state(StateName, StateData);
handle_info(Info, StateName, StateData) -> handle_info(Info, StateName, StateData) ->
?ERROR_MSG("Unexpected info: ~p", [Info]), ?ERROR_MSG("Unexpected info: ~p", [Info]),
fsm_next_state(StateName, StateData). fsm_next_state(StateName, StateData).
@ -3017,7 +3024,7 @@ inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) ->
OldPID -> OldPID ->
OldSID = {Time, OldPID}, OldSID = {Time, OldPID},
case catch resume_session(OldSID) of case catch resume_session(OldSID) of
{ok, OldStateData} -> {resume, OldStateData} ->
NewSID = {Time, self()}, % Old time, new PID NewSID = {Time, self()}, % Old time, new PID
Priority = case OldStateData#state.pres_last of Priority = case OldStateData#state.pres_last of
undefined -> undefined ->