QUIC Conformance Updates: Frame, Packet and Stream State Handling #21135

hlandau · 2023-06-06T15:54:21Z

New in this PR:

3d0f879f23 QUIC QSM: Get rid of recv_fin_retired in favour of recv_state
093caab4d4 QUIC QSM: Update API documentation
e1413f237f QUIC CONFORMANCE/APL: Handle FIN/reset retirement correctly
948e3d1bc0 QUIC Send Stream State: Transition to DATA_SENT
d7ee7d2080 QUIC CONFORMANCE: Wire the DATA_SENT state
87c6cecdac QUIC APL: Validate receive stream state
6f2b723a5f QUIC APL: Validate send stream state
681f4b36e0 QUIC CONFORMANCE: Stop handling frames after termination
0f4bd9da9b QUIC Conformance: Frame Handling Tests
34cd1746c2 QUIC CONFORMANCE: RFC 9000 s. 9.6
1b8729baa0 QUIC CONFORMANCE: Validate preferred_addr transport parameter
5d72419526 QUIC CONFORMANCE: RFC 9000 s. 19.16: RETIRE_CONNECTION_ID frames
1047e1494e QUIC CONFORMANCE: RFC 9000 s. 19.15: NEW_CONNECTION_ID frames
9fb58f3b1b QUIC RXDP: Make ACK eliciting definition more resilient and centralised
9f5b13bcf8 QUIC CONFORMANCE: RFC 9000 s. 19.14: STREAMS_BLOCKED Frames
35c5e6ac15 QUIC CONFORMANCE: RFC 9000 s. 19.13: STREAM_DATA_BLOCKED Frames
1b65314407 QUIC CONFORMANCE: RFC 9000 s. 19.7
5c58c030cc RFC 9000 s. 19.8: Enforce maximum stream size
51c5087904 QUIC CONFORMANCE: RFC 9000 s. 17.2.5.1
4aed860616 QUIC CONFORMANCE: RFC 9000 s. 17.2.2: Enforce no initial token from server
6b829c0ffc QUIC CONFORMANCE: Enforce packet header reserved bits
a7b36cf8c6 QUIC WIRE: Allow encoding/decoding of reserved header bits
2491024729 QUIC CONFORMANCE: RFC 9000 s. 13.3: MAX_STREAM_DATA generation
3a8e75e2c0 QUIC CONFORMANCE: RFC 9000 s. 12.5: Application CONNECTION_CLOSE frame masking
16d5cd141f QUIC CONFORMANCE: RFC 9000 s. 12.5: Ensure CFQ can not be used to send disallowed frame types in a given PN space
6671f9178e QUIC CONFORMANCE: RFC 9000 s. 12.3: PN Limit
3e75935c8b QUIC CONFORMANCE: RFC 9000 s. 12.3: PN duplicate suppression
ac8b561245 QUIC ACKM: Clarify the role of is_inflight
acca8026db QUIC CONFORMANCE: Enforce minimal frame type encoding
aae6a4a0ce QUIC CONFORMANCE: Packet handling fixes
a472d8a68b QUIC CONFORMANCE: Handle RESET_STREAM final size correctly
f413aaf2a4 QUIC CONFORMANCE: Validate RESET_STREAM final sizes correctly
f0bb62b882 QUIC: Note that we do not retransmit stream data for retransmitted streams
ea4a0f645c QUIC QSM: Free unneeded stream buffers, calculate RESET_STREAM final size correctly
a21a46d893 QUIC QSM: Model final sizes and handle STOP_SENDING correctly
1d21787268 QUIC CONFORMANCE: RFC 9000 s. 3.3: Stream States — Permitted Frame Types — STREAM
a6066c6966 QUIC QSM/STREAM: Refactor to use RFC stream states

mattcaswell · 2023-06-28T11:00:17Z

This looks like it needs a rebase

hlandau · 2023-06-29T09:25:45Z

Updated.

mattcaswell

I started to review this but only got as far as the first commit :-)

My comments so far...

include/internal/quic_stream_map.h

ssl/quic/quic_channel.c

mattcaswell · 2023-06-29T14:49:40Z

ssl/quic/quic_stream_map.c

+        /* Stream without send part - caller error. */
+        return 0;
+
+    case QUIC_SSTREAM_STATE_SEND:


Might be simpler just to do (same comment for next function):

if (qs->send_state != QUIC_SSTREAM_STATE_SEND) return 0;

I could. I chose to do it like this as I think it makes the state-based handling more explicit/easier to understand.

ssl/quic/quic_txp.c

include/internal/quic_stream_map.h

ssl/quic/quic_stream_map.c

ssl/quic/quic_txp.c

include/internal/quic_types.h

ssl/quic/quic_channel.c

test/quic_multistream_test.c

include/internal/quic_stream_map.h

ssl/quic/quic_stream_map.c

hlandau · 2023-07-03T12:15:17Z

Updated.

t8m

Great work! Just a few minor nits

t8m · 2023-07-03T14:38:49Z

include/internal/quic_stream_map.h

+    unsigned int    type : 8; /* QUIC_STREAM_INITIATOR_*, QUIC_STREAM_DIR_* */
+
+    unsigned int    send_state : 8; /* QUIC_SSTREAM_STATE_* */
+    unsigned int    recv_state : 8; /* QUIC_RSTREAM_STATE_* */


Would these be better as uint8_t?

We're not in the habit of using uint8_t. Use of unsigned char with bitfields is not allowed by strict C89. Since these are aligned on 8-bit boundaries they can get optimised to byte load/stores anyway.

include/internal/quic_stream_map.h

ssl/quic/quic_impl.c

ssl/quic/quic_rx_depack.c

ssl/quic/quic_txp.c

test/quic_multistream_test.c

hlandau · 2023-07-06T19:35:18Z

Updated.

MacOS is failing, will look into it.

t8m · 2023-07-12T11:00:14Z

There is now a conflict, can you please rebase?

…erver Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

hlandau requested review from levitte, t8m, mattcaswell and paulidale June 6, 2023 15:54

hlandau self-assigned this Jun 6, 2023

hlandau force-pushed the quic-conformance-frame-2 branch from 3d488a3 to 47306bd Compare June 7, 2023 13:42

arapov linked an issue Jun 9, 2023 that may be closed by this pull request

QUIC Conformance Updates — Frame handling openssl/project#8

Closed

hlandau force-pushed the quic-conformance-frame-2 branch from 47306bd to d47eb57 Compare June 29, 2023 08:50

mattcaswell requested changes Jun 29, 2023

View reviewed changes

mattcaswell requested changes Jun 30, 2023

View reviewed changes

mattcaswell approved these changes Jul 3, 2023

View reviewed changes

mattcaswell removed the approval: otc review pending This pull request needs review by an OTC member label Jul 3, 2023

t8m requested changes Jul 3, 2023

View reviewed changes

hlandau force-pushed the quic-conformance-frame-2 branch from 437b6bf to c3a5ee3 Compare July 6, 2023 19:14

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC CONFORMANCE: RFC 9000 s. 17.2.5.1

212616e

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

RFC 9000 s. 19.8: Enforce maximum stream size

283938f

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC CONFORMANCE: RFC 9000 s. 19.7

b5b40c4

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC CONFORMANCE: RFC 9000 s. 9.6

3ffb7d1

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC Conformance: Frame Handling Tests

e26dc8e

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC APL: Validate send stream state

abfe3d5

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC APL: Validate receive stream state

e0bd282

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC CONFORMANCE: Wire the DATA_SENT state

c068f4d

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC Send Stream State: Transition to DATA_SENT

7c88302

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC QSM: Update API documentation

b369515

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

make update

bac3f4d

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC: test fixes for WPACKET use

7eebc35

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC: Correct minimal frame encoding test

49a38de

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC: Multistream test fixes

70cafc4

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

Minor updates

96b7df6

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

Minor updates 2

1d547f8

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

Minor fixups

8aa6a43

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

QUIC: Fix multistream test on macOS

9ff3a99

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

openssl-machine pushed a commit that referenced this pull request Jul 16, 2023

Minor fixups

f36504c

Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from #21135)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

QUIC Conformance Updates: Frame, Packet and Stream State Handling #21135

QUIC Conformance Updates: Frame, Packet and Stream State Handling #21135

hlandau commented Jun 6, 2023

mattcaswell commented Jun 28, 2023

hlandau commented Jun 29, 2023

mattcaswell left a comment

mattcaswell Jun 29, 2023

hlandau Jul 3, 2023

hlandau commented Jul 3, 2023

t8m left a comment •

edited

Loading

t8m Jul 3, 2023

hlandau Jul 6, 2023

hlandau commented Jul 6, 2023

t8m commented Jul 12, 2023

QUIC Conformance Updates: Frame, Packet and Stream State Handling #21135

QUIC Conformance Updates: Frame, Packet and Stream State Handling #21135

Conversation

hlandau commented Jun 6, 2023

mattcaswell commented Jun 28, 2023

hlandau commented Jun 29, 2023

mattcaswell left a comment

Choose a reason for hiding this comment

mattcaswell Jun 29, 2023

Choose a reason for hiding this comment

hlandau Jul 3, 2023

Choose a reason for hiding this comment

hlandau commented Jul 3, 2023

t8m left a comment • edited Loading

Choose a reason for hiding this comment

t8m Jul 3, 2023

Choose a reason for hiding this comment

hlandau Jul 6, 2023

Choose a reason for hiding this comment

hlandau commented Jul 6, 2023

t8m commented Jul 12, 2023

t8m left a comment •

edited

Loading