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 8a4aedb09f19dac8a96d5cc9d79a22e72a0e4757..d909357e79fa69637a761259e678f1d61cf05905 100644 (file)
--- 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 e016be354d21efdd2cb3c822a1596b68d2c73641..85de625eb8ed33aa8c7e98271edab6071a9a9174 100644 (file)
--- 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 c8fdfde5df8c2d30ddd91a18d7a1e5d120a7d9af..00066851fac90ba746da1372dcb1f6e2905252fe 100644 (file)
--- 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 ce5734ed59e831d83235c7e1f87d60d97d0ad7d0..b311e98b7d4ced37ee7cb9f48ebe0a7258c3367b 100644 (file)
--- 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 37298550da451ae9ecad00d7a0c4bf66a6765fc2..c1fc5c23d58fc4fddfe727bb663b681380819b7b 100644 (file)
--- 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 7a1500db8e449d31b2c678f990594c84e8207673..af300bc7995854d8890bbf2efbf0c84f6f9f05cd 100644 (file)
--- 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 7d53d767631943350071bb80f259993e3b5109e2..de57a3bcb3466d3791afa7df6f0f0f364f4ff6e7 100644 (file)
--- 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 a752b8f33f7d85067bc45d167a0f30e032eed3eb..962ebc8bc6e98f56997889be4bdae28d9cdb1a4b 100644 (file)
--- 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 0016bf5c978ca6a09243d444f64efba63e02be01..88f3a305fd3b7a5b1f59eab5cd2db5c2f4ff4138 100644 (file)
--- 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>