projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wipe (some) secrets from memory after use
[tinc]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index
caaf038
..
026a120
100644
(file)
--- a/
src/logger.c
+++ b/
src/logger.c
@@
-34,7
+34,7
@@
debug_t debug_level = DEBUG_NOTHING;
static logmode_t logmode = LOGMODE_STDERR;
static pid_t logpid;
static FILE *logfile = NULL;
static logmode_t logmode = LOGMODE_STDERR;
static pid_t logpid;
static FILE *logfile = NULL;
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
static HANDLE loghandle = NULL;
#endif
static const char *logident = NULL;
static HANDLE loghandle = NULL;
#endif
static const char *logident = NULL;
@@
-72,7
+72,7
@@
static void real_logger(debug_t level, int priority, const char *message) {
break;
case LOGMODE_SYSLOG:
break;
case LOGMODE_SYSLOG:
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
{
const char *messages[] = {message};
ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
{
const char *messages[] = {message};
ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
@@
-110,7
+110,7
@@
static void real_logger(debug_t level, int priority, const char *message) {
logcontrol = true;
logcontrol = true;
- if(level > (c->
outcompression >= COMPRESS_NONE ? c->outcompression
: debug_level)) {
+ if(level > (c->
log_level != DEBUG_UNSET ? c->log_level
: debug_level)) {
continue;
}
continue;
}
@@
-150,7
+150,7
@@
static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap
char message[1024];
size_t msglen = sizeof(message);
char message[1024];
size_t msglen = sizeof(message);
- if(!should_log(DEBUG_
ALWAYS
)) {
+ if(!should_log(DEBUG_
TRAFFIC
)) {
return;
}
return;
}
@@
-171,7
+171,7
@@
static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap
}
}
}
}
- real_logger(DEBUG_
ALWAYS
, LOG_ERR, message);
+ real_logger(DEBUG_
TRAFFIC
, LOG_ERR, message);
}
void openlogger(const char *ident, logmode_t mode) {
}
void openlogger(const char *ident, logmode_t mode) {
@@
-195,7
+195,7
@@
void openlogger(const char *ident, logmode_t mode) {
break;
case LOGMODE_SYSLOG:
break;
case LOGMODE_SYSLOG:
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
loghandle = RegisterEventSource(NULL, logident);
if(!loghandle) {
loghandle = RegisterEventSource(NULL, logident);
if(!loghandle) {
@@
-248,7
+248,7
@@
void closelogger(void) {
break;
case LOGMODE_SYSLOG:
break;
case LOGMODE_SYSLOG:
-#ifdef HAVE_
MINGW
+#ifdef HAVE_
WINDOWS
DeregisterEventSource(loghandle);
break;
#else
DeregisterEventSource(loghandle);
break;
#else