commit 0eb32c0dd19d25730ceddb4daf1acbd8708e4818
author Christopher Faulet <cfaulet@haproxy.com> Mon Apr 04 11:06:31 2022 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Wed Apr 13 15:10:16 2022 +0200
tree ea79354903a5f509113c737483e1f41654947232
parent 1d03e6e3a1dbfd626fcf92bd4dacc570cc363ae2

MINOR: stream: Use conn-stream to report server error

the stream's srv_error callback function now manipulates a conn-stream
instead of a stream-interface.

src/backend.c

diff --git a/src/backend.c b/src/backend.c
index 8983e1d..3232f0e 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1995,7 +1995,7 @@
 			/* no stream was ever accounted for this server */
 			cs->state = CS_ST_CLO;
 			if (s->srv_error)
-				s->srv_error(s, cs->si);
+				s->srv_error(s, cs);
 			DBG_TRACE_STATE("internal error during connection", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 			goto end;
 		}
@@ -2050,7 +2050,7 @@
 				s->conn_err_type = STRM_ET_QUEUE_TO;
 			cs->state = CS_ST_CLO;
 			if (s->srv_error)
-				s->srv_error(s, cs->si);
+				s->srv_error(s, cs);
 			DBG_TRACE_STATE("connection request still queued", STRM_EV_STRM_PROC|STRM_EV_CS_ST, s);
 			goto end;
 		}
@@ -2107,7 +2107,7 @@
 	cs_shutw(cs);
 	cs->state = CS_ST_CLO;
 	if (s->srv_error)
-		s->srv_error(s, cs->si);
+		s->srv_error(s, cs);
 	DBG_TRACE_DEVEL("leaving on error", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 	return;
 }
@@ -2147,7 +2147,7 @@
 			s->conn_err_type = STRM_ET_CONN_RES;
 			cs->state = CS_ST_CLO;
 			if (s->srv_error)
-				s->srv_error(s, cs->si);
+				s->srv_error(s, cs);
 			DBG_TRACE_STATE("failed to register applet", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 			goto end;
 		}
@@ -2182,7 +2182,7 @@
 			s->conn_err_type = STRM_ET_CONN_OTHER;
 		cs->state = CS_ST_CLO;
 		if (s->srv_error)
-			s->srv_error(s, cs->si);
+			s->srv_error(s, cs);
 		DBG_TRACE_STATE("connection request failed", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 		goto end;
 	}
@@ -2220,7 +2220,7 @@
 		cs_shutw(cs);
 		s->conn_err_type |= STRM_ET_CONN_ABRT;
 		if (s->srv_error)
-			s->srv_error(s, cs->si);
+			s->srv_error(s, cs);
 		/* Note: state = CS_ST_DIS now */
 		DBG_TRACE_STATE("client abort during connection attempt", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 		goto end;
@@ -2319,7 +2319,7 @@
 
 		cs->state = CS_ST_CLO;
 		if (s->srv_error)
-			s->srv_error(s, cs->si);
+			s->srv_error(s, cs);
 
 		DBG_TRACE_STATE("connection failed", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 		goto end;
@@ -2353,7 +2353,7 @@
 
 		cs->state = CS_ST_CLO;
 		if (s->srv_error)
-			s->srv_error(s, cs->si);
+			s->srv_error(s, cs);
 
 		DBG_TRACE_STATE("error resetting endpoint", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 		goto end;
@@ -2436,7 +2436,7 @@
 			cs_shutw(cs);
 			s->conn_err_type |= STRM_ET_CONN_ABRT;
 			if (s->srv_error)
-				s->srv_error(s, cs->si);
+				s->srv_error(s, cs);
 			DBG_TRACE_STATE("client abort during connection attempt", STRM_EV_STRM_PROC|STRM_EV_CS_ST|STRM_EV_STRM_ERR, s);
 			goto end;
 		}