From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Mon, 11 May 2026 08:17:58 +0000 (+0200)
Subject: MEDIUM: mux_quic: rename qmux traces to qcm
X-Git-Tag: v3.4-dev12~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c090e515027e39e0288ec4e774653b51f345925d;p=thirdparty%2Fhaproxy.git

MEDIUM: mux_quic: rename qmux traces to qcm

This patch is part of a renaming affecting mux_quic and related files.
Naming "qcm" will become the new marker for common mux_quic stuffs,
shared both on QUIC and QMux protocols. The final objective is to limit
"qmux" naming for stuffs related to the new experimental protocol of the
same name.

The current patch renames mux_quic traces token to "qcm". This is the
only change with external visible impacts in the whole renaming series.
However, to preserve compatibility, trace source alias is defined with
the older name "qmux". This relies on the previous patch which
introduced "alias" new trace_source member.
---

diff --git a/examples/traces.cfg b/examples/traces.cfg
index 5a57e39d6..7493e627c 100644
--- a/examples/traces.cfg
+++ b/examples/traces.cfg
@@ -16,6 +16,6 @@ traces
 	trace applet verbosity complete start now
 	trace h3 start now
 	trace quic start now
-	trace qmux start now
+	trace qcm start now
 	trace peers start now
 .endif
diff --git a/src/haterm_init.c b/src/haterm_init.c
index f43ca5630..e77872126 100644
--- a/src/haterm_init.c
+++ b/src/haterm_init.c
@@ -56,7 +56,7 @@ static const char *haterm_cfg_traces_str =
             "\ttrace h1 sink stderr level user start now verbosity minimal\n"
             "\ttrace h2 sink stderr level user start now verbosity minimal\n"
             "\ttrace h3 sink stderr level user start now verbosity minimal\n"
-            "\ttrace qmux sink stderr level user start now verbosity minimal\n";
+            "\ttrace qcm sink stderr level user start now verbosity minimal\n";
 
 /* Very small API similar to buffer API to carefully build some strings */
 #define HBUF_NULL ((struct hbuf) { })
diff --git a/src/qcm_trace.c b/src/qcm_trace.c
index 136b24fd5..4492ed4ea 100644
--- a/src/qcm_trace.c
+++ b/src/qcm_trace.c
@@ -35,7 +35,8 @@ static const struct name_desc qcm_trace_decoding[] = {
 };
 
 struct trace_source trace_qcm = {
-	.name = IST("qmux"),
+	.name = IST("qcm"),
+	.alias = IST("qmux"),
 	.desc = "QUIC multiplexer",
 	.arg_def = TRC_ARG1_CONN,  /* TRACE()'s first argument is always a connection */
 	.default_cb = qcm_trace,
@@ -129,7 +130,7 @@ static void qcm_trace_fill_ctx(struct trace_ctx *ctx, const struct trace_source
 }
 
 
-/* register qmux traces */
+/* register qcm traces */
 INITCALL1(STG_REGISTER, trace_register_source, TRACE_SOURCE);
 
 static char *qcc_app_st_to_str(const enum qcc_app_st st)