diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-05-27 23:27:16 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-05-27 23:27:16 +0400 |
| commit | f9c5e349fb8df77c4fecb53156e1c8750b4d8063 (patch) | |
| tree | 8c005833ec0b43d95166d8ac84fbafa2dfe401ac /src | |
| parent | Merge pull request #220 from weiss/handle-send-failure (diff) | |
| parent | Let ejabberd_c2s always use fsm_next_state/2 (diff) | |
Merge pull request #225 from weiss/use-fsm-next-state
Let ejabberd_c2s always use fsm_next_state/2
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 5 |
1 files 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, |