From: Willy Tarreau <w@1wt.eu>
Date: Sat, 27 Aug 2011 09:51:36 +0000 (+0200)
Subject: [BUG] checks: use the correct destination port for sending checks
X-Git-Tag: v1.5-dev8~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48da04a6af9325a3ff379ea7d313c80233bfb8d6;p=thirdparty%2Fhaproxy.git

[BUG] checks: use the correct destination port for sending checks

In the number of switch/case statements added for IPv6 changes,
one was wrong and caused the check port to be ignored for outgoing
connection because the socket's family was not taken at the right
place. Use the set_host_port() macro instead to fix the issue.

The same cleanup could be performed at a number of other places
and should follow shortly.

Special thanks to Stephane Bakhos of Techboom for reporting a
detailed analysis of this bug.
---

diff --git a/src/checks.c b/src/checks.c
index 2e22b49e33..b98c49b857 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1284,16 +1284,8 @@ struct task *process_chk(struct task *t)
 					/* we'll connect to the addr on the server */
 					sa = s->addr;
 
-				switch (s->check_addr.ss_family) {
-				case AF_INET:
-					/* we'll connect to the check port on the server */
-					((struct sockaddr_in *)&sa)->sin_port = htons(s->check_port);
-					break;
-				case AF_INET6:
-					/* we'll connect to the check port on the server */
-					((struct sockaddr_in6 *)&sa)->sin6_port = htons(s->check_port);
-					break;
-				}
+				set_host_port(&sa, s->check_port);
+
 				/* allow specific binding :
 				 * - server-specific at first
 				 * - proxy-specific next