CLEANUP: conn_stream: rename the cs_endpoint's context to "conn"
This one is exclusively used by the connection, regardless its generic
name "ctx" is rather confusing. Let's make it a struct connection* and
call it "conn". This way there's no doubt about what it is and there's
no way it will be used by accident by being taken for something else.
diff --git a/include/haproxy/conn_stream-t.h b/include/haproxy/conn_stream-t.h
index 6701107..b56e1bd 100644
--- a/include/haproxy/conn_stream-t.h
+++ b/include/haproxy/conn_stream-t.h
@@ -157,13 +157,13 @@
* new cs-endpoint (for instance on connection retries).
*
* <target> is the mux or the appctx
- * <ctx> is the context set and used by <target>
+ * <conn> is the connection for connection-based streams
* <cs> is the conn_stream we're attached to, or NULL
* <flags> CS_EP_*
*/
struct cs_endpoint {
void *target;
- void *ctx;
+ struct connection *conn;
struct conn_stream *cs;
unsigned int flags;
};
diff --git a/include/haproxy/conn_stream.h b/include/haproxy/conn_stream.h
index cfc8a49..1629754 100644
--- a/include/haproxy/conn_stream.h
+++ b/include/haproxy/conn_stream.h
@@ -56,19 +56,13 @@
return cs->endp->target;
}
-/* Returns the endpoint context without any control */
-static inline void *__cs_endp_ctx(const struct conn_stream *cs)
-{
- return cs->endp->ctx;
-}
-
/* Returns the connection from a cs if the endpoint is a mux stream. Otherwise
* NULL is returned. __cs_conn() returns the connection without any control
* while cs_conn() check the endpoint type.
*/
static inline struct connection *__cs_conn(const struct conn_stream *cs)
{
- return __cs_endp_ctx(cs);
+ return cs->endp->conn;
}
static inline struct connection *cs_conn(const struct conn_stream *cs)
{
diff --git a/include/haproxy/mux_quic.h b/include/haproxy/mux_quic.h
index 1d71abd..b3284b1 100644
--- a/include/haproxy/mux_quic.h
+++ b/include/haproxy/mux_quic.h
@@ -101,7 +101,7 @@
return NULL;
qcs->endp->target = qcs;
- qcs->endp->ctx = qcc->conn;
+ qcs->endp->conn = qcc->conn;
qcs->endp->flags |= (CS_EP_T_MUX|CS_EP_ORPHAN|CS_EP_NOT_FIRST);
/* TODO duplicated from mux_h2 */
diff --git a/src/conn_stream.c b/src/conn_stream.c
index 772feb9..9147eda 100644
--- a/src/conn_stream.c
+++ b/src/conn_stream.c
@@ -85,7 +85,7 @@
void cs_endpoint_init(struct cs_endpoint *endp)
{
endp->target = NULL;
- endp->ctx = NULL;
+ endp->conn = NULL;
endp->cs = NULL;
endp->flags = CS_EP_NONE;
}
@@ -248,7 +248,7 @@
struct connection *conn = ctx;
cs->endp->target = target;
- cs->endp->ctx = ctx;
+ cs->endp->conn = ctx;
cs->endp->flags |= CS_EP_T_MUX;
cs->endp->flags &= ~CS_EP_DETACHED;
if (!conn->ctx)
@@ -381,7 +381,7 @@
if (cs->endp) {
/* the cs is the only one one the endpoint */
cs->endp->target = NULL;
- cs->endp->ctx = NULL;
+ cs->endp->conn = NULL;
cs->endp->flags &= CS_EP_APP_MASK;
cs->endp->flags |= CS_EP_DETACHED;
}
diff --git a/src/mux_h1.c b/src/mux_h1.c
index c5f0b03..14e399f 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -822,7 +822,7 @@
if (!h1s->endp)
goto fail;
h1s->endp->target = h1s;
- h1s->endp->ctx = h1c->conn;
+ h1s->endp->conn = h1c->conn;
h1s->endp->flags |= (CS_EP_T_MUX|CS_EP_ORPHAN);
}
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 9ed2727..cd57d98 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -1613,7 +1613,7 @@
if (!h2s->endp)
goto out_close;
h2s->endp->target = h2s;
- h2s->endp->ctx = h2c->conn;
+ h2s->endp->conn = h2c->conn;
h2s->endp->flags |= (CS_EP_T_MUX|CS_EP_ORPHAN|CS_EP_NOT_FIRST);
/* FIXME wrong analogy between ext-connect and websocket, this need to
diff --git a/src/mux_pt.c b/src/mux_pt.c
index 821f558..338e4fe 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -299,7 +299,7 @@
goto fail_free_ctx;
}
ctx->endp->target = ctx;
- ctx->endp->ctx = conn;
+ ctx->endp->conn = conn;
ctx->endp->flags |= (CS_EP_T_MUX|CS_EP_ORPHAN);
cs = cs_new_from_endp(ctx->endp, sess, input);
@@ -419,7 +419,7 @@
*/
static void mux_pt_detach(struct cs_endpoint *endp)
{
- struct connection *conn = endp->ctx;
+ struct connection *conn = endp->conn;
struct mux_pt_ctx *ctx;
TRACE_ENTER(PT_EV_STRM_END, conn, endp->cs);