From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 23 Dec 2021 13:00:22 +0000 (+0100)
Subject: MINOR: sink: Always access the stream-int via the conn-stream
X-Git-Tag: v2.6-dev2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=108ce5a70bbae6a693ea7939b54ea5a2028f7223;p=thirdparty%2Fhaproxy.git

MINOR: sink: 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 sink part.
---

diff --git a/src/sink.c b/src/sink.c
index b09b8959ab..7a4751b242 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -668,10 +668,10 @@ static struct appctx *sink_forward_session_create(struct sink *sink, struct sink
 
 
 	s->target = &sft->srv->obj_type;
-	if (!sockaddr_alloc(&s->si[1].dst, &sft->srv->addr, sizeof(sft->srv->addr)))
+	if (!sockaddr_alloc(&cs_si(s->csb)->dst, &sft->srv->addr, sizeof(sft->srv->addr)))
 		goto out_free_strm;
 	s->flags = SF_ASSIGNED|SF_ADDR_SET;
-	s->si[1].flags |= SI_FL_NOLINGER;
+	cs_si(s->csb)->flags |= SI_FL_NOLINGER;
 
 	s->do_log = NULL;
 	s->uniq_id = 0;