From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 22 Jan 2024 14:41:32 +0000 (+0000)
Subject: QUIC QLOG: Rename QFILTER to OSSL_QFILTER
X-Git-Tag: openssl-3.3.0-alpha1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dcad79795a74b1fe7ecb001f9f65f940cfd4848;p=thirdparty%2Fopenssl.git

QUIC QLOG: Rename QFILTER to OSSL_QFILTER

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
---

diff --git a/doc/designs/quic-design/debugging.md b/doc/designs/quic-design/debugging.md
index 4a29f95c8be..c44ddf2f899 100644
--- a/doc/designs/quic-design/debugging.md
+++ b/doc/designs/quic-design/debugging.md
@@ -49,8 +49,8 @@ To enable QLOG you must:
 - set the environment variable `QLOGDIR` to a directory where QLOG log files
   are to be written;
 
-- set the environment variable `QFILTER` to a filter specifying the events
-  you want to be written (set `QFILTER='*'` for all events).
+- set the environment variable `OSSL_QFILTER` to a filter specifying the events
+  you want to be written (set `OSSL_QFILTER='*'` for all events).
 
 Any process using the libssl QUIC implementation will then automatically write
 QLOG files in the JSON-SEQ format to the specified directory. The files have the
diff --git a/ssl/quic/qlog.c b/ssl/quic/qlog.c
index f374d0c8c77..6cf89e35544 100644
--- a/ssl/quic/qlog.c
+++ b/ssl/quic/qlog.c
@@ -98,7 +98,7 @@ QLOG *ossl_qlog_new_from_env(const QLOG_TRACE_INFO *info)
 {
     QLOG *qlog = NULL;
     const char *qlogdir = ossl_safe_getenv("QLOGDIR");
-    const char *qfilter = ossl_safe_getenv("QFILTER");
+    const char *qfilter = ossl_safe_getenv("OSSL_QFILTER");
     char qlogdir_sep, *filename = NULL;
     size_t i, l, strl;
 
@@ -134,7 +134,10 @@ QLOG *ossl_qlog_new_from_env(const QLOG_TRACE_INFO *info)
     if (!ossl_qlog_set_sink_filename(qlog, filename))
         goto err;
 
-    if (qfilter != NULL && !ossl_qlog_set_filter(qlog, qfilter))
+    if (qfilter == NULL)
+        qfilter = "*";
+
+    if (!ossl_qlog_set_filter(qlog, qfilter))
         goto err;
 
     OPENSSL_free(filename);