From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Mon, 11 May 2026 08:27:01 +0000 (+0200)
Subject: MINOR: mux_quic: rename qstrm files to qmux
X-Git-Tag: v3.4-dev12~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57ab169747ead12e8ba60819a8ee30fed9cf14c6;p=thirdparty%2Fhaproxy.git

MINOR: mux_quic: rename qstrm files to qmux

This is a follow-up on the QUIC MUX renaming process. Now most of "qmux"
generic usages as been replaced in favor of "qcm" naming. The next part
of the renaming is to replace "qstrm" naming with "qmux" for stuffs
related to the new QMux protocol specifically.

This is first applied on filenames. As with the previous renaming,
Makefile and include statements are updated as well to prevent
compilation issues.
---

diff --git a/Makefile b/Makefile
index d909357e7..22c4321d1 100644
--- a/Makefile
+++ b/Makefile
@@ -671,7 +671,7 @@ OPTIONS_OBJS += src/mux_quic.o src/h3.o src/quic_rx.o src/quic_tx.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	\
-                src/quic_enc.o src/mux_quic_qstrm.o src/xprt_qstrm.o	\
+                src/quic_enc.o src/qcm_qmux.o src/xprt_qmux.o		\
                 src/mpring.o
 endif
 
diff --git a/include/haproxy/mux_quic_qstrm.h b/include/haproxy/qcm_qmux.h
similarity index 55%
rename from include/haproxy/mux_quic_qstrm.h
rename to include/haproxy/qcm_qmux.h
index 6b81f3e65..350ffc771 100644
--- a/include/haproxy/mux_quic_qstrm.h
+++ b/include/haproxy/qcm_qmux.h
@@ -1,5 +1,5 @@
-#ifndef _HAPROXY_MUX_QUIC_QSTRM_H
-#define _HAPROXY_MUX_QUIC_QSTRM_H
+#ifndef _HAPROXY_QCM_QMUX_H
+#define _HAPROXY_QCM_QMUX_H
 
 #include <haproxy/mux_quic.h>
 
@@ -7,4 +7,4 @@ int qcc_qstrm_recv(struct qcc *qcc);
 
 int qcc_qstrm_send_frames(struct qcc *qcc, struct list *frms);
 
-#endif /* _HAPROXY_MUX_QUIC_QSTRM_H */
+#endif /* _HAPROXY_QCM_QMUX_H */
diff --git a/include/haproxy/xprt_qstrm.h b/include/haproxy/xprt_qmux.h
similarity index 75%
rename from include/haproxy/xprt_qstrm.h
rename to include/haproxy/xprt_qmux.h
index 96618f635..e88351eef 100644
--- a/include/haproxy/xprt_qstrm.h
+++ b/include/haproxy/xprt_qmux.h
@@ -1,5 +1,5 @@
-#ifndef _HAPROXY_XPRT_QSTRM_H
-#define _HAPROXY_XPRT_QSTRM_H
+#ifndef _HAPROXY_XPRT_QMUX_H
+#define _HAPROXY_XPRT_QMUX_H
 
 #include <stddef.h>
 
@@ -11,4 +11,4 @@ const struct quic_transport_params *xprt_qstrm_rparams(const void *context);
 
 size_t xprt_qstrm_xfer_rxbuf(void *context, struct buffer *out);
 
-#endif /* _HAPROXY_XPRT_QSTRM_H */
+#endif /* _HAPROXY_XPRT_QMUX_H */
diff --git a/src/mux_quic.c b/src/mux_quic.c
index 91a47c731..cf79dcca3 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -11,11 +11,11 @@
 #include <haproxy/global-t.h>
 #include <haproxy/h3.h>
 #include <haproxy/list.h>
-#include <haproxy/mux_quic_qstrm.h>
 #include <haproxy/ncbuf.h>
 #include <haproxy/pool.h>
 #include <haproxy/proxy.h>
 #include <haproxy/qcm_http.h>
+#include <haproxy/qcm_qmux.h>
 #include <haproxy/qcm_trace.h>
 #include <haproxy/quic_conn.h>
 #include <haproxy/quic_enc.h>
@@ -34,7 +34,7 @@
 #include <haproxy/stconn.h>
 #include <haproxy/time.h>
 #include <haproxy/trace.h>
-#include <haproxy/xprt_qstrm.h>
+#include <haproxy/xprt_qmux.h>
 #include <haproxy/xref.h>
 
 DECLARE_TYPED_POOL(pool_head_qcc, "qcc", struct qcc);
diff --git a/src/mux_quic_qstrm.c b/src/qcm_qmux.c
similarity index 99%
rename from src/mux_quic_qstrm.c
rename to src/qcm_qmux.c
index de57a3bcb..b7ad83bb2 100644
--- a/src/mux_quic_qstrm.c
+++ b/src/qcm_qmux.c
@@ -1,4 +1,4 @@
-#include <haproxy/mux_quic_qstrm.h>
+#include <haproxy/qcm_qmux.h>
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
diff --git a/src/xprt_qstrm.c b/src/xprt_qmux.c
similarity index 99%
rename from src/xprt_qstrm.c
rename to src/xprt_qmux.c
index bdcaf8459..42e12c778 100644
--- a/src/xprt_qstrm.c
+++ b/src/xprt_qmux.c
@@ -1,4 +1,4 @@
-#include <haproxy/xprt_qstrm.h>
+#include <haproxy/xprt_qmux.h>
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
@@ -7,8 +7,8 @@
 #include <haproxy/fd.h>
 #include <haproxy/global.h>
 #include <haproxy/mux_quic.h>
-#include <haproxy/mux_quic_qstrm.h>
 #include <haproxy/pool.h>
+#include <haproxy/qcm_qmux.h>
 #include <haproxy/quic_frame.h>
 #include <haproxy/quic_tp-t.h>