aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libcharon/bus/listeners/file_logger.c26
-rw-r--r--src/libcharon/bus/listeners/logger.h2
-rw-r--r--src/libcharon/bus/listeners/sys_logger.c18
-rw-r--r--src/libcharon/control/controller.c4
-rw-r--r--src/libcharon/control/controller.h4
-rw-r--r--src/libcharon/plugins/android/android_logger.c19
-rw-r--r--src/libcharon/plugins/sql/sql_logger.c2
7 files changed, 40 insertions, 35 deletions
diff --git a/src/libcharon/bus/listeners/file_logger.c b/src/libcharon/bus/listeners/file_logger.c
index 77af9e4ed..9c8458eb5 100644
--- a/src/libcharon/bus/listeners/file_logger.c
+++ b/src/libcharon/bus/listeners/file_logger.c
@@ -62,10 +62,10 @@ struct private_file_logger_t {
METHOD(logger_t, log_, void,
private_file_logger_t *this, debug_t group, level_t level, int thread,
- ike_sa_t* ike_sa, char *message)
+ ike_sa_t* ike_sa, const char *message)
{
char timestr[128], namestr[128] = "";
- char *current = message, *next;
+ const char *current = message, *next;
struct tm tm;
time_t t;
@@ -95,24 +95,26 @@ METHOD(logger_t, log_, void,
/* prepend a prefix in front of every line */
this->mutex->lock(this->mutex);
- while (current)
+ while (TRUE)
{
next = strchr(current, '\n');
- if (next)
- {
- *(next++) = '\0';
- }
if (this->time_format)
{
- fprintf(this->out, "%s %.2d[%N]%s %s\n",
- timestr, thread, debug_names, group, namestr, current);
+ fprintf(this->out, "%s %.2d[%N]%s ",
+ timestr, thread, debug_names, group, namestr);
}
else
{
- fprintf(this->out, "%.2d[%N]%s %s\n",
- thread, debug_names, group, namestr, current);
+ fprintf(this->out, "%.2d[%N]%s ",
+ thread, debug_names, group, namestr);
+ }
+ if (next == NULL)
+ {
+ fprintf(this->out, "%s\n", current);
+ break;
}
- current = next;
+ fprintf(this->out, "%.*s\n", (int)(next - current), current);
+ current = next + 1;
}
this->mutex->unlock(this->mutex);
}
diff --git a/src/libcharon/bus/listeners/logger.h b/src/libcharon/bus/listeners/logger.h
index 030653635..3b99e7dc1 100644
--- a/src/libcharon/bus/listeners/logger.h
+++ b/src/libcharon/bus/listeners/logger.h
@@ -45,7 +45,7 @@ struct logger_t {
* @param message log message
*/
void (*log)(logger_t *this, debug_t group, level_t level, int thread,
- ike_sa_t *ike_sa, char* message);
+ ike_sa_t *ike_sa, const char *message);
/**
* Get the desired log level for a debug group. This is called during
diff --git a/src/libcharon/bus/listeners/sys_logger.c b/src/libcharon/bus/listeners/sys_logger.c
index 9962fe0f6..53fdefe89 100644
--- a/src/libcharon/bus/listeners/sys_logger.c
+++ b/src/libcharon/bus/listeners/sys_logger.c
@@ -57,10 +57,10 @@ struct private_sys_logger_t {
METHOD(logger_t, log_, void,
private_sys_logger_t *this, debug_t group, level_t level, int thread,
- ike_sa_t* ike_sa, char *message)
+ ike_sa_t* ike_sa, const char *message)
{
char groupstr[4], namestr[128] = "";
- char *current = message, *next;
+ const char *current = message, *next;
/* cache group name and optional name string */
snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group);
@@ -81,16 +81,18 @@ METHOD(logger_t, log_, void,
/* do a syslog for every line */
this->mutex->lock(this->mutex);
- while (current)
+ while (TRUE)
{
next = strchr(current, '\n');
- if (next)
+ if (next == NULL)
{
- *(next++) = '\0';
+ syslog(this->facility | LOG_INFO, "%.2d[%s]%s %s\n",
+ thread, groupstr, namestr, current);
+ break;
}
- syslog(this->facility|LOG_INFO, "%.2d[%s]%s %s\n",
- thread, groupstr, namestr, current);
- current = next;
+ syslog(this->facility | LOG_INFO, "%.2d[%s]%s %.*s\n",
+ thread, groupstr, namestr, (int)(next - current), current);
+ current = next + 1;
}
this->mutex->unlock(this->mutex);
}
diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
index 0f98eb8c2..77d73dba9 100644
--- a/src/libcharon/control/controller.c
+++ b/src/libcharon/control/controller.c
@@ -209,7 +209,7 @@ static bool wait_for_listener(interface_job_t *job, u_int timeout)
METHOD(logger_t, listener_log, void,
interface_logger_t *this, debug_t group, level_t level, int thread,
- ike_sa_t *ike_sa, char* message)
+ ike_sa_t *ike_sa, const char *message)
{
ike_sa_t *target;
@@ -627,7 +627,7 @@ METHOD(controller_t, terminate_child, status_t,
* See header
*/
bool controller_cb_empty(void *param, debug_t group, level_t level,
- ike_sa_t *ike_sa, char *message)
+ ike_sa_t *ike_sa, const char *message)
{
return TRUE;
}
diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h
index 26614af32..222285cde 100644
--- a/src/libcharon/control/controller.h
+++ b/src/libcharon/control/controller.h
@@ -34,7 +34,7 @@
* @return FALSE to return from called controller method
*/
typedef bool (*controller_cb_t)(void* param, debug_t group, level_t level,
- ike_sa_t* ike_sa, char* message);
+ ike_sa_t* ike_sa, const char *message);
/**
* Empty callback function for controller_t methods.
@@ -43,7 +43,7 @@ typedef bool (*controller_cb_t)(void* param, debug_t group, level_t level,
* this function to the controller methods.
*/
bool controller_cb_empty(void *param, debug_t group, level_t level,
- ike_sa_t *ike_sa, char *message);
+ ike_sa_t *ike_sa, const char *message);
typedef struct controller_t controller_t;
diff --git a/src/libcharon/plugins/android/android_logger.c b/src/libcharon/plugins/android/android_logger.c
index 1f6042c56..0c5f609f7 100644
--- a/src/libcharon/plugins/android/android_logger.c
+++ b/src/libcharon/plugins/android/android_logger.c
@@ -45,26 +45,27 @@ struct private_android_logger_t {
mutex_t *mutex;
};
-
METHOD(logger_t, log_, void,
private_android_logger_t *this, debug_t group, level_t level,
- int thread, ike_sa_t* ike_sa, char *message)
+ int thread, ike_sa_t* ike_sa, const char *message)
{
int prio = level > 1 ? ANDROID_LOG_DEBUG : ANDROID_LOG_INFO;
char sgroup[16];
- char *current = message, *next;
+ const char *current = message, *next;
snprintf(sgroup, sizeof(sgroup), "%N", debug_names, group);
this->mutex->lock(this->mutex);
- while (current)
+ while (TRUE)
{ /* log each line separately */
next = strchr(current, '\n');
- if (next)
+ if (next == NULL)
{
- *(next++) = '\0';
+ __android_log_print(prio, "charon", "%.2d[%s] %s\n",
+ thread, sgroup, current);
+ break;
}
- __android_log_print(prio, "charon", "%.2d[%s] %s\n",
- thread, sgroup, current);
- current = next;
+ __android_log_print(prio, "charon", "%.2d[%s] %.*s\n",
+ thread, sgroup, (int)(next - current), current);
+ current = next + 1;
}
this->mutex->unlock(this->mutex);
}
diff --git a/src/libcharon/plugins/sql/sql_logger.c b/src/libcharon/plugins/sql/sql_logger.c
index 093053516..6db3258d2 100644
--- a/src/libcharon/plugins/sql/sql_logger.c
+++ b/src/libcharon/plugins/sql/sql_logger.c
@@ -50,7 +50,7 @@ struct private_sql_logger_t {
METHOD(logger_t, log_, void,
private_sql_logger_t *this, debug_t group, level_t level, int thread,
- ike_sa_t* ike_sa, char *message)
+ ike_sa_t* ike_sa, const char *message)
{
if (this->recursive->get(this->recursive))
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 21:22:44 +0000