24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00

Merge pull request #225 from weiss/use-fsm-next-state

Let ejabberd_c2s always use fsm_next_state/2
This commit is contained in:
Evgeny Khramtsov 2014-05-27 23:27:16 +04:00
commit f9c5e349fb

View File

@ -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,