mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-09-24 23:31:40 +02:00
[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.
This commit is contained in:
parent
e17a8d02d9
commit
48da04a6af
12
src/checks.c
12
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user