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

Adding support for debug groups in libstrongswan's logger.

Browse Source
This commit is contained in:
Tobias Brunner
2010-04-06 12:47:40 +02:00
parent 3fdee23f18
commit 9ed6341d3f
5 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/debug.c
+4 -4
View File
@@ -46,7 +46,7 @@ ENUM(debug_lower_names, DBG_DMN, DBG_LIB,
/**
* level logged by the default logger
*/
static int default_level = 1;
static level_t default_level = 1;
/**
* stream logged to by the default logger
@@ -56,7 +56,7 @@ static FILE *default_stream = NULL;
/**
* default dbg function which printf all to stderr
*/
void dbg_default(int level, char *fmt, ...)
void dbg_default(debug_t group, level_t level, char *fmt, ...)
{
if (!default_stream)
{
@@ -76,7 +76,7 @@ void dbg_default(int level, char *fmt, ...)
/**
* set the level logged by the default stderr logger
*/
void dbg_default_set_level(int level)
void dbg_default_set_level(level_t level)
{
default_level = level;
}
@@ -92,5 +92,5 @@ void dbg_default_set_stream(FILE *stream)
/**
* The registered debug hook.
*/
void (*dbg) (int level, char *fmt, ...) = dbg_default;
void (*dbg) (debug_t group, level_t level, char *fmt, ...) = dbg_default;
src/libstrongswan/debug.h
+10 -7
View File
@@ -91,17 +91,20 @@ enum level_t {
#endif /* DEBUG_LEVEL */
/** debug macros, they call the dbg function hook */
#if DEBUG_LEVEL >= 0
# define DBG0(group, fmt, ...) dbg(group, 0, fmt, ##__VA_ARGS__)
#endif /* DEBUG_LEVEL */
#if DEBUG_LEVEL >= 1
# define DBG1(fmt, ...) dbg(1, fmt, ##__VA_ARGS__)
# define DBG1(group, fmt, ...) dbg(group, 1, fmt, ##__VA_ARGS__)
#endif /* DEBUG_LEVEL */
#if DEBUG_LEVEL >= 2
# define DBG2(fmt, ...) dbg(2, fmt, ##__VA_ARGS__)
# define DBG2(group, fmt, ...) dbg(group, 2, fmt, ##__VA_ARGS__)
#endif /* DEBUG_LEVEL */
#if DEBUG_LEVEL >= 3
# define DBG3(fmt, ...) dbg(3, fmt, ##__VA_ARGS__)
# define DBG3(group, fmt, ...) dbg(group, 3, fmt, ##__VA_ARGS__)
#endif /* DEBUG_LEVEL */
#if DEBUG_LEVEL >= 4
# define DBG4(fmt, ...) dbg(4, fmt, ##__VA_ARGS__)
# define DBG4(group, fmt, ...) dbg(group, 4, fmt, ##__VA_ARGS__)
#endif /* DEBUG_LEVEL */
#ifndef DBG0
@@ -121,13 +124,13 @@ enum level_t {
#endif
/** dbg function hook, uses dbg_default() by default */
extern void (*dbg) (int level, char *fmt, ...);
extern void (*dbg) (debug_t group, level_t level, char *fmt, ...);
/** default logging function */
void dbg_default(int level, char *fmt, ...);
void dbg_default(debug_t group, level_t level, char *fmt, ...);
/** set the level logged by dbg_default() */
void dbg_default_set_level(int level);
void dbg_default_set_level(level_t level);
/** set the stream logged by dbg_default() to */
void dbg_default_set_stream(FILE *stream);