Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

Merge 28f09fe4fb into bd57dbc241

Browse source
This commit is contained in:
Baldwin 2025-02-25 07:41:19 +08:00 • committed by GitHub
commit 4f237e6b48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/roles/mqtt/mqtt.c
View file

@ -2325,7 +2325,7 @@ lws_mqtt_client_send_unsubcribe(struct lws *wsi,
for (n = 0; n < unsub->num_topics; n++) {
mysub = lws_mqtt_find_sub(nwsi->mqtt,
unsub->topic[n].name);
assert(mysub);
//assert(mysub);
if (mysub && --mysub->ref_count == 0) {
lwsl_notice("%s: Need to send UNSUB\n", __func__);

15
lib/roles/mqtt/ops-mqtt.c
View file

@ -552,6 +552,16 @@ rops_callback_on_writable_mqtt(struct lws *wsi)
)
return 1;
if (lws_check_opt(wsi->a.context->options, LWS_SERVER_OPTION_LIBUV)) {
if (network_wsi->mux_substream != 0)
network_wsi->mux_substream = 0;
lws_start_foreach_ll(struct lws *, w, network_wsi->mux.child_list) {
if (w->mux.requested_POLLOUT == 0)
w->mux.requested_POLLOUT = 1;
} lws_end_foreach_ll(w, mux.sibling_list);
}
return 0;
}
@ -562,6 +572,11 @@ rops_close_kill_connection_mqtt(struct lws *wsi, enum lws_close_status reason)
lws_wsi_tag(wsi),
lws_wsi_tag(wsi->mux.parent_wsi), wsi->mux.child_list);
//lws_wsi_mux_dump_children(wsi);
if (lws_check_opt(wsi->a.context->options, LWS_SERVER_OPTION_LIBUV)) {
struct lws *nwsi = lws_get_network_wsi(wsi);
if (nwsi->mux_substream == 0)
nwsi->mux_substream = 1;
}
if (wsi->mux_substream
#if defined(LWS_WITH_CLIENT)