X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Flog.c;h=61a92d24994109f34c06f23a1b165a9440ebc096;hb=bb5f5ae82bdcb7b5189032940d0b609dc12be70b;hp=31f96c01d97959db3229deb6d1d4cc8da80c491c;hpb=2aa733ee47fd6a345e2578f7837acbaa1cea3ca5;p=umurmur.git diff --git a/src/log.c b/src/log.c index 31f96c0..61a92d2 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,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);