mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] Support of unix listener sockets for debug and log event messages on frontend.c

Browse Source
This commit is contained in:
Emeric Brun 2010-10-22 16:33:18 +02:00 committed by Willy Tarreau
parent 837ca52de3
commit ab844ea9e1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontend.c
View File

@ -153,7 +153,7 @@ int frontend_accept(struct session *s)
s->fe->id, (s->fe->mode == PR_MODE_HTTP) ? "HTTP" : "TCP"); s->fe->id, (s->fe->mode == PR_MODE_HTTP) ? "HTTP" : "TCP");
} }
} }
else { else if (s->cli_addr.ss_family == AF_INET6) {
char pn[INET6_ADDRSTRLEN], sn[INET6_ADDRSTRLEN]; char pn[INET6_ADDRSTRLEN], sn[INET6_ADDRSTRLEN];
if (!(s->flags & SN_FRT_ADDR_SET)) if (!(s->flags & SN_FRT_ADDR_SET))
@ -169,6 +169,12 @@ int frontend_accept(struct session *s)
s->fe->id, (s->fe->mode == PR_MODE_HTTP) ? "HTTP" : "TCP"); s->fe->id, (s->fe->mode == PR_MODE_HTTP) ? "HTTP" : "TCP");
} }
} }
else {
/* UNIX socket, only the destination is known */
send_log(s->fe, LOG_INFO, "Connect to unix:%d (%s/%s)\n",
s->listener->luid,
s->fe->id, (s->fe->mode == PR_MODE_HTTP) ? "HTTP" : "TCP");
}
} }
if (unlikely((global.mode & MODE_DEBUG) && (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)))) { if (unlikely((global.mode & MODE_DEBUG) && (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)))) {
@ -187,7 +193,7 @@ int frontend_accept(struct session *s)
s->uniq_id, s->fe->id, (unsigned short)s->listener->fd, (unsigned short)cfd, s->uniq_id, s->fe->id, (unsigned short)s->listener->fd, (unsigned short)cfd,
pn, ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port)); pn, ntohs(((struct sockaddr_in *)&s->cli_addr)->sin_port));
} }
else { else if (s->cli_addr.ss_family == AF_INET6) {
char pn[INET6_ADDRSTRLEN]; char pn[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, inet_ntop(AF_INET6,
(const void *)&((struct sockaddr_in6 *)(&s->cli_addr))->sin6_addr, (const void *)&((struct sockaddr_in6 *)(&s->cli_addr))->sin6_addr,
@ -197,6 +203,11 @@ int frontend_accept(struct session *s)
s->uniq_id, s->fe->id, (unsigned short)s->listener->fd, (unsigned short)cfd, s->uniq_id, s->fe->id, (unsigned short)s->listener->fd, (unsigned short)cfd,
pn, ntohs(((struct sockaddr_in6 *)(&s->cli_addr))->sin6_port)); pn, ntohs(((struct sockaddr_in6 *)(&s->cli_addr))->sin6_port));
} }
else {
len = sprintf(trash, "%08x:%s.accept(%04x)=%04x from [unix:%d]\n",
s->uniq_id, s->fe->id, (unsigned short)s->listener->fd, (unsigned short)cfd,
s->listener->luid);
}
write(1, trash, len); write(1, trash, len);
} }