projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
connection_t: split compression_level/log_level into two fields
[tinc]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index
bcadae1
..
026a120
100644
(file)
--- a/
src/logger.c
+++ b/
src/logger.c
@@
-1,6
+1,6
@@
/*
logger.c -- logging code
/*
logger.c -- logging code
- Copyright (C) 2004-20
17
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2004-20
22
Guus Sliepen <guus@tinc-vpn.org>
2004-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
2004-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
@@
-28,31
+28,31
@@
#include "control_common.h"
#include "process.h"
#include "sptps.h"
#include "control_common.h"
#include "process.h"
#include "sptps.h"
+#include "compression.h"
-
in
t debug_level = DEBUG_NOTHING;
+
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;
-bool logcontrol = false;
+bool logcontrol = false;
// controlled by REQ_LOG <level>
int umbilical = 0;
int umbilical = 0;
-static void real_logger(int level, int priority, const char *message) {
+static bool should_log(debug_t level) {
+ return (level <= debug_level && logmode != LOGMODE_NULL) || logcontrol;
+}
+
+static void real_logger(debug_t level, int priority, const char *message) {
char timestr[32] = "";
static bool suppress = false;
char timestr[32] = "";
static bool suppress = false;
- // Bail out early if there is nothing to do.
if(suppress) {
return;
}
if(suppress) {
return;
}
- if(!logcontrol && (level > debug_level || logmode == LOGMODE_NULL)) {
- return;
- }
-
if(level <= debug_level) {
switch(logmode) {
case LOGMODE_STDERR:
if(level <= debug_level) {
switch(logmode) {
case LOGMODE_STDERR:
@@
-72,7
+72,7
@@
static void real_logger(int 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);
@@
-86,12
+86,16
@@
static void real_logger(int level, int priority, const char *message) {
break;
case LOGMODE_NULL:
break;
case LOGMODE_NULL:
+ default:
break;
}
if(umbilical && do_detach) {
break;
}
if(umbilical && do_detach) {
- write(umbilical, message, strlen(message));
- write(umbilical, "\n", 1);
+ size_t len = strlen(message);
+
+ if(write(umbilical, message, len) != (ssize_t)len || write(umbilical, "\n", 1) != 1) {
+ // Other end broken, nothing we can do about it.
+ }
}
}
}
}
@@
-99,20
+103,20
@@
static void real_logger(int level, int priority, const char *message) {
suppress = true;
logcontrol = false;
suppress = true;
logcontrol = false;
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c,
&
connection_list) {
if(!c->status.log) {
continue;
}
logcontrol = true;
if(!c->status.log) {
continue;
}
logcontrol = true;
- if(level > (c->
outcompression >= 0 ? c->outcompression
: debug_level)) {
+ if(level > (c->
log_level != DEBUG_UNSET ? c->log_level
: debug_level)) {
continue;
}
continue;
}
-
in
t len = strlen(message);
+
size_
t len = strlen(message);
- if(send_request(c, "%d %d %
d", CONTROL, REQ_LOG,
len)) {
+ if(send_request(c, "%d %d %
lu", CONTROL, REQ_LOG, (unsigned long)
len)) {
send_meta(c, message, len);
}
}
send_meta(c, message, len);
}
}
@@
-121,16
+125,20
@@
static void real_logger(int level, int priority, const char *message) {
}
}
}
}
-void logger(
in
t level, int priority, const char *format, ...) {
+void logger(
debug_
t level, int priority, const char *format, ...) {
va_list ap;
char message[1024] = "";
va_list ap;
char message[1024] = "";
+ if(!should_log(level)) {
+ return;
+ }
+
va_start(ap, format);
int len = vsnprintf(message, sizeof(message), format, ap);
message[sizeof(message) - 1] = 0;
va_end(ap);
va_start(ap, format);
int len = vsnprintf(message, sizeof(message), format, ap);
message[sizeof(message) - 1] = 0;
va_end(ap);
- if(len > 0 && len < sizeof(message) - 1 && message[len - 1] == '\n') {
+ if(len > 0 &&
(size_t)
len < sizeof(message) - 1 && message[len - 1] == '\n') {
message[len - 1] = 0;
}
message[len - 1] = 0;
}
@@
-138,13
+146,18
@@
void logger(int level, int priority, const char *format, ...) {
}
static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
}
static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
+ (void)s_errno;
char message[1024];
size_t msglen = sizeof(message);
char message[1024];
size_t msglen = sizeof(message);
+ if(!should_log(DEBUG_TRAFFIC)) {
+ return;
+ }
+
int len = vsnprintf(message, msglen, format, ap);
message[sizeof(message) - 1] = 0;
int len = vsnprintf(message, msglen, format, ap);
message[sizeof(message) - 1] = 0;
- if(len > 0 && len < sizeof(message) - 1) {
+ if(len > 0 &&
(size_t)
len < sizeof(message) - 1) {
if(message[len - 1] == '\n') {
message[--len] = 0;
}
if(message[len - 1] == '\n') {
message[--len] = 0;
}
@@
-158,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) {
@@
-182,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) {
@@
-199,6
+212,7
@@
void openlogger(const char *ident, logmode_t mode) {
#endif
case LOGMODE_NULL:
#endif
case LOGMODE_NULL:
+ default:
break;
}
break;
}
@@
-209,7
+223,7
@@
void openlogger(const char *ident, logmode_t mode) {
}
}
}
}
-void reopenlogger() {
+void reopenlogger(
void
) {
if(logmode != LOGMODE_FILE) {
return;
}
if(logmode != LOGMODE_FILE) {
return;
}
@@
-234,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
@@
-246,6
+260,7
@@
void closelogger(void) {
case LOGMODE_NULL:
case LOGMODE_STDERR:
case LOGMODE_NULL:
case LOGMODE_STDERR:
+ default:
break;
}
}
break;
}
}