From 725170eee67a12894c0aa5d97c98fcc3fa4f9d68 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Fri, 14 Apr 2023 12:05:25 +0200 Subject: [PATCH] MEDIUM: backend: Stop to use SE flags to detect connection errors SE_FL_ERROR flag is no longer set when an error is detected durign the connection establishment. SC_FL_ERROR flag is set instead. So it is safe to remove test on SE_FL_ERROR to detect connection establishment error. --- src/backend.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend.c b/src/backend.c index 2d4ea4b28..f709015d4 100644 --- a/src/backend.c +++ b/src/backend.c @@ -1955,7 +1955,7 @@ int srv_redispatch_connect(struct stream *s) /* Check if the connection request is in such a state that it can be aborted. */ static int back_may_abort_req(struct channel *req, struct stream *s) { - return ((s->scf->flags & SC_FL_ERROR) || sc_ep_test(s->scf, SE_FL_ERROR) || + return ((s->scf->flags & SC_FL_ERROR) || ((s->scb->flags & (SC_FL_SHUT_WANTED|SC_FL_SHUT_DONE)) && /* empty and client aborted */ (channel_is_empty(req) || (s->be->options & PR_O_ABRT_CLOSE)))); } @@ -2260,9 +2260,9 @@ void back_handle_st_con(struct stream *s) done: /* retryable error ? */ - if ((s->flags & SF_CONN_EXP) || sc_ep_test(sc, SE_FL_ERROR) || (sc->flags & SC_FL_ERROR)) { + if ((s->flags & SF_CONN_EXP) || (sc->flags & SC_FL_ERROR)) { if (!s->conn_err_type) { - if ((sc->flags & SC_FL_ERROR) || sc_ep_test(sc, SE_FL_ERROR)) + if ((sc->flags & SC_FL_ERROR)) s->conn_err_type = STRM_ET_CONN_ERR; else s->conn_err_type = STRM_ET_CONN_TO; @@ -2288,7 +2288,7 @@ void back_handle_st_con(struct stream *s) void back_handle_st_cer(struct stream *s) { struct stconn *sc = s->scb; - int must_tar = !!(sc->flags & SC_FL_ERROR) || sc_ep_test(sc, SE_FL_ERROR); + int must_tar = !!(sc->flags & SC_FL_ERROR); DBG_TRACE_ENTER(STRM_EV_STRM_PROC|STRM_EV_CS_ST, s); @@ -2306,7 +2306,7 @@ void back_handle_st_cer(struct stream *s) _HA_ATOMIC_DEC(&__objt_server(s->target)->cur_sess); } - if (((sc->flags & SC_FL_ERROR) || sc_ep_test(sc, SE_FL_ERROR)) && + if ((sc->flags & SC_FL_ERROR) && conn && conn->err_code == CO_ER_SSL_MISMATCH_SNI) { /* We tried to connect to a server which is configured * with "verify required" and which doesn't have the @@ -2482,7 +2482,7 @@ void back_handle_st_rdy(struct stream *s) } /* retryable error ? */ - if (sc->flags & SC_FL_ERROR || sc_ep_test(sc, SE_FL_ERROR)) { + if (sc->flags & SC_FL_ERROR) { if (!s->conn_err_type) s->conn_err_type = STRM_ET_CONN_ERR; sc->state = SC_ST_CER;