Skip to content

SM serialize/restore fixes #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

SM serialize/restore fixes #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb80d30
Restore SM data ready for resume
singpolyma May 21, 2025
bd4de7c
The serialize code assumes there is an id set
singpolyma May 21, 2025
29656e4
Was freeing the wrong level
singpolyma May 21, 2025
ae6dc12
Do not start sending updates until SM been enabled
singpolyma May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,8 +1388,9 @@ int xmpp_conn_restore_sm_state(xmpp_conn_t *conn,
memset(conn->sm_state, 0, sizeof(*conn->sm_state));
conn->sm_state->ctx = conn->ctx;

conn->sm_state->bound_jid = strophe_strdup(conn->ctx, conn->jid);
conn->sm_state->sm_support = 1;
conn->sm_state->sm_enabled = 1;
conn->sm_state->sm_enabled = 0;
conn->sm_state->can_resume = 1;
conn->sm_state->resume = 1;

Expand All @@ -1403,7 +1404,7 @@ int xmpp_conn_restore_sm_state(xmpp_conn_t *conn,
goto err_reload;

size_t id_len;
ret = sm_load_string(&sm, &conn->sm_state->id, &id_len);
ret = sm_load_string(&sm, &conn->sm_state->previd, &id_len);
if (ret)
goto err_reload;

Expand Down Expand Up @@ -1484,7 +1485,7 @@ static int sm_store_u32(unsigned char **next_,
static size_t sm_state_serialize(xmpp_conn_t *conn, unsigned char **buf)
{
if (!conn->sm_state->sm_support || !conn->sm_state->sm_enabled ||
!conn->sm_state->can_resume) {
!conn->sm_state->can_resume || !conn->sm_state->id) {
*buf = NULL;
return 0;
}
Expand Down Expand Up @@ -1570,13 +1571,13 @@ static size_t sm_state_serialize(xmpp_conn_t *conn, unsigned char **buf)

err_serialize:
strophe_error(conn->ctx, "conn", "Can't serialize more data, buffer full");
strophe_free(conn->ctx, buf);
strophe_free(conn->ctx, *buf);
return 0;
}

void trigger_sm_callback(xmpp_conn_t *conn)
{
if (!conn || !conn->sm_callback)
if (!conn || !conn->sm_callback || !conn->sm_state->sm_enabled)
return;

unsigned char *buf;
Expand Down
6 changes: 3 additions & 3 deletions tests/test_serialize_sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void callback(xmpp_conn_t *conn,
xmpp_conn_restore_sm_state(newconn, sm_state, sm_state_len);
ENSURE_EQ(newconn->sm_state->sm_sent_nr, 0);
ENSURE_EQ(newconn->sm_state->sm_handled_nr, 0);
COMPARE(newconn->sm_state->id, "SMID");
COMPARE(newconn->sm_state->previd, "SMID");
ENSURE_EQ(newconn->send_queue_len, 2);
ENSURE_EQ(newconn->send_queue_user_len, 2);
ENSURE_EQ((size_t)(newconn->sm_state->sm_queue.head), 0);
Expand All @@ -66,7 +66,7 @@ void callback(xmpp_conn_t *conn,
xmpp_conn_restore_sm_state(newconn, sm_state, sm_state_len);
ENSURE_EQ(newconn->sm_state->sm_sent_nr, 1);
ENSURE_EQ(newconn->sm_state->sm_handled_nr, 0);
COMPARE(newconn->sm_state->id, "SMID");
COMPARE(newconn->sm_state->previd, "SMID");
ENSURE_EQ(newconn->send_queue_len, 1);
ENSURE_EQ(newconn->send_queue_user_len, 1);
ENSURE_EQ(newconn->sm_state->sm_queue.head->sm_h, 0);
Expand All @@ -86,7 +86,7 @@ void callback(xmpp_conn_t *conn,
xmpp_conn_restore_sm_state(newconn, sm_state, sm_state_len);
ENSURE_EQ(newconn->sm_state->sm_sent_nr, 1);
ENSURE_EQ(newconn->sm_state->sm_handled_nr, 0);
COMPARE(newconn->sm_state->id, "SMID");
COMPARE(newconn->sm_state->previd, "SMID");
ENSURE_EQ(newconn->send_queue_len, 0);
ENSURE_EQ(newconn->send_queue_user_len, 0);
ENSURE_EQ(newconn->sm_state->sm_queue.head->sm_h, 0);
Expand Down
Loading