3 files changed, 47 insertions, 58 deletions

diff --git a/src/libcharon/bus/bus.c b/src/libcharon/bus/bus.c
index 9abc07598..23931c47d 100644
--- a/src/libcharon/bus/bus.c
+++ b/src/libcharon/bus/bus.c
@@ -227,20 +227,13 @@ static bool log_cb(entry_t *entry, log_data_t *data)
 		{
 			entry->blocker = FALSE;
 			entry->condvar->signal(entry->condvar);
-<<<<<<< HEAD
-=======
 			entry->calling--;
->>>>>>> upstream/4.5.1
 		}
 		else
 		{
 			entry_destroy(entry);
 		}
 		va_end(args);
-<<<<<<< HEAD
-		entry->calling--;
-=======
->>>>>>> upstream/4.5.1
 		return TRUE;
 	}
 	va_end(args);
diff --git a/src/libcharon/bus/listeners/file_logger.c b/src/libcharon/bus/listeners/file_logger.c
index 157436a7d..36d18619a 100644
--- a/src/libcharon/bus/listeners/file_logger.c
+++ b/src/libcharon/bus/listeners/file_logger.c
@@ -53,11 +53,9 @@ struct private_file_logger_t {
 	bool ike_name;
 };
 
-/**
- * Implementation of bus_listener_t.log.
- */
-static bool log_(private_file_logger_t *this, debug_t group, level_t level,
-				 int thread, ike_sa_t* ike_sa, char *format, va_list args)
+METHOD(listener_t, log_, bool,
+	   private_file_logger_t *this, debug_t group, level_t level, int thread,
+	   ike_sa_t* ike_sa, char *format, va_list args)
 {
 	if (level <= this->levels[group])
 	{
@@ -118,10 +116,8 @@ static bool log_(private_file_logger_t *this, debug_t group, level_t level,
 	return TRUE;
 }
 
-/**
- * Implementation of file_logger_t.set_level.
- */
-static void set_level(private_file_logger_t *this, debug_t group, level_t level)
+METHOD(file_logger_t, set_level, void,
+	   private_file_logger_t *this, debug_t group, level_t level)
 {
 	if (group < DBG_ANY)
 	{
@@ -136,10 +132,8 @@ static void set_level(private_file_logger_t *this, debug_t group, level_t level)
 	}
 }
 
-/**
- * Implementation of file_logger_t.destroy.
- */
-static void destroy(private_file_logger_t *this)
+METHOD(file_logger_t, destroy, void,
+	   private_file_logger_t *this)
 {
 	if (this->out != stdout && this->out != stderr)
 	{
@@ -153,18 +147,21 @@ static void destroy(private_file_logger_t *this)
  */
 file_logger_t *file_logger_create(FILE *out, char *time_format, bool ike_name)
 {
-	private_file_logger_t *this = malloc_thing(private_file_logger_t);
-
-	/* public functions */
-	memset(&this->public.listener, 0, sizeof(listener_t));
-	this->public.listener.log = (bool(*)(listener_t*,debug_t,level_t,int,ike_sa_t*,char*,va_list))log_;
-	this->public.set_level = (void(*)(file_logger_t*,debug_t,level_t))set_level;
-	this->public.destroy = (void(*)(file_logger_t*))destroy;
-
-	/* private variables */
-	this->out = out;
-	this->time_format = time_format;
-	this->ike_name = ike_name;
+	private_file_logger_t *this;
+
+	INIT(this,
+		.public = {
+			.listener = {
+				.log = _log_,
+			},
+			.set_level = _set_level,
+			.destroy = _destroy,
+		},
+		.out = out,
+		.time_format = time_format,
+		.ike_name = ike_name,
+	);
+
 	set_level(this, DBG_ANY, LEVEL_SILENT);
 
 	return &this->public;
diff --git a/src/libcharon/bus/listeners/sys_logger.c b/src/libcharon/bus/listeners/sys_logger.c
index fa394ba88..c29c9f2e4 100644
--- a/src/libcharon/bus/listeners/sys_logger.c
+++ b/src/libcharon/bus/listeners/sys_logger.c
@@ -48,19 +48,19 @@ struct private_sys_logger_t {
 	bool ike_name;
 };
 
-/**
- * Implementation of listener_t.log.
- */
-static bool log_(private_sys_logger_t *this, debug_t group, level_t level,
-				 int thread, ike_sa_t* ike_sa, char *format, va_list args)
+METHOD(listener_t, log_, bool,
+	   private_sys_logger_t *this, debug_t group, level_t level, int thread,
+	   ike_sa_t* ike_sa, char *format, va_list args)
 {
 	if (level <= this->levels[group])
 	{
-		char buffer[8192], namestr[128] = "";
+		char buffer[8192], groupstr[4], namestr[128] = "";
 		char *current = buffer, *next;
 
 		/* write in memory buffer first */
 		vsnprintf(buffer, sizeof(buffer), format, args);
+		/* cache group name */
+		snprintf(groupstr, sizeof(groupstr), "%N", debug_names, group);
 
 		if (this->ike_name && ike_sa)
 		{
@@ -84,8 +84,8 @@ static bool log_(private_sys_logger_t *this, debug_t group, level_t level,
 			{
 				*(next++) = '\0';
 			}
-			syslog(this->facility|LOG_INFO, "%.2d[%N]%s %s\n",
-				   thread, debug_names, group, namestr, current);
+			syslog(this->facility|LOG_INFO, "%.2d[%s]%s %s\n",
+				   thread, groupstr, namestr, current);
 			current = next;
 		}
 	}
@@ -93,10 +93,8 @@ static bool log_(private_sys_logger_t *this, debug_t group, level_t level,
 	return TRUE;
 }
 
-/**
- * Implementation of sys_logger_t.set_level.
- */
-static void set_level(private_sys_logger_t *this, debug_t group, level_t level)
+METHOD(sys_logger_t, set_level, void,
+	   private_sys_logger_t *this, debug_t group, level_t level)
 {
 	if (group < DBG_ANY)
 	{
@@ -111,10 +109,8 @@ static void set_level(private_sys_logger_t *this, debug_t group, level_t level)
 	}
 }
 
-/**
- * Implementation of sys_logger_t.destroy.
- */
-static void destroy(private_sys_logger_t *this)
+METHOD(sys_logger_t, destroy, void,
+	   private_sys_logger_t *this)
 {
 	closelog();
 	free(this);
@@ -125,17 +121,20 @@ static void destroy(private_sys_logger_t *this)
  */
 sys_logger_t *sys_logger_create(int facility, bool ike_name)
 {
-	private_sys_logger_t *this = malloc_thing(private_sys_logger_t);
-
-	/* public functions */
-	memset(&this->public.listener, 0, sizeof(listener_t));
-	this->public.listener.log = (bool(*)(listener_t*,debug_t,level_t,int,ike_sa_t*,char*,va_list))log_;
-	this->public.set_level = (void(*)(sys_logger_t*,debug_t,level_t))set_level;
-	this->public.destroy = (void(*)(sys_logger_t*))destroy;
+	private_sys_logger_t *this;
+
+	INIT(this,
+		.public = {
+			.listener = {
+				.log = _log_,
+			},
+			.set_level = _set_level,
+			.destroy = _destroy,
+		},
+		.facility = facility,
+		.ike_name = ike_name,
+	);
 
-	/* private variables */
-	this->facility = facility;
-	this->ike_name = ike_name;
 	set_level(this, DBG_ANY, LEVEL_SILENT);
 
 	return &this->public;