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.
This commit is contained in:
Amaury Denoyelle 2026-05-11 09:45:30 +02:00
parent 7e2f0fa178
commit af3560fa0a
9 changed files with 16 additions and 16 deletions

View File

@ -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 \

View File

@ -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 */

View File

@ -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 */

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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

View File

@ -1,4 +1,4 @@
#include <haproxy/qmux_trace.h>
#include <haproxy/qcm_trace.h>
#include <import/ist.h>
#include <haproxy/api.h>