projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a compiler warning.
[tinc]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index
2defb23
..
4075ea8
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-201
5
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2004-201
7
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
@@
-26,9
+26,10
@@
#include "logger.h"
#include "connection.h"
#include "control_common.h"
#include "logger.h"
#include "connection.h"
#include "control_common.h"
+#include "process.h"
#include "sptps.h"
#include "sptps.h"
-
debug_
t debug_level = DEBUG_NOTHING;
+
in
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;
@@
-37,7
+38,7
@@
static HANDLE loghandle = NULL;
#endif
static const char *logident = NULL;
bool logcontrol = false;
#endif
static const char *logident = NULL;
bool logcontrol = false;
-
+int umbilical = 0;
static void real_logger(int level, int priority, const char *message) {
char timestr[32] = "";
static void real_logger(int level, int priority, const char *message) {
char timestr[32] = "";
@@
-79,6
+80,11
@@
static void real_logger(int level, int priority, const char *message) {
case LOGMODE_NULL:
break;
}
case LOGMODE_NULL:
break;
}
+
+ if(umbilical && do_detach) {
+ write(umbilical, message, strlen(message));
+ write(umbilical, "\n", 1);
+ }
}
if(logcontrol) {
}
if(logcontrol) {
@@
-104,23
+110,27
@@
void logger(int level, int priority, const char *format, ...) {
va_start(ap, format);
int len = vsnprintf(message, sizeof message, format, ap);
va_start(ap, format);
int len = vsnprintf(message, sizeof message, format, ap);
+ message[sizeof message - 1] = 0;
va_end(ap);
va_end(ap);
- if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+ if(len > 0 && len < sizeof message
- 1
&& message[len - 1] == '\n')
message[len - 1] = 0;
real_logger(level, priority, message);
}
static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
message[len - 1] = 0;
real_logger(level, priority, message);
}
static void sptps_logger(sptps_t *s, int s_errno, const char *format, va_list ap) {
- char message[1024]
= ""
;
+ char message[1024];
size_t msglen = sizeof message;
int len = vsnprintf(message, msglen, format, ap);
size_t msglen = sizeof message;
int len = vsnprintf(message, msglen, format, ap);
- if(len > 0 && len < sizeof message) {
+ message[sizeof message - 1] = 0;
+ if(len > 0 && len < sizeof message - 1) {
if(message[len - 1] == '\n')
message[--len] = 0;
if(message[len - 1] == '\n')
message[--len] = 0;
+ // WARNING: s->handle can point to a connection_t or a node_t,
+ // but both types have the name and hostname fields at the same offsets.
connection_t *c = s->handle;
if(c)
snprintf(message + len, sizeof message - len, " from %s (%s)", c->name, c->hostname);
connection_t *c = s->handle;
if(c)
snprintf(message + len, sizeof message - len, " from %s (%s)", c->name, c->hostname);
@@
-202,6
+212,5
@@
void closelogger(void) {
case LOGMODE_NULL:
case LOGMODE_STDERR:
break;
case LOGMODE_NULL:
case LOGMODE_STDERR:
break;
- break;
}
}
}
}