qir-hs-fixes

Author: lws-team

lib/roles/h3/ops-h3.c

@@ -361,6 +361,29 @@ rops_perform_user_POLLOUT_h3(struct lws *wsi)
 			lwsl_wsi_err(wsi, "lws_h3_client_handshake failed!");
 			return -1;
 		}
+
+		/*
+		 * The request headers (+FIN for GET) have been sent.  Bound the
+		 * wait for the server's response the same way the H1 client does
+		 * (client-http.c lws_http_client_socket_service), so an H3 stream
+		 * whose reply is lost to packet corruption, a silent/blackholed
+		 * peer, or a key-phase desync fails cleanly here instead of
+		 * hanging on an otherwise-live QUIC connection forever.
+		 *
+		 * LRS_WAITING_SERVER_REPLY is chosen (rather than staying in
+		 * LRS_ESTABLISHED, which lws_h3_client_handshake() just set) so
+		 * that, if the timeout fires, lws_sul_wsitimeout_cb() delivers the
+		 * informative LWS_CALLBACK_CLIENT_CONNECTION_ERROR "Timed out
+		 * waiting server reply" that H1 clients get.  On the first response
+		 * bytes the timeout is cleared and the state advanced to
+		 * LRS_ESTABLISHED by lws_client_interpret_server_handshake()
+		 * (client-http.c); the LRS_ESTABLISHED POLLOUT branch below is only
+		 * used for client body upload / writeable, which does not happen
+		 * while we are waiting for the reply to a request we just sent.
+		 */
+		lwsi_set_state(wsi, LRS_WAITING_SERVER_REPLY);
+		lws_set_timeout(wsi, PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE,
+				(int)wsi->a.context->timeout_secs);
 #endif
 		return 0;
 	}

minimal-examples-lowlevel/http-client/minimal-http-client-timeout-h3/CMakeLists.txt

@@ -0,0 +1,49 @@
+project(lws-minimal-http-client-timeout-h3 C)
+cmake_minimum_required(VERSION 3.10)
+find_package(libwebsockets CONFIG REQUIRED)
+list(APPEND CMAKE_MODULE_PATH ${LWS_CMAKE_DIR})
+include(CheckCSourceCompiles)
+include(LwsCheckRequirements)
+
+set(SAMP lws-minimal-http-client-timeout-h3)
+set(SRCS minimal-http-client-timeout-h3.c)
+
+set(requirements 1)
+require_lws_config(LWS_ROLE_QUIC 1 requirements)
+require_lws_config(LWS_WITH_HTTP3 1 requirements)
+require_lws_config(LWS_WITH_CLIENT 1 requirements)
+require_lws_config(LWS_WITH_SERVER 1 requirements)
+
+if (requirements)
+	add_executable(${SAMP} ${SRCS})
+
+	if (websockets_shared)
+		target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})
+		add_dependencies(${SAMP} websockets_shared)
+	else()
+		target_link_libraries(${SAMP} websockets ${LIBWEBSOCKETS_DEP_LIBS})
+	endif()
+
+	if (LWS_WITH_MINIMAL_EXAMPLES)
+		#
+		# The test starts the blackhole QUIC server (-s) on a free port,
+		# gives it a moment to bind, runs the client against it, then
+		# kills the server.  The client's success condition is that it
+		# times out awaiting the reply (the server never answers), which
+		# exercises the H3 client reply timeout.  We bundle server +
+		# client into a single ctest command with a tiny inline shell
+		# wrapper so the test is self-contained and does not depend on
+		# netstat/lsof-based port detection helpers.
+		#
+		# Expected exit codes: server (-s) always returns 0; the client
+		# returns 0 if it saw the timeout and non-zero otherwise, so the
+		# client exit code is the test result.
+		lws_get_free_port(PORT_H3TO)
+
+		add_test(NAME h3to COMMAND sh -c
+			"$<TARGET_FILE:${SAMP}> -s -p ${PORT_H3TO} -d1039 2>/dev/null & SRV=$!; sleep 2; $<TARGET_FILE:${SAMP}> -p ${PORT_H3TO} -d1039; RC=$?; kill $SRV 2>/dev/null; wait $SRV 2>/dev/null; exit $RC")
+		set_tests_properties(h3to PROPERTIES
+				     WORKING_DIRECTORY .
+				     TIMEOUT 40)
+	endif()
+endif()

minimal-examples-lowlevel/http-client/minimal-http-client-timeout-h3/README.md

@@ -0,0 +1,43 @@
+# lws-minimal-http-client-timeout-h3
+
+This tests the HTTP/3 client reply timeout.
+
+It runs as a single binary in two modes:
+
+ - by default, as a client that issues a single `GET` over HTTP/3 against the
+   blackhole server described below, and
+ - with `-s`, as a "blackhole" QUIC/H3 server that completes the QUIC + TLS
+   handshake but then deliberately never sends any H3 response.
+
+The intended outcome is that the **client times out** waiting for the server's
+reply and receives `LWS_CALLBACK_CLIENT_CONNECTION_ERROR` ("Timed out waiting
+server reply") within the context timeout — rather than hanging on the live
+QUIC connection indefinitely, which was the historical gap this example pins
+down.
+
+When run under ctest, the blackhole server is started with `-s` on a free port
+as a background fixture, and the client is then run against it.  The client
+returns `0` if it timed out as expected, and non-zero otherwise.
+
+## Build
+
+```bash
+ $ cmake . && make
+```
+
+## Usage (manual)
+
+In one terminal, start the blackhole server:
+
+```bash
+ $ ./lws-minimal-http-client-timeout-h3 -s -p 7681 -d 1039
+```
+
+In another, run the client against it:
+
+```bash
+ $ ./lws-minimal-http-client-timeout-h3 -p 7681 -d 1039
+```
+
+The client should report `Completed: OK (timed out as expected)` after the
+short reply timeout configured via `info.timeout_secs`.