MINOR: quic; Move the QUIC frame pool to its proper location

pool_head_quic_frame QUIC frame pool definition is move from quic_conn-t.h to
quic_frame-t.h.
Its declation is moved from quic_conn.c to quic_frame.c.

diff --git a/include/haproxy/quic_conn-t.h b/include/haproxy/quic_conn-t.h
index ae104489bf17f882c2edc227a0a598a33fa68555..491ec8bb5c501f6651082efcd1d2b5aed85f445b 100644 (file)
--- a/include/haproxy/quic_conn-t.h
+++ b/include/haproxy/quic_conn-t.h
@@ -34,7 +34,6 @@
 #include <haproxy/openssl-compat.h>
 #include <haproxy/mux_quic-t.h>
 #include <haproxy/quic_cc-t.h>
-#include <haproxy/quic_frame-t.h>
 #include <haproxy/quic_loss-t.h>
 #include <haproxy/quic_openssl_compat-t.h>
 #include <haproxy/quic_stats-t.h>
@@ -253,7 +252,6 @@ enum quic_pkt_type {
 
 extern struct trace_source trace_quic;
 extern struct pool_head *pool_head_quic_crypto_buf;
-extern struct pool_head *pool_head_quic_frame;
 
 struct quic_version {
        uint32_t num;

diff --git a/include/haproxy/quic_frame-t.h b/include/haproxy/quic_frame-t.h
index 18200e5010b908c5075999c2cc6a51b80dc49d32..b2aab70b096200bb6659532101ca1f6288e3a686 100644 (file)
--- a/include/haproxy/quic_frame-t.h
+++ b/include/haproxy/quic_frame-t.h
@@ -34,6 +34,8 @@
 #include <haproxy/list.h>
 #include <haproxy/quic_stream-t.h>
 
+extern struct pool_head *pool_head_quic_frame;
+
 /* forward declarations from xprt-quic */
 struct quic_arngs;
 struct quic_enc_level;

diff --git a/src/quic_conn.c b/src/quic_conn.c
index 40dcdee158830cf4e1f9b637b249f00ef6fd2e08..178a1480442ada5fcb9d91c1214532a3e19ef102 100644 (file)
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -133,7 +133,6 @@ DECLARE_POOL(pool_head_quic_connection_id,
              "quic_connection_id", sizeof(struct quic_connection_id));
 DECLARE_POOL(pool_head_quic_crypto_buf, "quic_crypto_buf", sizeof(struct quic_crypto_buf));
 DECLARE_STATIC_POOL(pool_head_quic_cstream, "quic_cstream", sizeof(struct quic_cstream));
-DECLARE_POOL(pool_head_quic_frame, "quic_frame", sizeof(struct quic_frame));
 
 struct task *quic_conn_app_io_cb(struct task *t, void *context, unsigned int state);
 static int quic_conn_init_timer(struct quic_conn *qc);

diff --git a/src/quic_frame.c b/src/quic_frame.c
index 5b3806cf1e615777e9588e669f153839e7ee5ec9..f918cbd0d9becaf00b81f7d8efc2ba33b75b802f 100644 (file)
--- a/src/quic_frame.c
+++ b/src/quic_frame.c
@@ -23,6 +23,8 @@
 
 #define TRACE_SOURCE    &trace_quic
 
+DECLARE_POOL(pool_head_quic_frame, "quic_frame", sizeof(struct quic_frame));
+
 const char *quic_frame_type_string(enum quic_frame_type ft)
 {
        switch (ft) {