mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-05 22:56:57 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: rhttp: support PROXY emission on preconnect

Browse Source 
Extend preconnect to support PROXY protocol emission. Code is duplicated
from connect_server() into new_reverse_conn(). This is necessary to
support send-proxy on server line used as rhttp.
This commit is contained in:
Amaury Denoyelle 2024-05-14 16:34:49 +02:00
parent 12c40c25a9
commit 7a81bfc8d2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/proto_rhttp.c
View File

@ -79,6 +79,14 @@ static struct connection *new_reverse_conn(struct listener *l, struct server *sr
*conn->dst = srv->addr; *conn->dst = srv->addr;
set_host_port(conn->dst, srv->svc_port); set_host_port(conn->dst, srv->svc_port);
conn->send_proxy_ofs = 0;
if (srv->pp_opts) {
conn->flags |= CO_FL_SEND_PROXY;
conn->send_proxy_ofs = 1; /* must compute size */
}
/* TODO support SOCKS4 */
if (conn_prepare(conn, protocol_lookup(conn->dst->ss_family, PROTO_TYPE_STREAM, 0), srv->xprt)) if (conn_prepare(conn, protocol_lookup(conn->dst->ss_family, PROTO_TYPE_STREAM, 0), srv->xprt))
goto err; goto err;
@ -97,6 +105,14 @@ static struct connection *new_reverse_conn(struct listener *l, struct server *sr
} }
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
/* The CO_FL_SEND_PROXY flag may have been set by the connect method,
* if so, add our handshake pseudo-XPRT now.
*/
if (conn->flags & CO_FL_HANDSHAKE) {
if (xprt_add_hs(conn) < 0)
goto err;
}
if (conn_xprt_start(conn) < 0) if (conn_xprt_start(conn) < 0)
goto err; goto err;
@ -107,8 +123,6 @@ static struct connection *new_reverse_conn(struct listener *l, struct server *sr
goto err; goto err;
} }
/* Not expected here. */
BUG_ON((conn->flags & CO_FL_HANDSHAKE));
return conn; return conn;
err: err: