[MINOR] Manage unix socket source field on logs

diff --git a/src/log.c b/src/log.c
index 25e5f0377b71dc27c1e1f3181f321363023e46b2..9e269673e7aaa0f9f4c309af4b75de7ef6241cf3 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -335,7 +335,7 @@ void tcp_sess_log(struct session *s)
                inet_ntop(AF_INET,
                          (const void *)&((struct sockaddr_in *)&s->cli_addr)->sin_addr,
                          pn, sizeof(pn));
-       else
+       else if (s->cli_addr.ss_family == AF_INET6)
                inet_ntop(AF_INET6,
                          (const void *)&((struct sockaddr_in6 *)(&s->cli_addr))->sin6_addr,
                          pn, sizeof(pn));
@@ -356,10 +356,10 @@ void tcp_sess_log(struct session *s)
        send_log(prx_log, level, "%s:%d [%02d/%s/%04d:%02d:%02d:%02d.%03d]"
                 " %s %s/%s %ld/%ld/%s%ld %s%lld"
                 " %c%c %d/%d/%d/%d/%s%u %ld/%ld\n",
-                pn,
-                (s->cli_addr.ss_family == AF_INET) ?
-                ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port) :
-                ntohs(((struct sockaddr_in6 *)&s->cli_addr)->sin6_port),
+                s->cli_addr.ss_family == AF_UNIX ? "unix" : pn,
+                s->cli_addr.ss_family == AF_UNIX ? s->listener->luid : (ntohs((s->cli_addr.ss_family == AF_INET) ?
+                                                           ((struct sockaddr_in *)&s->cli_addr)->sin_port :
+                                                           ((struct sockaddr_in6 *)&s->cli_addr)->sin6_port)),
                 tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
                 tm.tm_hour, tm.tm_min, tm.tm_sec, (int)s->logs.tv_accept.tv_usec/1000,
                 fe->id, be->id, svid,