he-wait-for-h3-increase-initially

Author: lws-team

lib/core-net/client/connect2.c

@@ -377,6 +377,9 @@ lws_client_connect_2_dnsreq_MAY_CLOSE_WSI(struct lws *wsi)
 				if (wsi->udp) {
 					struct lws_client_connect_info i;
 					wsi->tried_quic = 1;
+#if defined(LWS_ROLE_QUIC)
+					wsi->quic.quic_race_start_us = lws_now_usecs();
+#endif
 					memset(&i, 0, sizeof(i));
 					i.method = "QUIC";
 					i.alpn = "h3";

lib/core-net/client/connect3.c

@@ -82,9 +82,11 @@ lws_client_h3_grace_cb(lws_sorted_usec_list_t *sul)
 
 	/* Mark H3 as FAILED in cache with 5s TTL */
 	if (wsi->a.context->h3_cap_cache && wsi->stash && wsi->stash->cis[CIS_HOST]) {
-		lws_h3_state_t state = LWS_H3_STATE_FAILED_IGNORE;
+		lws_h3_cap_info_t cap;
+		memset(&cap, 0, sizeof(cap));
+		cap.state = LWS_H3_STATE_FAILED_IGNORE;
 		lws_cache_write_through(wsi->a.context->h3_cap_cache, wsi->stash->cis[CIS_HOST], 
-					(const uint8_t *)&state, sizeof(state), 
+					(const uint8_t *)&cap, sizeof(cap), 
 					lws_now_usecs() + (5000000ll), NULL);
 	}
 
@@ -1005,14 +1007,17 @@ lws_client_connect_3_connect(struct lws *wsi, const char *ads,
 		return wsi;
 	} else if (!is_parallel && wsi->role_ops && !strcmp(wsi->role_ops->name, "quic")) {
 		/* QUIC connect immediately succeeds. Schedule grace and happy eyeballs. */
-		uint32_t grace_us = 200000;
+		uint32_t grace_us = LWS_QUIC_GRACE_DEFAULT_US;
 		if (wsi->a.context->h3_cap_cache && wsi->stash && wsi->stash->cis[CIS_HOST]) {
 			const void *item = NULL;
 			size_t item_len = 0;
-			if (!lws_cache_item_get(wsi->a.context->h3_cap_cache, wsi->stash->cis[CIS_HOST], &item, &item_len)) {
-				lws_h3_state_t state = *(lws_h3_state_t *)item;
-				if (state == LWS_H3_STATE_KNOWN_GOOD || state == LWS_H3_STATE_HTTPS_RECORD_EXISTS)
-					grace_us = 3000000;
+			if (!lws_cache_item_get(wsi->a.context->h3_cap_cache, wsi->stash->cis[CIS_HOST], &item, &item_len) &&
+			    item_len == sizeof(lws_h3_cap_info_t)) {
+				const lws_h3_cap_info_t *cap = (const lws_h3_cap_info_t *)item;
+				if (cap->state == LWS_H3_STATE_KNOWN_GOOD)
+					grace_us = cap->latency_us + LWS_QUIC_GRACE_MARGIN_US;
+				else if (cap->state == LWS_H3_STATE_HTTPS_RECORD_EXISTS)
+					grace_us = LWS_QUIC_GRACE_DEFAULT_US;
 			}
 		}
 		lwsl_wsi_notice(wsi, "QUIC socket created, starting grace timer %uus", (unsigned int)grace_us);

lib/core/context.c

@@ -1626,7 +1626,7 @@ lws_create_context(const struct lws_context_creation_info *info)
 		cci.name		= "H3CAP";
 		cci.max_footprint	= 4096;
 		cci.max_items		= 256;
-		cci.max_payload		= 8; /* Just an enum */
+		cci.max_payload		= sizeof(lws_h3_cap_info_t);
 
 		context->h3_cap_cache = lws_cache_create(&cci);
 		if (!context->h3_cap_cache) {

lib/core/private-lib-core.h

@@ -443,6 +443,14 @@ typedef enum {
 	LWS_H3_STATE_FAILED_IGNORE
 } lws_h3_state_t;
 
+#define LWS_QUIC_GRACE_DEFAULT_US 2000000
+#define LWS_QUIC_GRACE_MARGIN_US  200000
+
+typedef struct {
+	lws_h3_state_t state;
+	uint32_t latency_us;
+} lws_h3_cap_info_t;
+
 /*
  * the rest is managed per-context, that includes
  *

lib/roles/http/server/server.c

@@ -583,6 +583,8 @@ _lws_vhost_init_server(const struct lws_context_creation_info *info,
 #if defined(LWS_ROLE_QUIC)
         if (!vhost->context->lws_stub &&
             LWS_SSL_ENABLED(vhost) &&
+            vhost->tls.alpn &&
+            (strstr(vhost->tls.alpn, "h3") || strstr(vhost->tls.alpn, "lws-quic")) &&
             !lws_vhost_foreach_listen_wsi(vhost->context, &a, check_extant_quic)) {
 
 #if defined(LWS_WITH_IPV6)

lib/roles/quic/ops-quic.c

@@ -2259,6 +2259,11 @@ rops_alpn_negotiated_quic(struct lws *wsi, const char *alpn)
 	struct lws *nwsi;
 	const struct lws_role_ops *role;
 
+#if defined(LWS_WITH_CLIENT)
+	if (lwsi_role_client(wsi))
+		lws_sul_cancel(&wsi->sul_h3_grace);
+#endif
+
 	if (strcmp(alpn, "h3") && strcmp(alpn, "lws-quic"))
 		return 0;
 
@@ -2373,11 +2378,9 @@ rops_alpn_negotiated_quic(struct lws *wsi, const char *alpn)
 
 #if defined(LWS_WITH_CLIENT)
 	/* 
-	 * QUIC succeeded! Resolve the race by cancelling the grace timer 
-	 * and killing parallel TCP connections. 
+	 * QUIC succeeded! Resolve the race by killing parallel TCP connections. 
 	 */
 	if (lwsi_role_client(wsi)) {
-		lws_sul_cancel(&wsi->sul_h3_grace);
 
 		for (int i = 0; i < wsi->parallel_count; i++) {
 			if (wsi->parallel_conns[i].is_valid) {
@@ -2387,9 +2390,12 @@ rops_alpn_negotiated_quic(struct lws *wsi, const char *alpn)
 		wsi->parallel_count = 0;
 
 		if (wsi->a.context->h3_cap_cache && wsi->stash && wsi->stash->cis[CIS_HOST]) {
-			lws_h3_state_t state = LWS_H3_STATE_KNOWN_GOOD;
-			lws_cache_write_through(wsi->a.context->h3_cap_cache, wsi->stash->cis[CIS_HOST], 
-						(const uint8_t *)&state, sizeof(state), 
+			lws_h3_cap_info_t cap;
+			cap.state = LWS_H3_STATE_KNOWN_GOOD;
+			cap.latency_us = (uint32_t)(lws_now_usecs() - wsi->quic.quic_race_start_us);
+
+			lws_cache_write_through(wsi->a.context->h3_cap_cache, wsi->stash->cis[CIS_HOST],
+						(const uint8_t *)&cap, sizeof(cap),
 						lws_now_usecs() + (3600ll * LWS_US_PER_SEC), NULL);
 		}
 	}

lib/roles/quic/private-lib-roles-quic.h

@@ -376,11 +376,13 @@ lws_quic_parse_transport_parameters(struct lws *wsi, const uint8_t *buf, size_t
 #define LWS_QUIC_DEFAULT_PTO_US 500000 /* 500ms baseline PTO for early dev */
 
 struct _lws_quic_related {
-	struct lws_quic_netconn *qn; /* malloc'd for root net conn */
-	struct lws_quic_stream *qs; /* malloc'd for stream child wsi */
+        struct lws_quic_netconn *qn; /* malloc'd for root net conn */
+        struct lws_quic_stream *qs; /* malloc'd for stream child wsi */
 
-	uint8_t initialized:1;
-	uint8_t tx_blocked_sent:1;
+        lws_usec_t quic_race_start_us;
+
+        uint8_t initialized:1;
+        uint8_t tx_blocked_sent:1;
 };
 
 #endif