MINOR: quic-be: Handshake packet number space discarding

This is done for QUIC clients (or haproxy QUIC servers) when the handshake is
confirmed.

diff --git a/src/quic_conn.c b/src/quic_conn.c
index f8c03489b8a0aedd3c7f2e069b39f203bcdddf87..4b126de40d2592fefdc775fd45fdf6fafdb5738c 100644 (file)
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -775,6 +775,7 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
        struct list send_list = LIST_HEAD_INIT(send_list);
        struct quic_enc_level *qel;
        int st;
+       int discard_hpktns = 0;
        struct tasklet *tl = (struct tasklet *)t;
 
        TRACE_ENTER(QUIC_EV_CONN_IO_CB, qc);
@@ -822,16 +823,26 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
                goto out;
 
        st = qc->state;
-       if (st >= QUIC_HS_ST_COMPLETE) {
-               if (!(qc->flags & QUIC_FL_CONN_HPKTNS_DCD)) {
-                       /* Discard the Handshake packet number space. */
-                       TRACE_PROTO("discarding Handshake pktns", QUIC_EV_CONN_PHPKTS, qc);
-                       quic_pktns_discard(qc->hel->pktns, qc);
-                       qc_set_timer(qc);
-                       qc_el_rx_pkts_del(qc->hel);
-                       qc_release_pktns_frms(qc, qc->hel->pktns);
-               }
 
+       if (qc_is_listener(qc)) {
+               if (st >= QUIC_HS_ST_COMPLETE && !quic_tls_pktns_is_dcd(qc, qc->hpktns))
+                       discard_hpktns = 1;
+       }
+       else {
+               if (st >= QUIC_HS_ST_CONFIRMED && !quic_tls_pktns_is_dcd(qc, qc->hpktns))
+                       discard_hpktns = 1;
+       }
+
+       if (discard_hpktns) {
+               /* Discard the Handshake packet number space. */
+               TRACE_PROTO("discarding Handshake pktns", QUIC_EV_CONN_PHPKTS, qc);
+               quic_pktns_discard(qc->hel->pktns, qc);
+               qc_set_timer(qc);
+               qc_el_rx_pkts_del(qc->hel);
+               qc_release_pktns_frms(qc, qc->hel->pktns);
+       }
+
+       if (qc_is_listener(qc) && st >= QUIC_HS_ST_COMPLETE) {
                /* Note: if no token for address validation was received
                 * for a 0RTT connection, some 0RTT packet could still be
                 * waiting for HP removal AFTER the successful handshake completion.