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

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

diff --git a/src/peers.c b/src/peers.c
index 76a091722b..8e7246dc0b 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -3216,15 +3216,15 @@ static struct appctx *peer_session_create(struct peers *peers, struct peer *peer
 	}
 
 	/* applet is waiting for data */
-	si_cant_get(&s->si[0]);
+	si_cant_get(cs_si(s->csf));
 	appctx_wakeup(appctx);
 
 	/* initiate an outgoing connection */
 	s->target = peer_session_target(peer, s);
-	if (!sockaddr_alloc(&s->si[1].dst, &peer->addr, sizeof(peer->addr)))
+	if (!sockaddr_alloc(&(cs_si(s->csb)->dst), &peer->addr, sizeof(peer->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;