From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Mon, 11 May 2026 07:45:30 +0000 (+0200)
Subject: REORG: mux_quic: use newer qcm prefix for legacy qmux files
X-Git-Tag: v3.4-dev12~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af3560fa0a60bd27c6dd5163033ebbe9b18fd6c8;p=thirdparty%2Fhaproxy.git

REORG: mux_quic: use newer qcm prefix for legacy qmux files

This patch is the first one of the renaming serie, affecting the QUIC
MUX module. The objective is to remove older "qmux" naming which was
used as a generic identifier. Now it should be restricted to the QMux
experimental protocol. A new "qcm" naming will replace the generic
usage.

The current patch renames the files themselves. Token "qmux" is replaced
by the new "qcm" identifier. Makefile and include statements are
adjusted as required.
---

diff --git a/Makefile b/Makefile
index 8a4aedb09f..d909357e79 100644
--- a/Makefile
+++ b/Makefile
@@ -667,7 +667,7 @@ OPTIONS_OBJS += src/mux_quic.o src/h3.o src/quic_rx.o src/quic_tx.o	\
                 src/quic_cc_bbr.o src/quic_retry.o			\
                 src/cfgparse-quic.o src/xprt_quic.o src/quic_token.o	\
                 src/quic_ack.o src/qpack-dec.o src/quic_cc_newreno.o	\
-                src/qmux_http.o src/qmux_trace.o src/quic_rules.o	\
+                src/qcm_http.o src/qcm_trace.o src/quic_rules.o		\
                 src/quic_cc_nocc.o src/quic_cc.o src/quic_pacing.o	\
                 src/h3_stats.o src/quic_stats.o src/qpack-enc.o		\
                 src/qpack-tbl.o src/quic_cc_drs.o src/quic_fctl.o	\
diff --git a/include/haproxy/qmux_http.h b/include/haproxy/qcm_http.h
similarity index 81%
rename from include/haproxy/qmux_http.h
rename to include/haproxy/qcm_http.h
index e016be354d..85de625eb8 100644
--- a/include/haproxy/qmux_http.h
+++ b/include/haproxy/qcm_http.h
@@ -1,5 +1,5 @@
-#ifndef _HAPROXY_MUX_QUIC_HTTP_H
-#define _HAPROXY_MUX_QUIC_HTTP_H
+#ifndef _HAPROXY_QCM_HTTP_H
+#define _HAPROXY_QCM_HTTP_H
 
 #ifdef USE_QUIC
 
@@ -17,4 +17,4 @@ size_t qcs_http_reset_buf(struct qcs *qcs, struct buffer *buf, size_t count);
 
 #endif /* USE_QUIC */
 
-#endif /* _HAPROXY_MUX_QUIC_HTTP_H */
+#endif /* _HAPROXY_QCM_HTTP_H */
diff --git a/include/haproxy/qmux_trace.h b/include/haproxy/qcm_trace.h
similarity index 97%
rename from include/haproxy/qmux_trace.h
rename to include/haproxy/qcm_trace.h
index c8fdfde5df..00066851fa 100644
--- a/include/haproxy/qmux_trace.h
+++ b/include/haproxy/qcm_trace.h
@@ -1,5 +1,5 @@
-#ifndef _HAPROXY_QMUX_TRACE_H
-#define _HAPROXY_QMUX_TRACE_H
+#ifndef _HAPROXY_QCM_TRACE_H
+#define _HAPROXY_QCM_TRACE_H
 
 #ifdef USE_QUIC
 
@@ -77,4 +77,4 @@ void qmux_dump_qcs_info(struct buffer *msg, const struct qcs *qcs);
 
 #endif /* USE_QUIC */
 
-#endif /* _HAPROXY_QMUX_TRACE_H */
+#endif /* _HAPROXY_QCM_TRACE_H */
diff --git a/src/h3.c b/src/h3.c
index ce5734ed59..b311e98b7d 100644
--- a/src/h3.c
+++ b/src/h3.c
@@ -33,7 +33,7 @@
 #include <haproxy/istbuf.h>
 #include <haproxy/mux_quic.h>
 #include <haproxy/pool.h>
-#include <haproxy/qmux_http.h>
+#include <haproxy/qcm_http.h>
 #include <haproxy/qpack-dec.h>
 #include <haproxy/qpack-enc.h>
 #include <haproxy/quic_conn.h>
diff --git a/src/hq_interop.c b/src/hq_interop.c
index 37298550da..c1fc5c23d5 100644
--- a/src/hq_interop.c
+++ b/src/hq_interop.c
@@ -8,8 +8,8 @@
 #include <haproxy/http.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/mux_quic.h>
-#include <haproxy/qmux_http.h>
-#include <haproxy/qmux_trace.h>
+#include <haproxy/qcm_http.h>
+#include <haproxy/qcm_trace.h>
 #include <haproxy/quic_utils.h>
 #include <haproxy/trace.h>
 
diff --git a/src/mux_quic.c b/src/mux_quic.c
index 7a1500db8e..af300bc799 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -15,8 +15,8 @@
 #include <haproxy/ncbuf.h>
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
-#include <haproxy/qmux_http.h>
-#include <haproxy/qmux_trace.h>
+#include <haproxy/qcm_http.h>
+#include <haproxy/qcm_trace.h>
 #include <haproxy/quic_conn.h>
 #include <haproxy/quic_enc.h>
 #include <haproxy/quic_fctl.h>
diff --git a/src/mux_quic_qstrm.c b/src/mux_quic_qstrm.c
index 7d53d76763..de57a3bcb3 100644
--- a/src/mux_quic_qstrm.c
+++ b/src/mux_quic_qstrm.c
@@ -8,7 +8,7 @@
 #include <haproxy/mux_quic.h>
 #include <haproxy/mux_quic_priv.h>
 #include <haproxy/proxy.h>
-#include <haproxy/qmux_trace.h>
+#include <haproxy/qcm_trace.h>
 #include <haproxy/quic_fctl.h>
 #include <haproxy/quic_frame.h>
 #include <haproxy/trace.h>
diff --git a/src/qmux_http.c b/src/qcm_http.c
similarity index 97%
rename from src/qmux_http.c
rename to src/qcm_http.c
index a752b8f33f..962ebc8bc6 100644
--- a/src/qmux_http.c
+++ b/src/qcm_http.c
@@ -1,8 +1,8 @@
-#include <haproxy/qmux_http.h>
+#include <haproxy/qcm_http.h>
 
 #include <haproxy/api-t.h>
 #include <haproxy/htx.h>
-#include <haproxy/qmux_trace.h>
+#include <haproxy/qcm_trace.h>
 
 /* QUIC MUX rcv_buf operation using HTX data. Received data from stream <qcs>
  * will be transferred as HTX in <buf>. Output buffer is expected to be of
diff --git a/src/qmux_trace.c b/src/qcm_trace.c
similarity index 99%
rename from src/qmux_trace.c
rename to src/qcm_trace.c
index 0016bf5c97..88f3a305fd 100644
--- a/src/qmux_trace.c
+++ b/src/qcm_trace.c
@@ -1,4 +1,4 @@
-#include <haproxy/qmux_trace.h>
+#include <haproxy/qcm_trace.h>
 
 #include <import/ist.h>
 #include <haproxy/api.h>