From: Willy Tarreau <w@1wt.eu>
Date: Sat, 24 Nov 2012 10:23:04 +0000 (+0100)
Subject: BUG/MEDIUM: connection: local_send_proxy must wait for connection to establish
X-Git-Tag: v1.5-dev14~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3635edc885e066491dd4db9688862149a538ab6;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: connection: local_send_proxy must wait for connection to establish

The conn_local_send_proxy() function has to retrieve the local and remote
addresses, but the getpeername() and getsockname() functions may fail until
the connection is established. So now we catch this error and poll for write
when this happens.
---

diff --git a/src/connection.c b/src/connection.c
index 38d4ca6289..d882bb74d3 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -531,14 +531,16 @@ int conn_local_send_proxy(struct connection *conn, unsigned int flag)
 	if (conn->flags & CO_FL_SOCK_WR_SH)
 		goto out_error;
 
-	/* The target server expects a PROXY line to be sent first. */
+	/* The target server expects a PROXY 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_error;
+		goto out_wait;
 
 	conn_get_to_addr(conn);
 	if (!(conn->flags & CO_FL_ADDR_TO_SET))
-		goto out_error;
+		goto out_wait;
 
 	trash.len = make_proxy_line(trash.str, trash.size, &conn->addr.from, &conn->addr.to);
 	if (!trash.len)