Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-20 22:22:09 +02:00
Code Releases Activity

Merge pull request #206 from weiss/xep-0198

Browse Source 
XEP-0198: Terminate session if stanza queue becomes too large
This commit is contained in:
Evgeny Khramtsov 2014-05-28 13:18:12 +04:00
commit 7d54fdea51
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/guide.tex
View File

@ -983,10 +983,10 @@ This is a detailed description of each option allowed by the listening modules:
\titem{max\_ack\_queue: Size}
This option specifies the maximum number of unacknowledged stanzas
queued for possible retransmission if \term{stream\_management} is
enabled. When the limit is reached, the first stanza is dropped from
the queue before adding the next one. This option can be specified
for \term{ejabberd\_c2s} listeners. The allowed values are positive
integers and \term{infinity}. Default value: \term{500}.
enabled. When the limit is exceeded, the client session is
terminated. This option can be specified for \term{ejabberd\_c2s}
listeners. The allowed values are positive integers and
\term{infinity}. Default value: \term{500}.
\titem{max\_fsm\_queue: Size}
This option specifies the maximum number of elements in the queue of the FSM
(Finite State Machine).

27
src/ejabberd_c2s.erl
View File

@ -1284,6 +1284,10 @@ wait_for_resume(Event, StateData) ->
%% {next_state, NextStateName, NextStateData, Timeout} |
%% {stop, Reason, NewStateData}
%%----------------------------------------------------------------------
handle_event({abort, Xmlelement}, _StateName, StateData) ->
send_element(StateData, Xmlelement),
send_trailer(StateData),
{stop, normal, StateData};
handle_event(_Event, StateName, StateData) ->
fsm_next_state(StateName, StateData).
@ -2779,27 +2783,30 @@ mgmt_queue_add(StateData, El) ->
Num ->
Num + 1
end,
NewState = limit_queue_length(StateData),
NewQueue = queue:in({NewNum, El}, NewState#state.mgmt_queue),
NewState#state{mgmt_queue = NewQueue, mgmt_stanzas_out = NewNum}.
NewQueue = queue:in({NewNum, El}, StateData#state.mgmt_queue),
NewState = StateData#state{mgmt_queue = NewQueue,
mgmt_stanzas_out = NewNum},
check_queue_length(NewState).
mgmt_queue_drop(StateData, NumHandled) ->
NewQueue = jlib:queue_drop_while(fun({N, _Stanza}) -> N =< NumHandled end,
StateData#state.mgmt_queue),
StateData#state{mgmt_queue = NewQueue}.
limit_queue_length(#state{mgmt_max_queue = Limit} = StateData)
check_queue_length(#state{mgmt_max_queue = Limit} = StateData)
when Limit == infinity;
Limit == unlimited ->
StateData;
limit_queue_length(#state{jid = JID,
mgmt_queue = Queue,
check_queue_length(#state{mgmt_queue = Queue,
mgmt_max_queue = Limit} = StateData) ->
case queue:len(Queue) >= Limit of
case queue:len(Queue) > Limit of
true ->
?WARNING_MSG("Dropping stanza from too long ACK queue for ~s",
[jlib:jid_to_string(JID)]),
limit_queue_length(StateData#state{mgmt_queue = queue:drop(Queue)});
?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">>),
(?GEN_FSM):send_all_state_event(self(), {abort, Err}),
StateData#state{mgmt_resend = false}; % Don't resend the flood!
false ->
StateData
end.