mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 23:01:24 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: checks: replace conn->addr.to with conn->dst

Browse Source 
Two places will require a dynamic address allocation since the connection
is created from scratch. For the source address it looks like the
clear_addr() call will simply have to be removed as the pointer will
already be NULL.
This commit is contained in:
Willy Tarreau 2019-07-17 16:54:52 +02:00
parent 6c6365f455
commit b3c81cbbbf
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/checks.c
View File

@ -1614,13 +1614,14 @@ static int connect_conn_chk(struct task *t)
/* Maybe there were an older connection we were waiting on */ /* Maybe there were an older connection we were waiting on */
check->wait_list.events = 0; check->wait_list.events = 0;
/* FIXME WTA: we'll have to dynamically allocate the dst address here */
if (is_addr(&check->addr)) { if (is_addr(&check->addr)) {
/* we'll connect to the check addr specified on the server */ /* we'll connect to the check addr specified on the server */
conn->addr.to = check->addr; *conn->dst = check->addr;
} }
else { else {
/* we'll connect to the addr on the server */ /* we'll connect to the addr on the server */
conn->addr.to = s->addr; *conn->dst = s->addr;
} }
if (s->check.via_socks4 && (s->flags & SRV_F_SOCKS4_PROXY)) { if (s->check.via_socks4 && (s->flags & SRV_F_SOCKS4_PROXY)) {
@ -1628,21 +1629,24 @@ static int connect_conn_chk(struct task *t)
conn->flags |= CO_FL_SOCKS4; conn->flags |= CO_FL_SOCKS4;
} }
proto = protocol_by_family(conn->addr.to.ss_family); proto = protocol_by_family(conn->dst->ss_family);
conn->target = &s->obj_type; conn->target = &s->obj_type;
if ((conn->addr.to.ss_family == AF_INET) || (conn->addr.to.ss_family == AF_INET6)) { if ((conn->dst->ss_family == AF_INET) || (conn->dst->ss_family == AF_INET6)) {
int i = 0; int i = 0;
i = srv_check_healthcheck_port(check); i = srv_check_healthcheck_port(check);
if (i == 0) if (i == 0)
return SF_ERR_CHK_PORT; return SF_ERR_CHK_PORT;
set_host_port(&conn->addr.to, i); set_host_port(conn->dst, i);
} }
/* no client address */ /* no client address */
clear_addr(&conn->addr.from); /* FIXME WTA: we'll have to dynamically allocate the src address here
* before clearing it, or better release it and make it null.
*/
clear_addr(conn->src);
conn_prepare(conn, proto, check->xprt); conn_prepare(conn, proto, check->xprt);
if (conn_install_mux(conn, &mux_pt_ops, cs, s->proxy, NULL) < 0) if (conn_install_mux(conn, &mux_pt_ops, cs, s->proxy, NULL) < 0)
@ -2858,25 +2862,29 @@ static int tcpcheck_main(struct check *check)
conn->target = s ? &s->obj_type : &proxy->obj_type; conn->target = s ? &s->obj_type : &proxy->obj_type;
/* no client address */ /* no client address */
clear_addr(&conn->addr.from); /* FIXME WTA: we'll have to dynamically allocate the src address here
* before clearing it, or better release it and make it null.
*/
clear_addr(conn->src);
/* FIXME WTA: we'll have to dynamically allocate the dst address here */
if (is_addr(&check->addr)) { if (is_addr(&check->addr)) {
/* we'll connect to the check addr specified on the server */ /* we'll connect to the check addr specified on the server */
conn->addr.to = check->addr; *conn->dst = check->addr;
} }
else { else {
/* we'll connect to the addr on the server */ /* we'll connect to the addr on the server */
conn->addr.to = s->addr; *conn->dst = s->addr;
} }
proto = protocol_by_family(conn->addr.to.ss_family); proto = protocol_by_family(conn->dst->ss_family);
/* port */ /* port */
if (check->current_step->port) if (check->current_step->port)
set_host_port(&conn->addr.to, check->current_step->port); set_host_port(conn->dst, check->current_step->port);
else if (check->port) else if (check->port)
set_host_port(&conn->addr.to, check->port); set_host_port(conn->dst, check->port);
else if (s->svc_port) else if (s->svc_port)
set_host_port(&conn->addr.to, s->svc_port); set_host_port(conn->dst, s->svc_port);
if (check->current_step->conn_opts & TCPCHK_OPT_SSL) { if (check->current_step->conn_opts & TCPCHK_OPT_SSL) {
xprt = xprt_get(XPRT_SSL); xprt = xprt_get(XPRT_SSL);