X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Flogger.c;h=2defb23908c06cfb2e71de1bad6fb01bae6dcc69;hb=3ccdf50beb6b2d3f2730bdc66006b43190537cde;hp=6fb972d136149674779661ba4b28fbacf2d328ac;hpb=f5bb64b36ae0807cdd3f241f81a8e933065437f6;p=tinc

diff --git a/src/logger.c b/src/logger.c
index 6fb972d1..2defb239 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -1,6 +1,6 @@
 /*
     logger.c -- logging code
-    Copyright (C) 2004-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2004-2015 Guus Sliepen <guus@tinc-vpn.org>
                   2004-2005 Ivo Timmermans
 
     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) {
 	char message[1024] = "";
-	int len = vsnprintf(message, sizeof message, format, ap);
-	if(len > 0 && len < sizeof message && message[len - 1] == '\n')
-		message[len - 1] = 0;
+	size_t msglen = sizeof message;
+
+	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);
 }