]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: proxy: switch to conn->src in error snapshots
authorWilly Tarreau <w@1wt.eu>
Wed, 17 Jul 2019 13:20:02 +0000 (15:20 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 19 Jul 2019 11:50:09 +0000 (13:50 +0200)
The source address was taken unchecked from a client connection. In
practice we know it's set but better strengthen this now.

src/proxy.c

index 91e04a2b63120cc4eac79391898ea84ad77de295..1378941d766cf281d80f5fb252ac4388dd2eccf4 100644 (file)
@@ -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));