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

sys-logger: Optionally log the level of each message

Browse Source 
Fixes #3509.
This commit is contained in:
Tobias Brunner
2020-10-27 10:42:49 +01:00
parent a3f5e38b7f
commit b422f16d10
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/bus/listeners/sys_logger.c
+19 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Tobias Brunner
* Copyright (C) 2012-2020 Tobias Brunner
* Copyright (C) 2006 Martin Willi
* HSR Hochschule fuer Technik Rapperswil
*
@@ -50,6 +50,11 @@ struct private_sys_logger_t {
*/
bool ike_name;
/**
* Print the log level
*/
bool log_level;
/**
* Mutex to ensure multi-line log messages are not torn apart
*/
@@ -65,13 +70,21 @@ METHOD(logger_t, log_, void,
private_sys_logger_t *this, debug_t group, level_t level, int thread,
ike_sa_t* ike_sa, const char *message)
{
char groupstr[4], namestr[128] = "";
char groupstr[5], namestr[128] = "";
const char *current = message, *next;
/* cache group name and optional name string */
snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group);
this->lock->read_lock(this->lock);
if (this->log_level)
{
snprintf(groupstr, sizeof(groupstr), "%N%d", debug_names, group,
level);
}
else
{
snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group);
}
if (this->ike_name && ike_sa)
{
if (ike_sa->get_peer_cfg(ike_sa))
@@ -135,10 +148,11 @@ METHOD(sys_logger_t, set_level, void,
}
METHOD(sys_logger_t, set_options, void,
private_sys_logger_t *this, bool ike_name)
private_sys_logger_t *this, bool ike_name, bool log_level)
{
this->lock->write_lock(this->lock);
this->ike_name = ike_name;
this->log_level = log_level;
this->lock->unlock(this->lock);
}
src/libcharon/bus/listeners/sys_logger.h
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Tobias Brunner
* Copyright (C) 2012-2020 Tobias Brunner
* Copyright (C) 2006 Martin Willi
* HSR Hochschule fuer Technik Rapperswil
*
@@ -48,8 +48,9 @@ struct sys_logger_t {
* Set options used by this logger.
*
* @param ike_name TRUE to prefix the name of the IKE_SA
* @param log_level TRUE to include the log level in the message
*/
void (*set_options) (sys_logger_t *this, bool ike_name);
void (*set_options) (sys_logger_t *this, bool ike_name, bool log_level);
/**
* Destroys a sys_logger_t object.