Commitfb559165Recorded18 Oct 2026Repositorysigil-quic

Add private HQ Retry interoperability mode

Changed
 tools/hq/README.md                     |  4 ++++
 tools/hq/src/sigil/quic/interop/hq.sgl | 42 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 6 deletions(-)
Diff
tools/hq/README.mdmodified
@@ -26,6 +26,10 @@ Set `HQ_ROLE` to `client` or `server`, and supply these environment variables:
26
- `HQ_PAYLOAD`: response file path, server; at most 16 MiB.
27
- `HQ_OUTPUT`: downloaded response path, client; at most 16 MiB.
28
- `HQ_CASE`: `handshake` (default) or `transfer`.
+29
- `HQ_RETRY`: `1` requires authenticated Retry transport parameters. The
+30
server issues Retry through the private endpoint; a client expects the peer
+31
server to issue it. Unset or `0` preserves ordinary admission. Other values
+32
are errors. Save an independent wire capture to prove the Retry exchange.
33
- `HQ_DIRECTORY`: transfer case input directory for server, output directory
34
for client; replaces `HQ_PAYLOAD`/`HQ_OUTPUT` in that case.
35
tools/hq/src/sigil/quic/interop/hq.sglmodified
@@ -17,6 +17,29 @@
17
(define (required name)
18
(or (getenv name) (error "HQ test adapter: missing environment variable" name)))
19
+20
(define (retry-enabled?)
+21
(let ((value (getenv "HQ_RETRY")))
+22
(cond
+23
((or (not value) (equal? value "0")) #f)
+24
((equal? value "1") #t)
+25
(else (error "HQ_RETRY must be 0 or 1")))))
+26
+27
(define (report-retry! role connection)
+28
(when (retry-enabled?)
+29
(let* ((parameters (if (eq? role 'client)
+30
(quic-peer-parameters connection)
+31
(quic-local-parameters connection)))
+32
(original (assoc 0 parameters))
+33
(source (assoc 15 parameters))
+34
(retry (assoc 16 parameters)))
+35
(unless (and original source retry
+36
(bytevector? (cdr original)) (bytevector? (cdr source))
+37
(bytevector? (cdr retry)) (not (bytes=? (cdr original) (cdr retry))))
+38
(error "HQ test adapter: authenticated Retry parameters missing"))
+39
(println "HQ-RETRY role=~a original-bytes=~a source-bytes=~a retry-bytes=~a"
+40
role (bytevector-length (cdr original)) (bytevector-length (cdr source))
+41
(bytevector-length (cdr retry))))))
+42
43
(define (case-files)
44
(let ((name (or (getenv "HQ_CASE") "handshake")))
45
(cond ((equal? name "handshake") '("payload"))
@@ -129,6 +152,7 @@
152
(lambda ()
153
(quic-endpoint-attach! endpoint connection (port-number "HQ_PEER_PORT"))
154
(pump-until! endpoint (lambda () (quic-confirmed? connection)))
+155
(report-retry! 'client connection)
156
(println "HQ-HANDSHAKE role=client version=1 complete=true confirmed=true alpn=hq-interop pin=exact-DER")
157
(run-files! endpoint stream files (lambda (name) (client-file! endpoint stream name))))
158
(lambda () (quic-endpoint-close! endpoint)))))
@@ -142,14 +166,20 @@
166
(dynamic-wind
167
(lambda () #t)
168
(lambda ()
−145
(quic-endpoint-accept! endpoint
−146
(lambda (original source)
−147
(set! connection (make-quic-server (list alpn) (stream-transport-parameters 'server)
−148
(list certificate) private original source))
−149
(set! stream (make-quic-stream connection maximum-streams: (length files)))
−150
connection))
+169
(let ((factory
+170
(lambda (original source retry)
+171
(set! connection
+172
(make-quic-server (list alpn) (stream-transport-parameters 'server)
+173
(list certificate) private original source retry-source-id: retry))
+174
(set! stream (make-quic-stream connection maximum-streams: (length files)))
+175
connection)))
+176
(if (retry-enabled?)
+177
(quic-endpoint-accept-retry! endpoint factory)
+178
(quic-endpoint-accept! endpoint
+179
(lambda (original source) (factory original source #f)))))
180
(println "HQ-READY role=server address=127.0.0.1 port=~a" (quic-endpoint-port endpoint))
181
(pump-until! endpoint (lambda () (and connection (quic-confirmed? connection))))
+182
(report-retry! 'server connection)
183
(println "HQ-HANDSHAKE role=server version=1 complete=true confirmed=true alpn=hq-interop")
184
(run-files! endpoint stream files
185
(lambda (name) (server-file! endpoint connection stream name))))