]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: proxy: Always access the stream-int via the conn-stream
authorChristopher Faulet <cfaulet@haproxy.com>
Thu, 23 Dec 2021 12:34:47 +0000 (13:34 +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 proxy part.

src/proxy.c

index a130e00f897ea35a7bd7e8f20103b453a974f1b5..c392b4c6c92fdbd09ce47cdf0594d33eec68f7cf 100644 (file)
@@ -2265,12 +2265,12 @@ int stream_set_backend(struct stream *s, struct proxy *be)
        proxy_inc_be_ctr(be);
 
        /* assign new parameters to the stream from the new backend */
-       s->si[1].flags &= ~SI_FL_INDEP_STR;
+       cs_si(s->csb)->flags &= ~SI_FL_INDEP_STR;
        if (be->options2 & PR_O2_INDEPSTR)
-               s->si[1].flags |= SI_FL_INDEP_STR;
+               cs_si(s->csb)->flags |= SI_FL_INDEP_STR;
 
        if (tick_isset(be->timeout.serverfin))
-               s->si[1].hcto = be->timeout.serverfin;
+               cs_si(s->csb)->hcto = be->timeout.serverfin;
 
        /* We want to enable the backend-specific analysers except those which
         * were already run as part of the frontend/listener. Note that it would