From: willy tarreau <willy@wtap.(none)>
Date: Sun, 29 Jan 2006 20:55:30 +0000 (+0100)
Subject: * recent change for pause/play mode broke compilation due to sockaddr_storage.
X-Git-Tag: v1.2.8~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb2e562ad7c55dfdd7946254338dd90409b55b89;p=thirdparty%2Fhaproxy.git

* recent change for pause/play mode broke compilation due to sockaddr_storage.
---

diff --git a/haproxy.c b/haproxy.c
index 1c9dde1edf..27a1cc9422 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -5822,10 +5822,17 @@ static void listen_proxies(void) {
 		    else
 			p->state = PR_STIDLE;
 		} else {
+		    int port;
+
+		    if (l->addr.ss_family == AF_INET6)
+			port = ntohs(((struct sockaddr_in6 *)(&l->addr))->sin6_port);
+		    else
+ 			port = ntohs(((struct sockaddr_in *)(&l->addr))->sin_port);
+
 		    Warning("Port %d busy while trying to enable proxy %s.\n",
-			    ntohs(l->addr.sin_port), p->id);
+			    port, p->id);
 		    send_log(p, LOG_WARNING, "Port %d busy while trying to enable proxy %s.\n",
-			     ntohs(l->addr.sin_port), p->id);
+			     port, p->id);
 		    /* Another port might have been enabled. Let's stop everything. */
 		    pause_proxy(p);
 		    break;