diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-10-17 01:35:30 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-10-17 01:35:30 +0200 |
| commit | 0c24e18b5e98767c03ba13b5edaaf2a88665c81a (patch) | |
| tree | 5f6d38a98a0ae0ff437ac56f7b0d9d5f4febd646 /src | |
| parent | Merge pull request #317 from weiss/xep-0198 (diff) | |
XEP-0198: Abort immediately on queue overflow
Terminate the ejabberd_c2s process immediately once stanza queue
overflow is detected. This makes sure the FSM won't process additional
stanzas before terminating if the recipient is flooded.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_c2s.erl | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index ad00e89bd..4c5f677c3 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -2454,6 +2454,15 @@ fsm_next_state_gc(StateName, PackedStateData) -> %% fsm_next_state: Generate the next_state FSM tuple with different %% timeout, depending on the future state +fsm_next_state(session_established, #state{mgmt_max_queue = exceeded} = + StateData) -> + ?WARNING_MSG("ACK queue too long, terminating session for ~s", + [jlib:jid_to_string(StateData#state.jid)]), + Err = ?SERRT_POLICY_VIOLATION(StateData#state.lang, + <<"Too many unacked stanzas">>), + send_element(StateData, Err), + send_trailer(StateData), + {stop, normal, StateData#state{mgmt_resend = false}}; fsm_next_state(session_established, #state{mgmt_state = pending} = StateData) -> fsm_next_state(wait_for_resume, StateData); fsm_next_state(session_established, StateData) -> @@ -2815,18 +2824,15 @@ mgmt_queue_drop(StateData, NumHandled) -> StateData#state.mgmt_queue), StateData#state{mgmt_queue = NewQueue}. -check_queue_length(#state{mgmt_max_queue = infinity} = StateData) -> +check_queue_length(#state{mgmt_max_queue = Limit} = StateData) + when Limit == infinity; + Limit == exceeded -> StateData; check_queue_length(#state{mgmt_queue = Queue, mgmt_max_queue = Limit} = StateData) -> case queue:len(Queue) > Limit of true -> - ?WARNING_MSG("ACK queue too long, terminating session for ~s", - [jlib:jid_to_string(StateData#state.jid)]), - Lang = StateData#state.lang, - Err = ?SERRT_POLICY_VIOLATION(Lang, <<"Too many unacked stanzas">>), - self() ! {kick, queue_overflow, Err}, - StateData#state{mgmt_resend = false}; % Don't resend the flood! + StateData#state{mgmt_max_queue = exceeded}; false -> StateData end. |