From ed0c89f8769eef6fa548dc9fc9c6316f7a7ad607 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Tue, 27 May 2014 21:07:53 +0200 Subject: [PATCH] Let ejabberd_c2s always use fsm_next_state/2 Make sure any logic implemented in ejabberd_c2s:fsm_next_state/2 is always applied. --- src/ejabberd_c2s.erl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 6aebefdd6..c0b40725a 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -763,8 +763,7 @@ wait_for_feature_request({xmlstreamelement, El}, children = [#xmlel{name = Error, attrs = [], children = []}]}), - {next_state, wait_for_feature_request, StateData, - ?C2S_OPEN_TIMEOUT}; + fsm_next_state(wait_for_feature_request, StateData); {error, Error} -> send_element(StateData, #xmlel{name = <<"failure">>, @@ -1692,7 +1691,7 @@ handle_info({force_update_presence, LUser}, StateName, StateData2; _ -> StateData end, - {next_state, StateName, NewStateData}; + fsm_next_state(StateName, NewStateData); handle_info({broadcast, Type, From, Packet}, StateName, StateData) -> Recipients = ejabberd_hooks:run_fold( c2s_broadcast_recipients, StateData#state.server, -- 2.40.0