commit 967955b156cc8423ac5f52282eead9ca94a0f856
author Willy Tarreau <w@1wt.eu> Wed May 18 18:15:18 2022 +0200
committer Willy Tarreau <w@1wt.eu> Fri May 27 19:33:34 2022 +0200
tree 5ef444049d2a99b0aaf29b1b25f8f1b8107cf278
parent 108423819c6d2bf32e5aca70918ff4158e878dc7

CLEANUP: stconn: rename cs_ep_set_error() to se_fl_set_error()

First it applies to the stream endpoint and not the conn_stream, and
second it only tests and touches the flags so it makes sense to call
it se_fl_ like other functions which only manipulate the flags, as
it's just a special case of flags.

include/haproxy/conn_stream.h

diff --git a/include/haproxy/conn_stream.h b/include/haproxy/conn_stream.h
index e3d2b71..5bfffd9 100644
--- a/include/haproxy/conn_stream.h
+++ b/include/haproxy/conn_stream.h
@@ -92,6 +92,15 @@
 	return se->flags;
 }
 
+/* sets SE_FL_ERROR or SE_FL_ERR_PENDING on the endpoint */
+static inline void se_fl_set_error(struct sedesc *se)
+{
+	if (se_fl_test(se, SE_FL_EOS))
+		se_fl_set(se, SE_FL_ERROR);
+	else
+		se_fl_set(se, SE_FL_ERR_PENDING);
+}
+
 /* stream connector version */
 static forceinline void sc_ep_zero(struct stconn *sc)
 {
@@ -274,15 +283,6 @@
 	sc_conn_shutr(cs, CO_SHR_DRAIN);
 }
 
-/* sets SE_FL_ERROR or SE_FL_ERR_PENDING on the endpoint */
-static inline void cs_ep_set_error(struct sedesc *endp)
-{
-	if (se_fl_test(endp, SE_FL_EOS))
-		se_fl_set(endp, SE_FL_ERROR);
-	else
-		se_fl_set(endp, SE_FL_ERR_PENDING);
-}
-
 /* Returns non-zero if the stream connector's Rx path is blocked */
 static inline int cs_rx_blocked(const struct stconn *cs)
 {

src/mux_fcgi.c

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 5bde48b..058ab3b 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -927,7 +927,7 @@
 			fstrm->state = FCGI_SS_ERROR;
 			TRACE_STATE("switching to ERROR", FCGI_EV_FSTRM_ERR, fstrm->fconn->conn, fstrm);
 		}
-		cs_ep_set_error(fstrm->endp);
+		se_fl_set_error(fstrm->endp);
 	}
 }
 
@@ -4120,7 +4120,7 @@
 
 	if (fstrm->state == FCGI_SS_ERROR) {
 		TRACE_DEVEL("reporting error to the app-layer stream", FCGI_EV_STRM_SEND|FCGI_EV_FSTRM_ERR|FCGI_EV_STRM_ERR, fconn->conn, fstrm);
-		cs_ep_set_error(fstrm->endp);
+		se_fl_set_error(fstrm->endp);
 		if (!(fstrm->flags & FCGI_SF_BEGIN_SENT) || fcgi_strm_send_abort(fconn, fstrm))
 			fcgi_strm_close(fstrm);
 	}

src/mux_h2.c

diff --git a/src/mux_h2.c b/src/mux_h2.c
index 4a3a701..1e50bed 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1284,7 +1284,7 @@
 		h2s->errcode = err;
 		if (h2s->st < H2_SS_ERROR)
 			h2s->st = H2_SS_ERROR;
-		cs_ep_set_error(h2s->endp);
+		se_fl_set_error(h2s->endp);
 	}
 }
 
@@ -2756,7 +2756,7 @@
 	h2s_close(h2s);
 
 	if (h2s_sc(h2s)) {
-		cs_ep_set_error(h2s->endp);
+		se_fl_set_error(h2s->endp);
 		h2s_alert(h2s);
 	}
 
@@ -6668,7 +6668,7 @@
 	/* RST are sent similarly to frame acks */
 	if (h2s->st == H2_SS_ERROR || h2s->flags & H2_SF_RST_RCVD) {
 		TRACE_DEVEL("reporting RST/error to the app-layer stream", H2_EV_H2S_SEND|H2_EV_H2S_ERR|H2_EV_STRM_ERR, h2s->h2c->conn, h2s);
-		cs_ep_set_error(h2s->endp);
+		se_fl_set_error(h2s->endp);
 		if (h2s_send_rst_stream(h2s->h2c, h2s) > 0)
 			h2s_close(h2s);
 	}