From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Mon, 23 Nov 2020 13:29:28 +0000 (+0100)
Subject: MINOR: server: Add QUIC definitions to servers.
X-Git-Tag: v2.4-dev5~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f46c10cfb1dd9ee481cafb8f6c1d4a62ea173fd8;p=thirdparty%2Fhaproxy.git

MINOR: server: Add QUIC definitions to servers.

This patch adds QUIC structs to server struct so that to make the QUIC code
compile. Also initializes the ebtree to store the connections by connection
IDs.
---

diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 0e66be693f..512489a5c5 100644
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -41,6 +41,7 @@
 #include <haproxy/stats-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/thread-t.h>
+#include <haproxy/xprt_quic-t.h>
 
 
 /* server states. Only SRV_ST_STOPPED indicates a down server. */
@@ -329,6 +330,10 @@ struct server {
 		int alpn_len;                   /* ALPN protocol string length */
 #endif
 	} ssl_ctx;
+#ifdef USE_QUIC
+	struct quic_transport_params quic_params; /* QUIC transport parameters */
+	struct eb_root cids;        /* QUIC connections IDs. */
+#endif
 #endif
 	struct dns_srvrq *srvrq;		/* Pointer representing the DNS SRV requeest, if any */
 	struct {
diff --git a/src/server.c b/src/server.c
index 15d88de8cf..8df763be14 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1742,6 +1742,9 @@ struct server *new_server(struct proxy *proxy)
 	srv->agent.server = srv;
 	srv->agent.proxy = proxy;
 	srv->xprt  = srv->check.xprt = srv->agent.xprt = xprt_get(XPRT_RAW);
+#if defined(USE_QUIC)
+	srv->cids = EB_ROOT_UNIQUE;
+#endif
 
 	srv->extra_counters = NULL;