upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-28 01:19:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Create the quic SSL listening context only when needed.

Browse source
This commit is contained in:
Yorgos Thessalonikefs 2025-01-20 15:49:37 +01:00
parent 3f839cebc3
commit d62fff2c7c
4 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/unbound.c
View file

@ -505,9 +505,11 @@ setup_sslctxs(struct daemon* daemon, struct config_file* cfg)
}
#endif
#ifdef HAVE_NGTCP2
if(!(daemon->listen_quic_sslctx = quic_sslctx_create(
cfg->ssl_service_key, cfg->ssl_service_pem, NULL))) {
fatal_exit("could not set up quic SSL_CTX");
if(cfg_has_quic(cfg)) {
if(!(daemon->listen_quic_sslctx = quic_sslctx_create(
cfg->ssl_service_key, cfg->ssl_service_pem, NULL))) {
fatal_exit("could not set up quic SSL_CTX");
}
}
#endif /* HAVE_NGTCP2 */
}

1
doc/Changelog
View file

@ -1,6 +1,7 @@
20 January 2025: Yorgos
- Merge #1222: Unique DoT and DoH SSL contexts to allow for different
ALPN.
- Create the quic SSL listening context only when needed.
15 January 2025: Yorgos
- Merge #1221: Consider auth zones when checking for forwarders.

19
util/config_file.c
View file

@ -2866,3 +2866,22 @@ if_is_quic(const char* ifname, const char* port, int quic_port)
return 0;
#endif
}
/** see if config contains quic turned on */
int
cfg_has_quic(struct config_file* cfg)
{
#ifndef HAVE_NGTCP2
(void)cfg;
return 0;
#else
int i;
char portbuf[32];
snprintf(portbuf, sizeof(portbuf), "%d", cfg->port);
for(i = 0; i<cfg->num_ifs; i++) {
if(if_is_quic(cfg->ifs[i], portbuf, cfg->quic_port))
return 1;
}
return 0;
#endif
}

7
util/config_file.h
View file

@ -1419,6 +1419,13 @@ int if_is_dnscrypt(const char* ifname, const char* port, int dnscrypt_port);
/** see if interface is quic, its port number == the quic port number */
int if_is_quic(const char* ifname, const char* port, int quic_port);
/**
* Return true if the config contains settings that enable quic.
* @param cfg: config information.
* @return true if quic ports are used for server.
*/
int cfg_has_quic(struct config_file* cfg);
#ifdef USE_LINUX_IP_LOCAL_PORT_RANGE
#define LINUX_IP_LOCAL_PORT_RANGE_PATH "/proc/sys/net/ipv4/ip_local_port_range"
#endif