From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Thu, 7 Oct 2021 14:44:05 +0000 (+0200)
Subject: BUG/MINOR: quic: fix includes for compilation
X-Git-Tag: v2.5-dev9~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb01f597eb88d93493dadd841e7454783b25a68e;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: fix includes for compilation

Fix missing includes in quic code following the general recent include
reorganization. This fixes the compilation error with QUIC enabled.
---

diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h
index bd20d46f28..2050b79b41 100644
--- a/include/haproxy/xprt_quic.h
+++ b/include/haproxy/xprt_quic.h
@@ -28,6 +28,8 @@
 
 #include <stdint.h>
 
+#include <import/eb64tree.h>
+
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
 #include <haproxy/net_helper.h>
diff --git a/src/mux_quic.c b/src/mux_quic.c
index f16f37a977..c89490f67e 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -10,7 +10,8 @@
  *
  */
 
-#include <import/eb32tree.h>
+#include <import/eb64tree.h>
+
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
@@ -21,6 +22,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/quic_frame.h>
 #include <haproxy/session-t.h>
+#include <haproxy/ssl_sock-t.h>
 #include <haproxy/stats.h>
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
diff --git a/src/quic_sock.c b/src/quic_sock.c
index 761c2a4e8e..ffd4504888 100644
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -17,6 +17,7 @@
 
 #include <haproxy/connection.h>
 #include <haproxy/listener.h>
+#include <haproxy/session.h>
 #include <haproxy/xprt_quic.h>
 
 /* This function is called from the protocol layer accept() in order to
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 3fd4632848..455c83bc40 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -22,6 +22,8 @@
 
 #include <netinet/tcp.h>
 
+#include <import/ebmbtree.h>
+
 #include <haproxy/buf-t.h>
 #include <haproxy/compat.h>
 #include <haproxy/api.h>