From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Tue, 25 Jul 2023 15:11:51 +0000 (+0200)
Subject: MINOR: quic; Move the QUIC frame pool to its proper location
X-Git-Tag: v2.9-dev3~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c156c5bda6d51c743b2f4af9ee87f53f38a946bd;p=thirdparty%2Fhaproxy.git

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 ae104489bf..491ec8bb5c 100644
--- 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 18200e5010..b2aab70b09 100644
--- 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 40dcdee158..178a148044 100644
--- 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 5b3806cf1e..f918cbd0d9 100644
--- 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) {