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

[MINOR] startup: print the proxy socket which caused an error

Browse Source 
Add the address and port to the error message of the proxy socket that caused
the error. This can be helpful when several listening addresses are used in a
proxy.

Edit: since we now also support unix sockets (which already report their
      path), better move the address reporting to proto_tcp.c by analogy.
      -Willy
This commit is contained in:
Cyril Bont 2010-11-01 19:26:01 +01:00 committed by Willy Tarreau
parent 17f449b214
commit 43ba1b331c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/proto_tcp.c
View File

@ -559,8 +559,22 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
fd_insert(fd);
tcp_return:
if (msg && errlen)
strlcpy2(errmsg, msg, errlen);
if (msg && errlen) {
char pn[INET6_ADDRSTRLEN];
if (listener->addr.ss_family == AF_INET) {
inet_ntop(AF_INET,
(const void *)&((struct sockaddr_in *)&listener->addr)->sin_addr,
pn, sizeof(pn));
snprintf(errmsg, errlen, "%s [%s:%d]", msg, pn, ntohs(((struct sockaddr_in *)&listener->addr)->sin_port));
}
else {
inet_ntop(AF_INET6,
(const void *)&((struct sockaddr_in6 *)(&listener->addr))->sin6_addr,
pn, sizeof(pn));
snprintf(errmsg, errlen, "%s [%s:%d]", msg, pn, ntohs(((struct sockaddr_in6 *)&listener->addr)->sin6_port));
}
}
return err;
tcp_close_return: