]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: quic: Display the packet number space flags in traces
authorFrédéric Lécaille <flecaille@haproxy.com>
Thu, 13 Apr 2023 13:55:49 +0000 (15:55 +0200)
committerFrédéric Lécaille <flecaille@haproxy.com>
Thu, 13 Apr 2023 17:20:08 +0000 (19:20 +0200)
Display this information when the encryption level is also displayed.

Must be backported to 2.6 and 2.7.

src/quic_conn.c

index 50a562d09719d8355c0a7d4540798a75b2f54b58..8e7f21d05d038411f6f8e926fc42947a177ec1b9 100644 (file)
@@ -398,9 +398,10 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
 
                        if (qel) {
                                const struct quic_pktns *pktns = qel->pktns;
-                               chunk_appendf(&trace_buf, " qel=%c pto_count=%d cwnd=%llu ppif=%lld pif=%llu "
+                               chunk_appendf(&trace_buf, " qel=%c flags=0x%x pto_count=%d cwnd=%llu ppif=%lld pif=%llu "
                                              "if=%llu pp=%u",
                                              quic_enc_level_char_from_qel(qel, qc),
+                                             qel->pktns->flags,
                                              qc->path->loss.pto_count,
                                              (unsigned long long)qc->path->cwnd,
                                              (unsigned long long)qc->path->prep_in_flight,
@@ -504,8 +505,9 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
                        if (qel) {
                                const struct quic_pktns *pktns = qel->pktns;
                                chunk_appendf(&trace_buf,
-                                             " qel=%c state=%s ack?%d pto_count=%d cwnd=%llu ppif=%lld pif=%llu if=%llu pp=%u off=%llu",
+                                             " qel=%c flags=0x%x state=%s ack?%d pto_count=%d cwnd=%llu ppif=%lld pif=%llu if=%llu pp=%u off=%llu",
                                              quic_enc_level_char_from_qel(qel, qc),
+                                             qel->pktns->flags,
                                              quic_hdshk_state_str(qc->state),
                                              !!(qel->pktns->flags & QUIC_FL_PKTNS_ACK_REQUIRED),
                                              qc->path->loss.pto_count,