MINOR: quic: Initial packet number spaced not discarded
There were cases where the Initial packet number space was not discarded.
This leaded the packet loss detection to continue to take it into
considuration during the connection lifetime. Some Application level
packets could not be retransmitted.
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 40346f9..75ba788 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -2003,12 +2003,17 @@
* has successfully parse a Handshake packet. The Initial encryption must also
* be discarded.
*/
- if (HA_ATOMIC_LOAD(&conn->state) == QUIC_HS_ST_SERVER_INITIAL &&
- pkt->type == QUIC_PACKET_TYPE_HANDSHAKE) {
- quic_tls_discard_keys(&conn->els[QUIC_TLS_ENC_LEVEL_INITIAL]);
- quic_pktns_discard(conn->els[QUIC_TLS_ENC_LEVEL_INITIAL].pktns, conn);
- qc_set_timer(ctx);
- HA_ATOMIC_STORE(&conn->state, QUIC_HS_ST_SERVER_HANDSHAKE);
+ if (pkt->type == QUIC_PACKET_TYPE_HANDSHAKE && objt_listener(ctx->conn->target)) {
+ int state = HA_ATOMIC_LOAD(&conn->state);
+
+ if (state >= QUIC_HS_ST_SERVER_INITIAL) {
+ quic_tls_discard_keys(&conn->els[QUIC_TLS_ENC_LEVEL_INITIAL]);
+ TRACE_PROTO("discarding Initial pktns", QUIC_EV_CONN_PRSHPKT, ctx->conn);
+ quic_pktns_discard(conn->els[QUIC_TLS_ENC_LEVEL_INITIAL].pktns, conn);
+ qc_set_timer(ctx);
+ if (state < QUIC_HS_ST_SERVER_HANDSHAKE)
+ HA_ATOMIC_STORE(&conn->state, QUIC_HS_ST_SERVER_HANDSHAKE);
+ }
}
TRACE_LEAVE(QUIC_EV_CONN_PRSHPKT, ctx->conn);