WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-08-17 21:25:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into doh

Browse Source
This commit is contained in:
Ralph Dolmans
2020-09-18 12:05:53 +02:00
parent 4ae823fbc2 2541ccbb1b
commit ea90f50ca8
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/Changelog
+5
View File
@@ -1,3 +1,8 @@
18 September 2020: Wouter
- Fix that prefer-ip4 and prefer-ip6 can be get and set with
unbound-control, with libunbound and the unbound-checkconf option
output function.
15 September 2020: George
- Introduce test for statistics.
util/config_file.c
+4
View File
@@ -497,6 +497,8 @@ int config_set_option(struct config_file* cfg, const char* opt,
else S_YNO("do-ip6:", do_ip6)
else S_YNO("do-udp:", do_udp)
else S_YNO("do-tcp:", do_tcp)
else S_YNO("prefer-ip4:", prefer_ip4)
else S_YNO("prefer-ip6:", prefer_ip6)
else S_YNO("tcp-upstream:", tcp_upstream)
else S_YNO("udp-upstream-without-downstream:",
udp_upstream_without_downstream)
@@ -961,6 +963,8 @@ config_get_option(struct config_file* cfg, const char* opt,
else O_YNO(opt, "do-ip6", do_ip6)
else O_YNO(opt, "do-udp", do_udp)
else O_YNO(opt, "do-tcp", do_tcp)
else O_YNO(opt, "prefer-ip4", prefer_ip4)
else O_YNO(opt, "prefer-ip6", prefer_ip6)
else O_YNO(opt, "tcp-upstream", tcp_upstream)
else O_YNO(opt, "udp-upstream-without-downstream", udp_upstream_without_downstream)
else O_DEC(opt, "tcp-mss", tcp_mss)