commit 6001c9217cac5f065261cf818b835f772fcc39e7
author Willy Tarreau <w@1wt.eu> Tue May 24 09:08:33 2022 +0200
committer Willy Tarreau <w@1wt.eu> Fri May 27 19:33:34 2022 +0200
tree 5fa80aac9d318a30d19fbea3919cd22ac8e4f888
parent 967955b156cc8423ac5f52282eead9ca94a0f856

CLEANUP: stconn: make a few functions take a const argument

A number of functions in cs_utils.h are not usable from functions taking
a const because they're not declared as using const, despite never
modifying the stconn. Let's address this for the following ones:

  sc_ic(), sc_oc(), sc_ib(), sc_ob(), sc_strm_task(),
  cs_opposite(), sc_conn_ready(), cs_src(), cs_dst(),

include/haproxy/cs_utils.h

diff --git a/include/haproxy/cs_utils.h b/include/haproxy/cs_utils.h
index 1add209..9f5463d 100644
--- a/include/haproxy/cs_utils.h
+++ b/include/haproxy/cs_utils.h
@@ -42,7 +42,7 @@
 
 
 /* returns the channel which receives data from this stream connector (input channel) */
-static inline struct channel *sc_ic(struct stconn *cs)
+static inline struct channel *sc_ic(const struct stconn *cs)
 {
 	struct stream *strm = __sc_strm(cs);
 
@@ -50,7 +50,7 @@
 }
 
 /* returns the channel which feeds data to this stream connector (output channel) */
-static inline struct channel *sc_oc(struct stconn *cs)
+static inline struct channel *sc_oc(const struct stconn *cs)
 {
 	struct stream *strm = __sc_strm(cs);
 
@@ -58,18 +58,18 @@
 }
 
 /* returns the buffer which receives data from this stream connector (input channel's buffer) */
-static inline struct buffer *sc_ib(struct stconn *cs)
+static inline struct buffer *sc_ib(const struct stconn *cs)
 {
 	return &sc_ic(cs)->buf;
 }
 
 /* returns the buffer which feeds data to this stream connector (output channel's buffer) */
-static inline struct buffer *sc_ob(struct stconn *cs)
+static inline struct buffer *sc_ob(const struct stconn *cs)
 {
 	return &sc_oc(cs)->buf;
 }
 /* returns the stream's task associated to this stream connector */
-static inline struct task *sc_strm_task(struct stconn *cs)
+static inline struct task *sc_strm_task(const struct stconn *cs)
 {
 	struct stream *strm = __sc_strm(cs);
 
@@ -77,7 +77,7 @@
 }
 
 /* returns the stream connector on the other side. Used during forwarding. */
-static inline struct stconn *cs_opposite(struct stconn *cs)
+static inline struct stconn *cs_opposite(const struct stconn *cs)
 {
 	struct stream *strm = __sc_strm(cs);
 
@@ -120,9 +120,9 @@
 /* Returns true if a connection is attached to the stream connector <cs> and if this
  * connection is ready.
  */
-static inline int sc_conn_ready(struct stconn *cs)
+static inline int sc_conn_ready(const struct stconn *cs)
 {
-	struct connection *conn = sc_conn(cs);
+	const struct connection *conn = sc_conn(cs);
 
 	return conn && conn_ctrl_ready(conn) && conn_xprt_ready(conn);
 }
@@ -136,7 +136,7 @@
  */
 static inline int cs_is_conn_error(const struct stconn *cs)
 {
-	struct connection *conn;
+	const struct connection *conn;
 
 	if (cs->state >= SC_ST_EST)
 		return 0;
@@ -169,7 +169,7 @@
  * the session for frontend CS and the server connection for the backend CS. It
  * returns a const address on success or NULL on failure.
  */
-static inline const struct sockaddr_storage *cs_src(struct stconn *cs)
+static inline const struct sockaddr_storage *cs_src(const struct stconn *cs)
 {
 	if (cs->src)
 		return cs->src;
@@ -189,7 +189,7 @@
  * on the session for frontend CS and the server connection for the backend
  * CS. It returns a const address on success or NULL on failure.
  */
-static inline const struct sockaddr_storage *cs_dst(struct stconn *cs)
+static inline const struct sockaddr_storage *cs_dst(const struct stconn *cs)
 {
 	if (cs->dst)
 		return cs->dst;