From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Mon, 20 Sep 2021 13:11:51 +0000 (+0200)
Subject: MINOR: mux_quic: Export the mux related flags
X-Git-Tag: v2.5-dev8~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=153194f47a64a1d6adb0e0f0e565b7ae32482f6c;p=thirdparty%2Fhaproxy.git

MINOR: mux_quic: Export the mux related flags

These flags should be available from the xprt which must be able to
wake up the mux when blocked.
---

diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index 241aa60e4f..18e2cec954 100644
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -52,6 +52,31 @@
 #define OUQS_SF_TXBUF_MALLOC 0x00000001
 #define OUQS_SF_TXBUF_FULL   0x00000002
 
+/* Connection flags (32 bit), in qcc->flags */
+#define QC_CF_NONE              0x00000000
+
+/* Flags indicating why writing to the mux is blocked. */
+#define QC_CF_MUX_MALLOC        0x00000001  // mux blocked on lack of connection's mux buffer
+#define QC_CF_MUX_MFULL         0x00000002  // mux blocked on connection's mux buffer full
+#define QC_CF_MUX_BLOCK_ANY     0x00000003  // aggregate of the mux flags above
+
+/* Flags indicating why writing to the demux is blocked.
+ * The first two ones directly affect the ability for the mux to receive data
+ * from the connection. The other ones affect the mux's ability to demux
+ * received data.
+ */
+#define QC_CF_DEM_DFULL         0x00000004  // demux blocked on connection's demux buffer full
+
+#define QC_CF_DEM_MBUSY         0x00000008  // demux blocked on connection's mux side busy
+#define QC_CF_DEM_MROOM         0x00000010  // demux blocked on lack of room in mux buffer
+#define QC_CF_DEM_SALLOC        0x00000020  // demux blocked on lack of stream's request buffer
+#define QC_CF_DEM_SFULL         0x00000040  // demux blocked on stream request buffer full
+#define QC_CF_DEM_TOOMANY       0x00000100  // demux blocked waiting for some conn_streams to leave
+#define QC_CF_DEM_BLOCK_ANY     0x00000170  // aggregate of the demux flags above except DFULL
+
+/* other flags */
+#define QC_CF_IS_BACK           0x00008000  // this is an outgoing connection
+
 extern struct pool_head *pool_head_qcs;
 
 /* Stream types */
diff --git a/src/mux_quic.c b/src/mux_quic.c
index b471bf54a1..8b96b6fd9a 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -29,31 +29,6 @@
 /* dummy streams returned for closed, error, refused, idle and states */
 static const struct qcs *qc_closed_stream;
 
-/* Connection flags (32 bit), in qcc->flags */
-#define QC_CF_NONE              0x00000000
-
-/* Flags indicating why writing to the mux is blocked. */
-#define QC_CF_MUX_MALLOC        0x00000001  // mux blocked on lack of connection's mux buffer
-#define QC_CF_MUX_MFULL         0x00000002  // mux blocked on connection's mux buffer full
-#define QC_CF_MUX_BLOCK_ANY     0x00000003  // aggregate of the mux flags above
-
-/* Flags indicating why writing to the demux is blocked.
- * The first two ones directly affect the ability for the mux to receive data
- * from the connection. The other ones affect the mux's ability to demux
- * received data.
- */
-#define QC_CF_DEM_DFULL         0x00000004  // demux blocked on connection's demux buffer full
-
-#define QC_CF_DEM_MBUSY         0x00000008  // demux blocked on connection's mux side busy
-#define QC_CF_DEM_MROOM         0x00000010  // demux blocked on lack of room in mux buffer
-#define QC_CF_DEM_SALLOC        0x00000020  // demux blocked on lack of stream's request buffer
-#define QC_CF_DEM_SFULL         0x00000040  // demux blocked on stream request buffer full
-#define QC_CF_DEM_TOOMANY       0x00000100  // demux blocked waiting for some conn_streams to leave
-#define QC_CF_DEM_BLOCK_ANY     0x00000170  // aggregate of the demux flags above except DFULL
-
-/* other flags */
-#define QC_CF_IS_BACK           0x00008000  // this is an outgoing connection
-
 #define QC_SS_MASK(state) (1UL << (state))
 #define QC_SS_IDLE_BIT    (1UL << QC_SS_IDLE)
 #define QC_SS_RLOC_BIT    (1UL << QC_SS_RLOC)