quic: sai fixes

Author: lws-team

lib/core-net/service.c

@@ -148,7 +148,7 @@ lws_handle_POLLOUT_event(struct lws *wsi, struct lws_pollfd *pollfd)
 
 #if defined(LWS_WITH_CLIENT)
 	/* Intercept POLLOUT for parallel sockets if we are racing H3 */
-	if (pollfd && pollfd->fd != wsi->desc.sockfd) {
+	if (pollfd && wsi->parallel_count > 0 && pollfd->fd != wsi->desc.sockfd) {
 		lws_client_connect_3_connect(wsi, NULL, NULL, 0, pollfd);
 		return 0;
 	}

lib/roles/quic/crypto-quic.c

@@ -725,6 +725,7 @@ lws_quic_encrypt_payload(struct lws_quic_keys *keys, uint8_t *packet, size_t pac
 int
 lws_tls_quic_rx_crypto(struct lws *wsi, int level, const uint8_t *buf, size_t len)
 {
+	struct lws *orig_wsi = wsi;
 	int n;
 
 	if (len > 0 && wsi->quic.qn) {
@@ -935,14 +936,14 @@ lws_tls_quic_rx_crypto(struct lws *wsi, int level, const uint8_t *buf, size_t le
 		}
 #endif
 
-		if (wsi->role_ops) {
-			enum lws_callback_reasons cb = (enum lws_callback_reasons)wsi->role_ops->adoption_cb[lwsi_role_server(wsi)];
-			if (cb && wsi->a.protocol && wsi->a.protocol->callback) {
-				wsi->a.protocol->callback(wsi, cb, wsi->user_space, NULL, 0);
+		if (orig_wsi->role_ops) {
+			enum lws_callback_reasons cb = (enum lws_callback_reasons)orig_wsi->role_ops->adoption_cb[lwsi_role_server(orig_wsi)];
+			if (cb && orig_wsi->a.protocol && orig_wsi->a.protocol->callback) {
+				orig_wsi->a.protocol->callback(orig_wsi, cb, orig_wsi->user_space, NULL, 0);
 			}
 		}
 
-		lws_callback_on_writable(wsi);
+		lws_callback_on_writable(orig_wsi);
 	}
 
 	return 0;

lib/roles/quic/ops-quic.c

@@ -1494,8 +1494,6 @@ rops_handle_POLLOUT_quic(struct lws *wsi)
 	int eagain_blocked = 0;
 	uint8_t pkt[2048]; memset(pkt, 0, sizeof(pkt));
 
-	wsi->mux.requested_POLLOUT = 0;
-
 	// lwsl_notice("QUIC TX: POLLOUT called for %s, qn=%p, is_server=%d\n", lws_wsi_tag(wsi), qn, qn ? qn->is_server : -1);
 
 	if (!qn) {
@@ -1514,6 +1512,8 @@ rops_handle_POLLOUT_quic(struct lws *wsi)
 		return LWS_HP_RET_DROP_POLLOUT;
 	}
 
+	wsi->mux.requested_POLLOUT = 0;
+
 	lws_usec_t pto_base = qn->smoothed_rtt ? (qn->smoothed_rtt + (4 * qn->rttvar) + 25000) : LWS_QUIC_DEFAULT_PTO_US;
         lws_usec_t pto_delay = pto_base << qn->pto_count;
         if (pto_delay > 10000000)