MINOR: mux-quic: define is_active app-ops
Add a new app layer operation is_active. This can be used by the MUX to
check if the connection can be considered as active or not. This is used
inside qcc_is_dead as a first check.
For example on HTTP/3, if there is at least one bidir client stream
opened the connection is active. This explicitly ignore the uni streams
used for control and qpack as they can never be closed during the
connection lifetime.
diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index edc6930..2a1cd86 100644
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -117,6 +117,7 @@
int (*decode_qcs)(struct qcs *qcs, int fin, void *ctx);
size_t (*snd_buf)(struct conn_stream *cs, struct buffer *buf, size_t count, int flags);
int (*finalize)(void *ctx);
+ int (*is_active)(const struct qcc *qcc, void *ctx);
void (*release)(void *ctx);
};
diff --git a/src/h3.c b/src/h3.c
index 3cce595..e39c541 100644
--- a/src/h3.c
+++ b/src/h3.c
@@ -897,6 +897,18 @@
pool_free(pool_head_h3, h3);
}
+/* Check if the H3 connection can still be considered as active.
+ *
+ * Return true if active else false.
+ */
+static int h3_is_active(const struct qcc *qcc, void *ctx)
+{
+ if (qcc->strms[QCS_CLT_BIDI].nb_streams)
+ return 1;
+
+ return 0;
+}
+
/* HTTP/3 application layer operations */
const struct qcc_app_ops h3_ops = {
.init = h3_init,
@@ -904,5 +916,6 @@
.decode_qcs = h3_decode_qcs,
.snd_buf = h3_snd_buf,
.finalize = h3_finalize,
+ .is_active = h3_is_active,
.release = h3_release,
};
diff --git a/src/hq_interop.c b/src/hq_interop.c
index 7928373..71419d1 100644
--- a/src/hq_interop.c
+++ b/src/hq_interop.c
@@ -166,7 +166,16 @@
return total;
}
+static int hq_is_active(const struct qcc *qcc, void *ctx)
+{
+ if (!eb_is_empty(&qcc->streams_by_id))
+ return 1;
+
+ return 0;
+}
+
const struct qcc_app_ops hq_interop_ops = {
.decode_qcs = hq_interop_decode_qcs,
.snd_buf = hq_interop_snd_buf,
+ .is_active = hq_is_active,
};
diff --git a/src/mux_quic.c b/src/mux_quic.c
index ad1a693..34e9291 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -462,7 +462,11 @@
static inline int qcc_is_dead(const struct qcc *qcc)
{
- if (!qcc->strms[QCS_CLT_BIDI].nb_streams && !qcc->task)
+ if (qcc->app_ops && qcc->app_ops->is_active &&
+ qcc->app_ops->is_active(qcc, qcc->ctx))
+ return 0;
+
+ if (!qcc->task)
return 1;
return 0;