Updates after rebase

Author: embhorn

scripts/broker.test

@@ -864,6 +864,7 @@ else
     echo "FAIL: Clean session persistence (got_msg=$T21_GOT_MSG)"
     FAIL=1
 fi
+fi
 
 # --- WebSocket Tests ---
 ws_client_bin="examples/websocket/websocket_client"
@@ -872,9 +873,9 @@ echo "$broker_features" | grep -q "websocket" && has_websocket=yes
 
 if [ "$has_websocket" = "yes" ] && [ -x ./$ws_client_bin ]; then
 
-    # --- Test 17: WebSocket connect and subscribe ---
+    # --- Test 22: WebSocket connect and subscribe ---
     echo ""
-    echo "--- Test 17: WebSocket connect and subscribe ---"
+    echo "--- Test 22: WebSocket connect and subscribe ---"
     generate_port
     ws_port=$port
     generate_port

src/mqtt_broker.c

@@ -1929,11 +1929,9 @@ static void BrokerPendingWill_FreeAll(MqttBroker* broker)
 #endif
 }
 
-#ifdef WOLFMQTT_BROKER_WILL
 static void BrokerClient_PublishWillImmediate(MqttBroker* broker,
     const char* topic, const byte* payload, word16 payload_len,
     MqttQoS qos, byte retain);
-#endif
 
 /* Process pending wills - publish any that have expired their delay */
 static int BrokerPendingWill_Process(MqttBroker* broker)
@@ -3039,7 +3037,7 @@ static int BrokerClient_Process(MqttBroker* broker, BrokerClient* bc)
             return 0;
         }
     }
-#endif
+#endif /* ENABLE_MQTT_TLS */
 
     /* Try non-blocking read (timeout=0) */
     rc = MqttPacket_Read(&bc->client, bc->rx_buf, BROKER_CLIENT_RX_SZ(bc), 0);
@@ -3255,10 +3253,16 @@ int MqttBroker_Step(MqttBroker* broker)
                 activity = 1;
             }
         }
+    }
+#endif /* ENABLE_MQTT_TLS */
 
 #ifdef ENABLE_MQTT_WEBSOCKET
-    /* 1b. Service WebSocket connections (non-blocking) */
+    /* 1b. Service WebSocket connections (non-blocking).
+     * lws_service() uses poll/epoll internally and may block even with
+     * timeout=0 when connections are active.  Cancel the service first
+     * to force the internal poll to return immediately. */
     if (broker->ws_ctx != NULL) {
+        lws_cancel_service(broker->ws_ctx);
         lws_service(broker->ws_ctx, 0);
     }
 #endif