From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 23 Dec 2021 12:33:59 +0000 (+0100)
Subject: MINOR: frontend: Always access the stream-int via the conn-stream
X-Git-Tag: v2.6-dev2~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=503d26428d32594beb83cbb8d85e65f3b6ce5ea2;p=thirdparty%2Fhaproxy.git

MINOR: frontend: Always access the stream-int via the conn-stream

To be able to move the stream-interface from the stream to the conn-stream,
all access to the SI is done via the conn-stream. This patch is limited to
the frontend part.
---

diff --git a/src/frontend.c b/src/frontend.c
index 1016a1b862..c8fb3d2ba2 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -62,7 +62,7 @@ int frontend_accept(struct stream *s)
 					s->do_log(s);
 		}
 		else if (conn) {
-			src = si_src(&s->si[0]);
+			src = si_src(cs_si(s->csf));
 			if (!src)
 				send_log(fe, LOG_INFO, "Connect from unknown source to listener %d (%s/%s)\n",
 					 l->luid, fe->id, (fe->mode == PR_MODE_HTTP) ? "HTTP" : "TCP");
@@ -73,7 +73,7 @@ int frontend_accept(struct stream *s)
 				switch (addr_to_str(src, pn, sizeof(pn))) {
 				case AF_INET:
 				case AF_INET6:
-					dst = si_dst(&s->si[0]);
+					dst = si_dst(cs_si(s->csf));
 					if (dst) {
 						addr_to_str(dst, sn, sizeof(sn));
 						port = get_host_port(dst);
@@ -113,7 +113,7 @@ int frontend_accept(struct stream *s)
 			}
 		}
 
-		src = si_src(&s->si[0]);
+		src = si_src(cs_si(s->csf));
 		if (!src) {
 			chunk_printf(&trash, "%08x:%s.accept(%04x)=%04x from [listener:%d] ALPN=%s\n",
 			             s->uniq_id, fe->id, (unsigned short)l->rx.fd, (unsigned short)conn->handle.fd,