From 860028db47ac2ad38de56c7711ce872245c70b83 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= Date: Thu, 4 Jan 2024 11:16:06 +0100 Subject: [PATCH] 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. --- include/haproxy/server-t.h | 4 ---- src/proxy.c | 3 --- src/server.c | 3 --- 3 files changed, 10 deletions(-) diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h index 40002f8f8b..f077ff2f88 100644 --- 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 349c2c6325..6451cbb8a8 100644 --- 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 b35d16caa5..c6c4e6c51f 100644 --- 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 -- 2.47.3