../svn-commit.tmp

2 files changed, 20 insertions, 12 deletions

diff --git a/Source/charon/utils/logger.c b/Source/charon/utils/logger.c
index 1795c282a..b05d4b0ba 100644
--- a/Source/charon/utils/logger.c
+++ b/Source/charon/utils/logger.c
@@ -102,15 +102,15 @@ static void prepend_prefix(private_logger_t *this, logger_level_t loglevel, char
 		log_type = '-';
 	}
 	
-	if (loglevel & (ALL - MOST))
+	if (loglevel & (LEVEL3 - LEVEL2))
 	{
 		log_details = '3';
 	}
-	else if (loglevel & (MOST - MORE))
+	else if (loglevel & (LEVEL2 - LEVEL1))
 	{
 		log_details = '2';
 	}
-	else if (loglevel & MORE)
+	else if (loglevel & LEVEL1)
 	{
 		log_details = '1';
 	}
diff --git a/Source/charon/utils/logger.h b/Source/charon/utils/logger.h
index a104ca0be..3841955df 100644
--- a/Source/charon/utils/logger.h
+++ b/Source/charon/utils/logger.h
@@ -53,31 +53,39 @@ enum logger_level_t {
 	 */
 	ERROR = 2,
 	/**
+	 * Logs important for the sysadmin.
+	 */
+	AUDIT = 4,
+	/**
 	 * Raw data dumps.
 	 */
-	RAW = 4,
+	RAW = 8,
 	/**
 	 * Private data dumps.
 	 */
-	PRIVATE = 8,
+	PRIVATE = 16,
 	
 	/**
-	 * Use more detailed output for those above.
+	 * Log most important output, can be omitted.
+	 */
+	LEVEL0 = 0,
+	/**
+	 * Log more detailed output.
 	 */
-	MORE = 16, 
+	LEVEL1 = 32, 
 	/**
-	 * Use even more detailed output.
+	 * Log even more detailed output.
 	 */
-	MOST = MORE + 32,
+	LEVEL2 = LEVEL1 + 64,
 	/**
-	 * Use full detailed output.
+	 * Use maximum detailed output.
 	 */
-	ALL = MOST + 64,
+	LEVEL3 = LEVEL2 + 128,
 	
 	/**
 	 * Summary for all types with all detail-levels.
 	 */
-	FULL = ALL + CONTROL + ERROR + RAW + PRIVATE
+	FULL = LEVEL3 + CONTROL + ERROR + RAW + PRIVATE + AUDIT
 };
 
 typedef struct logger_t logger_t;