CLEANUP: muxes: make mux->attach/detach take a conn_stream endpoint
The mux ->detach() function currently takes a conn_stream. This causes
an awkward situation where the caller cs_detach_endp() has to partially
mark it as released but not completely so that ->detach() finds its
endpoint and context, and it cannot be done later since it's possible
that ->detach() deletes the endpoint. As such the endpoint link between
the conn_stream and the mux's stream is in a transient situation while
we'd like it to be clean so that the mux's ->detach() code can call any
regular function it wants that knows the regular semantics of the
relation between the CS and the endpoint.
A better approach consists in slightly modifying the detach() API to
better match the reality, which is that the endpoint is detached but
still alive and that it's the only part the function is interested in.
As such, this patch modifies the function to take an endpoint there,
and by analogy (or simplicity) does the same for ->attach(), even
though it looks less important there since we're always attaching an
endpoint to a conn_stream anyway. It is possible that in the future
the API could evolve to use more endpoints that provide a bit more
flexibility in the API, but at this point we don't need to go further.
diff --git a/src/mux_h1.c b/src/mux_h1.c
index e74e0fb..e41e6ef 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -3303,7 +3303,7 @@
* Attach a new stream to a connection
* (Used for outgoing connections)
*/
-static int h1_attach(struct connection *conn, struct conn_stream *cs, struct session *sess)
+static int h1_attach(struct connection *conn, struct cs_endpoint *endp, struct session *sess)
{
struct h1c *h1c = conn->ctx;
struct h1s *h1s;
@@ -3314,7 +3314,7 @@
goto err;
}
- h1s = h1c_bck_stream_new(h1c, cs, sess);
+ h1s = h1c_bck_stream_new(h1c, endp->cs, sess);
if (h1s == NULL) {
TRACE_ERROR("h1s creation failure", H1_EV_STRM_NEW|H1_EV_STRM_END|H1_EV_STRM_ERR, conn);
goto err;
@@ -3357,9 +3357,9 @@
/*
* Detach the stream from the connection and possibly release the connection.
*/
-static void h1_detach(struct conn_stream *cs)
+static void h1_detach(struct cs_endpoint *endp)
{
- struct h1s *h1s = __cs_mux(cs);
+ struct h1s *h1s = endp->target;
struct h1c *h1c;
struct session *sess;
int is_not_first;