devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send less ACK requests

Browse Source 
Only send an `r` stanza after we've received the reply to the previous one.

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2023-10-03 17:22:37 +02:00
parent 53d8eb17b6
commit 13d0354176
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common.h
View File

@@ -181,6 +181,7 @@ struct _xmpp_sm_t {
int sm_support; int sm_support;
int sm_enabled; int sm_enabled;
int can_resume, resume, dont_request_resume; int can_resume, resume, dont_request_resume;
int r_sent;
uint32_t sm_handled_nr; uint32_t sm_handled_nr;
uint32_t sm_sent_nr; uint32_t sm_sent_nr;
xmpp_queue_t sm_queue; xmpp_queue_t sm_queue;

7
src/conn.c
View File

@@ -1314,7 +1314,7 @@ static void _reset_sm_state_for_reconnect(xmpp_conn_t *conn)
s->id = NULL; s->id = NULL;
} }
s->sm_enabled = s->sm_support = s->resume = 0; s->r_sent = s->sm_enabled = s->sm_support = s->resume = 0;
if (s->bind) { if (s->bind) {
xmpp_stanza_release(s->bind); xmpp_stanza_release(s->bind);
@@ -1751,6 +1751,7 @@ static void _conn_sm_handle_stanza(xmpp_conn_t *const conn,
c = queue_element_free(conn->ctx, e); c = queue_element_free(conn->ctx, e);
strophe_free(conn->ctx, c); strophe_free(conn->ctx, c);
} }
conn->sm_state->r_sent = 0;
} }
} }
} }
@@ -2035,8 +2036,10 @@ static int _send_raw(xmpp_conn_t *conn,
conn->send_queue_user_len++; conn->send_queue_user_len++;
strophe_debug_verbose(3, conn->ctx, "conn", "QUEUED: %s", data); strophe_debug_verbose(3, conn->ctx, "conn", "QUEUED: %s", data);
strophe_debug_verbose(1, conn->ctx, "conn", "Q_ADD: %p", item); strophe_debug_verbose(1, conn->ctx, "conn", "Q_ADD: %p", item);
if (!(owner & XMPP_QUEUE_SM) && conn->sm_state->sm_enabled) { if (!(owner & XMPP_QUEUE_SM) && conn->sm_state->sm_enabled &&
!conn->sm_state->r_sent) {
send_raw(conn, req_ack, strlen(req_ack), XMPP_QUEUE_SM_STROPHE, item); send_raw(conn, req_ack, strlen(req_ack), XMPP_QUEUE_SM_STROPHE, item);
conn->sm_state->r_sent = 1;
} }
return XMPP_EOK; return XMPP_EOK;
} }