]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: sink: Always access the stream-int via the conn-stream
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 23 Dec 2021 13:00:22 +0000 (14:00 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Thu, 24 Feb 2022 10:00:02 +0000 (11:00 +0100)
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.

src/sink.c

index b09b8959ab8ce6ceee37d3857de2fc9f9a86773c..7a4751b24271e4c69fee4b2b81cba4860fadc806 100644 (file)
@@ -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;