From a6c5280ea59f940be13fd6eb0f94ab8360d3d6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sat, 12 May 2018 11:55:17 +0000 Subject: Vendor import of Unbound 1.6.6. --- util/config_file.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'util/config_file.c') diff --git a/util/config_file.c b/util/config_file.c index d0fdb2daaa25..796c1a61f269 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -282,6 +282,8 @@ config_create(void) cfg->dnscrypt_provider = NULL; cfg->dnscrypt_provider_cert = NULL; cfg->dnscrypt_secret_key = NULL; + cfg->dnscrypt_shared_secret_cache_size = 4*1024*1024; + cfg->dnscrypt_shared_secret_cache_slabs = 4; #ifdef USE_IPSECMOD cfg->ipsecmod_enabled = 1; cfg->ipsecmod_ignore_bogus = 0; @@ -289,6 +291,10 @@ config_create(void) cfg->ipsecmod_max_ttl = 3600; cfg->ipsecmod_whitelist = NULL; cfg->ipsecmod_strict = 0; +#endif +#ifdef USE_CACHEDB + cfg->cachedb_backend = NULL; + cfg->cachedb_secret = NULL; #endif return cfg; error_exit: @@ -561,6 +567,10 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_STR("dnscrypt-provider:", dnscrypt_provider) else S_STRLIST("dnscrypt-provider-cert:", dnscrypt_provider_cert) else S_STRLIST("dnscrypt-secret-key:", dnscrypt_secret_key) + else S_MEMSIZE("dnscrypt-shared-secret-cache-size:", + dnscrypt_shared_secret_cache_size) + else S_POW2("dnscrypt-shared-secret-cache-slabs:", + dnscrypt_shared_secret_cache_slabs) #endif else if(strcmp(opt, "ip-ratelimit:") == 0) { IS_NUMBER_OR_ZERO; cfg->ip_ratelimit = atoi(val); @@ -922,6 +932,10 @@ config_get_option(struct config_file* cfg, const char* opt, else O_STR(opt, "dnscrypt-provider", dnscrypt_provider) else O_LST(opt, "dnscrypt-provider-cert", dnscrypt_provider_cert) else O_LST(opt, "dnscrypt-secret-key", dnscrypt_secret_key) + else O_MEM(opt, "dnscrypt-shared-secret-cache-size", + dnscrypt_shared_secret_cache_size) + else O_DEC(opt, "dnscrypt-shared-secret-cache-slabs", + dnscrypt_shared_secret_cache_slabs) #endif else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones) else O_YNO(opt, "insecure-lan-zones", insecure_lan_zones) @@ -957,6 +971,10 @@ config_get_option(struct config_file* cfg, const char* opt, else O_DEC(opt, "ipsecmod-max-ttl", ipsecmod_max_ttl) else O_LST(opt, "ipsecmod-whitelist", ipsecmod_whitelist) else O_YNO(opt, "ipsecmod-strict", ipsecmod_strict) +#endif +#ifdef USE_CACHEDB + else O_STR(opt, "backend", cachedb_backend) + else O_STR(opt, "secret-seed", cachedb_secret) #endif /* not here: * outgoing-permit, outgoing-avoid - have list of ports @@ -1258,6 +1276,10 @@ config_delete(struct config_file* cfg) #ifdef USE_IPSECMOD free(cfg->ipsecmod_hook); config_delstrlist(cfg->ipsecmod_whitelist); +#endif +#ifdef USE_CACHEDB + free(cfg->cachedb_backend); + free(cfg->cachedb_secret); #endif free(cfg); } -- cgit v1.2.3