upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

variables get_option and set_option also for dnscrypt.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4130 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-04-24 09:00:45 +00:00
parent 461c8c97db
commit 7925a98141
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,6 +1,6 @@
24 April 2017: Wouter 24 April 2017: Wouter
- unbound-checkconf -o allows query of dnstap config variables. - unbound-checkconf -o allows query of dnstap config variables.
Also unbound-control get_option. Also unbound-control get_option. Also for dnscrypt.
21 April 2017: Ralph 21 April 2017: Ralph
- Fix #1254: clarify ratelimit-{for,below}-domain (from Manu Bretelle). - Fix #1254: clarify ratelimit-{for,below}-domain (from Manu Bretelle).

14
util/config_file.c
View file

@ -542,6 +542,13 @@ int config_set_option(struct config_file* cfg, const char* opt,
dnstap_log_forwarder_query_messages) dnstap_log_forwarder_query_messages)
else S_YNO("dnstap-log-forwarder-response-messages:", else S_YNO("dnstap-log-forwarder-response-messages:",
dnstap_log_forwarder_response_messages) dnstap_log_forwarder_response_messages)
#endif
#ifdef USE_DNSCRYPT
else S_YNO("dnscrypt-enable:", dnscrypt)
else S_NUMBER_NONZERO("dnscrypt-port:", dnscrypt_port)
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)
#endif #endif
else if(strcmp(opt, "ip-ratelimit:") == 0) { else if(strcmp(opt, "ip-ratelimit:") == 0) {
IS_NUMBER_OR_ZERO; cfg->ip_ratelimit = atoi(val); IS_NUMBER_OR_ZERO; cfg->ip_ratelimit = atoi(val);
@ -886,6 +893,13 @@ config_get_option(struct config_file* cfg, const char* opt,
dnstap_log_forwarder_query_messages) dnstap_log_forwarder_query_messages)
else O_YNO(opt, "dnstap-log-forwarder-response-messages", else O_YNO(opt, "dnstap-log-forwarder-response-messages",
dnstap_log_forwarder_response_messages) dnstap_log_forwarder_response_messages)
#endif
#ifdef USE_DNSCRYPT
else O_YNO(opt, "dnscrypt-enable", dnscrypt)
else O_DEC(opt, "dnscrypt-port", dnscrypt_port)
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)
#endif #endif
else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones) else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones)
else O_YNO(opt, "insecure-lan-zones", insecure_lan_zones) else O_YNO(opt, "insecure-lan-zones", insecure_lan_zones)