git: 46d2f61818f5 - main - unbound: Vendor import 1.22.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Oct 2024 14:24:05 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=46d2f61818f594174cafe31ee338c6e083fa1876
commit 46d2f61818f594174cafe31ee338c6e083fa1876
Merge: 7aa6667623be 0a6d797cf6eb
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-10-18 13:59:33 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-10-18 14:14:21 +0000
unbound: Vendor import 1.22.0
Release notes at
https://nlnetlabs.nl/news/2024/Oct/17/unbound-1.22.0-released/
MFC after: 1 week
Merge commit '0a6d797cf6eb751d7eb613900cd19803e05d905f' into main
contrib/unbound/Makefile.in | 19 +-
contrib/unbound/aclocal.m4 | 292 +-
contrib/unbound/cachedb/cachedb.c | 5 +-
contrib/unbound/cachedb/redis.c | 29 +-
contrib/unbound/config.h.in | 94 +
contrib/unbound/configure | 769 +-
contrib/unbound/configure.ac | 74 +-
contrib/unbound/contrib/aaaa-filter-iterator.patch | 2 +-
contrib/unbound/daemon/daemon.c | 10 +
contrib/unbound/daemon/daemon.h | 3 +
contrib/unbound/daemon/remote.c | 14 +-
contrib/unbound/daemon/stats.c | 14 +-
contrib/unbound/daemon/worker.c | 38 +-
contrib/unbound/dns64/dns64.c | 5 +-
contrib/unbound/dnstap/unbound-dnstap-socket.c | 24 +-
contrib/unbound/doc/Changelog | 151 +-
contrib/unbound/doc/README | 2 +-
contrib/unbound/doc/example.conf.in | 26 +-
contrib/unbound/doc/libunbound.3.in | 4 +-
contrib/unbound/doc/unbound-anchor.8.in | 2 +-
contrib/unbound/doc/unbound-checkconf.8.in | 2 +-
contrib/unbound/doc/unbound-control.8.in | 10 +-
contrib/unbound/doc/unbound-host.1.in | 2 +-
contrib/unbound/doc/unbound.8.in | 4 +-
contrib/unbound/doc/unbound.conf.5.in | 71 +-
contrib/unbound/doc/unbound.doxygen | 8 +-
contrib/unbound/install-sh | 174 +-
contrib/unbound/iterator/iter_scrub.c | 45 +-
contrib/unbound/iterator/iter_utils.c | 42 +
contrib/unbound/iterator/iter_utils.h | 7 +
contrib/unbound/iterator/iterator.c | 57 +-
contrib/unbound/iterator/iterator.h | 2 +-
contrib/unbound/libunbound/context.c | 2 +-
contrib/unbound/libunbound/libworker.c | 16 +
contrib/unbound/libunbound/unbound.h | 4 +
contrib/unbound/ltmain.sh | 866 +-
contrib/unbound/services/authzone.c | 39 +-
contrib/unbound/services/cache/dns.c | 59 +-
contrib/unbound/services/cache/dns.h | 3 +-
contrib/unbound/services/cache/rrset.c | 10 +-
contrib/unbound/services/listen_dnsport.c | 2534 +++++-
contrib/unbound/services/listen_dnsport.h | 405 +-
contrib/unbound/services/mesh.c | 13 +-
contrib/unbound/services/mesh.h | 3 +-
contrib/unbound/services/modstack.c | 2 +-
contrib/unbound/services/rpz.c | 19 +
.../unbound/smallapp/unbound-control-setup.sh.in | 2 +-
contrib/unbound/smallapp/unbound-control.c | 6 +
contrib/unbound/smallapp/unbound-host.c | 6 +
contrib/unbound/smallapp/worker_cb.c | 16 +
contrib/unbound/testcode/doqclient.c | 2701 +++++++
contrib/unbound/testcode/unitdoq.c | 84 +
.../unbound/testdata/auth_tls.tdir/auth_tls.dsc | 16 +
.../testdata/auth_tls.tdir/auth_tls.nsd.conf | 21 +
.../unbound/testdata/auth_tls.tdir/auth_tls.post | 14 +
.../unbound/testdata/auth_tls.tdir/auth_tls.pre | 47 +
.../unbound/testdata/auth_tls.tdir/auth_tls.test | 48 +
.../testdata/auth_tls.tdir/auth_tls.ub.conf | 22 +
.../testdata/auth_tls.tdir/example.com.zone | 4 +
.../unbound/testdata/auth_tls.tdir/nsd_server.key | 39 +
.../unbound/testdata/auth_tls.tdir/nsd_server.pem | 22 +
.../testdata/auth_tls.tdir/unbound_server.key | 39 +
.../testdata/auth_tls.tdir/unbound_server.pem | 22 +
.../auth_tls_failcert.tdir/auth_tls_failcert.dsc | 16 +
.../auth_tls_failcert.nsd.conf | 21 +
.../auth_tls_failcert.tdir/auth_tls_failcert.post | 14 +
.../auth_tls_failcert.tdir/auth_tls_failcert.pre | 47 +
.../auth_tls_failcert.tdir/auth_tls_failcert.test | 56 +
.../auth_tls_failcert.ub.conf | 23 +
.../auth_tls_failcert.tdir/example.com.zone | 4 +
.../testdata/auth_tls_failcert.tdir/nsd_server.key | 39 +
.../testdata/auth_tls_failcert.tdir/nsd_server.pem | 22 +
.../auth_tls_failcert.tdir/unbound_server.key | 39 +
.../auth_tls_failcert.tdir/unbound_server.pem | 22 +
.../testdata/cookie_file.tdir/cookie_file.test | 6 +-
contrib/unbound/testdata/dns64_prefetch_cache.rpl | 195 +
.../doq_downstream.tdir/doq_downstream.conf | 21 +
.../doq_downstream.tdir/doq_downstream.dsc | 16 +
.../doq_downstream.tdir/doq_downstream.post | 13 +
.../doq_downstream.tdir/doq_downstream.pre | 44 +
.../doq_downstream.tdir/doq_downstream.test | 109 +
.../doq_downstream.tdir/doq_downstream.testns | 13 +
.../doq_downstream.tdir/unbound_server.key | 15 +
.../doq_downstream.tdir/unbound_server.pem | 11 +
contrib/unbound/testdata/iter_max_global_quota.rpl | 2236 ++++++
contrib/unbound/testdata/iter_unverified_glue.rpl | 188 +
.../testdata/iter_unverified_glue_fallback.rpl | 138 +
contrib/unbound/testdata/rpz_val_block.rpl | 643 ++
.../testdata/serve_expired_cached_servfail.rpl | 2 +-
.../serve_expired_cached_servfail_refresh.rpl | 2 +-
.../serve_expired_client_timeout_val_bogus.rpl | 317 +
...ired_client_timeout_val_insecure_delegation.rpl | 247 +
.../unbound/testdata/serve_expired_ttl_reset.rpl | 102 +
.../unbound/testdata/serve_expired_val_bogus.rpl | 316 +
contrib/unbound/testdata/val_negcache_ttl.rpl | 188 +
.../unbound/testdata/val_negcache_ttl_prefetch.rpl | 316 +
contrib/unbound/util/alloc.c | 9 +
contrib/unbound/util/config_file.c | 55 +-
contrib/unbound/util/config_file.h | 23 +
contrib/unbound/util/configlexer.c | 8484 ++++++++++----------
contrib/unbound/util/configlexer.lex | 11 +-
contrib/unbound/util/configparser.c | 4713 +++++------
contrib/unbound/util/configparser.h | 296 +-
contrib/unbound/util/configparser.y | 165 +-
contrib/unbound/util/data/msgparse.h | 2 +
contrib/unbound/util/data/msgreply.c | 47 +-
contrib/unbound/util/data/msgreply.h | 39 +-
contrib/unbound/util/data/packed_rrset.h | 3 +
contrib/unbound/util/fptr_wlist.c | 17 +
contrib/unbound/util/locks.h | 1 +
contrib/unbound/util/log.c | 36 +
contrib/unbound/util/log.h | 6 +
contrib/unbound/util/module.h | 8 +-
contrib/unbound/util/netevent.c | 2067 ++++-
contrib/unbound/util/netevent.h | 164 +
contrib/unbound/validator/val_neg.c | 6 +-
contrib/unbound/validator/val_nsec3.c | 6 +-
contrib/unbound/validator/validator.c | 81 +-
contrib/unbound/validator/validator.h | 2 +-
lib/libunbound/config.h | 8 +-
120 files changed, 22786 insertions(+), 7989 deletions(-)
diff --cc contrib/unbound/smallapp/unbound-control-setup.sh.in
index f74b0105afee,4a358f6bd09d..4a358f6bd09d
mode 100755,100644..100755
--- a/contrib/unbound/smallapp/unbound-control-setup.sh.in
+++ b/contrib/unbound/smallapp/unbound-control-setup.sh.in
diff --cc contrib/unbound/testcode/doqclient.c
index 000000000000,1a2fd418359b..1a2fd418359b
mode 000000,100644..100644
--- a/contrib/unbound/testcode/doqclient.c
+++ b/contrib/unbound/testcode/doqclient.c
diff --cc contrib/unbound/testcode/unitdoq.c
index 000000000000,2b9160970493..2b9160970493
mode 000000,100644..100644
--- a/contrib/unbound/testcode/unitdoq.c
+++ b/contrib/unbound/testcode/unitdoq.c
diff --cc contrib/unbound/testdata/auth_tls.tdir/auth_tls.dsc
index 000000000000,0caf949e88e4..0caf949e88e4
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/auth_tls.dsc
+++ b/contrib/unbound/testdata/auth_tls.tdir/auth_tls.dsc
diff --cc contrib/unbound/testdata/auth_tls.tdir/auth_tls.nsd.conf
index 000000000000,c20ed21dfe29..c20ed21dfe29
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/auth_tls.nsd.conf
+++ b/contrib/unbound/testdata/auth_tls.tdir/auth_tls.nsd.conf
diff --cc contrib/unbound/testdata/auth_tls.tdir/auth_tls.post
index 000000000000,19de9f46f9e2..19de9f46f9e2
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/auth_tls.post
+++ b/contrib/unbound/testdata/auth_tls.tdir/auth_tls.post
diff --cc contrib/unbound/testdata/auth_tls.tdir/auth_tls.pre
index 000000000000,ebeee24c5658..ebeee24c5658
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/auth_tls.pre
+++ b/contrib/unbound/testdata/auth_tls.tdir/auth_tls.pre
diff --cc contrib/unbound/testdata/auth_tls.tdir/auth_tls.test
index 000000000000,030212f52850..030212f52850
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/auth_tls.test
+++ b/contrib/unbound/testdata/auth_tls.tdir/auth_tls.test
diff --cc contrib/unbound/testdata/auth_tls.tdir/auth_tls.ub.conf
index 000000000000,0220c60af58c..0220c60af58c
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/auth_tls.ub.conf
+++ b/contrib/unbound/testdata/auth_tls.tdir/auth_tls.ub.conf
diff --cc contrib/unbound/testdata/auth_tls.tdir/example.com.zone
index 000000000000,18b5b407eedd..18b5b407eedd
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/example.com.zone
+++ b/contrib/unbound/testdata/auth_tls.tdir/example.com.zone
diff --cc contrib/unbound/testdata/auth_tls.tdir/nsd_server.key
index 000000000000,5d9f6103134e..5d9f6103134e
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/nsd_server.key
+++ b/contrib/unbound/testdata/auth_tls.tdir/nsd_server.key
diff --cc contrib/unbound/testdata/auth_tls.tdir/nsd_server.pem
index 000000000000,5d41ad2d6477..5d41ad2d6477
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/nsd_server.pem
+++ b/contrib/unbound/testdata/auth_tls.tdir/nsd_server.pem
diff --cc contrib/unbound/testdata/auth_tls.tdir/unbound_server.key
index 000000000000,370a7bbb2f22..370a7bbb2f22
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/unbound_server.key
+++ b/contrib/unbound/testdata/auth_tls.tdir/unbound_server.key
diff --cc contrib/unbound/testdata/auth_tls.tdir/unbound_server.pem
index 000000000000,986807310f2b..986807310f2b
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls.tdir/unbound_server.pem
+++ b/contrib/unbound/testdata/auth_tls.tdir/unbound_server.pem
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.dsc
index 000000000000,ba11e2b8c93b..ba11e2b8c93b
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.dsc
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.dsc
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.nsd.conf
index 000000000000,c20ed21dfe29..c20ed21dfe29
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.nsd.conf
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.nsd.conf
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.post
index 000000000000,db103df70056..db103df70056
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.post
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.post
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.pre
index 000000000000,519c363dbb7a..519c363dbb7a
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.pre
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.pre
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.test
index 000000000000,1f9e8e201c9e..1f9e8e201c9e
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.test
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.test
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.ub.conf
index 000000000000,57e3dcfcbc33..57e3dcfcbc33
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.ub.conf
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/auth_tls_failcert.ub.conf
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/example.com.zone
index 000000000000,18b5b407eedd..18b5b407eedd
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/example.com.zone
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/example.com.zone
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/nsd_server.key
index 000000000000,5d9f6103134e..5d9f6103134e
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/nsd_server.key
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/nsd_server.key
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/nsd_server.pem
index 000000000000,5d41ad2d6477..5d41ad2d6477
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/nsd_server.pem
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/nsd_server.pem
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/unbound_server.key
index 000000000000,370a7bbb2f22..370a7bbb2f22
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/unbound_server.key
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/unbound_server.key
diff --cc contrib/unbound/testdata/auth_tls_failcert.tdir/unbound_server.pem
index 000000000000,986807310f2b..986807310f2b
mode 000000,100644..100644
--- a/contrib/unbound/testdata/auth_tls_failcert.tdir/unbound_server.pem
+++ b/contrib/unbound/testdata/auth_tls_failcert.tdir/unbound_server.pem
diff --cc contrib/unbound/testdata/dns64_prefetch_cache.rpl
index 000000000000,a23b92f08d42..a23b92f08d42
mode 000000,100644..100644
--- a/contrib/unbound/testdata/dns64_prefetch_cache.rpl
+++ b/contrib/unbound/testdata/dns64_prefetch_cache.rpl
diff --cc contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.conf
index 000000000000,babd3504123a..babd3504123a
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.conf
+++ b/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.conf
diff --cc contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.dsc
index 000000000000,1e0b19d509d1..1e0b19d509d1
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.dsc
+++ b/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.dsc
diff --cc contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.post
index 000000000000,f1a31be3cd81..f1a31be3cd81
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.post
+++ b/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.post
diff --cc contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.pre
index 000000000000,f748cc1f5cf3..f748cc1f5cf3
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.pre
+++ b/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.pre
diff --cc contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.test
index 000000000000,a302e8da6b62..a302e8da6b62
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.test
+++ b/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.test
diff --cc contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.testns
index 000000000000,2d0ea45a4c3d..2d0ea45a4c3d
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.testns
+++ b/contrib/unbound/testdata/doq_downstream.tdir/doq_downstream.testns
diff --cc contrib/unbound/testdata/doq_downstream.tdir/unbound_server.key
index 000000000000,4256c421dd0d..4256c421dd0d
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/unbound_server.key
+++ b/contrib/unbound/testdata/doq_downstream.tdir/unbound_server.key
diff --cc contrib/unbound/testdata/doq_downstream.tdir/unbound_server.pem
index 000000000000,aeda3ff11882..aeda3ff11882
mode 000000,100644..100644
--- a/contrib/unbound/testdata/doq_downstream.tdir/unbound_server.pem
+++ b/contrib/unbound/testdata/doq_downstream.tdir/unbound_server.pem
diff --cc contrib/unbound/testdata/iter_max_global_quota.rpl
index 000000000000,2dddf035a70b..2dddf035a70b
mode 000000,100644..100644
--- a/contrib/unbound/testdata/iter_max_global_quota.rpl
+++ b/contrib/unbound/testdata/iter_max_global_quota.rpl
diff --cc contrib/unbound/testdata/iter_unverified_glue.rpl
index 000000000000,017f220b6f1c..017f220b6f1c
mode 000000,100644..100644
--- a/contrib/unbound/testdata/iter_unverified_glue.rpl
+++ b/contrib/unbound/testdata/iter_unverified_glue.rpl
diff --cc contrib/unbound/testdata/iter_unverified_glue_fallback.rpl
index 000000000000,386186d48b0c..386186d48b0c
mode 000000,100644..100644
--- a/contrib/unbound/testdata/iter_unverified_glue_fallback.rpl
+++ b/contrib/unbound/testdata/iter_unverified_glue_fallback.rpl
diff --cc contrib/unbound/testdata/rpz_val_block.rpl
index 000000000000,acde15294adb..acde15294adb
mode 000000,100644..100644
--- a/contrib/unbound/testdata/rpz_val_block.rpl
+++ b/contrib/unbound/testdata/rpz_val_block.rpl
diff --cc contrib/unbound/testdata/serve_expired_client_timeout_val_bogus.rpl
index 000000000000,f4937a16c538..f4937a16c538
mode 000000,100644..100644
--- a/contrib/unbound/testdata/serve_expired_client_timeout_val_bogus.rpl
+++ b/contrib/unbound/testdata/serve_expired_client_timeout_val_bogus.rpl
diff --cc contrib/unbound/testdata/serve_expired_client_timeout_val_insecure_delegation.rpl
index 000000000000,6654a2c68409..6654a2c68409
mode 000000,100644..100644
--- a/contrib/unbound/testdata/serve_expired_client_timeout_val_insecure_delegation.rpl
+++ b/contrib/unbound/testdata/serve_expired_client_timeout_val_insecure_delegation.rpl
diff --cc contrib/unbound/testdata/serve_expired_ttl_reset.rpl
index 000000000000,521d5a0f04ca..521d5a0f04ca
mode 000000,100644..100644
--- a/contrib/unbound/testdata/serve_expired_ttl_reset.rpl
+++ b/contrib/unbound/testdata/serve_expired_ttl_reset.rpl
diff --cc contrib/unbound/testdata/serve_expired_val_bogus.rpl
index 000000000000,35365beef973..35365beef973
mode 000000,100644..100644
--- a/contrib/unbound/testdata/serve_expired_val_bogus.rpl
+++ b/contrib/unbound/testdata/serve_expired_val_bogus.rpl
diff --cc contrib/unbound/testdata/val_negcache_ttl.rpl
index 000000000000,328b9b6ecba8..328b9b6ecba8
mode 000000,100644..100644
--- a/contrib/unbound/testdata/val_negcache_ttl.rpl
+++ b/contrib/unbound/testdata/val_negcache_ttl.rpl
diff --cc contrib/unbound/testdata/val_negcache_ttl_prefetch.rpl
index 000000000000,103c81fbaba4..103c81fbaba4
mode 000000,100644..100644
--- a/contrib/unbound/testdata/val_negcache_ttl_prefetch.rpl
+++ b/contrib/unbound/testdata/val_negcache_ttl_prefetch.rpl
diff --cc contrib/unbound/util/config_file.c
index de3c5375b4c0,000000000000..6d13c03befb8
mode 100644,000000..100644
--- a/contrib/unbound/util/config_file.c
+++ b/contrib/unbound/util/config_file.c
@@@ -1,2797 -1,0 +1,2848 @@@
+/*
+ * util/config_file.c - reads and stores the config file for unbound.
+ *
+ * Copyright (c) 2007, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * This file contains functions for the config file.
+ */
+
+#include "config.h"
+#include <ctype.h>
+#include <stdarg.h>
+#include <errno.h>
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+#include "util/log.h"
+#include "util/configyyrename.h"
+#include "util/config_file.h"
+#include "configparser.h"
+#include "util/net_help.h"
+#include "util/data/msgparse.h"
+#include "util/module.h"
+#include "util/regional.h"
+#include "util/fptr_wlist.h"
+#include "util/data/dname.h"
+#include "util/random.h"
+#include "util/rtt.h"
+#include "services/cache/infra.h"
+#include "sldns/wire2str.h"
+#include "sldns/parseutil.h"
+#include "iterator/iterator.h"
+#ifdef HAVE_GLOB_H
+# include <glob.h>
+#endif
+#ifdef CLIENT_SUBNET
+#include "edns-subnet/edns-subnet.h"
+#endif
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+
+/** from cfg username, after daemonize setup performed */
+uid_t cfg_uid = (uid_t)-1;
+/** from cfg username, after daemonize setup performed */
+gid_t cfg_gid = (gid_t)-1;
+/** for debug allow small timeout values for fast rollovers */
+int autr_permit_small_holddown = 0;
+/** size (in bytes) of stream wait buffers max */
+size_t stream_wait_max = 4 * 1024 * 1024;
+size_t http2_query_buffer_max = 4 * 1024 * 1024;
+size_t http2_response_buffer_max = 4 * 1024 * 1024;
+
+/** global config during parsing */
+struct config_parser_state* cfg_parser = 0;
+
+/** init ports possible for use */
+static void init_outgoing_availports(int* array, int num);
+
+/** init cookie with random data */
+static void init_cookie_secret(uint8_t* cookie_secret, size_t cookie_secret_len);
+
+struct config_file*
+config_create(void)
+{
+ struct config_file* cfg;
+ cfg = (struct config_file*)calloc(1, sizeof(struct config_file));
+ if(!cfg)
+ return NULL;
+ /* the defaults if no config is present */
+ cfg->verbosity = 1;
+ cfg->stat_interval = 0;
+ cfg->stat_cumulative = 0;
+ cfg->stat_extended = 0;
+ cfg->stat_inhibit_zero = 1;
+ cfg->num_threads = 1;
+ cfg->port = UNBOUND_DNS_PORT;
+ cfg->do_ip4 = 1;
+ cfg->do_ip6 = 1;
+ cfg->do_udp = 1;
+ cfg->do_tcp = 1;
+ cfg->tcp_reuse_timeout = 60 * 1000; /* 60s in milisecs */
+ cfg->max_reuse_tcp_queries = 200;
+ cfg->tcp_upstream = 0;
+ cfg->udp_upstream_without_downstream = 0;
+ cfg->tcp_mss = 0;
+ cfg->outgoing_tcp_mss = 0;
+ cfg->tcp_idle_timeout = 30 * 1000; /* 30s in millisecs */
+ cfg->tcp_auth_query_timeout = 3 * 1000; /* 3s in millisecs */
+ cfg->do_tcp_keepalive = 0;
+ cfg->tcp_keepalive_timeout = 120 * 1000; /* 120s in millisecs */
+ cfg->sock_queue_timeout = 0; /* do not check timeout */
+ cfg->ssl_service_key = NULL;
+ cfg->ssl_service_pem = NULL;
+ cfg->ssl_port = UNBOUND_DNS_OVER_TLS_PORT;
+ cfg->ssl_upstream = 0;
+ cfg->tls_cert_bundle = NULL;
+ cfg->tls_win_cert = 0;
+ cfg->tls_use_sni = 1;
+ cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT;
+ if(!(cfg->http_endpoint = strdup("/dns-query"))) goto error_exit;
+ cfg->http_max_streams = 100;
+ cfg->http_query_buffer_size = 4*1024*1024;
+ cfg->http_response_buffer_size = 4*1024*1024;
+ cfg->http_nodelay = 1;
++ cfg->quic_port = UNBOUND_DNS_OVER_QUIC_PORT;
++ cfg->quic_size = 8*1024*1024;
+ cfg->use_syslog = 1;
+ cfg->log_identity = NULL; /* changed later with argv[0] */
+ cfg->log_time_ascii = 0;
++ cfg->log_time_iso = 0;
+ cfg->log_queries = 0;
+ cfg->log_replies = 0;
+ cfg->log_tag_queryreply = 0;
+ cfg->log_local_actions = 0;
+ cfg->log_servfail = 0;
+ cfg->log_destaddr = 0;
+#ifndef USE_WINSOCK
+# ifdef USE_MINI_EVENT
+ /* select max 1024 sockets */
+ cfg->outgoing_num_ports = 960;
+ cfg->num_queries_per_thread = 512;
+# else
+ /* libevent can use many sockets */
+ cfg->outgoing_num_ports = 4096;
+ cfg->num_queries_per_thread = 1024;
+# endif
+ cfg->outgoing_num_tcp = 10;
+ cfg->incoming_num_tcp = 10;
+#else
+ cfg->outgoing_num_ports = 48; /* windows is limited in num fds */
+ cfg->num_queries_per_thread = 24;
+ cfg->outgoing_num_tcp = 2; /* leaves 64-52=12 for: 4if,1stop,thread4 */
+ cfg->incoming_num_tcp = 2;
+#endif
+ cfg->stream_wait_size = 4 * 1024 * 1024;
+ cfg->edns_buffer_size = 1232; /* from DNS flagday recommendation */
+ cfg->msg_buffer_size = 65552; /* 64 k + a small margin */
+ cfg->msg_cache_size = 4 * 1024 * 1024;
+ cfg->msg_cache_slabs = 4;
+ cfg->jostle_time = 200;
+ cfg->rrset_cache_size = 4 * 1024 * 1024;
+ cfg->rrset_cache_slabs = 4;
+ cfg->host_ttl = 900;
+ cfg->bogus_ttl = 60;
+ cfg->min_ttl = 0;
+ cfg->max_ttl = 3600 * 24;
+ cfg->max_negative_ttl = 3600;
+ cfg->min_negative_ttl = 0;
+ cfg->prefetch = 0;
+ cfg->prefetch_key = 0;
+ cfg->deny_any = 0;
+ cfg->infra_cache_slabs = 4;
+ cfg->infra_cache_numhosts = 10000;
+ cfg->infra_cache_min_rtt = 50;
+ cfg->infra_cache_max_rtt = 120000;
+ cfg->infra_keep_probing = 0;
+ cfg->delay_close = 0;
+ cfg->udp_connect = 1;
+ if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int))))
+ goto error_exit;
+ init_outgoing_availports(cfg->outgoing_avail_ports, 65536);
+ if(!(cfg->username = strdup(UB_USERNAME))) goto error_exit;
+#ifdef HAVE_CHROOT
+ if(!(cfg->chrootdir = strdup(CHROOT_DIR))) goto error_exit;
+#endif
+ if(!(cfg->directory = strdup(RUN_DIR))) goto error_exit;
+ if(!(cfg->logfile = strdup(""))) goto error_exit;
+ if(!(cfg->pidfile = strdup(PIDFILE))) goto error_exit;
+ if(!(cfg->target_fetch_policy = strdup("3 2 1 0 0"))) goto error_exit;
+ cfg->fast_server_permil = 0;
+ cfg->fast_server_num = 3;
+ cfg->donotqueryaddrs = NULL;
+ cfg->donotquery_localhost = 1;
+ cfg->root_hints = NULL;
+ cfg->use_systemd = 0;
+ cfg->do_daemonize = 1;
+ cfg->if_automatic = 0;
+ cfg->if_automatic_ports = NULL;
+ cfg->so_rcvbuf = 0;
+ cfg->so_sndbuf = 0;
+ cfg->so_reuseport = REUSEPORT_DEFAULT;
+ cfg->ip_transparent = 0;
+ cfg->ip_freebind = 0;
+ cfg->ip_dscp = 0;
+ cfg->num_ifs = 0;
+ cfg->ifs = NULL;
+ cfg->num_out_ifs = 0;
+ cfg->out_ifs = NULL;
+ cfg->stubs = NULL;
+ cfg->forwards = NULL;
+ cfg->auths = NULL;
+#ifdef CLIENT_SUBNET
+ cfg->client_subnet = NULL;
+ cfg->client_subnet_zone = NULL;
+ cfg->client_subnet_opcode = LDNS_EDNS_CLIENT_SUBNET;
+ cfg->client_subnet_always_forward = 0;
+ cfg->max_client_subnet_ipv4 = 24;
+ cfg->max_client_subnet_ipv6 = 56;
+ cfg->min_client_subnet_ipv4 = 0;
+ cfg->min_client_subnet_ipv6 = 0;
+ cfg->max_ecs_tree_size_ipv4 = 100;
+ cfg->max_ecs_tree_size_ipv6 = 100;
+#endif
+ cfg->views = NULL;
+ cfg->acls = NULL;
+ cfg->tcp_connection_limits = NULL;
+ cfg->harden_short_bufsize = 1;
+ cfg->harden_large_queries = 0;
+ cfg->harden_glue = 1;
++ cfg->harden_unverified_glue = 0;
+ cfg->harden_dnssec_stripped = 1;
+ cfg->harden_below_nxdomain = 1;
+ cfg->harden_referral_path = 0;
+ cfg->harden_algo_downgrade = 0;
+ cfg->harden_unknown_additional = 0;
+ cfg->use_caps_bits_for_id = 0;
+ cfg->caps_whitelist = NULL;
+ cfg->private_address = NULL;
+ cfg->private_domain = NULL;
+ cfg->unwanted_threshold = 0;
+ cfg->hide_identity = 0;
+ cfg->hide_version = 0;
+ cfg->hide_trustanchor = 0;
+ cfg->hide_http_user_agent = 0;
+ cfg->identity = NULL;
+ cfg->version = NULL;
+ cfg->http_user_agent = NULL;
+ cfg->nsid_cfg_str = NULL;
+ cfg->nsid = NULL;
+ cfg->nsid_len = 0;
+ cfg->auto_trust_anchor_file_list = NULL;
+ cfg->trust_anchor_file_list = NULL;
+ cfg->trust_anchor_list = NULL;
+ cfg->trusted_keys_file_list = NULL;
+ cfg->trust_anchor_signaling = 1;
+ cfg->root_key_sentinel = 1;
+ cfg->domain_insecure = NULL;
+ cfg->val_date_override = 0;
+ cfg->val_sig_skew_min = 3600; /* at least daylight savings trouble */
+ cfg->val_sig_skew_max = 86400; /* at most timezone settings trouble */
+ cfg->val_max_restart = 5;
+ cfg->val_clean_additional = 1;
+ cfg->val_log_level = 0;
+ cfg->val_log_squelch = 0;
+ cfg->val_permissive_mode = 0;
+ cfg->aggressive_nsec = 1;
+ cfg->ignore_cd = 0;
+ cfg->disable_edns_do = 0;
+ cfg->serve_expired = 0;
+ cfg->serve_expired_ttl = 0;
+ cfg->serve_expired_ttl_reset = 0;
+ cfg->serve_expired_reply_ttl = 30;
+ cfg->serve_expired_client_timeout = 0;
+ cfg->ede_serve_expired = 0;
+ cfg->serve_original_ttl = 0;
+ cfg->zonemd_permissive_mode = 0;
+ cfg->add_holddown = 30*24*3600;
+ cfg->del_holddown = 30*24*3600;
+ cfg->keep_missing = 366*24*3600; /* one year plus a little leeway */
+ cfg->permit_small_holddown = 0;
+ cfg->key_cache_size = 4 * 1024 * 1024;
+ cfg->key_cache_slabs = 4;
+ cfg->neg_cache_size = 1 * 1024 * 1024;
+ cfg->local_zones = NULL;
+ cfg->local_zones_nodefault = NULL;
+#ifdef USE_IPSET
+ cfg->local_zones_ipset = NULL;
+#endif
+ cfg->local_zones_disable_default = 0;
+ cfg->local_data = NULL;
+ cfg->local_zone_overrides = NULL;
+ cfg->unblock_lan_zones = 0;
+ cfg->insecure_lan_zones = 0;
+ cfg->python_script = NULL;
+ cfg->dynlib_file = NULL;
+ cfg->remote_control_enable = 0;
+ cfg->control_ifs.first = NULL;
+ cfg->control_ifs.last = NULL;
+ cfg->control_port = UNBOUND_CONTROL_PORT;
+ cfg->control_use_cert = 1;
+ cfg->minimal_responses = 1;
+ cfg->rrset_roundrobin = 1;
+ cfg->unknown_server_time_limit = 376;
+ cfg->discard_timeout = 1900; /* msec */
+ cfg->wait_limit = 1000;
+ cfg->wait_limit_cookie = 10000;
+ cfg->wait_limit_netblock = NULL;
+ cfg->wait_limit_cookie_netblock = NULL;
+ cfg->max_udp_size = 1232; /* value taken from edns_buffer_size */
+ if(!(cfg->server_key_file = strdup(RUN_DIR"/unbound_server.key")))
+ goto error_exit;
+ if(!(cfg->server_cert_file = strdup(RUN_DIR"/unbound_server.pem")))
+ goto error_exit;
+ if(!(cfg->control_key_file = strdup(RUN_DIR"/unbound_control.key")))
+ goto error_exit;
+ if(!(cfg->control_cert_file = strdup(RUN_DIR"/unbound_control.pem")))
+ goto error_exit;
+
+#ifdef CLIENT_SUBNET
+ if(!(cfg->module_conf = strdup("subnetcache validator iterator"))) goto error_exit;
+#else
+ if(!(cfg->module_conf = strdup("validator iterator"))) goto error_exit;
+#endif
+ if(!(cfg->val_nsec3_key_iterations =
+ strdup("1024 150 2048 150 4096 150"))) goto error_exit;
+#if defined(DNSTAP_SOCKET_PATH)
+ if(!(cfg->dnstap_socket_path = strdup(DNSTAP_SOCKET_PATH)))
+ goto error_exit;
+#endif
+ cfg->dnstap_bidirectional = 1;
+ cfg->dnstap_tls = 1;
+ cfg->disable_dnssec_lame_check = 0;
+ cfg->ip_ratelimit_cookie = 0;
+ cfg->ip_ratelimit = 0;
+ cfg->ratelimit = 0;
+ cfg->ip_ratelimit_slabs = 4;
+ cfg->ratelimit_slabs = 4;
+ cfg->ip_ratelimit_size = 4*1024*1024;
+ cfg->ratelimit_size = 4*1024*1024;
+ cfg->ratelimit_for_domain = NULL;
+ cfg->ratelimit_below_domain = NULL;
+ cfg->ip_ratelimit_factor = 10;
+ cfg->ratelimit_factor = 10;
+ cfg->ip_ratelimit_backoff = 0;
+ cfg->ratelimit_backoff = 0;
+ cfg->outbound_msg_retry = 5;
+ cfg->max_sent_count = 32;
+ cfg->max_query_restarts = 11;
+ cfg->qname_minimisation = 1;
+ cfg->qname_minimisation_strict = 0;
+ cfg->shm_enable = 0;
+ cfg->shm_key = 11777;
+ cfg->edns_client_strings = NULL;
+ cfg->edns_client_string_opcode = 65001;
+ cfg->dnscrypt = 0;
+ cfg->dnscrypt_port = 0;
+ cfg->dnscrypt_provider = NULL;
+ cfg->dnscrypt_provider_cert = NULL;
+ cfg->dnscrypt_provider_cert_rotated = NULL;
+ cfg->dnscrypt_secret_key = NULL;
+ cfg->dnscrypt_shared_secret_cache_size = 4*1024*1024;
+ cfg->dnscrypt_shared_secret_cache_slabs = 4;
+ cfg->dnscrypt_nonce_cache_size = 4*1024*1024;
+ cfg->dnscrypt_nonce_cache_slabs = 4;
+ cfg->pad_responses = 1;
+ cfg->pad_responses_block_size = 468; /* from RFC8467 */
+ cfg->pad_queries = 1;
+ cfg->pad_queries_block_size = 128; /* from RFC8467 */
+#ifdef USE_IPSECMOD
+ cfg->ipsecmod_enabled = 1;
+ cfg->ipsecmod_ignore_bogus = 0;
+ cfg->ipsecmod_hook = NULL;
+ cfg->ipsecmod_max_ttl = 3600;
+ cfg->ipsecmod_whitelist = NULL;
+ cfg->ipsecmod_strict = 0;
+#endif
+ cfg->do_answer_cookie = 0;
+ memset(cfg->cookie_secret, 0, sizeof(cfg->cookie_secret));
+ cfg->cookie_secret_len = 16;
+ init_cookie_secret(cfg->cookie_secret, cfg->cookie_secret_len);
+ cfg->cookie_secret_file = NULL;
+#ifdef USE_CACHEDB
+ if(!(cfg->cachedb_backend = strdup("testframe"))) goto error_exit;
+ if(!(cfg->cachedb_secret = strdup("default"))) goto error_exit;
+ cfg->cachedb_no_store = 0;
+ cfg->cachedb_check_when_serve_expired = 1;
+#ifdef USE_REDIS
+ if(!(cfg->redis_server_host = strdup("127.0.0.1"))) goto error_exit;
+ cfg->redis_server_path = NULL;
+ cfg->redis_server_password = NULL;
+ cfg->redis_timeout = 100;
++ cfg->redis_command_timeout = 0;
++ cfg->redis_connect_timeout = 0;
+ cfg->redis_server_port = 6379;
+ cfg->redis_expire_records = 0;
+ cfg->redis_logical_db = 0;
+#endif /* USE_REDIS */
+#endif /* USE_CACHEDB */
+#ifdef USE_IPSET
+ cfg->ipset_name_v4 = NULL;
+ cfg->ipset_name_v6 = NULL;
+#endif
+ cfg->ede = 0;
++ cfg->iter_scrub_ns = 20;
++ cfg->iter_scrub_cname = 11;
++ cfg->max_global_quota = 128;
+ return cfg;
+error_exit:
+ config_delete(cfg);
+ return NULL;
+}
+
+struct config_file* config_create_forlib(void)
+{
+ struct config_file* cfg = config_create();
+ if(!cfg) return NULL;
+ /* modifications for library use, less verbose, less memory */
+ free(cfg->chrootdir);
+ cfg->chrootdir = NULL;
+ cfg->verbosity = 0;
+ cfg->outgoing_num_ports = 16; /* in library use, this is 'reasonable'
+ and probably within the ulimit(maxfds) of the user */
+ cfg->outgoing_num_tcp = 2;
+ cfg->msg_cache_size = 1024*1024;
+ cfg->msg_cache_slabs = 1;
+ cfg->rrset_cache_size = 1024*1024;
+ cfg->rrset_cache_slabs = 1;
+ cfg->infra_cache_slabs = 1;
+ cfg->use_syslog = 0;
+ cfg->key_cache_size = 1024*1024;
+ cfg->key_cache_slabs = 1;
+ cfg->neg_cache_size = 100 * 1024;
+ cfg->donotquery_localhost = 0; /* allow, so that you can ask a
+ forward nameserver running on localhost */
+ cfg->val_log_level = 2; /* to fill why_bogus with */
+ cfg->val_log_squelch = 1;
+ cfg->minimal_responses = 0;
+ cfg->harden_short_bufsize = 1;
+ return cfg;
+}
+
+/** check that the value passed is >= 0 */
+#define IS_NUMBER_OR_ZERO \
+ if(atoi(val) == 0 && strcmp(val, "0") != 0) return 0
+/** check that the value passed is > 0 */
+#define IS_NONZERO_NUMBER \
+ if(atoi(val) == 0) return 0
+/** check that the value passed is not 0 and a power of 2 */
+#define IS_POW2_NUMBER \
+ if(atoi(val) == 0 || !is_pow2((size_t)atoi(val))) return 0
+/** check that the value passed is yes or no */
+#define IS_YES_OR_NO \
+ if(strcmp(val, "yes") != 0 && strcmp(val, "no") != 0) return 0
+/** put integer_or_zero into variable */
+#define S_NUMBER_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \
+ { IS_NUMBER_OR_ZERO; cfg->var = atoi(val); }
+/** put integer_nonzero into variable */
+#define S_NUMBER_NONZERO(str, var) if(strcmp(opt, str) == 0) \
+ { IS_NONZERO_NUMBER; cfg->var = atoi(val); }
+/** put integer_or_zero into unsigned */
+#define S_UNSIGNED_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \
+ { IS_NUMBER_OR_ZERO; cfg->var = (unsigned)atoi(val); }
+/** put integer_or_zero into size_t */
+#define S_SIZET_OR_ZERO(str, var) if(strcmp(opt, str) == 0) \
+ { IS_NUMBER_OR_ZERO; cfg->var = (size_t)atoi(val); }
+/** put integer_nonzero into size_t */
+#define S_SIZET_NONZERO(str, var) if(strcmp(opt, str) == 0) \
+ { IS_NONZERO_NUMBER; cfg->var = (size_t)atoi(val); }
+/** put yesno into variable */
+#define S_YNO(str, var) if(strcmp(opt, str) == 0) \
+ { IS_YES_OR_NO; cfg->var = (strcmp(val, "yes") == 0); }
+/** put memsize into variable */
+#define S_MEMSIZE(str, var) if(strcmp(opt, str)==0) \
+ { return cfg_parse_memsize(val, &cfg->var); }
+/** put pow2 number into variable */
+#define S_POW2(str, var) if(strcmp(opt, str)==0) \
+ { IS_POW2_NUMBER; cfg->var = (size_t)atoi(val); }
+/** put string into variable */
+#define S_STR(str, var) if(strcmp(opt, str)==0) \
+ { free(cfg->var); return (cfg->var = strdup(val)) != NULL; }
+/** put string into strlist */
+#define S_STRLIST(str, var) if(strcmp(opt, str)==0) \
+ { return cfg_strlist_insert(&cfg->var, strdup(val)); }
+/** put string into strlist if not present yet*/
+#define S_STRLIST_UNIQ(str, var) if(strcmp(opt, str)==0) \
+ { if(cfg_strlist_find(cfg->var, val)) { return 0;} \
+ return cfg_strlist_insert(&cfg->var, strdup(val)); }
+/** append string to strlist */
+#define S_STRLIST_APPEND(str, var) if(strcmp(opt, str)==0) \
+ { return cfg_strlist_append(&cfg->var, strdup(val)); }
+
+int config_set_option(struct config_file* cfg, const char* opt,
+ const char* val)
+{
+ char buf[64];
+ if(!opt) return 0;
+ if(opt[strlen(opt)-1] != ':' && strlen(opt)+2<sizeof(buf)) {
+ snprintf(buf, sizeof(buf), "%s:", opt);
+ opt = buf;
+ }
+ S_NUMBER_OR_ZERO("verbosity:", verbosity)
+ else if(strcmp(opt, "statistics-interval:") == 0) {
+ if(strcmp(val, "0") == 0 || strcmp(val, "") == 0)
+ cfg->stat_interval = 0;
+ else if(atoi(val) == 0)
+ return 0;
+ else cfg->stat_interval = atoi(val);
+ } else if(strcmp(opt, "num-threads:") == 0) {
+ /* not supported, library must have 1 thread in bgworker */
+ return 0;
+ } else if(strcmp(opt, "outgoing-port-permit:") == 0) {
+ return cfg_mark_ports(val, 1,
+ cfg->outgoing_avail_ports, 65536);
+ } else if(strcmp(opt, "outgoing-port-avoid:") == 0) {
+ return cfg_mark_ports(val, 0,
+ cfg->outgoing_avail_ports, 65536);
+ } else if(strcmp(opt, "local-zone:") == 0) {
+ return cfg_parse_local_zone(cfg, val);
+ } else if(strcmp(opt, "val-override-date:") == 0) {
+ if(strcmp(val, "") == 0 || strcmp(val, "0") == 0) {
+ cfg->val_date_override = 0;
+ } else if(strlen(val) == 14) {
+ cfg->val_date_override = cfg_convert_timeval(val);
+ return cfg->val_date_override != 0;
+ } else {
+ if(atoi(val) == 0) return 0;
+ cfg->val_date_override = (uint32_t)atoi(val);
+ }
+ } else if(strcmp(opt, "local-data-ptr:") == 0) {
+ char* ptr = cfg_ptr_reverse((char*)opt);
+ return cfg_strlist_insert(&cfg->local_data, ptr);
+ } else if(strcmp(opt, "logfile:") == 0) {
+ cfg->use_syslog = 0;
+ free(cfg->logfile);
+ return (cfg->logfile = strdup(val)) != NULL;
+ }
+ else if(strcmp(opt, "log-time-ascii:") == 0)
+ { IS_YES_OR_NO; cfg->log_time_ascii = (strcmp(val, "yes") == 0);
+ log_set_time_asc(cfg->log_time_ascii); }
++ else if(strcmp(opt, "log-time-iso:") == 0)
++ { IS_YES_OR_NO; cfg->log_time_iso = (strcmp(val, "yes") == 0);
++ log_set_time_iso(cfg->log_time_iso); }
+ else S_SIZET_NONZERO("max-udp-size:", max_udp_size)
+ else S_YNO("use-syslog:", use_syslog)
+ else S_STR("log-identity:", log_identity)
+ else S_YNO("extended-statistics:", stat_extended)
+ else S_YNO("statistics-inhibit-zero:", stat_inhibit_zero)
+ else S_YNO("statistics-cumulative:", stat_cumulative)
+ else S_YNO("shm-enable:", shm_enable)
+ else S_NUMBER_OR_ZERO("shm-key:", shm_key)
+ else S_YNO("do-ip4:", do_ip4)
+ 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)
+ else S_NUMBER_NONZERO("tcp-mss:", tcp_mss)
+ else S_NUMBER_NONZERO("outgoing-tcp-mss:", outgoing_tcp_mss)
+ else S_NUMBER_NONZERO("tcp-auth-query-timeout:", tcp_auth_query_timeout)
+ else S_NUMBER_NONZERO("tcp-idle-timeout:", tcp_idle_timeout)
+ else S_NUMBER_NONZERO("max-reuse-tcp-queries:", max_reuse_tcp_queries)
+ else S_NUMBER_NONZERO("tcp-reuse-timeout:", tcp_reuse_timeout)
+ else S_YNO("edns-tcp-keepalive:", do_tcp_keepalive)
+ else S_NUMBER_NONZERO("edns-tcp-keepalive-timeout:", tcp_keepalive_timeout)
+ else S_NUMBER_OR_ZERO("sock-queue-timeout:", sock_queue_timeout)
+ else S_YNO("ssl-upstream:", ssl_upstream)
+ else S_YNO("tls-upstream:", ssl_upstream)
+ else S_STR("ssl-service-key:", ssl_service_key)
+ else S_STR("tls-service-key:", ssl_service_key)
+ else S_STR("ssl-service-pem:", ssl_service_pem)
+ else S_STR("tls-service-pem:", ssl_service_pem)
+ else S_NUMBER_NONZERO("ssl-port:", ssl_port)
+ else S_NUMBER_NONZERO("tls-port:", ssl_port)
+ else S_STR("ssl-cert-bundle:", tls_cert_bundle)
+ else S_STR("tls-cert-bundle:", tls_cert_bundle)
+ else S_YNO("tls-win-cert:", tls_win_cert)
+ else S_YNO("tls-system-cert:", tls_win_cert)
+ else S_STRLIST("additional-ssl-port:", tls_additional_port)
+ else S_STRLIST("additional-tls-port:", tls_additional_port)
+ else S_STRLIST("tls-additional-ports:", tls_additional_port)
+ else S_STRLIST("tls-additional-port:", tls_additional_port)
+ else S_STRLIST_APPEND("tls-session-ticket-keys:", tls_session_ticket_keys)
+ else S_STR("tls-ciphers:", tls_ciphers)
+ else S_STR("tls-ciphersuites:", tls_ciphersuites)
+ else S_YNO("tls-use-sni:", tls_use_sni)
+ else S_NUMBER_NONZERO("https-port:", https_port)
+ else S_STR("http-endpoint:", http_endpoint)
+ else S_NUMBER_NONZERO("http-max-streams:", http_max_streams)
+ else S_MEMSIZE("http-query-buffer-size:", http_query_buffer_size)
+ else S_MEMSIZE("http-response-buffer-size:", http_response_buffer_size)
+ else S_YNO("http-nodelay:", http_nodelay)
+ else S_YNO("http-notls-downstream:", http_notls_downstream)
++ else S_NUMBER_NONZERO("quic-port:", quic_port)
++ else S_MEMSIZE("quic-size:", quic_size)
+ else S_YNO("interface-automatic:", if_automatic)
+ else S_STR("interface-automatic-ports:", if_automatic_ports)
+ else S_YNO("use-systemd:", use_systemd)
+ else S_YNO("do-daemonize:", do_daemonize)
+ else S_NUMBER_NONZERO("port:", port)
+ else S_NUMBER_NONZERO("outgoing-range:", outgoing_num_ports)
+ else S_SIZET_OR_ZERO("outgoing-num-tcp:", outgoing_num_tcp)
+ else S_SIZET_OR_ZERO("incoming-num-tcp:", incoming_num_tcp)
+ else S_MEMSIZE("stream-wait-size:", stream_wait_size)
*** 3790 LINES SKIPPED ***