From: Willy Tarreau <w@1wt.eu>
Date: Wed, 17 Jul 2019 13:20:02 +0000 (+0200)
Subject: MINOR: proxy: switch to conn->src in error snapshots
X-Git-Tag: v2.1-dev2~310
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=026efc71c8f766667e3803cad357ad7cf051c942;p=thirdparty%2Fhaproxy.git

MINOR: proxy: switch to conn->src in error snapshots

The source address was taken unchecked from a client connection. In
practice we know it's set but better strengthen this now.
---

diff --git a/src/proxy.c b/src/proxy.c
index 91e04a2b63..1378941d76 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1525,8 +1525,8 @@ void proxy_capture_error(struct proxy *proxy, int is_back,
 	es->when    = date; // user-visible date
 	es->srv     = objt_server(target);
 	es->oe      = other_end;
-	if (objt_conn(sess->origin))
-		es->src  = __objt_conn(sess->origin)->addr.from;
+	if (objt_conn(sess->origin) && conn_get_src(__objt_conn(sess->origin)))
+		es->src  = *__objt_conn(sess->origin)->src;
 	else
 		memset(&es->src, 0, sizeof(es->src));