MEDIUM: mux: provide the session to the init() and attach() method.
Instead of trying to get the session from the connection, which is not
always there, and of course there could be multiple sessions per connection,
provide it with the init() and attach() methods, so that we know the
session for each outgoing stream.
diff --git a/src/backend.c b/src/backend.c
index 83ae51d..c79302d 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1074,7 +1074,7 @@
cs = si_alloc_cs(&s->si[1], conn);
if (!cs)
goto fail;
- if (conn_install_mux_be(conn, cs) < 0)
+ if (conn_install_mux_be(conn, cs, s->sess) < 0)
goto fail;
srv = objt_server(s->target);
if (srv && ((s->be->options & PR_O_REUSE_MASK) == PR_O_REUSE_ALWS) &&
@@ -1275,7 +1275,7 @@
LIST_DEL(&srv_conn->list);
LIST_INIT(&srv_conn->list);
}
- srv_cs = srv_conn->mux->attach(srv_conn);
+ srv_cs = srv_conn->mux->attach(srv_conn, s->sess);
if (srv_cs)
si_attach_cs(&s->si[1], srv_cs);
}
@@ -1324,7 +1324,7 @@
conn_free(srv_conn);
return SF_ERR_RESOURCE;
}
- if (conn_install_mux_be(srv_conn, srv_cs) < 0)
+ if (conn_install_mux_be(srv_conn, srv_cs, s->sess) < 0)
return SF_ERR_INTERNAL;
/* If we're doing http-reuse always, and the connection
* is an http2 connection, add it to the available list,
diff --git a/src/checks.c b/src/checks.c
index 282ed88..e4bb732 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -1604,7 +1604,7 @@
clear_addr(&conn->addr.from);
conn_prepare(conn, proto, check->xprt);
- conn_install_mux(conn, &mux_pt_ops, cs, s->proxy);
+ conn_install_mux(conn, &mux_pt_ops, cs, s->proxy, NULL);
cs_attach(cs, check, &check_conn_cb);
/* only plain tcp-check supports quick ACK */
@@ -2787,7 +2787,7 @@
}
conn_prepare(conn, proto, xprt);
- conn_install_mux(conn, &mux_pt_ops, cs, s->proxy);
+ conn_install_mux(conn, &mux_pt_ops, cs, s->proxy, NULL);
cs_attach(cs, check, &check_conn_cb);
ret = SF_ERR_INTERNAL;
diff --git a/src/mux_h1.c b/src/mux_h1.c
index 0a8f874..d116cbd 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -92,6 +92,7 @@
struct wait_event *recv_wait; /* Address of the wait_event the conn_stream associated is waiting on */
struct wait_event *send_wait; /* Address of the wait_event the conn_stream associated is waiting on */
+ struct session *sess; /* Associated session */
struct h1m req;
struct h1m res;
@@ -239,7 +240,7 @@
return NULL;
}
-static struct h1s *h1s_create(struct h1c *h1c, struct conn_stream *cs)
+static struct h1s *h1s_create(struct h1c *h1c, struct conn_stream *cs, struct session *sess)
{
struct h1s *h1s;
@@ -250,6 +251,8 @@
h1s->h1c = h1c;
h1c->h1s = h1s;
+ h1s->sess = sess;
+
h1s->cs = NULL;
h1s->flags = H1S_F_NONE;
@@ -291,7 +294,8 @@
h1s->cs = cs;
}
else {
- struct session *sess = h1c->conn->owner;
+ /* For frontend connections we should always have a session */
+ sess = h1c->conn->owner;
h1s->csinfo.create_date = sess->accept_date;
h1s->csinfo.tv_create = sess->tv_accept;
@@ -345,7 +349,7 @@
* points to the existing conn_stream (for outgoing connections) or NULL (for
* incoming ones). Returns < 0 on error.
*/
-static int h1_init(struct connection *conn, struct proxy *proxy)
+static int h1_init(struct connection *conn, struct proxy *proxy, struct session *sess)
{
struct h1c *h1c;
@@ -372,7 +376,7 @@
h1c->flags |= H1C_F_CS_WAIT_CONN;
/* Always Create a new H1S */
- if (!h1s_create(h1c, conn->mux_ctx))
+ if (!h1s_create(h1c, conn->mux_ctx, sess))
goto fail;
conn->mux_ctx = h1c;
@@ -616,19 +620,19 @@
static void h1_set_srv_conn_mode(struct h1s *h1s, struct h1m *h1m)
{
struct h1c *h1c = h1s->h1c;
- struct session *sess = h1c->conn->owner;
- struct proxy *fe = sess->fe;
+ struct session *sess = h1s->sess;
struct proxy *be = h1c->px;
int flag = H1S_F_WANT_KAL;
+ int fe_flags = sess ? sess->fe->options : 0;
/* Tunnel mode can only by set on the frontend */
- if ((fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_TUN)
+ if ((fe_flags & PR_O_HTTP_MODE) == PR_O_HTTP_TUN)
flag = H1S_F_WANT_TUN;
/* For the server connection: server-close == httpclose */
- if ((fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_SCL ||
+ if ((fe_flags & PR_O_HTTP_MODE) == PR_O_HTTP_SCL ||
(be->options & PR_O_HTTP_MODE) == PR_O_HTTP_SCL ||
- (fe->options & PR_O_HTTP_MODE) == PR_O_HTTP_CLO ||
+ (fe_flags & PR_O_HTTP_MODE) == PR_O_HTTP_CLO ||
(be->options & PR_O_HTTP_MODE) == PR_O_HTTP_CLO)
flag = H1S_F_WANT_CLO;
@@ -1789,7 +1793,7 @@
conn_xprt_read0_pending(conn))
goto release;
if (!conn_is_back(conn) && !(h1c->flags & (H1C_F_CS_SHUTW_NOW|H1C_F_CS_SHUTW))) {
- if (!h1s_create(h1c, NULL))
+ if (!h1s_create(h1c, NULL, NULL))
goto release;
}
else
@@ -1865,7 +1869,7 @@
* Attach a new stream to a connection
* (Used for outgoing connections)
*/
-static struct conn_stream *h1_attach(struct connection *conn)
+static struct conn_stream *h1_attach(struct connection *conn, struct session *sess)
{
struct h1c *h1c = conn->mux_ctx;
struct conn_stream *cs = NULL;
@@ -1878,7 +1882,7 @@
if (!cs)
goto end;
- h1s = h1s_create(h1c, cs);
+ h1s = h1s_create(h1c, cs, sess);
if (h1s == NULL)
goto end;
@@ -1917,6 +1921,7 @@
{
struct h1s *h1s = cs->ctx;
struct h1c *h1c;
+ struct session *sess;
int has_keepalive;
int is_not_first;
@@ -1924,6 +1929,7 @@
if (!h1s)
return;
+ sess = h1s->sess;
h1c = h1s->h1c;
h1s->cs = NULL;
@@ -1933,16 +1939,13 @@
if (conn_is_back(h1c->conn) && has_keepalive &&
!(h1c->conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH))) {
- struct stream_interface *si = cs->data;
- struct stream *s = si_strm(si);
-
/* Never ever allow to reuse a connection from a non-reuse backend */
if ((h1c->px->options & PR_O_REUSE_MASK) == PR_O_REUSE_NEVR)
h1c->conn->flags |= CO_FL_PRIVATE;
if (!(h1c->conn->owner)) {
- h1c->conn->owner = s->sess;
- session_add_conn(s->sess, h1c->conn, s->target);
+ h1c->conn->owner = sess;
+ session_add_conn(sess, h1c->conn, h1c->conn->target);
}
/* we're in keep-alive with an idle connection, monitor it if not already done */
if (LIST_ISEMPTY(&h1c->conn->list)) {
diff --git a/src/mux_h2.c b/src/mux_h2.c
index c28b844..3509db5 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -175,6 +175,7 @@
*/
struct h2s {
struct conn_stream *cs;
+ struct session *sess;
struct h2c *h2c;
struct h1m h1m; /* request or response parser state for H1 */
struct eb32_node by_id; /* place in h2c's streams_by_id */
@@ -245,7 +246,7 @@
static int h2s_decode_headers(struct h2s *h2s);
static int h2_frt_transfer_data(struct h2s *h2s);
static struct task *h2_deferred_shut(struct task *t, void *ctx, unsigned short state);
-static struct h2s *h2c_bck_stream_new(struct h2c *h2c, struct conn_stream *cs);
+static struct h2s *h2c_bck_stream_new(struct h2c *h2c, struct conn_stream *cs, struct session *sess);
/*****************************************************/
/* functions below are for dynamic buffer management */
@@ -376,7 +377,7 @@
* connections from the fact that the context is still NULL. Returns < 0 on
* error.
*/
-static int h2_init(struct connection *conn, struct proxy *prx)
+static int h2_init(struct connection *conn, struct proxy *prx, struct session *sess)
{
struct h2c *h2c;
struct task *t = NULL;
@@ -457,7 +458,7 @@
*/
struct h2s *h2s;
- h2s = h2c_bck_stream_new(h2c, conn->mux_ctx);
+ h2s = h2c_bck_stream_new(h2c, conn->mux_ctx, sess);
if (!h2s)
goto fail_stream;
}
@@ -830,7 +831,7 @@
* and returns it, or NULL in case of memory allocation error or if the highest
* possible stream ID was reached.
*/
-static struct h2s *h2c_bck_stream_new(struct h2c *h2c, struct conn_stream *cs)
+static struct h2s *h2c_bck_stream_new(struct h2c *h2c, struct conn_stream *cs, struct session *sess)
{
struct h2s *h2s = NULL;
@@ -843,6 +844,7 @@
goto out;
h2s->cs = cs;
+ h2s->sess = sess;
cs->ctx = h2s;
h2c->nb_cs++;
@@ -2747,7 +2749,7 @@
* Attach a new stream to a connection
* (Used for outgoing connections)
*/
-static struct conn_stream *h2_attach(struct connection *conn)
+static struct conn_stream *h2_attach(struct connection *conn, struct session *sess)
{
struct conn_stream *cs;
struct h2s *h2s;
@@ -2756,7 +2758,7 @@
cs = cs_new(conn);
if (!cs)
return NULL;
- h2s = h2c_bck_stream_new(h2c, cs);
+ h2s = h2c_bck_stream_new(h2c, cs, sess);
if (!h2s) {
cs_free(cs);
return NULL;
@@ -2803,11 +2805,13 @@
{
struct h2s *h2s = cs->ctx;
struct h2c *h2c;
+ struct session *sess;
cs->ctx = NULL;
if (!h2s)
return;
+ sess = h2s->sess;
h2c = h2s->h2c;
h2s->cs = NULL;
h2c->nb_cs--;
@@ -2840,16 +2844,11 @@
if (h2c->flags & H2_CF_IS_BACK &&
(h2c->proxy->options2 & PR_O2_USE_HTX)) {
- struct stream_interface *si;
- struct stream *s;
-
- si = cs->data;
- s = si_strm(si);
if (!(h2c->conn->flags &
(CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH))) {
if (!h2c->conn->owner) {
- h2c->conn->owner = s->sess;
- session_add_conn(s->sess, h2c->conn, s->target);
+ h2c->conn->owner = sess;
+ session_add_conn(sess, h2c->conn, h2c->conn->target);
}
/* Never ever allow to reuse a connection from a non-reuse backend */
if ((h2c->proxy->options & PR_O_REUSE_MASK) == PR_O_REUSE_NEVR)
diff --git a/src/mux_pt.c b/src/mux_pt.c
index af69676..0a2b805 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -63,7 +63,7 @@
* incoming ones, in which case one will be allocated and a new stream will be
* instanciated). Returns < 0 on error.
*/
-static int mux_pt_init(struct connection *conn, struct proxy *prx)
+static int mux_pt_init(struct connection *conn, struct proxy *prx, struct session *sess)
{
struct conn_stream *cs = conn->mux_ctx;
struct mux_pt_ctx *ctx = pool_alloc(pool_head_pt_ctx);
@@ -138,7 +138,7 @@
* Attach a new stream to a connection
* (Used for outgoing connections)
*/
-static struct conn_stream *mux_pt_attach(struct connection *conn)
+static struct conn_stream *mux_pt_attach(struct connection *conn, struct session *sess)
{
struct conn_stream *cs;
struct mux_pt_ctx *ctx = conn->mux_ctx;
diff --git a/src/peers.c b/src/peers.c
index 7d47d3c..4314d58 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -2000,7 +2000,7 @@
memcpy(&conn->addr.to, &peer->addr, sizeof(conn->addr.to));
conn_prepare(conn, peer->proto, peer->xprt);
- conn_install_mux(conn, &mux_pt_ops, cs, s->be);
+ conn_install_mux(conn, &mux_pt_ops, cs, s->be, NULL);
si_attach_cs(&s->si[1], cs);
s->do_log = NULL;