7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5 from nm-mrt/log-to-syslog

Browse Source 
Log to syslog
This commit is contained in:
Tobias Hintze 2016-03-30 16:50:37 +02:00
commit 62af47a2f6
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/capwap_logging.c
View File

@ -40,6 +40,9 @@ void capwap_logging_init() {
#ifdef CAPWAP_MULTITHREADING_ENABLE #ifdef CAPWAP_MULTITHREADING_ENABLE
capwap_lock_init(&l_loglock); capwap_lock_init(&l_loglock);
#endif #endif
#ifdef LOG_TO_SYSLOG
openlog("capwap", LOG_CONS | LOG_PID | LOG_NDELAY, LOG_DAEMON);
#endif
} }
/* */ /* */
@ -47,6 +50,9 @@ void capwap_logging_close() {
#ifdef CAPWAP_MULTITHREADING_ENABLE #ifdef CAPWAP_MULTITHREADING_ENABLE
capwap_lock_destroy(&l_loglock); capwap_lock_destroy(&l_loglock);
#endif #endif
#ifdef LOG_TO_SYSLOG
closelog();
#endif
} }
/* */ /* */
@ -107,6 +113,16 @@ void capwap_logging_disable_console(void) {
/* */ /* */
#ifdef ENABLE_LOGGING #ifdef ENABLE_LOGGING
void __log_syslog(int level, const char* format, ...)
{
int errsv = errno;
va_list args;
va_start(args, format);
vsyslog(level, format, args);
va_end(args);
errno = errsv;
}
void __log_printf(int level, const char* format, ...) void __log_printf(int level, const char* format, ...)
{ {
int errsv = errno; int errsv = errno;

9
src/common/capwap_logging.h
View File

@ -2,6 +2,7 @@
#define __CAPWAP_LOGGING_HEADER__ #define __CAPWAP_LOGGING_HEADER__
#include <syslog.h> #include <syslog.h>
#define LOG_TO_SYSLOG
/* Logging level */ /* Logging level */
#define LOG_NONE -1 #define LOG_NONE -1
@ -23,6 +24,8 @@ void capwap_logging_disable_console(void);
void __log_printf(int level, const char *format, ...) void __log_printf(int level, const char *format, ...)
__attribute__ ((__format__ (__printf__, 2, 3))); __attribute__ ((__format__ (__printf__, 2, 3)));
void __log_hexdump(int level, const char *title, const unsigned char *data, size_t len); void __log_hexdump(int level, const char *title, const unsigned char *data, size_t len);
void __log_syslog(int level, const char* format, ...)
__attribute__ ((__format__ (__printf__, 2, 3)));
#ifdef DISABLE_LOGGING_DEBUG #ifdef DISABLE_LOGGING_DEBUG
@ -39,11 +42,15 @@ void __log_hexdump(int level, const char *title, const unsigned char *data, size
#else #else
#ifdef LOG_TO_SYSLOG
#define log_printf(level, f, args...) \
__log_syslog((level), (f), ##args)
#else
#define log_printf(level, f, args...) \ #define log_printf(level, f, args...) \
__log_printf((level), (f), ##args) __log_printf((level), (f), ##args)
#endif
#define log_hexdump(level, title, data, len) \ #define log_hexdump(level, title, data, len) \
__log_hexdump((level), (title), (data), (len)) __log_hexdump((level), (title), (data), (len))
#endif #endif
#else #else