]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: quic: Remove a useless test about probing in qc_prep_pkts()
authorFrédéric Lécaille <flecaille@haproxy.com>
Thu, 13 Apr 2023 13:59:02 +0000 (15:59 +0200)
committerFrédéric Lécaille <flecaille@haproxy.com>
Thu, 13 Apr 2023 17:20:09 +0000 (19:20 +0200)
qel->pktns->tx.pto_probe is set to 0 after having prepared a probing
datagram. There is no reason to check this parameter. Furthermore
it is always 0 when the connection does not probe the peer.

Must be backported to 2.6 and 2.7.

src/quic_conn.c

index 8e7f21d05d038411f6f8e926fc42947a177ec1b9..95ba744f64de569c5e235e5f01cb518a5ca49b41 100644 (file)
@@ -3675,7 +3675,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
                 * select the next level.
                 */
                if ((tel == QUIC_TLS_ENC_LEVEL_INITIAL || tel == QUIC_TLS_ENC_LEVEL_HANDSHAKE) &&
-                   next_tel != QUIC_TLS_ENC_LEVEL_NONE && (LIST_ISEMPTY(frms) && !qel->pktns->tx.pto_probe)) {
+                   next_tel != QUIC_TLS_ENC_LEVEL_NONE && (LIST_ISEMPTY(frms))) {
                        /* If QUIC_TLS_ENC_LEVEL_HANDSHAKE was already reached let's try QUIC_TLS_ENC_LEVEL_APP */
                        if (tel == QUIC_TLS_ENC_LEVEL_HANDSHAKE && next_tel == tel)
                                next_tel = QUIC_TLS_ENC_LEVEL_APP;