From bea1f1100ee14264808268bd5cdb6df7a8ea382c Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 3 Dec 2024 09:04:34 +0100 Subject: [PATCH] file-logger: Don't log <> if ike_name is disabled and no IKE_SA is available Fixes: a2fba6db4a17 ("file-logger: Add option to log messages as JSON objects") --- src/libcharon/bus/listeners/file_logger.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libcharon/bus/listeners/file_logger.c b/src/libcharon/bus/listeners/file_logger.c index 3a05aa47c..d5d2a3d69 100644 --- a/src/libcharon/bus/listeners/file_logger.c +++ b/src/libcharon/bus/listeners/file_logger.c @@ -101,7 +101,7 @@ METHOD(logger_t, log_, void, ike_sa_t* ike_sa, const char *message) { char groupstr[5], timestr[128]; - char idstr[11] = "", namestr[128] = "", nameidstr[142]; + char idstr[11] = "", namestr[128] = "", nameidstr[142] = ""; const char *current = message, *next = NULL; struct tm tm; timeval_t tv; @@ -199,8 +199,11 @@ METHOD(logger_t, log_, void, { snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group); } - snprintf(nameidstr, sizeof(nameidstr), " <%s%s%s>", namestr, - namestr[0] ? "|" : "", idstr); + if (idstr[0]) + { + snprintf(nameidstr, sizeof(nameidstr), " <%s%s%s>", namestr, + namestr[0] ? "|" : "", idstr); + } /* prepend the prefix in front of every line */ while (TRUE) {