Skip to content

Preserve persistent sessions on WebSocket close #573

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

Merged
embhorn merged 1 commit into from
Aug 13, 2026
Merged

Preserve persistent sessions on WebSocket close #573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions src/mqtt_broker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,11 +912,27 @@ static int BrokerWsNetDisconnect(void* context);

/* Forward declarations for client management used by lws callback */
static void BrokerSubs_RemoveClient(MqttBroker* broker, BrokerClient* bc);
static void BrokerSubs_OrphanClient(MqttBroker* broker, BrokerClient* bc);
static void BrokerClient_Remove(MqttBroker* broker, BrokerClient* bc);
#ifdef WOLFMQTT_BROKER_WILL
static void BrokerClient_PublishWill(MqttBroker* broker, BrokerClient* bc);
#endif

static int BrokerClient_SessionPersists(const BrokerClient* bc)
{
if (bc == NULL) {
return 0;
}
#if defined(WOLFMQTT_V5) && !defined(WOLFMQTT_STATIC_MEMORY)
/* MQTT 5.0 section 3.1.2.11.2: Session Expiry, not Clean Start,
* determines whether session state survives the network connection. */
if (bc->protocol_level >= MQTT_CONNECT_PROTOCOL_LEVEL_5) {
return bc->session_expiry_sec != 0;
}
#endif
return !bc->clean_session;
}

/* Scrub and release the WebSocket outbound staging buffer. The staged copy
* holds plaintext MQTT payloads (forwarded PUBLISH, retained and will
* messages) that the source tx_buf scrub cannot reach, because the network
Expand Down Expand Up @@ -1161,9 +1177,14 @@ static int callback_broker_mqtt(struct lws *wsi,
}
}

/* Peer-initiated close: publish will and remove client. */
/* Peer-initiated close: publish will and preserve persistent state. */
BrokerClient_PublishWill(broker, bc);
BrokerSubs_RemoveClient(broker, bc);
if (BrokerClient_SessionPersists(bc)) {
BrokerSubs_OrphanClient(broker, bc);
}
else {
BrokerSubs_RemoveClient(broker, bc);
}
*bc_ptr = NULL;
if (ws != NULL && ws->processing) {
/* bc is on the call stack inside BrokerClient_Process (a packet
Expand Down
Loading