From: Emeric Brun <ebrun@exceliance.fr>
Date: Fri, 22 Oct 2010 15:42:55 +0000 (+0200)
Subject: [MINOR] Manage socket type unix for some logs
X-Git-Tag: v1.5-dev8~406
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0aaccf88f980b0eaa6f2a7235accbaba464f0c79;p=thirdparty%2Fhaproxy.git

[MINOR] Manage socket type unix for some logs
---

diff --git a/src/proxy.c b/src/proxy.c
index 99594980ac..c19842fd4e 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -687,15 +687,27 @@ void listen_proxies(void)
 				} else {
 					int port;
 
-					if (l->addr.ss_family == AF_INET6)
+					if (l->addr.ss_family == AF_INET6) {
 						port = ntohs(((struct sockaddr_in6 *)(&l->addr))->sin6_port);
-					else
+						Warning("Port %d busy while trying to enable %s %s.\n",
+							port, proxy_cap_str(p->cap), p->id);
+						send_log(p, LOG_WARNING, "Port %d busy while trying to enable %s %s.\n",
+							 port, proxy_cap_str(p->cap), p->id);
+					}
+					else if (l->addr.ss_family == AF_INET) {
 						port = ntohs(((struct sockaddr_in *)(&l->addr))->sin_port);
+						Warning("Port %d busy while trying to enable %s %s.\n",
+							port, proxy_cap_str(p->cap), p->id);
+						send_log(p, LOG_WARNING, "Port %d busy while trying to enable %s %s.\n",
+							 port, proxy_cap_str(p->cap), p->id);
+					}
+					else {
+						Warning("Bind on socket %d busy while trying to enable %s %s.\n",
+							l->luid, proxy_cap_str(p->cap), p->id);
+						send_log(p, LOG_WARNING, "Bind on socket %d busy while trying to enable %s %s.\n",
+							 l->luid, proxy_cap_str(p->cap), p->id);
+					}
 
-					Warning("Port %d busy while trying to enable %s %s.\n",
-						port, proxy_cap_str(p->cap), p->id);
-					send_log(p, LOG_WARNING, "Port %d busy while trying to enable %s %s.\n",
-						 port, proxy_cap_str(p->cap), p->id);
 					/* Another port might have been enabled. Let's stop everything. */
 					pause_proxy(p);
 					break;