From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Fri, 23 Feb 2024 16:28:49 +0000 (+0100)
Subject: BUG/MINOR: quic: fix output of show quic
X-Git-Tag: v3.0-dev4~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba9f905da978afafb81ceb4277af2a886e6ca616;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: fix output of show quic

Output of 'show quic' is messed up since the introduction of reordered
packets counter in the following commit. The new counter is mixed up
with the first stream line. This is due to the wrong placement of the
newline delimiter.

  167e38e0e0296e899aa894d2f3db5ba2a0c68cb5
  MINOR: quic: Add a counter for reordered packets

This should be backported up to 2.6.
---

diff --git a/src/quic_cli.c b/src/quic_cli.c
index 56301fa848..f237a1fd02 100644
--- a/src/quic_cli.c
+++ b/src/quic_cli.c
@@ -204,7 +204,7 @@ static void dump_quic_full(struct show_quic_ctx *ctx, struct quic_conn *qc)
 	}
 
 	chunk_appendf(&trash, "  srtt=%-4u rttvar=%-4u rttmin=%-4u ptoc=%-4u cwnd=%-6llu"
-	                      " mcwnd=%-6llu sentpkts=%-6llu lostpkts=%-6llu\n reorderedpkts=%-6llu",
+	                      " mcwnd=%-6llu sentpkts=%-6llu lostpkts=%-6llu reorderedpkts=%-6llu\n",
 	              qc->path->loss.srtt, qc->path->loss.rtt_var,
 	              qc->path->loss.rtt_min, qc->path->loss.pto_count, (ullong)qc->path->cwnd,
 	              (ullong)qc->path->mcwnd, (ullong)qc->cntrs.sent_pkt, (ullong)qc->path->loss.nb_lost_pkt, (ullong)qc->path->loss.nb_reordered_pkt);