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

XEP-0198: Accept stream elements in pending state

Browse Source 
Due to timing issues, ejabberd_c2s might receive stream elements from
the client while the session is waiting for stream resumption.  Those
elements are now accepted.
This commit is contained in:
Holger Weiss 2014-05-05 00:02:55 +02:00
parent a0917a8e9b
commit 32abcbca6c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ejabberd_c2s.erl
View File

@ -1270,15 +1270,15 @@ session_established2(El, StateData) ->
[{xmlstreamelement, El}]), [{xmlstreamelement, El}]),
fsm_next_state(session_established, NewState). fsm_next_state(session_established, NewState).
wait_for_resume({xmlstreamelement, _El} = Event, StateData) ->
session_established(Event, StateData),
fsm_next_state(wait_for_resume, StateData);
wait_for_resume(timeout, StateData) -> wait_for_resume(timeout, StateData) ->
?DEBUG("Timed out waiting for resumption of stream for ~s", ?DEBUG("Timed out waiting for resumption of stream for ~s",
[jlib:jid_to_string(StateData#state.jid)]), [jlib:jid_to_string(StateData#state.jid)]),
{stop, normal, StateData}; {stop, normal, StateData};
wait_for_resume(closed, StateData) ->
?DEBUG("Ignoring 'closed' event while waiting for resumption", []),
fsm_next_state(wait_for_resume, StateData);
wait_for_resume(Event, StateData) -> wait_for_resume(Event, StateData) ->
?INFO_MSG("Ignoring event while waiting for resumption: ~p", [Event]), ?DEBUG("Ignoring event while waiting for resumption: ~p", [Event]),
fsm_next_state(wait_for_resume, StateData). fsm_next_state(wait_for_resume, StateData).
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
@ -1873,6 +1873,9 @@ send_header(StateData, Server, Version, Lang) ->
LangStr]), LangStr]),
send_text(StateData, iolist_to_binary(Header)). send_text(StateData, iolist_to_binary(Header)).
send_trailer(StateData)
when StateData#state.sm_state == pending ->
?DEBUG("Cannot send stream trailer while waiting for resumption", []);
send_trailer(StateData) send_trailer(StateData)
when StateData#state.xml_socket -> when StateData#state.xml_socket ->
(StateData#state.sockmod):send_xml(StateData#state.socket, (StateData#state.sockmod):send_xml(StateData#state.socket,
@ -2558,7 +2561,8 @@ stream_mgmt_enabled(#state{sm_state = disabled}) ->
stream_mgmt_enabled(_StateData) -> stream_mgmt_enabled(_StateData) ->
true. true.
dispatch_stream_mgmt(El, #state{sm_state = active} = StateData) -> dispatch_stream_mgmt(El, StateData) when StateData#state.sm_state == active;
StateData#state.sm_state == pending ->
perform_stream_mgmt(El, StateData); perform_stream_mgmt(El, StateData);
dispatch_stream_mgmt(El, StateData) -> dispatch_stream_mgmt(El, StateData) ->
negotiate_stream_mgmt(El, StateData). negotiate_stream_mgmt(El, StateData).