CLEANUP: quic: Remaining useless code into server part

Remove some QUIC definitions of members from server structure as the haproxy QUIC
stack does not support at all the server part (QUIC client) as this time.
Remove the statements in relation with their initializations.

This patch should be backported as far as 2.6 to save memory.

(cherry picked from commit 860028db47ac2ad38de56c7711ce872245c70b83)
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 9a9b48b..666d2cc 100644 (file)
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -430,10 +430,6 @@ struct server {
                char *alpn_str;                 /* ALPN protocol string */
                int alpn_len;                   /* ALPN protocol string length */
        } ssl_ctx;
-#ifdef USE_QUIC
-       struct quic_transport_params quic_params; /* QUIC transport parameters */
-       struct eb_root cids;        /* QUIC connections IDs. */
-#endif
        struct resolv_srvrq *srvrq;             /* Pointer representing the DNS SRV requeest, if any */
        struct list srv_rec_item;               /* to attach server to a srv record item */
        struct list ip_rec_item;                /* to attach server to a A or AAAA record item */

diff --git a/src/proxy.c b/src/proxy.c
index 9beb232..ef95340 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1484,9 +1484,6 @@ void proxy_preset_defaults(struct proxy *defproxy)
 
        defproxy->email_alert.level = LOG_ALERT;
        defproxy->load_server_state_from_file = PR_SRV_STATE_FILE_UNSPEC;
-#if defined(USE_QUIC)
-       quic_transport_params_init(&defproxy->defsrv.quic_params, 0);
-#endif
 
        if (defproxy->cap & PR_CAP_INT)
                defproxy->timeout.connect = 5000;

diff --git a/src/server.c b/src/server.c
index b62dd06..829fbb3 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -2812,9 +2812,6 @@ 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;
 #ifdef USE_OPENSSL