From 661167d136d5bf4ac40ac4fae450d66dd69a64df Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Wed, 29 May 2019 17:08:03 +0200 Subject: [PATCH] BUG/MEDIUM: connection: Use the session to get the origin address if needed. In conn_si_send_proxy(), if we don't have a conn_stream yet, because the mux won't be created until the SSL handshake is done, retrieve the opposite's connection from the session. At this point, we know the session associated with the connection is the one that initiated it, and we can thus just use the session's origin. This should be backported to 1.9. --- src/stream_interface.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/stream_interface.c b/src/stream_interface.c index 3a3824c67..fd5311d83 100644 --- a/src/stream_interface.c +++ b/src/stream_interface.c @@ -360,6 +360,21 @@ int conn_si_send_proxy(struct connection *conn, unsigned int flag) ret = make_proxy_line(trash.area, trash.size, objt_server(conn->target), remote_cs ? remote_cs->conn : NULL); + /* We may not have a conn_stream yet, if we don't + * know which mux to use, because it will be decided + * during the SSL handshake. In this case, there should + * be a session associated to the connection in + * conn->owner, and we know it is the session that + * initiated that connection, so we can just use + * its origin, which should contain the client + * connection. + */ + } else if (!cs && conn->owner) { + struct session *sess = conn->owner; + + ret = make_proxy_line(trash.area, trash.size, + objt_server(conn->target), + objt_conn(sess->origin)); } else { /* The target server expects a LOCAL line to be sent first. Retrieving