]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: quic: simplify qc_prep_pkts() exit path
authorAmaury Denoyelle <adenoyelle@haproxy.com>
Wed, 16 Oct 2024 15:50:30 +0000 (17:50 +0200)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Mon, 21 Oct 2024 09:08:27 +0000 (11:08 +0200)
src/quic_tx.c

index 001a745e646f49f97e0e4e2db7625d557c2e0e4b..cdba917b1e26cb59b4c147c25cf34a3e36dd7c54 100644 (file)
@@ -658,6 +658,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
 
                                if (err == QC_BUILD_PKT_ERR_ALLOC || err == QC_BUILD_PKT_ERR_ENCRYPT)
                                        goto leave;
+                               first_pkt = NULL;
                                goto out;
                        }
 
@@ -692,10 +693,8 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
                        BUG_ON(padding && !next_qel);
 
                        /* Build only one datagram when an immediate close is required. */
-                       if (cc) {
-                               qc_txb_store(buf, dglen, first_pkt);
+                       if (cc)
                                goto out;
-                       }
 
                        /* Only one short packet by datagram when probing. */
                        if (probe && qel == qc->ael)
@@ -742,10 +741,10 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
                TRACE_DEVEL("next encryption level", QUIC_EV_CONN_PHPKTS, qc);
        }
 
+ out:
        if (first_pkt)
                qc_txb_store(buf, wrlen, first_pkt);
 
- out:
        if (cc && total) {
                BUG_ON(buf != &qc->tx.cc_buf);
                BUG_ON(dglen != total);