From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Mon, 23 May 2022 07:01:56 +0000 (+0200)
Subject: Revert "MINOR: quic: activate QUIC traces at compilation"
X-Git-Tag: v2.6-dev12~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2208d57ce7c5c3bbdd2fbe2f85a601c54e1c69d3;p=thirdparty%2Fhaproxy.git

Revert "MINOR: quic: activate QUIC traces at compilation"

This reverts commit 118b2cbf8430a9513947c27a8403ff380e1dcaf2.

This patch was useful mainly for the docker image of QUIC interop to
have traces on stdout.

A better solution has been found by integrating this patch directly in
the qns repository which is used to build the docker image. Thus, this
hack is not require anymore in the main repository.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 1341dc91f5..acb90bfe49 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -50,7 +50,6 @@
 #include <haproxy/cbuf.h>
 #include <haproxy/proto_quic.h>
 #include <haproxy/quic_tls.h>
-#include <haproxy/sink.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/task.h>
 #include <haproxy/trace.h>
@@ -6523,20 +6522,6 @@ void qc_notify_close(struct quic_conn *qc)
 		qc->conn->mux->wake(qc->conn);
 }
 
-/* Function to automatically activate QUIC traces on stdout.
- * Activated via the compilation flag -DENABLE_QUIC_STDOUT_TRACES.
- * Main use for now is in the docker image for QUIC interop testing.
- */
-static void quic_init_stdout_traces(void)
-{
-#ifdef ENABLE_QUIC_STDOUT_TRACES
-	trace_quic.sink = sink_find("stdout");
-	trace_quic.level = TRACE_LEVEL_DEVELOPER;
-	trace_quic.state = TRACE_STATE_RUNNING;
-#endif
-}
-INITCALL0(STG_INIT, quic_init_stdout_traces);
-
 /*
  * Local variables:
  *  c-indent-level: 8