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.

diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 40002f8f8bdb577cf4666de80dd3fe745592cfea..f077ff2f887c0878aaa9a545cfcc08957948d524 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 349c2c632559d6f8315bfcc874e2f2c0d8981af6..6451cbb8a826227a7b8c0dd61ac460a1c759188c 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1436,9 +1436,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 b35d16caa573bdba53bc13972988bd5b64aa500e..c6c4e6c51f38fab7dca24203250c57a769f4ba3c 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -2779,9 +2779,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