j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Add source of SPTPS errors to log messages.

Browse source
This commit is contained in:
Guus Sliepen 2015-05-19 21:23:35 +02:00
parent d89f37eb17
commit a752211801
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/logger.c
View file

@ -1,6 +1,6 @@
/* /*
logger.c -- logging code logger.c -- logging code
Copyright (C) 2004-2013 Guus Sliepen <guus@tinc-vpn.org> Copyright (C) 2004-2015 Guus Sliepen <guus@tinc-vpn.org>
2004-2005 Ivo Timmermans 2004-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -114,9 +114,17 @@ 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) {
char message[1024] = ""; char message[1024] = "";
int len = vsnprintf(message, sizeof message, format, ap); size_t msglen = sizeof message;
if(len > 0 && len < sizeof message && message[len - 1] == '\n')
message[len - 1] = 0; int len = vsnprintf(message, msglen, format, ap);
if(len > 0 && len < sizeof message) {
if(message[len - 1] == '\n')
message[--len] = 0;
connection_t *c = s->handle;
if(c)
snprintf(message + len, sizeof message - len, " from %s (%s)", c->name, c->hostname);
}
real_logger(DEBUG_ALWAYS, LOG_ERR, message); real_logger(DEBUG_ALWAYS, LOG_ERR, message);
} }