commit ac03ef26e8b81461c2585cc42c1bbaa2ceb878ee
author Amaury Denoyelle <adenoyelle@haproxy.com> Thu Oct 28 16:36:11 2021 +0200
committer Amaury Denoyelle <adenoyelle@haproxy.com> Wed Nov 03 16:24:48 2021 +0100
tree aa8db1b6195bdfb1f3d879e604a2178597fd721f
parent 2454bda1405da260021547d1c9edd676b4219a22

MINOR: connection: add alternative mux_ops param for conn_install_mux_be

Add a new parameter force_mux_ops. This will be useful to specify an
alternative to the srv->mux_proto field. If non-NULL, it will be use to
force the mux protocol wether srv->mux_proto is set or not.

This argument will become useful to install a mux for non-standard
streams, most notably websocket streams.

include/haproxy/connection.h

diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index a4bef3d..49f5d3f 100644
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -76,7 +76,8 @@
 int conn_upgrade_mux_fe(struct connection *conn, void *ctx, struct buffer *buf,
                         struct ist mux_proto, int mode);
 int conn_install_mux_fe(struct connection *conn, void *ctx);
-int conn_install_mux_be(struct connection *conn, void *ctx, struct session *sess);
+int conn_install_mux_be(struct connection *conn, void *ctx, struct session *sess,
+                        const struct mux_ops *force_mux_ops);
 int conn_install_mux_chk(struct connection *conn, void *ctx, struct session *sess);
 
 void conn_delete_from_tree(struct ebmb_node *node);

src/backend.c

diff --git a/src/backend.c b/src/backend.c
index ee6e2b8..ae63d93 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1645,7 +1645,7 @@
 	 * fail, and flag the connection as CO_FL_ERROR.
 	 */
 	if (init_mux) {
-		if (conn_install_mux_be(srv_conn, srv_cs, s->sess) < 0) {
+		if (conn_install_mux_be(srv_conn, srv_cs, s->sess, NULL) < 0) {
 			conn_full_close(srv_conn);
 			return SF_ERR_INTERNAL;
 		}

src/connection.c

diff --git a/src/connection.c b/src/connection.c
index a1472f6..270ae11 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -70,7 +70,7 @@
 			if (conn_install_mux_chk(conn, conn->ctx, sess) < 0)
 				goto fail;
 		}
-		else if (conn_install_mux_be(conn, conn->ctx, sess) < 0)
+		else if (conn_install_mux_be(conn, conn->ctx, sess, NULL) < 0)
 			goto fail;
 		srv = objt_server(conn->target);
 
@@ -247,10 +247,14 @@
 }
 
 /* installs the best mux for outgoing connection <conn> using the upper context
- * <ctx>. If the mux protocol is forced, we use it to find the best mux. Returns
- * < 0 on error.
+ * <ctx>. If the server mux protocol is forced, we use it to find the best mux.
+ * It's also possible to specify an alternative mux protocol <force_mux_ops>,
+ * in which case it will be used instead of the default server mux protocol.
+ *
+ * Returns < 0 on error.
  */
-int conn_install_mux_be(struct connection *conn, void *ctx, struct session *sess)
+int conn_install_mux_be(struct connection *conn, void *ctx, struct session *sess,
+                        const struct mux_ops *force_mux_ops)
 {
 	struct server *srv = objt_server(conn->target);
 	struct proxy  *prx = objt_proxy(conn->target);
@@ -262,8 +266,12 @@
 	if (!prx) // target must be either proxy or server
 		return -1;
 
-	if (srv && srv->mux_proto)
+	if (srv && srv->mux_proto && likely(!force_mux_ops)) {
 		mux_ops = srv->mux_proto->mux;
+	}
+	else if (srv && unlikely(force_mux_ops)) {
+		mux_ops = force_mux_ops;
+	}
 	else {
 		struct ist mux_proto;
 		const char *alpn_str = NULL;