From 7bb447c3ddcc3f5cd5d117d4cd3f79f334ff6730 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 17 Jul 2019 11:40:51 +0200 Subject: [PATCH] MINOR: stream-int: use conn_get_{src,dst} in conn_si_send_proxy() These ones replace the previous conn_get_{from,to}_addr() used to wait for the connection establishment before sending a LOCAL line. The error handling was preserved. --- src/stream_interface.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/stream_interface.c b/src/stream_interface.c index 9b9a8e9fa..75e60ff60 100644 --- a/src/stream_interface.c +++ b/src/stream_interface.c @@ -381,12 +381,7 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag) /* The target server expects a LOCAL line to be sent first. Retrieving * local or remote addresses may fail until the connection is established. */ - conn_get_from_addr(conn); - if (!(conn->flags & CO_FL_ADDR_FROM_SET)) - goto out_wait; - - conn_get_to_addr(conn); - if (!(conn->flags & CO_FL_ADDR_TO_SET)) + if (!conn_get_src(conn) || !conn_get_dst(conn)) goto out_wait; ret = make_proxy_line(trash.area, trash.size,