X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Flog.c;h=91ec5b023ed40e0de5d8e407553114fc0f9d78f7;hb=c72ebd29f239793218f2248c3f8b48a7b3e0a541;hp=31f96c01d97959db3229deb6d1d4cc8da80c491c;hpb=a0e46b6337ab6736bb391703338d2ad3b5ee514f;p=umurmur.git

diff --git a/src/log.c b/src/log.c
index 31f96c0..91ec5b0 100644
--- a/src/log.c
+++ b/src/log.c
@@ -39,6 +39,7 @@
 
 #include "log.h"
 #include "conf.h"
+#include "util.h"
 
 #define STRSIZE 254
 
@@ -182,7 +183,6 @@ void Log_info_client(client_t *client, const char *logstring, ...)
 	va_list argp;
 	char buf[STRSIZE + 1];
 	int offset = 0;
-	uint16_t port;
 
 	if (termprint || logfile)
 		offset = sprintf(buf, "INFO: ");
@@ -191,16 +191,13 @@ void Log_info_client(client_t *client, const char *logstring, ...)
 	offset += vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
 	va_end(argp);
 
-	if(client->remote_tcp.ss_family == AF_INET)
-		port = ntohs(((struct sockaddr_in*)&client->remote_tcp)->sin_port);
-	else
-		port = ntohs(((struct sockaddr_in6*)&client->remote_tcp)->sin6_port);
-
+	char *clientAddressString = Util_clientAddressToString(client);
 	offset += snprintf(&buf[offset], STRSIZE - offset, " - [%d] %s@%s:%d",
 		client->sessionId,
 		client->username == NULL ? "" : client->username,
-		client->addressString,
-		port);
+		clientAddressString,
+		Util_clientAddressToPortTCP(client));
+	free(clientAddressString);
 
 	if (termprint)
 		fprintf(stderr, "%s\n", buf);