CLEANUP: connection: rename conn->mux_ctx to conn->ctx
We most often store the mux context there but it can also be something
else while setting up the connection. Better call it "ctx" and know
that it's the owner's context than misleadingly call it mux_ctx and
get caught doing suspicious tricks.
diff --git a/include/proto/connection.h b/include/proto/connection.h
index 05148bb..441b51d 100644
--- a/include/proto/connection.h
+++ b/include/proto/connection.h
@@ -520,7 +520,7 @@
conn->mux = NULL;
conn->xprt_st = 0;
conn->xprt_ctx = NULL;
- conn->mux_ctx = NULL;
+ conn->ctx = NULL;
}
/*
@@ -545,7 +545,7 @@
conn->tmp_early_data = -1;
conn->sent_early_data = 0;
conn->mux = NULL;
- conn->mux_ctx = NULL;
+ conn->ctx = NULL;
conn->owner = NULL;
conn->send_proxy_ofs = 0;
conn->handle.fd = DEAD_FD_MAGIC;
@@ -672,8 +672,8 @@
/* If we temporarily stored the connection as the stream_interface's
* end point, remove it.
*/
- if (conn->mux_ctx != NULL && conn->mux == NULL) {
- struct stream *s = conn->mux_ctx;
+ if (conn->ctx != NULL && conn->mux == NULL) {
+ struct stream *s = conn->ctx;
if (objt_conn(s->si[1].end) == conn)
s->si[1].end = NULL;
@@ -823,7 +823,7 @@
void *ctx, struct proxy *prx, struct session *sess)
{
conn->mux = mux;
- conn->mux_ctx = ctx;
+ conn->ctx = ctx;
return mux->init ? mux->init(conn, prx, sess) : 0;
}
diff --git a/include/types/connection.h b/include/types/connection.h
index 430e92a..f1fd7a0 100644
--- a/include/types/connection.h
+++ b/include/types/connection.h
@@ -429,7 +429,7 @@
const struct xprt_ops *xprt; /* operations at the transport layer */
const struct mux_ops *mux; /* mux layer opreations. Must be set before xprt->init() */
void *xprt_ctx; /* general purpose pointer, initialized to NULL */
- void *mux_ctx; /* mux-specific context, initialized to NULL */
+ void *ctx; /* highest level context (usually the mux), initialized to NULL */
void *owner; /* pointer to the owner session, or NULL */
enum obj_type *target; /* the target to connect to (server, proxy, applet, ...) */