Code cleanup

[umurmur.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index 31f96c01d97959db3229deb6d1d4cc8da80c491c..61a92d24994109f34c06f23a1b165a9440ebc096 100644 (file)
--- 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,11 @@ 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);
-
        offset += snprintf(&buf[offset], STRSIZE - offset, " - [%d] %s@%s:%d",
                client->sessionId,
                client->username == NULL ? "" : client->username,
-               client->addressString,
-               port);
+               Util_clientAddressToString(client),
+               Util_clientAddressToPortTCP(client));
 
        if (termprint)
                fprintf(stderr, "%s\n", buf);