BUG/MINOR: proxy: only use proxy_inc_fe_cum_sess_ver_ctr() with frontends

proxy_inc_fe_cum_sess_ver_ctr() was implemented in 9969adbc
("MINOR: stats: add by HTTP version cumulated number of sessions and
requests")

As its name suggests, it is meant to be called for frontends, not backends

Also, in 9969adbc, when used under h1_init(), a precaution is taken to
ensure that the function is only called with frontends.

However, this precaution was not applied in h2_init() and qc_init().

Due to this, it remains possible to have proxy_inc_fe_cum_sess_ver_ctr()
being called with a backend proxy as parameter. While it did not cause
known issues so far, it is not expected and could result in bugs in the
future. Better fix this by ensuring the function is only called with
frontends.

It may be backported up to 2.8

(cherry picked from commit b39825ee45150415d7ed64b7ce785bb946f727bd)
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/src/mux_h2.c b/src/mux_h2.c
index dbd7086..06acc9b 100644 (file)
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1367,7 +1367,7 @@ static int h2_init(struct connection *conn, struct proxy *prx, struct session *s
                        goto fail_stream;
        }
 
-       if (sess)
+       if (sess && !conn_is_back(conn))
                proxy_inc_fe_cum_sess_ver_ctr(sess->listener, prx, 2);
 
        /* Rhttp connections are only accounted after reverse completion. */

diff --git a/src/mux_quic.c b/src/mux_quic.c
index 458da36..0b9be32 100644 (file)
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -3161,7 +3161,7 @@ static int qmux_init(struct connection *conn, struct proxy *prx,
                goto err;
        }
 
-       if (qcc->app_ops == &h3_ops)
+       if (qcc->app_ops == &h3_ops && !conn_is_back(conn))
                proxy_inc_fe_cum_sess_ver_ctr(sess->listener, prx, 3);
 
        /* Register conn for idle front closing. This is done once everything is allocated. */