From nobody Tue Sep 19 04:19:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RqT212Fjfz4tKH0; Tue, 19 Sep 2023 04:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RqT211c2fz4SLP; Tue, 19 Sep 2023 04:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695097145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2m530ozhqUlA0GlDyw94kn/w3eIlonG1c0bmiHFI2e8=; b=MESPVeNE/VaDPAiHziWehqKpc5a3c787nCV+W1NM11dbzTYGEDyFSlN0Ip3xZNoO64RQGa TIYm117LpoapaHejkOH+fZQVeJGMZIs75v3uSnFaOC08vzmaOB4BP+A11MdlxbzcqfsEaO 6Nq6uX2giVEHLXRM6tBphVlI/3y6RPQ7IRSk61Nb4D7Rp0W0AhBJFT3bgf1BKQTmS7OKX5 IVs4cxdYP1zEgvbHpXSFM4PGv5/9gTmvQ59DQ5CF4WrqYMbnLEGnrLqx29xwdULW5oSteB nLa3ZGn+aWFB3K0UJSeoVaUy+yvl+78h45hT8FrTKwokq+depYRWgVXxRs/6Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695097145; a=rsa-sha256; cv=none; b=MT2PCKR5SiMsDTxNX4ZlUjkU7A1u1WHmfibdVX87SIu2gfuoAM4BZad5g9+ARtJa4QVbGT OD8z5uBXaInZk2YV8HBoy9D3brrtrAjddPHd86OxZAd/mZuw0td+50MUt+hZQStCgevASN vsRzTCeNeOV2Oe5d64HAr0ajqLeaAmlQUKh8fC8gpnxUcRoLmSQwGA4esV8eiQQEyHu0zR DX+Ne31rnemXiPnnV4+L1W7769ivqm9szZxQT7zaPeRDQvFEbwS3/c9DEANGXerLlf7oNm RyD1VaY8y7tSfAb55Tnue1CHtn0PLHvpn5g+a1UDt4f1oG3lyNIr9k1pfS4z5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695097145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2m530ozhqUlA0GlDyw94kn/w3eIlonG1c0bmiHFI2e8=; b=v7M9BfDKNYeH5aiZxXGbTeRraRtd3gDnhkPM37yaJLwfpuspCukegsslw2/A9cUJ5J7vZs 51L758sq635LyR9fRxFzbZuGO75h9czqe43+6ePQtPp8pHqo6mSjPfe95g74J+K18JtsAT FZRpEmqu/4j8nIffV88SZNJqt/ym+2NkKgw7Qyv0rmYno/E4f5BWF/jkzBc4NDLif1QNpE 8AvAwhFIZuhtAYg9zazVJKdQYGPLH7ndFypmrmgYsnMjMgHfJg+eEDvNLV8/NhLnKGOb8A ksiqWuQ+73qYZc2T5ZELCJX+Xw0qR4TrPYnHhcw2tUA3ivhQ7CqDE/EcM0IOQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RqT210VpRz1070; Tue, 19 Sep 2023 04:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38J4J54K077844; Tue, 19 Sep 2023 04:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38J4J4RV077841; Tue, 19 Sep 2023 04:19:04 GMT (envelope-from git) Date: Tue, 19 Sep 2023 04:19:04 GMT Message-Id: <202309190419.38J4J4RV077841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 8f76bb7dad48 - main - unbound: Vendor import 1.18.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f76bb7dad48538c6832c2fb466a433d2a3f8cd5 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8f76bb7dad48538c6832c2fb466a433d2a3f8cd5 commit 8f76bb7dad48538c6832c2fb466a433d2a3f8cd5 Merge: b2bd87bb01a9 401770e05c71 Author: Cy Schubert AuthorDate: 2023-09-19 04:17:09 +0000 Commit: Cy Schubert CommitDate: 2023-09-19 04:17:09 +0000 unbound: Vendor import 1.18.0 Release notes at https://www.nlnetlabs.nl/news/2023/Aug/30/unbound-1.18.0-released/ MFC after: 2 weeks Merge commit '401770e05c71ecb5ae61a59d316069b4b78bf622' into main contrib/unbound/Makefile.in | 43 +- contrib/unbound/README.md | 2 +- contrib/unbound/acx_nlnetlabs.m4 | 36 +- contrib/unbound/acx_python.m4 | 61 +- contrib/unbound/cachedb/cachedb.c | 57 +- contrib/unbound/cachedb/redis.c | 28 +- contrib/unbound/compat/getentropy_solaris.c | 2 +- contrib/unbound/config.guess | 51 +- contrib/unbound/config.h.in | 25 +- contrib/unbound/config.h.in~ | 1456 ++++++++++++++++++++ contrib/unbound/config.sub | 72 +- contrib/unbound/configure | 170 ++- contrib/unbound/configure.ac | 99 +- contrib/unbound/contrib/Dockerfile.tests | 4 +- contrib/unbound/contrib/README | 3 + contrib/unbound/contrib/aaaa-filter-iterator.patch | 4 +- contrib/unbound/contrib/unbound.init_yocto | 139 ++ contrib/unbound/daemon/acl_list.c | 2 + contrib/unbound/daemon/acl_list.h | 8 +- contrib/unbound/daemon/cachedump.c | 28 +- contrib/unbound/daemon/remote.c | 236 ++-- contrib/unbound/daemon/remote.h | 2 +- contrib/unbound/daemon/stats.c | 53 +- contrib/unbound/daemon/stats.h | 7 + contrib/unbound/daemon/worker.c | 471 ++++--- contrib/unbound/dns64/dns64.c | 4 +- contrib/unbound/dnstap/dnstap.c | 7 +- contrib/unbound/dnstap/dnstap.h | 4 +- contrib/unbound/dnstap/unbound-dnstap-socket.c | 39 +- contrib/unbound/doc/Changelog | 323 +++++ contrib/unbound/doc/README | 2 +- contrib/unbound/doc/README.DNS64 | 20 + contrib/unbound/doc/example.conf.in | 32 +- 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 | 58 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 147 +- contrib/unbound/edns-subnet/subnetmod.c | 27 +- contrib/unbound/iterator/iter_delegpt.c | 39 + contrib/unbound/iterator/iter_delegpt.h | 25 + contrib/unbound/iterator/iter_resptype.c | 7 + contrib/unbound/iterator/iter_scrub.c | 43 +- contrib/unbound/iterator/iter_utils.c | 43 +- contrib/unbound/iterator/iter_utils.h | 7 +- contrib/unbound/iterator/iterator.c | 259 ++-- contrib/unbound/iterator/iterator.h | 23 +- contrib/unbound/libunbound/libworker.c | 16 +- contrib/unbound/libunbound/unbound-event.h | 6 +- contrib/unbound/libunbound/unbound.h | 116 +- contrib/unbound/services/authzone.c | 10 +- contrib/unbound/services/cache/dns.c | 50 +- contrib/unbound/services/cache/infra.c | 75 +- contrib/unbound/services/cache/infra.h | 5 +- contrib/unbound/services/listen_dnsport.c | 153 +- contrib/unbound/services/localzone.c | 20 +- contrib/unbound/services/localzone.h | 2 + contrib/unbound/services/mesh.c | 385 +++--- contrib/unbound/services/mesh.h | 14 +- contrib/unbound/services/modstack.c | 10 +- contrib/unbound/services/outside_network.c | 28 + contrib/unbound/services/rpz.c | 230 +++- contrib/unbound/services/rpz.h | 16 +- contrib/unbound/sldns/rrdef.c | 12 +- contrib/unbound/sldns/rrdef.h | 7 +- contrib/unbound/sldns/str2wire.c | 94 +- contrib/unbound/sldns/str2wire.h | 4 +- contrib/unbound/sldns/wire2str.c | 19 +- contrib/unbound/smallapp/unbound-anchor.c | 3 +- contrib/unbound/smallapp/unbound-checkconf.c | 2 +- contrib/unbound/smallapp/unbound-control.c | 54 +- contrib/unbound/smallapp/unbound-host.c | 5 +- contrib/unbound/testdata/00-lint.tdir/00-lint.pre | 14 + contrib/unbound/testdata/cachedb_cached_ede.crpl | 91 ++ .../unbound/testdata/edns_downstream_cookies.rpl | 235 ++++ .../testdata/ip_ratelimit.tdir/ip_ratelimit.conf | 28 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.dsc | 16 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.post | 13 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.pre | 24 + .../testdata/ip_ratelimit.tdir/ip_ratelimit.test | 165 +++ .../testdata/ip_ratelimit.tdir/unbound_control.key | 39 + .../testdata/ip_ratelimit.tdir/unbound_control.pem | 22 + .../testdata/ip_ratelimit.tdir/unbound_server.key | 39 + .../testdata/ip_ratelimit.tdir/unbound_server.pem | 22 + .../unbound/testdata/iter_cname_minimise_nx.rpl | 246 ++++ contrib/unbound/testdata/iter_failreply.rpl | 132 ++ contrib/unbound/testdata/iter_ignore_empty.rpl | 198 +++ contrib/unbound/testdata/iter_nat64.rpl | 117 ++ contrib/unbound/testdata/iter_nat64_prefix.rpl | 119 ++ contrib/unbound/testdata/iter_nat64_prefix48.rpl | 118 ++ .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 154 +++ .../testdata/serve_expired_0ttl_nxdomain.rpl | 154 +++ .../testdata/serve_expired_0ttl_servfail.rpl | 129 ++ .../serve_expired_cached_servfail_refresh.rpl | 145 ++ .../stat_values.tdir/stat_values_cachedb.conf | 36 + .../stat_values_downstream_cookies.conf | 32 + contrib/unbound/testdata/subnet_cached_ede.crpl | 114 ++ .../unbound/testdata/subnet_global_prefetch.crpl | 236 ++++ .../subnet_global_prefetch_always_forward.crpl | 167 +++ .../testdata/subnet_global_prefetch_expired.crpl | 241 ++++ contrib/unbound/testdata/val_any_negcache.rpl | 240 ++++ contrib/unbound/util/config_file.c | 153 +- contrib/unbound/util/config_file.h | 65 +- contrib/unbound/util/configlexer.lex | 15 +- contrib/unbound/util/configparser.y | 148 +- contrib/unbound/util/data/msgencode.c | 148 +- contrib/unbound/util/data/msgencode.h | 42 +- contrib/unbound/util/data/msgparse.c | 98 +- contrib/unbound/util/data/msgparse.h | 18 +- contrib/unbound/util/data/msgreply.c | 95 +- contrib/unbound/util/data/msgreply.h | 30 +- contrib/unbound/util/edns.c | 59 + contrib/unbound/util/edns.h | 59 + contrib/unbound/util/fptr_wlist.c | 8 + contrib/unbound/util/iana_ports.inc | 4 + contrib/unbound/util/module.c | 16 +- contrib/unbound/util/module.h | 14 +- contrib/unbound/util/net_help.c | 70 +- contrib/unbound/util/net_help.h | 23 + contrib/unbound/util/netevent.c | 229 +-- contrib/unbound/util/netevent.h | 70 +- contrib/unbound/util/regional.c | 2 +- contrib/unbound/util/rfc_1982.c | 74 + contrib/unbound/util/rfc_1982.h | 63 + contrib/unbound/util/siphash.c | 187 +++ contrib/unbound/util/siphash.h | 43 + contrib/unbound/util/storage/lruhash.c | 25 +- contrib/unbound/util/storage/lruhash.h | 5 +- contrib/unbound/util/storage/slabhash.c | 18 + contrib/unbound/util/storage/slabhash.h | 9 + contrib/unbound/util/timehist.c | 44 +- contrib/unbound/util/timeval_func.c | 113 ++ contrib/unbound/util/timeval_func.h | 53 + contrib/unbound/validator/autotrust.c | 2 + contrib/unbound/validator/val_kcache.c | 10 +- contrib/unbound/validator/val_kcache.h | 4 +- contrib/unbound/validator/val_kentry.c | 48 +- contrib/unbound/validator/val_kentry.h | 37 +- contrib/unbound/validator/val_neg.c | 7 +- contrib/unbound/validator/val_nsec.c | 19 +- contrib/unbound/validator/val_nsec.h | 5 +- contrib/unbound/validator/val_sigcrypt.c | 43 +- contrib/unbound/validator/val_utils.c | 19 +- contrib/unbound/validator/validator.c | 137 +- lib/libunbound/Makefile | 6 +- lib/libunbound/config.h | 6 +- 148 files changed, 9439 insertions(+), 1708 deletions(-) diff --cc contrib/unbound/README.md index c3d9bc2492ef,000000000000..c220da030458 mode 100644,000000..100644 --- a/contrib/unbound/README.md +++ b/contrib/unbound/README.md @@@ -1,40 -1,0 +1,40 @@@ +# Unbound + - [![Travis Build Status](https://travis-ci.org/NLnetLabs/unbound.svg?branch=master)](https://travis-ci.org/NLnetLabs/unbound) ++[![Github Build Status](https://github.com/NLnetLabs/unbound/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/NLnetLabs/unbound/actions) +[![Packaging status](https://repology.org/badge/tiny-repos/unbound.svg)](https://repology.org/project/unbound/versions) +[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/unbound.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:unbound) +[![Documentation Status](https://readthedocs.org/projects/unbound/badge/?version=latest)](https://unbound.readthedocs.io/en/latest/?badge=latest) +[![Mastodon Follow](https://img.shields.io/mastodon/follow/109262826617293067?domain=https%3A%2F%2Ffosstodon.org&style=social)](https://fosstodon.org/@nlnetlabs) + +Unbound is a validating, recursive, caching DNS resolver. It is designed to be +fast and lean and incorporates modern features based on open standards. If you +have any feedback, we would love to hear from you. Don’t hesitate to +[create an issue on Github](https://github.com/NLnetLabs/unbound/issues/new) +or post a message on the [Unbound mailing list](https://lists.nlnetlabs.nl/mailman/listinfo/unbound-users). +You can learn more about Unbound by reading our +[documentation](https://unbound.docs.nlnetlabs.nl/). + +## Compiling + +Make sure you have the C toolchain, OpenSSL and its include files, and libexpat +installed. Unbound can be compiled and installed using: + +``` +./configure && make && make install +``` + +You can use libevent if you want. libevent is useful when using many (10000) +outgoing ports. By default max 256 ports are opened at the same time and the +builtin alternative is equally capable and a little faster. + +Use the `--with-libevent=dir` configure option to compile Unbound with libevent +support. + +## Unbound configuration + +All of Unbound's configuration options are described in the man pages, which +will be installed and are available on the Unbound +[documentation page](https://unbound.docs.nlnetlabs.nl/). + +An example configuration file is located in +[doc/example.conf](https://github.com/NLnetLabs/unbound/blob/master/doc/example.conf.in). diff --cc contrib/unbound/config.h.in~ index 000000000000,f31354d01408..f31354d01408 mode 000000,100644..100644 --- a/contrib/unbound/config.h.in~ +++ b/contrib/unbound/config.h.in~ diff --cc contrib/unbound/contrib/unbound.init_yocto index 000000000000,4eba752bc55c..4eba752bc55c mode 000000,100644..100644 --- a/contrib/unbound/contrib/unbound.init_yocto +++ b/contrib/unbound/contrib/unbound.init_yocto diff --cc contrib/unbound/testdata/00-lint.tdir/00-lint.pre index 000000000000,507f5e1e9454..507f5e1e9454 mode 000000,100644..100644 --- a/contrib/unbound/testdata/00-lint.tdir/00-lint.pre +++ b/contrib/unbound/testdata/00-lint.tdir/00-lint.pre diff --cc contrib/unbound/testdata/cachedb_cached_ede.crpl index 000000000000,5eade545105f..5eade545105f mode 000000,100644..100644 --- a/contrib/unbound/testdata/cachedb_cached_ede.crpl +++ b/contrib/unbound/testdata/cachedb_cached_ede.crpl diff --cc contrib/unbound/testdata/edns_downstream_cookies.rpl index 000000000000,820bc5a7ca70..820bc5a7ca70 mode 000000,100644..100644 --- a/contrib/unbound/testdata/edns_downstream_cookies.rpl +++ b/contrib/unbound/testdata/edns_downstream_cookies.rpl diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.conf index 000000000000,ae7d0cda0d9d..ae7d0cda0d9d mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.conf +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.conf diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.dsc index 000000000000,a6f6192360cd..a6f6192360cd mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.dsc +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.dsc diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.post index 000000000000,1f86d008587d..1f86d008587d mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.post +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.post diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.pre index 000000000000,c4589a0ea4fe..c4589a0ea4fe mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.pre +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.pre diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.test index 000000000000,f58b7edcbe2a..f58b7edcbe2a mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.test +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/ip_ratelimit.test diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.key index 000000000000,753a4ef6162e..753a4ef6162e mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.key +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.key diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.pem index 000000000000,a1edf7017f1d..a1edf7017f1d mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.pem +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_control.pem diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.key index 000000000000,370a7bbb2f22..370a7bbb2f22 mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.key +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.key diff --cc contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.pem index 000000000000,986807310f2b..986807310f2b mode 000000,100644..100644 --- a/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.pem +++ b/contrib/unbound/testdata/ip_ratelimit.tdir/unbound_server.pem diff --cc contrib/unbound/testdata/iter_cname_minimise_nx.rpl index 000000000000,080055208daf..080055208daf mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_cname_minimise_nx.rpl +++ b/contrib/unbound/testdata/iter_cname_minimise_nx.rpl diff --cc contrib/unbound/testdata/iter_failreply.rpl index 000000000000,393714196d89..393714196d89 mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_failreply.rpl +++ b/contrib/unbound/testdata/iter_failreply.rpl diff --cc contrib/unbound/testdata/iter_ignore_empty.rpl index 000000000000,c70dd7e8df7b..c70dd7e8df7b mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_ignore_empty.rpl +++ b/contrib/unbound/testdata/iter_ignore_empty.rpl diff --cc contrib/unbound/testdata/iter_nat64.rpl index 000000000000,dde0a25596c1..dde0a25596c1 mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_nat64.rpl +++ b/contrib/unbound/testdata/iter_nat64.rpl diff --cc contrib/unbound/testdata/iter_nat64_prefix.rpl index 000000000000,ecb6508dcf55..ecb6508dcf55 mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_nat64_prefix.rpl +++ b/contrib/unbound/testdata/iter_nat64_prefix.rpl diff --cc contrib/unbound/testdata/iter_nat64_prefix48.rpl index 000000000000,e7c32e8ffc6a..e7c32e8ffc6a mode 000000,100644..100644 --- a/contrib/unbound/testdata/iter_nat64_prefix48.rpl +++ b/contrib/unbound/testdata/iter_nat64_prefix48.rpl diff --cc contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl index 000000000000,45b51444bccd..45b51444bccd mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl +++ b/contrib/unbound/testdata/serve_expired_0ttl_nodata.rpl diff --cc contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl index 000000000000,0fcde9f2ddb6..0fcde9f2ddb6 mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl +++ b/contrib/unbound/testdata/serve_expired_0ttl_nxdomain.rpl diff --cc contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl index 000000000000,aad7aa8c984f..aad7aa8c984f mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl +++ b/contrib/unbound/testdata/serve_expired_0ttl_servfail.rpl diff --cc contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl index 000000000000,664de9aa8732..664de9aa8732 mode 000000,100644..100644 --- a/contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl +++ b/contrib/unbound/testdata/serve_expired_cached_servfail_refresh.rpl diff --cc contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf index 000000000000,b5e9b0e02932..b5e9b0e02932 mode 000000,100644..100644 --- a/contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf +++ b/contrib/unbound/testdata/stat_values.tdir/stat_values_cachedb.conf diff --cc contrib/unbound/testdata/stat_values.tdir/stat_values_downstream_cookies.conf index 000000000000,21e78829fc8e..21e78829fc8e mode 000000,100644..100644 --- a/contrib/unbound/testdata/stat_values.tdir/stat_values_downstream_cookies.conf +++ b/contrib/unbound/testdata/stat_values.tdir/stat_values_downstream_cookies.conf diff --cc contrib/unbound/testdata/subnet_cached_ede.crpl index 000000000000,36bb28fcc180..36bb28fcc180 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_cached_ede.crpl +++ b/contrib/unbound/testdata/subnet_cached_ede.crpl diff --cc contrib/unbound/testdata/subnet_global_prefetch.crpl index 000000000000,2f005d43b905..2f005d43b905 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_global_prefetch.crpl +++ b/contrib/unbound/testdata/subnet_global_prefetch.crpl diff --cc contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl index 000000000000,ccfe5dfd6ea1..ccfe5dfd6ea1 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl +++ b/contrib/unbound/testdata/subnet_global_prefetch_always_forward.crpl diff --cc contrib/unbound/testdata/subnet_global_prefetch_expired.crpl index 000000000000,de1b780553a9..de1b780553a9 mode 000000,100644..100644 --- a/contrib/unbound/testdata/subnet_global_prefetch_expired.crpl +++ b/contrib/unbound/testdata/subnet_global_prefetch_expired.crpl diff --cc contrib/unbound/testdata/val_any_negcache.rpl index 000000000000,77aacba8cc13..77aacba8cc13 mode 000000,100644..100644 --- a/contrib/unbound/testdata/val_any_negcache.rpl +++ b/contrib/unbound/testdata/val_any_negcache.rpl diff --cc contrib/unbound/util/config_file.c index d0b9904e133d,000000000000..71c6d245794f mode 100644,000000..100644 --- a/contrib/unbound/util/config_file.c +++ b/contrib/unbound/util/config_file.c @@@ -1,2670 -1,0 +1,2711 @@@ +/* + * 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 +#include +#ifdef HAVE_TIME_H +#include +#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 +#endif +#ifdef CLIENT_SUBNET +#include "edns-subnet/edns-subnet.h" +#endif +#ifdef HAVE_PWD_H +#include +#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); + - struct config_file* ++/** 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->use_syslog = 1; + cfg->log_identity = NULL; /* changed later with argv[0] */ + cfg->log_time_ascii = 0; + cfg->log_queries = 0; + cfg->log_replies = 0; + cfg->log_tag_queryreply = 0; + cfg->log_local_actions = 0; + cfg->log_servfail = 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; ++ 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->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_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->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->max_udp_size = 4096; - if(!(cfg->server_key_file = strdup(RUN_DIR"/unbound_server.key"))) ++ 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"))) ++ 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"))) ++ 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"))) ++ 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 = ++ 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); +#ifdef USE_CACHEDB + if(!(cfg->cachedb_backend = strdup("testframe"))) goto error_exit; + if(!(cfg->cachedb_secret = strdup("default"))) goto error_exit; +#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_server_port = 6379; + cfg->redis_expire_records = 0; +#endif /* USE_REDIS */ +#endif /* USE_CACHEDB */ +#ifdef USE_IPSET + cfg->ipset_name_v4 = NULL; + cfg->ipset_name_v6 = NULL; +#endif + cfg->ede = 0; + 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)+2stat_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, ++ 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, ++ 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) { ++ } 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 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_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) + else S_SIZET_NONZERO("edns-buffer-size:", edns_buffer_size) *** 4018 LINES SKIPPED ***