Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Fix ping IQ reply/timeout processing ("mod_ping" regression since 17.x that may cause resources leakage)

Browse Source
This commit is contained in:
Frank Diebolt 2019-01-29 18:13:28 +01:00
parent 23e5b3756c
commit dd57950103
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mod_ping.erl
View File

@ -122,10 +122,19 @@ handle_cast({start_ping, JID}, State) ->
handle_cast({stop_ping, JID}, State) -> handle_cast({stop_ping, JID}, State) ->
Timers = del_timer(JID, State#state.timers), Timers = del_timer(JID, State#state.timers),
{noreply, State#state{timers = Timers}}; {noreply, State#state{timers = Timers}};
handle_cast({iq_reply, timeout, JID}, State) -> handle_cast(Msg, State) ->
?WARNING_MSG("unexpected cast: ~p", [Msg]),
{noreply, State}.
handle_info({iq_reply, #iq{type = error}, JID}, State) ->
handle_info({iq_reply, timeout, JID}, State);
handle_info({iq_reply, #iq{}, _JID}, State) ->
{noreply, State};
handle_info({iq_reply, timeout, JID}, State) ->
Timers = del_timer(JID, State#state.timers),
ejabberd_hooks:run(user_ping_timeout, State#state.host, ejabberd_hooks:run(user_ping_timeout, State#state.host,
[JID]), [JID]),
Timers = case State#state.timeout_action of case State#state.timeout_action of
kill -> kill ->
#jid{user = User, server = Server, #jid{user = User, server = Server,
resource = Resource} = resource = Resource} =
@ -134,18 +143,10 @@ handle_cast({iq_reply, timeout, JID}, State) ->
of of
Pid when is_pid(Pid) -> ejabberd_c2s:close(Pid, ping_timeout); Pid when is_pid(Pid) -> ejabberd_c2s:close(Pid, ping_timeout);
_ -> ok _ -> ok
end, end;
del_timer(JID, State#state.timers); _ -> ok
_ ->
State#state.timers
end, end,
{noreply, State#state{timers = Timers}}; {noreply, State#state{timers = Timers}};
handle_cast({iq_reply, #iq{}, _JID}, State) ->
{noreply, State};
handle_cast(Msg, State) ->
?WARNING_MSG("unexpected cast: ~p", [Msg]),
{noreply, State}.
handle_info({timeout, _TRef, {ping, JID}}, State) -> handle_info({timeout, _TRef, {ping, JID}}, State) ->
Host = State#state.host, Host = State#state.host,
From = jid:remove_resource(JID), From = jid:remove_resource(JID),