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 5a57e39d6e1d238a296fde0e55c00b09ceec3d47..7493e627c32ddbcdbb40053df26f1b1d20dc4cee 100644 (file)
--- 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 f43ca5630f2f85615c19add50531106ce3deb278..e77872126fb13ffea3bef8b09127f408a5f91447 100644 (file)
--- 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 136b24fd53e62cc0c8d4dbc4a19b5a5508523419..4492ed4eae7f59ffe574befb451528691a942098 100644 (file)
--- 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)