denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file-logger: Don't log <> if ike_name is disabled and no IKE_SA is available

Browse Source 
Fixes: a2fba6db4a ("file-logger: Add option to log messages as JSON objects")
This commit is contained in:
Tobias Brunner
2024-12-03 09:04:34 +01:00
parent 832c811598
commit bea1f1100e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/bus/listeners/file_logger.c
+6 -3
View File
@@ -101,7 +101,7 @@ METHOD(logger_t, log_, void,
ike_sa_t* ike_sa, const char *message) ike_sa_t* ike_sa, const char *message)
{ {
char groupstr[5], timestr[128]; 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; const char *current = message, *next = NULL;
struct tm tm; struct tm tm;
timeval_t tv; timeval_t tv;
@@ -199,8 +199,11 @@ METHOD(logger_t, log_, void,
{ {
snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group); snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group);
} }
snprintf(nameidstr, sizeof(nameidstr), " <%s%s%s>", namestr, if (idstr[0])
namestr[0] ? "|" : "", idstr); {
snprintf(nameidstr, sizeof(nameidstr), " <%s%s%s>", namestr,
namestr[0] ? "|" : "", idstr);
}
/* prepend the prefix in front of every line */ /* prepend the prefix in front of every line */
while (TRUE) while (TRUE)
{ {