mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_smacks: Fix to use current method of counting acked stanzas

Browse source 
Fixes #1757

These places seem to have been left since e62025f949f9

The logic around expected_h in should_ack() misbehaved, always comparing
with 0 + unacked instead of acked + unacked.
This commit is contained in:
Kim Alvefur 2022-05-26 17:38:55 +02:00
parent d545540ae0
commit 8027b67f19
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/mod_smacks.lua
View file

@ -143,7 +143,7 @@ local function should_ack(session, force)
if session.awaiting_ack then return end -- already waiting
if force then return force end
local queue = session.outgoing_stanza_queue;
local expected_h = session.last_acknowledged_stanza + queue:count_unacked();
local expected_h = queue:count_acked() + queue:count_unacked();
local max_unacked = max_unacked_stanzas;
if session.state == "inactive" then
max_unacked = max_inactive_unacked_stanzas;
@ -161,7 +161,7 @@ local function request_ack(session, reason)
if session.destroyed then return end -- sending something can trigger destruction
session.awaiting_ack = true;
-- expected_h could be lower than this expression e.g. more stanzas added to the queue meanwhile)
session.last_requested_h = session.last_acknowledged_stanza + queue:count_unacked();
session.last_requested_h = queue:count_acked() + queue:count_unacked();
session.log("debug", "Sending <r> (inside timer, after send) from %s - #queue=%d", reason, queue:count_unacked());
if not session.delayed_ack_timer then
session.delayed_ack_timer = timer.add_task(delayed_ack_timeout, function()
@ -223,7 +223,6 @@ end
local function wrap_session_out(session, resume)
if not resume then
session.outgoing_stanza_queue = smqueue.new(queue_size);
session.last_acknowledged_stanza = 0;
end
add_filter(session, "stanzas/out", outgoing_stanza_filter, -999);