diff options
370 files changed, 30050 insertions, 8135 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e62b172efea9..b5c96820c192 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,7 +4,7 @@ compute_engine_instance: # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images platform: freebsd image_project: freebsd-org-cloud-dev - image: freebsd-14-2-release-amd64-ufs + image: freebsd-14-3-release-amd64-ufs cpu: 8 memory: 8G disk: 40 diff --git a/Makefile.inc1 b/Makefile.inc1 index dfd31456ad5a..9dc4f2db4a6c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -523,25 +523,6 @@ BUILDENV_SHELL?=/bin/sh .endif .if !defined(_MKSHOWCONFIG) -.if !defined(VCS_REVISION) || empty(VCS_REVISION) -.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD) -. for _D in ${PATH:S,:, ,g} -. if exists(${_D}/svnversion) -SVNVERSION_CMD?=${_D}/svnversion -. endif -. if exists(${_D}/svnliteversion) -SVNVERSION_CMD?=${_D}/svnliteversion -. endif -. endfor -.endif -.if defined(SVNVERSION_CMD) && !empty(SVNVERSION_CMD) -_VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) -. if !empty(_VCS_REVISION) -VCS_REVISION= $$(echo r${_VCS_REVISION}) -.export VCS_REVISION -. endif -.endif -.endif .if !defined(GIT_CMD) || empty(GIT_CMD) . for _P in /usr/bin /usr/local/bin @@ -603,6 +584,7 @@ EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} .if !defined(PKG_VERSION) PKG_VERSION:= ${_PKG_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} .endif + .endif # !defined(_MKSHOWCONFIG) .if make(*package*) @@ -2225,9 +2207,6 @@ create-world-package-${pkgname}: .PHONY /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${WSTAGEDIR}/${pkgname}.ucl - @if [ "${pkgname}" == "runtime" ]; then \ - sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ - fi ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} ${PKG_CLEVEL} \ @@ -2548,6 +2527,10 @@ ${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} ${_bt_libkldelf_depend} .if ${BOOTSTRAPPING} < 1300059 ${_bt}-libexec/flua: ${_bt}-lib/liblua _flua= lib/liblua libexec/flua +.if ${BOOTSTRAPPING} == 0 +_flua+= lib/libmd lib/libucl lib/libyaml +${_bt}-libexec/flua: ${_bt}-lib/libmd ${_bt}-lib/libucl ${_bt}-lib/libyaml +.endif # BOOTSTRAPPING == 0 .endif # r245440 mtree -N support added @@ -2859,6 +2842,15 @@ bootstrap-tools: ${_bt}-links .PHONY ${_mkesdb} \ ${_zic} \ ${LOCAL_BSTOOL_DIRS} +# We don't enforce any particular uniqueness of targets in the above list; it +# may be the case that different bootstrap tools may have shared dependencies +# at different BOOTSTRAPPING points, so we don't object to them using their own +# conditionals and duplicating them into their ${_foo} variable to ease future +# maintenance if we purge some entries. These target names are purposefully +# unique and this is the only place that should be generating commands for them, +# but the target may have been defined earlier to express dependencies -- thus, +# we specifically want commands() here. +.if !commands(${_bt}-${_tool}) ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -2868,8 +2860,8 @@ ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE fi; \ ${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install - bootstrap-tools: ${_bt}-${_tool} +.endif .endfor .if target(${_bt}-lib/libmd) # If we are bootstrapping libmd (e.g. when building on macOS/Linux) add the diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 36e8c048661e..3645cff43458 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20251006: Remove libnss_tacplus.a (it never should have been installed) +OLD_FILES+=usr/lib/libnss_tacplus.a + # 20251003: kgdb python scripts moved OLD_FILES+=usr/libexec/kgdb/acttrace.py OLD_DIRS+=usr/libexec/kgdb diff --git a/bin/cp/tests/cp_test.sh b/bin/cp/tests/cp_test.sh index fdf50d042f0b..b637f862b7d3 100755 --- a/bin/cp/tests/cp_test.sh +++ b/bin/cp/tests/cp_test.sh @@ -90,7 +90,7 @@ hardlink_body() echo "foo" >foo atf_check cp -l foo bar atf_check -o inline:"foo\n" cat bar - atf_check_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test foo -ef bar } atf_test_case hardlink_exists @@ -105,7 +105,7 @@ hardlink_exists_body() echo "bar" >bar atf_check -s not-exit:0 -e match:exists cp -l foo bar atf_check -o inline:"bar\n" cat bar - atf_check_not_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test ! foo -ef bar } atf_test_case hardlink_exists_force @@ -120,7 +120,7 @@ hardlink_exists_force_body() echo "bar" >bar atf_check cp -fl foo bar atf_check -o inline:"foo\n" cat bar - atf_check_equal "$(stat -f%d,%i foo)" "$(stat -f%d,%i bar)" + atf_check test foo -ef bar } atf_test_case matching_srctgt @@ -389,7 +389,7 @@ file_is_sparse() files_are_equal() { - atf_check_not_equal "$(stat -f%d,%i "$1")" "$(stat -f%d,%i "$2")" + atf_check test ! "$1" -ef "$2" atf_check cmp "$1" "$2" } diff --git a/bin/ln/tests/ln_test.sh b/bin/ln/tests/ln_test.sh index 78b4074aea18..ac9d785ba1fc 100644 --- a/bin/ln/tests/ln_test.sh +++ b/bin/ln/tests/ln_test.sh @@ -28,7 +28,7 @@ atf_check_same_file() { - atf_check_equal "$(stat -f %d,%i "$1")" "$(stat -f %d,%i "$2")" + atf_check test "$1" -ef "$2" } atf_check_symlink_to() diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile index 6cdb64b0fccb..6d3663081ae6 100644 --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -24,6 +24,7 @@ FILES= \ openzfs-2.1-linux \ openzfs-2.2 \ openzfs-2.3 \ + openzfs-2.4 \ zol-0.6.1 \ zol-0.6.4 \ zol-0.6.5 \ @@ -60,7 +61,9 @@ LINKS= \ ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-linux \ ${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd \ ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-linux \ - ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-freebsd + ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-freebsd \ + ${FILESDIR}/openzfs-2.4 ${FILESDIR}/openzfs-2.4-linux \ + ${FILESDIR}/openzfs-2.4 ${FILESDIR}/openzfs-2.4-freebsd LINKMODE= ${NOBINMODE} diff --git a/contrib/unbound/Makefile.in b/contrib/unbound/Makefile.in index 463cdac286e1..b28ed34ae77e 100644 --- a/contrib/unbound/Makefile.in +++ b/contrib/unbound/Makefile.in @@ -449,9 +449,13 @@ dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c config.h dnstap/dnstap_config.h \ $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h \ $(srcdir)/util/locks.h -dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h: $(srcdir)/dnstap/dnstap.proto +# Builds both dnstap/dnstap.pb-c.c and dnstap/dnstap.pb-c.h. +# To avoid double-building we split one target out. +dnstap/dnstap.pb-c.c: $(srcdir)/dnstap/dnstap.proto @-if test ! -d dnstap; then $(INSTALL) -d dnstap; fi $(PROTOC_C) --c_out=. --proto_path=$(srcdir) $(srcdir)/dnstap/dnstap.proto +dnstap/dnstap.pb-c.h: dnstap/dnstap.pb-c.c + touch $@ unbound-dnstap-socket$(EXEEXT): $(DNSTAP_SOCKET_OBJ_LINK) $(LINK) -o $@ $(DNSTAP_SOCKET_OBJ_LINK) $(SSLLIB) $(LIBS) @@ -722,299 +726,338 @@ unitdoq.lo unitdoq.o: $(srcdir)/testcode/unitdoq.c dns.lo dns.o: $(srcdir)/services/cache/dns.c config.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h $(srcdir)/validator/val_nsec.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/validator/val_utils.h $(srcdir)/sldns/pkthdr.h $(srcdir)/services/cache/dns.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/sldns/pkthdr.h $(srcdir)/services/cache/dns.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/dname.h $(srcdir)/util/module.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/util/data/msgparse.h $(srcdir)/util/data/dname.h $(srcdir)/util/module.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h infra.lo infra.o: $(srcdir)/services/cache/infra.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h \ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/services/cache/infra.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/iterator/iterator.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/util/storage/lookup3.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/config_file.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h rrset.lo rrset.o: $(srcdir)/services/cache/rrset.c config.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/slabhash.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/regional.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/net_help.h + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h $(srcdir)/util/alloc.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h as112.lo as112.o: $(srcdir)/util/as112.c $(srcdir)/util/as112.h dname.lo dname.o: $(srcdir)/util/data/dname.c config.h $(srcdir)/util/data/dname.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/storage/lookup3.h $(srcdir)/sldns/sbuffer.h msgencode.lo msgencode.o: $(srcdir)/util/data/msgencode.c config.h $(srcdir)/util/data/msgencode.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/services/localzone.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/localzone.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/module.h $(srcdir)/services/view.h -msgparse.lo msgparse.o: $(srcdir)/util/data/msgparse.c config.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h +msgparse.lo msgparse.o: $(srcdir)/util/data/msgparse.c config.h $(srcdir)/util/config_file.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ + $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/rfc_1982.h $(srcdir)/util/edns.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h msgreply.lo msgreply.o: $(srcdir)/util/data/msgreply.c config.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lookup3.h $(srcdir)/util/alloc.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/regional.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ - $(srcdir)/util/data/msgencode.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/module.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \ - $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/respip/respip.h + $(srcdir)/sldns/rrdef.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/alloc.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/msgencode.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/module.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ + $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h packed_rrset.lo packed_rrset.o: $(srcdir)/util/data/packed_rrset.c config.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h \ $(srcdir)/util/storage/lookup3.h $(srcdir)/util/alloc.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h + $(srcdir)/util/random.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h iterator.lo iterator.o: $(srcdir)/iterator/iterator.c config.h $(srcdir)/iterator/iterator.h \ $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/iterator/iter_utils.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/iterator/iter_utils.h \ $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_donotq.h \ $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_scrub.h $(srcdir)/iterator/iter_priv.h \ - $(srcdir)/validator/val_neg.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ - $(srcdir)/util/random.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h + $(srcdir)/validator/val_neg.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h \ + $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h iter_delegpt.lo iter_delegpt.o: $(srcdir)/iterator/iter_delegpt.c config.h $(srcdir)/iterator/iter_delegpt.h \ $(srcdir)/util/log.h $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/regional.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/sldns/sbuffer.h iter_donotq.lo iter_donotq.o: $(srcdir)/iterator/iter_donotq.c config.h $(srcdir)/iterator/iter_donotq.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/log.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h iter_fwd.lo iter_fwd.o: $(srcdir)/iterator/iter_fwd.c config.h $(srcdir)/iterator/iter_fwd.h \ - $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h + $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/iterator/iter_delegpt.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/str2wire.h iter_hints.lo iter_hints.o: $(srcdir)/iterator/iter_hints.c config.h $(srcdir)/iterator/iter_hints.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/str2wire.h \ $(srcdir)/sldns/wire2str.h iter_priv.lo iter_priv.o: $(srcdir)/iterator/iter_priv.c config.h $(srcdir)/iterator/iter_priv.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/log.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/sbuffer.h iter_resptype.lo iter_resptype.o: $(srcdir)/iterator/iter_resptype.c config.h \ - $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iterator.h $(srcdir)/util/log.h \ - $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/data/dname.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h + $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ + $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/data/dname.h iter_scrub.lo iter_scrub.o: $(srcdir)/iterator/iter_scrub.c config.h $(srcdir)/iterator/iter_scrub.h \ $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/iterator/iter_priv.h $(srcdir)/util/rbtree.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h \ $(srcdir)/util/config_file.h $(srcdir)/util/data/dname.h $(srcdir)/util/alloc.h $(srcdir)/sldns/sbuffer.h iter_utils.lo iter_utils.o: $(srcdir)/iterator/iter_utils.c config.h $(srcdir)/iterator/iter_utils.h \ $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/iterator/iter_hints.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/iterator/iter_hints.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_fwd.h \ $(srcdir)/iterator/iter_donotq.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_priv.h \ $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outside_network.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \ - $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ - $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_kentry.h \ - $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/sldns/str2wire.h + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h $(srcdir)/util/regional.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/config_file.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/validator/val_anchor.h \ + $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_utils.h \ + $(srcdir)/validator/val_sigcrypt.h $(srcdir)/sldns/str2wire.h listen_dnsport.lo listen_dnsport.o: $(srcdir)/services/listen_dnsport.c config.h \ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ - $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/services/authzone.h \ - $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/rbtree.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h $(srcdir)/util/regional.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ + $(srcdir)/util/timeval_func.h \ + localzone.lo localzone.o: $(srcdir)/services/localzone.c config.h $(srcdir)/services/localzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h \ $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/data/msgencode.h $(srcdir)/util/net_help.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/as112.h + $(srcdir)/util/data/msgencode.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/as112.h mesh.lo mesh.o: $(srcdir)/services/mesh.c config.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ - $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/alloc.h \ - $(srcdir)/util/edns.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/data/dname.h $(srcdir)/services/listen_dnsport.h -modstack.lo modstack.o: $(srcdir)/services/modstack.c config.h $(srcdir)/services/modstack.h \ - $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/dns64/dns64.h $(srcdir)/iterator/iterator.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/regional.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/edns.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/data/dname.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/timeval_func.h $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/edns-subnet/addrtree.h \ + $(srcdir)/edns-subnet/edns-subnet.h +modstack.lo modstack.o: $(srcdir)/services/modstack.c config.h $(srcdir)/services/modstack.h \ + $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/dns64/dns64.h \ + $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/validator/validator.h \ + $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_nsec3.h $(PYTHONMOD_HEADER) \ + $(DYNLIBMOD_HEADER) $(srcdir)/cachedb/cachedb.h $(srcdir)/ipsecmod/ipsecmod.h \ + $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/util/alloc.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/data/dname.h $(srcdir)/edns-subnet/addrtree.h \ + $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/ipset/ipset.h view.lo view.o: $(srcdir)/services/view.c config.h $(srcdir)/services/view.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/respip/respip.h + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/respip/respip.h rpz.lo rpz.o: $(srcdir)/services/rpz.c config.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h \ $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h $(srcdir)/sldns/wire2str.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/respip/respip.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/util/data/dname.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h $(srcdir)/util/data/msgencode.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/iterator/iter_delegpt.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/util/alloc.h \ + $(srcdir)/dnstap/dnstap.h +rfc_1982.lo rfc_1982.o: $(srcdir)/util/rfc_1982.c config.h $(srcdir)/util/rfc_1982.h outbound_list.lo outbound_list.o: $(srcdir)/services/outbound_list.c config.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - + $(srcdir)/services/outbound_list.h $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + outside_network.lo outside_network.o: $(srcdir)/services/outside_network.c config.h \ - $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/iterator/iterator.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h \ - $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ - $(srcdir)/util/edns.h $(srcdir)/dnstap/dnstap.h + $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/rtt.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/msgencode.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h \ + $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/respip/respip.h $(srcdir)/util/edns.h $(srcdir)/dnstap/dnstap.h \ + alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/regional.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h config_file.lo config_file.o: $(srcdir)/util/config_file.c config.h $(srcdir)/util/log.h \ - $(srcdir)/util/configyyrename.h $(srcdir)/util/config_file.h util/configparser.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/regional.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/util/configyyrename.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h \ + util/configparser.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/regional.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/data/dname.h \ $(srcdir)/util/rtt.h $(srcdir)/services/cache/infra.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/util/iana_ports.inc + $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/edns-subnet/edns-subnet.h \ + $(srcdir)/util/iana_ports.inc configlexer.lo configlexer.o: util/configlexer.c config.h $(srcdir)/util/configyyrename.h \ - $(srcdir)/util/config_file.h util/configparser.h + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h util/configparser.h configparser.lo configparser.o: util/configparser.c config.h $(srcdir)/util/configyyrename.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/sldns/str2wire.h \ - $(srcdir)/sldns/rrdef.h + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ + $(srcdir)/util/random.h $(srcdir)/sldns/str2wire.h util/configparser.h shm_main.lo shm_main.o: $(srcdir)/util/shm_side/shm_main.c config.h $(srcdir)/util/shm_side/shm_main.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/services/mesh.h \ - $(srcdir)/util/rbtree.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h \ - $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/rtt.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/tube.h $(srcdir)/util/timeval_func.h + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \ + $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h $(srcdir)/services/cache/rrset.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_nsec3.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h authzone.lo authzone.o: $(srcdir)/services/authzone.c config.h $(srcdir)/services/authzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h \ - $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/data/msgencode.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ - $(srcdir)/services/cache/dns.h $(srcdir)/services/outside_network.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \ - $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/keyraw.h $(srcdir)/validator/val_nsec3.h \ - $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/val_sigcrypt.h \ - $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_utils.h + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/respip/respip.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/regional.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/services/cache/dns.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_secalgo.h \ + $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_utils.h fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/outside_network.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/rtt.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/dns64/dns64.h \ - $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \ - $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_anchor.h \ - $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h \ - $(srcdir)/validator/val_neg.h $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h \ - $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound-event.h \ - $(srcdir)/libunbound/worker.h $(srcdir)/daemon/remote.h + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h $(srcdir)/util/regional.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/cache/rrset.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/dns64/dns64.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/validator/validator.h \ + $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_anchor.h \ + $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_neg.h \ + $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h $(srcdir)/libunbound/context.h \ + $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/worker.h $(srcdir)/daemon/remote.h \ + $(PYTHONMOD_HEADER) $(DYNLIBMOD_HEADER) $(srcdir)/cachedb/cachedb.h \ + $(srcdir)/ipsecmod/ipsecmod.h $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/data/dname.h $(srcdir)/edns-subnet/addrtree.h \ + $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/ipset/ipset.h $(srcdir)/dnstap/dtstream.h locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h -mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h +mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h module.lo module.o: $(srcdir)/util/module.c config.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/ub_event.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/sldns/str2wire.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/timeval_func.h -proxy_protocol.lo proxy_protocol.o: $(srcdir)/util/proxy_protocol.c config.h \ - $(srcdir)/util/proxy_protocol.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/tcp_conn_limit.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \ + $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/proxy_protocol.h \ + $(srcdir)/util/timeval_func.h $(srcdir)/sldns/str2wire.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ + net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h \ - $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h + $(srcdir)/util/random.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/regional.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h \ + random.lo random.o: $(srcdir)/util/random.c config.h $(srcdir)/util/random.h $(srcdir)/util/log.h rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ @@ -1022,442 +1065,609 @@ rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcd regional.lo regional.o: $(srcdir)/util/regional.c config.h $(srcdir)/util/log.h $(srcdir)/util/regional.h rtt.lo rtt.o: $(srcdir)/util/rtt.c config.h $(srcdir)/util/rtt.h $(srcdir)/iterator/iterator.h \ $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h -siphash.lo siphash.o: $(srcdir)/util/siphash.c -rfc_1982.lo rfc_1982.o: $(srcdir)/util/rfc_1982.c + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h +siphash.lo siphash.o: $(srcdir)/util/siphash.c config.h $(srcdir)/util/siphash.h edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/edns.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/regional.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h + $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h $(srcdir)/util/rfc_1982.h \ + $(srcdir)/util/siphash.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/sldns/sbuffer.h dnstree.lo dnstree.o: $(srcdir)/util/storage/dnstree.c config.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/util/net_help.h + $(srcdir)/util/log.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h lookup3.lo lookup3.o: $(srcdir)/util/storage/lookup3.c config.h $(srcdir)/util/storage/lookup3.h lruhash.lo lruhash.o: $(srcdir)/util/storage/lruhash.c config.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h \ + $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h slabhash.lo slabhash.o: $(srcdir)/util/storage/slabhash.c config.h $(srcdir)/util/storage/slabhash.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h tcp_conn_limit.lo tcp_conn_limit.o: $(srcdir)/util/tcp_conn_limit.c config.h $(srcdir)/util/regional.h \ - $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/tcp_conn_limit.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h -timehist.lo timehist.o: $(srcdir)/util/timehist.c config.h $(srcdir)/util/timehist.h $(srcdir)/util/log.h -tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h \ + $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/locks.h $(srcdir)/services/localzone.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h +timehist.lo timehist.o: $(srcdir)/util/timehist.c config.h $(srcdir)/util/timehist.h $(srcdir)/util/log.h \ + $(srcdir)/util/timeval_func.h +tube.lo tube.o: $(srcdir)/util/tube.c config.h $(srcdir)/util/tube.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/ub_event.h +proxy_protocol.lo proxy_protocol.o: $(srcdir)/util/proxy_protocol.c $(srcdir)/util/proxy_protocol.h config.h +timeval_func.lo timeval_func.o: $(srcdir)/util/timeval_func.c config.h $(srcdir)/util/timeval_func.h ub_event.lo ub_event.o: $(srcdir)/util/ub_event.c config.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h $(srcdir)/daemon/remote.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h \ + $(srcdir)/util/tube.h $(srcdir)/daemon/remote.h \ + $(srcdir)/dnstap/dtstream.h ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c config.h $(srcdir)/util/ub_event.h \ $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ + $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h winsock_event.lo winsock_event.o: $(srcdir)/util/winsock_event.c config.h autotrust.lo autotrust.o: $(srcdir)/validator/autotrust.c config.h $(srcdir)/validator/autotrust.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_utils.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/dname.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/random.h $(srcdir)/services/mesh.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/dname.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/services/mesh.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/respip/respip.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ - $(srcdir)/validator/val_kcache.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h + $(srcdir)/validator/val_kcache.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h \ + val_anchor.lo val_anchor.o: $(srcdir)/validator/val_anchor.c config.h $(srcdir)/validator/val_anchor.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_sigcrypt.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/validator/autotrust.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/as112.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/validator/autotrust.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/util/as112.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/sldns/str2wire.h validator.lo validator.o: $(srcdir)/validator/validator.c config.h $(srcdir)/validator/validator.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h \ - $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_kcache.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_nsec.h \ - $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_neg.h $(srcdir)/validator/val_sigcrypt.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/validator/val_utils.h \ + $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_anchor.h \ + $(srcdir)/validator/val_kcache.h $(srcdir)/util/storage/slabhash.h $(srcdir)/validator/val_kentry.h \ + $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_neg.h $(srcdir)/validator/val_sigcrypt.h \ $(srcdir)/validator/autotrust.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/respip/respip.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h + $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h val_kcache.lo val_kcache.o: $(srcdir)/validator/val_kcache.c config.h $(srcdir)/validator/val_kcache.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/validator/val_kentry.h $(srcdir)/util/config_file.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h + $(srcdir)/validator/val_kentry.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/config_file.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h val_kentry.lo val_kentry.o: $(srcdir)/validator/val_kentry.c config.h $(srcdir)/validator/val_kentry.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h -val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h \ + $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/sldns/keyraw.h \ + +val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h \ + $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \ + $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ $(srcdir)/util/config_file.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ - $(srcdir)/services/cache/dns.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/services/cache/dns.h $(srcdir)/sldns/sbuffer.h val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h $(srcdir)/validator/val_nsec3.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_kentry.h \ - $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/regional.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/validator/val_nsec.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_secalgo.h \ + $(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/validator/val_utils.h \ + $(srcdir)/validator/val_kentry.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/data/dname.h \ + $(srcdir)/validator/val_nsec.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h val_nsec.lo val_nsec.o: $(srcdir)/validator/val_nsec.c config.h $(srcdir)/validator/val_nsec.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/validator/val_utils.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h + $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h val_secalgo.lo val_secalgo.o: $(srcdir)/validator/val_secalgo.c config.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h \ $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/sldns/sbuffer.h + $(srcdir)/sldns/sbuffer.h \ + val_sigcrypt.lo val_sigcrypt.o: $(srcdir)/validator/val_sigcrypt.c config.h \ $(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/validator/val_secalgo.h \ - $(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/rbtree.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ - $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/sldns/wire2str.h + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/validator/val_utils.h \ + $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/util/data/dname.h $(srcdir)/util/rfc_1982.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h \ + $(srcdir)/sldns/keyraw.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h $(srcdir)/services/mesh.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/services/authzone.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ + val_utils.lo val_utils.o: $(srcdir)/validator/val_utils.c config.h $(srcdir)/validator/val_utils.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_kentry.h \ - $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h \ - $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_neg.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/wire2str.h \ - $(srcdir)/sldns/parseutil.h + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/validator.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/validator/val_nsec3.h \ + $(srcdir)/util/rbtree.h $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_sigcrypt.h \ + $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_neg.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h dns64.lo dns64.o: $(srcdir)/dns64/dns64.c config.h $(srcdir)/dns64/dns64.h $(srcdir)/util/module.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/str2wire.h -edns-subnet.lo edns-subnet.o: $(srcdir)/edns-subnet/edns-subnet.c config.h -subnetmod.lo subnetmod.o: $(srcdir)/edns-subnet/subnetmod.c config.h + $(srcdir)/util/random.h $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/str2wire.h +edns-subnet.lo edns-subnet.o: $(srcdir)/edns-subnet/edns-subnet.c config.h \ + $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/random.h +subnetmod.lo subnetmod.o: $(srcdir)/edns-subnet/subnetmod.c config.h $(srcdir)/edns-subnet/subnetmod.h \ + $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/util/data/dname.h $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h \ + $(srcdir)/edns-subnet/subnet-whitelist.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ + $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/util/regional.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ + $(srcdir)/sldns/wire2str.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \ + $(srcdir)/cachedb/cachedb.h addrtree.lo addrtree.o: $(srcdir)/edns-subnet/addrtree.c config.h $(srcdir)/util/log.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/edns-subnet/addrtree.h -subnet-whitelist.lo subnet-whitelist.o: $(srcdir)/edns-subnet/subnet-whitelist.c config.h + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/edns-subnet/addrtree.h +subnet-whitelist.lo subnet-whitelist.o: $(srcdir)/edns-subnet/subnet-whitelist.c config.h \ + $(srcdir)/edns-subnet/edns-subnet.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/random.h \ + $(srcdir)/edns-subnet/subnet-whitelist.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h +cachedb.lo cachedb.o: $(srcdir)/cachedb/cachedb.c config.h $(srcdir)/cachedb/cachedb.h $(srcdir)/util/module.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/cachedb/redis.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/respip/respip.h $(srcdir)/validator/val_neg.h $(srcdir)/validator/val_secalgo.h \ + $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h $(srcdir)/sldns/parseutil.h \ + $(srcdir)/sldns/wire2str.h +redis.lo redis.o: $(srcdir)/cachedb/redis.c config.h $(srcdir)/cachedb/redis.h $(srcdir)/cachedb/cachedb.h \ + $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/alloc.h $(srcdir)/util/config_file.h \ + $(srcdir)/util/timeval_func.h $(srcdir)/sldns/sbuffer.h respip.lo respip.o: $(srcdir)/respip/respip.c config.h $(srcdir)/services/localzone.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/module.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/services/view.h \ $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/services/modstack.h \ - $(srcdir)/services/rpz.h $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/services/cache/dns.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/regional.h + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/sldns/str2wire.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/testcode/checklocks.h -ipsecmod.lo ipsecmod.o: $(srcdir)/ipsecmod/ipsecmod.c config.h -ipsecmod-whitelist.lo ipsecmod-whitelist.o: $(srcdir)/ipsecmod/ipsecmod-whitelist.c config.h +dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c config.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ + $(srcdir)/util/random.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h \ + $(srcdir)/dnstap/dnstap.h $(srcdir)/dnstap/dtstream.h dnstap/dnstap.pb-c.h +dnstap.pb-c.lo dnstap.pb-c.o: dnstap/dnstap.pb-c.c dnstap/dnstap.pb-c.h +dnstap_fstrm.lo dnstap_fstrm.o: $(srcdir)/dnstap/dnstap_fstrm.c config.h $(srcdir)/dnstap/dnstap_fstrm.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h +dtstream.lo dtstream.o: $(srcdir)/dnstap/dtstream.c config.h $(srcdir)/dnstap/dtstream.h $(srcdir)/util/locks.h \ + $(srcdir)/util/log.h $(srcdir)/dnstap/dnstap_fstrm.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/services/outside_network.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/sldns/sbuffer.h \ + +dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ + $(srcdir)/util/random.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/lookup3.h +ipsecmod.lo ipsecmod.o: $(srcdir)/ipsecmod/ipsecmod.c config.h $(srcdir)/ipsecmod/ipsecmod.h \ + $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/rbtree.h \ + $(srcdir)/ipsecmod/ipsecmod-whitelist.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h \ + $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/respip/respip.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/services/cache/dns.h $(srcdir)/sldns/wire2str.h +ipsecmod-whitelist.lo ipsecmod-whitelist.o: $(srcdir)/ipsecmod/ipsecmod-whitelist.c config.h \ + $(srcdir)/ipsecmod/ipsecmod.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ + $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/rbtree.h \ + $(srcdir)/ipsecmod/ipsecmod-whitelist.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/regional.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/str2wire.h +ipset.lo ipset.o: $(srcdir)/ipset/ipset.c config.h $(srcdir)/ipset/ipset.h $(srcdir)/util/module.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/config_file.h $(srcdir)/services/cache/dns.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/sldns/parseutil.h unitanchor.lo unitanchor.o: $(srcdir)/testcode/unitanchor.c config.h $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h unitdname.lo unitdname.o: $(srcdir)/testcode/unitdname.c config.h $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h unitlruhash.lo unitlruhash.o: $(srcdir)/testcode/unitlruhash.c config.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h -unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h $(srcdir)/util/timehist.h $(srcdir)/iterator/iterator.h \ - $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/libunbound/unbound.h $(srcdir)/services/cache/infra.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/random.h $(srcdir)/respip/respip.h \ - $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/services/outside_network.h +unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/util/log.h \ + $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h $(srcdir)/util/timehist.h \ + $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/edns.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/respip/respip.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/regional.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/sldns/str2wire.h unitmsgparse.lo unitmsgparse.o: $(srcdir)/testcode/unitmsgparse.c config.h $(srcdir)/util/log.h \ $(srcdir)/testcode/unitmain.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/testcode/readhex.h \ - $(srcdir)/testcode/testpkts.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h + $(srcdir)/util/alloc.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/testcode/readhex.h $(srcdir)/testcode/testpkts.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h \ + $(srcdir)/sldns/wire2str.h unitneg.lo unitneg.o: $(srcdir)/testcode/unitneg.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/data/dname.h $(srcdir)/testcode/unitmain.h $(srcdir)/validator/val_neg.h $(srcdir)/util/rbtree.h \ - $(srcdir)/sldns/rrdef.h + $(srcdir)/util/random.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/locks.h $(srcdir)/util/data/dname.h $(srcdir)/testcode/unitmain.h $(srcdir)/validator/val_neg.h \ + $(srcdir)/util/rbtree.h $(srcdir)/sldns/rrdef.h unitregional.lo unitregional.o: $(srcdir)/testcode/unitregional.c config.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/util/log.h $(srcdir)/util/regional.h unitslabhash.lo unitslabhash.o: $(srcdir)/testcode/unitslabhash.c config.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/util/log.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h unitverify.lo unitverify.o: $(srcdir)/testcode/unitverify.c config.h $(srcdir)/util/log.h \ $(srcdir)/testcode/unitmain.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_nsec3.h \ $(srcdir)/util/rbtree.h $(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h \ - $(srcdir)/testcode/testpkts.h $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h $(srcdir)/util/alloc.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h + $(srcdir)/util/data/msgparse.h $(srcdir)/validator/val_utils.h $(srcdir)/testcode/testpkts.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h $(srcdir)/util/alloc.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \ + readhex.lo readhex.o: $(srcdir)/testcode/readhex.c config.h $(srcdir)/testcode/readhex.h $(srcdir)/util/log.h \ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcode/testpkts.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h + $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/random.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h unitldns.lo unitldns.o: $(srcdir)/testcode/unitldns.c config.h $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h \ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h \ $(srcdir)/sldns/parseutil.h -unitecs.lo unitecs.o: $(srcdir)/testcode/unitecs.c config.h +unitecs.lo unitecs.o: $(srcdir)/testcode/unitecs.c config.h $(srcdir)/util/log.h $(srcdir)/util/module.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/testcode/unitmain.h $(srcdir)/edns-subnet/addrtree.h \ + $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/services/outbound_list.h $(srcdir)/util/alloc.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/data/dname.h \ + $(srcdir)/edns-subnet/edns-subnet.h unitauth.lo unitauth.o: $(srcdir)/testcode/unitauth.c config.h $(srcdir)/services/authzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h \ - $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/testcode/unitmain.h \ - $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/services/cache/dns.h $(srcdir)/sldns/str2wire.h \ - $(srcdir)/sldns/wire2str.h + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/respip/respip.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/services/cache/dns.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h unitzonemd.lo unitzonemd.o: $(srcdir)/testcode/unitzonemd.c config.h $(srcdir)/util/log.h \ $(srcdir)/testcode/unitmain.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/authzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h \ - $(srcdir)/validator/val_anchor.h -unittcpreuse.lo unittcpreuse.o: $(srcdir)/testcode/unittcpreuse.c config.h $(srcdir)/services/outside_network.h \ -$(srcdir)/util/random.h -unitinfra.lo unitinfra.o: $(srcdir)/testcode/unitinfra.c config.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/iterator/iterator.h + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h \ + $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/data/dname.h \ + $(srcdir)/util/regional.h $(srcdir)/validator/val_anchor.h +unittcpreuse.lo unittcpreuse.o: $(srcdir)/testcode/unittcpreuse.c config.h $(srcdir)/testcode/unitmain.h \ + $(srcdir)/util/log.h $(srcdir)/util/random.h $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h \ + $(srcdir)/util/locks.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + +unitdoq.lo unitdoq.o: $(srcdir)/testcode/unitdoq.c config.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/util/rbtree.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/testcode/unitmain.h +unitinfra.lo unitinfra.o: $(srcdir)/testcode/unitinfra.c config.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/log.h \ + $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \ - $(srcdir)/services/localzone.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h -cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h $(srcdir)/daemon/cachedump.h \ - $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/services/localzone.h $(srcdir)/util/module.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/sldns/str2wire.h +cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h \ + $(srcdir)/daemon/cachedump.h $(srcdir)/daemon/remote.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h \ $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h \ - $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/config_file.h $(srcdir)/iterator/iterator.h \ $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h \ $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/util/config_file.h $(srcdir)/services/outside_network.h -daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ - $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ - $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h \ - $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h \ - $(srcdir)/util/edns.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/respip/respip.h \ - $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h -remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h \ + $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h +daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \ + $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ + $(srcdir)/daemon/worker.h \ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/alloc.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ + $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \ + $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/util/storage/lookup3.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h \ + $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \ + $(srcdir)/respip/respip.h $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/cachedb/cachedb.h +remote.lo remote.o: $(srcdir)/daemon/remote.c config.h \ + $(srcdir)/daemon/remote.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ $(srcdir)/services/modstack.h $(srcdir)/daemon/cachedump.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/data/dname.h $(srcdir)/validator/validator.h \ - $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_kentry.h \ - $(srcdir)/validator/val_anchor.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ - $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_delegpt.h \ - $(srcdir)/services/outside_network.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/util/edns.h \ - $(srcdir)/util/locks.h $(srcdir)/util/ub_event.h \ - $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h $(srcdir)/validator/val_neg.h \ - $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_donotq.h $(srcdir)/iterator/iter_priv.h + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/ub_event.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/util/rbtree.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h \ + $(srcdir)/util/rtt.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ + $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ + $(srcdir)/util/data/dname.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h \ + $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_kentry.h \ + $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_neg.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \ + $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \ + $(srcdir)/iterator/iter_donotq.h $(srcdir)/iterator/iter_priv.h $(srcdir)/services/outside_network.h \ + $(srcdir)/util/regional.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/util/timeval_func.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h $(srcdir)/cachedb/cachedb.h \ + $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h \ - $(srcdir)/services/outside_network.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/tube.h \ - $(srcdir)/util/net_help.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h \ - $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ - $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_neg.h + $(srcdir)/services/outside_network.h $(srcdir)/util/regional.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/validator/validator.h \ + $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_nsec3.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h \ + $(srcdir)/validator/val_neg.h $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/util/data/dname.h \ + $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h \ + unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \ $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ - $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ - $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/ub_event.h + $(srcdir)/daemon/remote.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/rbtree.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h \ + $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ + $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/ub_event.h worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/timeval_func.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ - $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \ + $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/listen_dnsport.h \ $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \ $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \ $(srcdir)/services/localzone.h $(srcdir)/respip/respip.h $(srcdir)/util/data/msgencode.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/edns.h \ - $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_utils.h \ - $(srcdir)/iterator/iter_resptype.h $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h \ - $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/dnstap/dtstream.h + $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/proxy_protocol.h \ + $(srcdir)/util/edns.h $(srcdir)/util/timeval_func.h $(srcdir)/iterator/iter_fwd.h \ + $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \ + $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h \ + $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/util/shm_side/shm_main.h $(srcdir)/dnstap/dtstream.h testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \ $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h \ - $(srcdir)/daemon/remote.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/daemon/daemon.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/timeval_func.h $(srcdir)/services/modstack.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \ - $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h $(srcdir)/daemon/worker.h + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/daemon/remote.h \ + $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/daemon/worker.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/daemon/unbound.c $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/ub_event.h testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcode/testpkts.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h + $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/random.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/timeval_func.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \ - $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \ + $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/listen_dnsport.h \ $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \ $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ $(srcdir)/services/cache/dns.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \ $(srcdir)/services/localzone.h $(srcdir)/respip/respip.h $(srcdir)/util/data/msgencode.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/edns.h \ - $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_utils.h \ - $(srcdir)/iterator/iter_resptype.h $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h \ - $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/dnstap/dtstream.h + $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/proxy_protocol.h \ + $(srcdir)/util/edns.h $(srcdir)/util/timeval_func.h $(srcdir)/iterator/iter_fwd.h \ + $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \ + $(srcdir)/validator/autotrust.h $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h \ + $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/libworker.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/util/shm_side/shm_main.h $(srcdir)/dnstap/dtstream.h acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \ - $(srcdir)/services/localzone.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h -daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ - $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ - $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ - $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h \ - $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h \ - $(srcdir)/util/edns.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/respip/respip.h \ - $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h + $(srcdir)/util/log.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/services/localzone.h $(srcdir)/util/module.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/sldns/str2wire.h +daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \ + $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ + $(srcdir)/daemon/worker.h \ + $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h \ + $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \ + $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/services/view.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/util/storage/lookup3.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/tcp_conn_limit.h $(srcdir)/util/edns.h \ + $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \ + $(srcdir)/respip/respip.h $(srcdir)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/cachedb/cachedb.h stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h \ - $(srcdir)/services/outside_network.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/tube.h \ - $(srcdir)/util/net_help.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h \ - $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ - $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_neg.h + $(srcdir)/services/outside_network.h $(srcdir)/util/regional.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/validator/validator.h \ + $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_nsec3.h $(srcdir)/iterator/iterator.h \ + $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h \ + $(srcdir)/validator/val_neg.h $(srcdir)/edns-subnet/subnetmod.h $(srcdir)/util/data/dname.h \ + $(srcdir)/edns-subnet/addrtree.h $(srcdir)/edns-subnet/edns-subnet.h \ + replay.lo replay.o: $(srcdir)/testcode/replay.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/config_file.h $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/testcode/testpkts.h $(srcdir)/util/rbtree.h $(srcdir)/util/timeval_func.h \ - $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/testcode/replay.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h \ + $(srcdir)/testcode/testpkts.h $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h \ + $(srcdir)/util/timeval_func.h fake_event.lo fake_event.o: $(srcdir)/testcode/fake_event.c config.h $(srcdir)/testcode/fake_event.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/edns.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h \ - $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h $(srcdir)/util/timeval_func.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/util/edns.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \ + $(srcdir)/util/config_file.h $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ + $(srcdir)/services/view.h \ + $(srcdir)/services/outside_network.h $(srcdir)/util/alloc.h $(srcdir)/util/regional.h \ $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ $(srcdir)/testcode/replay.h $(srcdir)/testcode/testpkts.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \ - $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ - $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/daemon/remote.h $(srcdir)/util/storage/slabhash.h $(srcdir)/daemon/daemon.h + $(srcdir)/services/localzone.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/sldns/str2wire.h $(srcdir)/daemon/remote.h \ + $(srcdir)/daemon/daemon.h $(srcdir)/util/timeval_func.h lock_verify.lo lock_verify.o: $(srcdir)/testcode/lock_verify.c config.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/locks.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \ + $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h pktview.lo pktview.o: $(srcdir)/testcode/pktview.c config.h $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/testcode/unitmain.h $(srcdir)/testcode/readhex.h $(srcdir)/sldns/sbuffer.h \ @@ -1466,133 +1676,156 @@ readhex.lo readhex.o: $(srcdir)/testcode/readhex.c config.h $(srcdir)/testcode/r $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h memstats.lo memstats.o: $(srcdir)/testcode/memstats.c config.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/locks.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \ + $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h unbound-checkconf.lo unbound-checkconf.o: $(srcdir)/smallapp/unbound-checkconf.c config.h $(srcdir)/util/log.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \ - $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \ - $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \ - $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h $(srcdir)/sldns/str2wire.h + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/locks.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + $(srcdir)/util/regional.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \ + $(srcdir)/iterator/iter_fwd.h $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_hints.h \ + $(srcdir)/util/storage/dnstree.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h \ + $(srcdir)/validator/val_nsec3.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/daemon/acl_list.h \ + $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/respip/respip.h \ + $(srcdir)/sldns/str2wire.h $(PYTHONMOD_HEADER) $(srcdir)/edns-subnet/subnet-whitelist.h worker_cb.lo worker_cb.o: $(srcdir)/smallapp/worker_cb.c config.h $(srcdir)/libunbound/context.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \ - $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/respip/respip.h $(srcdir)/dnstap/dtstream.h context.lo context.o: $(srcdir)/libunbound/context.c config.h $(srcdir)/libunbound/context.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/net_help.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h $(srcdir)/util/edns.h \ - $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h + $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/daemon/acl_list.h \ + $(srcdir)/util/edns.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbound/unbound.h \ $(srcdir)/libunbound/unbound-event.h config.h $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h \ $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/libunbound/libworker.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h \ - $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/util/ub_event.h $(srcdir)/util/edns.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/regional.h $(srcdir)/util/random.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/util/ub_event.h $(srcdir)/util/edns.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/services/localzone.h $(srcdir)/services/view.h \ $(srcdir)/sldns/sbuffer.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/services/cache/rrset.h \ - $(srcdir)/util/storage/slabhash.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \ - $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/authzone.h \ + $(srcdir)/services/mesh.h $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/respip/respip.h $(srcdir)/services/listen_dnsport.h $(srcdir)/daemon/acl_list.h \ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h -libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/libunbound/libworker.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/libunbound/worker.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/services/outside_network.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ - $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h \ - $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h \ - $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h \ - $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/regional.h $(srcdir)/util/random.h \ - $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/data/msgencode.h $(srcdir)/sldns/str2wire.h +libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h \ + $(srcdir)/libunbound/libworker.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \ + $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/unbound-event.h \ + $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/outside_network.h \ + $(srcdir)/util/regional.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/respip/respip.h $(srcdir)/services/cache/rrset.h \ + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/tube.h $(srcdir)/util/random.h $(srcdir)/util/proxy_protocol.h $(srcdir)/util/storage/lookup3.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/sldns/str2wire.h \ + $(srcdir)/dnstap/dtstream.h unbound-host.lo unbound-host.o: $(srcdir)/smallapp/unbound-host.c config.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h \ + asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/rrdef.h + $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/rrdef.h \ + streamtcp.lo streamtcp.o: $(srcdir)/testcode/streamtcp.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/proxy_protocol.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/proxy_protocol.h \ + $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \ + perf.lo perf.o: $(srcdir)/testcode/perf.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h + $(srcdir)/util/random.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/sldns/str2wire.h delayer.lo delayer.o: $(srcdir)/testcode/delayer.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ - $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h -unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h $(srcdir)/util/log.h \ - $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h $(srcdir)/util/shm_side/shm_main.h \ - $(srcdir)/libunbound/unbound.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h +unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h \ + $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/random.h $(srcdir)/util/shm_side/shm_main.h $(srcdir)/libunbound/unbound.h \ + $(srcdir)/util/timeval_func.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/sldns/wire2str.h \ $(srcdir)/sldns/pkthdr.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/services/modstack.h $(srcdir)/respip/respip.h \ - $(srcdir)/services/listen_dnsport.h + $(srcdir)/services/view.h $(srcdir)/sldns/sbuffer.h $(srcdir)/services/authzone.h $(srcdir)/services/mesh.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/services/modstack.h $(srcdir)/respip/respip.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/daemon/acl_list.h \ + unbound-anchor.lo unbound-anchor.o: $(srcdir)/smallapp/unbound-anchor.c config.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h -petal.lo petal.o: $(srcdir)/testcode/petal.c config.h + $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h \ + +petal.lo petal.o: $(srcdir)/testcode/petal.c config.h \ + unbound-dnstap-socket.lo unbound-dnstap-socket.o: $(srcdir)/dnstap/unbound-dnstap-socket.c config.h \ $(srcdir)/dnstap/dtstream.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/dnstap/dnstap_fstrm.h \ - $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h \ + $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/services/listen_dnsport.h \ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/config_file.h \ - $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/daemon/worker.h \ - $(srcdir)/libunbound/worker.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h \ - $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/rbtree.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/pkthdr.h dnstap/dnstap.pb-c.h \ + $(srcdir)/util/config_file.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/util/alloc.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ + $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ $(srcdir)/daemon/remote.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ - $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h $(srcdir)/services/localzone.h \ $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h $(srcdir)/libunbound/context.h \ $(srcdir)/libunbound/unbound-event.h pythonmod_utils.lo pythonmod_utils.o: $(srcdir)/pythonmod/pythonmod_utils.c config.h \ $(srcdir)/pythonmod/pythonmod_utils.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/net_help.h \ - $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ - $(srcdir)/util/regional.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/netevent.h \ + $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/services/cache/dns.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/regional.h \ + $(srcdir)/iterator/iter_delegpt.h $(srcdir)/sldns/sbuffer.h \ + win_svc.lo win_svc.o: $(srcdir)/winrc/win_svc.c config.h $(srcdir)/winrc/win_svc.h $(srcdir)/winrc/w_inst.h \ $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ $(srcdir)/daemon/worker.h \ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ - $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/dnscrypt/cert.h \ + $(srcdir)/util/data/msgreply.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h \ - $(srcdir)/util/net_help.h + $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \ + $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h w_inst.lo w_inst.o: $(srcdir)/winrc/w_inst.c config.h $(srcdir)/winrc/w_inst.h $(srcdir)/winrc/win_svc.h unbound-service-install.lo unbound-service-install.o: $(srcdir)/winrc/unbound-service-install.c config.h \ $(srcdir)/winrc/w_inst.h @@ -1600,12 +1833,14 @@ unbound-service-remove.lo unbound-service-remove.o: $(srcdir)/winrc/unbound-serv $(srcdir)/winrc/w_inst.h anchor-update.lo anchor-update.o: $(srcdir)/winrc/anchor-update.c config.h $(srcdir)/libunbound/unbound.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/wire2str.h -keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/rrdef.h +keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h \ + $(srcdir)/sldns/rrdef.h \ + sbuffer.lo sbuffer.o: $(srcdir)/sldns/sbuffer.c config.h $(srcdir)/sldns/sbuffer.h wire2str.lo wire2str.o: $(srcdir)/sldns/wire2str.c config.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/sldns/keyraw.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/log.h + $(srcdir)/sldns/keyraw.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h parse.lo parse.o: $(srcdir)/sldns/parse.c config.h $(srcdir)/sldns/parse.h $(srcdir)/sldns/parseutil.h \ $(srcdir)/sldns/sbuffer.h parseutil.lo parseutil.o: $(srcdir)/sldns/parseutil.c config.h $(srcdir)/sldns/parseutil.h @@ -1616,8 +1851,23 @@ dohclient.lo dohclient.o: $(srcdir)/testcode/dohclient.c config.h $(srcdir)/sldn $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h \ $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/util/net_help.h -readzone.lo readzone.o: $(srcdir)/testcode/readzone.c + $(srcdir)/sldns/pkthdr.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h \ + +doqclient.lo doqclient.o: $(srcdir)/testcode/doqclient.c config.h \ + $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \ + $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/util/data/dname.h $(srcdir)/util/ub_event.h \ + $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/dnscrypt/cert.h $(srcdir)/util/alloc.h $(srcdir)/daemon/stats.h \ + $(srcdir)/util/timehist.h $(srcdir)/libunbound/unbound.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \ + $(srcdir)/daemon/remote.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ + $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/services/rpz.h \ + $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h $(srcdir)/services/view.h \ + $(srcdir)/util/config_file.h $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h \ + $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound-event.h +readzone.lo readzone.o: $(srcdir)/testcode/readzone.c config.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/sldns/wire2str.h ctime_r.lo ctime_r.o: $(srcdir)/compat/ctime_r.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h fake-rfc2553.lo fake-rfc2553.o: $(srcdir)/compat/fake-rfc2553.c $(srcdir)/compat/fake-rfc2553.h config.h gmtime_r.lo gmtime_r.o: $(srcdir)/compat/gmtime_r.c config.h @@ -1632,9 +1882,11 @@ strlcat.lo strlcat.o: $(srcdir)/compat/strlcat.c config.h strlcpy.lo strlcpy.o: $(srcdir)/compat/strlcpy.c config.h strptime.lo strptime.o: $(srcdir)/compat/strptime.c config.h getentropy_freebsd.lo getentropy_freebsd.o: $(srcdir)/compat/getentropy_freebsd.c -getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h +getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h \ + getentropy_osx.lo getentropy_osx.o: $(srcdir)/compat/getentropy_osx.c -getentropy_solaris.lo getentropy_solaris.o: $(srcdir)/compat/getentropy_solaris.c config.h +getentropy_solaris.lo getentropy_solaris.o: $(srcdir)/compat/getentropy_solaris.c config.h \ + getentropy_win.lo getentropy_win.o: $(srcdir)/compat/getentropy_win.c explicit_bzero.lo explicit_bzero.o: $(srcdir)/compat/explicit_bzero.c config.h arc4random.lo arc4random.o: $(srcdir)/compat/arc4random.c config.h $(srcdir)/compat/chacha_private.h diff --git a/contrib/unbound/cachedb/redis.c b/contrib/unbound/cachedb/redis.c index 3dfa95859eb8..9383f1c8576c 100644 --- a/contrib/unbound/cachedb/redis.c +++ b/contrib/unbound/cachedb/redis.c @@ -46,6 +46,8 @@ #include "cachedb/cachedb.h" #include "util/alloc.h" #include "util/config_file.h" +#include "util/locks.h" +#include "util/timeval_func.h" #include "sldns/sbuffer.h" #ifdef USE_REDIS @@ -75,6 +77,18 @@ struct redis_moddata { /* timeout for connection setup */ struct timeval connect_timeout; struct timeval replica_connect_timeout; + /* the reconnect interval time. */ + struct timeval reconnect_interval; + struct timeval replica_reconnect_interval; + /* reconnect attempts, 0 if connected, counts up failed reconnects. */ + int reconnect_attempts; + int replica_reconnect_attempts; + /* Lock on reconnect_wait time. */ + lock_basic_type wait_lock; + lock_basic_type replica_wait_lock; + /* reconnect wait time, wait until it has passed before reconnect. */ + struct timeval reconnect_wait; + struct timeval replica_reconnect_wait; /* the redis logical database to use */ int logical_db; int replica_logical_db; @@ -82,6 +96,10 @@ struct redis_moddata { int set_with_ex_available; }; +/** The limit on the number of redis connect attempts. After failure if + * the number is exceeded, the reconnects are throttled by the wait time. */ +#define REDIS_RECONNECT_ATTEMPT_LIMIT 3 + static redisReply* redis_command(struct module_env*, struct cachedb_env*, const char*, const uint8_t*, size_t, int); @@ -105,6 +123,8 @@ moddata_clean(struct redis_moddata** moddata) { } free((*moddata)->replica_ctxs); } + lock_basic_destroy(&(*moddata)->wait_lock); + lock_basic_destroy(&(*moddata)->replica_wait_lock); free(*moddata); *moddata = NULL; } @@ -113,10 +133,39 @@ static redisContext* redis_connect(const char* host, int port, const char* path, const char* password, int logical_db, const struct timeval connect_timeout, - const struct timeval command_timeout) + const struct timeval command_timeout, + const struct timeval* reconnect_interval, + int* reconnect_attempts, + struct timeval* reconnect_wait, + lock_basic_type* wait_lock, + struct timeval* now_tv, + const char* infostr) { + struct timeval now_val; redisContext* ctx; + /* See if the redis server is down, and reconnect has to wait. */ + if(*reconnect_attempts > REDIS_RECONNECT_ATTEMPT_LIMIT) { + /* Acquire lock to look at timeval, the integer has atomic + * integrity. */ + struct timeval wait_tv; + if(now_tv) { + now_val = *now_tv; + } else { + if(gettimeofday(&now_val, NULL) < 0) + log_err("redis: gettimeofday: %s", + strerror(errno)); + } + lock_basic_lock(wait_lock); + wait_tv = *reconnect_wait; + lock_basic_unlock(wait_lock); + if(timeval_smaller(&now_val, &wait_tv)) { + verbose(VERB_ALGO, "redis %sdown, reconnect wait", + infostr); + return NULL; + } + } + if(path && path[0]!=0) { ctx = redisConnectUnixWithTimeout(path, connect_timeout); } else { @@ -126,18 +175,18 @@ redis_connect(const char* host, int port, const char* path, const char *errstr = "out of memory"; if(ctx) errstr = ctx->errstr; - log_err("failed to connect to redis server: %s", errstr); + log_err("failed to connect to redis %sserver: %s", infostr, errstr); goto fail; } if(redisSetTimeout(ctx, command_timeout) != REDIS_OK) { - log_err("failed to set redis timeout, %s", ctx->errstr); + log_err("failed to set redis %stimeout, %s", infostr, ctx->errstr); goto fail; } if(password && password[0]!=0) { redisReply* rep; rep = redisCommand(ctx, "AUTH %s", password); if(!rep || rep->type == REDIS_REPLY_ERROR) { - log_err("failed to authenticate with password"); + log_err("failed to authenticate %swith password", infostr); freeReplyObject(rep); goto fail; } @@ -147,18 +196,20 @@ redis_connect(const char* host, int port, const char* path, redisReply* rep; rep = redisCommand(ctx, "SELECT %d", logical_db); if(!rep || rep->type == REDIS_REPLY_ERROR) { - log_err("failed to set logical database (%d)", - logical_db); + log_err("failed %sto set logical database (%d)", + infostr, logical_db); freeReplyObject(rep); goto fail; } freeReplyObject(rep); } + *reconnect_attempts = 0; if(verbosity >= VERB_OPS) { char port_str[6+1]; port_str[0] = ' '; (void)snprintf(port_str+1, sizeof(port_str)-1, "%d", port); - verbose(VERB_OPS, "Connection to Redis established (%s%s)", + verbose(VERB_OPS, "Connection to Redis %sestablished (%s%s)", + infostr, path&&path[0]!=0?path:host, path&&path[0]!=0?"":port_str); } @@ -167,6 +218,25 @@ redis_connect(const char* host, int port, const char* path, fail: if(ctx) redisFree(ctx); + (*reconnect_attempts)++; + if(*reconnect_attempts > REDIS_RECONNECT_ATTEMPT_LIMIT) { + /* Wait for the reconnect interval before trying again. */ + struct timeval tv; + if(now_tv) { + now_val = *now_tv; + } else { + if(gettimeofday(&now_val, NULL) < 0) + log_err("redis: gettimeofday: %s", + strerror(errno)); + } + tv = now_val; + timeval_add(&tv, reconnect_interval); + lock_basic_lock(wait_lock); + *reconnect_wait = tv; + lock_basic_unlock(wait_lock); + verbose(VERB_ALGO, "redis %sreconnect wait until %d.%6.6d", + infostr, (int)tv.tv_sec, (int)tv.tv_usec); + } return NULL; } @@ -191,6 +261,13 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) log_err("out of memory"); goto fail; } + lock_basic_init(&moddata->wait_lock); + lock_protect(&moddata->wait_lock, &moddata->reconnect_wait, + sizeof(moddata->reconnect_wait)); + lock_basic_init(&moddata->replica_wait_lock); + lock_protect(&moddata->replica_wait_lock, + &moddata->replica_reconnect_wait, + sizeof(moddata->replica_reconnect_wait)); moddata->numctxs = env->cfg->num_threads; /* note: server_host and similar string configuration options are * shallow references to configured strings; we don't have to free them @@ -219,6 +296,8 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) set_timeout(&moddata->replica_connect_timeout, env->cfg->redis_replica_timeout, env->cfg->redis_replica_connect_timeout); + set_timeout(&moddata->reconnect_interval, 1000, 0); + set_timeout(&moddata->replica_reconnect_interval, 1000, 0); moddata->logical_db = env->cfg->redis_logical_db; moddata->replica_logical_db = env->cfg->redis_replica_logical_db; @@ -245,7 +324,13 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata->server_password, moddata->logical_db, moddata->connect_timeout, - moddata->command_timeout); + moddata->command_timeout, + &moddata->reconnect_interval, + &moddata->reconnect_attempts, + &moddata->reconnect_wait, + &moddata->wait_lock, + env->now_tv, + ""); if(!ctx) { log_err("redis_init: failed to init redis " "(for thread %d)", i); @@ -263,7 +348,13 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) moddata->replica_server_password, moddata->replica_logical_db, moddata->replica_connect_timeout, - moddata->replica_command_timeout); + moddata->replica_command_timeout, + &moddata->replica_reconnect_interval, + &moddata->replica_reconnect_attempts, + &moddata->replica_reconnect_wait, + &moddata->replica_wait_lock, + env->now_tv, + "replica "); if(!ctx) { log_err("redis_init: failed to init redis " "replica (for thread %d)", i); @@ -301,7 +392,7 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env) set_with_ex_fail: log_err("redis_init: failure during redis_init, the " "redis-expire-records option requires the SET with EX command " - "(redis >= 2.6.2)"); + "(redis >= 2.6.12)"); return 1; fail: moddata_clean(&moddata); @@ -364,7 +455,13 @@ redis_command(struct module_env* env, struct cachedb_env* cachedb_env, d->replica_server_password, d->replica_logical_db, d->replica_connect_timeout, - d->replica_command_timeout); + d->replica_command_timeout, + &d->replica_reconnect_interval, + &d->replica_reconnect_attempts, + &d->replica_reconnect_wait, + &d->replica_wait_lock, + env->now_tv, + "replica "); } else { ctx = redis_connect( d->server_host, @@ -373,7 +470,13 @@ redis_command(struct module_env* env, struct cachedb_env* cachedb_env, d->server_password, d->logical_db, d->connect_timeout, - d->command_timeout); + d->command_timeout, + &d->reconnect_interval, + &d->reconnect_attempts, + &d->reconnect_wait, + &d->wait_lock, + env->now_tv, + ""); } ctx_selector[env->alloc->thread_num] = ctx; } @@ -405,7 +508,14 @@ redis_lookup(struct module_env* env, struct cachedb_env* cachedb_env, char* key, struct sldns_buffer* result_buffer) { redisReply* rep; - char cmdbuf[4+(CACHEDB_HASHSIZE/8)*2+1]; /* "GET " + key */ + /* Supported commands: + * - "GET " + key + */ +#define REDIS_LOOKUP_MAX_BUF_LEN \ + 4 /* "GET " */ \ + +(CACHEDB_HASHSIZE/8)*2 /* key hash */ \ + + 1 /* \0 */ + char cmdbuf[REDIS_LOOKUP_MAX_BUF_LEN]; int n; int ret = 0; @@ -465,7 +575,13 @@ redis_store(struct module_env* env, struct cachedb_env* cachedb_env, * older redis 2.0.0 was "SETEX " + key + " " + ttl + " %b" * - "EXPIRE " + key + " 0" */ - char cmdbuf[6+(CACHEDB_HASHSIZE/8)*2+11+3+1]; +#define REDIS_STORE_MAX_BUF_LEN \ + 7 /* "EXPIRE " */ \ + +(CACHEDB_HASHSIZE/8)*2 /* key hash */ \ + + 7 /* " %b EX " */ \ + + 20 /* ttl (uint64_t) */ \ + + 1 /* \0 */ + char cmdbuf[REDIS_STORE_MAX_BUF_LEN]; if (!set_ttl) { verbose(VERB_ALGO, "redis_store %s (%d bytes)", key, (int)data_len); diff --git a/contrib/unbound/compat/fake-rfc2553.c b/contrib/unbound/compat/fake-rfc2553.c index 0f0f34f1fb2d..45b703f2bce8 100644 --- a/contrib/unbound/compat/fake-rfc2553.c +++ b/contrib/unbound/compat/fake-rfc2553.c @@ -57,7 +57,7 @@ int getnameinfo(const struct sockaddr *sa, size_t ATTR_UNUSED(salen), char *host } if (host != NULL) { - if (flags & NI_NUMERICHOST) { + if ((flags & NI_NUMERICHOST)) { if (strlcpy(host, inet_ntoa(sin->sin_addr), hostlen) >= hostlen) return (EAI_MEMORY); @@ -168,7 +168,7 @@ getaddrinfo(const char *hostname, const char *servname, port = 0; } - if (hints && hints->ai_flags & AI_PASSIVE) { + if (hints && (hints->ai_flags & AI_PASSIVE)) { addr = htonl(0x00000000); if (hostname && inet_aton(hostname, &in) != 0) addr = in.s_addr; @@ -193,7 +193,7 @@ getaddrinfo(const char *hostname, const char *servname, } /* Don't try DNS if AI_NUMERICHOST is set */ - if (hints && hints->ai_flags & AI_NUMERICHOST) + if (hints && (hints->ai_flags & AI_NUMERICHOST)) return (EAI_NONAME); hp = gethostbyname(hostname); diff --git a/contrib/unbound/config.h.in b/contrib/unbound/config.h.in index 584810398b91..a2b3f33c32be 100644 --- a/contrib/unbound/config.h.in +++ b/contrib/unbound/config.h.in @@ -173,7 +173,11 @@ 0 if you don't. */ #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO -/* Define to 1 if you have the declaration of 'strlcat', and to 0 if you +/* Define to 1 if you have the declaration of `SSL_CTX_set_tmp_ecdh', and to 0 + if you don't. */ +#undef HAVE_DECL_SSL_CTX_SET_TMP_ECDH + +/* Define to 1 if you have the declaration of `strlcat', and to 0 if you don't. */ #undef HAVE_DECL_STRLCAT @@ -477,13 +481,19 @@ 'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */ #undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL -/* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */ +/* Define to 1 if you have the `ngtcp2_crypto_quictls_init' function. */ +#undef HAVE_NGTCP2_CRYPTO_QUICTLS_INIT + +/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */ #undef HAVE_NGTCP2_ENCRYPTION_LEVEL /* Define to 1 if you have the <ngtcp2/ngtcp2_crypto_openssl.h> header file. */ #undef HAVE_NGTCP2_NGTCP2_CRYPTO_OPENSSL_H +/* Define to 1 if you have the <ngtcp2/ngtcp2_crypto_ossl.h> header file. */ +#undef HAVE_NGTCP2_NGTCP2_CRYPTO_OSSL_H + /* Define to 1 if you have the <ngtcp2/ngtcp2_crypto_quictls.h> header file. */ #undef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H @@ -645,10 +655,7 @@ function. */ #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB -/* Define to 1 if you have the 'SSL_CTX_set_tmp_ecdh' function. */ -#undef HAVE_SSL_CTX_SET_TMP_ECDH - -/* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */ +/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */ #undef HAVE_SSL_GET0_ALPN_SELECTED /* Define to 1 if you have the 'SSL_get0_peername' function. */ @@ -1023,6 +1030,9 @@ /* Define this to enable client TCP Fast Open. */ #undef USE_MSG_FASTOPEN +/* Define this to use ngtcp2_crypto_ossl. */ +#undef USE_NGTCP2_CRYPTO_OSSL + /* Define this to enable client TCP Fast Open. */ #undef USE_OSX_MSG_FASTOPEN diff --git a/contrib/unbound/configure b/contrib/unbound/configure index c4c5de99d85d..6e401b685e3e 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for unbound 1.23.1. +# Generated by GNU Autoconf 2.71 for unbound 1.24.0. # # Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>. # @@ -615,8 +615,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.23.1' -PACKAGE_STRING='unbound 1.23.1' +PACKAGE_VERSION='1.24.0' +PACKAGE_STRING='unbound 1.24.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -679,7 +679,9 @@ opt_dnstap_socket_path ENABLE_DNSTAP PROTOBUFC_LIBS PROTOBUFC_CFLAGS +PROTOC_GEN_C PROTOC_C +PROTOC UBSYMS EXTRALINK COMMON_OBJ_ALL_SYMBOLS @@ -1506,7 +1508,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures unbound 1.23.1 to adapt to many kinds of systems. +\`configure' configures unbound 1.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1572,7 +1574,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.23.1:";; + short | recursive ) echo "Configuration of unbound 1.24.0:";; esac cat <<\_ACEOF @@ -1826,8 +1828,8 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.23.1 -generated by GNU Autoconf 2.72 +unbound configure 1.24.0 +generated by GNU Autoconf 2.71 Copyright (C) 2023 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -2504,8 +2506,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.23.1, which was -generated by GNU Autoconf 2.72. Invocation command line was +It was created by unbound $as_me 1.24.0, which was +generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3284,13 +3286,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=23 +UNBOUND_VERSION_MINOR=24 UNBOUND_VERSION_MICRO=1 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=32 +LIBUNBOUND_REVISION=33 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -3390,6 +3392,7 @@ LIBUNBOUND_AGE=1 # 1.22.0 had 9:30:1 # 1.23.0 had 9:31:1 # 1.23.1 had 9:32:1 +# 1.24.0 had 9:33:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -21362,12 +21365,6 @@ then : printf "%s\n" "#define HAVE_BIO_SET_CALLBACK_EX 1" >>confdefs.h fi -ac_fn_c_check_func "$LINENO" "SSL_CTX_set_tmp_ecdh" "ac_cv_func_SSL_CTX_set_tmp_ecdh" -if test "x$ac_cv_func_SSL_CTX_set_tmp_ecdh" = xyes -then : - printf "%s\n" "#define HAVE_SSL_CTX_SET_TMP_ECDH 1" >>confdefs.h - -fi # these check_funcs need -lssl @@ -21529,6 +21526,34 @@ else case e in #( esac fi printf "%s\n" "#define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO $ac_have_decl" >>confdefs.h +ac_fn_check_decl "$LINENO" "SSL_CTX_set_tmp_ecdh" "ac_cv_have_decl_SSL_CTX_set_tmp_ecdh" " +$ac_includes_default +#ifdef HAVE_OPENSSL_ERR_H +#include <openssl/err.h> +#endif + +#ifdef HAVE_OPENSSL_RAND_H +#include <openssl/rand.h> +#endif + +#ifdef HAVE_OPENSSL_CONF_H +#include <openssl/conf.h> +#endif + +#ifdef HAVE_OPENSSL_ENGINE_H +#include <openssl/engine.h> +#endif +#include <openssl/ssl.h> +#include <openssl/evp.h> + +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_SSL_CTX_set_tmp_ecdh" = xyes +then : + ac_have_decl=1 +else $as_nop + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_SSL_CTX_SET_TMP_ECDH $ac_have_decl" >>confdefs.h if test "$ac_cv_func_HMAC_Init_ex" = "yes"; then @@ -22896,6 +22921,13 @@ then : printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "ngtcp2/ngtcp2_crypto_ossl.h" "ac_cv_header_ngtcp2_ngtcp2_crypto_ossl_h" "$ac_includes_default +" +if test "x$ac_cv_header_ngtcp2_ngtcp2_crypto_ossl_h" = xyes +then : + printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_CRYPTO_OSSL_H 1" >>confdefs.h + +fi ac_fn_c_check_header_compile "$LINENO" "ngtcp2/ngtcp2_crypto_openssl.h" "ac_cv_header_ngtcp2_ngtcp2_crypto_openssl_h" "$ac_includes_default " if test "x$ac_cv_header_ngtcp2_ngtcp2_crypto_openssl_h" = xyes @@ -22937,7 +22969,52 @@ esac fi printf "%s\n" "#define HAVE_DECL_NGTCP2_CRYPTO_ENCRYPT_CB $ac_have_decl" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_openssl" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_ossl" >&5 +printf %s "checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_ossl... " >&6; } +if test ${ac_cv_lib_ngtcp2_crypto_ossl_ngtcp2_crypto_encrypt_cb+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lngtcp2_crypto_ossl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char ngtcp2_crypto_encrypt_cb (); +int +main (void) +{ +return ngtcp2_crypto_encrypt_cb (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_ngtcp2_crypto_ossl_ngtcp2_crypto_encrypt_cb=yes +else $as_nop + ac_cv_lib_ngtcp2_crypto_ossl_ngtcp2_crypto_encrypt_cb=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_ossl_ngtcp2_crypto_encrypt_cb" >&5 +printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_ossl_ngtcp2_crypto_encrypt_cb" >&6; } +if test "x$ac_cv_lib_ngtcp2_crypto_ossl_ngtcp2_crypto_encrypt_cb" = xyes +then : + + LIBS="$LIBS -lngtcp2_crypto_ossl" + +printf "%s\n" "#define USE_NGTCP2_CRYPTO_OSSL 1" >>confdefs.h + + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_openssl" >&5 printf %s "checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_openssl... " >&6; } if test ${ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_encrypt_cb+y} then : @@ -22983,9 +23060,9 @@ printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_encrypt_cb" >&6; } if test "x$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_encrypt_cb" = xyes then : LIBS="$LIBS -lngtcp2_crypto_openssl" -fi +else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_quictls" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_quictls" >&5 printf %s "checking for ngtcp2_crypto_encrypt_cb in -lngtcp2_crypto_quictls... " >&6; } if test ${ac_cv_lib_ngtcp2_crypto_quictls_ngtcp2_crypto_encrypt_cb+y} then : @@ -23033,6 +23110,12 @@ then : LIBS="$LIBS -lngtcp2_crypto_quictls" fi + +fi + + +fi + ac_fn_c_check_func "$LINENO" "ngtcp2_crypto_encrypt_cb" "ac_cv_func_ngtcp2_crypto_encrypt_cb" if test "x$ac_cv_func_ngtcp2_crypto_encrypt_cb" = xyes then : @@ -23081,6 +23164,12 @@ then : printf "%s\n" "#define HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT 1" >>confdefs.h fi +ac_fn_c_check_func "$LINENO" "ngtcp2_crypto_quictls_init" "ac_cv_func_ngtcp2_crypto_quictls_init" +if test "x$ac_cv_func_ngtcp2_crypto_quictls_init" = xyes +then : + printf "%s\n" "#define HAVE_NGTCP2_CRYPTO_QUICTLS_INIT 1" >>confdefs.h + +fi ac_fn_c_check_func "$LINENO" "ngtcp2_conn_get_num_scid" "ac_cv_func_ngtcp2_conn_get_num_scid" if test "x$ac_cv_func_ngtcp2_conn_get_num_scid" = xyes then : @@ -23101,6 +23190,10 @@ then : fi + # these check_funcs need -lssl + BAKLIBS="$LIBS" + LIBS="-lssl $LIBS" + for ac_func in SSL_is_quic do : ac_fn_c_check_func "$LINENO" "SSL_is_quic" "ac_cv_func_SSL_is_quic" @@ -23114,6 +23207,8 @@ esac fi done + LIBS="$BAKLIBS" + ac_fn_c_check_type "$LINENO" "struct ngtcp2_version_cid" "ac_cv_type_struct_ngtcp2_version_cid" "$ac_includes_default #include <ngtcp2/ngtcp2.h> @@ -24958,7 +25053,55 @@ fi if test "x$opt_dnstap" != "xno"; then - # Extract the first word of "protoc-c", so it can be a program name with args. + # Extract the first word of "protoc", so it can be a program name with args. +set dummy protoc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PROTOC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PROTOC in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROTOC="$PROTOC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PROTOC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PROTOC=$ac_cv_path_PROTOC +if test -n "$PROTOC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROTOC" >&5 +printf "%s\n" "$PROTOC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + # 'protoc-c' is deprecated. We use 'protoc' instead. If it can not be + # found, try 'protoc-c'. + if test -z "$PROTOC"; then + # Extract the first word of "protoc-c", so it can be a program name with args. set dummy protoc-c; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 printf %s "checking for $ac_word... " >&6; } @@ -25004,9 +25147,83 @@ printf "%s\n" "no" >&6; } fi - if test -z "$PROTOC_C"; then - as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 - fi + else + PROTOC_C="$PROTOC" + fi + if test -z "$PROTOC_C"; then + as_fn_error $? "The protoc or protoc-c program was not found. It is needed for dnstap, use --disable-dnstap, or install protobuf-c to provide protoc or protoc-c" "$LINENO" 5 + fi + + # Check for protoc-gen-c plugin + # Extract the first word of "protoc-gen-c", so it can be a program name with args. +set dummy protoc-gen-c; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PROTOC_GEN_C+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PROTOC_GEN_C in + [\\/]* | ?:[\\/]*) + ac_cv_path_PROTOC_GEN_C="$PROTOC_GEN_C" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PROTOC_GEN_C="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PROTOC_GEN_C=$ac_cv_path_PROTOC_GEN_C +if test -n "$PROTOC_GEN_C"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROTOC_GEN_C" >&5 +printf "%s\n" "$PROTOC_GEN_C" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + if test -z "$PROTOC_GEN_C"; then + as_fn_error $? "The protoc-gen-c plugin was not found. It is needed for dnstap, use --disable-dnstap, or install protobuf-c-compiler to provide protoc-gen-c" "$LINENO" 5 + fi + + # Test that protoc-gen-c actually works + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if protoc-gen-c plugin works" >&5 +printf %s "checking if protoc-gen-c plugin works... " >&6; } + cat > conftest.proto << EOF +syntax = "proto2"; +message TestMessage { + optional string test_field = 1; +} +EOF + if $PROTOC_C --c_out=. conftest.proto >/dev/null 2>&1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + rm -f conftest.proto conftest.pb-c.c conftest.pb-c.h + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + rm -f conftest.proto conftest.pb-c.c conftest.pb-c.h + as_fn_error $? "The protoc-gen-c plugin is not working properly. Please ensure protobuf-c-compiler is properly installed" "$LINENO" 5 + fi + # Check whether --with-protobuf-c was given. if test ${with_protobuf_c+y} @@ -25823,7 +26040,7 @@ printf "%s\n" "#define MAXSYSLOGMSGLEN 10240" >>confdefs.h -version=1.23.1 +version=1.24.0 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for build time" >&5 printf %s "checking for build time... " >&6; } @@ -26364,8 +26581,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.23.1, which was -generated by GNU Autoconf 2.72. Invocation command line was +This file was extended by unbound $as_me 1.24.0, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -26432,8 +26649,8 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -unbound config.status 1.23.1 -configured by $0, generated by GNU Autoconf 2.72, +unbound config.status 1.24.0 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" Copyright (C) 2023 Free Software Foundation, Inc. diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 051e7b392e33..1bbb41a764f3 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,15 +11,15 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[23]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MINOR],[24]) +m4_define([VERSION_MICRO],[0]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=32 +LIBUNBOUND_REVISION=33 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -119,6 +119,7 @@ LIBUNBOUND_AGE=1 # 1.22.0 had 9:30:1 # 1.23.0 had 9:31:1 # 1.23.1 had 9:32:1 +# 1.24.0 had 9:33:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -996,7 +997,7 @@ else AC_MSG_RESULT([no]) fi AC_CHECK_HEADERS([openssl/conf.h openssl/engine.h openssl/bn.h openssl/dh.h openssl/dsa.h openssl/rsa.h openssl/core_names.h openssl/param_build.h],,, [AC_INCLUDES_DEFAULT]) -AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_default_properties_is_fips_enabled EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback EVP_MAC_CTX_set_params OSSL_PARAM_BLD_new BIO_set_callback_ex SSL_CTX_set_tmp_ecdh]) +AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_default_properties_is_fips_enabled EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ENGINE_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback EVP_MAC_CTX_set_params OSSL_PARAM_BLD_new BIO_set_callback_ex]) # these check_funcs need -lssl BAKLIBS="$LIBS" @@ -1004,7 +1005,7 @@ LIBS="-lssl $LIBS" AC_CHECK_FUNCS([OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites SSL_CTX_set_tlsext_ticket_key_evp_cb SSL_CTX_set_alpn_select_cb SSL_get0_alpn_selected SSL_CTX_set_alpn_protos SSL_get1_peer_certificate]) LIBS="$BAKLIBS" -AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto], [], [], [ +AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto,SSL_CTX_set_tmp_ecdh], [], [], [ AC_INCLUDES_DEFAULT #ifdef HAVE_OPENSSL_ERR_H #include <openssl/err.h> @@ -1610,17 +1611,29 @@ if test x_$withval = x_yes -o x_$withval != x_no; then if test x_$found_libngtcp2 != x_yes; then AC_MSG_ERROR([Could not find libngtcp2, ngtcp2.h]) fi - AC_CHECK_HEADERS([ngtcp2/ngtcp2.h ngtcp2/ngtcp2_crypto_openssl.h ngtcp2/ngtcp2_crypto_quictls.h],,, [AC_INCLUDES_DEFAULT]) + AC_CHECK_HEADERS([ngtcp2/ngtcp2.h ngtcp2/ngtcp2_crypto_ossl.h ngtcp2/ngtcp2_crypto_openssl.h ngtcp2/ngtcp2_crypto_quictls.h],,, [AC_INCLUDES_DEFAULT]) AC_CHECK_DECLS([ngtcp2_conn_server_new], [], [], [AC_INCLUDES_DEFAULT #include <ngtcp2/ngtcp2.h> ]) AC_CHECK_DECLS([ngtcp2_crypto_encrypt_cb], [], [], [AC_INCLUDES_DEFAULT #include <ngtcp2/ngtcp2_crypto.h> ]) - AC_CHECK_LIB([ngtcp2_crypto_openssl], [ngtcp2_crypto_encrypt_cb], [ LIBS="$LIBS -lngtcp2_crypto_openssl" ]) - AC_CHECK_LIB([ngtcp2_crypto_quictls], [ngtcp2_crypto_encrypt_cb], [ LIBS="$LIBS -lngtcp2_crypto_quictls" ]) - AC_CHECK_FUNCS([ngtcp2_crypto_encrypt_cb ngtcp2_ccerr_default ngtcp2_conn_in_closing_period ngtcp2_conn_in_draining_period ngtcp2_conn_get_max_local_streams_uni ngtcp2_crypto_quictls_from_ossl_encryption_level ngtcp2_crypto_quictls_configure_server_context ngtcp2_crypto_quictls_configure_client_context ngtcp2_conn_get_num_scid ngtcp2_conn_tls_early_data_rejected ngtcp2_conn_encode_0rtt_transport_params]) + AC_CHECK_LIB([ngtcp2_crypto_ossl], [ngtcp2_crypto_encrypt_cb], [ + LIBS="$LIBS -lngtcp2_crypto_ossl" + AC_DEFINE(USE_NGTCP2_CRYPTO_OSSL, 1, [Define this to use ngtcp2_crypto_ossl.]) + ], [ + AC_CHECK_LIB([ngtcp2_crypto_openssl], [ngtcp2_crypto_encrypt_cb], [ LIBS="$LIBS -lngtcp2_crypto_openssl" ], [ + AC_CHECK_LIB([ngtcp2_crypto_quictls], [ngtcp2_crypto_encrypt_cb], [ LIBS="$LIBS -lngtcp2_crypto_quictls" ]) + ]) + ]) + AC_CHECK_FUNCS([ngtcp2_crypto_encrypt_cb ngtcp2_ccerr_default ngtcp2_conn_in_closing_period ngtcp2_conn_in_draining_period ngtcp2_conn_get_max_local_streams_uni ngtcp2_crypto_quictls_from_ossl_encryption_level ngtcp2_crypto_quictls_configure_server_context ngtcp2_crypto_quictls_configure_client_context ngtcp2_crypto_quictls_init ngtcp2_conn_get_num_scid ngtcp2_conn_tls_early_data_rejected ngtcp2_conn_encode_0rtt_transport_params]) + + # these check_funcs need -lssl + BAKLIBS="$LIBS" + LIBS="-lssl $LIBS" AC_CHECK_FUNCS([SSL_is_quic], [], [AC_MSG_ERROR([No QUIC support detected in OpenSSL. Need OpenSSL version with QUIC support to enable DNS over QUIC with libngtcp2.])]) + LIBS="$BAKLIBS" + AC_CHECK_TYPES([struct ngtcp2_version_cid, ngtcp2_encryption_level],,,[AC_INCLUDES_DEFAULT #include <ngtcp2/ngtcp2.h> ]) diff --git a/contrib/unbound/contrib/aaaa-filter-iterator.patch b/contrib/unbound/contrib/aaaa-filter-iterator.patch index b0c2b2198a60..4ada030730fc 100644 --- a/contrib/unbound/contrib/aaaa-filter-iterator.patch +++ b/contrib/unbound/contrib/aaaa-filter-iterator.patch @@ -1,10 +1,10 @@ diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in -index 5a75e319..c6c6dbe2 100644 +index 172eb26c..2921c87f 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in -@@ -970,6 +970,13 @@ potentially broken nameservers. A lot of domains will not be resolvable when - this option in enabled. Only use if you know what you are doing. - This option only has effect when qname-minimisation is enabled. Default is no. +@@ -2146,6 +2146,13 @@ Default: no + .UNINDENT + .INDENT 0.0 .TP +.B aaaa\-filter: \fI<yes or no> +Activate behavior similar to BIND's AAAA-filter. @@ -13,14 +13,14 @@ index 5a75e319..c6c6dbe2 100644 +This also causes an additional A query to be sent for each AAAA query. +This breaks DNSSEC! +.TP - .B aggressive\-nsec: \fI<yes or no> - Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN - and other denials, using information from previous NXDOMAINs answers. + .B aggressive\-nsec: \fI<yes or no>\fP + Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN and other + denials, using information from previous NXDOMAINs answers. diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c -index f093c1bf..e55a2246 100644 +index 49a5f5da..fbe434fa 100644 --- a/iterator/iter_scrub.c +++ b/iterator/iter_scrub.c -@@ -679,6 +679,32 @@ static int sanitize_nsec_is_overreach(sldns_buffer* pkt, +@@ -849,6 +849,32 @@ scrub_sanitize_rr_length(sldns_buffer* pkt, struct msg_parse* msg, return 0; } @@ -53,15 +53,15 @@ index f093c1bf..e55a2246 100644 /** * Given a response event, remove suspect RRsets from the response. * "Suspect" rrsets are potentially poison. Note that this routine expects -@@ -698,6 +724,7 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg, +@@ -869,6 +895,7 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg, struct query_info* qinfo, uint8_t* zonename, struct module_env* env, - struct iter_env* ie) + struct iter_env* ie, struct module_qstate* qstate) { + int found_a_record = 0; /* ASN: do we have a A record? */ int del_addi = 0; /* if additional-holding rrsets are deleted, we do not trust the normalized additional-A-AAAA any more */ - struct rrset_parse* rrset, *prev; -@@ -733,6 +760,13 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg, + uint8_t* ns_rrset_dname = NULL; +@@ -906,6 +933,13 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg, rrset = rrset->rrset_all_next; } @@ -75,9 +75,9 @@ index f093c1bf..e55a2246 100644 /* At this point, we brutally remove ALL rrsets that aren't * children of the originating zone. The idea here is that, * as far as we know, the server that we contacted is ONLY -@@ -744,6 +778,24 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg, - rrset = msg->rrset_first; - while(rrset) { +@@ -925,6 +959,24 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg, + continue; + } + /* ASN: For AAAA records only... */ + if((ie->aaaa_filter) && (rrset->type == LDNS_RR_TYPE_AAAA)) { @@ -101,10 +101,10 @@ index f093c1bf..e55a2246 100644 if( (rrset->type == LDNS_RR_TYPE_A || rrset->type == LDNS_RR_TYPE_AAAA)) { diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c -index 2482a1f4..bd5ba243 100644 +index 1da21896..6583dd0e 100644 --- a/iterator/iter_utils.c +++ b/iterator/iter_utils.c -@@ -177,6 +177,7 @@ iter_apply_cfg(struct iter_env* iter_env, struct config_file* cfg) +@@ -250,6 +250,7 @@ iter_apply_cfg(struct iter_env* iter_env, struct config_file* cfg) iter_env->outbound_msg_retry = cfg->outbound_msg_retry; iter_env->max_sent_count = cfg->max_sent_count; iter_env->max_query_restarts = cfg->max_query_restarts; @@ -113,12 +113,12 @@ index 2482a1f4..bd5ba243 100644 } diff --git a/iterator/iterator.c b/iterator/iterator.c -index 54006940..768fe202 100644 +index 71e64655..735f4ca0 100644 --- a/iterator/iterator.c +++ b/iterator/iterator.c -@@ -2155,6 +2155,53 @@ processDSNSFind(struct module_qstate* qstate, struct iter_qstate* iq, int id) - - return 0; +@@ -2412,6 +2412,53 @@ check_waiting_queries(struct iter_qstate* iq, struct module_qstate* qstate, + qstate->ext_state[id] = module_wait_reply; + } } + +/** @@ -170,8 +170,8 @@ index 54006940..768fe202 100644 /** * This is the request event state where the request will be sent to one of -@@ -2216,6 +2263,13 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, - return error_response(qstate, id, LDNS_RCODE_SERVFAIL); +@@ -2554,6 +2601,13 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, + } } + /* ASN: If we have a AAAA query, then also query for A records */ @@ -184,7 +184,7 @@ index 54006940..768fe202 100644 /* Make sure we have a delegation point, otherwise priming failed * or another failure occurred */ if(!iq->dp) { -@@ -3648,6 +3702,61 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -4178,6 +4232,61 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq, return 0; } @@ -246,7 +246,7 @@ index 54006940..768fe202 100644 /* * Return priming query results to interested super querystates. * -@@ -3667,6 +3776,9 @@ iter_inform_super(struct module_qstate* qstate, int id, +@@ -4197,6 +4306,9 @@ iter_inform_super(struct module_qstate* qstate, int id, else if(super->qinfo.qtype == LDNS_RR_TYPE_DS && ((struct iter_qstate*) super->minfo[id])->state == DSNS_FIND_STATE) processDSNSResponse(qstate, id, super); @@ -256,7 +256,7 @@ index 54006940..768fe202 100644 else if(qstate->return_rcode != LDNS_RCODE_NOERROR) error_supers(qstate, id, super); else if(qstate->is_priming) -@@ -3704,6 +3816,9 @@ iter_handle(struct module_qstate* qstate, struct iter_qstate* iq, +@@ -4234,6 +4346,9 @@ iter_handle(struct module_qstate* qstate, struct iter_qstate* iq, case INIT_REQUEST_3_STATE: cont = processInitRequest3(qstate, iq, id); break; @@ -266,7 +266,7 @@ index 54006940..768fe202 100644 case QUERYTARGETS_STATE: cont = processQueryTargets(qstate, iq, ie, id); break; -@@ -4040,6 +4155,8 @@ iter_state_to_string(enum iter_state state) +@@ -4578,6 +4693,8 @@ iter_state_to_string(enum iter_state state) return "INIT REQUEST STATE (stage 2)"; case INIT_REQUEST_3_STATE: return "INIT REQUEST STATE (stage 3)"; @@ -275,7 +275,7 @@ index 54006940..768fe202 100644 case QUERYTARGETS_STATE : return "QUERY TARGETS STATE"; case PRIME_RESP_STATE : -@@ -4064,6 +4181,7 @@ iter_state_is_responsestate(enum iter_state s) +@@ -4602,6 +4719,7 @@ iter_state_is_responsestate(enum iter_state s) case INIT_REQUEST_STATE : case INIT_REQUEST_2_STATE : case INIT_REQUEST_3_STATE : @@ -284,10 +284,10 @@ index 54006940..768fe202 100644 case COLLECT_CLASS_STATE : return 0; diff --git a/iterator/iterator.h b/iterator/iterator.h -index 8b840528..a61c4195 100644 +index ae4b4e45..a44f9d27 100644 --- a/iterator/iterator.h +++ b/iterator/iterator.h -@@ -133,6 +133,9 @@ struct iter_env { +@@ -157,6 +157,9 @@ struct iter_env { */ int* target_fetch_policy; @@ -297,7 +297,7 @@ index 8b840528..a61c4195 100644 /** lock on ratelimit counter */ lock_basic_type queries_ratelimit_lock; /** number of queries that have been ratelimited */ -@@ -187,6 +190,14 @@ enum iter_state { +@@ -217,6 +220,14 @@ enum iter_state { */ INIT_REQUEST_3_STATE, @@ -312,9 +312,9 @@ index 8b840528..a61c4195 100644 /** * Each time a delegation point changes for a given query or a * query times out and/or wakes up, this state is (re)visited. -@@ -376,6 +387,13 @@ struct iter_qstate { - */ - int refetch_glue; +@@ -434,6 +445,13 @@ struct iter_qstate { + * already so that it is accepted later. */ + int empty_nodata_found; + /** + * ASN: This is a flag that, if true, means that this query is @@ -327,10 +327,10 @@ index 8b840528..a61c4195 100644 struct outbound_list outlist; diff --git a/pythonmod/interface.i b/pythonmod/interface.i -index 1ca8686a..d91b19ec 100644 +index 2040fb9e..f073c3dc 100644 --- a/pythonmod/interface.i +++ b/pythonmod/interface.i -@@ -995,6 +995,7 @@ struct config_file { +@@ -1013,6 +1013,7 @@ struct config_file { int harden_dnssec_stripped; int harden_referral_path; int use_caps_bits_for_id; @@ -339,23 +339,23 @@ index 1ca8686a..d91b19ec 100644 struct config_strlist* private_domain; size_t unwanted_threshold; diff --git a/util/config_file.c b/util/config_file.c -index 969d664b..8d94b008 100644 +index b1e767b3..5eb3c099 100644 --- a/util/config_file.c +++ b/util/config_file.c -@@ -231,6 +231,7 @@ config_create(void) - cfg->harden_referral_path = 0; +@@ -247,6 +247,7 @@ config_create(void) cfg->harden_algo_downgrade = 0; + cfg->harden_unknown_additional = 0; cfg->use_caps_bits_for_id = 0; + cfg->aaaa_filter = 0; /* ASN: default is disabled */ cfg->caps_whitelist = NULL; cfg->private_address = NULL; cfg->private_domain = NULL; diff --git a/util/config_file.h b/util/config_file.h -index c7c9a0a4..e3aa15b0 100644 +index 44ac036b..1e59ab07 100644 --- a/util/config_file.h +++ b/util/config_file.h -@@ -285,6 +285,8 @@ struct config_file { - int harden_algo_downgrade; +@@ -311,6 +311,8 @@ struct config_file { + int harden_unknown_additional; /** use 0x20 bits in query as random ID bits */ int use_caps_bits_for_id; + /** ASN: enable AAAA filter? */ @@ -364,10 +364,10 @@ index c7c9a0a4..e3aa15b0 100644 struct config_strlist* caps_whitelist; /** strip away these private addrs from answers, no DNS Rebinding */ diff --git a/util/configlexer.lex b/util/configlexer.lex -index 34a0e5dd..c890be2a 100644 +index bc258673..76aab170 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex -@@ -317,6 +317,7 @@ use-caps-for-id{COLON} { YDVAR(1, VAR_USE_CAPS_FOR_ID) } +@@ -327,6 +327,7 @@ use-caps-for-id{COLON} { YDVAR(1, VAR_USE_CAPS_FOR_ID) } caps-whitelist{COLON} { YDVAR(1, VAR_CAPS_WHITELIST) } caps-exempt{COLON} { YDVAR(1, VAR_CAPS_WHITELIST) } unwanted-reply-threshold{COLON} { YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } @@ -376,10 +376,10 @@ index 34a0e5dd..c890be2a 100644 private-domain{COLON} { YDVAR(1, VAR_PRIVATE_DOMAIN) } prefetch-key{COLON} { YDVAR(1, VAR_PREFETCH_KEY) } diff --git a/util/configparser.y b/util/configparser.y -index d4f965f9..8cc237c6 100644 +index 82e1d878..dc19bed5 100644 --- a/util/configparser.y +++ b/util/configparser.y -@@ -97,6 +97,7 @@ extern struct config_parser_state* cfg_parser; +@@ -100,6 +100,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_STATISTICS_CUMULATIVE VAR_OUTGOING_PORT_PERMIT %token VAR_OUTGOING_PORT_AVOID VAR_DLV_ANCHOR_FILE VAR_DLV_ANCHOR %token VAR_NEG_CACHE_SIZE VAR_HARDEN_REFERRAL_PATH VAR_PRIVATE_ADDRESS @@ -387,7 +387,7 @@ index d4f965f9..8cc237c6 100644 %token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE %token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE %token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE -@@ -247,6 +248,7 @@ content_server: server_num_threads | server_verbosity | server_port | +@@ -276,6 +277,7 @@ content_server: server_num_threads | server_verbosity | server_port | server_dlv_anchor_file | server_dlv_anchor | server_neg_cache_size | server_harden_referral_path | server_private_address | server_private_domain | server_extended_statistics | @@ -395,7 +395,7 @@ index d4f965f9..8cc237c6 100644 server_local_data_ptr | server_jostle_timeout | server_unwanted_reply_threshold | server_log_time_ascii | server_domain_insecure | server_val_sig_skew_min | -@@ -1754,6 +1756,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG +@@ -1932,6 +1934,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG yyerror("out of memory"); } ; diff --git a/contrib/unbound/contrib/unbound.service.in b/contrib/unbound/contrib/unbound.service.in index 8a5d3b2b0189..cc8d0ed2dab3 100644 --- a/contrib/unbound/contrib/unbound.service.in +++ b/contrib/unbound/contrib/unbound.service.in @@ -38,11 +38,17 @@ ; - `LockPersonality=yes` locks down the personality system call so that the ; kernel execution domain may not be changed from the default. ; +; - With /etc/systemd/network/*.network a setting to make sure the network +; is not considered online too early, can reduce network unreachable +; errors on server start: +; [Link] +; RequiredForOnline=routable ; [Unit] Description=Validating, recursive, and caching DNS resolver Documentation=man:unbound(8) After=network-online.target +Wants=network-online.target Before=nss-lookup.target [Install] diff --git a/contrib/unbound/daemon/cachedump.c b/contrib/unbound/daemon/cachedump.c index ba986c763edc..f0a693bf6f8e 100644 --- a/contrib/unbound/daemon/cachedump.c +++ b/contrib/unbound/daemon/cachedump.c @@ -62,84 +62,231 @@ #include "sldns/wire2str.h" #include "sldns/str2wire.h" +static void spool_txt_printf(struct config_strlist_head* txt, + const char* format, ...) ATTR_FORMAT(printf, 2, 3); + +/** Append to strlist at end, and log error if out of memory. */ +static void +spool_txt_string(struct config_strlist_head* txt, char* str) +{ + if(!cfg_strlist_append(txt, strdup(str))) { + log_err("out of memory in spool text"); + } +} + +/** Spool txt to spool list. */ +static void +spool_txt_vmsg(struct config_strlist_head* txt, const char* format, + va_list args) +{ + char msg[65535]; + vsnprintf(msg, sizeof(msg), format, args); + spool_txt_string(txt, msg); +} + +/** Print item to spool list. On alloc failure the list is as before. */ +static void +spool_txt_printf(struct config_strlist_head* txt, const char* format, ...) +{ + va_list args; + va_start(args, format); + spool_txt_vmsg(txt, format, args); + va_end(args); +} + /** dump one rrset zonefile line */ -static int -dump_rrset_line(RES* ssl, struct ub_packed_rrset_key* k, time_t now, size_t i) +static void +dump_rrset_line(struct config_strlist_head* txt, struct ub_packed_rrset_key* k, + time_t now, size_t i) { char s[65535]; if(!packed_rr_to_string(k, i, now, s, sizeof(s))) { - return ssl_printf(ssl, "BADRR\n"); + spool_txt_string(txt, "BADRR\n"); + return; } - return ssl_printf(ssl, "%s", s); + spool_txt_string(txt, s); } /** dump rrset key and data info */ -static int -dump_rrset(RES* ssl, struct ub_packed_rrset_key* k, +static void +dump_rrset(struct config_strlist_head* txt, struct ub_packed_rrset_key* k, struct packed_rrset_data* d, time_t now) { size_t i; /* rd lock held by caller */ - if(!k || !d) return 1; - if(k->id == 0) return 1; /* deleted */ - if(d->ttl < now) return 1; /* expired */ + if(!k || !d) return; + if(k->id == 0) return; /* deleted */ + if(d->ttl < now) return; /* expired */ /* meta line */ - if(!ssl_printf(ssl, ";rrset%s " ARG_LL "d %u %u %d %d\n", + spool_txt_printf(txt, ";rrset%s " ARG_LL "d %u %u %d %d\n", (k->rk.flags & PACKED_RRSET_NSEC_AT_APEX)?" nsec_apex":"", (long long)(d->ttl - now), (unsigned)d->count, (unsigned)d->rrsig_count, (int)d->trust, (int)d->security - )) - return 0; + ); for(i=0; i<d->count + d->rrsig_count; i++) { - if(!dump_rrset_line(ssl, k, now, i)) + dump_rrset_line(txt, k, now, i); + } +} + +/** Spool strlist to the output. */ +static int +spool_strlist(RES* ssl, struct config_strlist* list) +{ + struct config_strlist* s; + for(s=list; s; s=s->next) { + if(!ssl_printf(ssl, "%s", s->str)) return 0; } return 1; } -/** dump lruhash rrset cache */ +/** dump lruhash cache and call callback for every item. */ static int -dump_rrset_lruhash(RES* ssl, struct lruhash* h, time_t now) +dump_lruhash(struct lruhash* table, + void (*func)(struct lruhash_entry*, struct config_strlist_head*, void*), + RES* ssl, void* arg) { - struct lruhash_entry* e; - /* lruhash already locked by caller */ - /* walk in order of lru; best first */ - for(e=h->lru_start; e; e = e->lru_next) { - lock_rw_rdlock(&e->lock); - if(!dump_rrset(ssl, (struct ub_packed_rrset_key*)e->key, - (struct packed_rrset_data*)e->data, now)) { - lock_rw_unlock(&e->lock); + int just_started = 1; + int not_done = 1; + hashvalue_type hash; + size_t num = 0; /* number of entries processed. */ + size_t max = 2; /* number of entries after which it unlocks. */ + struct config_strlist_head txt; /* Text strings spooled. */ + memset(&txt, 0, sizeof(txt)); + + while(not_done) { + size_t i; /* hash bin. */ + /* Process a number of items. */ + num = 0; + lock_quick_lock(&table->lock); + if(just_started) { + i = 0; + } else { + i = hash&table->size_mask; + } + while(num < max) { + /* Process bin. */ + int found = 0; + size_t num_bin = 0; + struct lruhash_bin* bin = &table->array[i]; + struct lruhash_entry* e; + lock_quick_lock(&bin->lock); + for(e = bin->overflow_list; e; e = e->overflow_next) { + /* Entry e is locked by the func. */ + func(e, &txt, arg); + num_bin++; + } + lock_quick_unlock(&bin->lock); + /* This addition of bin number of entries may take + * it over the max. */ + num += num_bin; + + /* Move to next bin. */ + /* Find one with an entry, with a hash value, so we + * can continue from the hash value. The hash value + * can be indexed also if the array changes size. */ + i++; + while(i < table->size) { + bin = &table->array[i]; + lock_quick_lock(&bin->lock); + if(bin->overflow_list) { + hash = bin->overflow_list->hash; + lock_quick_unlock(&bin->lock); + found = 1; + just_started = 0; + break; + } + lock_quick_unlock(&bin->lock); + i++; + } + if(!found) { + not_done = 0; + break; + } + } + lock_quick_unlock(&table->lock); + /* Print the spooled items, that are collected while the + * locks are locked. The print happens while they are not + * locked. */ + if(txt.first) { + if(!spool_strlist(ssl, txt.first)) { + config_delstrlist(txt.first); + return 0; + } + config_delstrlist(txt.first); + memset(&txt, 0, sizeof(txt)); + } + } + /* Print the final spooled items. */ + if(txt.first) { + if(!spool_strlist(ssl, txt.first)) { + config_delstrlist(txt.first); return 0; } - lock_rw_unlock(&e->lock); + config_delstrlist(txt.first); + } + return 1; +} + +/** dump slabhash cache and call callback for every item. */ +static int +dump_slabhash(struct slabhash* sh, + void (*func)(struct lruhash_entry*, struct config_strlist_head*, void*), + RES* ssl, void* arg) +{ + /* Process a number of items at a time, then unlock the cache, + * so that ordinary processing can continue. Keep an iteration marker + * to continue the loop. That means the cache can change, items + * could be inserted and deleted. And, for example, the hash table + * can grow. */ + size_t slab; + for(slab=0; slab<sh->size; slab++) { + if(!dump_lruhash(sh->array[slab], func, ssl, arg)) + return 0; } return 1; } +/** Struct for dump information. */ +struct dump_info { + /** The worker. */ + struct worker* worker; + /** The printout connection. */ + RES* ssl; +}; + +/** Dump the rrset cache entry */ +static void +dump_rrset_entry(struct lruhash_entry* e, struct config_strlist_head* txt, + void* arg) +{ + struct dump_info* dump_info = (struct dump_info*)arg; + lock_rw_rdlock(&e->lock); + dump_rrset(txt, (struct ub_packed_rrset_key*)e->key, + (struct packed_rrset_data*)e->data, + *dump_info->worker->env.now); + lock_rw_unlock(&e->lock); +} + /** dump rrset cache */ static int dump_rrset_cache(RES* ssl, struct worker* worker) { struct rrset_cache* r = worker->env.rrset_cache; - size_t slab; + struct dump_info dump_info; + dump_info.worker = worker; + dump_info.ssl = ssl; if(!ssl_printf(ssl, "START_RRSET_CACHE\n")) return 0; - for(slab=0; slab<r->table.size; slab++) { - lock_quick_lock(&r->table.array[slab]->lock); - if(!dump_rrset_lruhash(ssl, r->table.array[slab], - *worker->env.now)) { - lock_quick_unlock(&r->table.array[slab]->lock); - return 0; - } - lock_quick_unlock(&r->table.array[slab]->lock); - } + if(!dump_slabhash(&r->table, &dump_rrset_entry, ssl, &dump_info)) + return 0; return ssl_printf(ssl, "END_RRSET_CACHE\n"); } /** dump message to rrset reference */ -static int -dump_msg_ref(RES* ssl, struct ub_packed_rrset_key* k) +static void +dump_msg_ref(struct config_strlist_head* txt, struct ub_packed_rrset_key* k) { char* nm, *tp, *cl; nm = sldns_wire2str_dname(k->rk.dname, k->rk.dname_len); @@ -149,30 +296,25 @@ dump_msg_ref(RES* ssl, struct ub_packed_rrset_key* k) free(nm); free(tp); free(cl); - return ssl_printf(ssl, "BADREF\n"); - } - if(!ssl_printf(ssl, "%s %s %s %d\n", nm, cl, tp, (int)k->rk.flags)) { - free(nm); - free(tp); - free(cl); - return 0; + spool_txt_string(txt, "BADREF\n"); + return; } + spool_txt_printf(txt, "%s %s %s %d\n", nm, cl, tp, (int)k->rk.flags); free(nm); free(tp); free(cl); - - return 1; } /** dump message entry */ -static int -dump_msg(RES* ssl, struct query_info* k, struct reply_info* d, time_t now) +static void +dump_msg(struct config_strlist_head* txt, struct query_info* k, + struct reply_info* d, time_t now) { size_t i; char* nm, *tp, *cl; - if(!k || !d) return 1; - if(d->ttl < now) return 1; /* expired */ - + if(!k || !d) return; + if(d->ttl < now) return; /* expired */ + nm = sldns_wire2str_dname(k->qname, k->qname_len); tp = sldns_wire2str_type(k->qtype); cl = sldns_wire2str_class(k->qclass); @@ -180,45 +322,35 @@ dump_msg(RES* ssl, struct query_info* k, struct reply_info* d, time_t now) free(nm); free(tp); free(cl); - return 1; /* skip this entry */ + return; /* skip this entry */ } if(!rrset_array_lock(d->ref, d->rrset_count, now)) { /* rrsets have timed out or do not exist */ free(nm); free(tp); free(cl); - return 1; /* skip this entry */ + return; /* skip this entry */ } - + /* meta line */ - if(!ssl_printf(ssl, "msg %s %s %s %d %d " ARG_LL "d %d %u %u %u %d %s\n", - nm, cl, tp, - (int)d->flags, (int)d->qdcount, - (long long)(d->ttl-now), (int)d->security, - (unsigned)d->an_numrrsets, - (unsigned)d->ns_numrrsets, - (unsigned)d->ar_numrrsets, - (int)d->reason_bogus, - d->reason_bogus_str?d->reason_bogus_str:"")) { - free(nm); - free(tp); - free(cl); - rrset_array_unlock(d->ref, d->rrset_count); - return 0; - } + spool_txt_printf(txt, + "msg %s %s %s %d %d " ARG_LL "d %d %u %u %u %d %s\n", + nm, cl, tp, + (int)d->flags, (int)d->qdcount, + (long long)(d->ttl-now), (int)d->security, + (unsigned)d->an_numrrsets, + (unsigned)d->ns_numrrsets, + (unsigned)d->ar_numrrsets, + (int)d->reason_bogus, + d->reason_bogus_str?d->reason_bogus_str:""); free(nm); free(tp); free(cl); for(i=0; i<d->rrset_count; i++) { - if(!dump_msg_ref(ssl, d->rrsets[i])) { - rrset_array_unlock(d->ref, d->rrset_count); - return 0; - } + dump_msg_ref(txt, d->rrsets[i]); } rrset_array_unlock(d->ref, d->rrset_count); - - return 1; } /** copy msg to worker pad */ @@ -247,49 +379,40 @@ copy_msg(struct regional* region, struct lruhash_entry* e, return (*k)->qname != NULL; } -/** dump lruhash msg cache */ -static int -dump_msg_lruhash(RES* ssl, struct worker* worker, struct lruhash* h) +/** Dump the msg entry. */ +static void +dump_msg_entry(struct lruhash_entry* e, struct config_strlist_head* txt, + void* arg) { - struct lruhash_entry* e; + struct dump_info* dump_info = (struct dump_info*)arg; struct query_info* k; struct reply_info* d; - /* lruhash already locked by caller */ - /* walk in order of lru; best first */ - for(e=h->lru_start; e; e = e->lru_next) { - regional_free_all(worker->scratchpad); - lock_rw_rdlock(&e->lock); - /* make copy of rrset in worker buffer */ - if(!copy_msg(worker->scratchpad, e, &k, &d)) { - lock_rw_unlock(&e->lock); - return 0; - } + regional_free_all(dump_info->worker->scratchpad); + /* Make copy of rrset in worker buffer. */ + lock_rw_rdlock(&e->lock); + if(!copy_msg(dump_info->worker->scratchpad, e, &k, &d)) { lock_rw_unlock(&e->lock); - /* release lock so we can lookup the rrset references - * in the rrset cache */ - if(!dump_msg(ssl, k, d, *worker->env.now)) { - return 0; - } + log_err("out of memory in dump_msg_entry"); + return; } - return 1; + lock_rw_unlock(&e->lock); + /* Release lock so we can lookup the rrset references + * in the rrset cache. */ + dump_msg(txt, k, d, *dump_info->worker->env.now); } /** dump msg cache */ static int dump_msg_cache(RES* ssl, struct worker* worker) { - struct slabhash* sh = worker->env.msg_cache; - size_t slab; + struct dump_info dump_info; + dump_info.worker = worker; + dump_info.ssl = ssl; if(!ssl_printf(ssl, "START_MSG_CACHE\n")) return 0; - for(slab=0; slab<sh->size; slab++) { - lock_quick_lock(&sh->array[slab]->lock); - if(!dump_msg_lruhash(ssl, worker, sh->array[slab])) { - lock_quick_unlock(&sh->array[slab]->lock); - return 0; - } - lock_quick_unlock(&sh->array[slab]->lock); - } + if(!dump_slabhash(worker->env.msg_cache, &dump_msg_entry, ssl, + &dump_info)) + return 0; return ssl_printf(ssl, "END_MSG_CACHE\n"); } @@ -811,12 +934,18 @@ print_dp_main(RES* ssl, struct delegpt* dp, struct dns_msg* msg) struct ub_packed_rrset_key* k = msg->rep->rrsets[i]; struct packed_rrset_data* d = (struct packed_rrset_data*)k->entry.data; + struct config_strlist_head txt; + memset(&txt, 0, sizeof(txt)); if(d->security == sec_status_bogus) { if(!ssl_printf(ssl, "Address is BOGUS:\n")) return; } - if(!dump_rrset(ssl, k, d, 0)) + dump_rrset(&txt, k, d, 0); + if(!spool_strlist(ssl, txt.first)) { + config_delstrlist(txt.first); return; + } + config_delstrlist(txt.first); } delegpt_count_ns(dp, &n_ns, &n_miss); delegpt_count_addr(dp, &n_addr, &n_res, &n_avail); diff --git a/contrib/unbound/daemon/remote.c b/contrib/unbound/daemon/remote.c index 89134efc92a8..e10dadde7862 100644 --- a/contrib/unbound/daemon/remote.c +++ b/contrib/unbound/daemon/remote.c @@ -101,6 +101,10 @@ #ifdef USE_CACHEDB #include "cachedb/cachedb.h" #endif +#ifdef CLIENT_SUBNET +#include "edns-subnet/subnetmod.h" +#include "edns-subnet/addrtree.h" +#endif #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> @@ -1148,6 +1152,8 @@ print_ext(RES* ssl, struct ub_stats_info* s, int inhibit_zero) (unsigned long)s->svr.ans_bogus)) return 0; if(!ssl_printf(ssl, "num.rrset.bogus"SQ"%lu\n", (unsigned long)s->svr.rrset_bogus)) return 0; + if(!ssl_printf(ssl, "num.valops"SQ"%lu\n", + (unsigned long)s->svr.val_ops)) return 0; if(!ssl_printf(ssl, "num.query.aggressive.NOERROR"SQ"%lu\n", (unsigned long)s->svr.num_neg_cache_noerror)) return 0; if(!ssl_printf(ssl, "num.query.aggressive.NXDOMAIN"SQ"%lu\n", @@ -1576,7 +1582,7 @@ do_view_zone_add(RES* ssl, struct worker* worker, char* arg) } if(!v->isfirst) { /* Global local-zone is not used for this view, - * therefore add defaults to this view-specic + * therefore add defaults to this view-specific * local-zone. */ struct config_file lz_cfg; memset(&lz_cfg, 0, sizeof(lz_cfg)); @@ -1740,6 +1746,334 @@ do_view_datas_remove(struct daemon_remote* rc, RES* ssl, struct worker* worker, (void)ssl_printf(ssl, "removed %d datas\n", num); } +/** information for the domain search */ +struct cache_lookup_info { + /** The connection to print on. */ + RES* ssl; + /** The worker. */ + struct worker* worker; + /** The domain, in wireformat. */ + uint8_t* nm; + /** The length of nm. */ + size_t nmlen; +}; + +#ifdef CLIENT_SUBNET +static void addrtree_traverse_visit_node(struct addrnode* n, addrkey_t* addr, + size_t addr_size, int is_ipv6, time_t now, struct query_info* q, + void (*func)(struct query_info*, struct reply_info*, addrkey_t*, + size_t, int, addrlen_t, int, time_t, void*), void* arg); + +/** Lookup in subnet addrtree */ +static void +cache_lookup_subnet_addrnode(struct query_info* q, struct reply_info* d, + addrkey_t* addr, size_t addr_size, int is_ipv6, addrlen_t scope, + int only_match_scope_zero, time_t ttl, void* arg) +{ + size_t i; + char s[65535], tp[32], cl[32], rc[32], fg[32], astr[64]; + struct cache_lookup_info* inf = (struct cache_lookup_info*)arg; + if(is_ipv6) { + if(addr_size < 16 || inet_ntop(AF_INET6, addr, astr, + sizeof(astr)) == NULL) + snprintf(astr, sizeof(astr), "(inet6ntoperror)"); + } else { + if(addr_size < 4 || inet_ntop(AF_INET, addr, astr, + sizeof(astr)) == NULL) + snprintf(astr, sizeof(astr), "(inetntoperror)"); + } + sldns_wire2str_dname_buf(q->qname, q->qname_len, s, sizeof(s)); + sldns_wire2str_type_buf(q->qtype, tp, sizeof(tp)); + sldns_wire2str_class_buf(q->qclass, cl, sizeof(cl)); + sldns_wire2str_rcode_buf(FLAGS_GET_RCODE(d->flags), + rc, sizeof(rc)); + snprintf(fg, sizeof(fg), "%s%s%s%s%s%s%s%s", + ((d->flags&BIT_QR)?" QR":""), + ((d->flags&BIT_AA)?" AA":""), + ((d->flags&BIT_TC)?" TC":""), + ((d->flags&BIT_RD)?" RD":""), + ((d->flags&BIT_RA)?" RA":""), + ((d->flags&BIT_Z)?" Z":""), + ((d->flags&BIT_AD)?" AD":""), + ((d->flags&BIT_CD)?" CD":"")); + if(!rrset_array_lock(d->ref, d->rrset_count, + *inf->worker->env.now)) { + /* rrsets have timed out or do not exist */ + return; + } + if(!ssl_printf(inf->ssl, "subnet %s/%d%s %s %s %s " ARG_LL "d\n", astr, + (int)scope, (only_match_scope_zero?" scope_zero":""), + s, cl, tp, (long long)(ttl-*inf->worker->env.now))) { + rrset_array_unlock(d->ref, d->rrset_count); + return; + } + ssl_printf(inf->ssl, + "subnet msg %s %s %s%s %s %d %d " ARG_LL "d %d %u %u %u %d %s\n", + s, cl, tp, fg, rc, + (int)d->flags, (int)d->qdcount, + (long long)(d->ttl-*inf->worker->env.now), + (int)d->security, + (unsigned)d->an_numrrsets, + (unsigned)d->ns_numrrsets, + (unsigned)d->ar_numrrsets, + (int)d->reason_bogus, + d->reason_bogus_str?d->reason_bogus_str:""); + for(i=0; i<d->rrset_count; i++) { + struct ub_packed_rrset_key* rk = d->rrsets[i]; + struct packed_rrset_data* rd = (struct packed_rrset_data*)rk->entry.data; + size_t j; + for(j=0; j<rd->count + rd->rrsig_count; j++) { + if(!packed_rr_to_string(rk, j, + *inf->worker->env.now, s, sizeof(s))) { + ssl_printf(inf->ssl, "BADRR\n"); + } else { + ssl_printf(inf->ssl, "%s", s); + } + } + } + rrset_array_unlock(d->ref, d->rrset_count); + ssl_printf(inf->ssl, "\n"); +} + +/** Visit an edge in subnet addrtree traverse */ +static void +addrtree_traverse_visit_edge(struct addredge* edge, addrkey_t* addr, + size_t addr_size, int is_ipv6, time_t now, struct query_info* q, + void (*func)(struct query_info*, struct reply_info*, addrkey_t*, + size_t, int, addrlen_t, int, time_t, void*), void* arg) +{ + size_t n; + addrlen_t addrlen; + if(!edge || !edge->node) + return; + addrlen = edge->len; + /* ceil() */ + n = (size_t)((addrlen / KEYWIDTH) + ((addrlen % KEYWIDTH != 0)?1:0)); + if(n > addr_size) + n = addr_size; + memset(addr, 0, addr_size); + memcpy(addr, edge->str, n); + addrtree_traverse_visit_node(edge->node, addr, addr_size, is_ipv6, + now, q, func, arg); +} + +/** Visit a node in subnet addrtree traverse */ +static void +addrtree_traverse_visit_node(struct addrnode* n, addrkey_t* addr, + size_t addr_size, int is_ipv6, time_t now, struct query_info* q, + void (*func)(struct query_info*, struct reply_info*, addrkey_t*, + size_t, int, addrlen_t, int, time_t, void*), void* arg) +{ + /* If this node has data, and not expired. */ + if(n->elem && n->ttl >= now) { + func(q, (struct reply_info*)n->elem, addr, addr_size, is_ipv6, + n->scope, n->only_match_scope_zero, n->ttl, arg); + } + /* Traverse edges. */ + addrtree_traverse_visit_edge(n->edge[0], addr, addr_size, is_ipv6, + now, q, func, arg); + addrtree_traverse_visit_edge(n->edge[1], addr, addr_size, is_ipv6, + now, q, func, arg); +} + +/** Traverse subnet addrtree */ +static void +addrtree_traverse(struct addrtree* tree, int is_ipv6, time_t now, + struct query_info* q, + void (*func)(struct query_info*, struct reply_info*, addrkey_t*, + size_t, int, addrlen_t, int, time_t, void*), void* arg) +{ + uint8_t addr[16]; /* Large enough for IPv4 and IPv6. */ + memset(addr, 0, sizeof(addr)); + addrtree_traverse_visit_node(tree->root, (addrkey_t*)addr, + sizeof(addr), is_ipv6, now, q, func, arg); +} + +/** Lookup cache_lookup for subnet content. */ +static void +cache_lookup_subnet_msg(struct lruhash_entry* e, void* arg) +{ + struct cache_lookup_info* inf = (struct cache_lookup_info*)arg; + struct msgreply_entry *k = (struct msgreply_entry*)e->key; + struct subnet_msg_cache_data* d = + (struct subnet_msg_cache_data*)e->data; + if(!dname_subdomain_c(k->key.qname, inf->nm)) + return; + + if(d->tree4) { + addrtree_traverse(d->tree4, 0, *inf->worker->env.now, &k->key, + &cache_lookup_subnet_addrnode, inf); + } + if(d->tree6) { + addrtree_traverse(d->tree6, 1, *inf->worker->env.now, &k->key, + &cache_lookup_subnet_addrnode, inf); + } +} +#endif /* CLIENT_SUBNET */ + +static void +cache_lookup_rrset(struct lruhash_entry* e, void* arg) +{ + struct cache_lookup_info* inf = (struct cache_lookup_info*)arg; + struct ub_packed_rrset_key* k = (struct ub_packed_rrset_key*)e->key; + struct packed_rrset_data* d = (struct packed_rrset_data*)e->data; + if(*inf->worker->env.now < d->ttl && + k->id != 0 && /* not deleted */ + dname_subdomain_c(k->rk.dname, inf->nm)) { + size_t i; + for(i=0; i<d->count + d->rrsig_count; i++) { + char s[65535]; + if(!packed_rr_to_string(k, i, *inf->worker->env.now, + s, sizeof(s))) { + ssl_printf(inf->ssl, "BADRR\n"); + return; + } + ssl_printf(inf->ssl, "%s", s); + } + ssl_printf(inf->ssl, "\n"); + } +} + +static void +cache_lookup_msg(struct lruhash_entry* e, void* arg) +{ + struct cache_lookup_info* inf = (struct cache_lookup_info*)arg; + struct msgreply_entry* k = (struct msgreply_entry*)e->key; + struct reply_info* d = (struct reply_info*)e->data; + if(*inf->worker->env.now < d->ttl && + dname_subdomain_c(k->key.qname, inf->nm)) { + size_t i; + char s[65535], tp[32], cl[32], rc[32], fg[32]; + sldns_wire2str_dname_buf(k->key.qname, k->key.qname_len, + s, sizeof(s)); + sldns_wire2str_type_buf(k->key.qtype, tp, sizeof(tp)); + sldns_wire2str_class_buf(k->key.qclass, cl, sizeof(cl)); + sldns_wire2str_rcode_buf(FLAGS_GET_RCODE(d->flags), + rc, sizeof(rc)); + snprintf(fg, sizeof(fg), "%s%s%s%s%s%s%s%s", + ((d->flags&BIT_QR)?" QR":""), + ((d->flags&BIT_AA)?" AA":""), + ((d->flags&BIT_TC)?" TC":""), + ((d->flags&BIT_RD)?" RD":""), + ((d->flags&BIT_RA)?" RA":""), + ((d->flags&BIT_Z)?" Z":""), + ((d->flags&BIT_AD)?" AD":""), + ((d->flags&BIT_CD)?" CD":"")); + if(!rrset_array_lock(d->ref, d->rrset_count, + *inf->worker->env.now)) { + /* rrsets have timed out or do not exist */ + return; + } + ssl_printf(inf->ssl, + "msg %s %s %s%s %s %d %d " ARG_LL "d %d %u %u %u %d %s\n", + s, cl, tp, fg, rc, + (int)d->flags, (int)d->qdcount, + (long long)(d->ttl-*inf->worker->env.now), + (int)d->security, + (unsigned)d->an_numrrsets, + (unsigned)d->ns_numrrsets, + (unsigned)d->ar_numrrsets, + (int)d->reason_bogus, + d->reason_bogus_str?d->reason_bogus_str:""); + for(i=0; i<d->rrset_count; i++) { + struct ub_packed_rrset_key* rk = d->rrsets[i]; + struct packed_rrset_data* rd = (struct packed_rrset_data*)rk->entry.data; + size_t j; + for(j=0; j<rd->count + rd->rrsig_count; j++) { + if(!packed_rr_to_string(rk, j, + *inf->worker->env.now, s, sizeof(s))) { + rrset_array_unlock(d->ref, d->rrset_count); + ssl_printf(inf->ssl, "BADRR\n"); + return; + } + ssl_printf(inf->ssl, "%s", s); + } + } + rrset_array_unlock(d->ref, d->rrset_count); + ssl_printf(inf->ssl, "\n"); + } +} + +/** perform cache search for domain */ +static void +do_cache_lookup_domain(RES* ssl, struct worker* worker, uint8_t* nm, + size_t nmlen) +{ +#ifdef CLIENT_SUBNET + int m; + struct subnet_env* sn_env = NULL; +#endif /* CLIENT_SUBNET */ + struct cache_lookup_info inf; + inf.ssl = ssl; + inf.worker = worker; + inf.nm = nm; + inf.nmlen = nmlen; + +#ifdef CLIENT_SUBNET + m = modstack_find(worker->env.modstack, "subnetcache"); + if(m != -1) sn_env = (struct subnet_env*)worker->env.modinfo[m]; + if(sn_env) { + lock_rw_rdlock(&sn_env->biglock); + slabhash_traverse(sn_env->subnet_msg_cache, 0, + &cache_lookup_subnet_msg, &inf); + lock_rw_unlock(&sn_env->biglock); + } +#endif /* CLIENT_SUBNET */ + + slabhash_traverse(&worker->env.rrset_cache->table, 0, + &cache_lookup_rrset, &inf); + slabhash_traverse(worker->env.msg_cache, 0, &cache_lookup_msg, &inf); +} + +/** cache lookup of domain */ +static void +do_cache_lookup(RES* ssl, struct worker* worker, char* arg) +{ + uint8_t nm[LDNS_MAX_DOMAINLEN+1]; + size_t nmlen; + int status; + char* s = arg, *next = NULL; + int allow_long = 0; + + if(arg[0] == '+' && arg[1] == 't' && (arg[2]==' ' || arg[2]=='\t')) { + allow_long = 1; + s = arg+2; + } + + /* Find the commandline arguments of domains. */ + while(s && *s != 0) { + s = skipwhite(s); + if(*s == 0) + break; + if(strchr(s, ' ') || strchr(s, '\t')) { + char* sp = strchr(s, ' '); + if(strchr(s, '\t') != 0 && strchr(s, '\t') < sp) + sp = strchr(s, '\t'); + *sp = 0; + next = sp+1; + } else { + next = NULL; + } + + nmlen = sizeof(nm); + status = sldns_str2wire_dname_buf(s, nm, &nmlen); + if(status != 0) { + ssl_printf(ssl, "error cannot parse name %s at %d: %s\n", s, + LDNS_WIREPARSE_OFFSET(status), + sldns_get_errorstr_parse(status)); + return; + } + if(!allow_long && dname_count_labels(nm) < 3) { + ssl_printf(ssl, "error name too short: '%s'. Need example.com. or longer, short names take very long, use +t to allow them.\n", s); + return; + } + + do_cache_lookup_domain(ssl, worker, nm, nmlen); + + s = next; + } +} + /** cache lookup of nameservers */ static void do_lookup(RES* ssl, struct worker* worker, char* arg) @@ -2887,10 +3221,13 @@ do_auth_zone_reload(RES* ssl, struct worker* worker, char* arg) (void)ssl_printf(ssl, "error: no SOA in zone after read %s\n", arg); return; } - if(xfr->have_zone) + if(xfr->have_zone) { xfr->lease_time = *worker->env.now; + xfr->soa_zone_acquired = *worker->env.now; + } lock_basic_unlock(&xfr->lock); } + z->soa_zone_acquired = *worker->env.now; auth_zone_verify_zonemd(z, &worker->env, &worker->env.mesh->mods, &reason, 0, 0); @@ -3039,7 +3376,7 @@ static void do_list_auth_zones(RES* ssl, struct auth_zones* az) { struct auth_zone* z; - char buf[LDNS_MAX_DOMAINLEN], buf2[256]; + char buf[LDNS_MAX_DOMAINLEN], buf2[256], buf3[256]; lock_rw_rdlock(&az->lock); RBTREE_FOR(z, struct auth_zone*, &az->ztree) { lock_rw_rdlock(&z->lock); @@ -3048,18 +3385,41 @@ do_list_auth_zones(RES* ssl, struct auth_zones* az) snprintf(buf2, sizeof(buf2), "expired"); else { uint32_t serial = 0; - if(auth_zone_get_serial(z, &serial)) + if(auth_zone_get_serial(z, &serial)) { snprintf(buf2, sizeof(buf2), "serial %u", (unsigned)serial); - else snprintf(buf2, sizeof(buf2), "no serial"); + if(z->soa_zone_acquired != 0) { +#if defined(HAVE_STRFTIME) && defined(HAVE_LOCALTIME_R) + char tmbuf[32]; + struct tm tm; + struct tm *tm_p; + tm_p = localtime_r( + &z->soa_zone_acquired, &tm); + if(!strftime(tmbuf, sizeof(tmbuf), "%Y-%m-%dT%H:%M:%S", tm_p)) + snprintf(tmbuf, sizeof(tmbuf), "strftime-err-%u", (unsigned)z->soa_zone_acquired); + snprintf(buf3, sizeof(buf3), + "\t since %u %s", + (unsigned)z->soa_zone_acquired, + tmbuf); +#else + snprintf(buf3, sizeof(buf3), + "\t since %u", + (unsigned)z->soa_zone_acquired); +#endif + } else { + buf3[0]=0; + } + } else { + snprintf(buf2, sizeof(buf2), "no serial"); + buf3[0]=0; + } } - if(!ssl_printf(ssl, "%s\t%s\n", buf, buf2)) { + lock_rw_unlock(&z->lock); + if(!ssl_printf(ssl, "%s\t%s%s\n", buf, buf2, buf3)) { /* failure to print */ - lock_rw_unlock(&z->lock); lock_rw_unlock(&az->lock); return; } - lock_rw_unlock(&z->lock); } lock_rw_unlock(&az->lock); } @@ -3502,6 +3862,30 @@ do_print_cookie_secrets(RES* ssl, struct worker* worker) { explicit_bzero(secret_hex, sizeof(secret_hex)); } +/** check that there is no argument after a command that takes no arguments. */ +static int +cmd_no_args(RES* ssl, char* cmd, char* p) +{ + if(p && *p != 0) { + /* cmd contains the command that is called at the start, + * with space or tab after it. */ + char* c = cmd; + if(strchr(c, ' ') && strchr(c, '\t')) { + if(strchr(c, ' ') < strchr(c, '\t')) + *strchr(c, ' ')=0; + else *strchr(c, '\t')=0; + } else if(strchr(c, ' ')) { + *strchr(c, ' ')=0; + } else if(strchr(c, '\t')) { + *strchr(c, '\t')=0; + } + (void)ssl_printf(ssl, "error command %s takes no arguments," + " have '%s'\n", c, p); + return 1; + } + return 0; +} + /** check for name with end-of-string, space or tab after it */ static int cmdcmp(char* p, const char* cmd, size_t len) @@ -3517,27 +3901,41 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, char* p = skipwhite(cmd); /* compare command */ if(cmdcmp(p, "stop", 4)) { + if(cmd_no_args(ssl, p, skipwhite(p+4))) + return; do_stop(ssl, worker); return; } else if(cmdcmp(p, "reload_keep_cache", 17)) { + if(cmd_no_args(ssl, p, skipwhite(p+17))) + return; do_reload(ssl, worker, 1); return; } else if(cmdcmp(p, "reload", 6)) { + if(cmd_no_args(ssl, p, skipwhite(p+6))) + return; do_reload(ssl, worker, 0); return; } else if(cmdcmp(p, "fast_reload", 11)) { do_fast_reload(ssl, worker, s, skipwhite(p+11)); return; } else if(cmdcmp(p, "stats_noreset", 13)) { + if(cmd_no_args(ssl, p, skipwhite(p+13))) + return; do_stats(ssl, worker, 0); return; } else if(cmdcmp(p, "stats", 5)) { + if(cmd_no_args(ssl, p, skipwhite(p+5))) + return; do_stats(ssl, worker, 1); return; } else if(cmdcmp(p, "status", 6)) { + if(cmd_no_args(ssl, p, skipwhite(p+6))) + return; do_status(ssl, worker); return; } else if(cmdcmp(p, "dump_cache", 10)) { + if(cmd_no_args(ssl, p, skipwhite(p+10))) + return; #ifdef THREADS_DISABLED if(worker->daemon->num > 1) { (void)ssl_printf(ssl, "dump_cache/load_cache is not " @@ -3548,6 +3946,8 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, (void)dump_cache(ssl, worker); return; } else if(cmdcmp(p, "load_cache", 10)) { + if(cmd_no_args(ssl, p, skipwhite(p+10))) + return; #ifdef THREADS_DISABLED if(worker->daemon->num > 1) { /* The warning can't be printed when stdin is sending @@ -3558,18 +3958,28 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, if(load_cache(ssl, worker)) send_ok(ssl); return; } else if(cmdcmp(p, "list_forwards", 13)) { + if(cmd_no_args(ssl, p, skipwhite(p+13))) + return; do_list_forwards(ssl, worker); return; } else if(cmdcmp(p, "list_stubs", 10)) { + if(cmd_no_args(ssl, p, skipwhite(p+10))) + return; do_list_stubs(ssl, worker); return; } else if(cmdcmp(p, "list_insecure", 13)) { + if(cmd_no_args(ssl, p, skipwhite(p+13))) + return; do_insecure_list(ssl, worker); return; } else if(cmdcmp(p, "list_local_zones", 16)) { + if(cmd_no_args(ssl, p, skipwhite(p+16))) + return; do_list_local_zones(ssl, worker->daemon->local_zones); return; } else if(cmdcmp(p, "list_local_data", 15)) { + if(cmd_no_args(ssl, p, skipwhite(p+15))) + return; do_list_local_data(ssl, worker, worker->daemon->local_zones); return; } else if(cmdcmp(p, "view_list_local_zones", 21)) { @@ -3585,6 +3995,8 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, do_ip_ratelimit_list(ssl, worker, p+17); return; } else if(cmdcmp(p, "list_auth_zones", 15)) { + if(cmd_no_args(ssl, p, skipwhite(p+15))) + return; do_list_auth_zones(ssl, worker->env.auth_zones); return; } else if(cmdcmp(p, "auth_zone_reload", 16)) { @@ -3605,14 +4017,21 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, return; } else if(cmdcmp(p, "flush_stats", 11)) { /* must always distribute this cmd */ + if(cmd_no_args(ssl, p, skipwhite(p+11))) + return; if(rc) distribute_cmd(rc, ssl, cmd); do_flush_stats(ssl, worker); return; } else if(cmdcmp(p, "flush_requestlist", 17)) { /* must always distribute this cmd */ + if(cmd_no_args(ssl, p, skipwhite(p+17))) + return; if(rc) distribute_cmd(rc, ssl, cmd); do_flush_requestlist(ssl, worker); return; + } else if(cmdcmp(p, "cache_lookup", 12)) { + do_cache_lookup(ssl, worker, skipwhite(p+12)); + return; } else if(cmdcmp(p, "lookup", 6)) { do_lookup(ssl, worker, skipwhite(p+6)); return; @@ -3620,15 +4039,23 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, * Each line needs to be distributed if THREADS_DISABLED. */ } else if(cmdcmp(p, "local_zones_remove", 18)) { + if(cmd_no_args(ssl, p, skipwhite(p+18))) + return; do_zones_remove(rc, ssl, worker); return; } else if(cmdcmp(p, "local_zones", 11)) { + if(cmd_no_args(ssl, p, skipwhite(p+11))) + return; do_zones_add(rc, ssl, worker); return; } else if(cmdcmp(p, "local_datas_remove", 18)) { + if(cmd_no_args(ssl, p, skipwhite(p+18))) + return; do_datas_remove(rc, ssl, worker); return; } else if(cmdcmp(p, "local_datas", 11)) { + if(cmd_no_args(ssl, p, skipwhite(p+11))) + return; do_datas_add(rc, ssl, worker); return; } else if(cmdcmp(p, "view_local_datas_remove", 23)){ @@ -3638,6 +4065,8 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, do_view_datas_add(rc, ssl, worker, skipwhite(p+16)); return; } else if(cmdcmp(p, "print_cookie_secrets", 20)) { + if(cmd_no_args(ssl, p, skipwhite(p+20))) + return; do_print_cookie_secrets(ssl, worker); return; } @@ -3687,10 +4116,16 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, } else if(cmdcmp(p, "flush", 5)) { do_flush_name(ssl, worker, skipwhite(p+5)); } else if(cmdcmp(p, "dump_requestlist", 16)) { + if(cmd_no_args(ssl, p, skipwhite(p+16))) + return; do_dump_requestlist(ssl, worker); } else if(cmdcmp(p, "dump_infra", 10)) { + if(cmd_no_args(ssl, p, skipwhite(p+10))) + return; do_dump_infra(ssl, worker); } else if(cmdcmp(p, "log_reopen", 10)) { + if(cmd_no_args(ssl, p, skipwhite(p+10))) + return; do_log_reopen(ssl, worker); } else if(cmdcmp(p, "set_option", 10)) { do_set_option(ssl, worker, skipwhite(p+10)); @@ -3707,8 +4142,12 @@ execute_cmd(struct daemon_remote* rc, struct rc_state* s, RES* ssl, char* cmd, } else if(cmdcmp(p, "add_cookie_secret", 17)) { do_add_cookie_secret(ssl, worker, skipwhite(p+17)); } else if(cmdcmp(p, "drop_cookie_secret", 18)) { + if(cmd_no_args(ssl, p, skipwhite(p+18))) + return; do_drop_cookie_secret(ssl, worker); } else if(cmdcmp(p, "activate_cookie_secret", 22)) { + if(cmd_no_args(ssl, p, skipwhite(p+22))) + return; do_activate_cookie_secret(ssl, worker); } else { (void)ssl_printf(ssl, "error unknown command '%s'\n", p); @@ -4348,37 +4787,45 @@ fr_check_tag_defines(struct fast_reload_thread* fr, struct config_file* newcfg) return 1; } -/** fast reload thread, check if config item has changed, if not add to - * the explanatory string. */ +/** fast reload thread, add incompatible option to the explanatory string */ static void -fr_check_changed_cfg(int cmp, const char* desc, char* str, size_t len) +fr_add_incompatible_option(const char* desc, char* str, size_t len) { - if(cmp) { - size_t slen = strlen(str); - size_t desclen = strlen(desc); - if(slen == 0) { - snprintf(str, len, "%s", desc); - return; - } - if(len - slen < desclen+2) - return; /* It does not fit */ - snprintf(str+slen, len-slen, " %s", desc); + size_t slen = strlen(str); + size_t desclen = strlen(desc); + if(slen == 0) { + snprintf(str, len, "%s", desc); + return; } + if(len - slen < desclen+2) + return; /* It does not fit */ + snprintf(str+slen, len-slen, " %s", desc); } +/** fast reload thread, check if config item has changed; thus incompatible */ +#define FR_CHECK_CHANGED_CFG(desc, var, str) \ +do { \ + if(cfg->var != newcfg->var) { \ + fr_add_incompatible_option(desc, str, sizeof(str)); \ + } \ +} while(0); + /** fast reload thread, check if config string has changed, checks NULLs. */ -static void -fr_check_changed_cfg_str(char* cmp1, char* cmp2, const char* desc, char* str, - size_t len) -{ - if((!cmp1 && cmp2) || - (cmp1 && !cmp2) || - (cmp1 && cmp2 && strcmp(cmp1, cmp2) != 0)) { - fr_check_changed_cfg(1, desc, str, len); - } -} +#define FR_CHECK_CHANGED_CFG_STR(desc, var, str) \ +do { \ + if((!cfg->var && newcfg->var) || \ + (cfg->var && !newcfg->var) || \ + (cfg->var && newcfg->var \ + && strcmp(cfg->var, newcfg->var) != 0)) { \ + fr_add_incompatible_option(desc, str, sizeof(str)); \ + } \ +} while(0); /** fast reload thread, check if config strlist has changed. */ +#define FR_CHECK_CHANGED_CFG_STRLIST(desc, var, str) do { \ + fr_check_changed_cfg_strlist(cfg->var, newcfg->var, desc, str, \ + sizeof(str)); \ + } while(0); static void fr_check_changed_cfg_strlist(struct config_strlist* cmp1, struct config_strlist* cmp2, const char* desc, char* str, size_t len) @@ -4389,18 +4836,22 @@ fr_check_changed_cfg_strlist(struct config_strlist* cmp1, (p1->str && !p2->str) || (p1->str && p2->str && strcmp(p1->str, p2->str) != 0)) { /* The strlist is different. */ - fr_check_changed_cfg(1, desc, str, len); + fr_add_incompatible_option(desc, str, len); return; } p1 = p1->next; p2 = p2->next; } if((!p1 && p2) || (p1 && !p2)) { - fr_check_changed_cfg(1, desc, str, len); + fr_add_incompatible_option(desc, str, len); } } /** fast reload thread, check if config str2list has changed. */ +#define FR_CHECK_CHANGED_CFG_STR2LIST(desc, var, buff) do { \ + fr_check_changed_cfg_str2list(cfg->var, newcfg->var, desc, buff,\ + sizeof(buff)); \ + } while(0); static void fr_check_changed_cfg_str2list(struct config_str2list* cmp1, struct config_str2list* cmp2, const char* desc, char* str, size_t len) @@ -4411,7 +4862,7 @@ fr_check_changed_cfg_str2list(struct config_str2list* cmp1, (p1->str && !p2->str) || (p1->str && p2->str && strcmp(p1->str, p2->str) != 0)) { /* The str2list is different. */ - fr_check_changed_cfg(1, desc, str, len); + fr_add_incompatible_option(desc, str, len); return; } if((!p1->str2 && p2->str2) || @@ -4419,14 +4870,14 @@ fr_check_changed_cfg_str2list(struct config_str2list* cmp1, (p1->str2 && p2->str2 && strcmp(p1->str2, p2->str2) != 0)) { /* The str2list is different. */ - fr_check_changed_cfg(1, desc, str, len); + fr_add_incompatible_option(desc, str, len); return; } p1 = p1->next; p2 = p2->next; } if((!p1 && p2) || (p1 && !p2)) { - fr_check_changed_cfg(1, desc, str, len); + fr_add_incompatible_option(desc, str, len); } } @@ -4440,98 +4891,54 @@ fr_check_compat_cfg(struct fast_reload_thread* fr, struct config_file* newcfg) changed_str[0]=0; /* Find incompatible options, and if so, print an error. */ - fr_check_changed_cfg(cfg->num_threads != newcfg->num_threads, - "num-threads", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->do_ip4 != newcfg->do_ip4, - "do-ip4", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->do_ip6 != newcfg->do_ip6, - "do-ip6", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->do_udp != newcfg->do_udp, - "do-udp", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->do_tcp != newcfg->do_tcp, - "do-tcp", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->port != newcfg->port, - "port", changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("num-threads", num_threads, changed_str); + FR_CHECK_CHANGED_CFG("do-ip4", do_ip4, changed_str); + FR_CHECK_CHANGED_CFG("do-ip6", do_ip6, changed_str); + FR_CHECK_CHANGED_CFG("do-udp", do_udp, changed_str); + FR_CHECK_CHANGED_CFG("do-tcp", do_tcp, changed_str); + FR_CHECK_CHANGED_CFG("port", port, changed_str); /* But cfg->outgoing_num_ports has been changed at startup, * possibly to reduce it, so do not check it here. */ - fr_check_changed_cfg(cfg->outgoing_num_tcp != newcfg->outgoing_num_tcp, - "outgoing-num-tcp", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->incoming_num_tcp != newcfg->incoming_num_tcp, - "incoming-num-tcp", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->num_out_ifs != newcfg->num_out_ifs, - "outgoing-interface", changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("outgoing-num-tcp", outgoing_num_tcp, changed_str); + FR_CHECK_CHANGED_CFG("incoming-num-tcp", incoming_num_tcp, changed_str); + FR_CHECK_CHANGED_CFG("outgoing-interface", num_out_ifs, changed_str); if(cfg->num_out_ifs == newcfg->num_out_ifs) { for(i=0; i<cfg->num_out_ifs; i++) - fr_check_changed_cfg(strcmp(cfg->out_ifs[i], - newcfg->out_ifs[i]) != 0, "outgoing-interface", - changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG_STR("outgoing-interface", + out_ifs[i], changed_str); } - fr_check_changed_cfg(cfg->num_ifs != newcfg->num_ifs, - "interface", changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("interface", num_ifs, changed_str); if(cfg->num_ifs == newcfg->num_ifs) { for(i=0; i<cfg->num_ifs; i++) - fr_check_changed_cfg(strcmp(cfg->ifs[i], - newcfg->ifs[i]) != 0, "interface", - changed_str, sizeof(changed_str)); - } - fr_check_changed_cfg(cfg->if_automatic != newcfg->if_automatic, - "interface-automatic", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->so_rcvbuf != newcfg->so_rcvbuf, - "so-rcvbuf", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->so_sndbuf != newcfg->so_sndbuf, - "so-sndbuf", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->so_reuseport != newcfg->so_reuseport, - "so-reuseport", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->ip_transparent != newcfg->ip_transparent, - "ip-transparent", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->ip_freebind != newcfg->ip_freebind, - "ip-freebind", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->udp_connect != newcfg->udp_connect, - "udp-connect", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->msg_buffer_size != newcfg->msg_buffer_size, - "msg-buffer-size", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->do_tcp_keepalive != newcfg->do_tcp_keepalive, - "edns-tcp-keepalive", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->tcp_keepalive_timeout != newcfg->tcp_keepalive_timeout, - "edns-tcp-keepalive-timeout", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->tcp_idle_timeout != newcfg->tcp_idle_timeout, - "tcp-idle-timeout", changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG_STR("interface", + ifs[i], changed_str); + } + FR_CHECK_CHANGED_CFG("interface-automatic", if_automatic, changed_str); + FR_CHECK_CHANGED_CFG("so-rcvbuf", so_rcvbuf, changed_str); + FR_CHECK_CHANGED_CFG("so-sndbuf", so_sndbuf, changed_str); + FR_CHECK_CHANGED_CFG("so-reuseport", so_reuseport, changed_str); + FR_CHECK_CHANGED_CFG("ip-transparent", ip_transparent, changed_str); + FR_CHECK_CHANGED_CFG("ip-freebind", ip_freebind, changed_str); + FR_CHECK_CHANGED_CFG("udp-connect", udp_connect, changed_str); + FR_CHECK_CHANGED_CFG("msg-buffer-size", msg_buffer_size, changed_str); + FR_CHECK_CHANGED_CFG("edns-tcp-keepalive", do_tcp_keepalive, changed_str); + FR_CHECK_CHANGED_CFG("edns-tcp-keepalive-timeout", tcp_keepalive_timeout, changed_str); + FR_CHECK_CHANGED_CFG("tcp-idle-timeout", tcp_idle_timeout, changed_str); /* Not changed, only if DoH is used, it is then stored in commpoints, * as well as used from cfg. */ - fr_check_changed_cfg( - cfg->harden_large_queries != newcfg->harden_large_queries, - "harden-large-queries", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->http_max_streams != newcfg->http_max_streams, - "http-max-streams", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->http_endpoint, newcfg->http_endpoint, - "http-endpoint", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->http_notls_downstream != newcfg->http_notls_downstream, - "http_notls_downstream", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->https_port != newcfg->https_port, - "https-port", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->ssl_port != newcfg->ssl_port, - "tls-port", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->ssl_service_key, newcfg->ssl_service_key, - "tls-service-key", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->ssl_service_pem, newcfg->ssl_service_pem, - "tls-service-pem", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->tls_cert_bundle, newcfg->tls_cert_bundle, - "tls-cert-bundle", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_strlist(cfg->proxy_protocol_port, - newcfg->proxy_protocol_port, "proxy-protocol-port", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg_strlist(cfg->tls_additional_port, - newcfg->tls_additional_port, "tls-additional-port", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->if_automatic_ports, - newcfg->if_automatic_ports, "interface-automatic-ports", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->udp_upstream_without_downstream != - newcfg->udp_upstream_without_downstream, - "udp-upstream-without-downstream", changed_str, - sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("harden-large-queries", harden_large_queries, changed_str); + FR_CHECK_CHANGED_CFG("http-max-streams", http_max_streams, changed_str); + FR_CHECK_CHANGED_CFG_STR("http-endpoint", http_endpoint, changed_str); + FR_CHECK_CHANGED_CFG("http_notls_downstream", http_notls_downstream, changed_str); + FR_CHECK_CHANGED_CFG("https-port", https_port, changed_str); + FR_CHECK_CHANGED_CFG("tls-port", ssl_port, changed_str); + FR_CHECK_CHANGED_CFG_STR("tls-service-key", ssl_service_key, changed_str); + FR_CHECK_CHANGED_CFG_STR("tls-service-pem", ssl_service_pem, changed_str); + FR_CHECK_CHANGED_CFG_STR("tls-cert-bundle", tls_cert_bundle, changed_str); + FR_CHECK_CHANGED_CFG_STRLIST("proxy-protocol-port", proxy_protocol_port, changed_str); + FR_CHECK_CHANGED_CFG_STRLIST("tls-additional-port", tls_additional_port, changed_str); + FR_CHECK_CHANGED_CFG_STR("interface-automatic-ports", if_automatic_ports, changed_str); + FR_CHECK_CHANGED_CFG("udp-upstream-without-downstream", udp_upstream_without_downstream, changed_str); if(changed_str[0] != 0) { /* The new config changes some items that do not work with @@ -4549,7 +4956,7 @@ fr_check_compat_cfg(struct fast_reload_thread* fr, struct config_file* newcfg) /** fast reload thread, check nopause config items */ static int -fr_check_nopause_cfg(struct fast_reload_thread* fr, struct config_file* newcfg) +fr_check_nopause_compat_cfg(struct fast_reload_thread* fr, struct config_file* newcfg) { char changed_str[1024]; struct config_file* cfg = fr->worker->env.cfg; @@ -4558,94 +4965,43 @@ fr_check_nopause_cfg(struct fast_reload_thread* fr, struct config_file* newcfg) changed_str[0]=0; /* Check for iter_env. */ - fr_check_changed_cfg( - cfg->outbound_msg_retry != newcfg->outbound_msg_retry, - "outbound-msg-retry", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->max_sent_count != newcfg->max_sent_count, - "max-sent-count", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->max_query_restarts != newcfg->max_query_restarts, - "max-query-restarts", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(strcmp(cfg->target_fetch_policy, - newcfg->target_fetch_policy) != 0, - "target-fetch-policy", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->donotquery_localhost != newcfg->donotquery_localhost, - "do-not-query-localhost", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_strlist(cfg->donotqueryaddrs, - newcfg->donotqueryaddrs, "do-not-query-localhost", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg_strlist(cfg->private_address, - newcfg->private_address, "private-address", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg_strlist(cfg->private_domain, - newcfg->private_domain, "private-domain", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg_strlist(cfg->caps_whitelist, - newcfg->caps_whitelist, "caps-exempt", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->do_nat64 != newcfg->do_nat64, - "do-nat64", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->nat64_prefix, newcfg->nat64_prefix, - "nat64-prefix", changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("outbound-msg-retry", outbound_msg_retry, changed_str); + FR_CHECK_CHANGED_CFG("max-sent-count", max_sent_count, changed_str); + FR_CHECK_CHANGED_CFG("max-query-restarts", max_query_restarts, changed_str); + FR_CHECK_CHANGED_CFG_STR("target-fetch-policy", target_fetch_policy, changed_str); + FR_CHECK_CHANGED_CFG("do-not-query-localhost", donotquery_localhost, changed_str); + FR_CHECK_CHANGED_CFG_STRLIST("do-not-query-address", donotqueryaddrs, changed_str); + FR_CHECK_CHANGED_CFG_STRLIST("private-address", private_address, changed_str); + FR_CHECK_CHANGED_CFG_STRLIST("private-domain", private_domain, changed_str); + FR_CHECK_CHANGED_CFG_STRLIST("caps-exempt", caps_whitelist, changed_str); + FR_CHECK_CHANGED_CFG("do-nat64", do_nat64, changed_str); + FR_CHECK_CHANGED_CFG_STR("nat64-prefix", nat64_prefix, changed_str); /* Check for val_env. */ - fr_check_changed_cfg(cfg->bogus_ttl != newcfg->bogus_ttl, - "val-bogus-ttl", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->val_date_override != newcfg->val_date_override, - "val-date-override", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->val_sig_skew_min != newcfg->val_sig_skew_min, - "val-sig-skew-min", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->val_sig_skew_max != newcfg->val_sig_skew_max, - "val-sig-skew-max", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(cfg->val_max_restart != newcfg->val_max_restart, - "val-max-restart", changed_str, sizeof(changed_str)); - fr_check_changed_cfg(strcmp(cfg->val_nsec3_key_iterations, - newcfg->val_nsec3_key_iterations) != 0, - "val-nsec3-keysize-iterations", changed_str, - sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("val-bogus-ttl", bogus_ttl, changed_str); + FR_CHECK_CHANGED_CFG("val-date-override", val_date_override, changed_str); + FR_CHECK_CHANGED_CFG("val-sig-skew-min", val_sig_skew_min, changed_str); + FR_CHECK_CHANGED_CFG("val-sig-skew-max", val_sig_skew_max, changed_str); + FR_CHECK_CHANGED_CFG("val-max-restart", val_max_restart, changed_str); + FR_CHECK_CHANGED_CFG_STR("val-nsec3-keysize-iterations", + val_nsec3_key_iterations, changed_str); /* Check for infra. */ - fr_check_changed_cfg(cfg->host_ttl != newcfg->host_ttl, - "infra-host-ttl", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->infra_keep_probing != newcfg->infra_keep_probing, - "infra-keep-probing", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->ratelimit != newcfg->ratelimit, - "ratelimit", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->ip_ratelimit != newcfg->ip_ratelimit, - "ip-ratelimit", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->ip_ratelimit_cookie != newcfg->ip_ratelimit_cookie, - "ip-ratelimit-cookie", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str2list(cfg->wait_limit_netblock, - newcfg->wait_limit_netblock, "wait-limit-netblock", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str2list(cfg->wait_limit_cookie_netblock, - newcfg->wait_limit_cookie_netblock, - "wait-limit-cookie-netblock", changed_str, - sizeof(changed_str)); - fr_check_changed_cfg_str2list(cfg->ratelimit_below_domain, - newcfg->ratelimit_below_domain, "ratelimit-below-domain", - changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str2list(cfg->ratelimit_for_domain, - newcfg->ratelimit_for_domain, "ratelimit-for-domain", - changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("infra-host-ttl", host_ttl, changed_str); + FR_CHECK_CHANGED_CFG("infra-keep-probing", infra_keep_probing, changed_str); + FR_CHECK_CHANGED_CFG("ratelimit", ratelimit, changed_str); + FR_CHECK_CHANGED_CFG("ip-ratelimit", ip_ratelimit, changed_str); + FR_CHECK_CHANGED_CFG("ip-ratelimit-cookie", ip_ratelimit_cookie, changed_str); + FR_CHECK_CHANGED_CFG_STR2LIST("wait-limit-netblock", wait_limit_netblock, changed_str); + FR_CHECK_CHANGED_CFG_STR2LIST("wait-limit-cookie-netblock", wait_limit_cookie_netblock, changed_str); + FR_CHECK_CHANGED_CFG_STR2LIST("ratelimit-below-domain", ratelimit_below_domain, changed_str); + FR_CHECK_CHANGED_CFG_STR2LIST("ratelimit-for-domain", ratelimit_for_domain, changed_str); /* Check for dnstap. */ - fr_check_changed_cfg( - cfg->dnstap_send_identity != newcfg->dnstap_send_identity, - "dnstap-send-identity", changed_str, sizeof(changed_str)); - fr_check_changed_cfg( - cfg->dnstap_send_version != newcfg->dnstap_send_version, - "dnstap-send-version", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->dnstap_identity, newcfg->dnstap_identity, - "dnstap-identity", changed_str, sizeof(changed_str)); - fr_check_changed_cfg_str(cfg->dnstap_version, newcfg->dnstap_version, - "dnstap-version", changed_str, sizeof(changed_str)); + FR_CHECK_CHANGED_CFG("dnstap-send-identity", dnstap_send_identity, changed_str); + FR_CHECK_CHANGED_CFG("dnstap-send-version", dnstap_send_version, changed_str); + FR_CHECK_CHANGED_CFG_STR("dnstap-identity", dnstap_identity, changed_str); + FR_CHECK_CHANGED_CFG_STR("dnstap-version", dnstap_version, changed_str); if(changed_str[0] != 0) { /* The new config changes some items that need a pause, @@ -5507,7 +5863,7 @@ fr_atomic_copy_cfg(struct config_file* oldcfg, struct config_file* cfg, COPY_VAR_ptr(tls_cert_bundle); COPY_VAR_int(tls_win_cert); COPY_VAR_ptr(tls_additional_port); - /* The first is used to walk throught the list but last is + /* The first is used to walk through the list but last is * only used during config read. */ COPY_VAR_ptr(tls_session_ticket_keys.first); COPY_VAR_ptr(tls_session_ticket_keys.last); @@ -5694,7 +6050,7 @@ fr_atomic_copy_cfg(struct config_file* oldcfg, struct config_file* cfg, tagname, num_tags */ COPY_VAR_int(remote_control_enable); - /* The first is used to walk throught the list but last is + /* The first is used to walk through the list but last is * only used during config read. */ COPY_VAR_ptr(control_ifs.first); COPY_VAR_ptr(control_ifs.last); @@ -6193,7 +6549,7 @@ fr_load_config(struct fast_reload_thread* fr, struct timeval* time_read, config_delete(newcfg); return 0; } - if(!fr_check_nopause_cfg(fr, newcfg)) { + if(!fr_check_nopause_compat_cfg(fr, newcfg)) { config_delete(newcfg); return 0; } @@ -7131,6 +7487,7 @@ fr_worker_auth_add(struct worker* worker, struct fast_reload_auth_change* item, xfr->serial = 0; } } + auth_zone_pickup_initial_zone(item->new_z, &worker->env); lock_rw_unlock(&item->new_z->lock); lock_rw_unlock(&worker->env.auth_zones->lock); lock_rw_unlock(&worker->daemon->fast_reload_thread->old_auth_zones->lock); @@ -7257,7 +7614,7 @@ void fast_reload_worker_pickup_changes(struct worker* worker) { /* The pickup of changes is called when the fast reload has - * a syncronized moment, and all the threads are paused and the + * a synchronized moment, and all the threads are paused and the * reload has been applied. Then the worker can pick up the new * changes and store them in worker-specific structs. * The pickup is also called when there is no pause, and then diff --git a/contrib/unbound/daemon/stats.c b/contrib/unbound/daemon/stats.c index 7efb83a0bc3f..41c4656aaec5 100644 --- a/contrib/unbound/daemon/stats.c +++ b/contrib/unbound/daemon/stats.c @@ -273,6 +273,7 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset) /* add in the values from the mesh */ s->svr.ans_secure += (long long)worker->env.mesh->ans_secure; s->svr.ans_bogus += (long long)worker->env.mesh->ans_bogus; + s->svr.val_ops += (long long)worker->env.mesh->val_ops; s->svr.ans_rcode_nodata += (long long)worker->env.mesh->ans_nodata; s->svr.ans_expired += (long long)worker->env.mesh->ans_expired; for(i=0; i<UB_STATS_RCODE_NUM; i++) @@ -495,6 +496,7 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a) total->svr.ans_rcode_nodata += a->svr.ans_rcode_nodata; total->svr.ans_secure += a->svr.ans_secure; total->svr.ans_bogus += a->svr.ans_bogus; + total->svr.val_ops += a->svr.val_ops; total->svr.unwanted_replies += a->svr.unwanted_replies; total->svr.unwanted_queries += a->svr.unwanted_queries; total->svr.tcp_accept_usage += a->svr.tcp_accept_usage; diff --git a/contrib/unbound/daemon/unbound.c b/contrib/unbound/daemon/unbound.c index 8e59bb25a725..164d0fb89509 100644 --- a/contrib/unbound/daemon/unbound.c +++ b/contrib/unbound/daemon/unbound.c @@ -174,7 +174,7 @@ static void checkrlimits(struct config_file* cfg) { #ifndef S_SPLINT_S -#ifdef HAVE_GETRLIMIT +#if defined(HAVE_GETRLIMIT) && !defined(unbound_testbound) /* list has number of ports to listen to, ifs number addresses */ int list = ((cfg->do_udp?1:0) + (cfg->do_tcp?1 + (int)cfg->incoming_num_tcp:0)); @@ -463,11 +463,11 @@ detach(void) #endif /* HAVE_DAEMON */ } +#ifdef HAVE_SSL /* setup a listening ssl context, fatal_exit() on any failure */ static void setup_listen_sslctx(void** ctx, int is_dot, int is_doh, struct config_file* cfg) { -#ifdef HAVE_SSL if(!(*ctx = listen_sslctx_create( cfg->ssl_service_key, cfg->ssl_service_pem, NULL, cfg->tls_ciphers, cfg->tls_ciphersuites, @@ -476,10 +476,8 @@ setup_listen_sslctx(void** ctx, int is_dot, int is_doh, struct config_file* cfg) is_dot, is_doh))) { fatal_exit("could not set up listen SSL_CTX"); } -#else /* HAVE_SSL */ - (void)ctx;(void)is_dot;(void)is_doh;(void)cfg; -#endif /* HAVE_SSL */ } +#endif /* HAVE_SSL */ /* setups the needed ssl contexts, fatal_exit() on any failure */ static void @@ -747,6 +745,7 @@ run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, int need_pi "the commandline to see more errors, " "or unbound-checkconf", cfgfile); log_warn("Continuing with default config settings"); + config_auto_slab_values(cfg); } apply_settings(daemon, cfg, cmdline_verbose, debug_mode); if(!done_setup) diff --git a/contrib/unbound/daemon/worker.c b/contrib/unbound/daemon/worker.c index ead20938e172..8e4a9b3d650a 100644 --- a/contrib/unbound/daemon/worker.c +++ b/contrib/unbound/daemon/worker.c @@ -1707,6 +1707,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error, repinfo->client_addrlen, edns.cookie_valid, c->buffer)) { worker->stats.num_queries_ip_ratelimited++; + regional_free_all(worker->scratchpad); comm_point_drop_reply(repinfo); return 0; } @@ -1818,8 +1819,9 @@ worker_handle_request(struct comm_point* c, void* arg, int error, goto send_reply; } if(worker->env.auth_zones && - auth_zones_answer(worker->env.auth_zones, &worker->env, - &qinfo, &edns, repinfo, c->buffer, worker->scratchpad)) { + auth_zones_downstream_answer(worker->env.auth_zones, + &worker->env, &qinfo, &edns, repinfo, c->buffer, + worker->scratchpad)) { regional_free_all(worker->scratchpad); if(sldns_buffer_limit(c->buffer) == 0) { comm_point_drop_reply(repinfo); @@ -1872,20 +1874,11 @@ worker_handle_request(struct comm_point* c, void* arg, int error, /* If we've found a local alias, replace the qname with the alias * target before resolving it. */ if(qinfo.local_alias) { - struct ub_packed_rrset_key* rrset = qinfo.local_alias->rrset; - struct packed_rrset_data* d = rrset->entry.data; - - /* Sanity check: our current implementation only supports - * a single CNAME RRset as a local alias. */ - if(qinfo.local_alias->next || - rrset->rk.type != htons(LDNS_RR_TYPE_CNAME) || - d->count != 1) { - log_err("assumption failure: unexpected local alias"); + if(!local_alias_shallow_copy_qname(qinfo.local_alias, &qinfo.qname, + &qinfo.qname_len)) { regional_free_all(worker->scratchpad); return 0; /* drop it */ } - qinfo.qname = d->rr_data[0] + 2; - qinfo.qname_len = d->rr_len[0] - 2; } /* If we may apply IP-based actions to the answer, build the client diff --git a/contrib/unbound/dns64/dns64.c b/contrib/unbound/dns64/dns64.c index f028cd28aa24..fbdbd87b9f63 100644 --- a/contrib/unbound/dns64/dns64.c +++ b/contrib/unbound/dns64/dns64.c @@ -631,7 +631,7 @@ handle_event_moddone(struct module_qstate* qstate, int id) /* When an AAAA query completes check if we want to perform DNS64 * synthesis. We skip queries with DNSSEC enabled (!CD) and - * ones generated by us to retrive the A/PTR record to use for + * ones generated by us to retrieve the A/PTR record to use for * synth. */ int could_synth = qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA && diff --git a/contrib/unbound/dnstap/dnstap.c b/contrib/unbound/dnstap/dnstap.c index 071fd0895fe6..3b27301825c2 100644 --- a/contrib/unbound/dnstap/dnstap.c +++ b/contrib/unbound/dnstap/dnstap.c @@ -542,7 +542,7 @@ dt_msg_send_outside_query(struct dt_env *env, qflags = sldns_buffer_read_u16_at(qmsg, 2); /* type */ - if (qflags & BIT_RD) { + if ((qflags & BIT_RD)) { if (!env->log_forwarder_query_messages) return; dt_msg_init(env, &dm, DNSTAP__MESSAGE__TYPE__FORWARDER_QUERY); @@ -599,7 +599,7 @@ dt_msg_send_outside_response(struct dt_env *env, qflags = ntohs(qflags); /* type */ - if (qflags & BIT_RD) { + if ((qflags & BIT_RD)) { if (!env->log_forwarder_response_messages) return; dt_msg_init(env, &dm, DNSTAP__MESSAGE__TYPE__FORWARDER_RESPONSE); diff --git a/contrib/unbound/dnstap/dnstap.m4 b/contrib/unbound/dnstap/dnstap.m4 index 78d0dd68b762..89eda929bfb3 100644 --- a/contrib/unbound/dnstap/dnstap.m4 +++ b/contrib/unbound/dnstap/dnstap.m4 @@ -18,10 +18,41 @@ AC_DEFUN([dt_DNSTAP], [opt_dnstap_socket_path="$1"]) if test "x$opt_dnstap" != "xno"; then - AC_PATH_PROG([PROTOC_C], [protoc-c]) - if test -z "$PROTOC_C"; then - AC_MSG_ERROR([The protoc-c program was not found. Please install protobuf-c!]) - fi + AC_PATH_PROG([PROTOC], [protoc]) + # 'protoc-c' is deprecated. We use 'protoc' instead. If it can not be + # found, try 'protoc-c'. + if test -z "$PROTOC"; then + AC_PATH_PROG([PROTOC_C], [protoc-c]) + else + PROTOC_C="$PROTOC" + fi + if test -z "$PROTOC_C"; then + AC_MSG_ERROR([[The protoc or protoc-c program was not found. It is needed for dnstap, use --disable-dnstap, or install protobuf-c to provide protoc or protoc-c]]) + fi + + # Check for protoc-gen-c plugin + AC_PATH_PROG([PROTOC_GEN_C], [protoc-gen-c]) + if test -z "$PROTOC_GEN_C"; then + AC_MSG_ERROR([[The protoc-gen-c plugin was not found. It is needed for dnstap, use --disable-dnstap, or install protobuf-c-compiler to provide protoc-gen-c]]) + fi + + # Test that protoc-gen-c actually works + AC_MSG_CHECKING([if protoc-gen-c plugin works]) + cat > conftest.proto << EOF +syntax = "proto2"; +message TestMessage { + optional string test_field = 1; +} +EOF + if $PROTOC_C --c_out=. conftest.proto >/dev/null 2>&1; then + AC_MSG_RESULT([yes]) + rm -f conftest.proto conftest.pb-c.c conftest.pb-c.h + else + AC_MSG_RESULT([no]) + rm -f conftest.proto conftest.pb-c.c conftest.pb-c.h + AC_MSG_ERROR([[The protoc-gen-c plugin is not working properly. Please ensure protobuf-c-compiler is properly installed]]) + fi + AC_ARG_WITH([protobuf-c], AS_HELP_STRING([--with-protobuf-c=path], [Path where protobuf-c is installed, for dnstap]), [ diff --git a/contrib/unbound/dnstap/dnstap.proto b/contrib/unbound/dnstap/dnstap.proto index dfc8ad411d94..75b8757c2081 100644 --- a/contrib/unbound/dnstap/dnstap.proto +++ b/contrib/unbound/dnstap/dnstap.proto @@ -98,7 +98,7 @@ message Policy { // rule: the rule matched by the message. // // In a RPZ context, this is the owner name of the rule in - // the Reponse Policy Zone in wire format. + // the Response Policy Zone in wire format. optional bytes rule = 2; // action: the policy action taken in response to the diff --git a/contrib/unbound/dnstap/dtstream.c b/contrib/unbound/dnstap/dtstream.c index 2d5ab20f0c84..39d43403bc62 100644 --- a/contrib/unbound/dnstap/dtstream.c +++ b/contrib/unbound/dnstap/dtstream.c @@ -1509,7 +1509,7 @@ void dtio_output_cb(int ATTR_UNUSED(fd), short bits, void* arg) } #endif - if((bits&UB_EV_READ || dtio->ssl_brief_write)) { + if((bits&UB_EV_READ) || dtio->ssl_brief_write) { #ifdef HAVE_SSL if(dtio->ssl_brief_write) (void)dtio_disable_brief_write(dtio); diff --git a/contrib/unbound/doc/Changelog b/contrib/unbound/doc/Changelog index 9668a6364cf4..c78cdff3b9bf 100644 --- a/contrib/unbound/doc/Changelog +++ b/contrib/unbound/doc/Changelog @@ -1,3 +1,270 @@ +17 September 2025: Yorgos + - Too many quotes for the EDE message debug printout. + +15 September 2025: Yorgos + - Small debug output improvement when attaching an EDE. + +15 September 2025: Wouter + - Fix to print warning for when so-sndbuf setsockopt is not granted. + +11 September 2025: Wouter + - version set to 1.24.0 for release. + - tag for 1.24.0rc1. + - Update contrib/aaaa-filter-iterator.patch so it applies on 1.24.0. + +9 September 2025: Wouter + - Fix #1332: CNAME chains are sometimes not followed when RPZs add a + local CNAME rewrite. + +8 September 2025: Yorgos + - Update documentation for using "SET ... EX" in Redis. + - Document max buffer sizes for Redis commands. + - Update man pages. + +3 September 2025: Wouter + - For #1328: make depend. + +2 September 2025: Wouter + - Fix #1235: Outdated Python2 code in + unbound/pythonmod/examples/log.py. + - Fix #1324: Memory leak in 'msgparse.c' in + 'parse_edns_options_from_query(...)'. + - Fix indentation in tcp-mss option parsing. + +1 September 2025: Wouter + - Fix for #1324: Fix to free edns options scratch in ratelimit case. + +29 August 2025: Yorgos + - Limit the number of consecutive reads on an HTTP/2 session. + Thanks to Gal Bar Nahum for exposing the possibility of infinite + reads on the session. + +28 August 2025: Wouter + - Fix setup_listen_sslctx warning for nettle compile. + +27 August 2025: Wouter + - Fix unbound-control dump_cache for double unlock of lruhash table. + +26 August 2025: Wouter + - Fix ports workflow to install expat for macos. + +22 August 2025: Wouter + - For #1318: Fix compile warnings for DoH compile on windows. + - Fix sha1 enable environment variable in test code on windows. + - Fix #1319: [FR] zone status for Unbound auth-zones. + - Fix that the zone acquired timestamp is set after the + zonefile is read. + +21 August 2025: Wouter + - Fix to check for extraneous command arguments for unbound-control, + when the command takes no arguments but there are arguments present. + - Fix #1317: Unbound starts too early. Add + Wants=network-online.target under [Unit] in unbound.service. + - Fix for #1317: Fix contrib/unbound.service comment path for + systemd network configuration. + +15 August 2025: Wouter + - unbound-control cache_lookup +t allows tld and root names. And + subnet cache contents are printed. + - Fix cache_lookup subnet printout to wipe zero part of the prefix. + - Fix cache_lookup subnet print to not print messages without rrsets + and perform in-depth check on node in the addrtree. + +14 August 2025: Wouter + - Fix to increase responsiveness of dump_cache. + - Fix to decouple file descriptor activity and cache lookups in + dump_cache. + +13 August 2025: Wouter + - unbound-control cache_lookup <domains> prints the cached rrsets + and messages for those. + - Fix to remove debug from cache_lookup. + - Fix to unlock cache_lookup message for malformed records. + +12 August 2025: Wouter + - Fix that unbound-control dump_cache releases the cache locks + every so often, so that the server stays responsive. + +7 August 2025: Wouter + - Fix dname_str for printout of long names. Thanks to Jan Komissar + for the fix. + - Fix that edns-subnet failure to create a subquery errors as + servfail, and not formerror. + - Fix to whitespace in dname_str. + +6 August 2025: Wouter + - Fix edns subnet, so that the subquery without subnet is stored in + global cache if the querier used 0.0.0.0/0 and the name and address + do not receive subnet treatment. If the name and address are + configured for subnet, it is stored in the subnet cache. + +5 August 2025: Wouter + - Fix #1309: incorrectly reclaimed tcp handler can cause data + corruption and segfault. + - Fix to use assertions for consistency checks in #1309 reclaimed + tcp handlers. + +1 August 2025: Wouter + - Fix testbound test program to accurately output packets from hex. + +28 July 2025: Wouter + - Fix redis cachedb module gettimeofday init failure. + +24 July 2025: Wouter + - Redis checks for server down and throttles reconnects. + +17 July 2025: Wouter + - Fix to not set rlimits in the unit tests. + - Fix #1303: [FR] Disable TLSv1.2. + - iana portlist updated. + +16 July 2025: Wouter + - Fix for RebirthDay Attack CVE-2025-5994, reported by Xiang Li + from AOSP Lab Nankai University. + - Tag for 1.23.1 with the release of 1.23.0 and the CVE fix, the + repository continues with the previous fixes, with 1.23.2. + - Add unit tests for non-ecs aggregation. + +12 July 2025: Yorgos + - Merge #1289 from Roland van Rijswijk-Deij: Add extra statistic to + track the number of signature validation operations. + Adds 'num.valops' to extended statistics. + - For #1289: test num.valops in existing stat_values.tdir. + - For #1289: add num.valops in the unbound-control man page. + +11 July 2025: Wouter + - Fix detection of SSL_CTX_set_tmp_ecdh function. + - For #1301: configure cant find SSL_is_quic in OpenSSL 3.5.1. + +8 July 2025: Wouter + - Fix to improve dnstap discovery on Fedora. + +3 July 2025: Wouter + - Fix #1300: Is 'sock-queue-timeout' a linux only feature. + - For #1300: implement sock-queue-timeout for FreeBSD as well. + - Fix layout of comm_point_udp_ancil_callback. + +2 July 2025: Wouter + - Merge #1299: Fix typos. + - Generate ltmain.sh and configure again. + +25 June 2025: Yorgos + - Fix #1247: forward-first: ssl handshake failed on root nameservers. + - For #1247, turn off fetch-policy for delegation when looking into + parent side name servers that may not update the addresses and hit + NXNS limits. + - For #1247, replay test (added tcp_transport to + outnet_serviced_query). + +20 June 2025: Yorgos + - Fix #1293: EDE 6 is attached to insecure cached answers when client + sends the CD bit. + +19 June 2025: Wouter + - Fix #1296: DNS over QUIC depends on a very outdated version of + ngtcp2. Fixed so it works with ngtcp2 1.13.0 and OpenSSL 3.5.0. + - Merge #1297: edns-subnet: fix NULL_AFTER_DEREF on subnetmod. + - Fix rrset cache create allocation failure case. + +17 June 2025: Yorgos + - Fix for consistent use of local zone CNAME alias for configured auth + zones. Now it also applies to downstream configured auth zones. + +16 June 2025: Wouter + - Fix to check control-interface addresses in unbound-checkconf. + - Fix #1295: Windows 32-bit binaries download seems to be missing dll + dependency. + +12 June 2025: Wouter + - Fix header return value description for skip_pkt_rrs and + parse_edns_from_query_pkt. + +11 June 2025: Wouter + - Fix bitwise operators in conditional expressions with parentheses. + - Fix conditional expressions with parentheses for bitwise and. + +5 June 2025: Wouter + - Fix unbound-anchor certificate file read for line ends and end of + file. + - Fix comment for the dname_remove_label_limit_len function. + - iana portlist updated. + +3 June 2025: Yorgos + - Small manpage corrections for the 'disable-dnssec-lame-check' option. + +21 May 2025: Wouter + - Fix #1288: [FR] Improve fuzzing of unbound by adapting the netbound + program. + +20 May 2025: Yorgos + - Merge #1285: RST man pages. It introduces restructuredText man pages + to sync the online and source code man page documentation. + The templated man pages (*.in) are still part of the repo but + generated with docutils from their .rst counterpart. + Documentation on how to generate those (mainly for core developers) + is in README.man. + - Add more checks about respip in unbound-checkconf. + Also fixes #310: unbound-checkconf not reporting RPZ configuration + error. + +19 May 2025: Wouter + - Fix for cname chain length with qtype ANY and qname minimisation. + Thanks to Jim Greenwood from Nominet for the report. + +15 May 2025: Wouter + - Fix config of slab values when there is no config file. + +13 May 2025: Yorgos + - Fix #1284: NULL pointer deref in az_find_nsec_cover() (latent bug) + by adding a log_assert() to safeguard future development. + - Fix #1282: log-destaddr fail on long ipv6 addresses. + +13 May 2025: Wouter + - Change default for so-sndbuf to 1m, to mitigate a cross-layer + issue where the UDP socket send buffers are exhausted waiting + for ARP/NDP resolution. Thanks to Reflyable for the report. + - Adjusted so-sndbuf default to 4m. + +12 May 2025: Yorgos + - Merge #1280: Fix auth nsec3 code. Fixes NSEC3 code to not break on + broken auth zones that include unsigned out of zone (above apex) + data. Could lead to hang while trying to prove a wildcard answer. + +12 May 2025: Wouter + - Fix #1283: Unsafe usage of atoi() while parsing the configuration + file. + +9 May 2025: Wouter + - Fix #1281: forward-zone "name: ." conflicts with auth-zone "name: ." + in 1.23.0, but worked in 1.22.0. + +5 May 2025: Yorgos + - Sync unbound and unbound-checkconf log output for unknown modules. + +29 April 2025: Wouter + - Fix for parallel build of dnstap protoc-c output. + - Fix dnstap to use protoc. + +29 April 2025: Yorgos + - Merge #1276: Auto-configure '-slabs' values. + +28 April 2025: Yorgos + - Merge #1275: Use macros for the fr_check_changed* functions. + +25 April 2025: Wouter + - Fix #1272: assertion failure testcode/unitverify.c:202. + +16 April 2025: Wouter + - Increase default to `num-queries-per-thread: 2048`, when unbound is + compiled with libevent. It makes saturation of the task queue more + resource intensive and less practical. Thanks to Shiming Liu, + Network and Information Security Lab, Tsinghua University for the + report. + +11 April 2025: Wouter + - Tag for 1.23.0rc2. This became the release of 1.23.0 on 24 April + 2025. The code repository continues with 1.23.1 in development. + 11 April 2025: Yorgos - Merge #1265: Fix WSAPoll. @@ -651,7 +918,7 @@ now checks both single and multi process/thread operation. 16 May 2024: Yorgos - - Merge #1070: Fix rtt assignement for low values of + - Merge #1070: Fix rtt assignment for low values of infra-cache-max-rtt. 16 May 2024: Wouter @@ -1059,7 +1326,7 @@ 13 October 2023: George - Better fix for infinite loop when reading multiple lines of input on a broken remote control socket, by treating a zero byte line the - same as transmission end. Addesses #947 and #948. + same as transmission end. Addresses #947 and #948. 12 October 2023: Wouter - Merge #944: Disable EDNS DO. @@ -1082,7 +1349,7 @@ 10 October 2023: George - Fix infinite loop when reading multiple lines of input on a broken - remote control socket. Addesses #947 and #948. + remote control socket. Addresses #947 and #948. 9 October 2023: Wouter - Fix edns subnet so that queries with a source prefix of zero cause @@ -1515,7 +1782,7 @@ - Ignore expired error responses. 11 November 2022: Wouter - - Fix #779: [doc] Missing documention in ub_resolve_event() for + - Fix #779: [doc] Missing documentation in ub_resolve_event() for callback parameter was_ratelimited. 9 November 2022: George @@ -2479,7 +2746,7 @@ not hang. removed trailing slashes from configure paths. Moved iOS tests to allow-failure. - travis, analyzer disabled on test without debug, that does not - run anway. Turn off failing tests except one. Update iOS test + run anyway. Turn off failing tests except one. Update iOS test to xcode image 12.2. 22 March 2021: George @@ -2568,7 +2835,7 @@ - Fix build on Python 3.10. 10 February 2021: Wouter - - Merge PR #420 from dyunwei: DOH not responsing with + - Merge PR #420 from dyunwei: DOH not responding with "http2_query_read_done failure" logged. 9 February 2021: Wouter @@ -2968,7 +3235,7 @@ 6 August 2020: Wouter - Merge PR #284 and Fix #246: Remove DLV entirely from Unbound. - The DLV has been decommisioned and in unbound 1.5.4, in 2015, there + The DLV has been decommissioned and in unbound 1.5.4, in 2015, there was advise to stop using it. The current code base does not contain DLV code any more. The use of dlv options displays a warning. @@ -3517,7 +3784,7 @@ 3 December 2019: Wouter - Merge pull request #124 from rmetrich: Changed log lock from 'quick' to 'basic' because this is an I/O lock. - - Fix text around serial arithmatic used for RRSIG times to refer + - Fix text around serial arithmetic used for RRSIG times to refer to correct RFC number. - Fix Assert Causing DoS in synth_cname(), reported by X41 D-Sec. @@ -3780,7 +4047,7 @@ - For #52 #53, second context does not close logfile override. - Fix #52 #53, fix for example fail program. - Fix to return after failed auth zone http chunk write. - - Fix to remove unused test for task_probe existance. + - Fix to remove unused test for task_probe existence. - Fix to timeval_add for remaining second in microseconds. - Check repinfo in worker_handle_request, if null, drop it. @@ -5037,7 +5304,7 @@ 1 February 2018: Wouter - fix unaligned structure making a false positive in checklock - unitialised memory. + uninitialised memory. 29 January 2018: Ralph - Use NSEC with longest ce to prove wildcard absence. @@ -5640,8 +5907,8 @@ - Remove (now unused) event2 include from dnscrypt code. 24 March 2017: George - - Fix to prevent non-referal query from being cached as referal when the - no_cache_store flag was set. + - Fix to prevent non-referral query from being cached as referral when + the no_cache_store flag was set. 23 March 2017: Wouter - Fix #1239: configure fails to find python distutils if python @@ -5704,7 +5971,7 @@ 7 March 2017: Wouter - Fix #1230: swig version 2.0.0 is required for pythonmod, with - 1.3.40 it crashes when running repeatly unbound-control reload. + 1.3.40 it crashes when running repeatedly unbound-control reload. - Response actions based on IP address from Jinmei Tatuya (Infoblox). 6 March 2017: Wouter @@ -5720,7 +5987,7 @@ known vulns. 27 February 2017: Wouter - - Fix #1227: Fix that Unbound control allows weak ciphersuits. + - Fix #1227: Fix that Unbound control allows weak ciphersuites. - Fix #1226: provide official 32bit binary for windows. 24 February 2017: Wouter @@ -6709,7 +6976,7 @@ - Fix #674: Do not free pointers given by getenv. 29 May 2015: Wouter - - Fix that unparseable error responses are ratelimited. + - Fix that unparsable error responses are ratelimited. - SOA negative TTL is capped at minimumttl in its rdata section. - cache-max-negative-ttl config option, default 3600. @@ -6727,7 +6994,7 @@ 10 May 2015: Wouter - Change syntax of particular validator error to be easier for - machine parse, swap rrset and ip adres info so it looks like: + machine parse, swap rrset and ip address info so it looks like: validation failure <www.example.nl. TXT IN>: signature crypto failed from 2001:DB8:7:bba4::53 for <*.example.nl. NSEC IN> @@ -8307,7 +8574,7 @@ - fix that --enable-static-exe does not complain about it unknown. 30 June 2011: Wouter - - tag relase 1.4.11, trunk is 1.4.12 development. + - tag release 1.4.11, trunk is 1.4.12 development. - iana portlist updated. - fix bug#395: id bits of other query may leak out under conditions - fix replyaddr count wrong after jostled queries, which leads to @@ -9637,7 +9904,7 @@ 8 June 2009: Wouter - Removed RFC5011 REVOKE flag support. Partial 5011 support may cause - inadvertant behaviour. + inadvertent behaviour. - 1.3.0 tarball for release created. - 1.3.1 development in svn trunk. - iana portlist updated. @@ -9986,7 +10253,7 @@ - initgroups(3) is called to drop secondary group permissions, if applicable. - configure option --with-ldns-builtin forces the use of the - inluded ldns package with the unbound source. The -I include + included ldns package with the unbound source. The -I include is put before the others, so it avoids bad include files from an older ldns install. - daemon(3) posix call is used when available. @@ -10291,7 +10558,7 @@ please ranlib, stop file without symbols warning. - harden referral path now also validates the root after priming. It looks up the root NS authoritatively as well as the root servers - and attemps to validate the entries. + and attempts to validate the entries. 16 October 2008: Wouter - Fixup negative TTL values appearing (reported by Attila Nagy). @@ -11070,7 +11337,7 @@ - please doxygen, put doxygen comment in one place. - asynclook -b blocking mode and test. - refactor asynclook, nicer code. - - fixup race problems from opensll in rand init from library, with + - fixup race problems from openssl in rand init from library, with a mutex around the rand init. - fix pass async_id=NULL to _async resolve(). - rewrote _wait() routine, so that it is threadsafe. @@ -12043,7 +12310,7 @@ 11 June 2007: Wouter - replies on TCP queries have the address field set in replyinfo, for serviced queries, because the initiator does not know that - a TCP fallback has occured. + a TCP fallback has occurred. - omit DNSSEC types from nonDO replies, except if qtype is ANY or if qtype directly queries for the type (and then only show that 'unknown type' in the answer section). diff --git a/contrib/unbound/doc/README b/contrib/unbound/doc/README index 1cd60bb0b12d..8286ea81ca70 100644 --- a/contrib/unbound/doc/README +++ b/contrib/unbound/doc/README @@ -1,4 +1,4 @@ -README for Unbound 1.23.1 +README for Unbound 1.24.0 Copyright 2007 NLnet Labs http://unbound.net diff --git a/contrib/unbound/doc/README.man b/contrib/unbound/doc/README.man new file mode 100644 index 000000000000..8e7897f47790 --- /dev/null +++ b/contrib/unbound/doc/README.man @@ -0,0 +1,16 @@ +After Unbound 1.23.0, the source of the man pages is in reStructuredText format. + +This helps with the online documentation at https://unbound.docs.nlnetlabs.nl +and makes it easier to maintain and contribute to the documentation. + +The templated man pages (*.in) are still part of the code repository as to not +alter current procedures that could be in place by users/packagers. + +The templated man pages (*.in) are generated by Sphinx (used for the online +documentation). +The online documentation has its own repository at +https://github.com/NLnetLabs/unbound-manual. + +In the README.md there (branch test-auto for now), there are further simple +instructions on how to generate the templated man pages there and update them +in this repository. diff --git a/contrib/unbound/doc/example.conf.in b/contrib/unbound/doc/example.conf.in index e0149a2df6aa..ef9a5a264c64 100644 --- a/contrib/unbound/doc/example.conf.in +++ b/contrib/unbound/doc/example.conf.in @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.23.1. +# See unbound.conf(5) man page, version 1.24.0. # # this is a comment. @@ -116,8 +116,8 @@ server: # so-rcvbuf: 0 # buffer size for UDP port 53 outgoing (SO_SNDBUF socket option). - # 0 is system default. Use 4m to handle spikes on very busy servers. - # so-sndbuf: 0 + # 0 is system default. Set larger to handle spikes on very busy servers. + # so-sndbuf: 4m # use SO_REUSEPORT to distribute queries over threads. # at extreme load it could be better to turn it off to distribute even. @@ -163,7 +163,7 @@ server: # msg-cache-slabs: 4 # the number of queries that a thread gets to service. - # num-queries-per-thread: 1024 + # num-queries-per-thread: 2048 # if very busy, 50% queries run to completion, 50% get timeout in msec # jostle-timeout: 200 @@ -279,7 +279,7 @@ server: # do-ip6: yes # If running unbound on an IPv6-only host, domains that only have - # IPv4 servers would become unresolveable. If NAT64 is available in + # IPv4 servers would become unresolvable. If NAT64 is available in # the network, unbound can use NAT64 to reach these servers with # the following option. This is NOT needed for enabling DNS64 on a # system that has IPv4 connectivity. diff --git a/contrib/unbound/doc/libunbound.3.in b/contrib/unbound/doc/libunbound.3.in index 8ef33b0998a2..e3723fbbdbad 100644 --- a/contrib/unbound/doc/libunbound.3.in +++ b/contrib/unbound/doc/libunbound.3.in @@ -1,335 +1,306 @@ -.TH "libunbound" "3" "Jul 16, 2025" "NLnet Labs" "unbound 1.23.1" -.\" -.\" libunbound.3 -- unbound library functions manual -.\" -.\" Copyright (c) 2007, NLnet Labs. All rights reserved. -.\" -.\" See LICENSE for the license. -.\" -.\" -.SH "NAME" -.B libunbound, -.B unbound.h, -.B ub_ctx, -.B ub_result, -.B ub_callback_type, -.B ub_ctx_create, -.B ub_ctx_delete, -.B ub_ctx_set_option, -.B ub_ctx_get_option, -.B ub_ctx_config, -.B ub_ctx_set_fwd, -.B ub_ctx_set_stub, -.B ub_ctx_set_tls, -.B ub_ctx_resolvconf, -.B ub_ctx_hosts, -.B ub_ctx_add_ta, -.B ub_ctx_add_ta_autr, -.B ub_ctx_add_ta_file, -.B ub_ctx_trustedkeys, -.B ub_ctx_debugout, -.B ub_ctx_debuglevel, -.B ub_ctx_async, -.B ub_poll, -.B ub_wait, -.B ub_fd, -.B ub_process, -.B ub_resolve, -.B ub_resolve_async, -.B ub_cancel, -.B ub_resolve_free, -.B ub_strerror, -.B ub_ctx_print_local_zones, -.B ub_ctx_zone_add, -.B ub_ctx_zone_remove, -.B ub_ctx_data_add, -.B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.23.1 functions. -.SH "SYNOPSIS" -.B #include <unbound.h> -.LP -\fIstruct ub_ctx *\fR -\fBub_ctx_create\fR(\fIvoid\fR); -.LP -\fIvoid\fR -\fBub_ctx_delete\fR(\fIstruct ub_ctx*\fR ctx); -.LP -\fIint\fR -\fBub_ctx_set_option\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR opt, \fIchar*\fR val); -.LP -\fIint\fR -\fBub_ctx_get_option\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR opt, \fIchar**\fR val); -.LP -\fIint\fR -\fBub_ctx_config\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); -.LP -\fIint\fR -\fBub_ctx_set_fwd\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR addr); -.LP -\fIint\fR -\fBub_ctx_set_stub\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR zone, -\fIchar*\fR addr, -.br - \fIint\fR isprime); -.LP -\fIint\fR -\fBub_ctx_set_tls\fR(\fIstruct ub_ctx*\fR ctx, \fIint\fR tls); -.LP -\fIint\fR -\fBub_ctx_resolvconf\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); -.LP -\fIint\fR -\fBub_ctx_hosts\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); -.LP -\fIint\fR -\fBub_ctx_add_ta\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR ta); -.LP -\fIint\fR -\fBub_ctx_add_ta_autr\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); -.LP -\fIint\fR -\fBub_ctx_add_ta_file\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); -.LP -\fIint\fR -\fBub_ctx_trustedkeys\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); -.LP -\fIint\fR -\fBub_ctx_debugout\fR(\fIstruct ub_ctx*\fR ctx, \fIFILE*\fR out); -.LP -\fIint\fR -\fBub_ctx_debuglevel\fR(\fIstruct ub_ctx*\fR ctx, \fIint\fR d); -.LP -\fIint\fR -\fBub_ctx_async\fR(\fIstruct ub_ctx*\fR ctx, \fIint\fR dothread); -.LP -\fIint\fR -\fBub_poll\fR(\fIstruct ub_ctx*\fR ctx); -.LP -\fIint\fR -\fBub_wait\fR(\fIstruct ub_ctx*\fR ctx); -.LP -\fIint\fR -\fBub_fd\fR(\fIstruct ub_ctx*\fR ctx); -.LP -\fIint\fR -\fBub_process\fR(\fIstruct ub_ctx*\fR ctx); -.LP -\fIint\fR -\fBub_resolve\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR name, -.br - \fIint\fR rrtype, \fIint\fR rrclass, \fIstruct ub_result**\fR result); -.LP -\fIint\fR -\fBub_resolve_async\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR name, -.br - \fIint\fR rrtype, \fIint\fR rrclass, \fIvoid*\fR mydata, -.br - \fIub_callback_type\fR callback, \fIint*\fR async_id); -.LP -\fIint\fR -\fBub_cancel\fR(\fIstruct ub_ctx*\fR ctx, \fIint\fR async_id); -.LP -\fIvoid\fR -\fBub_resolve_free\fR(\fIstruct ub_result*\fR result); -.LP -\fIconst char *\fR -\fBub_strerror\fR(\fIint\fR err); -.LP -\fIint\fR -\fBub_ctx_print_local_zones\fR(\fIstruct ub_ctx*\fR ctx); -.LP -\fIint\fR -\fBub_ctx_zone_add\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR zone_name, \fIchar*\fR zone_type); -.LP -\fIint\fR -\fBub_ctx_zone_remove\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR zone_name); -.LP -\fIint\fR -\fBub_ctx_data_add\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR data); -.LP -\fIint\fR -\fBub_ctx_data_remove\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR data); -.SH "DESCRIPTION" -.B Unbound -is an implementation of a DNS resolver, that does caching and -DNSSEC validation. This is the library API, for using the \-lunbound library. -The server daemon is described in \fIunbound\fR(8). -The library works independent from a running unbound server, and -can be used to convert hostnames to ip addresses, and back, -and obtain other information from the DNS. The library performs public\-key -validation of results with DNSSEC. -.P -The library uses a variable of type \fIstruct ub_ctx\fR to keep context -between calls. The user must maintain it, creating it with -.B ub_ctx_create -and deleting it with -.B ub_ctx_delete\fR. -It can be created and deleted at any time. Creating it anew removes any -previous configuration (such as trusted keys) and clears any cached results. -.P -The functions are thread\-safe, and a context can be used in a threaded (as -well as in a non\-threaded) environment. Also resolution (and validation) -can be performed blocking and non\-blocking (also called asynchronous). -The async method returns from the call immediately, so that processing -can go on, while the results become available later. -.P +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "LIBUNBOUND" "3" "Sep 18, 2025" "1.24.0" "Unbound" +.SH NAME +libunbound \- Unbound DNS validating resolver 1.24.0 functions. +.SH SYNOPSIS +.sp +\fB#include <unbound.h>\fP +.sp +struct ub_ctx * \fBub_ctx_create\fP(void); +.sp +void \fBub_ctx_delete\fP(struct ub_ctx* ctx); +.sp +int \fBub_ctx_set_option\fP(struct ub_ctx* ctx, char* opt, char* val); +.sp +int \fBub_ctx_get_option\fP(struct ub_ctx* ctx, char* opt, char** val); +.sp +int \fBub_ctx_config\fP(struct ub_ctx* ctx, char* fname); +.sp +int \fBub_ctx_set_fwd\fP(struct ub_ctx* ctx, char* addr); +.INDENT 0.0 +.TP +int \fBub_ctx_set_stub\fP(struct ub_ctx* ctx, char* zone, char* addr, +int isprime); +.UNINDENT +.sp +int \fBub_ctx_set_tls\fP(struct ub_ctx* ctx, int tls); +.sp +int \fBub_ctx_resolvconf\fP(struct ub_ctx* ctx, char* fname); +.sp +int \fBub_ctx_hosts\fP(struct ub_ctx* ctx, char* fname); +.sp +int \fBub_ctx_add_ta\fP(struct ub_ctx* ctx, char* ta); +.sp +int \fBub_ctx_add_ta_autr\fP(struct ub_ctx* ctx, char* fname); +.sp +int \fBub_ctx_add_ta_file\fP(struct ub_ctx* ctx, char* fname); +.sp +int \fBub_ctx_trustedkeys\fP(struct ub_ctx* ctx, char* fname); +.sp +int \fBub_ctx_debugout\fP(struct ub_ctx* ctx, FILE* out); +.sp +int \fBub_ctx_debuglevel\fP(struct ub_ctx* ctx, int d); +.sp +int \fBub_ctx_async\fP(struct ub_ctx* ctx, int dothread); +.sp +int \fBub_poll\fP(struct ub_ctx* ctx); +.sp +int \fBub_wait\fP(struct ub_ctx* ctx); +.sp +int \fBub_fd\fP(struct ub_ctx* ctx); +.sp +int \fBub_process\fP(struct ub_ctx* ctx); +.INDENT 0.0 +.TP +int \fBub_resolve\fP(struct ub_ctx* ctx, char* name, +int rrtype, int rrclass, struct ub_result** result); +.TP +int \fBub_resolve_async\fP(struct ub_ctx* ctx, char* name, +int rrtype, int rrclass, void* mydata, +ub_callback_type* callback, int* async_id); +.UNINDENT +.sp +int \fBub_cancel\fP(struct ub_ctx* ctx, int async_id); +.sp +void \fBub_resolve_free\fP(struct ub_result* result); +.sp +const char * \fBub_strerror\fP(int err); +.sp +int \fBub_ctx_print_local_zones\fP(struct ub_ctx* ctx); +.sp +int \fBub_ctx_zone_add\fP(struct ub_ctx* ctx, char* zone_name, char* zone_type); +.sp +int \fBub_ctx_zone_remove\fP(struct ub_ctx* ctx, char* zone_name); +.sp +int \fBub_ctx_data_add\fP(struct ub_ctx* ctx, char* data); +.sp +int \fBub_ctx_data_remove\fP(struct ub_ctx* ctx, char* data); +.SH DESCRIPTION +.sp +Unbound is an implementation of a DNS resolver, that does caching and DNSSEC +validation. +This is the library API, for using the \fB\-lunbound\fP library. +The server daemon is described in \fI\%unbound(8)\fP\&. +The library works independent from a running unbound server, and can be used to +convert hostnames to ip addresses, and back, and obtain other information from +the DNS. +The library performs public\-key validation of results with DNSSEC. +.sp +The library uses a variable of type \fIstruct ub_ctx\fP to keep context between +calls. +The user must maintain it, creating it with \fBub_ctx_create\fP and deleting it +with \fBub_ctx_delete\fP\&. +It can be created and deleted at any time. +Creating it anew removes any previous configuration (such as trusted keys) and +clears any cached results. +.sp +The functions are thread\-safe, and a context can be used in a threaded (as well +as in a non\-threaded) environment. +Also resolution (and validation) can be performed blocking and non\-blocking +(also called asynchronous). +The async method returns from the call immediately, so that processing can go +on, while the results become available later. +.sp The functions are discussed in turn below. -.SH "FUNCTIONS" -.TP +.SH FUNCTIONS +.INDENT 0.0 +.TP .B ub_ctx_create Create a new context, initialised with defaults. -The information from /etc/resolv.conf and /etc/hosts is not utilised -by default. Use -.B ub_ctx_resolvconf -and -.B ub_ctx_hosts -to read them. -Before you call this, use the openssl functions CRYPTO_set_id_callback and -CRYPTO_set_locking_callback to set up asynchronous operation if you use -lib openssl (the application calls these functions once for initialisation). -Openssl 1.0.0 or later uses the CRYPTO_THREADID_set_callback function. +The information from \fB/etc/resolv.conf\fP and \fB/etc/hosts\fP is +not utilised by default. +Use \fBub_ctx_resolvconf\fP and \fBub_ctx_hosts\fP to read them. +Before you call this, use the openssl functions +\fBCRYPTO_set_id_callback\fP and \fBCRYPTO_set_locking_callback\fP to set +up asynchronous operation if you use lib openssl (the application calls +these functions once for initialisation). +Openssl 1.0.0 or later uses the \fBCRYPTO_THREADID_set_callback\fP +function. .TP .B ub_ctx_delete Delete validation context and free associated resources. -Outstanding async queries are killed and callbacks are not called for them. +Outstanding async queries are killed and callbacks are not called for +them. .TP .B ub_ctx_set_option -A power\-user interface that lets you specify one of the options from the -config file format, see \fIunbound.conf\fR(5). Not all options are -relevant. For some specific options, such as adding trust anchors, special -routines exist. Pass the option name with the trailing ':'. +A power\-user interface that lets you specify one of the options from +the config file format, see \fI\%unbound.conf(5)\fP\&. +Not all options are relevant. +For some specific options, such as adding trust anchors, special +routines exist. +Pass the option name with the trailing \fB\(aq:\(aq\fP\&. .TP .B ub_ctx_get_option -A power\-user interface that gets an option value. Some options cannot be -gotten, and others return a newline separated list. Pass the option name -without trailing ':'. The returned value must be free(2)d by the caller. +A power\-user interface that gets an option value. +Some options cannot be gotten, and others return a newline separated +list. +Pass the option name without trailing \fB\(aq:\(aq\fP\&. +The returned value must be free(2)d by the caller. .TP .B ub_ctx_config -A power\-user interface that lets you specify an unbound config file, see -\fIunbound.conf\fR(5), which is read for configuration. Not all options are -relevant. For some specific options, such as adding trust anchors, special -routines exist. This function is thread\-safe only if a single instance of -ub_ctx* exists in the application. If several instances exist the -application has to ensure that ub_ctx_config is not called in parallel by -the different instances. +A power\-user interface that lets you specify an unbound config file, +see \fI\%unbound.conf(5)\fP, which is read for +configuration. +Not all options are relevant. +For some specific options, such as adding trust anchors, special +routines exist. +This function is thread\-safe only if a single instance of \fBub_ctx\fP* +exists in the application. +If several instances exist the application has to ensure that +\fBub_ctx_config\fP is not called in parallel by the different instances. .TP .B ub_ctx_set_fwd -Set machine to forward DNS queries to, the caching resolver to use. -IP4 or IP6 address. Forwards all DNS requests to that machine, which -is expected to run a recursive resolver. If the proxy is not -DNSSEC capable, validation may fail. Can be called several times, in -that case the addresses are used as backup servers. -At this time it is only possible to set configuration before the -first resolve is done. +Set machine to forward DNS queries to, the caching resolver to use. +IP4 or IP6 address. +Forwards all DNS requests to that machine, which is expected to run a +recursive resolver. +If the proxy is not DNSSEC capable, validation may fail. +Can be called several times, in that case the addresses are used as +backup servers. +At this time it is only possible to set configuration before the first +resolve is done. .TP .B ub_ctx_set_stub -Set a stub zone, authoritative dns servers to use for a particular zone. -IP4 or IP6 address. If the address is NULL the stub entry is removed. -Set isprime true if you configure root hints with it. Otherwise similar to -the stub zone item from unbound's config file. Can be called several times, -for different zones, or to add multiple addresses for a particular zone. -At this time it is only possible to set configuration before the -first resolve is done. +Set a stub zone, authoritative dns servers to use for a particular +zone. +IP4 or IP6 address. +If the address is NULL the stub entry is removed. +Set isprime true if you configure root hints with it. +Otherwise similar to the stub zone item from unbound\(aqs config file. +Can be called several times, for different zones, or to add multiple +addresses for a particular zone. +At this time it is only possible to set configuration before the first +resolve is done. .TP .B ub_ctx_set_tls -Enable DNS over TLS (DoT) for machines set with -.B ub_ctx_set_fwd. -At this time it is only possible to set configuration before the -first resolve is done. +Enable DNS over TLS (DoT) for machines set with \fBub_ctx_set_fwd\fP\&. +At this time it is only possible to set configuration before the first +resolve is done. .TP .B ub_ctx_resolvconf -By default the root servers are queried and full resolver mode is used, but -you can use this call to read the list of nameservers to use from the -filename given. -Usually "/etc/resolv.conf". Uses those nameservers as caching proxies. +By default the root servers are queried and full resolver mode is used, +but you can use this call to read the list of nameservers to use from +the filename given. +Usually \fB\(dq/etc/resolv.conf\(dq\fP\&. +Uses those nameservers as caching proxies. If they do not support DNSSEC, validation may fail. Only nameservers are picked up, the searchdomain, ndots and other -settings from \fIresolv.conf\fR(5) are ignored. -If fname NULL is passed, "/etc/resolv.conf" is used (if on Windows, -the system\-wide configured nameserver is picked instead). -At this time it is only possible to set configuration before the -first resolve is done. +settings from \fIresolv.conf(5)\fP are ignored. +If fname NULL is passed, \fB\(dq/etc/resolv.conf\(dq\fP is used (if on +Windows, the system\-wide configured nameserver is picked instead). +At this time it is only possible to set configuration before the first +resolve is done. .TP .B ub_ctx_hosts Read list of hosts from the filename given. -Usually "/etc/hosts". When queried for, these addresses are not marked -DNSSEC secure. If fname NULL is passed, "/etc/hosts" is used -(if on Windows, etc/hosts from WINDIR is picked instead). -At this time it is only possible to set configuration before the -first resolve is done. -.TP -.B -ub_ctx_add_ta +Usually \fB\(dq/etc/hosts\(dq\fP\&. +When queried for, these addresses are not marked DNSSEC secure. +If fname NULL is passed, \fB\(dq/etc/hosts\(dq\fP is used (if on Windows, +\fBetc/hosts\fP from WINDIR is picked instead). +At this time it is only possible to set configuration before the first +resolve is done. +.TP +.B ub_ctx_add_ta Add a trust anchor to the given context. -At this time it is only possible to add trusted keys before the -first resolve is done. +At this time it is only possible to add trusted keys before the first +resolve is done. The format is a string, similar to the zone\-file format, -[domainname] [type] [rdata contents]. Both DS and DNSKEY records are accepted. +\fB[domainname]\fP \fB[type]\fP \fB[rdata contents]\fP\&. +Both DS and DNSKEY records are accepted. .TP .B ub_ctx_add_ta_autr -Add filename with automatically tracked trust anchor to the given context. -Pass name of a file with the managed trust anchor. You can create this -file with \fIunbound\-anchor\fR(8) for the root anchor. You can also -create it with an initial file with one line with a DNSKEY or DS record. +Add filename with automatically tracked trust anchor to the given +context. +Pass name of a file with the managed trust anchor. +You can create this file with +\fI\%unbound\-anchor(8)\fP for the root anchor. +You can also create it with an initial file with one line with a DNSKEY +or DS record. If the file is writable, it is updated when the trust anchor changes. -At this time it is only possible to add trusted keys before the -first resolve is done. +At this time it is only possible to add trusted keys before the first +resolve is done. .TP .B ub_ctx_add_ta_file Add trust anchors to the given context. Pass name of a file with DS and DNSKEY records in zone file format. -At this time it is only possible to add trusted keys before the -first resolve is done. +At this time it is only possible to add trusted keys before the first +resolve is done. .TP .B ub_ctx_trustedkeys Add trust anchors to the given context. -Pass the name of a bind\-style config file with trusted\-keys{}. -At this time it is only possible to add trusted keys before the -first resolve is done. +Pass the name of a bind\-style config file with \fBtrusted\-keys{}\fP\&. +At this time it is only possible to add trusted keys before the first +resolve is done. .TP .B ub_ctx_debugout -Set debug and error log output to the given stream. Pass NULL to disable -output. Default is stderr. File\-names or using syslog can be enabled -using config options, this routine is for using your own stream. +Set debug and error log output to the given stream. +Pass NULL to disable output. +Default is stderr. +File\-names or using syslog can be enabled using config options, this +routine is for using your own stream. .TP .B ub_ctx_debuglevel -Set debug verbosity for the context. Output is directed to stderr. +Set debug verbosity for the context. +Output is directed to stderr. Higher debug level gives more output. .TP .B ub_ctx_async Set a context behaviour for asynchronous action. -if set to true, enables threading and a call to -.B ub_resolve_async +if set to true, enables threading and a call to \fBub_resolve_async\fP creates a thread to handle work in the background. If false, a process is forked to handle work in the background. -Changes to this setting after -.B ub_resolve_async -calls have been made have no effect (delete and re\-create the context -to change). +Changes to this setting after \fBub_resolve_async\fP calls have been made +have no effect (delete and re\-create the context to change). .TP .B ub_poll Poll a context to see if it has any new results. -Do not poll in a loop, instead extract the fd below to poll for readiness, -and then check, or wait using the wait routine. +Do not poll in a loop, instead extract the \fBfd\fP below to poll for +readiness, and then check, or wait using the wait routine. Returns 0 if nothing to read, or nonzero if a result is available. -If nonzero, call -.B ub_process -to do callbacks. +If nonzero, call \fBub_process\fP to do callbacks. .TP .B ub_wait -Wait for a context to finish with results. Calls -.B ub_process -after the wait for you. After the wait, there are no more outstanding -asynchronous queries. +Wait for a context to finish with results. +Calls \fBub_process\fP after the wait for you. +After the wait, there are no more outstanding asynchronous queries. .TP .B ub_fd -Get file descriptor. Wait for it to become readable, at this point -answers are returned from the asynchronous validating resolver. -Then call the \fBub_process\fR to continue processing. +Get file descriptor. +Wait for it to become readable, at this point answers are returned from +the asynchronous validating resolver. +Then call the \fBub_process\fP to continue processing. .TP .B ub_process Call this routine to continue processing results from the validating -resolver (when the fd becomes readable). +resolver (when the \fBfd\fP becomes readable). Will perform necessary callbacks. .TP .B ub_resolve @@ -340,95 +311,111 @@ The result structure is newly allocated with the resulting data. .TP .B ub_resolve_async Perform asynchronous resolution and validation of the target name. -Arguments mean the same as for \fBub_resolve\fR except no -data is returned immediately, instead a callback is called later. -The callback receives a copy of the mydata pointer, that you can use to pass -information to the callback. The callback type is a function pointer to -a function declared as -.IP -void my_callback_function(void* my_arg, int err, -.br - struct ub_result* result); -.IP -The async_id is returned so you can (at your option) decide to track it -and cancel the request if needed. If you pass a NULL pointer the async_id -is not returned. +Arguments mean the same as for \fBub_resolve\fP except no data is +returned immediately, instead a callback is called later. +The callback receives a copy of the mydata pointer, that you can use to +pass information to the callback. +The callback type is a function pointer to a function declared as: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +void my_callback_function(void* my_arg, int err, + struct ub_result* result); +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +The \fBasync_id\fP is returned so you can (at your option) decide to +track it and cancel the request if needed. +If you pass a NULL pointer the \fBasync_id\fP is not returned. .TP .B ub_cancel -Cancel an async query in progress. This may return an error if the query -does not exist, or the query is already being delivered, in that case you -may still get a callback for the query. +Cancel an async query in progress. +This may return an error if the query does not exist, or the query is +already being delivered, in that case you may still get a callback for +the query. .TP .B ub_resolve_free -Free struct ub_result contents after use. +Free struct \fBub_result\fP contents after use. .TP .B ub_strerror -Convert error value from one of the unbound library functions -to a human readable string. +Convert error value from one of the unbound library functions to a +human readable string. .TP .B ub_ctx_print_local_zones Debug printout the local authority information to debug output. .TP .B ub_ctx_zone_add -Add new zone to local authority info, like local\-zone \fIunbound.conf\fR(5) -statement. +Add new zone to local authority info, like local\-zone +\fI\%unbound.conf(5)\fP statement. .TP .B ub_ctx_zone_remove Delete zone from local authority info. .TP .B ub_ctx_data_add Add resource record data to local authority info, like local\-data -\fIunbound.conf\fR(5) statement. +\fI\%unbound.conf(5)\fP statement. .TP .B ub_ctx_data_remove Delete local authority data from the name given. -.SH "RESULT DATA STRUCTURE" -The result of the DNS resolution and validation is returned as -\fIstruct ub_result\fR. The result structure contains the following entries. -.P +.UNINDENT +.SH RESULT DATA STRUCTURE +.sp +The result of the DNS resolution and validation is returned as \fIstruct +ub_result\fP\&. +The result structure contains the following entries: +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - struct ub_result { - char* qname; /* text string, original question */ - int qtype; /* type code asked for */ - int qclass; /* class code asked for */ - char** data; /* array of rdata items, NULL terminated*/ - int* len; /* array with lengths of rdata items */ - char* canonname; /* canonical name of result */ - int rcode; /* additional error code in case of no data */ - void* answer_packet; /* full network format answer packet */ - int answer_len; /* length of packet in octets */ - int havedata; /* true if there is data */ - int nxdomain; /* true if nodata because name does not exist */ - int secure; /* true if result is secure */ - int bogus; /* true if a security failure happened */ - char* why_bogus; /* string with error if bogus */ - int was_ratelimited; /* true if the query was ratelimited (SERVFAIL) by unbound */ - int ttl; /* number of seconds the result is valid */ - }; +.ft C +struct ub_result { + char* qname; /* text string, original question */ + int qtype; /* type code asked for */ + int qclass; /* class code asked for */ + char** data; /* array of rdata items, NULL terminated*/ + int* len; /* array with lengths of rdata items */ + char* canonname; /* canonical name of result */ + int rcode; /* additional error code in case of no data */ + void* answer_packet; /* full network format answer packet */ + int answer_len; /* length of packet in octets */ + int havedata; /* true if there is data */ + int nxdomain; /* true if nodata because name does not exist */ + int secure; /* true if result is secure */ + int bogus; /* true if a security failure happened */ + char* why_bogus; /* string with error if bogus */ + int was_ratelimited; /* true if the query was ratelimited (SERVFAIL) by unbound */ + int ttl; /* number of seconds the result is valid */ +}; +.ft P .fi -.P -If both secure and bogus are false, security was not enabled for the -domain of the query. Else, they are not both true, one of them is true. -.SH "RETURN VALUES" -Many routines return an error code. The value 0 (zero) denotes no error -happened. Other values can be passed to -.B ub_strerror -to obtain a readable error string. -.B ub_strerror -returns a zero terminated string. -.B ub_ctx_create -returns NULL on an error (a malloc failure). -.B ub_poll -returns true if some information may be available, false otherwise. -.B ub_fd -returns a file descriptor or \-1 on error. -.B ub_ctx_config -and -.B ub_ctx_resolvconf -attempt to leave errno informative on a function return with file read failure. -.SH "SEE ALSO" -\fIunbound.conf\fR(5), -\fIunbound\fR(8). -.SH "AUTHORS" -.B Unbound -developers are mentioned in the CREDITS file in the distribution. +.UNINDENT +.UNINDENT +.sp +If both secure and bogus are false, security was not enabled for the domain of +the query. +Else, they are not both true, one of them is true. +.SH RETURN VALUES +.sp +Many routines return an error code. +The value 0 (zero) denotes no error happened. +Other values can be passed to \fBub_strerror\fP to obtain a readable error +string. +\fBub_strerror\fP returns a zero terminated string. +\fBub_ctx_create\fP returns NULL on an error (a malloc failure). +\fBub_poll\fP returns true if some information may be available, false otherwise. +\fBub_fd\fP returns a file descriptor or \-1 on error. +\fBub_ctx_config\fP and \fBub_ctx_resolvconf\fP attempt to leave errno informative +on a function return with file read failure. +.SH SEE ALSO +.sp +\fI\%unbound.conf(5)\fP, \fI\%unbound(8)\fP\&. +.SH AUTHOR +Unbound developers are mentioned in the CREDITS file in the distribution. +.SH COPYRIGHT +1999-2025, NLnet Labs +.\" Generated by docutils manpage writer. +. diff --git a/contrib/unbound/doc/libunbound.rst b/contrib/unbound/doc/libunbound.rst new file mode 100644 index 000000000000..97883dc555a3 --- /dev/null +++ b/contrib/unbound/doc/libunbound.rst @@ -0,0 +1,491 @@ +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +libunbound(3) +============= + +Synopsis +-------- + +.. only:: html + + .. code-block:: c + + #include <unbound.h> + + struct ub_ctx * ub_ctx_create(void); + + void ub_ctx_delete(struct ub_ctx* ctx); + + int ub_ctx_set_option(struct ub_ctx* ctx, char* opt, char* val); + + int ub_ctx_get_option(struct ub_ctx* ctx, char* opt, char** val); + + int ub_ctx_config(struct ub_ctx* ctx, char* fname); + + int ub_ctx_set_fwd(struct ub_ctx* ctx, char* addr); + + int ub_ctx_set_stub(struct ub_ctx* ctx, char* zone, char* addr, + int isprime); + + int ub_ctx_set_tls(struct ub_ctx* ctx, int tls); + + int ub_ctx_resolvconf(struct ub_ctx* ctx, char* fname); + + int ub_ctx_hosts(struct ub_ctx* ctx, char* fname); + + int ub_ctx_add_ta(struct ub_ctx* ctx, char* ta); + + int ub_ctx_add_ta_autr(struct ub_ctx* ctx, char* fname); + + int ub_ctx_add_ta_file(struct ub_ctx* ctx, char* fname); + + int ub_ctx_trustedkeys(struct ub_ctx* ctx, char* fname); + + int ub_ctx_debugout(struct ub_ctx* ctx, FILE* out); + + int ub_ctx_debuglevel(struct ub_ctx* ctx, int d); + + int ub_ctx_async(struct ub_ctx* ctx, int dothread); + + int ub_poll(struct ub_ctx* ctx); + + int ub_wait(struct ub_ctx* ctx); + + int ub_fd(struct ub_ctx* ctx); + + int ub_process(struct ub_ctx* ctx); + + int ub_resolve(struct ub_ctx* ctx, char* name, int rrtype, + int rrclass, struct ub_result** result); + + int ub_resolve_async(struct ub_ctx* ctx, char* name, int rrtype, + int rrclass, void* mydata, ub_callback_type callback, + int* async_id); + + int ub_cancel(struct ub_ctx* ctx, int async_id); + + void ub_resolve_free(struct ub_result* result); + + const char * ub_strerror(int err); + + int ub_ctx_print_local_zones(struct ub_ctx* ctx); + + int ub_ctx_zone_add(struct ub_ctx* ctx, char* zone_name, char* zone_type); + + int ub_ctx_zone_remove(struct ub_ctx* ctx, char* zone_name); + + int ub_ctx_data_add(struct ub_ctx* ctx, char* data); + + int ub_ctx_data_remove(struct ub_ctx* ctx, char* data); + +.. only:: man + + **#include <unbound.h>** + + struct ub_ctx \* **ub_ctx_create**\ (void); + + void **ub_ctx_delete**\ (struct ub_ctx\* ctx); + + int **ub_ctx_set_option**\ (struct ub_ctx\* ctx, char\* opt, char\* val); + + int **ub_ctx_get_option**\ (struct ub_ctx\* ctx, char\* opt, char\*\* val); + + int **ub_ctx_config**\ (struct ub_ctx\* ctx, char* fname); + + int **ub_ctx_set_fwd**\ (struct ub_ctx\* ctx, char\* addr); + + int **ub_ctx_set_stub**\ (struct ub_ctx\* ctx, char\* zone, char\* addr, + int isprime); + + int **ub_ctx_set_tls**\ (struct ub_ctx\* ctx, int tls); + + int **ub_ctx_resolvconf**\ (struct ub_ctx\* ctx, char\* fname); + + int **ub_ctx_hosts**\ (struct ub_ctx\* ctx, char\* fname); + + int **ub_ctx_add_ta**\ (struct ub_ctx\* ctx, char\* ta); + + int **ub_ctx_add_ta_autr**\ (struct ub_ctx\* ctx, char\* fname); + + int **ub_ctx_add_ta_file**\ (struct ub_ctx\* ctx, char\* fname); + + int **ub_ctx_trustedkeys**\ (struct ub_ctx\* ctx, char\* fname); + + int **ub_ctx_debugout**\ (struct ub_ctx\* ctx, FILE\* out); + + int **ub_ctx_debuglevel**\ (struct ub_ctx\* ctx, int d); + + int **ub_ctx_async**\ (struct ub_ctx\* ctx, int dothread); + + int **ub_poll**\ (struct ub_ctx\* ctx); + + int **ub_wait**\ (struct ub_ctx\* ctx); + + int **ub_fd**\ (struct ub_ctx\* ctx); + + int **ub_process**\ (struct ub_ctx\* ctx); + + int **ub_resolve**\ (struct ub_ctx\* ctx, char\* name, + int rrtype, int rrclass, struct ub_result\*\* result); + + int **ub_resolve_async**\ (struct ub_ctx\* ctx, char\* name, + int rrtype, int rrclass, void\* mydata, + ub_callback_type\* callback, int\* async_id); + + int **ub_cancel**\ (struct ub_ctx\* ctx, int async_id); + + void **ub_resolve_free**\ (struct ub_result\* result); + + const char \* **ub_strerror**\ (int err); + + int **ub_ctx_print_local_zones**\ (struct ub_ctx\* ctx); + + int **ub_ctx_zone_add**\ (struct ub_ctx\* ctx, char\* zone_name, char\* zone_type); + + int **ub_ctx_zone_remove**\ (struct ub_ctx\* ctx, char\* zone_name); + + int **ub_ctx_data_add**\ (struct ub_ctx\* ctx, char\* data); + + int **ub_ctx_data_remove**\ (struct ub_ctx\* ctx, char\* data); + +Description +----------- + +Unbound is an implementation of a DNS resolver, that does caching and DNSSEC +validation. +This is the library API, for using the ``-lunbound`` library. +The server daemon is described in :doc:`unbound(8)</manpages/unbound>`. +The library works independent from a running unbound server, and can be used to +convert hostnames to ip addresses, and back, and obtain other information from +the DNS. +The library performs public-key validation of results with DNSSEC. + +The library uses a variable of type *struct ub_ctx* to keep context between +calls. +The user must maintain it, creating it with **ub_ctx_create** and deleting it +with **ub_ctx_delete**. +It can be created and deleted at any time. +Creating it anew removes any previous configuration (such as trusted keys) and +clears any cached results. + +The functions are thread-safe, and a context can be used in a threaded (as well +as in a non-threaded) environment. +Also resolution (and validation) can be performed blocking and non-blocking +(also called asynchronous). +The async method returns from the call immediately, so that processing can go +on, while the results become available later. + +The functions are discussed in turn below. + +Functions +--------- + +.. glossary:: + + ub_ctx_create + Create a new context, initialised with defaults. + The information from :file:`/etc/resolv.conf` and :file:`/etc/hosts` is + not utilised by default. + Use **ub_ctx_resolvconf** and **ub_ctx_hosts** to read them. + Before you call this, use the openssl functions + **CRYPTO_set_id_callback** and **CRYPTO_set_locking_callback** to set + up asynchronous operation if you use lib openssl (the application calls + these functions once for initialisation). + Openssl 1.0.0 or later uses the **CRYPTO_THREADID_set_callback** + function. + + ub_ctx_delete + Delete validation context and free associated resources. + Outstanding async queries are killed and callbacks are not called for + them. + + ub_ctx_set_option + A power-user interface that lets you specify one of the options from + the config file format, see :doc:`unbound.conf(5)</manpages/unbound.conf>`. + Not all options are relevant. + For some specific options, such as adding trust anchors, special + routines exist. + Pass the option name with the trailing ``':'``. + + ub_ctx_get_option + A power-user interface that gets an option value. + Some options cannot be gotten, and others return a newline separated + list. + Pass the option name without trailing ``':'``. + The returned value must be free(2)d by the caller. + + ub_ctx_config + A power-user interface that lets you specify an unbound config file, + see :doc:`unbound.conf(5)</manpages/unbound.conf>`, which is read for + configuration. + Not all options are relevant. + For some specific options, such as adding trust anchors, special + routines exist. + This function is thread-safe only if a single instance of **ub_ctx**\* + exists in the application. + If several instances exist the application has to ensure that + **ub_ctx_config** is not called in parallel by the different instances. + + ub_ctx_set_fwd + Set machine to forward DNS queries to, the caching resolver to use. + IP4 or IP6 address. + Forwards all DNS requests to that machine, which is expected to run a + recursive resolver. + If the proxy is not DNSSEC capable, validation may fail. + Can be called several times, in that case the addresses are used as + backup servers. + At this time it is only possible to set configuration before the first + resolve is done. + + ub_ctx_set_stub + Set a stub zone, authoritative dns servers to use for a particular + zone. + IP4 or IP6 address. + If the address is NULL the stub entry is removed. + Set isprime true if you configure root hints with it. + Otherwise similar to the stub zone item from unbound's config file. + Can be called several times, for different zones, or to add multiple + addresses for a particular zone. + At this time it is only possible to set configuration before the first + resolve is done. + + ub_ctx_set_tls + Enable DNS over TLS (DoT) for machines set with **ub_ctx_set_fwd**. + At this time it is only possible to set configuration before the first + resolve is done. + + ub_ctx_resolvconf + By default the root servers are queried and full resolver mode is used, + but you can use this call to read the list of nameservers to use from + the filename given. + Usually :file:`"/etc/resolv.conf"`. + Uses those nameservers as caching proxies. + If they do not support DNSSEC, validation may fail. + Only nameservers are picked up, the searchdomain, ndots and other + settings from *resolv.conf(5)* are ignored. + If fname NULL is passed, :file:`"/etc/resolv.conf"` is used (if on + Windows, the system-wide configured nameserver is picked instead). + At this time it is only possible to set configuration before the first + resolve is done. + + ub_ctx_hosts + Read list of hosts from the filename given. + Usually :file:`"/etc/hosts"`. + When queried for, these addresses are not marked DNSSEC secure. + If fname NULL is passed, :file:`"/etc/hosts"` is used (if on Windows, + :file:`etc/hosts` from WINDIR is picked instead). + At this time it is only possible to set configuration before the first + resolve is done. + + ub_ctx_add_ta + Add a trust anchor to the given context. + At this time it is only possible to add trusted keys before the first + resolve is done. + The format is a string, similar to the zone-file format, + **[domainname]** **[type]** **[rdata contents]**. + Both DS and DNSKEY records are accepted. + + ub_ctx_add_ta_autr + Add filename with automatically tracked trust anchor to the given + context. + Pass name of a file with the managed trust anchor. + You can create this file with + :doc:`unbound-anchor(8)</manpages/unbound-anchor>` for the root anchor. + You can also create it with an initial file with one line with a DNSKEY + or DS record. + If the file is writable, it is updated when the trust anchor changes. + At this time it is only possible to add trusted keys before the first + resolve is done. + + ub_ctx_add_ta_file + Add trust anchors to the given context. + Pass name of a file with DS and DNSKEY records in zone file format. + At this time it is only possible to add trusted keys before the first + resolve is done. + + ub_ctx_trustedkeys + Add trust anchors to the given context. + Pass the name of a bind-style config file with ``trusted-keys{}``. + At this time it is only possible to add trusted keys before the first + resolve is done. + + ub_ctx_debugout + Set debug and error log output to the given stream. + Pass NULL to disable output. + Default is stderr. + File-names or using syslog can be enabled using config options, this + routine is for using your own stream. + + ub_ctx_debuglevel + Set debug verbosity for the context. + Output is directed to stderr. + Higher debug level gives more output. + + ub_ctx_async + Set a context behaviour for asynchronous action. + if set to true, enables threading and a call to **ub_resolve_async** + creates a thread to handle work in the background. + If false, a process is forked to handle work in the background. + Changes to this setting after **ub_resolve_async** calls have been made + have no effect (delete and re-create the context to change). + + ub_poll + Poll a context to see if it has any new results. + Do not poll in a loop, instead extract the **fd** below to poll for + readiness, and then check, or wait using the wait routine. + Returns 0 if nothing to read, or nonzero if a result is available. + If nonzero, call **ub_process** to do callbacks. + + ub_wait + Wait for a context to finish with results. + Calls **ub_process** after the wait for you. + After the wait, there are no more outstanding asynchronous queries. + + ub_fd + Get file descriptor. + Wait for it to become readable, at this point answers are returned from + the asynchronous validating resolver. + Then call the **ub_process** to continue processing. + + ub_process + Call this routine to continue processing results from the validating + resolver (when the **fd** becomes readable). + Will perform necessary callbacks. + + ub_resolve + Perform resolution and validation of the target name. + The name is a domain name in a zero terminated text string. + The rrtype and rrclass are DNS type and class codes. + The result structure is newly allocated with the resulting data. + + ub_resolve_async + Perform asynchronous resolution and validation of the target name. + Arguments mean the same as for **ub_resolve** except no data is + returned immediately, instead a callback is called later. + The callback receives a copy of the mydata pointer, that you can use to + pass information to the callback. + The callback type is a function pointer to a function declared as: + + .. code-block:: c + + void my_callback_function(void* my_arg, int err, + struct ub_result* result); + + The **async_id** is returned so you can (at your option) decide to + track it and cancel the request if needed. + If you pass a NULL pointer the **async_id** is not returned. + + ub_cancel + Cancel an async query in progress. + This may return an error if the query does not exist, or the query is + already being delivered, in that case you may still get a callback for + the query. + + ub_resolve_free + Free struct **ub_result** contents after use. + + ub_strerror + Convert error value from one of the unbound library functions to a + human readable string. + + ub_ctx_print_local_zones + Debug printout the local authority information to debug output. + + ub_ctx_zone_add + Add new zone to local authority info, like local-zone + :doc:`unbound.conf(5)</manpages/unbound.conf>` statement. + + ub_ctx_zone_remove + Delete zone from local authority info. + + ub_ctx_data_add + Add resource record data to local authority info, like local-data + :doc:`unbound.conf(5)</manpages/unbound.conf>` statement. + + ub_ctx_data_remove + Delete local authority data from the name given. + +Result Data structure +--------------------- + +The result of the DNS resolution and validation is returned as *struct +ub_result*. +The result structure contains the following entries: + +.. code-block:: c + + struct ub_result { + char* qname; /* text string, original question */ + int qtype; /* type code asked for */ + int qclass; /* class code asked for */ + char** data; /* array of rdata items, NULL terminated*/ + int* len; /* array with lengths of rdata items */ + char* canonname; /* canonical name of result */ + int rcode; /* additional error code in case of no data */ + void* answer_packet; /* full network format answer packet */ + int answer_len; /* length of packet in octets */ + int havedata; /* true if there is data */ + int nxdomain; /* true if nodata because name does not exist */ + int secure; /* true if result is secure */ + int bogus; /* true if a security failure happened */ + char* why_bogus; /* string with error if bogus */ + int was_ratelimited; /* true if the query was ratelimited (SERVFAIL) by unbound */ + int ttl; /* number of seconds the result is valid */ + }; + +If both secure and bogus are false, security was not enabled for the domain of +the query. +Else, they are not both true, one of them is true. + +Return Values +------------- + +Many routines return an error code. +The value 0 (zero) denotes no error happened. +Other values can be passed to **ub_strerror** to obtain a readable error +string. +**ub_strerror** returns a zero terminated string. +**ub_ctx_create** returns NULL on an error (a malloc failure). +**ub_poll** returns true if some information may be available, false otherwise. +**ub_fd** returns a file descriptor or -1 on error. +**ub_ctx_config** and **ub_ctx_resolvconf** attempt to leave errno informative +on a function return with file read failure. + +See Also +-------- + +:doc:`unbound.conf(5)</manpages/unbound.conf>`, :doc:`unbound(8)</manpages/unbound>`. diff --git a/contrib/unbound/doc/unbound-anchor.8.in b/contrib/unbound/doc/unbound-anchor.8.in index f93c5d0cd045..6b75e3c3874f 100644 --- a/contrib/unbound/doc/unbound-anchor.8.in +++ b/contrib/unbound/doc/unbound-anchor.8.in @@ -1,189 +1,300 @@ -.TH "unbound-anchor" "8" "Jul 16, 2025" "NLnet Labs" "unbound 1.23.1" -.\" -.\" unbound-anchor.8 -- unbound anchor maintenance utility manual -.\" -.\" Copyright (c) 2008, NLnet Labs. All rights reserved. -.\" -.\" See LICENSE for the license. -.\" -.\" -.SH "NAME" -.B unbound\-anchor -\- Unbound anchor utility. -.SH "SYNOPSIS" -.B unbound\-anchor -.RB [ opts ] -.SH "DESCRIPTION" -.B Unbound\-anchor -performs setup or update of the root trust anchor for DNSSEC validation. -The program fetches the trust anchor with the method from RFC7958 when -regular RFC5011 update fails to bring it up to date. +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "UNBOUND-ANCHOR" "8" "Sep 18, 2025" "1.24.0" "Unbound" +.SH NAME +unbound-anchor \- Unbound 1.24.0 anchor utility. +.SH SYNOPSIS +.sp +\fBunbound\-anchor\fP [\fBopts\fP] +.SH DESCRIPTION +.sp +\fBunbound\-anchor\fP performs setup or update of the root trust anchor for DNSSEC +validation. +The program fetches the trust anchor with the method from \fI\%RFC 7958\fP when +regular \fI\%RFC 5011\fP update fails to bring it up to date. It can be run (as root) from the commandline, or run as part of startup -scripts. Before you start the \fIunbound\fR(8) DNS server. -.P +scripts. +Before you start the \fI\%unbound(8)\fP DNS server. +.sp Suggested usage: -.P +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - # in the init scripts. - # provide or update the root anchor (if necessary) - unbound-anchor \-a "@UNBOUND_ROOTKEY_FILE@" - # Please note usage of this root anchor is at your own risk - # and under the terms of our LICENSE (see source). - # - # start validating resolver - # the unbound.conf contains: - # auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" - unbound \-c unbound.conf +.ft C +# in the init scripts. +# provide or update the root anchor (if necessary) +unbound\-anchor \-a \(dq@UNBOUND_ROOTKEY_FILE@\(dq +# Please note usage of this root anchor is at your own risk +# and under the terms of our LICENSE (see source). +# +# start validating resolver +# the unbound.conf contains: +# auto\-trust\-anchor\-file: \(dq@UNBOUND_ROOTKEY_FILE@\(dq +unbound \-c unbound.conf +.ft P .fi -.P -This tool provides builtin default contents for the root anchor and root -update certificate files. -.P +.UNINDENT +.UNINDENT +.sp +This tool provides builtin default contents for the root anchor and root update +certificate files. +.sp It tests if the root anchor file works, and if not, and an update is possible, attempts to update the root anchor using the root update certificate. -It performs a https fetch of root-anchors.xml and checks the results (RFC7958), -if all checks are successful, it updates the root anchor file. Otherwise -the root anchor file is unchanged. It performs RFC5011 tracking if the -DNSSEC information available via the DNS makes that possible. -.P -It does not perform an update if the certificate is expired, if the network -is down or other errors occur. -.P +It performs a https fetch of +\fI\%root\-anchors.xml\fP +and checks the results (\fI\%RFC 7958\fP); if all checks are successful, it updates +the root anchor file. +Otherwise the root anchor file is unchanged. +It performs \fI\%RFC 5011\fP tracking if the DNSSEC information available via the +DNS makes that possible. +.sp +It does not perform an update if the certificate is expired, if the network is +down or other errors occur. +.sp The available options are: +.INDENT 0.0 .TP -.B \-a \fIfile +.B \-a <file> The root anchor key file, that is read in and written out. -Default is @UNBOUND_ROOTKEY_FILE@. -If the file does not exist, or is empty, a builtin root key is written to it. +Default is \fB@UNBOUND_ROOTKEY_FILE@\fP\&. +If the file does not exist, or is empty, a builtin root key is written +to it. +.UNINDENT +.INDENT 0.0 .TP -.B \-c \fIfile +.B \-c <file> The root update certificate file, that is read in. -Default is @UNBOUND_ROOTCERT_FILE@. +Default is \fB@UNBOUND_ROOTCERT_FILE@\fP\&. If the file does not exist, or is empty, a builtin certificate is used. +.UNINDENT +.INDENT 0.0 .TP .B \-l List the builtin root key and builtin root update certificate on stdout. +.UNINDENT +.INDENT 0.0 .TP -.B \-u \fIname -The server name, it connects to https://name. Specify without https:// prefix. -The default is "data.iana.org". It connects to the port specified with \-P. +.B \-u <name> +The server name, it connects to \fBhttps://name\fP\&. +Specify without \fBhttps://\fP prefix. +The default is \fB\(dqdata.iana.org\(dq\fP\&. +It connects to the port specified with \fI\%\-P\fP\&. You can pass an IPv4 address or IPv6 address (no brackets) if you want. +.UNINDENT +.INDENT 0.0 .TP .B \-S -Do not use SNI for the HTTPS connection. Default is to use SNI. +Do not use SNI for the HTTPS connection. +Default is to use SNI. +.UNINDENT +.INDENT 0.0 .TP -.B \-b \fIaddress -The source address to bind to for domain resolution and contacting the server -on https. May be either an IPv4 address or IPv6 address (no brackets). +.B \-b <address> +The source address to bind to for domain resolution and contacting the +server on https. +May be either an IPv4 address or IPv6 address (no brackets). +.UNINDENT +.INDENT 0.0 .TP -.B \-x \fIpath -The pathname to the root\-anchors.xml file on the server. (forms URL with \-u). -The default is /root\-anchors/root\-anchors.xml. +.B \-x <path> +The pathname to the root\-anchors.xml file on the server. +(forms URL with \fI\%\-u\fP). +The default is \fB/root\-anchors/root\-anchors.xml\fP\&. +.UNINDENT +.INDENT 0.0 .TP -.B \-s \fIpath -The pathname to the root\-anchors.p7s file on the server. (forms URL with \-u). -The default is /root\-anchors/root\-anchors.p7s. This file has to be a PKCS7 -signature over the xml file, using the pem file (\-c) as trust anchor. +.B \-s <path> +The pathname to the root\-anchors.p7s file on the server. +(forms URL with \fI\%\-u\fP). +The default is \fB/root\-anchors/root\-anchors.p7s\fP\&. +This file has to be a PKCS7 signature over the xml file, using the pem +file (\fI\%\-c\fP) as trust anchor. +.UNINDENT +.INDENT 0.0 .TP -.B \-n \fIname -The emailAddress for the Subject of the signer's certificate from the p7s -signature file. Only signatures from this name are allowed. default is -dnssec@iana.org. If you pass "" then the emailAddress is not checked. +.B \-n <name> +The emailAddress for the Subject of the signer\(aqs certificate from the +p7s signature file. +Only signatures from this name are allowed. +The default is \fBdnssec@iana.org\fP\&. +If you pass \fB\(dq\(dq\fP then the emailAddress is not checked. +.UNINDENT +.INDENT 0.0 .TP .B \-4 -Use IPv4 for domain resolution and contacting the server on https. Default is -to use IPv4 and IPv6 where appropriate. +Use IPv4 for domain resolution and contacting the server on +https. +Default is to use IPv4 and IPv6 where appropriate. +.UNINDENT +.INDENT 0.0 .TP .B \-6 -Use IPv6 for domain resolution and contacting the server on https. Default is -to use IPv4 and IPv6 where appropriate. -.TP -.B \-f \fIresolv.conf -Use the given resolv.conf file. Not enabled by default, but you could try to -pass /etc/resolv.conf on some systems. It contains the IP addresses of the -recursive nameservers to use. However, since this tool could be used to -bootstrap that very recursive nameserver, it would not be useful (since -that server is not up yet, since we are bootstrapping it). It could be -useful in a situation where you know an upstream cache is deployed (and -running) and in captive portal situations. -.TP -.B \-r \fIroot.hints -Use the given root.hints file (same syntax as the BIND and Unbound root hints -file) to bootstrap domain resolution. By default a list of builtin root -hints is used. Unbound\-anchor goes to the network itself for these roots, -to resolve the server (\-u option) and to check the root DNSKEY records. +Use IPv6 for domain resolution and contacting the server on https. +Default is to use IPv4 and IPv6 where appropriate. +.UNINDENT +.INDENT 0.0 +.TP +.B \-f <resolv.conf> +Use the given resolv.conf file. +Not enabled by default, but you could try to pass +\fB/etc/resolv.conf\fP on some systems. +It contains the IP addresses of the recursive nameservers to use. +However, since this tool could be used to bootstrap that very recursive +nameserver, it would not be useful (since that server is not up yet, +since we are bootstrapping it). +It could be useful in a situation where you know an upstream cache is +deployed (and running) and in captive portal situations. +.UNINDENT +.INDENT 0.0 +.TP +.B \-r <root.hints> +Use the given root.hints file (same syntax as the BIND and Unbound root +hints file) to bootstrap domain resolution. +By default a list of builtin root hints is used. +unbound\-anchor goes to the network itself for these roots, to resolve +the server (\fI\%\-u\fP option) and to check the root DNSKEY records. It does so, because the tool when used for bootstrapping the recursive -resolver, cannot use that recursive resolver itself because it is bootstrapping -that server. +resolver, cannot use that recursive resolver itself because it is +bootstrapping that server. +.UNINDENT +.INDENT 0.0 .TP .B \-R -Allow fallback from \-f resolv.conf file to direct root servers query. -It allows you to prefer local resolvers, but fallback automatically -to direct root query if they do not respond or do not support DNSSEC. +Allow fallback from \fI\%\-f\fP \fB<resolv.conf>\fP file to direct root +servers query. +It allows you to prefer local resolvers, but fallback automatically to +direct root query if they do not respond or do not support DNSSEC. +.UNINDENT +.INDENT 0.0 .TP .B \-v -More verbose. Once prints informational messages, multiple times may enable -large debug amounts (such as full certificates or byte\-dumps of downloaded -files). By default it prints almost nothing. It also prints nothing on -errors by default; in that case the original root anchor file is simply -left undisturbed, so that a recursive server can start right after it. +More verbose. +Once prints informational messages, multiple times may enable large +debug amounts (such as full certificates or byte\-dumps of downloaded +files). +By default it prints almost nothing. +It also prints nothing on errors by default; in that case the original +root anchor file is simply left undisturbed, so that a recursive server +can start right after it. +.UNINDENT +.INDENT 0.0 .TP -.B \-C \fIunbound.conf -Debug option to read unbound.conf into the resolver process used. +.B \-C <unbound.conf> +Debug option to read \fB<unbound.conf>\fP into the resolver process +used. +.UNINDENT +.INDENT 0.0 .TP -.B \-P \fIport -Set the port number to use for the https connection. The default is 443. +.B \-P <port> +Set the port number to use for the https connection. +The default is 443. +.UNINDENT +.INDENT 0.0 .TP .B \-F -Debug option to force update of the root anchor through downloading the xml -file and verifying it with the certificate. By default it first tries to -update by contacting the DNS, which uses much less bandwidth, is much -faster (200 msec not 2 sec), and is nicer to the deployed infrastructure. -With this option, it still attempts to do so (and may verbosely tell you), -but then ignores the result and goes on to use the xml fallback method. +Debug option to force update of the root anchor through downloading the +xml file and verifying it with the certificate. +By default it first tries to update by contacting the DNS, which uses +much less bandwidth, is much faster (200 msec not 2 sec), and is nicer +to the deployed infrastructure. +With this option, it still attempts to do so (and may verbosely tell +you), but then ignores the result and goes on to use the xml fallback +method. +.UNINDENT +.INDENT 0.0 .TP .B \-h Show the version and commandline option help. -.SH "EXIT CODE" +.UNINDENT +.SH EXIT CODE +.sp This tool exits with value 1 if the root anchor was updated using the -certificate or if the builtin root-anchor was used. It exits with code -0 if no update was necessary, if the update was possible with RFC5011 -tracking, or if an error occurred. -.P +certificate or if the builtin root\-anchor was used. +It exits with code 0 if no update was necessary, if the update was possible +with \fI\%RFC 5011\fP tracking, or if an error occurred. +.sp You can check the exit value in this manner: +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - unbound-anchor \-a "root.key" || logger "Please check root.key" +.ft C +unbound\-anchor \-a \(dqroot.key\(dq || logger \(dqPlease check root.key\(dq +.ft P .fi +.UNINDENT +.UNINDENT +.sp Or something more suitable for your operational environment. -.SH "TRUST" -The root keys and update certificate included in this tool -are provided for convenience and under the terms of our -license (see the LICENSE file in the source distribution or -https://github.com/NLnetLabs/unbound/blob/master/LICENSE) and might be stale or -not suitable to your purpose. -.P -By running "unbound\-anchor \-l" the keys and certificate that are +.SH TRUST +.sp +The root keys and update certificate included in this tool are provided for +convenience and under the terms of our license (see the LICENSE file in the +source distribution or \fI\%https://github.com/NLnetLabs/unbound/blob/master/LICENSE\fP +and might be stale or not suitable to your purpose. +.sp +By running \fI\%unbound\-anchor \-l\fP the keys and certificate that are configured in the code are printed for your convenience. -.P -The build\-in configuration can be overridden by providing a root\-cert -file and a rootkey file. -.SH "FILES" +.sp +The built\-in configuration can be overridden by providing a root\-cert file and +a rootkey file. +.SH FILES +.INDENT 0.0 .TP -.I @UNBOUND_ROOTKEY_FILE@ -The root anchor file, updated with 5011 tracking, and read and written to. +.B @UNBOUND_ROOTKEY_FILE@ +The root anchor file, updated with 5011 tracking, and read and written +to. The file is created if it does not exist. .TP -.I @UNBOUND_ROOTCERT_FILE@ -The trusted self\-signed certificate that is used to verify the downloaded -DNSSEC root trust anchor. You can update it by fetching it from -https://data.iana.org/root\-anchors/icannbundle.pem (and validate it). +.B @UNBOUND_ROOTCERT_FILE@ +The trusted self\-signed certificate that is used to verify the +downloaded DNSSEC root trust anchor. +You can update it by fetching it from +\fI\%https://data.iana.org/root\-anchors/icannbundle.pem\fP (and validate it). If the file does not exist or is empty, a builtin version is used. .TP -.I https://data.iana.org/root\-anchors/root\-anchors.xml +.B \fI\%https://data.iana.org/root\-anchors/root\-anchors.xml\fP Source for the root key information. .TP -.I https://data.iana.org/root\-anchors/root\-anchors.p7s +.B \fI\%https://data.iana.org/root\-anchors/root\-anchors.p7s\fP Signature on the root key information. -.SH "SEE ALSO" -\fIunbound.conf\fR(5), -\fIunbound\fR(8). +.UNINDENT +.SH SEE ALSO +.sp +\fI\%unbound.conf(5)\fP, +\fI\%unbound(8)\fP\&. +.SH AUTHOR +Unbound developers are mentioned in the CREDITS file in the distribution. +.SH COPYRIGHT +1999-2025, NLnet Labs +.\" Generated by docutils manpage writer. +. diff --git a/contrib/unbound/doc/unbound-anchor.rst b/contrib/unbound/doc/unbound-anchor.rst new file mode 100644 index 000000000000..480db8eeb8c9 --- /dev/null +++ b/contrib/unbound/doc/unbound-anchor.rst @@ -0,0 +1,281 @@ +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. program:: unbound-anchor + +unbound-anchor(8) +================= + +Synopsis +-------- + +**unbound-anchor** [``opts``] + +Description +----------- + +``unbound-anchor`` performs setup or update of the root trust anchor for DNSSEC +validation. +The program fetches the trust anchor with the method from :rfc:`7958` when +regular :rfc:`5011` update fails to bring it up to date. +It can be run (as root) from the commandline, or run as part of startup +scripts. +Before you start the :doc:`unbound(8)</manpages/unbound>` DNS server. + +Suggested usage: + +.. code-block:: text + + # in the init scripts. + # provide or update the root anchor (if necessary) + unbound-anchor -a "@UNBOUND_ROOTKEY_FILE@" + # Please note usage of this root anchor is at your own risk + # and under the terms of our LICENSE (see source). + # + # start validating resolver + # the unbound.conf contains: + # auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@" + unbound -c unbound.conf + +This tool provides builtin default contents for the root anchor and root update +certificate files. + +It tests if the root anchor file works, and if not, and an update is possible, +attempts to update the root anchor using the root update certificate. +It performs a https fetch of +`root-anchors.xml <http://data.iana.org/root-anchors/root-anchors.xml>`__ +and checks the results (:rfc:`7958`); if all checks are successful, it updates +the root anchor file. +Otherwise the root anchor file is unchanged. +It performs :rfc:`5011` tracking if the DNSSEC information available via the +DNS makes that possible. + +It does not perform an update if the certificate is expired, if the network is +down or other errors occur. + +The available options are: + +.. option:: -a <file> + + The root anchor key file, that is read in and written out. + Default is :file:`@UNBOUND_ROOTKEY_FILE@`. + If the file does not exist, or is empty, a builtin root key is written + to it. + +.. option:: -c <file> + + The root update certificate file, that is read in. + Default is :file:`@UNBOUND_ROOTCERT_FILE@`. + If the file does not exist, or is empty, a builtin certificate is used. + +.. option:: -l + + List the builtin root key and builtin root update certificate on stdout. + +.. option:: -u <name> + + The server name, it connects to ``https://name``. + Specify without ``https://`` prefix. + The default is ``"data.iana.org"``. + It connects to the port specified with :option:`-P`. + You can pass an IPv4 address or IPv6 address (no brackets) if you want. + +.. option:: -S + + Do not use SNI for the HTTPS connection. + Default is to use SNI. + +.. option:: -b <address> + + The source address to bind to for domain resolution and contacting the + server on https. + May be either an IPv4 address or IPv6 address (no brackets). + +.. option:: -x <path> + + The pathname to the root-anchors.xml file on the server. + (forms URL with :option:`-u`). + The default is :file:`/root-anchors/root-anchors.xml`. + +.. option:: -s <path> + + The pathname to the root-anchors.p7s file on the server. + (forms URL with :option:`-u`). + The default is :file:`/root-anchors/root-anchors.p7s`. + This file has to be a PKCS7 signature over the xml file, using the pem + file (:option:`-c`) as trust anchor. + +.. option:: -n <name> + + The emailAddress for the Subject of the signer's certificate from the + p7s signature file. + Only signatures from this name are allowed. + The default is ``dnssec@iana.org``. + If you pass ``""`` then the emailAddress is not checked. + +.. option:: -4 + + Use IPv4 for domain resolution and contacting the server on + https. + Default is to use IPv4 and IPv6 where appropriate. + +.. option:: -6 + + Use IPv6 for domain resolution and contacting the server on https. + Default is to use IPv4 and IPv6 where appropriate. + +.. option:: -f <resolv.conf> + + Use the given resolv.conf file. + Not enabled by default, but you could try to pass + :file:`/etc/resolv.conf` on some systems. + It contains the IP addresses of the recursive nameservers to use. + However, since this tool could be used to bootstrap that very recursive + nameserver, it would not be useful (since that server is not up yet, + since we are bootstrapping it). + It could be useful in a situation where you know an upstream cache is + deployed (and running) and in captive portal situations. + +.. option:: -r <root.hints> + + Use the given root.hints file (same syntax as the BIND and Unbound root + hints file) to bootstrap domain resolution. + By default a list of builtin root hints is used. + unbound-anchor goes to the network itself for these roots, to resolve + the server (:option:`-u` option) and to check the root DNSKEY records. + It does so, because the tool when used for bootstrapping the recursive + resolver, cannot use that recursive resolver itself because it is + bootstrapping that server. + +.. option:: -R + + Allow fallback from :option:`-f` ``<resolv.conf>`` file to direct root + servers query. + It allows you to prefer local resolvers, but fallback automatically to + direct root query if they do not respond or do not support DNSSEC. + +.. option:: -v + + More verbose. + Once prints informational messages, multiple times may enable large + debug amounts (such as full certificates or byte-dumps of downloaded + files). + By default it prints almost nothing. + It also prints nothing on errors by default; in that case the original + root anchor file is simply left undisturbed, so that a recursive server + can start right after it. + +.. option:: -C <unbound.conf> + + Debug option to read :file:`<unbound.conf>` into the resolver process + used. + +.. option:: -P <port> + + Set the port number to use for the https connection. + The default is 443. + +.. option:: -F + + Debug option to force update of the root anchor through downloading the + xml file and verifying it with the certificate. + By default it first tries to update by contacting the DNS, which uses + much less bandwidth, is much faster (200 msec not 2 sec), and is nicer + to the deployed infrastructure. + With this option, it still attempts to do so (and may verbosely tell + you), but then ignores the result and goes on to use the xml fallback + method. + +.. option:: -h + + Show the version and commandline option help. + +Exit Code +--------- + +This tool exits with value 1 if the root anchor was updated using the +certificate or if the builtin root-anchor was used. +It exits with code 0 if no update was necessary, if the update was possible +with :rfc:`5011` tracking, or if an error occurred. + +You can check the exit value in this manner: + +.. code-block:: text + + unbound-anchor -a "root.key" || logger "Please check root.key" + +Or something more suitable for your operational environment. + +Trust +----- + +The root keys and update certificate included in this tool are provided for +convenience and under the terms of our license (see the LICENSE file in the +source distribution or https://github.com/NLnetLabs/unbound/blob/master/LICENSE +and might be stale or not suitable to your purpose. + +By running :option:`unbound-anchor -l` the keys and certificate that are +configured in the code are printed for your convenience. + +The built-in configuration can be overridden by providing a root-cert file and +a rootkey file. + +Files +----- + +@UNBOUND_ROOTKEY_FILE@ + The root anchor file, updated with 5011 tracking, and read and written + to. + The file is created if it does not exist. + +@UNBOUND_ROOTCERT_FILE@ + The trusted self-signed certificate that is used to verify the + downloaded DNSSEC root trust anchor. + You can update it by fetching it from + https://data.iana.org/root-anchors/icannbundle.pem (and validate it). + If the file does not exist or is empty, a builtin version is used. + +https://data.iana.org/root-anchors/root-anchors.xml + Source for the root key information. + +https://data.iana.org/root-anchors/root-anchors.p7s + Signature on the root key information. + +See Also +-------- + +:doc:`unbound.conf(5)</manpages/unbound.conf>`, +:doc:`unbound(8)</manpages/unbound>`. diff --git a/contrib/unbound/doc/unbound-checkconf.8.in b/contrib/unbound/doc/unbound-checkconf.8.in index 8902784bf0c9..69f998a5b80f 100644 --- a/contrib/unbound/doc/unbound-checkconf.8.in +++ b/contrib/unbound/doc/unbound-checkconf.8.in @@ -1,56 +1,93 @@ -.TH "unbound-checkconf" "8" "Jul 16, 2025" "NLnet Labs" "unbound 1.23.1" -.\" -.\" unbound-checkconf.8 -- unbound configuration checker manual -.\" -.\" Copyright (c) 2007, NLnet Labs. All rights reserved. -.\" -.\" See LICENSE for the license. -.\" -.\" -.SH "NAME" -unbound\-checkconf -\- Check Unbound configuration file for errors. -.SH "SYNOPSIS" -.B unbound\-checkconf -.RB [ \-h ] -.RB [ \-f ] -.RB [ \-q ] -.RB [ \-o -.IR option ] -.RI [ cfgfile ] -.SH "DESCRIPTION" -.B Unbound\-checkconf -checks the configuration file for the -\fIunbound\fR(8) -DNS resolver for syntax and other errors. +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "UNBOUND-CHECKCONF" "8" "Sep 18, 2025" "1.24.0" "Unbound" +.SH NAME +unbound-checkconf \- Check Unbound 1.24.0 configuration file for errors. +.SH SYNOPSIS +.sp +\fBunbound\-checkconf\fP [\fB\-hf\fP] [\fB\-o option\fP] [cfgfile] +.SH DESCRIPTION +.sp +\fBunbound\-checkconf\fP checks the configuration file for the +\fI\%unbound(8)\fP DNS resolver for syntax and other errors. The config file syntax is described in -\fIunbound.conf\fR(5). -.P +\fI\%unbound.conf(5)\fP\&. +.sp The available options are: +.INDENT 0.0 .TP .B \-h Show the version and commandline option help. +.UNINDENT +.INDENT 0.0 .TP .B \-f -Print full pathname, with chroot applied to it. Use with the \-o option. -.TP -.B \-o\fI option -If given, after checking the config file the value of this option is -printed to stdout. For "" (disabled) options an empty line is printed. +Print full pathname, with chroot applied to it. +Use with the \fI\%\-o\fP option. +.UNINDENT +.INDENT 0.0 .TP .B \-q Make the operation quiet, suppress output on success. +.UNINDENT +.INDENT 0.0 +.TP +.B \-o <option> +If given, after checking the config file the value of this option is +printed to stdout. +For \fB\(dq\(dq\fP (disabled) options an empty line is printed. +.UNINDENT +.INDENT 0.0 .TP -.I cfgfile -The config file to read with settings for Unbound. It is checked. +.B cfgfile +The config file to read with settings for Unbound. +It is checked. If omitted, the config file at the default location is checked. -.SH "EXIT CODE" -The unbound\-checkconf program exits with status code 1 on error, -0 for a correct config file. -.SH "FILES" +.UNINDENT +.SH EXIT CODE +.sp +The \fBunbound\-checkconf\fP program exits with status code 1 on error, 0 for a +correct config file. +.SH FILES +.INDENT 0.0 .TP -.I @ub_conf_file@ +.B @ub_conf_file@ Unbound configuration file. -.SH "SEE ALSO" -\fIunbound.conf\fR(5), -\fIunbound\fR(8). +.UNINDENT +.SH SEE ALSO +.sp +\fI\%unbound.conf(5)\fP, +\fI\%unbound(8)\fP\&. +.SH AUTHOR +Unbound developers are mentioned in the CREDITS file in the distribution. +.SH COPYRIGHT +1999-2025, NLnet Labs +.\" Generated by docutils manpage writer. +. diff --git a/contrib/unbound/doc/unbound-checkconf.rst b/contrib/unbound/doc/unbound-checkconf.rst new file mode 100644 index 000000000000..fbaacbee7d8e --- /dev/null +++ b/contrib/unbound/doc/unbound-checkconf.rst @@ -0,0 +1,98 @@ +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. program:: unbound-checkconf + +unbound-checkconf(8) +==================== + +Synopsis +-------- + +**unbound-checkconf** [``-hf``] [``-o option``] [cfgfile] + +Description +----------- + +``unbound-checkconf`` checks the configuration file for the +:doc:`unbound(8)</manpages/unbound>` DNS resolver for syntax and other errors. +The config file syntax is described in +:doc:`unbound.conf(5)</manpages/unbound.conf>`. + +The available options are: + +.. option:: -h + + Show the version and commandline option help. + +.. option:: -f + + Print full pathname, with chroot applied to it. + Use with the :option:`-o` option. + +.. option:: -q + + Make the operation quiet, suppress output on success. + +.. option:: -o <option> + + If given, after checking the config file the value of this option is + printed to stdout. + For ``""`` (disabled) options an empty line is printed. + +.. option:: cfgfile + + The config file to read with settings for Unbound. + It is checked. + If omitted, the config file at the default location is checked. + +Exit Code +--------- + +The ``unbound-checkconf`` program exits with status code 1 on error, 0 for a +correct config file. + +Files +----- + +@ub_conf_file@ + Unbound configuration file. + +See Also +-------- + +:doc:`unbound.conf(5)</manpages/unbound.conf>`, +:doc:`unbound(8)</manpages/unbound>`. diff --git a/contrib/unbound/doc/unbound-control.8.in b/contrib/unbound/doc/unbound-control.8.in index f7a497782701..8586f4fb5a86 100644 --- a/contrib/unbound/doc/unbound-control.8.in +++ b/contrib/unbound/doc/unbound-control.8.in @@ -1,982 +1,1547 @@ -.TH "unbound-control" "8" "Jul 16, 2025" "NLnet Labs" "unbound 1.23.1" -.\" -.\" unbound-control.8 -- unbound remote control manual -.\" -.\" Copyright (c) 2008, NLnet Labs. All rights reserved. -.\" -.\" See LICENSE for the license. -.\" -.\" -.SH "NAME" -.B unbound\-control, -.B unbound\-control\-setup -\- Unbound remote server control utility. -.SH "SYNOPSIS" -.B unbound\-control -.RB [ \-hq ] -.RB [ \-c -.IR cfgfile ] -.RB [ \-s -.IR server ] -.IR command -.SH "DESCRIPTION" -.B Unbound\-control -performs remote administration on the \fIunbound\fR(8) DNS server. -It reads the configuration file, contacts the Unbound server over SSL -sends the command and displays the result. -.P +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "UNBOUND-CONTROL" "8" "Sep 18, 2025" "1.24.0" "Unbound" +.SH NAME +unbound-control \- Unbound 1.24.0 remote server control utility. +.SH SYNOPSIS +.sp +\fBunbound\-control\fP [\fB\-hq\fP] [\fB\-c cfgfile\fP] [\fB\-s server\fP] command +.SH DESCRIPTION +.sp +\fBunbound\-control\fP performs remote administration on the +\fI\%unbound(8)\fP DNS server. +It reads the configuration file, contacts the Unbound server over TLS sends the +command and displays the result. +.sp The available options are: +.INDENT 0.0 .TP .B \-h Show the version and commandline option help. -.TP -.B \-c \fIcfgfile -The config file to read with settings. If not given the default -config file @ub_conf_file@ is used. -.TP -.B \-s \fIserver[@port] -IPv4 or IPv6 address of the server to contact. If not given, the -address is read from the config file. +.UNINDENT +.INDENT 0.0 +.TP +.B \-c <cfgfile> +The config file to read with settings. +If not given the default config file +\fB@ub_conf_file@\fP is used. +.UNINDENT +.INDENT 0.0 +.TP +.B \-s <server[@port]> +IPv4 or IPv6 address of the server to contact. +If not given, the address is read from the config file. +.UNINDENT +.INDENT 0.0 .TP .B \-q -quiet, if the option is given it does not print anything if it works ok. -.SH "COMMANDS" +Quiet, if the option is given it does not print anything if it works ok. +.UNINDENT +.SH COMMANDS +.sp There are several commands that the server understands. -.TP -.B start -Start the server. Simply execs \fIunbound\fR(8). The Unbound executable -is searched for in the \fBPATH\fR set in the environment. It is started -with the config file specified using \fI\-c\fR or the default config file. -.TP -.B stop -Stop the server. The server daemon exits. -.TP -.B reload -Reload the server. This flushes the cache and reads the config file fresh. -.TP -.B reload_keep_cache +.INDENT 0.0 +.TP +.B start +Start the server. +Simply execs \fI\%unbound(8)\fP\&. +The \fBunbound\fP executable is searched for in the \fBPATH\fP set in the +environment. +It is started with the config file specified using \fI\%\-c\fP or the +default config file. +.UNINDENT +.INDENT 0.0 +.TP +.B stop +Stop the server. +The server daemon exits. +.UNINDENT +.INDENT 0.0 +.TP +.B reload +Reload the server. +This flushes the cache and reads the config file fresh. +.UNINDENT +.INDENT 0.0 +.TP +.B reload_keep_cache Reload the server but try to keep the RRset and message cache if (re)configuration allows for it. -That means the caches sizes and the number of threads must not change between -reloads. +That means the caches sizes and the number of threads must not change +between reloads. +.UNINDENT +.INDENT 0.0 .TP -.B fast_reload \fR[\fI+dpv\fR] +.B fast_reload [\fB+dpv\fP] Reload the server, but keep downtime to a minimum, so that user queries -keep seeing service. This needs the code compiled with threads. The config -is loaded in a thread, and prepared, then it briefly pauses the existing -server and updates config options. The intent is that the pause does not -impact the service of user queries. The cache is kept. Also user queries -worked on are kept and continue, but with the new config options. -.IP +keep seeing service. +This needs the code compiled with threads. +The config is loaded in a thread, and prepared, then it briefly pauses the +existing server and updates config options. +The intent is that the pause does not impact the service of user queries. +The cache is kept. +Also user queries worked on are kept and continue, but with the new config +options. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 This command is experimental at this time. -.IP +.UNINDENT +.UNINDENT +.sp The amount of temporal memory needed during a fast_reload is twice the amount needed for configuration. -This is because Unbound temporarily needs to store both current configuration -values and new ones while trying to fast_reload. +This is because Unbound temporarily needs to store both current +configuration values and new ones while trying to fast_reload. Zones loaded from disk (authority zones and RPZ zones) are included in such memory needs. -.IP +.sp Options that can be changed are for -forwards, -stubs, -views, -authority zones, -RPZ zones and -local zones. -.IP +\fI\%forwards\fP, +\fI\%stubs\fP, +\fI\%views\fP, +\fI\%authority zones\fP, +\fI\%RPZ zones\fP and +\fI\%local zones\fP\&. +.sp Also -access-control and similar options, -interface-action and similar options and -tcp-connection-limit. +\fI\%access\-control\fP and similar options, +\fI\%interface\-action\fP and similar +options and +\fI\%tcp\-connection\-limit\fP\&. It can reload some -define-tag +\fI\%define\-tag\fP changes, more on that below. Further options include -insecure-lan-zones, -domain-insecure, -trust-anchor-file, -trust-anchor, -trusted-keys-file, -auto-trust-anchor-file, -edns-client-string, +\fI\%insecure\-lan\-zones\fP, +\fI\%domain\-insecure\fP, +\fI\%trust\-anchor\-file\fP, +\fI\%trust\-anchor\fP, +\fI\%trusted\-keys\-file\fP, +\fI\%auto\-trust\-anchor\-file\fP, +\fI\%edns\-client\-string\fP, ipset, -log-identity, -infra-cache-numhosts, -msg-cache-size, -rrset-cache-size, -key-cache-size, -ratelimit-size, -neg-cache-size, -num-queries-per-thread, -jostle-timeout, -use-caps-for-id, -unwanted-reply-threshold, -tls-use-sni, -outgoing-tcp-mss, -ip-dscp, -max-reuse-tcp-queries, -tcp-reuse-timeout, -tcp-auth-query-timeout, -delay-close. -.IP +\fI\%log\-identity\fP, +\fI\%infra\-cache\-numhosts\fP, +\fI\%msg\-cache\-size\fP, +\fI\%rrset\-cache\-size\fP, +\fI\%key\-cache\-size\fP, +\fI\%ratelimit\-size\fP, +\fI\%neg\-cache\-size\fP, +\fI\%num\-queries\-per\-thread\fP, +\fI\%jostle\-timeout\fP, +\fI\%use\-caps\-for\-id\fP, +\fI\%unwanted\-reply\-threshold\fP, +\fI\%tls\-use\-sni\fP, +\fI\%outgoing\-tcp\-mss\fP, +\fI\%ip\-dscp\fP, +\fI\%max\-reuse\-tcp\-queries\fP, +\fI\%tcp\-reuse\-timeout\fP, +\fI\%tcp\-auth\-query\-timeout\fP, +\fI\%delay\-close\fP\&. +.sp It does not work with -interface and -outgoing-interface changes, +\fI\%interface\fP and +\fI\%outgoing\-interface\fP changes, also not with -remote control, -outgoing-port-permit, -outgoing-port-avoid, -msg-buffer-size, -any **\*-slabs** options and -statistics-interval changes. -.IP -For dnstap these options can be changed: -dnstap-log-resolver-query-messages, -dnstap-log-resolver-response-messages, -dnstap-log-client-query-messages, -dnstap-log-client-response-messages, -dnstap-log-forwarder-query-messages and -dnstap-log-forwarder-response-messages. -.IP +\fI\%remote control\fP, +\fI\%outgoing\-port\-permit\fP, +\fI\%outgoing\-port\-avoid\fP, +\fI\%msg\-buffer\-size\fP, +any \fB*\-slabs\fP options and +\fI\%statistics\-interval\fP changes. +.sp +For \fI\%dnstap\fP these options can be changed: +\fI\%dnstap\-log\-resolver\-query\-messages\fP, +\fI\%dnstap\-log\-resolver\-response\-messages\fP, +\fI\%dnstap\-log\-client\-query\-messages\fP, +\fI\%dnstap\-log\-client\-response\-messages\fP, +\fI\%dnstap\-log\-forwarder\-query\-messages\fP and +\fI\%dnstap\-log\-forwarder\-response\-messages\fP\&. +.sp It does not work with these options: -dnstap-enable, -dnstap-bidirectional, -dnstap-socket-path, -dnstap-ip, -dnstap-tls, -dnstap-tls-server-name, -dnstap-tls-cert-bundle, -dnstap-tls-client-key-file and -dnstap-tls-client-cert-file. -.IP +\fI\%dnstap\-enable\fP, +\fI\%dnstap\-bidirectional\fP, +\fI\%dnstap\-socket\-path\fP, +\fI\%dnstap\-ip\fP, +\fI\%dnstap\-tls\fP, +\fI\%dnstap\-tls\-server\-name\fP, +\fI\%dnstap\-tls\-cert\-bundle\fP, +\fI\%dnstap\-tls\-client\-key\-file\fP and +\fI\%dnstap\-tls\-client\-cert\-file\fP\&. +.sp The options -dnstap-send-identity, -dnstap-send-version, -dnstap-identity, and -dnstap-version can be loaded -when ``+p`` is not used. -.IP -The '+v' option makes the output verbose which includes the time it took to do -the reload. -With '+vv' it is more verbose which includes the amount of memory that was -allocated temporarily to perform the reload; this amount of memory can be big -if the config has large contents. -In the timing output the 'reload' time is the time during which the server was -paused. -.IP -The '+p' option makes the reload not pause threads, they keep running. +\fI\%dnstap\-send\-identity\fP, +\fI\%dnstap\-send\-version\fP, +\fI\%dnstap\-identity\fP, and +\fI\%dnstap\-version\fP can be loaded +when \fB+p\fP is not used. +.sp +The \fB+v\fP option makes the output verbose which includes the time it took +to do the reload. +With \fB+vv\fP it is more verbose which includes the amount of memory that +was allocated temporarily to perform the reload; this amount of memory can +be big if the config has large contents. +In the timing output the \(aqreload\(aq time is the time during which the server +was paused. +.sp +The \fB+p\fP option makes the reload not pause threads, they keep running. Locks are acquired, but items are updated in sequence, so it is possible for threads to see an inconsistent state with some options from the old and some options from the new config, such as cache TTL parameters from the -old config and forwards from the new config. The stubs and forwards are -updated at the same time, so that they are viewed consistently, either old -or new values together. The option makes the reload time take eg. 3 -microseconds instead of 0.3 milliseconds during which the worker threads are -interrupted. So, the interruption is much shorter, at the expense of some -inconsistency. After the reload itself, every worker thread is briefly -contacted to make them release resources, this makes the delete timing -a little longer, and takes up time from the remote control servicing -worker thread. -.IP -With the nopause option, the reload does not work to reload some options, -that fast reload works on without the nopause option: val-bogus-ttl, -val-override-date, val-sig-skew-min, val-sig-skew-max, val-max-restart, -val-nsec3-keysize-iterations, target-fetch-policy, outbound-msg-retry, -max-sent-count, max-query-restarts, do-not-query-address, -do-not-query-localhost, private-address, private-domain, caps-exempt, -nat64-prefix, do-nat64, infra-host-ttl, infra-keep-probing, ratelimit, -ip-ratelimit, ip-ratelimit-cookie, wait-limit-netblock, -wait-limit-cookie-netblock, ratelimit-below-domain, ratelimit-for-domain. -.IP -The '+d' option makes the reload drop queries that the worker threads are -working on. This is like flush_requestlist. Without it the queries are kept -so that users keep getting answers for those queries that are currently -processed. The drop makes it so that queries during the life time of the +old config and forwards from the new config. +The stubs and forwards are updated at the same time, so that they are +viewed consistently, either old or new values together. +The option makes the reload time take eg. 3 microseconds instead of 0.3 +milliseconds during which the worker threads are interrupted. +So, the interruption is much shorter, at the expense of some inconsistency. +After the reload itself, every worker thread is briefly contacted to make +them release resources, this makes the delete timing a little longer, and +takes up time from the remote control servicing worker thread. +.sp +With the nopause option (\fB+p\fP), the reload does not work to reload some +options, that fast reload works on without the nopause option: +\fI\%val\-bogus\-ttl\fP, +\fI\%val\-override\-date\fP, +\fI\%val\-sig\-skew\-min\fP, +\fI\%val\-sig\-skew\-max\fP, +\fI\%val\-max\-restart\fP, +\fI\%val\-nsec3\-keysize\-iterations\fP, +\fI\%target\-fetch\-policy\fP, +\fI\%outbound\-msg\-retry\fP, +\fI\%max\-sent\-count\fP, +\fI\%max\-query\-restarts\fP, +\fI\%do\-not\-query\-address\fP, +\fI\%do\-not\-query\-localhost\fP, +\fI\%private\-address\fP, +\fI\%private\-domain\fP, +\fI\%caps\-exempt\fP, +\fI\%nat64\-prefix\fP, +\fI\%do\-nat64\fP, +\fI\%infra\-host\-ttl\fP, +\fI\%infra\-keep\-probing\fP, +\fI\%ratelimit\fP, +\fI\%ip\-ratelimit\fP, +\fI\%ip\-ratelimit\-cookie\fP, +\fI\%wait\-limit\-netblock\fP, +\fI\%wait\-limit\-cookie\-netblock\fP, +\fI\%ratelimit\-below\-domain\fP, +\fI\%ratelimit\-for\-domain\fP\&. +.sp +The \fB+d\fP option makes the reload drop queries that the worker threads are +working on. +This is like +\fI\%flush_requestlist\fP\&. +Without it the queries are kept so that users keep getting answers for +those queries that are currently processed. +The drop makes it so that queries during the life time of the query processing see only old, or only new config options. -.IP -When there are changes to the config tags, from the \fBdefine\-tag\fR option, -then the '+d' option is implicitly turned on with a warning printout, and +.sp +When there are changes to the config tags, from the +\fI\%define\-tag\fP option, +then the \fB+d\fP option is implicitly turned on with a warning printout, and queries are dropped. This is to stop references to the old tag information, by the old -queries. If the number of tags is increased in the newly loaded config, by -adding tags at the end, then the implicit '+d' option is not needed. -.IP +queries. +If the number of tags is increased in the newly loaded config, by +adding tags at the end, then the implicit \fB+d\fP option is not needed. +.sp For response ip, that is actions associated with IP addresses, and perhaps intersected with access control tag and action information, those settings are stored with a query when it comes in based on its source IP address. The old information is kept with the query until the queries are done. -This is gone when those queries are resolved and finished, or it is possible -to flush the requestlist with '+d'. -.TP -.B verbosity \fInumber -Change verbosity value for logging. Same values as \fBverbosity\fR keyword in -\fIunbound.conf\fR(5). This new setting lasts until the server is issued -a reload (taken from config file again), or the next verbosity control command. -.TP -.B log_reopen -Reopen the logfile, close and open it. Useful for logrotation to make the -daemon release the file it is logging to. If you are using syslog it will -attempt to close and open the syslog (which may not work if chrooted). -.TP -.B stats -Print statistics. Resets the internal counters to zero, this can be -controlled using the \fBstatistics\-cumulative\fR config statement. -Statistics are printed with one [name]: [value] per line. -.TP -.B stats_noreset -Peek at statistics. Prints them like the \fBstats\fR command does, but does not -reset the internal counters to zero. -.TP -.B status -Display server status. Exit code 3 if not running (the connection to the -port is refused), 1 on error, 0 if running. -.TP -.B local_zone \fIname\fR \fItype -Add new local zone with name and type. Like \fBlocal\-zone\fR config statement. +This is gone when those queries are resolved and finished, or it is +possible to flush the requestlist with \fB+d\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B verbosity \fInumber\fP +Change verbosity value for logging. +Same values as the \fBverbosity:\fP keyword in +\fI\%unbound.conf(5)\fP\&. +This new setting lasts until the server is issued a reload (taken from +config file again), or the next verbosity control command. +.UNINDENT +.INDENT 0.0 +.TP +.B log_reopen +Reopen the logfile, close and open it. +Useful for logrotation to make the daemon release the file it is logging +to. +If you are using syslog it will attempt to close and open the syslog (which +may not work if chrooted). +.UNINDENT +.INDENT 0.0 +.TP +.B stats +Print statistics. +Resets the internal counters to zero, this can be controlled using the +\fBstatistics\-cumulative:\fP config statement. +Statistics are printed with one \fB[name]: [value]\fP per line. +.UNINDENT +.INDENT 0.0 +.TP +.B stats_noreset +Peek at statistics. +Prints them like the stats command does, but does not reset the internal +counters to zero. +.UNINDENT +.INDENT 0.0 +.TP +.B status +Display server status. +Exit code 3 if not running (the connection to the port is refused), 1 on +error, 0 if running. +.UNINDENT +.INDENT 0.0 +.TP +.B local_zone \fIname type\fP +Add new local zone with name and type. +Like local\-zone config statement. If the zone already exists, the type is changed to the given argument. -.TP -.B local_zone_remove \fIname -Remove the local zone with the given name. Removes all local data inside -it. If the zone does not exist, the command succeeds. -.TP -.B local_data \fIRR data... -Add new local data, the given resource record. Like \fBlocal\-data\fR -config statement, except for when no covering zone exists. In that case -this remote control command creates a transparent zone with the same -name as this record. -.TP -.B local_data_remove \fIname -Remove all RR data from local name. If the name already has no items, -nothing happens. Often results in NXDOMAIN for the name (in a static zone), -but if the name has become an empty nonterminal (there is still data in -domain names below the removed name), NOERROR nodata answers are the -result for that name. -.TP -.B local_zones -Add local zones read from stdin of unbound\-control. Input is read per line, -with name space type on a line. For bulk additions. -.TP -.B local_zones_remove -Remove local zones read from stdin of unbound\-control. Input is one name per -line. For bulk removals. -.TP -.B local_datas -Add local data RRs read from stdin of unbound\-control. Input is one RR per -line. For bulk additions. -.TP -.B local_datas_remove -Remove local data RRs read from stdin of unbound\-control. Input is one name per -line. For bulk removals. -.TP -.B dump_cache -The content of the cache is printed in a text format to stdout. +.UNINDENT +.INDENT 0.0 +.TP +.B local_zone_remove \fIname\fP +Remove the local zone with the given name. +Removes all local data inside it. +If the zone does not exist, the command succeeds. +.UNINDENT +.INDENT 0.0 +.TP +.B local_data \fIRR data...\fP +Add new local data, the given resource record. +Like \fBlocal\-data:\fP keyword, except for when no covering zone exists. +In that case this remote control command creates a transparent zone with +the same name as this record. +.UNINDENT +.INDENT 0.0 +.TP +.B local_data_remove \fIname\fP +Remove all RR data from local name. +If the name already has no items, nothing happens. +Often results in NXDOMAIN for the name (in a static zone), but if the name +has become an empty nonterminal (there is still data in domain names below +the removed name), NOERROR nodata answers are the result for that name. +.UNINDENT +.INDENT 0.0 +.TP +.B local_zones +Add local zones read from stdin of unbound\-control. +Input is read per line, with name space type on a line. +For bulk additions. +.UNINDENT +.INDENT 0.0 +.TP +.B local_zones_remove +Remove local zones read from stdin of unbound\-control. +Input is one name per line. +For bulk removals. +.UNINDENT +.INDENT 0.0 +.TP +.B local_datas +Add local data RRs read from stdin of unbound\-control. +Input is one RR per line. +For bulk additions. +.UNINDENT +.INDENT 0.0 +.TP +.B local_datas_remove +Remove local data RRs read from stdin of unbound\-control. +Input is one name per line. +For bulk removals. +.UNINDENT +.INDENT 0.0 +.TP +.B dump_cache +The contents of the cache is printed in a text format to stdout. You can redirect it to a file to store the cache in a file. -Not supported in remote Unbounds in multi-process operation. +Not supported in remote Unbounds in multi\-process operation. +.UNINDENT +.INDENT 0.0 .TP -.B load_cache -The content of the cache is loaded from stdin. +.B load_cache +The contents of the cache is loaded from stdin. Uses the same format as dump_cache uses. Loading the cache with old, or wrong data can result in old or wrong data returned to clients. Loading data into the cache in this way is supported in order to aid with debugging. -Not supported in remote Unbounds in multi-process operation. -.TP -.B lookup \fIname -Print to stdout the name servers that would be used to look up the -name specified. -.TP -.B flush \fR[\fI+c\fR] \fIname -Remove the name from the cache. Removes the types -A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV, NAPTR, SVCB and HTTPS. -Because that is fast to do. Other record types can be removed using -.B flush_type -or -.B flush_zone\fR. -.IP -The '+c' option removes the items also from the cachedb cache. If -cachedb is in use. -.TP -.B flush_type \fR[\fI+c\fR] \fIname\fR \fItype +Not supported in remote Unbounds in multi\-process operation. +.UNINDENT +.INDENT 0.0 +.TP +.B cache_lookup [\fB+t\fP] \fInames\fP +Print to stdout the RRsets and messages that are in the cache. +For every name listed the content at or under the name is printed. +Several names separated by spaces can be given, each is printed. +When subnetcache is enabled, also matching entries from the subnet +cache are printed. +.sp +The \fB+t\fP option allows tld and root names. +With it names like \(aqcom\(aq and \(aq.\(aq can be used, but it takes a lot of +effort to look up in the cache. +.UNINDENT +.INDENT 0.0 +.TP +.B lookup \fIname\fP +Print to stdout the name servers that would be used to look up the name +specified. +.UNINDENT +.INDENT 0.0 +.TP +.B flush [\fB+c\fP] \fIname\fP +Remove the name from the cache. +Removes the types A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV, NAPTR, +SVCB and HTTPS. +Because that is fast to do. +Other record types can be removed using \fBflush_type\fP or \fBflush_zone\fP\&. +.sp +The \fB+c\fP option removes the items also from the cachedb cache. +If cachedb is in use. +.UNINDENT +.INDENT 0.0 +.TP +.B flush_type [\fB+c\fP] \fIname type\fP Remove the name, type information from the cache. +.sp +The \fB+c\fP option removes the items also from the cachedb cache. +If cachedb is in use. +.UNINDENT +.INDENT 0.0 .TP -.B flush_zone \fR[\fI+c\fR] \fIname +.B flush_zone [\fB+c\fP] name Remove all information at or below the name from the cache. -The rrsets and key entries are removed so that new lookups will be performed. +The rrsets and key entries are removed so that new lookups will be +performed. This needs to walk and inspect the entire cache, and is a slow operation. The entries are set to expired in the implementation of this command (so, -with serve\-expired enabled, it'll serve that information but schedule a +with serve\-expired enabled, it\(aqll serve that information but schedule a prefetch for new information). +.sp +The \fB+c\fP option removes the items also from the cachedb cache. +If cachedb is in use. +.UNINDENT +.INDENT 0.0 .TP -.B flush_bogus \fR[\fI+c\fR] +.B flush_bogus [\fB+c\fP] Remove all bogus data from the cache. -.TP -.B flush_negative \fR[\fI+c\fR] -Remove all negative data from the cache. This is nxdomain answers, -nodata answers and servfail answers. Also removes bad key entries -(which could be due to failed lookups) from the dnssec key cache, and -iterator last-resort lookup failures from the rrset cache. -.TP -.B flush_stats +.sp +The \fB+c\fP option removes the items also from the cachedb cache. +If cachedb is in use. +.UNINDENT +.INDENT 0.0 +.TP +.B flush_negative [\fB+c\fP] +Remove all negative data from the cache. +This is nxdomain answers, nodata answers and servfail answers. +Also removes bad key entries (which could be due to failed lookups) from +the dnssec key cache, and iterator last\-resort lookup failures from the +rrset cache. +.sp +The \fB+c\fP option removes the items also from the cachedb cache. +If cachedb is in use. +.UNINDENT +.INDENT 0.0 +.TP +.B flush_stats Reset statistics to zero. -.TP -.B flush_requestlist -Drop the queries that are worked on. Stops working on the queries that the -server is working on now. The cache is unaffected. No reply is sent for -those queries, probably making those users request again later. +.UNINDENT +.INDENT 0.0 +.TP +.B flush_requestlist +Drop the queries that are worked on. +Stops working on the queries that the server is working on now. +The cache is unaffected. +No reply is sent for those queries, probably making those users request +again later. Useful to make the server restart working on queries with new settings, such as a higher verbosity level. -.TP -.B dump_requestlist -Show what is worked on. Prints all queries that the server is currently -working on. Prints the time that users have been waiting. For internal -requests, no time is printed. And then prints out the module status. +.UNINDENT +.INDENT 0.0 +.TP +.B dump_requestlist +Show what is worked on. +Prints all queries that the server is currently working on. +Prints the time that users have been waiting. +For internal requests, no time is printed. +And then prints out the module status. This prints the queries from the first thread, and not queries that are being serviced from other threads. -.TP -.B flush_infra \fIall|IP -If all then entire infra cache is emptied. If a specific IP address, the -entry for that address is removed from the cache. It contains EDNS, ping -and lameness data. -.TP -.B dump_infra +.UNINDENT +.INDENT 0.0 +.TP +.B flush_infra \fIall|IP\fP +If all then entire infra cache is emptied. +If a specific IP address, the entry for that address is removed from the +cache. +It contains EDNS, ping and lameness data. +.UNINDENT +.INDENT 0.0 +.TP +.B dump_infra Show the contents of the infra cache. -.TP -.B set_option \fIopt: val -Set the option to the given value without a reload. The cache is -therefore not flushed. The option must end with a ':' and whitespace -must be between the option and the value. Some values may not have an -effect if set this way, the new values are not written to the config file, -not all options are supported. This is different from the set_option call -in libunbound, where all values work because Unbound has not been initialized. -.IP +.UNINDENT +.INDENT 0.0 +.TP +.B set_option \fIopt: val\fP +Set the option to the given value without a reload. +The cache is therefore not flushed. +The option must end with a \fB\(aq:\(aq\fP and whitespace must be between the +option and the value. +Some values may not have an effect if set this way, the new values are not +written to the config file, not all options are supported. +This is different from the set_option call in libunbound, where all values +work because Unbound has not been initialized. +.sp The values that work are: statistics\-interval, statistics\-cumulative, -do\-not\-query\-localhost, harden\-short\-bufsize, harden\-large\-queries, +do\-not\-query\-localhost, harden\-short\-bufsize, harden\-large\-queries, harden\-glue, harden\-dnssec\-stripped, harden\-below\-nxdomain, -harden\-referral\-path, prefetch, prefetch\-key, log\-queries, -hide\-identity, hide\-version, identity, version, val\-log\-level, -val\-log\-squelch, ignore\-cd\-flag, add\-holddown, del\-holddown, -keep\-missing, tcp\-upstream, ssl\-upstream, max\-udp\-size, ratelimit, -ip\-ratelimit, cache\-max\-ttl, cache\-min\-ttl, cache\-max\-negative\-ttl. -.TP -.B get_option \fIopt -Get the value of the option. Give the option name without a trailing ':'. -The value is printed. If the value is "", nothing is printed -and the connection closes. On error 'error ...' is printed (it gives -a syntax error on unknown option). For some options a list of values, -one on each line, is printed. The options are shown from the config file -as modified with set_option. For some options an override may have been -taken that does not show up with this command, not results from e.g. the -verbosity and forward control commands. Not all options work, see list_stubs, -list_forwards, list_local_zones and list_local_data for those. -.TP -.B list_stubs -List the stub zones in use. These are printed one by one to the output. +harden\-referral\-path, prefetch, prefetch\-key, log\-queries, hide\-identity, +hide\-version, identity, version, val\-log\-level, val\-log\-squelch, +ignore\-cd\-flag, add\-holddown, del\-holddown, keep\-missing, tcp\-upstream, +ssl\-upstream, max\-udp\-size, ratelimit, ip\-ratelimit, cache\-max\-ttl, +cache\-min\-ttl, cache\-max\-negative\-ttl. +.UNINDENT +.INDENT 0.0 +.TP +.B get_option \fIopt\fP +Get the value of the option. +Give the option name without a trailing \fB\(aq:\(aq\fP\&. +The value is printed. +If the value is \fB\(dq\(dq\fP, nothing is printed and the connection closes. +On error \fB\(aqerror ...\(aq\fP is printed (it gives a syntax error on unknown +option). +For some options a list of values, one on each line, is printed. +The options are shown from the config file as modified with set_option. +For some options an override may have been taken that does not show up with +this command, not results from e.g. the verbosity and forward control +commands. +Not all options work, see list_stubs, list_forwards, list_local_zones and +list_local_data for those. +.UNINDENT +.INDENT 0.0 +.TP +.B list_stubs +List the stub zones in use. +These are printed one by one to the output. This includes the root hints in use. +.UNINDENT +.INDENT 0.0 .TP -.B list_forwards -List the forward zones in use. These are printed zone by zone to the output. +.B list_forwards +List the forward zones in use. +These are printed zone by zone to the output. +.UNINDENT +.INDENT 0.0 .TP -.B list_insecure +.B list_insecure List the zones with domain\-insecure. -.TP -.B list_local_zones -List the local zones in use. These are printed one per line with zone type. -.TP -.B list_local_data -List the local data RRs in use. The resource records are printed. -.TP -.B insecure_add \fIzone -Add a \fBdomain\-insecure\fR for the given zone, like the statement in unbound.conf. -Adds to the running Unbound without affecting the cache contents (which may -still be bogus, use \fBflush_zone\fR to remove it), does not affect the config file. -.TP -.B insecure_remove \fIzone +.UNINDENT +.INDENT 0.0 +.TP +.B list_local_zones +List the local zones in use. +These are printed one per line with zone type. +.UNINDENT +.INDENT 0.0 +.TP +.B list_local_data +List the local data RRs in use. +The resource records are printed. +.UNINDENT +.INDENT 0.0 +.TP +.B insecure_add \fIzone\fP +Add a domain\-insecure for the given zone, like the statement in +unbound.conf. +Adds to the running Unbound without affecting the cache +contents (which may still be bogus, use flush_zone to remove it), does not +affect the config file. +.UNINDENT +.INDENT 0.0 +.TP +.B insecure_remove \fIzone\fP Removes domain\-insecure for the given zone. -.TP -.B forward_add \fR[\fI+it\fR] \fIzone addr ... -Add a new forward zone to running Unbound. With +i option also adds a -\fIdomain\-insecure\fR for the zone (so it can resolve insecurely if you have -a DNSSEC root trust anchor configured for other names). -The addr can be IP4, IP6 or nameserver names, like \fIforward-zone\fR config -in unbound.conf. -The +t option sets it to use tls upstream, like \fIforward\-tls\-upstream\fR: yes. -.TP -.B forward_remove \fR[\fI+i\fR] \fIzone -Remove a forward zone from running Unbound. The +i also removes a -\fIdomain\-insecure\fR for the zone. -.TP -.B stub_add \fR[\fI+ipt\fR] \fIzone addr ... -Add a new stub zone to running Unbound. With +i option also adds a -\fIdomain\-insecure\fR for the zone. With +p the stub zone is set to prime, -without it it is set to notprime. The addr can be IP4, IP6 or nameserver -names, like the \fIstub-zone\fR config in unbound.conf. -The +t option sets it to use tls upstream, like \fIstub\-tls\-upstream\fR: yes. -.TP -.B stub_remove \fR[\fI+i\fR] \fIzone -Remove a stub zone from running Unbound. The +i also removes a -\fIdomain\-insecure\fR for the zone. -.TP -.B forward \fR[\fIoff\fR | \fIaddr ...\fR ] -Setup forwarding mode. Configures if the server should ask other upstream -nameservers, should go to the internet root nameservers itself, or show -the current config. You could pass the nameservers after a DHCP update. -.IP +.UNINDENT +.INDENT 0.0 +.TP +.B forward_add [\fB+it\fP] \fIzone addr ...\fP +Add a new forward zone to running Unbound. +With \fB+i\fP option also adds a domain\-insecure for the zone (so it can +resolve insecurely if you have a DNSSEC root trust anchor configured for +other names). +The addr can be IP4, IP6 or nameserver names, like forward\-zone config in +unbound.conf. +The \fB+t\fP option sets it to use TLS upstream, like +\fI\%forward\-tls\-upstream: yes\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B forward_remove [\fB+i\fP] \fIzone\fP +Remove a forward zone from running Unbound. +The \fB+i\fP also removes a domain\-insecure for the zone. +.UNINDENT +.INDENT 0.0 +.TP +.B stub_add [\fB+ipt\fP] \fIzone addr ...\fP +Add a new stub zone to running Unbound. +With \fB+i\fP option also adds a domain\-insecure for the zone. +With \fB+p\fP the stub zone is set to prime, without it it is set to +notprime. +The addr can be IP4, IP6 or nameserver names, like the \fBstub\-zone:\fP +config in unbound.conf. +The \fB+t\fP option sets it to use TLS upstream, like +\fI\%stub\-tls\-upstream: yes\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B stub_remove [\fB+i\fP] \fIzone\fP +Remove a stub zone from running Unbound. +The \fB+i\fP also removes a domain\-insecure for the zone. +.UNINDENT +.INDENT 0.0 +.TP +.B forward [\fIoff\fP | \fIaddr ...\fP ] +Setup forwarding mode. +Configures if the server should ask other upstream nameservers, should go +to the internet root nameservers itself, or show the current config. +You could pass the nameservers after a DHCP update. +.sp Without arguments the current list of addresses used to forward all queries -to is printed. On startup this is from the forward\-zone "." configuration. -Afterwards it shows the status. It prints off when no forwarding is used. -.IP -If \fIoff\fR is passed, forwarding is disabled and the root nameservers -are used. This can be used to avoid to avoid buggy or non\-DNSSEC supporting -nameservers returned from DHCP. But may not work in hotels or hotspots. -.IP -If one or more IPv4 or IPv6 addresses are given, those are then used to forward -queries to. The addresses must be separated with spaces. With '@port' the -port number can be set explicitly (default port is 53 (DNS)). -.IP -By default the forwarder information from the config file for the root "." is -used. The config file is not changed, so after a reload these changes are -gone. Other forward zones from the config file are not affected by this command. -.TP -.B ratelimit_list \fR[\fI+a\fR] -List the domains that are ratelimited. Printed one per line with current -estimated qps and qps limit from config. With +a it prints all domains, not -just the ratelimited domains, with their estimated qps. The ratelimited -domains return an error for uncached (new) queries, but cached queries work -as normal. -.TP -.B ip_ratelimit_list \fR[\fI+a\fR] -List the ip addresses that are ratelimited. Printed one per line with current -estimated qps and qps limit from config. With +a it prints all ips, not -just the ratelimited ips, with their estimated qps. The ratelimited -ips are dropped before checking the cache. -.TP -.B list_auth_zones -List the auth zones that are configured. Printed one per line with a status, -indicating if the zone is expired and current serial number. Configured RPZ -zones are included. -.TP -.B auth_zone_reload \fIzone\fR -Reload the auth zone (or RPZ zone) from zonefile. The zonefile is read in -overwriting the current contents of the zone in memory. This changes the auth -zone contents itself, not the cache contents. Such cache contents exists if -you set Unbound to validate with for-upstream yes and that can be cleared with -\fBflush_zone\fR \fIzone\fR. -.TP -.B auth_zone_transfer \fIzone\fR -Transfer the auth zone (or RPZ zone) from master. The auth zone probe sequence -is started, where the masters are probed to see if they have an updated zone -(with the SOA serial check). And then the zone is transferred for a newer zone -version. -.TP -.B rpz_enable \fIzone\fR +to is printed. +On startup this is from the forward\-zone \fB\(dq.\(dq\fP configuration. +Afterwards it shows the status. +It prints off when no forwarding is used. +.sp +If off is passed, forwarding is disabled and the root nameservers are +used. +This can be used to avoid to avoid buggy or non\-DNSSEC supporting +nameservers returned from DHCP. +But may not work in hotels or hotspots. +.sp +If one or more IPv4 or IPv6 addresses are given, those are then used to +forward queries to. +The addresses must be separated with spaces. +With \fB\(aq@port\(aq\fP the port number can be set explicitly (default port is 53 +(DNS)). +.sp +By default the forwarder information from the config file for the root +\fB\(dq.\(dq\fP is used. +The config file is not changed, so after a reload these changes are gone. +Other forward zones from the config file are not affected by this command. +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit_list [\fB+a\fP] +List the domains that are ratelimited. +Printed one per line with current estimated qps and qps limit from config. +With \fB+a\fP it prints all domains, not just the ratelimited domains, with +their estimated qps. +The ratelimited domains return an error for uncached (new) queries, but +cached queries work as normal. +.UNINDENT +.INDENT 0.0 +.TP +.B ip_ratelimit_list [\fB+a\fP] +List the ip addresses that are ratelimited. +Printed one per line with current estimated qps and qps limit from config. +With \fB+a\fP it prints all ips, not just the ratelimited ips, with their +estimated qps. +The ratelimited ips are dropped before checking the cache. +.UNINDENT +.INDENT 0.0 +.TP +.B list_auth_zones +List the auth zones that are configured. +Printed one per line with a status, indicating if the zone is expired and +current serial number. +Configured RPZ zones are included. +.UNINDENT +.INDENT 0.0 +.TP +.B auth_zone_reload \fIzone\fP +Reload the auth zone (or RPZ zone) from zonefile. +The zonefile is read in overwriting the current contents of the zone in +memory. +This changes the auth zone contents itself, not the cache contents. +Such cache contents exists if you set Unbound to validate with +\fBfor\-upstream: yes\fP and that can be cleared with \fBflush_zone\fP \fIzone\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B auth_zone_transfer \fIzone\fP +Transfer the auth zone (or RPZ zone) from master. +The auth zone probe sequence is started, where the masters are probed to +see if they have an updated zone (with the SOA serial check). +And then the zone is transferred for a newer zone version. +.UNINDENT +.INDENT 0.0 +.TP +.B rpz_enable \fIzone\fP Enable the RPZ zone if it had previously been disabled. +.UNINDENT +.INDENT 0.0 .TP -.B rpz_disable \fIzone\fR +.B rpz_disable \fIzone\fP Disable the RPZ zone. -.TP -.B view_list_local_zones \fIview\fR -\fIlist_local_zones\fR for given view. -.TP -.B view_local_zone \fIview\fR \fIname\fR \fItype -\fIlocal_zone\fR for given view. -.TP -.B view_local_zone_remove \fIview\fR \fIname -\fIlocal_zone_remove\fR for given view. -.TP -.B view_list_local_data \fIview\fR -\fIlist_local_data\fR for given view. -.TP -.B view_local_data \fIview\fR \fIRR data... -\fIlocal_data\fR for given view. -.TP -.B view_local_data_remove \fIview\fR \fIname -\fIlocal_data_remove\fR for given view. -.TP -.B view_local_datas_remove \fIview\fR -Remove a list of \fIlocal_data\fR for given view from stdin. Like local_datas_remove. -.TP -.B view_local_datas \fIview\fR -Add a list of \fIlocal_data\fR for given view from stdin. Like local_datas. -.TP -.B add_cookie_secret <secret> -Add or replace a cookie secret persistently. <secret> needs to be an 128 bit -hex string. -.IP -Cookie secrets can be either \fIactive\fR or \fIstaging\fR. \fIActive\fR cookie -secrets are used to create DNS Cookies, but verification of a DNS Cookie -succeeds with any of the \fIactive\fR or \fIstaging\fR cookie secrets. The -state of the current cookie secrets can be printed with the -\fBprint_cookie_secrets\fR command. -.IP -When there are no cookie secrets configured yet, the <secret> is added as -\fIactive\fR. If there is already an \fIactive\fR cookie secret, the <secret> -is added as \fIstaging\fR or replacing an existing \fIstaging\fR secret. -.IP -To "roll" a cookie secret used in an anycast set. The new secret has to be -added as staging secret to \fBall\fR nodes in the anycast set. When \fBall\fR -nodes can verify DNS Cookies with the new secret, the new secret can be -activated with the \fBactivate_cookie_secret\fR command. After \fBall\fR nodes -have the new secret \fIactive\fR for at least one hour, the previous secret can -be dropped with the \fBdrop_cookie_secret\fR command. -.IP -Persistence is accomplished by writing to a file which if configured with the -\fBcookie\-secret\-file\fR option in the server section of the config file. -This is disabled by default, "". -.TP -.B drop_cookie_secret -Drop the \fIstaging\fR cookie secret. -.TP -.B activate_cookie_secret -Make the current \fIstaging\fR cookie secret \fIactive\fR, and the current -\fIactive\fR cookie secret \fIstaging\fR. -.TP -.B print_cookie_secrets +.UNINDENT +.INDENT 0.0 +.TP +.B view_list_local_zones \fIview\fP +\fIlist_local_zones\fP for given view. +.UNINDENT +.INDENT 0.0 +.TP +.B view_local_zone \fIview name type\fP +\fIlocal_zone\fP for given view. +.UNINDENT +.INDENT 0.0 +.TP +.B view_local_zone_remove \fIview name\fP +\fIlocal_zone_remove\fP for given view. +.UNINDENT +.INDENT 0.0 +.TP +.B view_list_local_data \fIview\fP +\fIlist_local_data\fP for given view. +.UNINDENT +.INDENT 0.0 +.TP +.B view_local_data \fIview RR data...\fP +\fIlocal_data\fP for given view. +.UNINDENT +.INDENT 0.0 +.TP +.B view_local_data_remove \fIview name\fP +\fIlocal_data_remove\fP for given view. +.UNINDENT +.INDENT 0.0 +.TP +.B view_local_datas_remove \fIview\fP +Remove a list of \fIlocal_data\fP for given view from stdin. +Like \fIlocal_datas_remove\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B view_local_datas \fIview\fP +Add a list of \fIlocal_data\fP for given view from stdin. +Like \fIlocal_datas\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B add_cookie_secret \fIsecret\fP +Add or replace a cookie secret persistently. +\fIsecret\fP needs to be an 128 bit hex string. +.sp +Cookie secrets can be either \fBactive\fP or \fBstaging\fP\&. +\fBActive\fP cookie secrets are used to create DNS Cookies, but verification +of a DNS Cookie succeeds with any of the \fBactive\fP or \fBstaging\fP cookie +secrets. +The state of the current cookie secrets can be printed with the +\fI\%print_cookie_secrets\fP +command. +.sp +When there are no cookie secrets configured yet, the \fIsecret\fP is added as +\fBactive\fP\&. +If there is already an \fBactive\fP cookie secret, the \fIsecret\fP is added as +\fBstaging\fP or replacing an existing \fBstaging\fP secret. +.sp +To \(dqroll\(dq a cookie secret used in an anycast set. +The new secret has to be added as \fBstaging\fP secret to \fBall\fP nodes in +the anycast set. +When \fBall\fP nodes can verify DNS Cookies with the new secret, the new +secret can be activated with the +\fI\%activate_cookie_secret\fP +command. +After \fBall\fP nodes have the new secret \fBactive\fP for at least one hour, +the previous secret can be dropped with the +\fI\%drop_cookie_secret\fP +command. +.sp +Persistence is accomplished by writing to a file which is configured with +the +\fI\%cookie\-secret\-file\fP +option in the server section of the config file. +This is disabled by default, \(dq\(dq. +.UNINDENT +.INDENT 0.0 +.TP +.B drop_cookie_secret +Drop the \fBstaging\fP cookie secret. +.UNINDENT +.INDENT 0.0 +.TP +.B activate_cookie_secret +Make the current \fBstaging\fP cookie secret \fBactive\fP, and the current +\fBactive\fP cookie secret \fBstaging\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B print_cookie_secrets Show the current configured cookie secrets with their status. -.SH "EXIT CODE" -The unbound\-control program exits with status code 1 on error, 0 on success. -.SH "SET UP" -The setup requires a self\-signed certificate and private keys for both -the server and client. The script \fIunbound\-control\-setup\fR generates -these in the default run directory, or with \-d in another directory. +.UNINDENT +.SH EXIT CODE +.sp +The \fBunbound\-control\fP program exits with status code 1 on error, 0 on +success. +.SH SET UP +.sp +The setup requires a self\-signed certificate and private keys for both the +server and client. +The script \fBunbound\-control\-setup\fP generates these in the default run +directory, or with \fB\-d\fP in another directory. If you change the access control permissions on the key files you can decide -who can use unbound\-control, by default owner and group but not all users. -Run the script under the same username as you have configured in unbound.conf -or as root, so that the daemon is permitted to read the files, for example with: +who can use \fBunbound\-control\fP, by default owner and group but not all users. +Run the script under the same username as you have configured in +\fBunbound.conf\fP or as root, so that the daemon is permitted to read the +files, for example with: +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - sudo \-u unbound unbound\-control\-setup +.ft C +sudo \-u unbound unbound\-control\-setup +.ft P .fi -If you have not configured -a username in unbound.conf, the keys need read permission for the user -credentials under which the daemon is started. +.UNINDENT +.UNINDENT +.sp +If you have not configured a username in \fBunbound.conf\fP, the keys need +read permission for the user credentials under which the daemon is started. The script preserves private keys present in the directory. -After running the script as root, turn on \fBcontrol\-enable\fR in -\fIunbound.conf\fR. -.SH "STATISTIC COUNTERS" -The \fIstats\fR command shows a number of statistic counters. -.TP -.I threadX.num.queries +After running the script as root, turn on +\fI\%control\-enable\fP in +\fBunbound.conf\fP\&. +.SH STATISTIC COUNTERS +.sp +The \fI\%stats\fP and +\fI\%stats_noreset\fP commands show a +number of statistic counters: +.INDENT 0.0 +.TP +.B threadX.num.queries number of queries received by thread +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.queries_ip_ratelimited +.B threadX.num.queries_ip_ratelimited number of queries rate limited by thread +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.queries_cookie_valid +.B threadX.num.queries_cookie_valid number of queries with a valid DNS Cookie by thread +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.queries_cookie_client +.B threadX.num.queries_cookie_client number of queries with a client part only DNS Cookie by thread +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.queries_cookie_invalid +.B threadX.num.queries_cookie_invalid number of queries with an invalid DNS Cookie by thread +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.queries_discard_timeout -number of queries removed due to discard-timeout by thread +.B threadX.num.queries_discard_timeout +number of queries removed due to discard\-timeout by thread +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.queries_wait_limit -number of queries removed due to wait-limit by thread +.B threadX.num.queries_wait_limit +number of queries removed due to wait\-limit by thread +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.cachehits +.B threadX.num.cachehits number of queries that were successfully answered using a cache lookup +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.cachemiss +.B threadX.num.cachemiss number of queries that needed recursive processing +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.dnscrypt.crypted -number of queries that were encrypted and successfully decapsulated by dnscrypt. +.B threadX.num.dnscrypt.crypted +number of queries that were encrypted and successfully decapsulated by +dnscrypt. +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.dnscrypt.cert +.B threadX.num.dnscrypt.cert number of queries that were requesting dnscrypt certificates. +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.dnscrypt.cleartext +.B threadX.num.dnscrypt.cleartext number of queries received on dnscrypt port that were cleartext and not a request for certificates. +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.dnscrypt.malformed +.B threadX.num.dnscrypt.malformed number of request that were neither cleartext, not valid dnscrypt messages. +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.dns_error_reports +.B threadX.num.dns_error_reports number of DNS Error Reports generated by thread -.TP -.I threadX.num.prefetch -number of cache prefetches performed. This number is included in -cachehits, as the original query had the unprefetched answer from cache, -and resulted in recursive processing, taking a slot in the requestlist. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.num.prefetch +number of cache prefetches performed. +This number is included in cachehits, as the original query had the +unprefetched answer from cache, and resulted in recursive processing, +taking a slot in the requestlist. Not part of the recursivereplies (or the histogram thereof) or cachemiss, as a cache response was sent. +.UNINDENT +.INDENT 0.0 .TP -.I threadX.num.expired +.B threadX.num.expired number of replies that served an expired cache entry. -.TP -.I threadX.num.queries_timed_out -number of queries that are dropped because they waited in the UDP socket buffer -for too long. -.TP -.I threadX.query.queue_time_us.max -The maximum wait time for packets in the socket buffer, in microseconds. This -is only reported when sock-queue-timeout is enabled. -.TP -.I threadX.num.recursivereplies -The number of replies sent to queries that needed recursive processing. Could be smaller than threadX.num.cachemiss if due to timeouts no replies were sent for some queries. -.TP -.I threadX.requestlist.avg -The average number of requests in the internal recursive processing request list on insert of a new incoming recursive processing query. -.TP -.I threadX.requestlist.max +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.num.queries_timed_out +number of queries that are dropped because they waited in the UDP socket +buffer for too long. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.query.queue_time_us.max +The maximum wait time for packets in the socket buffer, in microseconds. +This is only reported when +\fI\%sock\-queue\-timeout\fP is enabled. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.num.recursivereplies +The number of replies sent to queries that needed recursive processing. +Could be smaller than threadX.num.cachemiss if due to timeouts no replies +were sent for some queries. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.requestlist.avg +The average number of requests in the internal recursive processing request +list on insert of a new incoming recursive processing query. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.requestlist.max Maximum size attained by the internal recursive processing request list. -.TP -.I threadX.requestlist.overwritten -Number of requests in the request list that were overwritten by newer entries. This happens if there is a flood of queries that recursive processing and the server has a hard time. -.TP -.I threadX.requestlist.exceeded -Queries that were dropped because the request list was full. This happens if a flood of queries need recursive processing, and the server can not keep up. -.TP -.I threadX.requestlist.current.all -Current size of the request list, includes internally generated queries (such -as priming queries and glue lookups). -.TP -.I threadX.requestlist.current.user +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.requestlist.overwritten +Number of requests in the request list that were overwritten by newer +entries. +This happens if there is a flood of queries that recursive processing and +the server has a hard time. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.requestlist.exceeded +Queries that were dropped because the request list was full. +This happens if a flood of queries need recursive processing, and the +server can not keep up. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.requestlist.current.all +Current size of the request list, includes internally generated queries +(such as priming queries and glue lookups). +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.requestlist.current.user Current size of the request list, only the requests from client queries. +.UNINDENT +.INDENT 0.0 .TP -.I threadX.recursion.time.avg -Average time it took to answer queries that needed recursive processing. Note that queries that were answered from the cache are not in this average. +.B threadX.recursion.time.avg +Average time it took to answer queries that needed recursive processing. +Note that queries that were answered from the cache are not in this average. +.UNINDENT +.INDENT 0.0 .TP -.I threadX.recursion.time.median +.B threadX.recursion.time.median The median of the time it took to answer queries that needed recursive -processing. The median means that 50% of the user queries were answered in -less than this time. Because of big outliers (usually queries to non -responsive servers), the average can be bigger than the median. This median -has been calculated by interpolation from a histogram. -.TP -.I threadX.tcpusage -The currently held tcp buffers for incoming connections. A spot value on -the time of the request. This helps you spot if the incoming\-num\-tcp -buffers are full. -.TP -.I total.num.queries +processing. +The median means that 50% of the user queries were answered in less than +this time. +Because of big outliers (usually queries to non responsive servers), the +average can be bigger than the median. +This median has been calculated by interpolation from a histogram. +.UNINDENT +.INDENT 0.0 +.TP +.B threadX.tcpusage +The currently held tcp buffers for incoming connections. +A spot value on the time of the request. +This helps you spot if the incoming\-num\-tcp buffers are full. +.UNINDENT +.INDENT 0.0 +.TP +.B total.num.queries summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.queries_ip_ratelimited +.B total.num.queries_ip_ratelimited summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.queries_cookie_valid +.B total.num.queries_cookie_valid summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.queries_cookie_client +.B total.num.queries_cookie_client summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.queries_cookie_invalid +.B total.num.queries_cookie_invalid summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.queries_discard_timeout +.B total.num.queries_discard_timeout summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.queries_wait_limit +.B total.num.queries_wait_limit summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.cachehits +.B total.num.cachehits summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.cachemiss +.B total.num.cachemiss summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.dnscrypt.crypted +.B total.num.dnscrypt.crypted summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.dnscrypt.cert +.B total.num.dnscrypt.cert summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.dnscrypt.cleartext +.B total.num.dnscrypt.cleartext summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.dnscrypt.malformed +.B total.num.dnscrypt.malformed summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.dns_error_reports +.B total.num.dns_error_reports summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.prefetch +.B total.num.prefetch summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.expired +.B total.num.expired summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.queries_timed_out +.B total.num.queries_timed_out summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.query.queue_time_us.max +.B total.query.queue_time_us.max the maximum of the thread values. +.UNINDENT +.INDENT 0.0 .TP -.I total.num.recursivereplies +.B total.num.recursivereplies summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.requestlist.avg +.B total.requestlist.avg averaged over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.requestlist.max +.B total.requestlist.max the maximum of the thread requestlist.max values. +.UNINDENT +.INDENT 0.0 .TP -.I total.requestlist.overwritten +.B total.requestlist.overwritten summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.requestlist.exceeded +.B total.requestlist.exceeded summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.requestlist.current.all +.B total.requestlist.current.all summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.recursion.time.median +.B total.recursion.time.median averaged over threads. +.UNINDENT +.INDENT 0.0 .TP -.I total.tcpusage +.B total.tcpusage summed over threads. +.UNINDENT +.INDENT 0.0 .TP -.I time.now +.B time.now current time in seconds since 1970. +.UNINDENT +.INDENT 0.0 .TP -.I time.up +.B time.up uptime since server boot in seconds. +.UNINDENT +.INDENT 0.0 .TP -.I time.elapsed +.B time.elapsed time since last statistics printout, in seconds. +.UNINDENT .SH EXTENDED STATISTICS +.INDENT 0.0 .TP -.I mem.cache.rrset +.B mem.cache.rrset Memory in bytes in use by the RRset cache. +.UNINDENT +.INDENT 0.0 .TP -.I mem.cache.message +.B mem.cache.message Memory in bytes in use by the message cache. +.UNINDENT +.INDENT 0.0 .TP -.I mem.cache.dnscrypt_shared_secret +.B mem.cache.dnscrypt_shared_secret Memory in bytes in use by the dnscrypt shared secrets cache. +.UNINDENT +.INDENT 0.0 .TP -.I mem.cache.dnscrypt_nonce +.B mem.cache.dnscrypt_nonce Memory in bytes in use by the dnscrypt nonce cache. +.UNINDENT +.INDENT 0.0 .TP -.I mem.mod.iterator +.B mem.mod.iterator Memory in bytes in use by the iterator module. -.TP -.I mem.mod.validator -Memory in bytes in use by the validator module. Includes the key cache and -negative cache. -.TP -.I mem.streamwait -Memory in bytes in used by the TCP and TLS stream wait buffers. These are -answers waiting to be written back to the clients. -.TP -.I mem.http.query_buffer -Memory in bytes used by the HTTP/2 query buffers. Containing (partial) DNS -queries waiting for request stream completion. -.TP -.I mem.http.response_buffer -Memory in bytes used by the HTTP/2 response buffers. Containing DNS responses -waiting to be written back to the clients. -.TP -.I mem.quic -Memory in bytes used by QUIC. Containing connection information, stream -information, queries read and responses written back to the clients. -.TP -.I histogram.<sec>.<usec>.to.<sec>.<usec> -Shows a histogram, summed over all threads. Every element counts the -recursive queries whose reply time fit between the lower and upper bound. +.UNINDENT +.INDENT 0.0 +.TP +.B mem.mod.validator +Memory in bytes in use by the validator module. +Includes the key cache and negative cache. +.UNINDENT +.INDENT 0.0 +.TP +.B mem.streamwait +Memory in bytes in used by the TCP and TLS stream wait buffers. +These are answers waiting to be written back to the clients. +.UNINDENT +.INDENT 0.0 +.TP +.B mem.http.query_buffer +Memory in bytes used by the HTTP/2 query buffers. +Containing (partial) DNS queries waiting for request stream completion. +.UNINDENT +.INDENT 0.0 +.TP +.B mem.http.response_buffer +Memory in bytes used by the HTTP/2 response buffers. +Containing DNS responses waiting to be written back to the clients. +.UNINDENT +.INDENT 0.0 +.TP +.B mem.quic +Memory in bytes used by QUIC. +Containing connection information, stream information, queries read and +responses written back to the clients. +.UNINDENT +.INDENT 0.0 +.TP +.B histogram.<sec>.<usec>.to.<sec>.<usec> +Shows a histogram, summed over all threads. +Every element counts the recursive queries whose reply time fit between the +lower and upper bound. Times larger or equal to the lowerbound, and smaller than the upper bound. There are 40 buckets, with bucket sizes doubling. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.type.A +.B num.query.type.A The total number of queries over all threads with query type A. Printed for the other query types as well, but only for the types for which queries were received, thus =0 entries are omitted for brevity. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.type.other +.B num.query.type.other Number of queries with query types 256\-65535. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.class.IN -The total number of queries over all threads with query class IN (internet). +.B num.query.class.IN +The total number of queries over all threads with query class IN +(internet). Also printed for other classes (such as CH (CHAOS) sometimes used for debugging), or NONE, ANY, used by dynamic update. num.query.class.other is printed for classes 256\-65535. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.opcode.QUERY +.B num.query.opcode.QUERY The total number of queries over all threads with query opcode QUERY. Also printed for other opcodes, UPDATE, ... +.UNINDENT +.INDENT 0.0 .TP -.I num.query.tcp +.B num.query.tcp Number of queries that were made using TCP towards the Unbound server. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.tcpout +.B num.query.tcpout Number of queries that the Unbound server made using TCP outgoing towards other servers. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.udpout +.B num.query.udpout Number of queries that the Unbound server made using UDP outgoing towards other servers. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.tls +.B num.query.tls Number of queries that were made using TLS towards the Unbound server. These are also counted in num.query.tcp, because TLS uses TCP. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.tls.resume -Number of TLS session resumptions, these are queries over TLS towards -the Unbound server where the client negotiated a TLS session resumption key. +.B num.query.tls.resume +Number of TLS session resumptions, these are queries over TLS towards the +Unbound server where the client negotiated a TLS session resumption key. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.https +.B num.query.https Number of queries that were made using HTTPS towards the Unbound server. These are also counted in num.query.tcp and num.query.tls, because HTTPS uses TLS and TCP. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.quic +.B num.query.quic Number of queries that were made using QUIC towards the Unbound server. -These are also counted in num.query.tls, because TLS is used for these queries. +These are also counted in num.query.tls, because TLS is used for these +queries. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.ipv6 +.B num.query.ipv6 Number of queries that were made using IPv6 towards the Unbound server. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.flags.RD +.B num.query.flags.RD The number of queries that had the RD flag set in the header. Also printed for flags QR, AA, TC, RA, Z, AD, CD. -Note that queries with flags QR, AA or TC may have been rejected -because of that. +Note that queries with flags QR, AA or TC may have been rejected because of +that. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.edns.present +.B num.query.edns.present number of queries that had an EDNS OPT record present. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.edns.DO -number of queries that had an EDNS OPT record with the DO (DNSSEC OK) bit set. +.B num.query.edns.DO +number of queries that had an EDNS OPT record with the DO (DNSSEC OK) bit +set. These queries are also included in the num.query.edns.present number. -.TP -.I num.query.ratelimited -The number of queries that are turned away from being send to nameserver due to -ratelimiting. -.TP -.I num.query.dnscrypt.shared_secret.cachemiss -The number of dnscrypt queries that did not find a shared secret in the cache. -This can be used to compute the shared secret hitrate. -.TP -.I num.query.dnscrypt.replay -The number of dnscrypt queries that found a nonce hit in the nonce cache and -hence are considered a query replay. -.TP -.I num.answer.rcode.NXDOMAIN -The number of answers to queries, from cache or from recursion, that had the -return code NXDOMAIN. Also printed for the other return codes. -.TP -.I num.answer.rcode.nodata +.UNINDENT +.INDENT 0.0 +.TP +.B num.query.ratelimited +The number of queries that are turned away from being send to nameserver +due to ratelimiting. +.UNINDENT +.INDENT 0.0 +.TP +.B num.query.dnscrypt.shared_secret.cachemiss +The number of dnscrypt queries that did not find a shared secret in the +cache. +This can be use to compute the shared secret hitrate. +.UNINDENT +.INDENT 0.0 +.TP +.B num.query.dnscrypt.replay +The number of dnscrypt queries that found a nonce hit in the nonce cache +and hence are considered a query replay. +.UNINDENT +.INDENT 0.0 +.TP +.B num.answer.rcode.NXDOMAIN +The number of answers to queries, from cache or from recursion, that had +the return code NXDOMAIN. +Also printed for the other return codes. +.UNINDENT +.INDENT 0.0 +.TP +.B num.answer.rcode.nodata The number of answers to queries that had the pseudo return code nodata. -This means the actual return code was NOERROR, but additionally, no data was -carried in the answer (making what is called a NOERROR/NODATA answer). +This means the actual return code was NOERROR, but additionally, no data +was carried in the answer (making what is called a NOERROR/NODATA answer). These queries are also included in the num.answer.rcode.NOERROR number. Common for AAAA lookups when an A record exists, and no AAAA. +.UNINDENT +.INDENT 0.0 .TP -.I num.answer.secure -Number of answers that were secure. The answer validated correctly. +.B num.answer.secure +Number of answers that were secure. +The answer validated correctly. The AD bit might have been set in some of these answers, where the client signalled (with DO or AD bit in the query) that they were ready to accept the AD bit in the answer. -.TP -.I num.answer.bogus -Number of answers that were bogus. These answers resulted in SERVFAIL -to the client because the answer failed validation. -.TP -.I num.rrset.bogus -The number of rrsets marked bogus by the validator. Increased for every -RRset inspection that fails. -.TP -.I unwanted.queries +.UNINDENT +.INDENT 0.0 +.TP +.B num.answer.bogus +Number of answers that were bogus. +These answers resulted in SERVFAIL to the client because the answer failed +validation. +.UNINDENT +.INDENT 0.0 +.TP +.B num.rrset.bogus +The number of rrsets marked bogus by the validator. +Increased for every RRset inspection that fails. +.UNINDENT +.INDENT 0.0 +.TP +.B num.valops +The number of validation operations performed by the validator. +Increased for every RRSIG verification operation regardless of the +validation result. +The RRSIG and key combination needs to first pass some sanity checks before +Unbound even performs the verification, e.g., length/protocol checks. +.UNINDENT +.INDENT 0.0 +.TP +.B unwanted.queries Number of queries that were refused or dropped because they failed the access control settings. +.UNINDENT +.INDENT 0.0 .TP -.I unwanted.replies -Replies that were unwanted or unsolicited. Could have been random traffic, -delayed duplicates, very late answers, or could be spoofing attempts. +.B unwanted.replies +Replies that were unwanted or unsolicited. +Could have been random traffic, delayed duplicates, very late answers, or +could be spoofing attempts. Some low level of late answers and delayed duplicates are to be expected -with the UDP protocol. Very high values could indicate a threat (spoofing). +with the UDP protocol. +Very high values could indicate a threat (spoofing). +.UNINDENT +.INDENT 0.0 .TP -.I msg.cache.count +.B msg.cache.count The number of items (DNS replies) in the message cache. -.TP -.I rrset.cache.count -The number of RRsets in the rrset cache. This includes rrsets used by -the messages in the message cache, but also delegation information. -.TP -.I infra.cache.count -The number of items in the infra cache. These are IP addresses with their -timing and protocol support information. -.TP -.I key.cache.count -The number of items in the key cache. These are DNSSEC keys, one item -per delegation point, and their validation status. -.TP -.I msg.cache.max_collisions -The maximum number of hash table collisions in the msg cache. This is the -number of hashes that are identical when a new element is inserted in the -hash table. If the value is very large, like hundreds, something is wrong -with the performance of the hash table, hash values are incorrect or malicious. -.TP -.I rrset.cache.max_collisions -The maximum number of hash table collisions in the rrset cache. This is the -number of hashes that are identical when a new element is inserted in the -hash table. If the value is very large, like hundreds, something is wrong -with the performance of the hash table, hash values are incorrect or malicious. -.TP -.I dnscrypt_shared_secret.cache.count -The number of items in the shared secret cache. These are precomputed shared -secrets for a given client public key/server secret key pair. Shared secrets -are CPU intensive and this cache allows Unbound to avoid recomputing the -shared secret when multiple dnscrypt queries are sent from the same client. -.TP -.I dnscrypt_nonce.cache.count -The number of items in the client nonce cache. This cache is used to prevent -dnscrypt queries replay. The client nonce must be unique for each client public -key/server secret key pair. This cache should be able to host QPS * `replay -window` interval keys to prevent replay of a query during `replay window` -seconds. -.TP -.I num.query.authzone.up +.UNINDENT +.INDENT 0.0 +.TP +.B rrset.cache.count +The number of RRsets in the rrset cache. +This includes rrsets used by the messages in the message cache, but also +delegation information. +.UNINDENT +.INDENT 0.0 +.TP +.B infra.cache.count +The number of items in the infra cache. +These are IP addresses with their timing and protocol support information. +.UNINDENT +.INDENT 0.0 +.TP +.B key.cache.count +The number of items in the key cache. +These are DNSSEC keys, one item per delegation point, and their validation +status. +.UNINDENT +.INDENT 0.0 +.TP +.B msg.cache.max_collisions +The maximum number of hash table collisions in the msg cache. +This is the number of hashes that are identical when a new element is +inserted in the hash table. +If the value is very large, like hundreds, something is wrong with the +performance of the hash table, hash values are incorrect or malicious. +.UNINDENT +.INDENT 0.0 +.TP +.B rrset.cache.max_collisions +The maximum number of hash table collisions in the rrset cache. +This is the number of hashes that are identical when a new element is +inserted in the hash table. +If the value is very large, like hundreds, something is wrong with the +performance of the hash table, hash values are incorrect or malicious. +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt_shared_secret.cache.count +The number of items in the shared secret cache. +These are precomputed shared secrets for a given client public key/server +secret key pair. +Shared secrets are CPU intensive and this cache allows Unbound to avoid +recomputing the shared secret when multiple dnscrypt queries are sent from +the same client. +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt_nonce.cache.count +The number of items in the client nonce cache. +This cache is used to prevent dnscrypt queries replay. +The client nonce must be unique for each client public key/server secret +key pair. +This cache should be able to host QPS * \fIreplay window\fP interval keys to +prevent replay of a query during \fIreplay window\fP seconds. +.UNINDENT +.INDENT 0.0 +.TP +.B num.query.authzone.up The number of queries answered from auth\-zone data, upstream queries. -These queries would otherwise have been sent (with fallback enabled) to -the internet, but are now answered from the auth zone. +These queries would otherwise have been sent (with fallback enabled) to the +internet, but are now answered from the auth zone. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.authzone.down +.B num.query.authzone.down The number of queries for downstream answered from auth\-zone data. -These queries are from downstream clients, and have had an answer from -the data in the auth zone. +These queries are from downstream clients, and have had an answer from the +data in the auth zone. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.aggressive.NOERROR +.B num.query.aggressive.NOERROR The number of queries answered using cached NSEC records with NODATA RCODE. These queries would otherwise have been sent to the internet, but are now answered using cached data. +.UNINDENT +.INDENT 0.0 .TP -.I num.query.aggressive.NXDOMAIN -The number of queries answered using cached NSEC records with NXDOMAIN RCODE. +.B num.query.aggressive.NXDOMAIN +The number of queries answered using cached NSEC records with NXDOMAIN +RCODE. These queries would otherwise have been sent to the internet, but are now answered using cached data. -.TP -.I num.query.subnet -Number of queries that got an answer that contained EDNS client subnet data. -.TP -.I num.query.subnet_cache -Number of queries answered from the edns client subnet cache. These are -counted as cachemiss by the main counters, but hit the client subnet -specific cache after getting processed by the edns client subnet module. -.TP -.I num.query.cachedb +.UNINDENT +.INDENT 0.0 +.TP +.B num.query.subnet +Number of queries that got an answer that contained EDNS client subnet +data. +.UNINDENT +.INDENT 0.0 +.TP +.B num.query.subnet_cache +Number of queries answered from the edns client subnet cache. +These are counted as cachemiss by the main counters, but hit the client +subnet specific cache after getting processed by the edns client subnet +module. +.UNINDENT +.INDENT 0.0 +.TP +.B num.query.cachedb Number of queries answered from the external cache of cachedb. These are counted as cachemiss by the main counters, but hit the cachedb external cache after getting processed by the cachedb module. -.TP -.I num.rpz.action.<rpz_action> -Number of queries answered using configured RPZ policy, per RPZ action type. -Possible actions are: nxdomain, nodata, passthru, drop, tcp\-only, local\-data, -disabled, and cname\-override. -.SH "FILES" -.TP -.I @ub_conf_file@ +.UNINDENT +.INDENT 0.0 +.TP +.B num.rpz.action.<rpz_action> +Number of queries answered using configured RPZ policy, per RPZ action +type. +Possible actions are: nxdomain, nodata, passthru, drop, tcp\-only, +local\-data, disabled, and cname\-override. +.UNINDENT +.SH FILES +.INDENT 0.0 +.TP +.B @ub_conf_file@ Unbound configuration file. .TP -.I @UNBOUND_RUN_DIR@ -directory with private keys (unbound_server.key and unbound_control.key) and -self\-signed certificates (unbound_server.pem and unbound_control.pem). -.SH "SEE ALSO" -\fIunbound.conf\fR(5), -\fIunbound\fR(8). +.B @UNBOUND_RUN_DIR@ +directory with private keys (\fBunbound_server.key\fP and +\fBunbound_control.key\fP) and self\-signed certificates +(\fBunbound_server.pem\fP and \fBunbound_control.pem\fP). +.UNINDENT +.SH SEE ALSO +.sp +\fI\%unbound.conf(5)\fP, +\fI\%unbound(8)\fP\&. +.SH AUTHOR +Unbound developers are mentioned in the CREDITS file in the distribution. +.SH COPYRIGHT +1999-2025, NLnet Labs +.\" Generated by docutils manpage writer. +. diff --git a/contrib/unbound/doc/unbound-control.rst b/contrib/unbound/doc/unbound-control.rst new file mode 100644 index 000000000000..bc548f51d064 --- /dev/null +++ b/contrib/unbound/doc/unbound-control.rst @@ -0,0 +1,1374 @@ +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. program:: unbound-control + +unbound-control(8) +================== + +Synopsis +-------- + +**unbound-control** [``-hq``] [``-c cfgfile``] [``-s server``] command + +Description +----------- + +``unbound-control`` performs remote administration on the +:doc:`unbound(8)</manpages/unbound>` DNS server. +It reads the configuration file, contacts the Unbound server over TLS sends the +command and displays the result. + +The available options are: + +.. option:: -h + + Show the version and commandline option help. + +.. option:: -c <cfgfile> + + The config file to read with settings. + If not given the default config file + :file:`@ub_conf_file@` is used. + +.. option:: -s <server[@port]> + + IPv4 or IPv6 address of the server to contact. + If not given, the address is read from the config file. + +.. option:: -q + + Quiet, if the option is given it does not print anything if it works ok. + +Commands +-------- + +There are several commands that the server understands. + + +@@UAHL@unbound-control.commands@start@@ + Start the server. + Simply execs :doc:`unbound(8)</manpages/unbound>`. + The ``unbound`` executable is searched for in the **PATH** set in the + environment. + It is started with the config file specified using :option:`-c` or the + default config file. + + +@@UAHL@unbound-control.commands@stop@@ + Stop the server. + The server daemon exits. + + +@@UAHL@unbound-control.commands@reload@@ + Reload the server. + This flushes the cache and reads the config file fresh. + + +@@UAHL@unbound-control.commands@reload_keep_cache@@ + Reload the server but try to keep the RRset and message cache if + (re)configuration allows for it. + That means the caches sizes and the number of threads must not change + between reloads. + + +@@UAHL@unbound-control.commands@fast_reload@@ [``+dpv``] + Reload the server, but keep downtime to a minimum, so that user queries + keep seeing service. + This needs the code compiled with threads. + The config is loaded in a thread, and prepared, then it briefly pauses the + existing server and updates config options. + The intent is that the pause does not impact the service of user queries. + The cache is kept. + Also user queries worked on are kept and continue, but with the new config + options. + + .. note:: + This command is experimental at this time. + + The amount of temporal memory needed during a fast_reload is twice the + amount needed for configuration. + This is because Unbound temporarily needs to store both current + configuration values and new ones while trying to fast_reload. + Zones loaded from disk (authority zones and RPZ zones) are included in such + memory needs. + + Options that can be changed are for + :ref:`forwards<unbound.conf.forward>`, + :ref:`stubs<unbound.conf.stub>`, + :ref:`views<unbound.conf.view>`, + :ref:`authority zones<unbound.conf.auth>`, + :ref:`RPZ zones<unbound.conf.rpz>` and + :ref:`local zones<unbound.conf.local-zone>`. + + Also + :ref:`access-control<unbound.conf.access-control>` and similar options, + :ref:`interface-action<unbound.conf.interface-action>` and similar + options and + :ref:`tcp-connection-limit<unbound.conf.tcp-connection-limit>`. + It can reload some + :ref:`define-tag<unbound.conf.define-tag>` + changes, more on that below. + Further options include + :ref:`insecure-lan-zones<unbound.conf.insecure-lan-zones>`, + :ref:`domain-insecure<unbound.conf.domain-insecure>`, + :ref:`trust-anchor-file<unbound.conf.trust-anchor-file>`, + :ref:`trust-anchor<unbound.conf.trust-anchor>`, + :ref:`trusted-keys-file<unbound.conf.trusted-keys-file>`, + :ref:`auto-trust-anchor-file<unbound.conf.auto-trust-anchor-file>`, + :ref:`edns-client-string<unbound.conf.edns-client-string>`, + ipset, + :ref:`log-identity<unbound.conf.log-identity>`, + :ref:`infra-cache-numhosts<unbound.conf.infra-cache-numhosts>`, + :ref:`msg-cache-size<unbound.conf.msg-cache-size>`, + :ref:`rrset-cache-size<unbound.conf.rrset-cache-size>`, + :ref:`key-cache-size<unbound.conf.key-cache-size>`, + :ref:`ratelimit-size<unbound.conf.ratelimit-size>`, + :ref:`neg-cache-size<unbound.conf.neg-cache-size>`, + :ref:`num-queries-per-thread<unbound.conf.num-queries-per-thread>`, + :ref:`jostle-timeout<unbound.conf.jostle-timeout>`, + :ref:`use-caps-for-id<unbound.conf.use-caps-for-id>`, + :ref:`unwanted-reply-threshold<unbound.conf.unwanted-reply-threshold>`, + :ref:`tls-use-sni<unbound.conf.tls-use-sni>`, + :ref:`outgoing-tcp-mss<unbound.conf.outgoing-tcp-mss>`, + :ref:`ip-dscp<unbound.conf.ip-dscp>`, + :ref:`max-reuse-tcp-queries<unbound.conf.max-reuse-tcp-queries>`, + :ref:`tcp-reuse-timeout<unbound.conf.tcp-reuse-timeout>`, + :ref:`tcp-auth-query-timeout<unbound.conf.tcp-auth-query-timeout>`, + :ref:`delay-close<unbound.conf.delay-close>`. + + It does not work with + :ref:`interface<unbound.conf.interface>` and + :ref:`outgoing-interface<unbound.conf.outgoing-interface>` changes, + also not with + :ref:`remote control<unbound.conf.remote>`, + :ref:`outgoing-port-permit<unbound.conf.outgoing-port-permit>`, + :ref:`outgoing-port-avoid<unbound.conf.outgoing-port-avoid>`, + :ref:`msg-buffer-size<unbound.conf.msg-buffer-size>`, + any **\*-slabs** options and + :ref:`statistics-interval<unbound.conf.statistics-interval>` changes. + + For :ref:`dnstap<unbound.conf.dnstap>` these options can be changed: + :ref:`dnstap-log-resolver-query-messages<unbound.conf.dnstap.dnstap-log-resolver-query-messages>`, + :ref:`dnstap-log-resolver-response-messages<unbound.conf.dnstap.dnstap-log-resolver-response-messages>`, + :ref:`dnstap-log-client-query-messages<unbound.conf.dnstap.dnstap-log-client-query-messages>`, + :ref:`dnstap-log-client-response-messages<unbound.conf.dnstap.dnstap-log-client-response-messages>`, + :ref:`dnstap-log-forwarder-query-messages<unbound.conf.dnstap.dnstap-log-forwarder-query-messages>` and + :ref:`dnstap-log-forwarder-response-messages<unbound.conf.dnstap.dnstap-log-forwarder-response-messages>`. + + It does not work with these options: + :ref:`dnstap-enable<unbound.conf.dnstap.dnstap-enable>`, + :ref:`dnstap-bidirectional<unbound.conf.dnstap.dnstap-bidirectional>`, + :ref:`dnstap-socket-path<unbound.conf.dnstap.dnstap-socket-path>`, + :ref:`dnstap-ip<unbound.conf.dnstap.dnstap-ip>`, + :ref:`dnstap-tls<unbound.conf.dnstap.dnstap-tls>`, + :ref:`dnstap-tls-server-name<unbound.conf.dnstap.dnstap-tls-server-name>`, + :ref:`dnstap-tls-cert-bundle<unbound.conf.dnstap.dnstap-tls-cert-bundle>`, + :ref:`dnstap-tls-client-key-file<unbound.conf.dnstap.dnstap-tls-client-key-file>` and + :ref:`dnstap-tls-client-cert-file<unbound.conf.dnstap.dnstap-tls-client-cert-file>`. + + The options + :ref:`dnstap-send-identity<unbound.conf.dnstap.dnstap-send-identity>`, + :ref:`dnstap-send-version<unbound.conf.dnstap.dnstap-send-version>`, + :ref:`dnstap-identity<unbound.conf.dnstap.dnstap-identity>`, and + :ref:`dnstap-version<unbound.conf.dnstap.dnstap-version>` can be loaded + when ``+p`` is not used. + + The ``+v`` option makes the output verbose which includes the time it took + to do the reload. + With ``+vv`` it is more verbose which includes the amount of memory that + was allocated temporarily to perform the reload; this amount of memory can + be big if the config has large contents. + In the timing output the 'reload' time is the time during which the server + was paused. + + The ``+p`` option makes the reload not pause threads, they keep running. + Locks are acquired, but items are updated in sequence, so it is possible + for threads to see an inconsistent state with some options from the old + and some options from the new config, such as cache TTL parameters from the + old config and forwards from the new config. + The stubs and forwards are updated at the same time, so that they are + viewed consistently, either old or new values together. + The option makes the reload time take eg. 3 microseconds instead of 0.3 + milliseconds during which the worker threads are interrupted. + So, the interruption is much shorter, at the expense of some inconsistency. + After the reload itself, every worker thread is briefly contacted to make + them release resources, this makes the delete timing a little longer, and + takes up time from the remote control servicing worker thread. + + With the nopause option (``+p``), the reload does not work to reload some + options, that fast reload works on without the nopause option: + :ref:`val-bogus-ttl<unbound.conf.val-bogus-ttl>`, + :ref:`val-override-date<unbound.conf.val-override-date>`, + :ref:`val-sig-skew-min<unbound.conf.val-sig-skew-min>`, + :ref:`val-sig-skew-max<unbound.conf.val-sig-skew-max>`, + :ref:`val-max-restart<unbound.conf.val-max-restart>`, + :ref:`val-nsec3-keysize-iterations<unbound.conf.val-nsec3-keysize-iterations>`, + :ref:`target-fetch-policy<unbound.conf.target-fetch-policy>`, + :ref:`outbound-msg-retry<unbound.conf.outbound-msg-retry>`, + :ref:`max-sent-count<unbound.conf.max-sent-count>`, + :ref:`max-query-restarts<unbound.conf.max-query-restarts>`, + :ref:`do-not-query-address<unbound.conf.do-not-query-address>`, + :ref:`do-not-query-localhost<unbound.conf.do-not-query-localhost>`, + :ref:`private-address<unbound.conf.private-address>`, + :ref:`private-domain<unbound.conf.private-domain>`, + :ref:`caps-exempt<unbound.conf.caps-exempt>`, + :ref:`nat64-prefix<unbound.conf.nat64.nat64-prefix>`, + :ref:`do-nat64<unbound.conf.nat64.do-nat64>`, + :ref:`infra-host-ttl<unbound.conf.infra-host-ttl>`, + :ref:`infra-keep-probing<unbound.conf.infra-keep-probing>`, + :ref:`ratelimit<unbound.conf.ratelimit>`, + :ref:`ip-ratelimit<unbound.conf.ip-ratelimit>`, + :ref:`ip-ratelimit-cookie<unbound.conf.ip-ratelimit-cookie>`, + :ref:`wait-limit-netblock<unbound.conf.wait-limit-netblock>`, + :ref:`wait-limit-cookie-netblock<unbound.conf.wait-limit-cookie-netblock>`, + :ref:`ratelimit-below-domain<unbound.conf.ratelimit-below-domain>`, + :ref:`ratelimit-for-domain<unbound.conf.ratelimit-for-domain>`. + + The ``+d`` option makes the reload drop queries that the worker threads are + working on. + This is like + :ref:`flush_requestlist<unbound-control.commands.flush_requestlist>`. + Without it the queries are kept so that users keep getting answers for + those queries that are currently processed. + The drop makes it so that queries during the life time of the + query processing see only old, or only new config options. + + When there are changes to the config tags, from the + :ref:`define-tag<unbound.conf.define-tag>` option, + then the ``+d`` option is implicitly turned on with a warning printout, and + queries are dropped. + This is to stop references to the old tag information, by the old + queries. + If the number of tags is increased in the newly loaded config, by + adding tags at the end, then the implicit ``+d`` option is not needed. + + For response ip, that is actions associated with IP addresses, and perhaps + intersected with access control tag and action information, those settings + are stored with a query when it comes in based on its source IP address. + The old information is kept with the query until the queries are done. + This is gone when those queries are resolved and finished, or it is + possible to flush the requestlist with ``+d``. + + +@@UAHL@unbound-control.commands@verbosity@@ *number* + Change verbosity value for logging. + Same values as the **verbosity:** keyword in + :doc:`unbound.conf(5)</manpages/unbound.conf>`. + This new setting lasts until the server is issued a reload (taken from + config file again), or the next verbosity control command. + + +@@UAHL@unbound-control.commands@log_reopen@@ + Reopen the logfile, close and open it. + Useful for logrotation to make the daemon release the file it is logging + to. + If you are using syslog it will attempt to close and open the syslog (which + may not work if chrooted). + + +@@UAHL@unbound-control.commands@stats@@ + Print statistics. + Resets the internal counters to zero, this can be controlled using the + **statistics-cumulative:** config statement. + Statistics are printed with one ``[name]: [value]`` per line. + + +@@UAHL@unbound-control.commands@stats_noreset@@ + Peek at statistics. + Prints them like the stats command does, but does not reset the internal + counters to zero. + + +@@UAHL@unbound-control.commands@status@@ + Display server status. + Exit code 3 if not running (the connection to the port is refused), 1 on + error, 0 if running. + + +@@UAHL@unbound-control.commands@local_zone@@ *name type* + Add new local zone with name and type. + Like local-zone config statement. + If the zone already exists, the type is changed to the given argument. + + +@@UAHL@unbound-control.commands@local_zone_remove@@ *name* + Remove the local zone with the given name. + Removes all local data inside it. + If the zone does not exist, the command succeeds. + + +@@UAHL@unbound-control.commands@local_data@@ *RR data...* + Add new local data, the given resource record. + Like **local-data:** keyword, except for when no covering zone exists. + In that case this remote control command creates a transparent zone with + the same name as this record. + + +@@UAHL@unbound-control.commands@local_data_remove@@ *name* + Remove all RR data from local name. + If the name already has no items, nothing happens. + Often results in NXDOMAIN for the name (in a static zone), but if the name + has become an empty nonterminal (there is still data in domain names below + the removed name), NOERROR nodata answers are the result for that name. + + +@@UAHL@unbound-control.commands@local_zones@@ + Add local zones read from stdin of unbound-control. + Input is read per line, with name space type on a line. + For bulk additions. + + +@@UAHL@unbound-control.commands@local_zones_remove@@ + Remove local zones read from stdin of unbound-control. + Input is one name per line. + For bulk removals. + + +@@UAHL@unbound-control.commands@local_datas@@ + Add local data RRs read from stdin of unbound-control. + Input is one RR per line. + For bulk additions. + + +@@UAHL@unbound-control.commands@local_datas_remove@@ + Remove local data RRs read from stdin of unbound-control. + Input is one name per line. + For bulk removals. + + +@@UAHL@unbound-control.commands@dump_cache@@ + The contents of the cache is printed in a text format to stdout. + You can redirect it to a file to store the cache in a file. + Not supported in remote Unbounds in multi-process operation. + + +@@UAHL@unbound-control.commands@load_cache@@ + The contents of the cache is loaded from stdin. + Uses the same format as dump_cache uses. + Loading the cache with old, or wrong data can result in old or wrong data + returned to clients. + Loading data into the cache in this way is supported in order to aid with + debugging. + Not supported in remote Unbounds in multi-process operation. + + +@@UAHL@unbound-control.commands@cache_lookup@@ [``+t``] *names* + Print to stdout the RRsets and messages that are in the cache. + For every name listed the content at or under the name is printed. + Several names separated by spaces can be given, each is printed. + When subnetcache is enabled, also matching entries from the subnet + cache are printed. + + The ``+t`` option allows tld and root names. + With it names like 'com' and '.' can be used, but it takes a lot of + effort to look up in the cache. + + +@@UAHL@unbound-control.commands@lookup@@ *name* + Print to stdout the name servers that would be used to look up the name + specified. + + +@@UAHL@unbound-control.commands@flush@@ [``+c``] *name* + Remove the name from the cache. + Removes the types A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV, NAPTR, + SVCB and HTTPS. + Because that is fast to do. + Other record types can be removed using **flush_type** or **flush_zone**. + + The ``+c`` option removes the items also from the cachedb cache. + If cachedb is in use. + + +@@UAHL@unbound-control.commands@flush_type@@ [``+c``] *name type* + Remove the name, type information from the cache. + + The ``+c`` option removes the items also from the cachedb cache. + If cachedb is in use. + + +@@UAHL@unbound-control.commands@flush_zone@@ [``+c``] name + Remove all information at or below the name from the cache. + The rrsets and key entries are removed so that new lookups will be + performed. + This needs to walk and inspect the entire cache, and is a slow operation. + The entries are set to expired in the implementation of this command (so, + with serve-expired enabled, it'll serve that information but schedule a + prefetch for new information). + + The ``+c`` option removes the items also from the cachedb cache. + If cachedb is in use. + + +@@UAHL@unbound-control.commands@flush_bogus@@ [``+c``] + Remove all bogus data from the cache. + + The ``+c`` option removes the items also from the cachedb cache. + If cachedb is in use. + + +@@UAHL@unbound-control.commands@flush_negative@@ [``+c``] + Remove all negative data from the cache. + This is nxdomain answers, nodata answers and servfail answers. + Also removes bad key entries (which could be due to failed lookups) from + the dnssec key cache, and iterator last-resort lookup failures from the + rrset cache. + + The ``+c`` option removes the items also from the cachedb cache. + If cachedb is in use. + + +@@UAHL@unbound-control.commands@flush_stats@@ + Reset statistics to zero. + + +@@UAHL@unbound-control.commands@flush_requestlist@@ + Drop the queries that are worked on. + Stops working on the queries that the server is working on now. + The cache is unaffected. + No reply is sent for those queries, probably making those users request + again later. + Useful to make the server restart working on queries with new settings, + such as a higher verbosity level. + + +@@UAHL@unbound-control.commands@dump_requestlist@@ + Show what is worked on. + Prints all queries that the server is currently working on. + Prints the time that users have been waiting. + For internal requests, no time is printed. + And then prints out the module status. + This prints the queries from the first thread, and not queries that are + being serviced from other threads. + + +@@UAHL@unbound-control.commands@flush_infra@@ *all|IP* + If all then entire infra cache is emptied. + If a specific IP address, the entry for that address is removed from the + cache. + It contains EDNS, ping and lameness data. + + +@@UAHL@unbound-control.commands@dump_infra@@ + Show the contents of the infra cache. + + +@@UAHL@unbound-control.commands@set_option@@ *opt: val* + Set the option to the given value without a reload. + The cache is therefore not flushed. + The option must end with a ``':'`` and whitespace must be between the + option and the value. + Some values may not have an effect if set this way, the new values are not + written to the config file, not all options are supported. + This is different from the set_option call in libunbound, where all values + work because Unbound has not been initialized. + + The values that work are: statistics-interval, statistics-cumulative, + do-not-query-localhost, harden-short-bufsize, harden-large-queries, + harden-glue, harden-dnssec-stripped, harden-below-nxdomain, + harden-referral-path, prefetch, prefetch-key, log-queries, hide-identity, + hide-version, identity, version, val-log-level, val-log-squelch, + ignore-cd-flag, add-holddown, del-holddown, keep-missing, tcp-upstream, + ssl-upstream, max-udp-size, ratelimit, ip-ratelimit, cache-max-ttl, + cache-min-ttl, cache-max-negative-ttl. + + +@@UAHL@unbound-control.commands@get_option@@ *opt* + Get the value of the option. + Give the option name without a trailing ``':'``. + The value is printed. + If the value is ``""``, nothing is printed and the connection closes. + On error ``'error ...'`` is printed (it gives a syntax error on unknown + option). + For some options a list of values, one on each line, is printed. + The options are shown from the config file as modified with set_option. + For some options an override may have been taken that does not show up with + this command, not results from e.g. the verbosity and forward control + commands. + Not all options work, see list_stubs, list_forwards, list_local_zones and + list_local_data for those. + + +@@UAHL@unbound-control.commands@list_stubs@@ + List the stub zones in use. + These are printed one by one to the output. + This includes the root hints in use. + + +@@UAHL@unbound-control.commands@list_forwards@@ + List the forward zones in use. + These are printed zone by zone to the output. + + +@@UAHL@unbound-control.commands@list_insecure@@ + List the zones with domain-insecure. + + +@@UAHL@unbound-control.commands@list_local_zones@@ + List the local zones in use. + These are printed one per line with zone type. + + +@@UAHL@unbound-control.commands@list_local_data@@ + List the local data RRs in use. + The resource records are printed. + + +@@UAHL@unbound-control.commands@insecure_add@@ *zone* + Add a domain-insecure for the given zone, like the statement in + unbound.conf. + Adds to the running Unbound without affecting the cache + contents (which may still be bogus, use flush_zone to remove it), does not + affect the config file. + + +@@UAHL@unbound-control.commands@insecure_remove@@ *zone* + Removes domain-insecure for the given zone. + + +@@UAHL@unbound-control.commands@forward_add@@ [``+it``] *zone addr ...* + Add a new forward zone to running Unbound. + With ``+i`` option also adds a domain-insecure for the zone (so it can + resolve insecurely if you have a DNSSEC root trust anchor configured for + other names). + The addr can be IP4, IP6 or nameserver names, like forward-zone config in + unbound.conf. + The ``+t`` option sets it to use TLS upstream, like + :ref:`forward-tls-upstream: yes<unbound.conf.forward.forward-tls-upstream>`. + + +@@UAHL@unbound-control.commands@forward_remove@@ [``+i``] *zone* + Remove a forward zone from running Unbound. + The ``+i`` also removes a domain-insecure for the zone. + + +@@UAHL@unbound-control.commands@stub_add@@ [``+ipt``] *zone addr ...* + Add a new stub zone to running Unbound. + With ``+i`` option also adds a domain-insecure for the zone. + With ``+p`` the stub zone is set to prime, without it it is set to + notprime. + The addr can be IP4, IP6 or nameserver names, like the **stub-zone:** + config in unbound.conf. + The ``+t`` option sets it to use TLS upstream, like + :ref:`stub-tls-upstream: yes<unbound.conf.stub.stub-tls-upstream>`. + + +@@UAHL@unbound-control.commands@stub_remove@@ [``+i``] *zone* + Remove a stub zone from running Unbound. + The ``+i`` also removes a domain-insecure for the zone. + + +@@UAHL@unbound-control.commands@forward@@ [*off* | *addr ...* ] + Setup forwarding mode. + Configures if the server should ask other upstream nameservers, should go + to the internet root nameservers itself, or show the current config. + You could pass the nameservers after a DHCP update. + + Without arguments the current list of addresses used to forward all queries + to is printed. + On startup this is from the forward-zone ``"."`` configuration. + Afterwards it shows the status. + It prints off when no forwarding is used. + + If off is passed, forwarding is disabled and the root nameservers are + used. + This can be used to avoid to avoid buggy or non-DNSSEC supporting + nameservers returned from DHCP. + But may not work in hotels or hotspots. + + If one or more IPv4 or IPv6 addresses are given, those are then used to + forward queries to. + The addresses must be separated with spaces. + With ``'@port'`` the port number can be set explicitly (default port is 53 + (DNS)). + + By default the forwarder information from the config file for the root + ``"."`` is used. + The config file is not changed, so after a reload these changes are gone. + Other forward zones from the config file are not affected by this command. + + +@@UAHL@unbound-control.commands@ratelimit_list@@ [``+a``] + List the domains that are ratelimited. + Printed one per line with current estimated qps and qps limit from config. + With ``+a`` it prints all domains, not just the ratelimited domains, with + their estimated qps. + The ratelimited domains return an error for uncached (new) queries, but + cached queries work as normal. + + +@@UAHL@unbound-control.commands@ip_ratelimit_list@@ [``+a``] + List the ip addresses that are ratelimited. + Printed one per line with current estimated qps and qps limit from config. + With ``+a`` it prints all ips, not just the ratelimited ips, with their + estimated qps. + The ratelimited ips are dropped before checking the cache. + + +@@UAHL@unbound-control.commands@list_auth_zones@@ + List the auth zones that are configured. + Printed one per line with a status, indicating if the zone is expired and + current serial number. + Configured RPZ zones are included. + + +@@UAHL@unbound-control.commands@auth_zone_reload@@ *zone* + Reload the auth zone (or RPZ zone) from zonefile. + The zonefile is read in overwriting the current contents of the zone in + memory. + This changes the auth zone contents itself, not the cache contents. + Such cache contents exists if you set Unbound to validate with + **for-upstream: yes** and that can be cleared with **flush_zone** *zone*. + + +@@UAHL@unbound-control.commands@auth_zone_transfer@@ *zone* + Transfer the auth zone (or RPZ zone) from master. + The auth zone probe sequence is started, where the masters are probed to + see if they have an updated zone (with the SOA serial check). + And then the zone is transferred for a newer zone version. + + +@@UAHL@unbound-control.commands@rpz_enable@@ *zone* + Enable the RPZ zone if it had previously been disabled. + + +@@UAHL@unbound-control.commands@rpz_disable@@ *zone* + Disable the RPZ zone. + + +@@UAHL@unbound-control.commands@view_list_local_zones@@ *view* + *list_local_zones* for given view. + + +@@UAHL@unbound-control.commands@view_local_zone@@ *view name type* + *local_zone* for given view. + + +@@UAHL@unbound-control.commands@view_local_zone_remove@@ *view name* + *local_zone_remove* for given view. + + +@@UAHL@unbound-control.commands@view_list_local_data@@ *view* + *list_local_data* for given view. + + +@@UAHL@unbound-control.commands@view_local_data@@ *view RR data...* + *local_data* for given view. + + +@@UAHL@unbound-control.commands@view_local_data_remove@@ *view name* + *local_data_remove* for given view. + + +@@UAHL@unbound-control.commands@view_local_datas_remove@@ *view* + Remove a list of *local_data* for given view from stdin. + Like *local_datas_remove*. + + +@@UAHL@unbound-control.commands@view_local_datas@@ *view* + Add a list of *local_data* for given view from stdin. + Like *local_datas*. + + +@@UAHL@unbound-control.commands@add_cookie_secret@@ *secret* + Add or replace a cookie secret persistently. + *secret* needs to be an 128 bit hex string. + + Cookie secrets can be either **active** or **staging**. + **Active** cookie secrets are used to create DNS Cookies, but verification + of a DNS Cookie succeeds with any of the **active** or **staging** cookie + secrets. + The state of the current cookie secrets can be printed with the + :ref:`print_cookie_secrets<unbound-control.commands.print_cookie_secrets>` + command. + + When there are no cookie secrets configured yet, the *secret* is added as + **active**. + If there is already an **active** cookie secret, the *secret* is added as + **staging** or replacing an existing **staging** secret. + + To "roll" a cookie secret used in an anycast set. + The new secret has to be added as **staging** secret to **all** nodes in + the anycast set. + When **all** nodes can verify DNS Cookies with the new secret, the new + secret can be activated with the + :ref:`activate_cookie_secret<unbound-control.commands.activate_cookie_secret>` + command. + After **all** nodes have the new secret **active** for at least one hour, + the previous secret can be dropped with the + :ref:`drop_cookie_secret<unbound-control.commands.drop_cookie_secret>` + command. + + Persistence is accomplished by writing to a file which is configured with + the + :ref:`cookie-secret-file<unbound.conf.cookie-secret-file>` + option in the server section of the config file. + This is disabled by default, "". + + +@@UAHL@unbound-control.commands@drop_cookie_secret@@ + Drop the **staging** cookie secret. + + +@@UAHL@unbound-control.commands@activate_cookie_secret@@ + Make the current **staging** cookie secret **active**, and the current + **active** cookie secret **staging**. + + +@@UAHL@unbound-control.commands@print_cookie_secrets@@ + Show the current configured cookie secrets with their status. + +Exit Code +--------- + +The ``unbound-control`` program exits with status code 1 on error, 0 on +success. + +Set Up +------ + +The setup requires a self-signed certificate and private keys for both the +server and client. +The script ``unbound-control-setup`` generates these in the default run +directory, or with ``-d`` in another directory. +If you change the access control permissions on the key files you can decide +who can use ``unbound-control``, by default owner and group but not all users. +Run the script under the same username as you have configured in +:file:`unbound.conf` or as root, so that the daemon is permitted to read the +files, for example with: + +.. code-block:: bash + + sudo -u unbound unbound-control-setup + +If you have not configured a username in :file:`unbound.conf`, the keys need +read permission for the user credentials under which the daemon is started. +The script preserves private keys present in the directory. +After running the script as root, turn on +:ref:`control-enable<unbound.conf.remote.control-enable>` in +:file:`unbound.conf`. + +Statistic Counters +------------------ + +The :ref:`stats<unbound-control.commands.stats>` and +:ref:`stats_noreset<unbound-control.commands.stats_noreset>` commands show a +number of statistic counters: + + +@@UAHL@unbound-control.stats@threadX.num.queries@@ + number of queries received by thread + + +@@UAHL@unbound-control.stats@threadX.num.queries_ip_ratelimited@@ + number of queries rate limited by thread + + +@@UAHL@unbound-control.stats@threadX.num.queries_cookie_valid@@ + number of queries with a valid DNS Cookie by thread + + +@@UAHL@unbound-control.stats@threadX.num.queries_cookie_client@@ + number of queries with a client part only DNS Cookie by thread + + +@@UAHL@unbound-control.stats@threadX.num.queries_cookie_invalid@@ + number of queries with an invalid DNS Cookie by thread + + +@@UAHL@unbound-control.stats@threadX.num.queries_discard_timeout@@ + number of queries removed due to discard-timeout by thread + + +@@UAHL@unbound-control.stats@threadX.num.queries_wait_limit@@ + number of queries removed due to wait-limit by thread + + +@@UAHL@unbound-control.stats@threadX.num.cachehits@@ + number of queries that were successfully answered using a cache lookup + + +@@UAHL@unbound-control.stats@threadX.num.cachemiss@@ + number of queries that needed recursive processing + + +@@UAHL@unbound-control.stats@threadX.num.dnscrypt.crypted@@ + number of queries that were encrypted and successfully decapsulated by + dnscrypt. + + +@@UAHL@unbound-control.stats@threadX.num.dnscrypt.cert@@ + number of queries that were requesting dnscrypt certificates. + + +@@UAHL@unbound-control.stats@threadX.num.dnscrypt.cleartext@@ + number of queries received on dnscrypt port that were cleartext and not a + request for certificates. + + +@@UAHL@unbound-control.stats@threadX.num.dnscrypt.malformed@@ + number of request that were neither cleartext, not valid dnscrypt messages. + + +@@UAHL@unbound-control.stats@threadX.num.dns_error_reports@@ + number of DNS Error Reports generated by thread + + +@@UAHL@unbound-control.stats@threadX.num.prefetch@@ + number of cache prefetches performed. + This number is included in cachehits, as the original query had the + unprefetched answer from cache, and resulted in recursive processing, + taking a slot in the requestlist. + Not part of the recursivereplies (or the histogram thereof) or cachemiss, + as a cache response was sent. + + +@@UAHL@unbound-control.stats@threadX.num.expired@@ + number of replies that served an expired cache entry. + + +@@UAHL@unbound-control.stats@threadX.num.queries_timed_out@@ + number of queries that are dropped because they waited in the UDP socket + buffer for too long. + + +@@UAHL@unbound-control.stats@threadX.query.queue_time_us.max@@ + The maximum wait time for packets in the socket buffer, in microseconds. + This is only reported when + :ref:`sock-queue-timeout<unbound.conf.sock-queue-timeout>` is enabled. + + +@@UAHL@unbound-control.stats@threadX.num.recursivereplies@@ + The number of replies sent to queries that needed recursive processing. + Could be smaller than threadX.num.cachemiss if due to timeouts no replies + were sent for some queries. + + +@@UAHL@unbound-control.stats@threadX.requestlist.avg@@ + The average number of requests in the internal recursive processing request + list on insert of a new incoming recursive processing query. + + +@@UAHL@unbound-control.stats@threadX.requestlist.max@@ + Maximum size attained by the internal recursive processing request list. + + +@@UAHL@unbound-control.stats@threadX.requestlist.overwritten@@ + Number of requests in the request list that were overwritten by newer + entries. + This happens if there is a flood of queries that recursive processing and + the server has a hard time. + + +@@UAHL@unbound-control.stats@threadX.requestlist.exceeded@@ + Queries that were dropped because the request list was full. + This happens if a flood of queries need recursive processing, and the + server can not keep up. + + +@@UAHL@unbound-control.stats@threadX.requestlist.current.all@@ + Current size of the request list, includes internally generated queries + (such as priming queries and glue lookups). + + +@@UAHL@unbound-control.stats@threadX.requestlist.current.user@@ + Current size of the request list, only the requests from client queries. + + +@@UAHL@unbound-control.stats@threadX.recursion.time.avg@@ + Average time it took to answer queries that needed recursive processing. + Note that queries that were answered from the cache are not in this average. + + +@@UAHL@unbound-control.stats@threadX.recursion.time.median@@ + The median of the time it took to answer queries that needed recursive + processing. + The median means that 50% of the user queries were answered in less than + this time. + Because of big outliers (usually queries to non responsive servers), the + average can be bigger than the median. + This median has been calculated by interpolation from a histogram. + + +@@UAHL@unbound-control.stats@threadX.tcpusage@@ + The currently held tcp buffers for incoming connections. + A spot value on the time of the request. + This helps you spot if the incoming-num-tcp buffers are full. + + +@@UAHL@unbound-control.stats@total.num.queries@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.queries_ip_ratelimited@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.queries_cookie_valid@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.queries_cookie_client@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.queries_cookie_invalid@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.queries_discard_timeout@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.queries_wait_limit@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.cachehits@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.cachemiss@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.dnscrypt.crypted@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.dnscrypt.cert@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.dnscrypt.cleartext@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.dnscrypt.malformed@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.dns_error_reports@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.prefetch@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.expired@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.num.queries_timed_out@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.query.queue_time_us.max@@ + the maximum of the thread values. + + +@@UAHL@unbound-control.stats@total.num.recursivereplies@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.requestlist.avg@@ + averaged over threads. + + +@@UAHL@unbound-control.stats@total.requestlist.max@@ + the maximum of the thread requestlist.max values. + + +@@UAHL@unbound-control.stats@total.requestlist.overwritten@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.requestlist.exceeded@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.requestlist.current.all@@ + summed over threads. + + +@@UAHL@unbound-control.stats@total.recursion.time.median@@ + averaged over threads. + + +@@UAHL@unbound-control.stats@total.tcpusage@@ + summed over threads. + + +@@UAHL@unbound-control.stats@time.now@@ + current time in seconds since 1970. + + +@@UAHL@unbound-control.stats@time.up@@ + uptime since server boot in seconds. + + +@@UAHL@unbound-control.stats@time.elapsed@@ + time since last statistics printout, in seconds. + +Extended Statistics +------------------- + + +@@UAHL@unbound-control.stats@mem.cache.rrset@@ + Memory in bytes in use by the RRset cache. + + +@@UAHL@unbound-control.stats@mem.cache.message@@ + Memory in bytes in use by the message cache. + + +@@UAHL@unbound-control.stats@mem.cache.dnscrypt_shared_secret@@ + Memory in bytes in use by the dnscrypt shared secrets cache. + + +@@UAHL@unbound-control.stats@mem.cache.dnscrypt_nonce@@ + Memory in bytes in use by the dnscrypt nonce cache. + + +@@UAHL@unbound-control.stats@mem.mod.iterator@@ + Memory in bytes in use by the iterator module. + + +@@UAHL@unbound-control.stats@mem.mod.validator@@ + Memory in bytes in use by the validator module. + Includes the key cache and negative cache. + + +@@UAHL@unbound-control.stats@mem.streamwait@@ + Memory in bytes in used by the TCP and TLS stream wait buffers. + These are answers waiting to be written back to the clients. + + +@@UAHL@unbound-control.stats@mem.http.query_buffer@@ + Memory in bytes used by the HTTP/2 query buffers. + Containing (partial) DNS queries waiting for request stream completion. + + +@@UAHL@unbound-control.stats@mem.http.response_buffer@@ + Memory in bytes used by the HTTP/2 response buffers. + Containing DNS responses waiting to be written back to the clients. + + +@@UAHL@unbound-control.stats@mem.quic@@ + Memory in bytes used by QUIC. + Containing connection information, stream information, queries read and + responses written back to the clients. + +@@UAHL@unbound-control.stats@histogram@@.<sec>.<usec>.to.<sec>.<usec> + Shows a histogram, summed over all threads. + Every element counts the recursive queries whose reply time fit between the + lower and upper bound. + Times larger or equal to the lowerbound, and smaller than the upper bound. + There are 40 buckets, with bucket sizes doubling. + + +@@UAHL@unbound-control.stats@num.query.type.A@@ + The total number of queries over all threads with query type A. + Printed for the other query types as well, but only for the types for which + queries were received, thus =0 entries are omitted for brevity. + + +@@UAHL@unbound-control.stats@num.query.type.other@@ + Number of queries with query types 256-65535. + + +@@UAHL@unbound-control.stats@num.query.class.IN@@ + The total number of queries over all threads with query class IN + (internet). + Also printed for other classes (such as CH (CHAOS) sometimes used for + debugging), or NONE, ANY, used by dynamic update. + num.query.class.other is printed for classes 256-65535. + + +@@UAHL@unbound-control.stats@num.query.opcode.QUERY@@ + The total number of queries over all threads with query opcode QUERY. + Also printed for other opcodes, UPDATE, ... + + +@@UAHL@unbound-control.stats@num.query.tcp@@ + Number of queries that were made using TCP towards the Unbound server. + + +@@UAHL@unbound-control.stats@num.query.tcpout@@ + Number of queries that the Unbound server made using TCP outgoing towards + other servers. + + +@@UAHL@unbound-control.stats@num.query.udpout@@ + Number of queries that the Unbound server made using UDP outgoing towards + other servers. + + +@@UAHL@unbound-control.stats@num.query.tls@@ + Number of queries that were made using TLS towards the Unbound server. + These are also counted in num.query.tcp, because TLS uses TCP. + + +@@UAHL@unbound-control.stats@num.query.tls.resume@@ + Number of TLS session resumptions, these are queries over TLS towards the + Unbound server where the client negotiated a TLS session resumption key. + + +@@UAHL@unbound-control.stats@num.query.https@@ + Number of queries that were made using HTTPS towards the Unbound server. + These are also counted in num.query.tcp and num.query.tls, because HTTPS + uses TLS and TCP. + + +@@UAHL@unbound-control.stats@num.query.quic@@ + Number of queries that were made using QUIC towards the Unbound server. + These are also counted in num.query.tls, because TLS is used for these + queries. + + +@@UAHL@unbound-control.stats@num.query.ipv6@@ + Number of queries that were made using IPv6 towards the Unbound server. + + +@@UAHL@unbound-control.stats@num.query.flags.RD@@ + The number of queries that had the RD flag set in the header. + Also printed for flags QR, AA, TC, RA, Z, AD, CD. + Note that queries with flags QR, AA or TC may have been rejected because of + that. + + +@@UAHL@unbound-control.stats@num.query.edns.present@@ + number of queries that had an EDNS OPT record present. + + +@@UAHL@unbound-control.stats@num.query.edns.DO@@ + number of queries that had an EDNS OPT record with the DO (DNSSEC OK) bit + set. + These queries are also included in the num.query.edns.present number. + + +@@UAHL@unbound-control.stats@num.query.ratelimited@@ + The number of queries that are turned away from being send to nameserver + due to ratelimiting. + + +@@UAHL@unbound-control.stats@num.query.dnscrypt.shared_secret.cachemiss@@ + The number of dnscrypt queries that did not find a shared secret in the + cache. + This can be use to compute the shared secret hitrate. + + +@@UAHL@unbound-control.stats@num.query.dnscrypt.replay@@ + The number of dnscrypt queries that found a nonce hit in the nonce cache + and hence are considered a query replay. + + +@@UAHL@unbound-control.stats@num.answer.rcode.NXDOMAIN@@ + The number of answers to queries, from cache or from recursion, that had + the return code NXDOMAIN. + Also printed for the other return codes. + + +@@UAHL@unbound-control.stats@num.answer.rcode.nodata@@ + The number of answers to queries that had the pseudo return code nodata. + This means the actual return code was NOERROR, but additionally, no data + was carried in the answer (making what is called a NOERROR/NODATA answer). + These queries are also included in the num.answer.rcode.NOERROR number. + Common for AAAA lookups when an A record exists, and no AAAA. + + +@@UAHL@unbound-control.stats@num.answer.secure@@ + Number of answers that were secure. + The answer validated correctly. + The AD bit might have been set in some of these answers, where the client + signalled (with DO or AD bit in the query) that they were ready to accept + the AD bit in the answer. + + +@@UAHL@unbound-control.stats@num.answer.bogus@@ + Number of answers that were bogus. + These answers resulted in SERVFAIL to the client because the answer failed + validation. + + +@@UAHL@unbound-control.stats@num.rrset.bogus@@ + The number of rrsets marked bogus by the validator. + Increased for every RRset inspection that fails. + + +@@UAHL@unbound-control.stats@num.valops@@ + The number of validation operations performed by the validator. + Increased for every RRSIG verification operation regardless of the + validation result. + The RRSIG and key combination needs to first pass some sanity checks before + Unbound even performs the verification, e.g., length/protocol checks. + + +@@UAHL@unbound-control.stats@unwanted.queries@@ + Number of queries that were refused or dropped because they failed the + access control settings. + + +@@UAHL@unbound-control.stats@unwanted.replies@@ + Replies that were unwanted or unsolicited. + Could have been random traffic, delayed duplicates, very late answers, or + could be spoofing attempts. + Some low level of late answers and delayed duplicates are to be expected + with the UDP protocol. + Very high values could indicate a threat (spoofing). + + +@@UAHL@unbound-control.stats@msg.cache.count@@ + The number of items (DNS replies) in the message cache. + + +@@UAHL@unbound-control.stats@rrset.cache.count@@ + The number of RRsets in the rrset cache. + This includes rrsets used by the messages in the message cache, but also + delegation information. + + +@@UAHL@unbound-control.stats@infra.cache.count@@ + The number of items in the infra cache. + These are IP addresses with their timing and protocol support information. + + +@@UAHL@unbound-control.stats@key.cache.count@@ + The number of items in the key cache. + These are DNSSEC keys, one item per delegation point, and their validation + status. + + +@@UAHL@unbound-control.stats@msg.cache.max_collisions@@ + The maximum number of hash table collisions in the msg cache. + This is the number of hashes that are identical when a new element is + inserted in the hash table. + If the value is very large, like hundreds, something is wrong with the + performance of the hash table, hash values are incorrect or malicious. + + +@@UAHL@unbound-control.stats@rrset.cache.max_collisions@@ + The maximum number of hash table collisions in the rrset cache. + This is the number of hashes that are identical when a new element is + inserted in the hash table. + If the value is very large, like hundreds, something is wrong with the + performance of the hash table, hash values are incorrect or malicious. + + +@@UAHL@unbound-control.stats@dnscrypt_shared_secret.cache.count@@ + The number of items in the shared secret cache. + These are precomputed shared secrets for a given client public key/server + secret key pair. + Shared secrets are CPU intensive and this cache allows Unbound to avoid + recomputing the shared secret when multiple dnscrypt queries are sent from + the same client. + + +@@UAHL@unbound-control.stats@dnscrypt_nonce.cache.count@@ + The number of items in the client nonce cache. + This cache is used to prevent dnscrypt queries replay. + The client nonce must be unique for each client public key/server secret + key pair. + This cache should be able to host QPS * `replay window` interval keys to + prevent replay of a query during `replay window` seconds. + + +@@UAHL@unbound-control.stats@num.query.authzone.up@@ + The number of queries answered from auth-zone data, upstream queries. + These queries would otherwise have been sent (with fallback enabled) to the + internet, but are now answered from the auth zone. + + +@@UAHL@unbound-control.stats@num.query.authzone.down@@ + The number of queries for downstream answered from auth-zone data. + These queries are from downstream clients, and have had an answer from the + data in the auth zone. + + +@@UAHL@unbound-control.stats@num.query.aggressive.NOERROR@@ + The number of queries answered using cached NSEC records with NODATA RCODE. + These queries would otherwise have been sent to the internet, but are now + answered using cached data. + + +@@UAHL@unbound-control.stats@num.query.aggressive.NXDOMAIN@@ + The number of queries answered using cached NSEC records with NXDOMAIN + RCODE. + These queries would otherwise have been sent to the internet, but are now + answered using cached data. + + +@@UAHL@unbound-control.stats@num.query.subnet@@ + Number of queries that got an answer that contained EDNS client subnet + data. + + +@@UAHL@unbound-control.stats@num.query.subnet_cache@@ + Number of queries answered from the edns client subnet cache. + These are counted as cachemiss by the main counters, but hit the client + subnet specific cache after getting processed by the edns client subnet + module. + + +@@UAHL@unbound-control.stats@num.query.cachedb@@ + Number of queries answered from the external cache of cachedb. + These are counted as cachemiss by the main counters, but hit the cachedb + external cache after getting processed by the cachedb module. + +@@UAHL@unbound-control.stats@num.rpz.action@@.<rpz_action> + Number of queries answered using configured RPZ policy, per RPZ action + type. + Possible actions are: nxdomain, nodata, passthru, drop, tcp-only, + local-data, disabled, and cname-override. + +Files +----- + +@ub_conf_file@ + Unbound configuration file. + +@UNBOUND_RUN_DIR@ + directory with private keys (:file:`unbound_server.key` and + :file:`unbound_control.key`) and self-signed certificates + (:file:`unbound_server.pem` and :file:`unbound_control.pem`). + +See Also +-------- + +:doc:`unbound.conf(5)</manpages/unbound.conf>`, +:doc:`unbound(8)</manpages/unbound>`. diff --git a/contrib/unbound/doc/unbound-host.1.in b/contrib/unbound/doc/unbound-host.1.in index a99bab0f7be6..f7ed75665bf5 100644 --- a/contrib/unbound/doc/unbound-host.1.in +++ b/contrib/unbound/doc/unbound-host.1.in @@ -1,118 +1,190 @@ -.TH "unbound\-host" "1" "Jul 16, 2025" "NLnet Labs" "unbound 1.23.1" -.\" -.\" unbound-host.1 -- unbound DNS lookup utility -.\" -.\" Copyright (c) 2007, NLnet Labs. All rights reserved. -.\" -.\" See LICENSE for the license. -.\" -.\" -.SH "NAME" -.B unbound\-host -\- unbound DNS lookup utility -.SH "SYNOPSIS" -.B unbound\-host -.RB [ \-C -.IR configfile ] -.RB [ \-vdhr46D ] -.RB [ \-c -.IR class ] -.RB [ \-t -.IR type ] -.RB [ \-y -.IR key ] -.RB [ \-f -.IR keyfile ] -.RB [ \-F -.IR namedkeyfile ] -.I hostname -.SH "DESCRIPTION" -.B Unbound\-host -uses the Unbound validating resolver to query for the hostname and display -results. With the \fB\-v\fR option it displays validation -status: secure, insecure, bogus (security failure). -.P -By default it reads no configuration file whatsoever. It attempts to reach -the internet root servers. With \fB\-C\fR an Unbound config file and with -\fB\-r\fR resolv.conf can be read. -.P +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "UNBOUND-HOST" "1" "Sep 18, 2025" "1.24.0" "Unbound" +.SH NAME +unbound-host \- Unbound 1.24.0 DNS lookup utility. +.SH SYNOPSIS +.sp +\fBunbound\-host\fP [\fB\-C configfile\fP] [\fB\-vdhr46D\fP] [\fB\-c class\fP] +[\fB\-t type\fP] [\fB\-y key\fP] [\fB\-f keyfile\fP] [\fB\-F namedkeyfile\fP] hostname +.SH DESCRIPTION +.sp +\fBunbound\-host\fP uses the Unbound validating resolver to query for the hostname +and display results. +With the \fI\%\-v\fP option it displays validation status: secure, insecure, +bogus (security failure). +.sp +By default it reads no configuration file whatsoever. +It attempts to reach the internet root servers. +With \fI\%\-C\fP an unbound config file and with \fI\%\-r\fP \fBresolv.conf\fP +can be read. +.sp The available options are: +.INDENT 0.0 .TP -.I hostname +.B hostname This name is resolved (looked up in the DNS). If a IPv4 or IPv6 address is given, a reverse lookup is performed. +.UNINDENT +.INDENT 0.0 .TP .B \-h Show the version and commandline option help. +.UNINDENT +.INDENT 0.0 .TP .B \-v Enable verbose output and it shows validation results, on every line. -Secure means that the NXDOMAIN (no such domain name), nodata (no such data) -or positive data response validated correctly with one of the keys. +Secure means that the NXDOMAIN (no such domain name), nodata (no such +data) or positive data response validated correctly with one of the +keys. Insecure means that that domain name has no security set up for it. -Bogus (security failure) means that the response failed one or more checks, -it is likely wrong, outdated, tampered with, or broken. +Bogus (security failure) means that the response failed one or more +checks, it is likely wrong, outdated, tampered with, or broken. +.UNINDENT +.INDENT 0.0 .TP .B \-d -Enable debug output to stderr. One \-d shows what the resolver and validator -are doing and may tell you what is going on. More times, \-d \-d, gives a -lot of output, with every packet sent and received. +Enable debug output to stderr. +One \fI\%\-d\fP shows what the resolver and validator are doing and may +tell you what is going on. +More times, \fI\%\-d\fP \fI\%\-d\fP, gives a lot of output, with every +packet sent and received. +.UNINDENT +.INDENT 0.0 .TP -.B \-c \fIclass -Specify the class to lookup for, the default is IN the internet class. +.B \-c <class> +Specify the class to lookup for, the default is IN the internet +class. +.UNINDENT +.INDENT 0.0 .TP -.B \-t \fItype -Specify the type of data to lookup. The default looks for IPv4, IPv6 and -mail handler data, or domain name pointers for reverse queries. +.B \-t <type> +Specify the type of data to lookup. +The default looks for IPv4, IPv6 and mail handler data, or domain name +pointers for reverse queries. +.UNINDENT +.INDENT 0.0 .TP -.B \-y \fIkey -Specify a public key to use as trust anchor. This is the base for a chain -of trust that is built up from the trust anchor to the response, in order -to validate the response message. Can be given as a DS or DNSKEY record. -For example \-y "example.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD". +.B \-y <key> +Specify a public key to use as trust anchor. +This is the base for a chain of trust that is built up from the trust +anchor to the response, in order to validate the response message. +Can be given as a DS or DNSKEY record. +For example: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +\-y \(dqexample.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD\(dq +.ft P +.fi +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 .TP .B \-D -Enables DNSSEC validation. Reads the root anchor from the default configured -root anchor at the default location, \fI@UNBOUND_ROOTKEY_FILE@\fR. +Enables DNSSEC validation. +Reads the root anchor from the default configured root anchor at the +default location, \fB@UNBOUND_ROOTKEY_FILE@\fP\&. +.UNINDENT +.INDENT 0.0 .TP -.B \-f \fIkeyfile -Reads keys from a file. Every line has a DS or DNSKEY record, in the format -as for \-y. The zone file format, the same as dig and drill produce. +.B \-f <keyfile> +Reads keys from a file. +Every line has a DS or DNSKEY record, in the format as for \fI\%\-y\fP\&. +The zone file format, the same as \fBdig\fP and \fBdrill\fP produce. +.UNINDENT +.INDENT 0.0 .TP -.B \-F \fInamedkeyfile -Reads keys from a BIND\-style named.conf file. Only the trusted\-key {}; entries -are read. +.B \-F <namedkeyfile> +Reads keys from a BIND\-style \fBnamed.conf\fP file. +Only the \fBtrusted\-key {};\fP entries are read. +.UNINDENT +.INDENT 0.0 .TP -.B \-C \fIconfigfile -Uses the specified unbound.conf to prime -.IR libunbound (3). +.B \-C <configfile> +Uses the specified unbound.conf to prime \fI\%libunbound(3)\fP\&. Pass it as first argument if you want to override some options from the config file with further arguments on the commandline. +.UNINDENT +.INDENT 0.0 .TP .B \-r -Read /etc/resolv.conf, and use the forward DNS servers from there (those could -have been set by DHCP). More info in -.IR resolv.conf (5). +Read \fB/etc/resolv.conf\fP, and use the forward DNS servers from +there (those could have been set by DHCP). +More info in \fIresolv.conf(5)\fP\&. Breaks validation if those servers do not support DNSSEC. +.UNINDENT +.INDENT 0.0 .TP .B \-4 Use solely the IPv4 network for sending packets. +.UNINDENT +.INDENT 0.0 .TP .B \-6 Use solely the IPv6 network for sending packets. -.SH "EXAMPLES" -Some examples of use. The keys shown below are fakes, thus a security failure -is encountered. -.P +.UNINDENT +.SH EXAMPLES +.sp +Some examples of use. +The keys shown below are fakes, thus a security failure is encountered. +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C $ unbound\-host www.example.com -.P -$ unbound\-host \-v \-y "example.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD" www.example.com -.P -$ unbound\-host \-v \-y "example.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD" 192.0.2.153 -.SH "EXIT CODE" -The unbound\-host program exits with status code 1 on error, -0 on no error. The data may not be available on exit code 0, exit code 1 -means the lookup encountered a fatal error. -.SH "SEE ALSO" -\fIunbound.conf\fR(5), -\fIunbound\fR(8). + +$ unbound\-host \-v \-y \(dqexample.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD\(dq www.example.com + +$ unbound\-host \-v \-y \(dqexample.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD\(dq 192.0.2.153 +.ft P +.fi +.UNINDENT +.UNINDENT +.SH EXIT CODE +.sp +The \fBunbound\-host\fP program exits with status code 1 on error, 0 on no error. +The data may not be available on exit code 0, exit code 1 means the lookup +encountered a fatal error. +.SH SEE ALSO +.sp +\fI\%unbound.conf(5)\fP, +\fI\%unbound(8)\fP\&. +.SH AUTHOR +Unbound developers are mentioned in the CREDITS file in the distribution. +.SH COPYRIGHT +1999-2025, NLnet Labs +.\" Generated by docutils manpage writer. +. diff --git a/contrib/unbound/doc/unbound-host.rst b/contrib/unbound/doc/unbound-host.rst new file mode 100644 index 000000000000..7c809a15d187 --- /dev/null +++ b/contrib/unbound/doc/unbound-host.rst @@ -0,0 +1,176 @@ +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. program:: unbound-host + +unbound-host(1) +=============== + +Synopsis +-------- + +**unbound-host** [``-C configfile``] [``-vdhr46D``] [``-c class``] +[``-t type``] [``-y key``] [``-f keyfile``] [``-F namedkeyfile``] hostname + +Description +----------- + +``unbound-host`` uses the Unbound validating resolver to query for the hostname +and display results. +With the :option:`-v` option it displays validation status: secure, insecure, +bogus (security failure). + +By default it reads no configuration file whatsoever. +It attempts to reach the internet root servers. +With :option:`-C` an unbound config file and with :option:`-r` ``resolv.conf`` +can be read. + +The available options are: + +.. option:: hostname + + This name is resolved (looked up in the DNS). + If a IPv4 or IPv6 address is given, a reverse lookup is performed. + +.. option:: -h + + Show the version and commandline option help. + +.. option:: -v + + Enable verbose output and it shows validation results, on every line. + Secure means that the NXDOMAIN (no such domain name), nodata (no such + data) or positive data response validated correctly with one of the + keys. + Insecure means that that domain name has no security set up for it. + Bogus (security failure) means that the response failed one or more + checks, it is likely wrong, outdated, tampered with, or broken. + +.. option:: -d + + Enable debug output to stderr. + One :option:`-d` shows what the resolver and validator are doing and may + tell you what is going on. + More times, :option:`-d` :option:`-d`, gives a lot of output, with every + packet sent and received. + +.. option:: -c <class> + + Specify the class to lookup for, the default is IN the internet + class. + +.. option:: -t <type> + + Specify the type of data to lookup. + The default looks for IPv4, IPv6 and mail handler data, or domain name + pointers for reverse queries. + +.. option:: -y <key> + + Specify a public key to use as trust anchor. + This is the base for a chain of trust that is built up from the trust + anchor to the response, in order to validate the response message. + Can be given as a DS or DNSKEY record. + For example: + + .. code-block:: text + + -y "example.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD" + +.. option:: -D + + Enables DNSSEC validation. + Reads the root anchor from the default configured root anchor at the + default location, :file:`@UNBOUND_ROOTKEY_FILE@`. + +.. option:: -f <keyfile> + + Reads keys from a file. + Every line has a DS or DNSKEY record, in the format as for :option:`-y`. + The zone file format, the same as ``dig`` and ``drill`` produce. + +.. option:: -F <namedkeyfile> + + Reads keys from a BIND-style :file:`named.conf` file. + Only the ``trusted-key {};`` entries are read. + +.. option:: -C <configfile> + + Uses the specified unbound.conf to prime :doc:`libunbound(3)</manpages/libunbound>`. + Pass it as first argument if you want to override some options from the + config file with further arguments on the commandline. + +.. option:: -r + + Read :file:`/etc/resolv.conf`, and use the forward DNS servers from + there (those could have been set by DHCP). + More info in *resolv.conf(5)*. + Breaks validation if those servers do not support DNSSEC. + +.. option:: -4 + + Use solely the IPv4 network for sending packets. + +.. option:: -6 + + Use solely the IPv6 network for sending packets. + +Examples +-------- + +Some examples of use. +The keys shown below are fakes, thus a security failure is encountered. + +.. code-block:: text + + $ unbound-host www.example.com + + $ unbound-host -v -y "example.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD" www.example.com + + $ unbound-host -v -y "example.com DS 31560 5 1 1CFED84787E6E19CCF9372C1187325972FE546CD" 192.0.2.153 + +Exit Code +--------- + +The ``unbound-host`` program exits with status code 1 on error, 0 on no error. +The data may not be available on exit code 0, exit code 1 means the lookup +encountered a fatal error. + +See Also +-------- + +:doc:`unbound.conf(5)</manpages/unbound.conf>`, +:doc:`unbound(8)</manpages/unbound>`. diff --git a/contrib/unbound/doc/unbound.8.in b/contrib/unbound/doc/unbound.8.in index 1ec4c304b70c..5069bc92d99f 100644 --- a/contrib/unbound/doc/unbound.8.in +++ b/contrib/unbound/doc/unbound.8.in @@ -1,88 +1,123 @@ -.TH "unbound" "8" "Jul 16, 2025" "NLnet Labs" "unbound 1.23.1" -.\" -.\" unbound.8 -- unbound manual -.\" -.\" Copyright (c) 2007, NLnet Labs. All rights reserved. -.\" -.\" See LICENSE for the license. -.\" -.\" -.SH "NAME" -.B unbound -\- Unbound DNS validating resolver 1.23.1. -.SH "SYNOPSIS" -.B unbound -.RB [ \-h ] -.RB [ \-d ] -.RB [ \-p ] -.RB [ \-v ] -.RB [ \-c -.IR cfgfile ] -.SH "DESCRIPTION" -.B Unbound -is a caching DNS resolver. -.P -It uses a built in list of authoritative nameservers for the root zone (.), +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "UNBOUND" "8" "Sep 18, 2025" "1.24.0" "Unbound" +.SH NAME +unbound \- Unbound DNS validating resolver 1.24.0. +.SH SYNOPSIS +.sp +\fBunbound\fP [\fB\-hdpv\fP] [\fB\-c <cfgfile>\fP] +.SH DESCRIPTION +.sp +\fBunbound\fP is a caching DNS resolver. +.sp +It uses a built in list of authoritative nameservers for the root zone (\fB\&.\fP), the so called root hints. -On receiving a DNS query it will ask the root nameservers for -an answer and will in almost all cases receive a delegation to a top level -domain (TLD) authoritative nameserver. +On receiving a DNS query it will ask the root nameservers for an answer and +will in almost all cases receive a delegation to a top level domain (TLD) +authoritative nameserver. It will then ask that nameserver for an answer. -It will recursively continue until an answer is found or no answer is -available (NXDOMAIN). -For performance and efficiency reasons that answer is cached for a -certain time (the answer's time\-to\-live or TTL). +It will recursively continue until an answer is found or no answer is available +(NXDOMAIN). +For performance and efficiency reasons that answer is cached for a certain time +(the answer\(aqs time\-to\-live or TTL). A second query for the same name will then be answered from the cache. Unbound can also do DNSSEC validation. -.P -To use a locally running -.B Unbound -for resolving put .sp -.RS 6n +To use a locally running Unbound for resolving put: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C nameserver 127.0.0.1 -.RE +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +into \fIresolv.conf(5)\fP\&. +.sp +If authoritative DNS is needed as well using \fI\%nsd(8)\fP, +careful setup is required because authoritative nameservers and resolvers are +using the same port number (53). .sp -into -.IR resolv.conf (5). -.P -If authoritative DNS is needed as well using -.IR nsd (8), -careful setup is required because authoritative nameservers and -resolvers are using the same port number (53). -.P The available options are: +.INDENT 0.0 .TP .B \-h Show the version number and commandline option help, and exit. +.UNINDENT +.INDENT 0.0 .TP -.B \-c\fI cfgfile -Set the config file with settings for Unbound to read instead of reading the -file at the default location, @ub_conf_file@. The syntax is -described in \fIunbound.conf\fR(5). +.B \-c <cfgfile> +Set the config file with settings for unbound to read instead of reading the +file at the default location, \fB@ub_conf_file@\fP\&. +The syntax is described in \fI\%unbound.conf(5)\fP\&. +.UNINDENT +.INDENT 0.0 .TP .B \-d -Debug flag: do not fork into the background, but stay attached to -the console. This flag will also delay writing to the log file until -the thread\-spawn time, so that most config and setup errors appear on -stderr. If given twice or more, logging does not switch to the log file -or to syslog, but the log messages are printed to stderr all the time. +Debug flag: do not fork into the background, but stay attached to the +console. +This flag will also delay writing to the log file until the thread\-spawn +time, so that most config and setup errors appear on stderr. +If given twice or more, logging does not switch to the log file or to +syslog, but the log messages are printed to stderr all the time. +.UNINDENT +.INDENT 0.0 .TP .B \-p -Don't use a pidfile. This argument should only be used by supervision -systems which can ensure that only one instance of Unbound will run -concurrently. +Don\(aqt use a pidfile. +This argument should only be used by supervision systems which can ensure +that only one instance of Unbound will run concurrently. +.UNINDENT +.INDENT 0.0 .TP .B \-v -Increase verbosity. If given multiple times, more information is logged. -This is added to the verbosity (if any) from the config file. +Increase verbosity. +If given multiple times, more information is logged. +This is in addition to the verbosity (if any) from the config file. +.UNINDENT +.INDENT 0.0 .TP .B \-V Show the version number and build options, and exit. -.SH "SEE ALSO" -\fIunbound.conf\fR(5), -\fIunbound\-checkconf\fR(8), -\fInsd\fR(8). -.SH "AUTHORS" -.B Unbound -developers are mentioned in the CREDITS file in the distribution. +.UNINDENT +.SH SEE ALSO +.sp +\fI\%unbound.conf(5)\fP, +\fI\%unbound\-checkconf(8)\fP, +\fI\%nsd(8)\fP\&. +.SH AUTHOR +Unbound developers are mentioned in the CREDITS file in the distribution. +.SH COPYRIGHT +1999-2025, NLnet Labs +.\" Generated by docutils manpage writer. +. diff --git a/contrib/unbound/doc/unbound.conf.5.in b/contrib/unbound/doc/unbound.conf.5.in index 46af53802479..59e9411cd6eb 100644 --- a/contrib/unbound/doc/unbound.conf.5.in +++ b/contrib/unbound/doc/unbound.conf.5.in @@ -1,1395 +1,2549 @@ -.TH "unbound.conf" "5" "Jul 16, 2025" "NLnet Labs" "unbound 1.23.1" -.\" -.\" unbound.conf.5 -- unbound.conf manual -.\" -.\" Copyright (c) 2007, NLnet Labs. All rights reserved. -.\" -.\" See LICENSE for the license. -.\" -.\" -.SH "NAME" -.B unbound.conf -\- Unbound configuration file. -.SH "SYNOPSIS" -.B unbound.conf -.SH "DESCRIPTION" -.B unbound.conf -is used to configure -\fIunbound\fR(8). -The file format has attributes and values. Some attributes have attributes -inside them. -The notation is: attribute: value. -.P -Comments start with # and last to the end of line. Empty lines are -ignored as is whitespace at the beginning of a line. -.P -The utility -\fIunbound\-checkconf\fR(8) -can be used to check unbound.conf prior to usage. -.SH "EXAMPLE" -An example config file is shown below. Copy this to /etc/unbound/unbound.conf -and start the server with: -.P +.\" Man page generated from reStructuredText. +. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.TH "UNBOUND.CONF" "5" "Sep 18, 2025" "1.24.0" "Unbound" +.SH NAME +unbound.conf \- Unbound 1.24.0 configuration file. +.SH SYNOPSIS +.sp +\fBunbound.conf\fP +.SH DESCRIPTION +.sp +\fBunbound.conf\fP is used to configure \fI\%unbound(8)\fP\&. +The file format has attributes and values. +Some attributes have attributes inside them. +The notation is: \fBattribute: value\fP\&. +.sp +Comments start with \fB#\fP and last to the end of line. +Empty lines are ignored as is whitespace at the beginning of a line. +.sp +The utility \fI\%unbound\-checkconf(8)\fP can be +used to check \fBunbound.conf\fP prior to usage. +.SH EXAMPLE +.sp +An example config file is shown below. +Copy this to \fB/etc/unbound/unbound.conf\fP and start the server with: +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - $ unbound \-c /etc/unbound/unbound.conf +.ft C +$ unbound \-c /etc/unbound/unbound.conf +.ft P .fi -.P -Most settings are the defaults. Stop the server with: -.P +.UNINDENT +.UNINDENT +.sp +Most settings are the defaults. +Stop the server with: +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - $ kill `cat /etc/unbound/unbound.pid` +.ft C +$ kill \(gacat /etc/unbound/unbound.pid\(ga +.ft P .fi -.P -Below is a minimal config file. The source distribution contains an extensive -example.conf file with all the options. -.P +.UNINDENT +.UNINDENT +.sp +Below is a minimal config file. +The source distribution contains an extensive \fBexample.conf\fP file with +all the options. +.INDENT 0.0 +.INDENT 3.5 +.sp .nf +.ft C # unbound.conf(5) config file for unbound(8). server: - directory: "/etc/unbound" - username: unbound - # make sure unbound can access entropy from inside the chroot. - # e.g. on linux the use these commands (on BSD, devfs(8) is used): - # mount \-\-bind \-n /dev/urandom /etc/unbound/dev/urandom - # and mount \-\-bind \-n /dev/log /etc/unbound/dev/log - chroot: "/etc/unbound" - # logfile: "/etc/unbound/unbound.log" #uncomment to use logfile. - pidfile: "/etc/unbound/unbound.pid" - # verbosity: 1 # uncomment and increase to get more logging. - # listen on all interfaces, answer queries from the local subnet. - interface: 0.0.0.0 - interface: ::0 - access\-control: 10.0.0.0/8 allow - access\-control: 2001:DB8::/64 allow + directory: \(dq/etc/unbound\(dq + username: unbound + # make sure unbound can access entropy from inside the chroot. + # e.g. on linux the use these commands (on BSD, devfs(8) is used): + # mount \-\-bind \-n /dev/urandom /etc/unbound/dev/urandom + # and mount \-\-bind \-n /dev/log /etc/unbound/dev/log + chroot: \(dq/etc/unbound\(dq + # logfile: \(dq/etc/unbound/unbound.log\(dq #uncomment to use logfile. + pidfile: \(dq/etc/unbound/unbound.pid\(dq + # verbosity: 1 # uncomment and increase to get more logging. + # listen on all interfaces, answer queries from the local subnet. + interface: 0.0.0.0 + interface: ::0 + access\-control: 10.0.0.0/8 allow + access\-control: 2001:DB8::/64 allow +.ft P .fi -.SH "FILE FORMAT" -There must be whitespace between keywords. Attribute keywords end with a -colon ':'. An attribute is followed by a value, or its containing attributes -in which case it is referred to as a clause. Clauses can be repeated throughout -the file (or included files) to group attributes under the same clause. -.P -Files can be included using the -.B include: -directive. It can appear anywhere, it accepts a single file name as argument. -Processing continues as if the text from the included file was copied into -the config file at that point. If also using chroot, using full path names -for the included files works, relative pathnames for the included names work -if the directory where the daemon is started equals its chroot/working -directory or is specified before the include statement with directory: dir. -Wildcards can be used to include multiple files, see \fIglob\fR(7). -.P -For a more structural include option, the -.B include\-toplevel: -directive can be used. This closes whatever clause is currently active (if any) -and forces the use of clauses in the included files and right after this -directive. -.SS "Server Options" -These options are part of the -.B server: -clause. -.TP -.B verbosity: \fI<number> -The verbosity number, level 0 means no verbosity, only errors. Level 1 -gives operational information. Level 2 gives detailed operational -information including short information per query. Level 3 gives query level -information, output per query. Level 4 gives algorithm level information. -Level 5 logs client identification for cache misses. Default is level 1. -The verbosity can also be increased from the commandline, see \fIunbound\fR(8). -.TP -.B statistics\-interval: \fI<seconds> -The number of seconds between printing statistics to the log for every thread. -Disable with value 0 or "". Default is disabled. The histogram statistics -are only printed if replies were sent during the statistics interval, -requestlist statistics are printed for every interval (but can be 0). +.UNINDENT +.UNINDENT +.SH FILE FORMAT +.sp +There must be whitespace between keywords. +Attribute keywords end with a colon \fB\(aq:\(aq\fP\&. +An attribute is followed by a value, or its containing attributes in which case +it is referred to as a clause. +Clauses can be repeated throughout the file (or included files) to group +attributes under the same clause. +.sp +Files can be included using the \fBinclude:\fP directive. +It can appear anywhere, it accepts a single file name as argument. +Processing continues as if the text from the included file was copied into the +config file at that point. +If also using \fI\%chroot\fP, using full path names for +the included files works, relative pathnames for the included names work if the +directory where the daemon is started equals its chroot/working directory or is +specified before the include statement with \fI\%directory: +dir\fP\&. +Wildcards can be used to include multiple files, see \fIglob(7)\fP\&. +.sp +For a more structural include option, the \fBinclude\-toplevel:\fP directive can +be used. +This closes whatever clause is currently active (if any) and forces the use of +clauses in the included files and right after this directive. +.SS Server Options +.sp +These options are part of the \fBserver:\fP clause. +.INDENT 0.0 +.TP +.B verbosity: \fI<number>\fP +The verbosity level. +.INDENT 7.0 +.TP +.B Level 0 +No verbosity, only errors. +.TP +.B Level 1 +Gives operational information. +.TP +.B Level 2 +Gives detailed operational information including short information per +query. +.TP +.B Level 3 +Gives query level information, output per query. +.TP +.B Level 4 +Gives algorithm level information. +.TP +.B Level 5 +Logs client identification for cache misses. +.UNINDENT +.sp +The verbosity can also be increased from the command line and during run +time via remote control. See \fI\%unbound(8)\fP and +\fI\%unbound\-control(8)\fP respectively. +.sp +Default: 1 +.UNINDENT +.INDENT 0.0 +.TP +.B statistics\-interval: \fI<seconds>\fP +The number of seconds between printing statistics to the log for every +thread. +Disable with value \fB0\fP or \fB\(dq\(dq\fP\&. +The histogram statistics are only printed if replies were sent during the +statistics interval, requestlist statistics are printed for every interval +(but can be 0). This is because the median calculation requires data to be present. -.TP -.B statistics\-cumulative: \fI<yes or no> -If enabled, statistics are cumulative since starting Unbound, without clearing -the statistics counters after logging the statistics. Default is no. -.TP -.B extended\-statistics: \fI<yes or no> -If enabled, extended statistics are printed from \fIunbound\-control\fR(8). -Default is off, because keeping track of more statistics takes time. The -counters are listed in \fIunbound\-control\fR(8). -.TP -.B statistics\-inhibit\-zero: \fI<yes or no> -If enabled, selected extended statistics with a value of 0 are inhibited from -printing with \fIunbound\-control\fR(8). +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B statistics\-cumulative: \fI<yes or no>\fP +If enabled, statistics are cumulative since starting Unbound, without +clearing the statistics counters after logging the statistics. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B extended\-statistics: \fI<yes or no>\fP +If enabled, extended statistics are printed from +\fI\%unbound\-control(8)\fP\&. +The counters are listed in +\fI\%unbound\-control(8)\fP\&. +Keeping track of more statistics takes time. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B statistics\-inhibit\-zero: \fI<yes or no>\fP +If enabled, selected extended statistics with a value of 0 are inhibited +from printing with +\fI\%unbound\-control(8)\fP\&. These are query types, query classes, query opcodes, answer rcodes -(except NOERROR, FORMERR, SERVFAIL, NXDOMAIN, NOTIMPL, REFUSED) and -RPZ actions. -Default is on. -.TP -.B num\-threads: \fI<number> +(except NOERROR, FORMERR, SERVFAIL, NXDOMAIN, NOTIMPL, REFUSED) +and PRZ actions. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B num\-threads: \fI<number>\fP The number of threads to create to serve clients. Use 1 for no threading. -.TP -.B port: \fI<port number> -The port number, default 53, on which the server responds to queries. -.TP -.B interface: \fI<ip address or interface name [@port]> -Interface to use to connect to the network. This interface is listened to -for queries from clients, and answers to clients are given from it. -Can be given multiple times to work on several interfaces. If none are -given the default is to listen to localhost. If an interface name is used -instead of an ip address, the list of ip addresses on that interface are used. -The interfaces are not changed on a reload (kill \-HUP) but only on restart. -A port number can be specified with @port (without spaces between -interface and port number), if not specified the default port (from -\fBport\fR) is used. -.TP -.B ip\-address: \fI<ip address or interface name [@port]> -Same as interface: (for ease of compatibility with nsd.conf). -.TP -.B interface\-automatic: \fI<yes or no> +.sp +Default: 1 +.UNINDENT +.INDENT 0.0 +.TP +.B port: \fI<port number>\fP +The port number on which the server responds to queries. +.sp +Default: 53 +.UNINDENT +.INDENT 0.0 +.TP +.B interface: \fI<IP address or interface name[@port]>\fP +Interface to use to connect to the network. +This interface is listened to for queries from clients, and answers to +clients are given from it. +Can be given multiple times to work on several interfaces. +If none are given the default is to listen on localhost. +.sp +If an interface name is used instead of an IP address, the list of IP +addresses on that interface are used. +The interfaces are not changed on a reload (\fBkill \-HUP\fP) but only on +restart. +.sp +A port number can be specified with @port (without spaces between interface +and port number), if not specified the default port (from +\fI\%port\fP) is used. +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-address: \fI<IP address or interface name[@port]>\fP +Same as \fI\%interface\fP (for ease of +compatibility with \fI\%nsd.conf(5)\fP). +.UNINDENT +.INDENT 0.0 +.TP +.B interface\-automatic: \fI<yes or no>\fP Listen on all addresses on all (current and future) interfaces, detect the -source interface on UDP queries and copy them to replies. This is a lot like -ip\-transparent, but this option services all interfaces whilst with -ip\-transparent you can select which (future) interfaces Unbound provides -service on. This feature is experimental, and needs support in your OS for -particular socket options. Default value is no. -.TP -.B interface\-automatic\-ports: \fI<string> -List the port numbers that interface-automatic listens on. If empty, the -default port is listened on. The port numbers are separated by spaces in the -string. Default is "". -.IP +source interface on UDP queries and copy them to replies. +This is a lot like \fI\%ip\-transparent\fP, but +this option services all interfaces whilst with +\fI\%ip\-transparent\fP you can select which +(future) interfaces Unbound provides service on. +This feature is experimental, and needs support in your OS for particular +socket options. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B interface\-automatic\-ports: \fI\(dq<string>\(dq\fP +List the port numbers that +\fI\%interface\-automatic\fP listens on. +If empty, the default port is listened on. +The port numbers are separated by spaces in the string. +.sp This can be used to have interface automatic to deal with the interface, and listen on the normal port number, by including it in the list, and -also https or dns over tls port numbers by putting them in the list as well. -.TP -.B outgoing\-interface: \fI<ip address or ip6 netblock> -Interface to use to connect to the network. This interface is used to send -queries to authoritative servers and receive their replies. Can be given -multiple times to work on several interfaces. If none are given the -default (all) is used. You can specify the same interfaces in -.B interface: -and -.B outgoing\-interface: -lines, the interfaces are then used for both purposes. Outgoing queries are -sent via a random outgoing interface to counter spoofing. -.IP +also HTTPS or DNS\-over\-TLS port numbers by putting them in the list as +well. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B outgoing\-interface: \fI<IPv4/IPv6 address or IPv6 netblock>\fP +Interface to use to connect to the network. +This interface is used to send queries to authoritative servers and receive +their replies. +Can be given multiple times to work on several interfaces. +If none are given the default (all) is used. +You can specify the same interfaces in +\fI\%interface\fP and +\fI\%outgoing\-interface\fP lines, the +interfaces are then used for both purposes. +Outgoing queries are sent via a random outgoing interface to counter +spoofing. +.sp If an IPv6 netblock is specified instead of an individual IPv6 address, outgoing UDP queries will use a randomised source address taken from the -netblock to counter spoofing. Requires the IPv6 netblock to be routed to the -host running Unbound, and requires OS support for unprivileged non-local binds -(currently only supported on Linux). Several netblocks may be specified with -multiple -.B outgoing\-interface: -options, but do not specify both an individual IPv6 address and an IPv6 -netblock, or the randomisation will be compromised. Consider combining with -.B prefer\-ip6: yes -to increase the likelihood of IPv6 nameservers being selected for queries. +netblock to counter spoofing. +Requires the IPv6 netblock to be routed to the host running Unbound, and +requires OS support for unprivileged non\-local binds (currently only +supported on Linux). +Several netblocks may be specified with multiple +\fI\%outgoing\-interface\fP options, but do +not specify both an individual IPv6 address and an IPv6 netblock, or the +randomisation will be compromised. +Consider combining with \fI\%prefer\-ip6: yes\fP to +increase the likelihood of IPv6 nameservers being selected for queries. On Linux you need these two commands to be able to use the freebind socket option to receive traffic for the ip6 netblock: -ip \-6 addr add mynetblock/64 dev lo && +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +ip \-6 addr add mynetblock/64 dev lo && \e ip \-6 route add local mynetblock/64 dev lo -.TP -.B outgoing\-range: \fI<number> -Number of ports to open. This number of file descriptors can be opened per -thread. Must be at least 1. Default depends on compile options. Larger -numbers need extra resources from the operating system. For performance a -very large value is best, use libevent to make this possible. -.TP -.B outgoing\-port\-permit: \fI<port number or range> +.ft P +.fi +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B outgoing\-range: \fI<number>\fP +Number of ports to open. +This number of file descriptors can be opened per thread. +Must be at least 1. +Default depends on compile options. +Larger numbers need extra resources from the operating system. +For performance a very large value is best, use libevent to make this +possible. +.sp +Default: 4096 (libevent) / 960 (minievent) / 48 (windows) +.UNINDENT +.INDENT 0.0 +.TP +.B outgoing\-port\-permit: \fI<port number or range>\fP Permit Unbound to open this port or range of ports for use to send queries. A larger number of permitted outgoing ports increases resilience against -spoofing attempts. Make sure these ports are not needed by other daemons. -By default only ports above 1024 that have not been assigned by IANA are used. -Give a port number or a range of the form "low\-high", without spaces. -.IP -The \fBoutgoing\-port\-permit\fR and \fBoutgoing\-port\-avoid\fR statements -are processed in the line order of the config file, adding the permitted ports -and subtracting the avoided ports from the set of allowed ports. The -processing starts with the non IANA allocated ports above 1024 in the set -of allowed ports. -.TP -.B outgoing\-port\-avoid: \fI<port number or range> +spoofing attempts. +Make sure these ports are not needed by other daemons. +By default only ports above 1024 that have not been assigned by IANA are +used. +Give a port number or a range of the form \(dqlow\-high\(dq, without spaces. +.sp +The \fI\%outgoing\-port\-permit\fP and +\fI\%outgoing\-port\-avoid\fP statements +are processed in the line order of the config file, adding the permitted +ports and subtracting the avoided ports from the set of allowed ports. +The processing starts with the non IANA allocated ports above 1024 in the +set of allowed ports. +.UNINDENT +.INDENT 0.0 +.TP +.B outgoing\-port\-avoid: \fI<port number or range>\fP Do not permit Unbound to open this port or range of ports for use to send -queries. Use this to make sure Unbound does not grab a port that another -daemon needs. The port is avoided on all outgoing interfaces, both IP4 and IP6. -By default only ports above 1024 that have not been assigned by IANA are used. -Give a port number or a range of the form "low\-high", without spaces. -.TP -.B outgoing\-num\-tcp: \fI<number> -Number of outgoing TCP buffers to allocate per thread. Default is 10. If -set to 0, or if do\-tcp is "no", no TCP queries to authoritative servers -are done. For larger installations increasing this value is a good idea. -.TP -.B incoming\-num\-tcp: \fI<number> -Number of incoming TCP buffers to allocate per thread. Default is -10. If set to 0, or if do\-tcp is "no", no TCP queries from clients are -accepted. For larger installations increasing this value is a good idea. -.TP -.B edns\-buffer\-size: \fI<number> +queries. +Use this to make sure Unbound does not grab a port that another daemon +needs. +The port is avoided on all outgoing interfaces, both IPv4 and IPv6. +By default only ports above 1024 that have not been assigned by IANA are +used. +Give a port number or a range of the form \(dqlow\-high\(dq, without spaces. +.UNINDENT +.INDENT 0.0 +.TP +.B outgoing\-num\-tcp: \fI<number>\fP +Number of outgoing TCP buffers to allocate per thread. +If set to 0, or if \fI\%do\-tcp: no\fP is set, no TCP +queries to authoritative servers are done. +For larger installations increasing this value is a good idea. +.sp +Default: 10 +.UNINDENT +.INDENT 0.0 +.TP +.B incoming\-num\-tcp: \fI<number>\fP +Number of incoming TCP buffers to allocate per thread. +If set to 0, or if \fI\%do\-tcp: no\fP is set, no TCP +queries from clients are accepted. +For larger installations increasing this value is a good idea. +.sp +Default: 10 +.UNINDENT +.INDENT 0.0 +.TP +.B edns\-buffer\-size: \fI<number>\fP Number of bytes size to advertise as the EDNS reassembly buffer size. -This is the value put into datagrams over UDP towards peers. The actual -buffer size is determined by msg\-buffer\-size (both for TCP and UDP). Do -not set higher than that value. Default is 1232 which is the DNS Flag Day 2020 -recommendation. Setting to 512 bypasses even the most stringent path MTU -problems, but is seen as extreme, since the amount of TCP fallback generated is -excessive (probably also for this resolver, consider tuning the outgoing tcp -number). -.TP -.B max\-udp\-size: \fI<number> -Maximum UDP response size (not applied to TCP response). 65536 disables the -udp response size maximum, and uses the choice from the client, always. -Suggested values are 512 to 4096. Default is 1232. The default value is the -same as the default for edns\-buffer\-size. -.TP -.B stream\-wait\-size: \fI<number> -Number of bytes size maximum to use for waiting stream buffers. Default is -4 megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, -megabytes or gigabytes (1024*1024 bytes in a megabyte). As TCP and TLS streams -queue up multiple results, the amount of memory used for these buffers does -not exceed this number, otherwise the responses are dropped. This manages -the total memory usage of the server (under heavy use), the number of requests -that can be queued up per connection is also limited, with further requests -waiting in TCP buffers. -.TP -.B msg\-buffer\-size: \fI<number> -Number of bytes size of the message buffers. Default is 65552 bytes, enough -for 64 Kb packets, the maximum DNS message size. No message larger than this -can be sent or received. Can be reduced to use less memory, but some requests -for DNS data, such as for huge resource records, will result in a SERVFAIL -reply to the client. -.TP -.B msg\-cache\-size: \fI<number> -Number of bytes size of the message cache. Default is 4 megabytes. -A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes +This is the value put into datagrams over UDP towards peers. +The actual buffer size is determined by +\fI\%msg\-buffer\-size\fP (both for TCP and +UDP). +Do not set higher than that value. +Setting to 512 bypasses even the most stringent path MTU problems, but is +seen as extreme, since the amount of TCP fallback generated is excessive +(probably also for this resolver, consider tuning +\fI\%outgoing\-num\-tcp\fP). +.sp +Default: 1232 (\fI\%DNS Flag Day 2020 recommendation\fP) +.UNINDENT +.INDENT 0.0 +.TP +.B max\-udp\-size: \fI<number>\fP +Maximum UDP response size (not applied to TCP response). +65536 disables the UDP response size maximum, and uses the choice from the +client, always. +Suggested values are 512 to 4096. +.sp +Default: 1232 (same as \fI\%edns\-buffer\-size\fP) +.UNINDENT +.INDENT 0.0 +.TP +.B stream\-wait\-size: \fI<number>\fP +Number of bytes size maximum to use for waiting stream buffers. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes or gigabytes (1024*1024 bytes in a megabyte). -.TP -.B msg\-cache\-slabs: \fI<number> -Number of slabs in the message cache. Slabs reduce lock contention by threads. -Must be set to a power of 2. Setting (close) to the number of cpus is a -reasonable guess. -.TP -.B num\-queries\-per\-thread: \fI<number> +As TCP and TLS streams queue up multiple results, the amount of memory used +for these buffers does not exceed this number, otherwise the responses are +dropped. +This manages the total memory usage of the server (under heavy use), the +number of requests that can be queued up per connection is also limited, +with further requests waiting in TCP buffers. +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B msg\-buffer\-size: \fI<number>\fP +Number of bytes size of the message buffers. +Default is 65552 bytes, enough for 64 Kb packets, the maximum DNS message +size. +No message larger than this can be sent or received. +Can be reduced to use less memory, but some requests for DNS data, such as +for huge resource records, will result in a SERVFAIL reply to the client. +.sp +Default: 65552 +.UNINDENT +.INDENT 0.0 +.TP +.B msg\-cache\-size: \fI<number>\fP +Number of bytes size of the message cache. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes +or gigabytes (1024*1024 bytes in a megabyte). +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B msg\-cache\-slabs: \fI<number>\fP +Number of slabs in the message cache. +Slabs reduce lock contention by threads. +Must be set to a power of 2. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.INDENT 0.0 +.TP +.B num\-queries\-per\-thread: \fI<number>\fP The number of queries that every thread will service simultaneously. -If more queries arrive that need servicing, and no queries can be jostled out -(see \fIjostle\-timeout\fR), then the queries are dropped. This forces -the client to resend after a timeout; allowing the server time to work on -the existing queries. Default depends on compile options, 512 or 1024. -.TP -.B jostle\-timeout: \fI<msec> -Timeout used when the server is very busy. Set to a value that usually -results in one roundtrip to the authority servers. If too many queries -arrive, then 50% of the queries are allowed to run to completion, and -the other 50% are replaced with the new incoming query if they have already -spent more than their allowed time. This protects against denial of -service by slow queries or high query rates. Default 200 milliseconds. -The effect is that the qps for long-lasting queries is about -(numqueriesperthread / 2) / (average time for such long queries) qps. -The qps for short queries can be about (numqueriesperthread / 2) -/ (jostletimeout in whole seconds) qps per thread, about (1024/2)*5 = 2560 -qps by default. -.TP -.B delay\-close: \fI<msec> +If more queries arrive that need servicing, and no queries can be jostled +out (see \fI\%jostle\-timeout\fP), then the +queries are dropped. +This forces the client to resend after a timeout; allowing the server time +to work on the existing queries. +Default depends on compile options. +.sp +Default: 2048 (libevent) / 512 (minievent) / 24 (windows) +.UNINDENT +.INDENT 0.0 +.TP +.B jostle\-timeout: \fI<msec>\fP +Timeout used when the server is very busy. +Set to a value that usually results in one roundtrip to the authority +servers. +.sp +If too many queries arrive, then 50% of the queries are allowed to run to +completion, and the other 50% are replaced with the new incoming query if +they have already spent more than their allowed time. +This protects against denial of service by slow queries or high query +rates. +.sp +The effect is that the qps for long\-lasting queries is about: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +(num\-queries\-per\-thread / 2) / (average time for such long queries) qps +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +The qps for short queries can be about: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +(num\-queries\-per\-thread / 2) / (jostle\-timeout in whole seconds) qps per thread +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +about (2048/2)*5 = 5120 qps by default. +.sp +Default: 200 +.UNINDENT +.INDENT 0.0 +.TP +.B delay\-close: \fI<msec>\fP Extra delay for timeouted UDP ports before they are closed, in msec. -Default is 0, and that disables it. This prevents very delayed answer -packets from the upstream (recursive) servers from bouncing against -closed ports and setting off all sort of close-port counters, with -eg. 1500 msec. When timeouts happen you need extra sockets, it checks -the ID and remote IP of packets, and unwanted packets are added to the -unwanted packet counter. -.TP -.B udp\-connect: \fI<yes or no> -Perform connect for UDP sockets that mitigates ICMP side channel leakage. -Default is yes. -.TP -.B unknown\-server\-time\-limit: \fI<msec> +This prevents very delayed answer packets from the upstream (recursive) +servers from bouncing against closed ports and setting off all sort of +close\-port counters, with eg. 1500 msec. +When timeouts happen you need extra sockets, it checks the ID and remote IP +of packets, and unwanted packets are added to the unwanted packet counter. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B udp\-connect: \fI<yes or no>\fP +Perform \fIconnect(2)\fP for UDP sockets that mitigates ICMP side channel +leakage. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B unknown\-server\-time\-limit: \fI<msec>\fP The wait time in msec for waiting for an unknown server to reply. Increase this if you are behind a slow satellite link, to eg. 1128. That would then avoid re\-querying every initial query because it times out. -Default is 376 msec. -.TP -.B discard\-timeout: \fI<msec> -The wait time in msec where recursion requests are dropped. This is -to stop a large number of replies from accumulating. They receive -no reply, the work item continues to recurse. It is nice to be a bit -larger than serve\-expired\-client\-timeout if that is enabled. -A value of 1900 msec is suggested. The value 0 disables it. -Default 1900 msec. -.TP -.B wait\-limit: \fI<number> +.sp +Default: 376 +.UNINDENT +.INDENT 0.0 +.TP +.B discard\-timeout: \fI<msec>\fP +The wait time in msec where recursion requests are dropped. +This is to stop a large number of replies from accumulating. +They receive no reply, the work item continues to recurse. +It is nice to be a bit larger than +\fI\%serve\-expired\-client\-timeout\fP +if that is enabled. +A value of \fB1900\fP msec is suggested. +The value \fB0\fP disables it. +.sp +Default: 1900 +.UNINDENT +.INDENT 0.0 +.TP +.B wait\-limit: \fI<number>\fP The number of replies that can wait for recursion, for an IP address. This makes a ratelimit per IP address of waiting replies for recursion. It stops very large amounts of queries waiting to be returned to one -destination. The value 0 disables wait limits. Default is 1000. +destination. +The value \fB0\fP disables wait limits. +.sp +Default: 1000 +.UNINDENT +.INDENT 0.0 .TP -.B wait\-limit\-cookie: \fI<number> +.B wait\-limit\-cookie: \fI<number>\fP The number of replies that can wait for recursion, for an IP address -that sent the query with a valid DNS cookie. Since the cookie validates -the client address, the limit can be higher. Default is 10000. -.TP -.B wait\-limit\-netblock: \fI<netblock> <number> -The wait limit for the netblock. If not given the wait\-limit value is -used. The most specific netblock is used to determine the limit. Useful for -overriding the default for a specific, group or individual, server. -The value -1 disables wait limits for the netblock. -By default the loopback has a wait limit netblock of -1, it is not limited, -because it is separated from the rest of network for spoofed packets. -The loopback addresses 127.0.0.0/8 and ::1/128 are default at -1. -.TP -.B wait\-limit\-cookie\-netblock: \fI<netblock> <number> -The wait limit for the netblock, when the query has a DNS cookie. -If not given, the wait\-limit\-cookie value is used. -The value -1 disables wait limits for the netblock. -The loopback addresses 127.0.0.0/8 and ::1/128 are default at -1. -.TP -.B so\-rcvbuf: \fI<number> -If not 0, then set the SO_RCVBUF socket option to get more buffer -space on UDP port 53 incoming queries. So that short spikes on busy -servers do not drop packets (see counter in netstat \-su). Default is -0 (use system value). Otherwise, the number of bytes to ask for, try -"4m" on a busy server. The OS caps it at a maximum, on linux Unbound -needs root permission to bypass the limit, or the admin can use sysctl -net.core.rmem_max. On BSD change kern.ipc.maxsockbuf in /etc/sysctl.conf. -On OpenBSD change header and recompile kernel. On Solaris ndd \-set -/dev/udp udp_max_buf 8388608. -.TP -.B so\-sndbuf: \fI<number> +that sent the query with a valid DNS Cookie. +Since the cookie validates the client address, this limit can be higher. +.sp +Default: 10000 +.UNINDENT +.INDENT 0.0 +.TP +.B wait\-limit\-netblock: \fI<netblock>\fP \fI<number>\fP +The wait limit for the netblock. +If not given the +\fI\%wait\-limit\fP +value is used. +The most specific netblock is used to determine the limit. +Useful for overriding the default for a specific, group or individual, +server. +The value \fB\-1\fP disables wait limits for the netblock. +By default the loopback has a wait limit netblock of \fB\-1\fP, it is not +limited, because it is separated from the rest of network for spoofed +packets. +The loopback addresses \fB127.0.0.0/8\fP and \fB::1/128\fP are default at \fB\-1\fP\&. +.sp +Default: (none) +.UNINDENT +.INDENT 0.0 +.TP +.B wait\-limit\-cookie\-netblock: \fI<netblock>\fP \fI<number>\fP +The wait limit for the netblock, when the query has a DNS Cookie. +If not given, the +\fI\%wait\-limit\-cookie\fP +value is used. +The value \fB\-1\fP disables wait limits for the netblock. +The loopback addresses \fB127.0.0.0/8\fP and \fB::1/128\fP are default at \fB\-1\fP\&. +.sp +Default: (none) +.UNINDENT +.INDENT 0.0 +.TP +.B so\-rcvbuf: \fI<number>\fP +If not 0, then set the SO_RCVBUF socket option to get more buffer space on +UDP port 53 incoming queries. +So that short spikes on busy servers do not drop packets (see counter in +\fBnetstat \-su\fP). +Otherwise, the number of bytes to ask for, try \(dq4m\(dq on a busy server. +.sp +The OS caps it at a maximum, on linux Unbound needs root permission to +bypass the limit, or the admin can use \fBsysctl net.core.rmem_max\fP\&. +.sp +On BSD change \fBkern.ipc.maxsockbuf\fP in \fB/etc/sysctl.conf\fP\&. +.sp +On OpenBSD change header and recompile kernel. +.sp +On Solaris \fBndd \-set /dev/udp udp_max_buf 8388608\fP\&. +.sp +Default: 0 (use system value) +.UNINDENT +.INDENT 0.0 +.TP +.B so\-sndbuf: \fI<number>\fP If not 0, then set the SO_SNDBUF socket option to get more buffer space on -UDP port 53 outgoing queries. This for very busy servers handles spikes -in answer traffic, otherwise 'send: resource temporarily unavailable' -can get logged, the buffer overrun is also visible by netstat \-su. -Default is 0 (use system value). Specify the number of bytes to ask -for, try "4m" on a very busy server. The OS caps it at a maximum, on -linux Unbound needs root permission to bypass the limit, or the admin -can use sysctl net.core.wmem_max. On BSD, Solaris changes are similar -to so\-rcvbuf. -.TP -.B so\-reuseport: \fI<yes or no> +UDP port 53 outgoing queries. +This for very busy servers handles spikes in answer traffic, otherwise: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +send: resource temporarily unavailable +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +can get logged, the buffer overrun is also visible by \fBnetstat \-su\fP\&. +If set to 0 it uses the system value. +Specify the number of bytes to ask for, try \(dq8m\(dq on a very busy server. +.sp +It needs some space to be able to deal with packets that wait for local +address resolution, from like ARP and NDP discovery, before they are sent +out, hence it is elevated above the system default by default. +.sp +The OS caps it at a maximum, on linux Unbound needs root permission to +bypass the limit, or the admin can use \fBsysctl net.core.wmem_max\fP\&. +.sp +On BSD, Solaris changes are similar to +\fI\%so\-rcvbuf\fP\&. +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B so\-reuseport: \fI<yes or no>\fP If yes, then open dedicated listening sockets for incoming queries for each -thread and try to set the SO_REUSEPORT socket option on each socket. May -distribute incoming queries to threads more evenly. Default is yes. -On Linux it is supported in kernels >= 3.9. On other systems, FreeBSD, OSX -it may also work. You can enable it (on any platform and kernel), -it then attempts to open the port and passes the option if it was available -at compile time, if that works it is used, if it fails, it continues -silently (unless verbosity 3) without the option. +thread and try to set the SO_REUSEPORT socket option on each socket. +May distribute incoming queries to threads more evenly. +.sp +On Linux it is supported in kernels >= 3.9. +.sp +On other systems, FreeBSD, OSX it may also work. +.sp +You can enable it (on any platform and kernel), it then attempts to open +the port and passes the option if it was available at compile time, if that +works it is used, if it fails, it continues silently (unless verbosity 3) +without the option. +.sp At extreme load it could be better to turn it off to distribute the queries evenly, reported for Linux systems (4.4.x). -.TP -.B ip\-transparent: \fI<yes or no> -If yes, then use IP_TRANSPARENT socket option on sockets where Unbound -is listening for incoming traffic. Default no. Allows you to bind to -non\-local interfaces. For example for non\-existent IP addresses that -are going to exist later on, with host failover configuration. This is -a lot like interface\-automatic, but that one services all interfaces -and with this option you can select which (future) interfaces Unbound -provides service on. This option needs Unbound to be started with root -permissions on some systems. The option uses IP_BINDANY on FreeBSD systems -and SO_BINDANY on OpenBSD systems. -.TP -.B ip\-freebind: \fI<yes or no> -If yes, then use IP_FREEBIND socket option on sockets where Unbound -is listening to incoming traffic. Default no. Allows you to bind to -IP addresses that are nonlocal or do not exist, like when the network -interface or IP address is down. Exists only on Linux, where the similar -ip\-transparent option is also available. -.TP -.B ip-dscp: \fI<number> +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-transparent: \fI<yes or no>\fP +If yes, then use IP_TRANSPARENT socket option on sockets where Unbound is +listening for incoming traffic. +Allows you to bind to non\-local interfaces. +For example for non\-existent IP addresses that are going to exist later on, +with host failover configuration. +.sp +This is a lot like +\fI\%interface\-automatic\fP, but that one +services all interfaces and with this option you can select which (future) +interfaces Unbound provides service on. +.sp +This option needs Unbound to be started with root permissions on some +systems. +The option uses IP_BINDANY on FreeBSD systems and SO_BINDANY on OpenBSD +systems. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-freebind: \fI<yes or no>\fP +If yes, then use IP_FREEBIND socket option on sockets where Unbound is +listening to incoming traffic. +Allows you to bind to IP addresses that are nonlocal or do not exist, like +when the network interface or IP address is down. +.sp +Exists only on Linux, where the similar +\fI\%ip\-transparent\fP option is also +available. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-dscp: \fI<number>\fP The value of the Differentiated Services Codepoint (DSCP) in the differentiated services field (DS) of the outgoing IP packet headers. -The field replaces the outdated IPv4 Type-Of-Service field and the -IPv6 traffic class field. -.TP -.B rrset\-cache\-size: \fI<number> -Number of bytes size of the RRset cache. Default is 4 megabytes. -A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes +The field replaces the outdated IPv4 Type\-Of\-Service field and the IPv6 +traffic class field. +.UNINDENT +.INDENT 0.0 +.TP +.B rrset\-cache\-size: \fI<number>\fP +Number of bytes size of the RRset cache. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes or gigabytes (1024*1024 bytes in a megabyte). -.TP -.B rrset\-cache\-slabs: \fI<number> -Number of slabs in the RRset cache. Slabs reduce lock contention by threads. +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B rrset\-cache\-slabs: \fI<number>\fP +Number of slabs in the RRset cache. +Slabs reduce lock contention by threads. Must be set to a power of 2. -.TP -.B cache\-max\-ttl: \fI<seconds> -Time to live maximum for RRsets and messages in the cache. Default is -86400 seconds (1 day). When the TTL expires, the cache item has expired. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.INDENT 0.0 +.TP +.B cache\-max\-ttl: \fI<seconds>\fP +Time to live maximum for RRsets and messages in the cache. +When the TTL expires, the cache item has expired. Can be set lower to force the resolver to query for data often, and not -trust (very large) TTL values. Downstream clients also see the lower TTL. -.TP -.B cache\-min\-ttl: \fI<seconds> -Time to live minimum for RRsets and messages in the cache. Default is 0. +trust (very large) TTL values. +Downstream clients also see the lower TTL. +.sp +Default: 86400 (1 day) +.UNINDENT +.INDENT 0.0 +.TP +.B cache\-min\-ttl: \fI<seconds>\fP +Time to live minimum for RRsets and messages in the cache. If the minimum kicks in, the data is cached for longer than the domain owner intended, and thus less queries are made to look up the data. Zero makes sure the data in the cache is as the domain owner intended, higher values, especially more than an hour or so, can lead to trouble as the data in the cache does not match up with the actual data any more. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 .TP -.B cache\-max\-negative\-ttl: \fI<seconds> +.B cache\-max\-negative\-ttl: \fI<seconds>\fP Time to live maximum for negative responses, these have a SOA in the -authority section that is limited in time. Default is 3600. -This applies to nxdomain and nodata answers. +authority section that is limited in time. +This applies to NXDOMAIN and NODATA answers. +.sp +Default: 3600 +.UNINDENT +.INDENT 0.0 .TP -.B cache\-min\-negative\-ttl: \fI<seconds> +.B cache\-min\-negative\-ttl: \fI<seconds>\fP Time to live minimum for negative responses, these have a SOA in the authority section that is limited in time. -Default is 0 (disabled). -If this is disabled and \fBcache-min-ttl\fR is configured, it will take effect -instead. -In that case you can set this to 1 to honor the upstream TTL. -This applies to nxdomain and nodata answers. -.TP -.B infra\-host\-ttl: \fI<seconds> -Time to live for entries in the host cache. The host cache contains -roundtrip timing, lameness and EDNS support information. Default is 900. -.TP -.B infra\-cache\-slabs: \fI<number> -Number of slabs in the infrastructure cache. Slabs reduce lock contention -by threads. Must be set to a power of 2. -.TP -.B infra\-cache\-numhosts: \fI<number> -Number of hosts for which information is cached. Default is 10000. -.TP -.B infra\-cache\-min\-rtt: \fI<msec> +If this is disabled and +\fI\%cache\-min\-ttl\fP +is configured, it will take effect instead. +In that case you can set this to \fB1\fP to honor the upstream TTL. +This applies to NXDOMAIN and NODATA answers. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B infra\-host\-ttl: \fI<seconds>\fP +Time to live for entries in the host cache. +The host cache contains roundtrip timing, lameness and EDNS support +information. +.sp +Default: 900 +.UNINDENT +.INDENT 0.0 +.TP +.B infra\-cache\-slabs: \fI<number>\fP +Number of slabs in the infrastructure cache. +Slabs reduce lock contention by threads. +Must be set to a power of 2. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.INDENT 0.0 +.TP +.B infra\-cache\-numhosts: \fI<number>\fP +Number of hosts for which information is cached. +.sp +Default: 10000 +.UNINDENT +.INDENT 0.0 +.TP +.B infra\-cache\-min\-rtt: \fI<msec>\fP Lower limit for dynamic retransmit timeout calculation in infrastructure -cache. Default is 50 milliseconds. Increase this value if using forwarders -needing more time to do recursive name resolution. -.TP -.B infra\-cache\-max\-rtt: \fI<msec> +cache. +Increase this value if using forwarders needing more time to do recursive +name resolution. +.sp +Default: 50 +.UNINDENT +.INDENT 0.0 +.TP +.B infra\-cache\-max\-rtt: \fI<msec>\fP Upper limit for dynamic retransmit timeout calculation in infrastructure -cache. Default is 2 minutes. +cache. +.sp +Default: 120000 (2 minutes) +.UNINDENT +.INDENT 0.0 .TP -.B infra\-keep\-probing: \fI<yes or no> +.B infra\-keep\-probing: \fI<yes or no>\fP If enabled the server keeps probing hosts that are down, in the one probe -at a time regime. Default is no. Hosts that are down, eg. they did -not respond during the one probe at a time period, are marked as down and -it may take \fBinfra\-host\-ttl\fR time to get probed again. -.TP -.B define\-tag: \fI<"list of tags"> -Define the tags that can be used with local\-zone and access\-control. -Enclose the list between quotes ("") and put spaces between tags. -.TP -.B do\-ip4: \fI<yes or no> -Enable or disable whether ip4 queries are answered or issued. Default is yes. -.TP -.B do\-ip6: \fI<yes or no> -Enable or disable whether ip6 queries are answered or issued. Default is yes. +at a time regime. +Hosts that are down, eg. they did not respond during the one probe at a +time period, are marked as down and it may take +\fI\%infra\-host\-ttl\fP time to get probed +again. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B define\-tag: \fI\(dq<list of tags>\(dq\fP +Define the tags that can be used with +\fI\%local\-zone\fP and +\fI\%access\-control\fP\&. +Enclose the list between quotes (\fB\(dq\(dq\fP) and put spaces between tags. +.UNINDENT +.INDENT 0.0 +.TP +.B do\-ip4: \fI<yes or no>\fP +Enable or disable whether IPv4 queries are answered or issued. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B do\-ip6: \fI<yes or no>\fP +Enable or disable whether IPv6 queries are answered or issued. If disabled, queries are not answered on IPv6, and queries are not sent on -IPv6 to the internet nameservers. With this option you can disable the -IPv6 transport for sending DNS traffic, it does not impact the contents of -the DNS traffic, which may have ip4 and ip6 addresses in it. -.TP -.B prefer\-ip4: \fI<yes or no> +IPv6 to the internet nameservers. +With this option you can disable the IPv6 transport for sending DNS +traffic, it does not impact the contents of the DNS traffic, which may have +IPv4 (A) and IPv6 (AAAA) addresses in it. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B prefer\-ip4: \fI<yes or no>\fP If enabled, prefer IPv4 transport for sending DNS queries to internet -nameservers. Default is no. Useful if the IPv6 netblock the server has, -the entire /64 of that is not owned by one operator and the reputation of -the netblock /64 is an issue, using IPv4 then uses the IPv4 filters that -the upstream servers have. -.TP -.B prefer\-ip6: \fI<yes or no> +nameservers. +Useful if the IPv6 netblock the server has, the entire /64 of that is not +owned by one operator and the reputation of the netblock /64 is an issue, +using IPv4 then uses the IPv4 filters that the upstream servers have. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B prefer\-ip6: \fI<yes or no>\fP If enabled, prefer IPv6 transport for sending DNS queries to internet -nameservers. Default is no. -.TP -.B do\-udp: \fI<yes or no> -Enable or disable whether UDP queries are answered or issued. Default is yes. -.TP -.B do\-tcp: \fI<yes or no> -Enable or disable whether TCP queries are answered or issued. Default is yes. -.TP -.B tcp\-mss: \fI<number> -Maximum segment size (MSS) of TCP socket on which the server responds -to queries. Value lower than common MSS on Ethernet -(1220 for example) will address path MTU problem. +nameservers. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B do\-udp: \fI<yes or no>\fP +Enable or disable whether UDP queries are answered or issued. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B do\-tcp: \fI<yes or no>\fP +Enable or disable whether TCP queries are answered or issued. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B tcp\-mss: \fI<number>\fP +Maximum segment size (MSS) of TCP socket on which the server responds to +queries. +Value lower than common MSS on Ethernet (1220 for example) will address +path MTU problem. Note that not all platform supports socket option to set MSS (TCP_MAXSEG). -Default is system default MSS determined by interface MTU and -negotiation between server and client. -.TP -.B outgoing\-tcp\-mss: \fI<number> -Maximum segment size (MSS) of TCP socket for outgoing queries -(from Unbound to other servers). Value lower than -common MSS on Ethernet (1220 for example) will address path MTU problem. +Default is system default MSS determined by interface MTU and negotiation +between server and client. +.UNINDENT +.INDENT 0.0 +.TP +.B outgoing\-tcp\-mss: \fI<number>\fP +Maximum segment size (MSS) of TCP socket for outgoing queries (from Unbound +to other servers). +Value lower than common MSS on Ethernet (1220 for example) will address +path MTU problem. Note that not all platform supports socket option to set MSS (TCP_MAXSEG). -Default is system default MSS determined by interface MTU and -negotiation between Unbound and other servers. +Default is system default MSS determined by interface MTU and negotiation +between Unbound and other servers. +.UNINDENT +.INDENT 0.0 .TP -.B tcp-idle-timeout: \fI<msec>\fR +.B tcp\-idle\-timeout: \fI<msec>\fP The period Unbound will wait for a query on a TCP connection. If this timeout expires Unbound closes the connection. -This option defaults to 30000 milliseconds. -When the number of free incoming TCP buffers falls below 50% of the -total number configured, the option value used is progressively -reduced, first to 1% of the configured value, then to 0.2% of the -configured value if the number of free buffers falls below 35% of the -total number configured, and finally to 0 if the number of free buffers -falls below 20% of the total number configured. A minimum timeout of -200 milliseconds is observed regardless of the option value used. -It will be overridden by \fBedns\-tcp\-keepalive\-timeout\fR if -\fBedns\-tcp\-keepalive\fR is enabled. -.TP -.B tcp-reuse-timeout: \fI<msec>\fR -The period Unbound will keep TCP persistent connections open to -authority servers. This option defaults to 60000 milliseconds. -.TP -.B max-reuse-tcp-queries: \fI<number>\fR +When the number of free incoming TCP buffers falls below 50% of the total +number configured, the option value used is progressively reduced, first to +1% of the configured value, then to 0.2% of the configured value if the +number of free buffers falls below 35% of the total number configured, and +finally to 0 if the number of free buffers falls below 20% of the total +number configured. +A minimum timeout of 200 milliseconds is observed regardless of the option +value used. +It will be overridden by +\fI\%edns\-tcp\-keepalive\-timeout\fP +if +\fI\%edns\-tcp\-keepalive\fP +is enabled. +.sp +Default: 30000 (30 seconds) +.UNINDENT +.INDENT 0.0 +.TP +.B tcp\-reuse\-timeout: \fI<msec>\fP +The period Unbound will keep TCP persistent connections open to authority +servers. +.sp +Default: 60000 (60 seconds) +.UNINDENT +.INDENT 0.0 +.TP +.B max\-reuse\-tcp\-queries: \fI<number>\fP The maximum number of queries that can be sent on a persistent TCP connection. -This option defaults to 200 queries. +.sp +Default: 200 +.UNINDENT +.INDENT 0.0 .TP -.B tcp-auth-query-timeout: \fI<number>\fR +.B tcp\-auth\-query\-timeout: \fI<number>\fP Timeout in milliseconds for TCP queries to auth servers. -This option defaults to 3000 milliseconds. -.TP -.B edns-tcp-keepalive: \fI<yes or no>\fR -Enable or disable EDNS TCP Keepalive. Default is no. -.TP -.B edns-tcp-keepalive-timeout: \fI<msec>\fR -Overrides \fBtcp\-idle\-timeout\fR when \fBedns\-tcp\-keepalive\fR is enabled. +.sp +Default: 3000 (3 seconds) +.UNINDENT +.INDENT 0.0 +.TP +.B edns\-tcp\-keepalive: \fI<yes or no>\fP +Enable or disable EDNS TCP Keepalive. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B edns\-tcp\-keepalive\-timeout: \fI<msec>\fP +Overrides +\fI\%tcp\-idle\-timeout\fP +when +\fI\%edns\-tcp\-keepalive\fP +is enabled. If the client supports the EDNS TCP Keepalive option, -Unbound sends the timeout value to the client to encourage it to -close the connection before the server times out. -This option defaults to 120000 milliseconds. -.TP -.B sock\-queue\-timeout: \fI<sec>\fR +If the client supports the EDNS TCP Keepalive option, Unbound sends the +timeout value to the client to encourage it to close the connection before +the server times out. +.sp +Default: 120000 (2 minutes) +.UNINDENT +.INDENT 0.0 +.TP +.B sock\-queue\-timeout: \fI<sec>\fP UDP queries that have waited in the socket buffer for a long time can be -dropped. Default is 0, disabled. The time is set in seconds, 3 could be a -good value to ignore old queries that likely the client does not need a reply -for any more. This could happen if the host has not been able to service -the queries for a while, i.e. Unbound is not running, and then is enabled -again. It uses timestamp socket options. -.TP -.B tcp\-upstream: \fI<yes or no> +dropped. +The time is set in seconds, 3 could be a good value to ignore old queries +that likely the client does not need a reply for any more. +This could happen if the host has not been able to service the queries for +a while, i.e. Unbound is not running, and then is enabled again. +It uses timestamp socket options. +The socket option is available on the Linux and FreeBSD platforms. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B tcp\-upstream: \fI<yes or no>\fP Enable or disable whether the upstream queries use TCP only for transport. -Default is no. Useful in tunneling scenarios. If set to no you can specify -TCP transport only for selected forward or stub zones using forward-tcp-upstream -or stub-tcp-upstream respectively. -.TP -.B udp\-upstream\-without\-downstream: \fI<yes or no> -Enable udp upstream even if do-udp is no. Default is no, and this does not -change anything. Useful for TLS service providers, that want no udp downstream -but use udp to fetch data upstream. -.TP -.B tls\-upstream: \fI<yes or no> +Useful in tunneling scenarios. +If set to no you can specify TCP transport only for selected forward or +stub zones using +\fI\%forward\-tcp\-upstream\fP or +\fI\%stub\-tcp\-upstream\fP +respectively. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B udp\-upstream\-without\-downstream: \fI<yes or no>\fP +Enable UDP upstream even if \fI\%do\-udp: no\fP is set. +Useful for TLS service providers, that want no UDP downstream but use UDP +to fetch data upstream. +.sp +Default: no (no changes) +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-upstream: \fI<yes or no>\fP Enabled or disable whether the upstream queries use TLS only for transport. -Default is no. Useful in tunneling scenarios. The TLS contains plain DNS in -TCP wireformat. The other server must support this (see -\fBtls\-service\-key\fR). -If you enable this, also configure a tls\-cert\-bundle or use tls\-win\-cert or -tls\-system\-cert to load CA certs, otherwise the connections cannot be -authenticated. This option enables TLS for all of them, but if you do not set -this you can configure TLS specifically for some forward zones with -forward\-tls\-upstream. And also with stub\-tls\-upstream. -If the tls\-upstream option is enabled, it is for all the forwards and stubs, -where the forward\-tls\-upstream and stub\-tls\-upstream options are ignored, -as if they had been set to yes. -.TP -.B ssl\-upstream: \fI<yes or no> -Alternate syntax for \fBtls\-upstream\fR. If both are present in the config -file the last is used. -.TP -.B tls\-service\-key: \fI<file> -If enabled, the server provides DNS-over-TLS or DNS-over-HTTPS service on the -TCP ports marked implicitly or explicitly for these services with tls\-port or -https\-port. The file must contain the private key for the TLS session, the -public certificate is in the tls\-service\-pem file and it must also be -specified if tls\-service\-key is specified. The default is "", turned off. -Enabling or disabling this service requires a restart (a reload is not enough), -because the key is read while root permissions are held and before chroot (if any). -The ports enabled implicitly or explicitly via \fBtls\-port:\fR and -\fBhttps\-port:\fR do not provide normal DNS TCP service. Unbound needs to be -compiled with libnghttp2 in order to provide DNS-over-HTTPS. -.TP -.B ssl\-service\-key: \fI<file> -Alternate syntax for \fBtls\-service\-key\fR. -.TP -.B tls\-service\-pem: \fI<file> -The public key certificate pem file for the tls service. Default is "", -turned off. -.TP -.B ssl\-service\-pem: \fI<file> -Alternate syntax for \fBtls\-service\-pem\fR. -.TP -.B tls\-port: \fI<number> -The port number on which to provide TCP TLS service, default 853, only -interfaces configured with that port number as @number get the TLS service. -.TP -.B ssl\-port: \fI<number> -Alternate syntax for \fBtls\-port\fR. -.TP -.B tls\-cert\-bundle: \fI<file> -If null or "", no file is used. Set it to the certificate bundle file, -for example "/etc/pki/tls/certs/ca\-bundle.crt". These certificates are used -for authenticating connections made to outside peers. For example auth\-zone -urls, and also DNS over TLS connections. It is read at start up before -permission drop and chroot. -.TP -.B ssl\-cert\-bundle: \fI<file> -Alternate syntax for \fBtls\-cert\-bundle\fR. -.TP -.B tls\-win\-cert: \fI<yes or no> -Add the system certificates to the cert bundle certificates for authentication. -If no cert bundle, it uses only these certificates. Default is no. -On windows this option uses the certificates from the cert store. Use -the tls\-cert\-bundle option on other systems. On other systems, this option -enables the system certificates. -.TP -.B tls\-system\-cert: \fI<yes or no> -This the same setting as the tls\-win\-cert setting, under a different name. +Useful in tunneling scenarios. +The TLS contains plain DNS in TCP wireformat. +The other server must support this (see +\fI\%tls\-service\-key\fP). +.sp +If you enable this, also configure a +\fI\%tls\-cert\-bundle\fP or use +\fI\%tls\-win\-cert\fP or +\fI\%tls\-system\-cert\fP to load CA certs, +otherwise the connections cannot be authenticated. +.sp +This option enables TLS for all of them, but if you do not set this you can +configure TLS specifically for some forward zones with +\fI\%forward\-tls\-upstream\fP\&. +And also with +\fI\%stub\-tls\-upstream\fP\&. +If the +\fI\%tls\-upstream\fP +option is enabled, it is for all the forwards and stubs, where the +\fI\%forward\-tls\-upstream\fP +and +\fI\%stub\-tls\-upstream\fP +options are ignored, as if they had been set to yes. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ssl\-upstream: \fI<yes or no>\fP +Alternate syntax for \fI\%tls\-upstream\fP\&. +If both are present in the config file the last is used. +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-service\-key: \fI<file>\fP +If enabled, the server provides DNS\-over\-TLS or DNS\-over\-HTTPS service on +the TCP ports marked implicitly or explicitly for these services with +\fI\%tls\-port\fP or +\fI\%https\-port\fP\&. +The file must contain the private key for the TLS session, the public +certificate is in the \fI\%tls\-service\-pem\fP +file and it must also be specified if +\fI\%tls\-service\-key\fP is specified. +Enabling or disabling this service requires a restart (a reload is not +enough), because the key is read while root permissions are held and before +chroot (if any). +The ports enabled implicitly or explicitly via +\fI\%tls\-port\fP and +\fI\%https\-port\fP do not provide normal DNS TCP +service. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +Unbound needs to be compiled with libnghttp2 in order to provide +DNS\-over\-HTTPS. +.UNINDENT +.UNINDENT +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B ssl\-service\-key: \fI<file>\fP +Alternate syntax for \fI\%tls\-service\-key\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-service\-pem: \fI<file>\fP +The public key certificate pem file for the tls service. +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B ssl\-service\-pem: \fI<file>\fP +Alternate syntax for \fI\%tls\-service\-pem\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-port: \fI<number>\fP +The port number on which to provide TCP TLS service. +Only interfaces configured with that port number as @number get the TLS +service. +.sp +Default: 853 +.UNINDENT +.INDENT 0.0 +.TP +.B ssl\-port: \fI<number>\fP +Alternate syntax for \fI\%tls\-port\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-cert\-bundle: \fI<file>\fP +If null or \fB\(dq\(dq\fP, no file is used. +Set it to the certificate bundle file, for example +\fB/etc/pki/tls/certs/ca\-bundle.crt\fP\&. +These certificates are used for authenticating connections made to outside +peers. +For example \fI\%auth\-zone urls\fP, and also +DNS\-over\-TLS connections. +It is read at start up before permission drop and chroot. +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B ssl\-cert\-bundle: \fI<file>\fP +Alternate syntax for \fI\%tls\-cert\-bundle\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-win\-cert: \fI<yes or no>\fP +Add the system certificates to the cert bundle certificates for +authentication. +If no cert bundle, it uses only these certificates. +On windows this option uses the certificates from the cert store. +Use the \fI\%tls\-cert\-bundle\fP option on +other systems. +On other systems, this option enables the system certificates. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-system\-cert: \fI<yes or no>\fP +This the same attribute as the +\fI\%tls\-win\-cert\fP attribute, under a +different name. Because it is not windows specific. +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-additional\-port: \fI<portnr>\fP +List port numbers as +\fI\%tls\-additional\-port\fP, and when +interfaces are defined, eg. with the @port suffix, as this port number, +they provide DNS\-over\-TLS service. +Can list multiple, each on a new statement. +.UNINDENT +.INDENT 0.0 .TP -.B tls\-additional\-port: \fI<portnr> -List portnumbers as tls\-additional\-port, and when interfaces are defined, -eg. with the @port suffix, as this port number, they provide dns over TLS -service. Can list multiple, each on a new statement. -.TP -.B tls-session-ticket-keys: \fI<file> -If not "", lists files with 80 bytes of random contents that are used to -perform TLS session resumption for clients using the Unbound server. +.B tls\-session\-ticket\-keys: \fI<file>\fP +If not \fB\(dq\(dq\fP, lists files with 80 bytes of random contents that are used +to perform TLS session resumption for clients using the Unbound server. These files contain the secret key for the TLS session tickets. First key use to encrypt and decrypt TLS session tickets. -Other keys use to decrypt only. With this you can roll over to new keys, -by generating a new first file and allowing decrypt of the old file by -listing it after the first file for some time, after the wait clients are not -using the old key any more and the old key can be removed. -One way to create the file is dd if=/dev/random bs=1 count=80 of=ticket.dat -The first 16 bytes should be different from the old one if you create a second key, that is the name used to identify the key. Then there is 32 bytes random -data for an AES key and then 32 bytes random data for the HMAC key. -.TP -.B tls\-ciphers: \fI<string with cipher list> -Set the list of ciphers to allow when serving TLS. Use "" for defaults, -and that is the default. -.TP -.B tls\-ciphersuites: \fI<string with ciphersuites list> -Set the list of ciphersuites to allow when serving TLS. This is for newer -TLS 1.3 connections. Use "" for defaults, and that is the default. -.TP -.B pad\-responses: \fI<yes or no> +Other keys use to decrypt only. +.sp +With this you can roll over to new keys, by generating a new first file and +allowing decrypt of the old file by listing it after the first file for +some time, after the wait clients are not using the old key any more and +the old key can be removed. +One way to create the file is: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +dd if=/dev/random bs=1 count=80 of=ticket.dat +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +The first 16 bytes should be different from the old one if you create a +second key, that is the name used to identify the key. +Then there is 32 bytes random data for an AES key and then 32 bytes random +data for the HMAC key. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-ciphers: \fI<string with cipher list>\fP +Set the list of ciphers to allow when serving TLS. +Use \fB\(dq\(dq\fP for default ciphers. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B tls\-ciphersuites: \fI<string with ciphersuites list>\fP +Set the list of ciphersuites to allow when serving TLS. +This is for newer TLS 1.3 connections. +Use \fB\(dq\(dq\fP for default ciphersuites. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B pad\-responses: \fI<yes or no>\fP If enabled, TLS serviced queries that contained an EDNS Padding option will cause responses padded to the closest multiple of the size specified in -\fBpad\-responses\-block\-size\fR. -Default is yes. -.TP -.B pad\-responses\-block\-size: \fI<number> -The block size with which to pad responses serviced over TLS. Only responses -to padded queries will be padded. -Default is 468. -.TP -.B pad\-queries: \fI<yes or no> -If enabled, all queries sent over TLS upstreams will be padded to the closest -multiple of the size specified in \fBpad\-queries\-block\-size\fR. -Default is yes. -.TP -.B pad\-queries\-block\-size: \fI<number> +\fI\%pad\-responses\-block\-size\fP\&. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B pad\-responses\-block\-size: \fI<number>\fP +The block size with which to pad responses serviced over TLS. +Only responses to padded queries will be padded. +.sp +Default: 468 +.UNINDENT +.INDENT 0.0 +.TP +.B pad\-queries: \fI<yes or no>\fP +If enabled, all queries sent over TLS upstreams will be padded to the +closest multiple of the size specified in +\fI\%pad\-queries\-block\-size\fP\&. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B pad\-queries\-block\-size: \fI<number>\fP The block size with which to pad queries sent over TLS upstreams. -Default is 128. +.sp +Default: 128 +.UNINDENT +.INDENT 0.0 .TP -.B tls\-use\-sni: \fI<yes or no> +.B tls\-use\-sni: \fI<yes or no>\fP Enable or disable sending the SNI extension on TLS connections. -Default is yes. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 Changing the value requires a reload. -.TP -.B https\-port: \fI<number> -The port number on which to provide DNS-over-HTTPS service, default 443, only -interfaces configured with that port number as @number get the HTTPS service. -.TP -.B http\-endpoint: \fI<endpoint string> -The HTTP endpoint to provide DNS-over-HTTPS service on. Default "/dns-query". -.TP -.B http\-max\-streams: \fI<number of streams> +.UNINDENT +.UNINDENT +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B https\-port: \fI<number>\fP +The port number on which to provide DNS\-over\-HTTPS service. +Only interfaces configured with that port number as @number get the HTTPS +service. +.sp +Default: 443 +.UNINDENT +.INDENT 0.0 +.TP +.B http\-endpoint: \fI<endpoint string>\fP +The HTTP endpoint to provide DNS\-over\-HTTPS service on. +.sp +Default: /dns\-query +.UNINDENT +.INDENT 0.0 +.TP +.B http\-max\-streams: \fI<number of streams>\fP Number used in the SETTINGS_MAX_CONCURRENT_STREAMS parameter in the HTTP/2 -SETTINGS frame for DNS-over-HTTPS connections. Default 100. -.TP -.B http\-query\-buffer\-size: \fI<size in bytes> -Maximum number of bytes used for all HTTP/2 query buffers combined. These -buffers contain (partial) DNS queries waiting for request stream completion. -An RST_STREAM frame will be send to streams exceeding this limit. Default is 4 -megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, -megabytes or gigabytes (1024*1024 bytes in a megabyte). -.TP -.B http\-response\-buffer\-size: \fI<size in bytes> -Maximum number of bytes used for all HTTP/2 response buffers combined. These -buffers contain DNS responses waiting to be written back to the clients. -An RST_STREAM frame will be send to streams exceeding this limit. Default is 4 -megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, -megabytes or gigabytes (1024*1024 bytes in a megabyte). -.TP -.B http\-nodelay: \fI<yes or no> -Set TCP_NODELAY socket option on sockets used to provide DNS-over-HTTPS service. -Ignored if the option is not available. Default is yes. -.TP -.B http\-notls\-downstream: \fI<yes or no> -Disable use of TLS for the downstream DNS-over-HTTP connections. Useful for -local back end servers. Default is no. -.TP -.B proxy\-protocol\-port: \fI<portnr> -List port numbers as proxy\-protocol\-port, and when interfaces are defined, -eg. with the @port suffix, as this port number, they support and expect PROXYv2. -In this case the proxy address will only be used for the network communication -and initial ACL (check if the proxy itself is denied/refused by configuration). -The proxied address (if any) will then be used as the true client address and -will be used where applicable for logging, ACL, DNSTAP, RPZ and IP ratelimiting. +SETTINGS frame for DNS\-over\-HTTPS connections. +.sp +Default: 100 +.UNINDENT +.INDENT 0.0 +.TP +.B http\-query\-buffer\-size: \fI<size in bytes>\fP +Maximum number of bytes used for all HTTP/2 query buffers combined. +These buffers contain (partial) DNS queries waiting for request stream +completion. +An RST_STREAM frame will be send to streams exceeding this limit. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes +or gigabytes (1024*1024 bytes in a megabyte). +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B http\-response\-buffer\-size: \fI<size in bytes>\fP +Maximum number of bytes used for all HTTP/2 response buffers combined. +These buffers contain DNS responses waiting to be written back to the +clients. +An RST_STREAM frame will be send to streams exceeding this limit. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes +or gigabytes (1024*1024 bytes in a megabyte). +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B http\-nodelay: \fI<yes or no>\fP +Set TCP_NODELAY socket option on sockets used to provide DNS\-over\-HTTPS +service. +Ignored if the option is not available. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B http\-notls\-downstream: \fI<yes or no>\fP +Disable use of TLS for the downstream DNS\-over\-HTTP connections. +Useful for local back end servers. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B proxy\-protocol\-port: \fI<portnr>\fP +List port numbers as +\fI\%proxy\-protocol\-port\fP, and when +interfaces are defined, eg. with the @port suffix, as this port number, +they support and expect PROXYv2. +.sp +In this case the proxy address will only be used for the network +communication and initial ACL (check if the proxy itself is denied/refused +by configuration). +.sp +The proxied address (if any) will then be used as the true client address +and will be used where applicable for logging, ACL, DNSTAP, RPZ and IP +ratelimiting. +.sp PROXYv2 is supported for UDP and TCP/TLS listening interfaces. +.sp There is no support for PROXYv2 on a DoH, DoQ or DNSCrypt listening interface. +.sp Can list multiple, each on a new statement. +.UNINDENT +.INDENT 0.0 .TP -.B quic\-port: \fI<number> -The port number on which to provide DNS-over-QUIC service, default 853, only -interfaces configured with that port number as @number get the QUIC service. +.B quic\-port: \fI<number>\fP +The port number on which to provide DNS\-over\-QUIC service. +Only interfaces configured with that port number as @number get the QUIC +service. The interface uses QUIC for the UDP traffic on that port number. -.TP -.B quic\-size: \fI<size in bytes> -Maximum number of bytes for all QUIC buffers and data combined. Default is 8 -megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, -megabytes or gigabytes (1024*1024 bytes in a megabyte). New connections receive -connection refused when the limit is exceeded. New streams are reset when the -limit is exceeded. -.TP -.B use\-systemd: \fI<yes or no> +.sp +Default: 853 +.UNINDENT +.INDENT 0.0 +.TP +.B quic\-size: \fI<size in bytes>\fP +Maximum number of bytes for all QUIC buffers and data combined. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes +or gigabytes (1024*1024 bytes in a megabyte). +New connections receive connection refused when the limit is exceeded. +New streams are reset when the limit is exceeded. +.sp +Default: 8m +.UNINDENT +.INDENT 0.0 +.TP +.B use\-systemd: \fI<yes or no>\fP Enable or disable systemd socket activation. -Default is no. -.TP -.B do\-daemonize: \fI<yes or no> -Enable or disable whether the Unbound server forks into the background as -a daemon. Set the value to \fIno\fR when Unbound runs as systemd service. -Default is yes. -.TP -.B tcp\-connection\-limit: \fI<IP netblock> <limit> -Allow up to \fIlimit\fR simultaneous TCP connections from the given netblock. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B do\-daemonize: \fI<yes or no>\fP +Enable or disable whether the Unbound server forks into the background as a +daemon. +Set the value to no when Unbound runs as systemd service. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B tcp\-connection\-limit: \fI<IP netblock> <limit>\fP +Allow up to limit simultaneous TCP connections from the given netblock. When at the limit, further connections are accepted but closed immediately. This option is experimental at this time. +.sp +Default: (disabled) +.UNINDENT +.INDENT 0.0 .TP -.B access\-control: \fI<IP netblock> <action> +.B access\-control: \fI<IP netblock> <action>\fP Specify treatment of incoming queries from their originating IP address. Queries can be allowed to have access to this server that gives DNS -answers, or refused, with other actions possible. The IP address range -can be specified as a netblock, it is possible to give the statement -several times in order to specify the treatment of different netblocks. -.IP -The netblock is given as an IP4 or IP6 address with /size appended for a -classless network block. The action can be \fIdeny\fR, \fIrefuse\fR, -\fIallow\fR, \fIallow_setrd\fR, \fIallow_snoop\fR, \fIallow_cookie\fR, -\fIdeny_non_local\fR or \fIrefuse_non_local\fR. -The most specific netblock match is used, if none match \fIrefuse\fR is used. +answers, or refused, with other actions possible. +The IP address range can be specified as a netblock, it is possible to give +the statement several times in order to specify the treatment of different +netblocks. +The netblock is given as an IPv4 or IPv6 address with /size appended for a +classless network block. +The most specific netblock match is used, if none match +\fI\%refuse\fP is used. The order of the access\-control statements therefore does not matter. -.IP -The \fIdeny\fR action stops queries from hosts from that netblock. -.IP -The \fIrefuse\fR action stops queries too, but sends a DNS rcode REFUSED -error message back. -.IP -The \fIallow\fR action gives access to clients from that netblock. -It gives only access for recursion clients (which is -what almost all clients need). Nonrecursive queries are refused. -.IP -The \fIallow\fR action does allow nonrecursive queries to access the -local\-data that is configured. The reason is that this does not involve -the Unbound server recursive lookup algorithm, and static data is served -in the reply. This supports normal operations where nonrecursive queries -are made for the authoritative data. For nonrecursive queries any replies -from the dynamic cache are refused. -.IP -The \fIallow_setrd\fR action ignores the recursion desired (RD) bit and -treats all requests as if the recursion desired bit is set. Note that this -behavior violates RFC 1034 which states that a name server should never perform -recursive service unless asked via the RD bit since this interferes with -trouble shooting of name servers and their databases. This prohibited behavior -may be useful if another DNS server must forward requests for specific -zones to a resolver DNS server, but only supports stub domains and -sends queries to the resolver DNS server with the RD bit cleared. -.IP -The \fIallow_snoop\fR action gives nonrecursive access too. This give -both recursive and non recursive access. The name \fIallow_snoop\fR refers -to cache snooping, a technique to use nonrecursive queries to examine -the cache contents (for malicious acts). However, nonrecursive queries can -also be a valuable debugging tool (when you want to examine the cache -contents). In that case use \fIallow_snoop\fR for your administration host. -.IP -The \fIallow_cookie\fR action allows access only to UDP queries that contain a -valid DNS Cookie as specified in RFC 7873 and RFC 9018, when the -\fBanswer\-cookie\fR option is enabled. -UDP queries containing only a DNS Client Cookie and no Server Cookie, or an -invalid DNS Cookie, will receive a BADCOOKIE response including a newly -generated DNS Cookie, allowing clients to retry with that DNS Cookie. -The \fIallow_cookie\fR action will also accept requests over stateful -transports, regardless of the presence of an DNS Cookie and regardless of the -\fBanswer\-cookie\fR setting. -UDP queries without a DNS Cookie receive REFUSED responses with the TC flag set, -that may trigger fall back to TCP for those clients. -.IP +The action can be +\fI\%deny\fP, +\fI\%refuse\fP, +\fI\%allow\fP, +\fI\%allow_setrd\fP, +\fI\%allow_snoop\fP, +\fI\%allow_cookie\fP, +\fI\%deny_non_local\fP or +\fI\%refuse_non_local\fP\&. +.INDENT 7.0 +.TP +.B deny +Stops queries from hosts from that netblock. +.UNINDENT +.INDENT 7.0 +.TP +.B refuse +Stops queries too, but sends a DNS rcode REFUSED error message back. +.UNINDENT +.INDENT 7.0 +.TP +.B allow +Gives access to clients from that netblock. +It gives only access for recursion clients (which is what almost all +clients need). +Non\-recursive queries are refused. +.sp +The \fI\%allow\fP action does +allow non\-recursive queries to access the local\-data that is +configured. +The reason is that this does not involve the Unbound server recursive +lookup algorithm, and static data is served in the reply. +This supports normal operations where non\-recursive queries are made +for the authoritative data. +For non\-recursive queries any replies from the dynamic cache are +refused. +.UNINDENT +.INDENT 7.0 +.TP +.B allow_setrd +Ignores the recursion desired (RD) bit and treats all requests as if +the recursion desired bit is set. +.sp +Note that this behavior violates \fI\%RFC 1034\fP which states that a name +server should never perform recursive service unless asked via the RD +bit since this interferes with trouble shooting of name servers and +their databases. +This prohibited behavior may be useful if another DNS server must +forward requests for specific zones to a resolver DNS server, but only +supports stub domains and sends queries to the resolver DNS server with +the RD bit cleared. +.UNINDENT +.INDENT 7.0 +.TP +.B allow_snoop +Gives non\-recursive access too. +This gives both recursive and non recursive access. +The name \fIallow_snoop\fP refers to cache snooping, a technique to use +non\-recursive queries to examine the cache contents (for malicious +acts). +However, non\-recursive queries can also be a valuable debugging tool +(when you want to examine the cache contents). +.sp +In that case use +\fI\%allow_snoop\fP for +your administration host. +.UNINDENT +.INDENT 7.0 +.TP +.B allow_cookie +Allows access only to UDP queries that contain a valid DNS Cookie as +specified in RFC 7873 and RFC 9018, when the +\fI\%answer\-cookie\fP option is enabled. +UDP queries containing only a DNS Client Cookie and no Server Cookie, +or an invalid DNS Cookie, will receive a BADCOOKIE response including a +newly generated DNS Cookie, allowing clients to retry with that DNS +Cookie. +The \fIallow_cookie\fP action will also accept requests over stateful +transports, regardless of the presence of an DNS Cookie and regardless +of the \fI\%answer\-cookie\fP setting. +UDP queries without a DNS Cookie receive REFUSED responses with the TC +flag set, that may trigger fall back to TCP for those clients. +.UNINDENT +.INDENT 7.0 +.TP +.B deny_non_local +The +\fI\%deny_non_local\fP +action is for hosts that are only allowed to query for the +authoritative \fI\%local\-data\fP, they are not +allowed full recursion but only the static data. +Messages that are disallowed are dropped. +.UNINDENT +.INDENT 7.0 +.TP +.B refuse_non_local +The +\fI\%refuse_non_local\fP +action is for hosts that are only allowed to query for the +authoritative \fI\%local\-data\fP, they are not +allowed full recursion but only the static data. +Messages that are disallowed receive error code REFUSED. +.UNINDENT +.sp By default only localhost (the 127.0.0.0/8 IP netblock, not the loopback -interface) is implicitly \fIallow\fRed, the rest is \fIrefuse\fRd. -The default is \fIrefuse\fRd, because that is protocol\-friendly. The DNS -protocol is not designed to handle dropped packets due to policy, and -dropping may result in (possibly excessive) retried queries. -.IP -The deny_non_local and refuse_non_local settings are for hosts that are -only allowed to query for the authoritative local\-data, they are not -allowed full recursion but only the static data. With deny_non_local, -messages that are disallowed are dropped, with refuse_non_local they -receive error code REFUSED. -.TP -.B access\-control\-tag: \fI<IP netblock> <"list of tags"> -Assign tags to access-control elements. Clients using this access control -element use localzones that are tagged with one of these tags. Tags must be -defined in \fIdefine\-tags\fR. Enclose list of tags in quotes ("") and put -spaces between tags. If access\-control\-tag is configured for a netblock that -does not have an access\-control, an access\-control element with action -\fIallow\fR is configured for this netblock. -.TP -.B access\-control\-tag\-action: \fI<IP netblock> <tag> <action> -Set action for particular tag for given access control element. If you have -multiple tag values, the tag used to lookup the action is the first tag match -between access\-control\-tag and local\-zone\-tag where "first" comes from the -order of the define-tag values. -.TP -.B access\-control\-tag\-data: \fI<IP netblock> <tag> <"resource record string"> +interface) is implicitly \fIallowed\fP, the rest is refused. +The default is \fIrefused\fP, because that is protocol\-friendly. +The DNS protocol is not designed to handle dropped packets due to policy, +and dropping may result in (possibly excessive) retried queries. +.UNINDENT +.INDENT 0.0 +.TP +.B access\-control\-tag: \fI<IP netblock> \(dq<list of tags>\(dq\fP +Assign tags to \fI\%access\-control\fP +elements. +Clients using this access control element use localzones that are tagged +with one of these tags. +.sp +Tags must be defined in \fI\%define\-tag\fP\&. +Enclose list of tags in quotes (\fB\(dq\(dq\fP) and put spaces between tags. +.sp +If \fI\%access\-control\-tag\fP is +configured for a netblock that does not have an +\fI\%access\-control\fP, an access\-control +element with action \fI\%allow\fP +is configured for this netblock. +.UNINDENT +.INDENT 0.0 +.TP +.B access\-control\-tag\-action: \fI<IP netblock> <tag> <action>\fP +Set action for particular tag for given access control element. +If you have multiple tag values, the tag used to lookup the action is the +first tag match between +\fI\%access\-control\-tag\fP and +\fI\%local\-zone\-tag\fP where \(dqfirst\(dq comes +from the order of the \fI\%define\-tag\fP values. +.UNINDENT +.INDENT 0.0 +.TP +.B access\-control\-tag\-data: \fI<IP netblock> <tag> \(dq<resource record string>\(dq\fP Set redirect data for particular tag for given access control element. +.UNINDENT +.INDENT 0.0 .TP -.B access\-control\-view: \fI<IP netblock> <view name> +.B access\-control\-view: \fI<IP netblock> <view name>\fP Set view for given access control element. -.TP -.B interface\-action: \fI<ip address or interface name [@port]> <action> -Similar to \fBaccess\-control:\fR but for interfaces. -.IP -The action is the same as the ones defined under \fBaccess\-control:\fR. -Interfaces are \fIrefuse\fRd by default. +.UNINDENT +.INDENT 0.0 +.TP +.B interface\-action: \fI<ip address or interface name [@port]> <action>\fP +Similar to \fI\%access\-control\fP but for +interfaces. +.sp +The action is the same as the ones defined under +\fI\%access\-control\fP\&. +.sp +Default action for interfaces is +\fI\%refuse\fP\&. By default only localhost (the 127.0.0.0/8 IP netblock, not the loopback -interface) is implicitly \fIallow\fRed through the default -\fBaccess\-control:\fR behavior. -This also means that any attempt to use the \fBinterface-*:\fR options for the -loopback interface will not work as they will be overridden by the implicit -default "\fBaccess\-control:\fR 127.0.0.0/8 allow" option. -.IP -Note that the interface needs to be already specified with \fBinterface:\fR -and that any \fBaccess-control*:\fR setting overrides all \fBinterface-*:\fR -settings for targeted clients. -.TP -.B interface\-tag: \fI<ip address or interface name [@port]> <"list of tags"> -Similar to \fBaccess\-control-tag:\fR but for interfaces. -.IP -Note that the interface needs to be already specified with \fBinterface:\fR -and that any \fBaccess-control*:\fR setting overrides all \fBinterface-*:\fR -settings for targeted clients. -.TP -.B interface\-tag\-action: \fI<ip address or interface name [@port]> <tag> <action> -Similar to \fBaccess\-control-tag-action:\fR but for interfaces. -.IP -Note that the interface needs to be already specified with \fBinterface:\fR -and that any \fBaccess-control*:\fR setting overrides all \fBinterface-*:\fR -settings for targeted clients. -.TP -.B interface\-tag\-data: \fI<ip address or interface name [@port]> <tag> <"resource record string"> -Similar to \fBaccess\-control-tag-data:\fR but for interfaces. -.IP -Note that the interface needs to be already specified with \fBinterface:\fR -and that any \fBaccess-control*:\fR setting overrides all \fBinterface-*:\fR -settings for targeted clients. -.TP -.B interface\-view: \fI<ip address or interface name [@port]> <view name> -Similar to \fBaccess\-control-view:\fR but for interfaces. -.IP -Note that the interface needs to be already specified with \fBinterface:\fR -and that any \fBaccess-control*:\fR setting overrides all \fBinterface-*:\fR -settings for targeted clients. -.TP -.B chroot: \fI<directory> -If chroot is enabled, you should pass the configfile (from the -commandline) as a full path from the original root. After the -chroot has been performed the now defunct portion of the config +interface) is implicitly allowed through the default +\fI\%access\-control\fP behavior. +This also means that any attempt to use the \fBinterface\-*:\fP options for +the loopback interface will not work as they will be overridden by the +implicit default \(dqaccess\-control: 127.0.0.0/8 allow\(dq option. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The interface needs to be already specified with +\fI\%interface\fP and that any +\fBaccess\-control*:\fP attribute overrides all \fBinterface\-*:\fP +attributes for targeted clients. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B interface\-tag: \fI<ip address or interface name [@port]> <\(dqlist of tags\(dq>\fP +Similar to \fI\%access\-control\-tag\fP but +for interfaces. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The interface needs to be already specified with +\fI\%interface\fP and that any +\fBaccess\-control*:\fP attribute overrides all \fBinterface\-*:\fP +attributes for targeted clients. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B interface\-tag\-action: \fI<ip address or interface name [@port]> <tag> <action>\fP +Similar to +\fI\%access\-control\-tag\-action\fP +but for interfaces. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The interface needs to be already specified with +\fI\%interface\fP and that any +\fBaccess\-control*:\fP attribute overrides all \fBinterface\-*:\fP +attributes for targeted clients. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B interface\-tag\-data: \fI<ip address or interface name [@port]> <tag> <\(dqresource record string\(dq>\fP +Similar to +\fI\%access\-control\-tag\-data\fP but +for interfaces. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The interface needs to be already specified with +\fI\%interface\fP and that any +\fBaccess\-control*:\fP attribute overrides all \fBinterface\-*:\fP +attributes for targeted clients. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B interface\-view: \fI<ip address or interface name [@port]> <view name>\fP +Similar to \fI\%access\-control\-view\fP +but for interfaces. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The interface needs to be already specified with +\fI\%interface\fP and that any +\fBaccess\-control*:\fP attribute overrides all \fBinterface\-*:\fP +attributes for targeted clients. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B chroot: \fI<directory>\fP +If \fI\%chroot\fP is enabled, you should pass the +configfile (from the commandline) as a full path from the original root. +After the chroot has been performed the now defunct portion of the config file path is removed to be able to reread the config after a reload. -.IP -All other file paths (working dir, logfile, roothints, and -key files) can be specified in several ways: -as an absolute path relative to the new root, -as a relative path to the working directory, or -as an absolute path relative to the original root. +.sp +All other file paths (working dir, logfile, roothints, and key files) can +be specified in several ways: as an absolute path relative to the new root, +as a relative path to the working directory, or as an absolute path +relative to the original root. In the last case the path is adjusted to remove the unused portion. -.IP -The pidfile can be either a relative path to the working directory, or -an absolute path relative to the original root. It is written just prior -to chroot and dropping permissions. This allows the pidfile to be -/var/run/unbound.pid and the chroot to be /var/unbound, for example. Note that -Unbound is not able to remove the pidfile after termination when it is located -outside of the chroot directory. -.IP -Additionally, Unbound may need to access /dev/urandom (for entropy) +.sp +The pidfile can be either a relative path to the working directory, or an +absolute path relative to the original root. +It is written just prior to chroot and dropping permissions. +This allows the pidfile to be \fB/var/run/unbound.pid\fP and the chroot +to be \fB/var/unbound\fP, for example. +Note that Unbound is not able to remove the pidfile after termination when +it is located outside of the chroot directory. +.sp +Additionally, Unbound may need to access \fB/dev/urandom\fP (for entropy) from inside the chroot. -.IP -If given a chroot is done to the given directory. The chroot is by default -set to "@UNBOUND_CHROOT_DIR@". If you give "" no chroot is performed. -.TP -.B username: \fI<name> -If given, after binding the port the user privileges are dropped. Default is -"@UNBOUND_USERNAME@". If you give username: "" no user change is performed. -.IP -If this user is not capable of binding the -port, reloads (by signal HUP) will still retain the opened ports. +.sp +If given, a \fIchroot(2)\fP is done to the given directory. +If you give \fB\(dq\(dq\fP no \fIchroot(2)\fP is performed. +.sp +Default: @UNBOUND_CHROOT_DIR@ +.UNINDENT +.INDENT 0.0 +.TP +.B username: \fI<name>\fP +If given, after binding the port the user privileges are dropped. +If you give username: \fB\(dq\(dq\fP no user change is performed. +.sp +If this user is not capable of binding the port, reloads (by signal HUP) +will still retain the opened ports. If you change the port number in the config file, and that new port number requires privileges, then a reload will fail; a restart is needed. -.TP -.B directory: \fI<directory> -Sets the working directory for the program. Default is "@UNBOUND_RUN_DIR@". -On Windows the string "%EXECUTABLE%" tries to change to the directory -that unbound.exe resides in. -If you give a server: directory: dir before include: file statements -then those includes can be relative to the working directory. -.TP -.B logfile: \fI<filename> -If "" is given, logging goes to stderr, or nowhere once daemonized. +.sp +Default: @UNBOUND_USERNAME@ +.UNINDENT +.INDENT 0.0 +.TP +.B directory: \fI<directory>\fP +Sets the working directory for the program. +On Windows the string \(dq%EXECUTABLE%\(dq tries to change to the directory that +\fBunbound.exe\fP resides in. +If you give a \fI\%server: directory: +<directory>\fP before +\fI\%include\fP file statements then those includes +can be relative to the working directory. +.sp +Default: @UNBOUND_RUN_DIR@ +.UNINDENT +.INDENT 0.0 +.TP +.B logfile: \fI<filename>\fP +If \fB\(dq\(dq\fP is given, logging goes to stderr, or nowhere once daemonized. The logfile is appended to, in the following format: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf +.ft C [seconds since 1970] unbound[pid:tid]: type: message. +.ft P .fi -If this option is given, the use\-syslog is option is set to "no". +.UNINDENT +.UNINDENT +.sp +If this option is given, the \fI\%use\-syslog\fP +attribute is internally set to \fBno\fP\&. +.sp The logfile is reopened (for append) when the config file is reread, on SIGHUP. -.TP -.B use\-syslog: \fI<yes or no> -Sets Unbound to send log messages to the syslogd, using -\fIsyslog\fR(3). -The log facility LOG_DAEMON is used, with identity "unbound". -The logfile setting is overridden when use\-syslog is turned on. -The default is to log to syslog. -.TP -.B log\-identity: \fI<string> -If "" is given (default), then the name of the executable, usually "unbound" -is used to report to the log. Enter a string to override it -with that, which is useful on systems that run more than one instance of -Unbound, with different configurations, so that the logs can be easily -distinguished against. -.TP -.B log\-time\-ascii: \fI<yes or no> -Sets logfile lines to use a timestamp in UTC ascii. Default is no, which -prints the seconds since 1970 in brackets. No effect if using syslog, in -that case syslog formats the timestamp printed into the log files. -.TP -.B log\-time\-iso:\fR <yes or no> -Log time in ISO8601 format, if \fBlog\-time\-ascii:\fR yes is also set. -Default is no. -.TP -.B log\-queries: \fI<yes or no> -Prints one line per query to the log, with the log timestamp and IP address, -name, type and class. Default is no. Note that it takes time to print these -lines which makes the server (significantly) slower. Odd (nonprintable) -characters in names are printed as '?'. -.TP -.B log\-replies: \fI<yes or no> -Prints one line per reply to the log, with the log timestamp and IP address, -name, type, class, return code, time to resolve, from cache and response size. -Default is no. Note that it takes time to print these -lines which makes the server (significantly) slower. Odd (nonprintable) -characters in names are printed as '?'. -.TP -.B log\-tag\-queryreply: \fI<yes or no> -Prints the word 'query' and 'reply' with log\-queries and log\-replies. -This makes filtering logs easier. The default is off (for backwards -compatibility). -.TP -.B log\-destaddr: \fI<yes or no> -Prints the destination address, port and type in the log\-replies output. -This disambiguates what type of traffic, eg. udp or tcp, and to what local +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B use\-syslog: \fI<yes or no>\fP +Sets Unbound to send log messages to the syslogd, using \fIsyslog(3)\fP\&. +The log facility LOG_DAEMON is used, with identity \(dqunbound\(dq. +The logfile setting is overridden when +\fI\%use\-syslog: yes\fP is set. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B log\-identity: \fI<string>\fP +If \fB\(dq\(dq\fP is given, then the name of the executable, usually +\(dqunbound\(dq is used to report to the log. +Enter a string to override it with that, which is useful on systems that +run more than one instance of Unbound, with different configurations, so +that the logs can be easily distinguished against. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B log\-time\-ascii: \fI<yes or no>\fP +Sets logfile lines to use a timestamp in UTC ASCII. +No effect if using syslog, in that case syslog formats the timestamp +printed into the log files. +.sp +Default: no (prints the seconds since 1970 in brackets) +.UNINDENT +.INDENT 0.0 +.TP +.B log\-time\-iso: \fI<yes or no>\fP +Log time in ISO8601 format, if +\fI\%log\-time\-ascii: yes\fP +is also set. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B log\-queries: \fI<yes or no>\fP +Prints one line per query to the log, with the log timestamp and IP +address, name, type and class. +Note that it takes time to print these lines which makes the server +(significantly) slower. +Odd (nonprintable) characters in names are printed as \fB\(aq?\(aq\fP\&. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B log\-replies: \fI<yes or no>\fP +Prints one line per reply to the log, with the log timestamp and IP +address, name, type, class, return code, time to resolve, from cache and +response size. +Note that it takes time to print these lines which makes the server +(significantly) slower. +Odd (nonprintable) characters in names are printed as \fB\(aq?\(aq\fP\&. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B log\-tag\-queryreply: \fI<yes or no>\fP +Prints the word \(aqquery\(aq and \(aqreply\(aq with +\fI\%log\-queries\fP and +\fI\%log\-replies\fP\&. +This makes filtering logs easier. +.sp +Default: no (backwards compatible) +.UNINDENT +.INDENT 0.0 +.TP +.B log\-destaddr: \fI<yes or no>\fP +Prints the destination address, port and type in the +\fI\%log\-replies\fP output. +This disambiguates what type of traffic, eg. UDP or TCP, and to what local port the traffic was sent to. -.TP -.B log\-local\-actions: \fI<yes or no> -Print log lines to inform about local zone actions. These lines are like the -local\-zone type inform prints out, but they are also printed for the other -types of local zones. -.TP -.B log\-servfail: \fI<yes or no> +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B log\-local\-actions: \fI<yes or no>\fP +Print log lines to inform about local zone actions. +These lines are like the \fI\%local\-zone type +inform\fP print outs, but they are also +printed for the other types of local zones. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B log\-servfail: \fI<yes or no>\fP Print log lines that say why queries return SERVFAIL to clients. This is separate from the verbosity debug logs, much smaller, and printed at the error level, not the info level of debug info from verbosity. -.TP -.B pidfile: \fI<filename> -The process id is written to the file. Default is "@UNBOUND_PIDFILE@". +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B pidfile: \fI<filename>\fP +The process id is written to the file. +Default is \fB\(dq@UNBOUND_PIDFILE@\(dq\fP\&. So, +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -kill \-HUP `cat @UNBOUND_PIDFILE@` +.ft C +kill \-HUP \(gacat @UNBOUND_PIDFILE@\(ga +.ft P .fi +.UNINDENT +.UNINDENT +.sp triggers a reload, +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -kill \-TERM `cat @UNBOUND_PIDFILE@` +.ft C +kill \-TERM \(gacat @UNBOUND_PIDFILE@\(ga +.ft P .fi +.UNINDENT +.UNINDENT +.sp gracefully terminates. -.TP -.B root\-hints: \fI<filename> -Read the root hints from this file. Default is nothing, using builtin hints -for the IN class. The file has the format of zone files, with root -nameserver names and addresses only. The default may become outdated, -when servers change, therefore it is good practice to use a root\-hints file. -.TP -.B hide\-identity: \fI<yes or no> -If enabled id.server and hostname.bind queries are refused. -.TP -.B identity: \fI<string> -Set the identity to report. If set to "", the default, then the hostname -of the server is returned. -.TP -.B hide\-version: \fI<yes or no> -If enabled version.server and version.bind queries are refused. -.TP -.B version: \fI<string> -Set the version to report. If set to "", the default, then the package -version is returned. -.TP -.B hide\-http\-user\-agent: \fI<yes or no> -If enabled the HTTP header User-Agent is not set. Use with caution as some -webserver configurations may reject HTTP requests lacking this header. +.sp +Default: @UNBOUND_PIDFILE@ +.UNINDENT +.INDENT 0.0 +.TP +.B root\-hints: \fI<filename>\fP +Read the root hints from this file. +Default is nothing, using builtin hints for the IN class. +The file has the format of zone files, with root nameserver names and +addresses only. +The default may become outdated, when servers change, therefore it is good +practice to use a root hints file. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B hide\-identity: \fI<yes or no>\fP +If enabled \(aqid.server\(aq and \(aqhostname.bind\(aq queries are REFUSED. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B identity: \fI<string>\fP +Set the identity to report. +If set to \fB\(dq\(dq\fP, then the hostname of the server is returned. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B hide\-version: \fI<yes or no>\fP +If enabled \(aqversion.server\(aq and \(aqversion.bind\(aq queries are REFUSED. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B version: \fI<string>\fP +Set the version to report. +If set to \fB\(dq\(dq\fP, then the package version is returned. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B hide\-http\-user\-agent: \fI<yes or no>\fP +If enabled the HTTP header User\-Agent is not set. +Use with caution as some webserver configurations may reject HTTP requests +lacking this header. If needed, it is better to explicitly set the -.B http\-user\-agent -below. -.TP -.B http\-user\-agent: \fI<string> -Set the HTTP User-Agent header for outgoing HTTP requests. If set to "", -the default, then the package name and version are used. -.TP -.B nsid:\fR <string> -Add the specified nsid to the EDNS section of the answer when queried -with an NSID EDNS enabled packet. As a sequence of hex characters or -with ascii_ prefix and then an ascii string. -.TP -.B hide\-trustanchor: \fI<yes or no> -If enabled trustanchor.unbound queries are refused. -.TP -.B target\-fetch\-policy: \fI<"list of numbers"> +\fI\%http\-user\-agent\fP below. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B http\-user\-agent: \fI<string>\fP +Set the HTTP User\-Agent header for outgoing HTTP requests. +If set to \fB\(dq\(dq\fP, then the package name and version are used. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B nsid: \fI<string>\fP +Add the specified nsid to the EDNS section of the answer when queried with +an NSID EDNS enabled packet. +As a sequence of hex characters or with \(aqascii_\(aq prefix and then an ASCII +string. +.sp +Default: (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B hide\-trustanchor: \fI<yes or no>\fP +If enabled \(aqtrustanchor.unbound\(aq queries are REFUSED. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B target\-fetch\-policy: \fI<\(dqlist of numbers\(dq>\fP Set the target fetch policy used by Unbound to determine if it should fetch -nameserver target addresses opportunistically. The policy is described per +nameserver target addresses opportunistically. +The policy is described per dependency depth. +.sp +The number of values determines the maximum dependency depth that Unbound +will pursue in answering a query. +A value of \-1 means to fetch all targets opportunistically for that dependency depth. -.IP -The number of values determines the maximum dependency depth -that Unbound will pursue in answering a query. -A value of \-1 means to fetch all targets opportunistically for that dependency -depth. A value of 0 means to fetch on demand only. A positive value fetches -that many targets opportunistically. -.IP -Enclose the list between quotes ("") and put spaces between numbers. -The default is "3 2 1 0 0". Setting all zeroes, "0 0 0 0 0" gives behaviour -closer to that of BIND 9, while setting "\-1 \-1 \-1 \-1 \-1" gives behaviour -rumoured to be closer to that of BIND 8. -.TP -.B harden\-short\-bufsize: \fI<yes or no> -Very small EDNS buffer sizes from queries are ignored. Default is yes, as -described in the standard. -.TP -.B harden\-large\-queries: \fI<yes or no> -Very large queries are ignored. Default is no, since it is legal protocol -wise to send these, and could be necessary for operation if TSIG or EDNS -payload is very large. -.TP -.B harden\-glue: \fI<yes or no> -Will trust glue only if it is within the servers authority. Default is yes. -.TP -.B harden\-unverified\-glue: \fI<yes or no> -Will trust only in-zone glue. Will try to resolve all out of zone -(\fI<unverfied>) glue. Will fallback to the original glue if unable to resolve. -Default is no. -.TP -.B harden\-dnssec\-stripped: \fI<yes or no> -Require DNSSEC data for trust\-anchored zones, if such data is absent, -the zone becomes bogus. If turned off, and no DNSSEC data is received -(or the DNSKEY data fails to validate), then the zone is made insecure, -this behaves like there is no trust anchor. You could turn this off if -you are sometimes behind an intrusive firewall (of some sort) that -removes DNSSEC data from packets, or a zone changes from signed to -unsigned to badly signed often. If turned off you run the risk of a -downgrade attack that disables security for a zone. Default is yes. -.TP -.B harden\-below\-nxdomain: \fI<yes or no> -From RFC 8020 (with title "NXDOMAIN: There Really Is Nothing Underneath"), -returns nxdomain to queries for a name -below another name that is already known to be nxdomain. DNSSEC mandates -noerror for empty nonterminals, hence this is possible. Very old software -might return nxdomain for empty nonterminals (that usually happen for reverse -IP address lookups), and thus may be incompatible with this. To try to avoid -this only DNSSEC-secure nxdomains are used, because the old software does not -have DNSSEC. Default is yes. -The nxdomain must be secure, this means nsec3 with optout is insufficient. -.TP -.B harden\-referral\-path: \fI<yes or no> +A value of 0 means to fetch on demand only. +A positive value fetches that many targets opportunistically. +.sp +Enclose the list between quotes (\fB\(dq\(dq\fP) and put spaces between numbers. +Setting all zeroes, \(dq0 0 0 0 0\(dq gives behaviour closer to that of BIND 9, +while setting \(dq\-1 \-1 \-1 \-1 \-1\(dq gives behaviour rumoured to be closer to +that of BIND 8. +.sp +Default: \(dq3 2 1 0 0\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-short\-bufsize: \fI<yes or no>\fP +Very small EDNS buffer sizes from queries are ignored. +.sp +Default: yes (as described in the standard) +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-large\-queries: \fI<yes or no>\fP +Very large queries are ignored. +Default is no, since it is legal protocol wise to send these, and could be +necessary for operation if TSIG or EDNS payload is very large. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-glue: \fI<yes or no>\fP +Will trust glue only if it is within the servers authority. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-unverified\-glue: \fI<yes or no>\fP +Will trust only in\-zone glue. +Will try to resolve all out of zone (\fIunverified\fP) glue. +Will fallback to the original glue if unable to resolve. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-dnssec\-stripped: \fI<yes or no>\fP +Require DNSSEC data for trust\-anchored zones, if such data is absent, the +zone becomes bogus. +If turned off, and no DNSSEC data is received (or the DNSKEY data fails to +validate), then the zone is made insecure, this behaves like there is no +trust anchor. +You could turn this off if you are sometimes behind an intrusive firewall +(of some sort) that removes DNSSEC data from packets, or a zone changes +from signed to unsigned to badly signed often. +If turned off you run the risk of a downgrade attack that disables security +for a zone. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-below\-nxdomain: \fI<yes or no>\fP +From \fI\%RFC 8020\fP (with title \(dqNXDOMAIN: There Really Is Nothing +Underneath\(dq), returns NXDOMAIN to queries for a name below another name +that is already known to be NXDOMAIN. +DNSSEC mandates NOERROR for empty nonterminals, hence this is possible. +Very old software might return NXDOMAIN for empty nonterminals (that +usually happen for reverse IP address lookups), and thus may be +incompatible with this. +To try to avoid this only DNSSEC\-secure NXDOMAINs are used, because the old +software does not have DNSSEC. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The NXDOMAIN must be secure, this means NSEC3 with optout is +insufficient. +.UNINDENT +.UNINDENT +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-referral\-path: \fI<yes or no>\fP Harden the referral path by performing additional queries for -infrastructure data. Validates the replies if trust anchors are configured -and the zones are signed. This enforces DNSSEC validation on nameserver -NS sets and the nameserver addresses that are encountered on the referral -path to the answer. -Default no, because it burdens the authority servers, and it is -not RFC standard, and could lead to performance problems because of the -extra query load that is generated. Experimental option. -If you enable it consider adding more numbers after the target\-fetch\-policy -to increase the max depth that is checked to. -.TP -.B harden\-algo\-downgrade: \fI<yes or no> -Harden against algorithm downgrade when multiple algorithms are -advertised in the DS record. -This works by first choosing only the strongest DS digest type as per RFC 4509 -(Unbound treats the highest algorithm as the strongest) and then -expecting signatures from all the advertised signing algorithms from the chosen -DS(es) to be present. -If no, allows any one supported algorithm to validate the zone, even if other advertised algorithms are broken. -Default is no. -RFC 6840 mandates that zone signers must produce zones signed with all +infrastructure data. +Validates the replies if trust anchors are configured and the zones are +signed. +This enforces DNSSEC validation on nameserver NS sets and the nameserver +addresses that are encountered on the referral path to the answer. +Default is off, because it burdens the authority servers, and it is not RFC +standard, and could lead to performance problems because of the extra query +load that is generated. +Experimental option. +If you enable it consider adding more numbers after the +\fI\%target\-fetch\-policy\fP to increase +the max depth that is checked to. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-algo\-downgrade: \fI<yes or no>\fP +Harden against algorithm downgrade when multiple algorithms are advertised +in the DS record. +This works by first choosing only the strongest DS digest type as per +\fI\%RFC 4509\fP (Unbound treats the highest algorithm as the strongest) and +then expecting signatures from all the advertised signing algorithms from +the chosen DS(es) to be present. +If no, allows any one supported algorithm to validate the zone, even if +other advertised algorithms are broken. +\fI\%RFC 6840\fP mandates that zone signers must produce zones signed with all advertised algorithms, but sometimes they do not. -RFC 6840 also clarifies that this requirement is not for validators and +\fI\%RFC 6840\fP also clarifies that this requirement is not for validators and validators should accept any single valid path. -It should thus be explicitly noted that this option violates RFC 6840 for -DNSSEC validation and should only be used to perform a signature +It should thus be explicitly noted that this option violates \fI\%RFC 6840\fP +for DNSSEC validation and should only be used to perform a signature completeness test to support troubleshooting. -Using this option may break DNSSEC resolution with non-RFC6840-conforming -signers and/or in multi-signer configurations that don't send all the -advertised signatures. -.TP -.B harden\-unknown\-additional: \fI<yes or no> +.sp +\fBWARNING:\fP +.INDENT 7.0 +.INDENT 3.5 +Using this option may break DNSSEC resolution with non \fI\%RFC 6840\fP +conforming signers and/or in multi\-signer configurations that don\(aqt +send all the advertised signatures. +.UNINDENT +.UNINDENT +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B harden\-unknown\-additional: \fI<yes or no>\fP Harden against unknown records in the authority section and additional -section. Default is no. If no, such records are copied from the upstream -and presented to the client together with the answer. If yes, it could -hamper future protocol developments that want to add records. -.TP -.B use\-caps\-for\-id: \fI<yes or no> +section. +If no, such records are copied from the upstream and presented to the +client together with the answer. +If yes, it could hamper future protocol developments that want to add +records. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B use\-caps\-for\-id: \fI<yes or no>\fP Use 0x20\-encoded random bits in the query to foil spoof attempts. -This perturbs the lowercase and uppercase of query names sent to -authority servers and checks if the reply still has the correct casing. -Disabled by default. +This perturbs the lowercase and uppercase of query names sent to authority +servers and checks if the reply still has the correct casing. This feature is an experimental implementation of draft dns\-0x20. +.sp +Default: no +.UNINDENT +.INDENT 0.0 .TP -.B caps\-exempt: \fI<domain> +.B caps\-exempt: \fI<domain>\fP Exempt the domain so that it does not receive caps\-for\-id perturbed -queries. For domains that do not support 0x20 and also fail with fallback -because they keep sending different answers, like some load balancers. +queries. +For domains that do not support 0x20 and also fail with fallback because +they keep sending different answers, like some load balancers. Can be given multiple times, for different domains. +.UNINDENT +.INDENT 0.0 .TP -.B caps\-whitelist: \fI<domain> -Alternate syntax for \fBcaps\-exempt\fR. +.B caps\-whitelist: \fI<domain>\fP +Alternate syntax for \fI\%caps\-exempt\fP\&. +.UNINDENT +.INDENT 0.0 .TP -.B qname\-minimisation: \fI<yes or no> +.B qname\-minimisation: \fI<yes or no>\fP Send minimum amount of information to upstream servers to enhance privacy. Only send minimum required labels of the QNAME and set QTYPE to A when -possible. Best effort approach; full QNAME and original QTYPE will be sent when +possible. +Best effort approach; full QNAME and original QTYPE will be sent when upstream replies with a RCODE other than NOERROR, except when receiving -NXDOMAIN from a DNSSEC signed zone. Default is yes. -.TP -.B qname\-minimisation\-strict: \fI<yes or no> -QNAME minimisation in strict mode. Do not fall-back to sending full QNAME to -potentially broken nameservers. A lot of domains will not be resolvable when -this option in enabled. Only use if you know what you are doing. -This option only has effect when qname-minimisation is enabled. Default is no. -.TP -.B aggressive\-nsec: \fI<yes or no> -Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN -and other denials, using information from previous NXDOMAINs answers. -Default is yes. It helps to reduce the query rate towards targets that get -a very high nonexistent name lookup rate. -.TP -.B private\-address: \fI<IP address or subnet> -Give IPv4 of IPv6 addresses or classless subnets. These are addresses -on your private network, and are not allowed to be returned for -public internet names. Any occurrence of such addresses are removed -from DNS answers. Additionally, the DNSSEC validator may mark the -answers bogus. This protects against so\-called DNS Rebinding, where -a user browser is turned into a network proxy, allowing remote access -through the browser to other parts of your private network. Some names -can be allowed to contain your private addresses, by default all the -\fBlocal\-data\fR that you configured is allowed to, and you can specify -additional names using \fBprivate\-domain\fR. No private addresses are -enabled by default. We consider to enable this for the RFC1918 private -IP address space by default in later releases. That would enable private -addresses for 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 169.254.0.0/16 -fd00::/8 and fe80::/10, since the RFC standards say these addresses -should not be visible on the public internet. Turning on 127.0.0.0/8 -would hinder many spamblocklists as they use that. Adding ::ffff:0:0/96 -stops IPv4-mapped IPv6 addresses from bypassing the filter. -.TP -.B private\-domain: \fI<domain name> +NXDOMAIN from a DNSSEC signed zone. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B qname\-minimisation\-strict: \fI<yes or no>\fP +QNAME minimisation in strict mode. +Do not fall\-back to sending full QNAME to potentially broken nameservers. +A lot of domains will not be resolvable when this option in enabled. +Only use if you know what you are doing. +This option only has effect when +\fI\%qname\-minimisation\fP is enabled. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B aggressive\-nsec: \fI<yes or no>\fP +Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN and other +denials, using information from previous NXDOMAINs answers. +It helps to reduce the query rate towards targets that get a very high +nonexistent name lookup rate. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B private\-address: \fI<IP address or subnet>\fP +Give IPv4 of IPv6 addresses or classless subnets. +These are addresses on your private network, and are not allowed to be +returned for public internet names. +Any occurrence of such addresses are removed from DNS answers. +Additionally, the DNSSEC validator may mark the answers bogus. +This protects against so\-called DNS Rebinding, where a user browser is +turned into a network proxy, allowing remote access through the browser to +other parts of your private network. +.sp +Some names can be allowed to contain your private addresses, by default all +the \fI\%local\-data\fP that you configured is +allowed to, and you can specify additional names using +\fI\%private\-domain\fP\&. +No private addresses are enabled by default. +.sp +We consider to enable this for the \fI\%RFC 1918\fP private IP address space by +default in later releases. +That would enable private addresses for \fB10.0.0.0/8\fP, \fB172.16.0.0/12\fP, +\fB192.168.0.0/16\fP, \fB169.254.0.0/16\fP, \fBfd00::/8\fP and \fBfe80::/10\fP, +since the RFC standards say these addresses should not be visible on the +public internet. +.sp +Turning on \fB127.0.0.0/8\fP would hinder many spamblocklists as they use +that. +Adding \fB::ffff:0:0/96\fP stops IPv4\-mapped IPv6 addresses from bypassing +the filter. +.UNINDENT +.INDENT 0.0 +.TP +.B private\-domain: \fI<domain name>\fP Allow this domain, and all its subdomains to contain private addresses. Give multiple times to allow multiple domain names to contain private -addresses. Default is none. -.TP -.B unwanted\-reply\-threshold: \fI<number> -If set, a total number of unwanted replies is kept track of in every thread. -When it reaches the threshold, a defensive action is taken and a warning -is printed to the log. The defensive action is to clear the rrset and -message caches, hopefully flushing away any poison. A value of 10 million -is suggested. Default is 0 (turned off). -.TP -.B do\-not\-query\-address: \fI<IP address> -Do not query the given IP address. Can be IP4 or IP6. Append /num to -indicate a classless delegation netblock, for example like -10.2.3.4/24 or 2001::11/64. -.TP -.B do\-not\-query\-localhost: \fI<yes or no> -If yes, localhost is added to the do\-not\-query\-address entries, both -IP6 ::1 and IP4 127.0.0.1/8. If no, then localhost can be used to send -queries to. Default is yes. -.TP -.B prefetch: \fI<yes or no> -If yes, cache hits on message cache elements that are on their last 10 percent -of their TTL value trigger a prefetch to keep the cache up to date. -Default is no. -Turning it on gives about 10 percent more traffic and load on the machine, but -popular items do not expire from the cache. -.TP -.B prefetch\-key: \fI<yes or no> +addresses. +.sp +Default: (none) +.UNINDENT +.INDENT 0.0 +.TP +.B unwanted\-reply\-threshold: \fI<number>\fP +If set, a total number of unwanted replies is kept track of in every +thread. +When it reaches the threshold, a defensive action is taken and a warning is +printed to the log. +The defensive action is to clear the rrset and message caches, hopefully +flushing away any poison. +A value of 10 million is suggested. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B do\-not\-query\-address: \fI<IP address>\fP +Do not query the given IP address. +Can be IPv4 or IPv6. +Append /num to indicate a classless delegation netblock, for example like +\fB10.2.3.4/24\fP or \fB2001::11/64\fP\&. +.sp +Default: (none) +.UNINDENT +.INDENT 0.0 +.TP +.B do\-not\-query\-localhost: \fI<yes or no>\fP +If yes, localhost is added to the +\fI\%do\-not\-query\-address\fP entries, +both IPv6 \fB::1\fP and IPv4 \fB127.0.0.1/8\fP\&. +If no, then localhost can be used to send queries to. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B prefetch: \fI<yes or no>\fP +If yes, cache hits on message cache elements that are on their last 10 +percent of their TTL value trigger a prefetch to keep the cache up to date. +Turning it on gives about 10 percent more traffic and load on the machine, +but popular items do not expire from the cache. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B prefetch\-key: \fI<yes or no>\fP If yes, fetch the DNSKEYs earlier in the validation process, when a DS -record is encountered. This lowers the latency of requests. It does use -a little more CPU. Also if the cache is set to 0, it is no use. Default is no. -.TP -.B deny\-any: \fI<yes or no> -If yes, deny queries of type ANY with an empty response. Default is no. +record is encountered. +This lowers the latency of requests. +It does use a little more CPU. +Also if the cache is set to 0, it is no use. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B deny\-any: \fI<yes or no>\fP +If yes, deny queries of type ANY with an empty response. If disabled, Unbound responds with a short list of resource records if some can be found in the cache and makes the upstream type ANY query if there are none. +.sp +Default: no +.UNINDENT +.INDENT 0.0 .TP -.B rrset\-roundrobin: \fI<yes or no> +.B rrset\-roundrobin: \fI<yes or no>\fP If yes, Unbound rotates RRSet order in response (the random number is taken -from the query ID, for speed and thread safety). Default is yes. +from the query ID, for speed and thread safety). +.sp +Default: yes +.UNINDENT +.INDENT 0.0 .TP -.B minimal-responses: \fI<yes or no> +.B minimal\-responses: \fI<yes or no>\fP If yes, Unbound does not insert authority/additional sections into response -messages when those sections are not required. This reduces response -size significantly, and may avoid TCP fallback for some responses which may -cause a slight speedup. The default is yes, even though the DNS -protocol RFCs mandate these sections, and the additional content could -save roundtrips for clients that use the additional content. +messages when those sections are not required. +This reduces response size significantly, and may avoid TCP fallback for +some responses which may cause a slight speedup. +The default is yes, even though the DNS protocol RFCs mandate these +sections, and the additional content could save roundtrips for clients that +use the additional content. However these sections are hardly used by clients. Enabling prefetch can benefit clients that need the additional content by trying to keep that content fresh in the cache. -.TP -.B disable-dnssec-lame-check: \fI<yes or no> -If true, disables the DNSSEC lameness check in the iterator. This check -sees if RRSIGs are present in the answer, when dnssec is expected, -and retries another authority if RRSIGs are unexpectedly missing. -The validator will insist in RRSIGs for DNSSEC signed domains regardless -of this setting, if a trust anchor is loaded. -.TP -.B module\-config: \fI<"module names"> +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B disable\-dnssec\-lame\-check: \fI<yes or no>\fP +If yes, disables the DNSSEC lameness check in the iterator. +This check sees if RRSIGs are present in the answer, when DNSSEC is +expected, and retries another authority if RRSIGs are unexpectedly missing. +The validator will insist in RRSIGs for DNSSEC signed domains regardless of +this setting, if a trust anchor is loaded. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B module\-config: \fI\(dq<module names>\(dq\fP Module configuration, a list of module names separated by spaces, surround -the string with quotes (""). The modules can be \fIrespip\fR, -\fIvalidator\fR, or \fIiterator\fR (and possibly more, see below). -Setting this to just "\fIiterator\fR" will result in a non\-validating -server. -Setting this to "\fIvalidator iterator\fR" will turn on DNSSEC validation. -The ordering of the modules is significant, the order decides the -order of processing. -You must also set \fItrust\-anchors\fR for validation to be useful. -Adding \fIrespip\fR to the front will cause RPZ processing to be done on -all queries. -The default is "\fIvalidator iterator\fR". -.IP +the string with quotes (\fB\(dq\(dq\fP). +The modules can be \fBrespip\fP, \fBvalidator\fP, or \fBiterator\fP (and possibly +more, see below). +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The ordering of the modules is significant, the order decides the order +of processing. +.UNINDENT +.UNINDENT +.sp +Setting this to just \(dqiterator\(dq will result in a non\-validating server. +Setting this to \(dqvalidator iterator\(dq will turn on DNSSEC validation. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +You must also set trust\-anchors for validation to be useful. +.UNINDENT +.UNINDENT +.sp +Adding \fBrespip\fP to the front will cause RPZ processing to be done on all +queries. +.sp Most modules that need to be listed here have to be listed at the beginning -of the line. The subnetcachedb module has to be listed just before -the iterator. -The python module can be listed in different places, it then processes the -output of the module it is just before. The dynlib module can be listed pretty -much anywhere, it is only a very thin wrapper that allows dynamic libraries to -run in its place. -.TP -.B trust\-anchor\-file: \fI<filename> -File with trusted keys for validation. Both DS and DNSKEY entries can appear -in the file. The format of the file is the standard DNS Zone file format. -Default is "", or no trust anchor file. -.TP -.B auto\-trust\-anchor\-file: \fI<filename> -File with trust anchor for one zone, which is tracked with RFC5011 probes. +of the line. +.sp +The \fBsubnetcache\fP module has to be listed just before the iterator. +.sp +The \fBpython\fP module can be listed in different places, it then processes +the output of the module it is just before. +.sp +The \fBdynlib\fP module can be listed pretty much anywhere, it is only a very +thin wrapper that allows dynamic libraries to run in its place. +.sp +Default: \(dqvalidator iterator\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B trust\-anchor\-file: \fI<filename>\fP +File with trusted keys for validation. +Both DS and DNSKEY entries can appear in the file. +The format of the file is the standard DNS Zone file format. +.sp +Default: \(dq\(dq (no trust anchor file) +.UNINDENT +.INDENT 0.0 +.TP +.B auto\-trust\-anchor\-file: \fI<filename>\fP +File with trust anchor for one zone, which is tracked with \fI\%RFC 5011\fP +probes. The probes are run several times per month, thus the machine must be online -frequently. The initial file can be one with contents as described in -\fBtrust\-anchor\-file\fR. The file is written to when the anchor is updated, -so the Unbound user must have write permission. Write permission to the file, -but also to the directory it is in (to create a temporary file, which is -necessary to deal with filesystem full events), it must also be inside the -chroot (if that is used). -.TP -.B trust\-anchor: \fI<"Resource Record"> -A DS or DNSKEY RR for a key to use for validation. Multiple entries can be -given to specify multiple trusted keys, in addition to the trust\-anchor\-files. -The resource record is entered in the same format as 'dig' or 'drill' prints -them, the same format as in the zone file. Has to be on a single line, with -"" around it. A TTL can be specified for ease of cut and paste, but is ignored. +frequently. +The initial file can be one with contents as described in +\fI\%trust\-anchor\-file\fP\&. +The file is written to when the anchor is updated, so the Unbound user must +have write permission. +Write permission to the file, but also to the directory it is in (to create +a temporary file, which is necessary to deal with filesystem full events), +it must also be inside the \fI\%chroot\fP (if that is +used). +.sp +Default: \(dq\(dq (no auto trust anchor file) +.UNINDENT +.INDENT 0.0 +.TP +.B trust\-anchor: \fI\(dq<Resource Record>\(dq\fP +A DS or DNSKEY RR for a key to use for validation. +Multiple entries can be given to specify multiple trusted keys, in addition +to the \fI\%trust\-anchor\-file\fP\&. +The resource record is entered in the same format as \fIdig(1)\fP or \fIdrill(1)\fP +prints them, the same format as in the zone file. +Has to be on a single line, with \fB\(dq\(dq\fP around it. +A TTL can be specified for ease of cut and paste, but is ignored. A class can be specified, but class IN is default. -.TP -.B trusted\-keys\-file: \fI<filename> -File with trusted keys for validation. Specify more than one file -with several entries, one file per entry. Like \fBtrust\-anchor\-file\fR -but has a different file format. Format is BIND\-9 style format, -the trusted\-keys { name flag proto algo "key"; }; clauses are read. +.sp +Default: (none) +.UNINDENT +.INDENT 0.0 +.TP +.B trusted\-keys\-file: \fI<filename>\fP +File with trusted keys for validation. +Specify more than one file with several entries, one file per entry. +Like \fI\%trust\-anchor\-file\fP but has a +different file format. +Format is BIND\-9 style format, the \fBtrusted\-keys { name flag proto algo +\(dqkey\(dq; };\fP clauses are read. It is possible to use wildcards with this statement, the wildcard is expanded on start and on reload. -.TP -.B trust\-anchor\-signaling: \fI<yes or no> -Send RFC8145 key tag query after trust anchor priming. Default is yes. -.TP -.B root\-key\-sentinel: \fI<yes or no> -Root key trust anchor sentinel. Default is yes. -.TP -.B domain\-insecure: \fI<domain name> -Sets domain name to be insecure, DNSSEC chain of trust is ignored towards -the domain name. So a trust anchor above the domain name can not make the -domain secure with a DS record, such a DS record is then ignored. -Can be given multiple times -to specify multiple domains that are treated as if unsigned. If you set -trust anchors for the domain they override this setting (and the domain -is secured). -.IP +.sp +Default: \(dq\(dq (no trusted keys file) +.UNINDENT +.INDENT 0.0 +.TP +.B trust\-anchor\-signaling: \fI<yes or no>\fP +Send \fI\%RFC 8145\fP key tag query after trust anchor priming. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B root\-key\-sentinel: \fI<yes or no>\fP +Root key trust anchor sentinel. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B domain\-insecure: \fI<domain name>\fP +Sets \fI<domain name>\fP to be insecure, DNSSEC chain of trust is ignored +towards the \fI<domain name>\fP\&. +So a trust anchor above the domain name can not make the domain secure with +a DS record, such a DS record is then ignored. +Can be given multiple times to specify multiple domains that are treated as +if unsigned. +If you set trust anchors for the domain they override this setting (and the +domain is secured). +.sp This can be useful if you want to make sure a trust anchor for external -lookups does not affect an (unsigned) internal domain. A DS record -externally can create validation failures for that internal domain. -.TP -.B val\-override\-date: \fI<rrsig\-style date spec> -Default is "" or "0", which disables this debugging feature. If enabled by -giving a RRSIG style date, that date is used for verifying RRSIG inception -and expiration dates, instead of the current date. Do not set this unless -you are debugging signature inception and expiration. The value \-1 ignores -the date altogether, useful for some special applications. -.TP -.B val\-sig\-skew\-min: \fI<seconds> +lookups does not affect an (unsigned) internal domain. +A DS record externally can create validation failures for that internal +domain. +.sp +Default: (none) +.UNINDENT +.INDENT 0.0 +.TP +.B val\-override\-date: \fI<rrsig\-style date spec>\fP +.sp +\fBWARNING:\fP +.INDENT 7.0 +.INDENT 3.5 +Debugging feature! +.UNINDENT +.UNINDENT +.sp +If enabled by giving a RRSIG style date, that date is used for verifying +RRSIG inception and expiration dates, instead of the current date. +Do not set this unless you are debugging signature inception and +expiration. +The value \-1 ignores the date altogether, useful for some special +applications. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B val\-sig\-skew\-min: \fI<seconds>\fP Minimum number of seconds of clock skew to apply to validated signatures. -A value of 10% of the signature lifetime (expiration \- inception) is -used, capped by this setting. Default is 3600 (1 hour) which allows for -daylight savings differences. Lower this value for more strict checking -of short lived signatures. -.TP -.B val\-sig\-skew\-max: \fI<seconds> +A value of 10% of the signature lifetime (expiration \- inception) is used, +capped by this setting. +Default is 3600 (1 hour) which allows for daylight savings differences. +Lower this value for more strict checking of short lived signatures. +.sp +Default: 3600 (1 hour) +.UNINDENT +.INDENT 0.0 +.TP +.B val\-sig\-skew\-max: \fI<seconds>\fP Maximum number of seconds of clock skew to apply to validated signatures. -A value of 10% of the signature lifetime (expiration \- inception) -is used, capped by this setting. Default is 86400 (24 hours) which -allows for timezone setting problems in stable domains. Setting both -min and max very low disables the clock skew allowances. Setting both -min and max very high makes the validator check the signature timestamps -less strictly. -.TP -.B val\-max\-restart: \fI<number> -The maximum number the validator should restart validation with -another authority in case of failed validation. Default is 5. -.TP -.B val\-bogus\-ttl: \fI<number> -The time to live for bogus data. This is data that has failed validation; -due to invalid signatures or other checks. The TTL from that data cannot be -trusted, and this value is used instead. The value is in seconds, default 60. +A value of 10% of the signature lifetime (expiration \- inception) is used, +capped by this setting. +Default is 86400 (24 hours) which allows for timezone setting problems in +stable domains. +Setting both min and max very low disables the clock skew allowances. +Setting both min and max very high makes the validator check the signature +timestamps less strictly. +.sp +Default: 86400 (24 hours) +.UNINDENT +.INDENT 0.0 +.TP +.B val\-max\-restart: \fI<number>\fP +The maximum number the validator should restart validation with another +authority in case of failed validation. +.sp +Default: 5 +.UNINDENT +.INDENT 0.0 +.TP +.B val\-bogus\-ttl: \fI<seconds>\fP +The time to live for bogus data. +This is data that has failed validation; due to invalid signatures or other +checks. +The TTL from that data cannot be trusted, and this value is used instead. The time interval prevents repeated revalidation of bogus data. +.sp +Default: 60 +.UNINDENT +.INDENT 0.0 .TP -.B val\-clean\-additional: \fI<yes or no> +.B val\-clean\-additional: \fI<yes or no>\fP Instruct the validator to remove data from the additional section of secure -messages that are not signed properly. Messages that are insecure, bogus, -indeterminate or unchecked are not affected. Default is yes. Use this setting -to protect the users that rely on this validator for authentication from -potentially bad data in the additional section. -.TP -.B val\-log\-level: \fI<number> -Have the validator print validation failures to the log. Regardless of -the verbosity setting. Default is 0, off. At 1, for every user query -that fails a line is printed to the logs. This way you can monitor what -happens with validation. Use a diagnosis tool, such as dig or drill, -to find out why validation is failing for these queries. At 2, not only -the query that failed is printed but also the reason why Unbound thought -it was wrong and which server sent the faulty data. -.TP -.B val\-permissive\-mode: \fI<yes or no> -Instruct the validator to mark bogus messages as indeterminate. The security -checks are performed, but if the result is bogus (failed security), the -reply is not withheld from the client with SERVFAIL as usual. The client -receives the bogus data. For messages that are found to be secure the AD bit -is set in replies. Also logging is performed as for full validation. -The default value is "no". -.TP -.B ignore\-cd\-flag: \fI<yes or no> -Instruct Unbound to ignore the CD flag from clients and refuse to -return bogus answers to them. Thus, the CD (Checking Disabled) flag -does not disable checking any more. This is useful if legacy (w2008) -servers that set the CD flag but cannot validate DNSSEC themselves are -the clients, and then Unbound provides them with DNSSEC protection. -The default value is "no". -.TP -.B disable\-edns\-do: \fI<yes or no> +messages that are not signed properly. +Messages that are insecure, bogus, indeterminate or unchecked are not +affected. +Use this setting to protect the users that rely on this validator for +authentication from potentially bad data in the additional section. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B val\-log\-level: \fI<number>\fP +Have the validator print validation failures to the log. +Regardless of the verbosity setting. +.sp +At 1, for every user query that fails a line is printed to the logs. +This way you can monitor what happens with validation. +Use a diagnosis tool, such as dig or drill, to find out why validation is +failing for these queries. +.sp +At 2, not only the query that failed is printed but also the reason why +Unbound thought it was wrong and which server sent the faulty data. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B val\-permissive\-mode: \fI<yes or no>\fP +Instruct the validator to mark bogus messages as indeterminate. +The security checks are performed, but if the result is bogus (failed +security), the reply is not withheld from the client with SERVFAIL as +usual. +The client receives the bogus data. +For messages that are found to be secure the AD bit is set in replies. +Also logging is performed as for full validation. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ignore\-cd\-flag: \fI<yes or no>\fP +Instruct Unbound to ignore the CD flag from clients and refuse to return +bogus answers to them. +Thus, the CD (Checking Disabled) flag does not disable checking any more. +This is useful if legacy (w2008) servers that set the CD flag but cannot +validate DNSSEC themselves are the clients, and then Unbound provides them +with DNSSEC protection. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B disable\-edns\-do: \fI<yes or no>\fP Disable the EDNS DO flag in upstream requests. -It breaks DNSSEC validation for Unbound's clients. +It breaks DNSSEC validation for Unbound\(aqs clients. This results in the upstream name servers to not include DNSSEC records in their replies and could be helpful for devices that cannot handle DNSSEC information. @@ -1399,1255 +2553,2187 @@ If this option is enabled but Unbound is already configured for DNSSEC validation (i.e., the validator module is enabled; default) this option is implicitly turned off with a warning as to not break DNSSEC validation in Unbound. -Default is no. -.TP -.B serve\-expired: \fI<yes or no> -If enabled, Unbound attempts to serve old responses from cache with a -TTL of \fBserve\-expired\-reply\-ttl\fR in the response. -By default the expired answer will be used after a resolution attempt errored -out or is taking more than serve\-expired\-client\-timeout to resolve. -Default is "no". -.TP -.B serve\-expired\-ttl: \fI<seconds> +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B serve\-expired: \fI<yes or no>\fP +If enabled, Unbound attempts to serve old responses from cache with a TTL +of \fI\%serve\-expired\-reply\-ttl\fP in +the response. +By default the expired answer will be used after a resolution attempt +errored out or is taking more than +\fI\%serve\-expired\-client\-timeout\fP +to resolve. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B serve\-expired\-ttl: \fI<seconds>\fP Limit serving of expired responses to configured seconds after expiration. -0 disables the limit. -This option only applies when \fBserve\-expired\fR is enabled. +\fB0\fP disables the limit. +This option only applies when +\fI\%serve\-expired\fP is enabled. A suggested value per RFC 8767 is between 86400 (1 day) and 259200 (3 days). The default is 86400. -.TP -.B serve\-expired\-ttl\-reset: \fI<yes or no> -Set the TTL of expired records to the \fBserve\-expired\-ttl\fR value after a -failed attempt to retrieve the record from upstream. This makes sure that the -expired records will be served as long as there are queries for it. Default is -"no". -.TP -.B serve\-expired\-reply\-ttl: \fI<seconds> -TTL value to use when replying with expired data. If -\fBserve\-expired\-client\-timeout\fR is also used then it is RECOMMENDED to -use 30 as the value (RFC 8767). The default is 30. -.TP -.B serve\-expired\-client\-timeout: \fI<msec> +.sp +Default: 86400 +.UNINDENT +.INDENT 0.0 +.TP +.B serve\-expired\-ttl\-reset: \fI<yes or no>\fP +Set the TTL of expired records to the +\fI\%serve\-expired\-ttl\fP value after a +failed attempt to retrieve the record from upstream. +This makes sure that the expired records will be served as long as there +are queries for it. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B serve\-expired\-reply\-ttl: \fI<seconds>\fP +TTL value to use when replying with expired data. +If +\fI\%serve\-expired\-client\-timeout\fP +is also used then it is RECOMMENDED to use 30 as the value (\fI\%RFC 8767\fP). +.sp +Default: 30 +.UNINDENT +.INDENT 0.0 +.TP +.B serve\-expired\-client\-timeout: \fI<msec>\fP Time in milliseconds before replying to the client with expired data. -This essentially enables the serve-stale behavior as specified in -RFC 8767 that first tries to resolve before immediately -responding with expired data. -Setting this to 0 will disable this behavior and instead serve the expired -record immediately from the cache before attempting to refresh it via -resolution. -Default is 1800. -.TP -.B serve\-original\-ttl: \fI<yes or no> +This essentially enables the serve\-stale behavior as specified in +\fI\%RFC 8767\fP that first tries to resolve before immediately responding with +expired data. +Setting this to \fB0\fP will disable this behavior and instead serve the +expired record immediately from the cache before attempting to refresh it +via resolution. +.sp +Default: 1800 +.UNINDENT +.INDENT 0.0 +.TP +.B serve\-original\-ttl: \fI<yes or no>\fP If enabled, Unbound will always return the original TTL as received from -the upstream name server rather than the decrementing TTL as -stored in the cache. This feature may be useful if Unbound serves as a -front-end to a hidden authoritative name server. Enabling this feature does -not impact cache expiry, it only changes the TTL Unbound embeds in responses to -queries. Note that enabling this feature implicitly disables enforcement of -the configured minimum and maximum TTL, as it is assumed users who enable this -feature do not want Unbound to change the TTL obtained from an upstream server. -Thus, the values set using \fBcache\-min\-ttl\fR and \fBcache\-max\-ttl\fR are -ignored. -Default is "no". -.TP -.B val\-nsec3\-keysize\-iterations: \fI<"list of values"> +the upstream name server rather than the decrementing TTL as stored in the +cache. +This feature may be useful if Unbound serves as a front\-end to a hidden +authoritative name server. +.sp +Enabling this feature does not impact cache expiry, it only changes the TTL +Unbound embeds in responses to queries. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +Enabling this feature implicitly disables enforcement of the configured +minimum and maximum TTL, as it is assumed users who enable this feature +do not want Unbound to change the TTL obtained from an upstream server. +.UNINDENT +.UNINDENT +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The values set using \fI\%cache\-min\-ttl\fP +and \fI\%cache\-max\-ttl\fP are ignored. +.UNINDENT +.UNINDENT +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B val\-nsec3\-keysize\-iterations: <\(dqlist of values\(dq> List of keysize and iteration count values, separated by spaces, surrounded -by quotes. Default is "1024 150 2048 150 4096 150". This determines the -maximum allowed NSEC3 iteration count before a message is simply marked -insecure instead of performing the many hashing iterations. The list must -be in ascending order and have at least one entry. If you set it to -"1024 65535" there is no restriction to NSEC3 iteration values. -This table must be kept short; a very long list could cause slower operation. -.TP -.B zonemd\-permissive\-mode: \fI<yes or no> -If enabled the ZONEMD verification failures are only logged and do not cause -the zone to be blocked and only return servfail. Useful for testing out -if it works, or if the operator only wants to be notified of a problem without -disrupting service. Default is no. -.TP -.B add\-holddown: \fI<seconds> -Instruct the \fBauto\-trust\-anchor\-file\fR probe mechanism for RFC5011 -autotrust updates to add new trust anchors only after they have been -visible for this time. Default is 30 days as per the RFC. -.TP -.B del\-holddown: \fI<seconds> -Instruct the \fBauto\-trust\-anchor\-file\fR probe mechanism for RFC5011 -autotrust updates to remove revoked trust anchors after they have been -kept in the revoked list for this long. Default is 30 days as per -the RFC. -.TP -.B keep\-missing: \fI<seconds> -Instruct the \fBauto\-trust\-anchor\-file\fR probe mechanism for RFC5011 -autotrust updates to remove missing trust anchors after they have been -unseen for this long. This cleans up the state file if the target zone -does not perform trust anchor revocation, so this makes the auto probe -mechanism work with zones that perform regular (non\-5011) rollovers. -The default is 366 days. The value 0 does not remove missing anchors, -as per the RFC. -.TP -.B permit\-small\-holddown: \fI<yes or no> -Debug option that allows the autotrust 5011 rollover timers to assume -very small values. Default is no. -.TP -.B key\-cache\-size: \fI<number> -Number of bytes size of the key cache. Default is 4 megabytes. -A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes +by quotes. +This determines the maximum allowed NSEC3 iteration count before a message +is simply marked insecure instead of performing the many hashing +iterations. +The list must be in ascending order and have at least one entry. +If you set it to \(dq1024 65535\(dq there is no restriction to NSEC3 iteration +values. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +This table must be kept short; a very long list could cause slower +operation. +.UNINDENT +.UNINDENT +.sp +Default: \(dq1024 150 2048 150 4096 150\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B zonemd\-permissive\-mode: \fI<yes or no>\fP +If enabled the ZONEMD verification failures are only logged and do not +cause the zone to be blocked and only return servfail. +Useful for testing out if it works, or if the operator only wants to be +notified of a problem without disrupting service. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B add\-holddown: \fI<seconds>\fP +Instruct the +\fI\%auto\-trust\-anchor\-file\fP probe +mechanism for \fI\%RFC 5011\fP autotrust updates to add new trust anchors only +after they have been visible for this time. +.sp +Default: 2592000 (30 days as per the RFC) +.UNINDENT +.INDENT 0.0 +.TP +.B del\-holddown: \fI<seconds>\fP +Instruct the +\fI\%auto\-trust\-anchor\-file\fP probe +mechanism for \fI\%RFC 5011\fP autotrust updates to remove revoked trust anchors +after they have been kept in the revoked list for this long. +.sp +Default: 2592000 (30 days as per the RFC) +.UNINDENT +.INDENT 0.0 +.TP +.B keep\-missing: \fI<seconds>\fP +Instruct the +\fI\%auto\-trust\-anchor\-file\fP probe +mechanism for \fI\%RFC 5011\fP autotrust updates to remove missing trust anchors +after they have been unseen for this long. +This cleans up the state file if the target zone does not perform trust +anchor revocation, so this makes the auto probe mechanism work with zones +that perform regular (non\-5011) rollovers. +The value 0 does not remove missing anchors, as per the RFC. +.sp +Default: 31622400 (366 days) +.UNINDENT +.INDENT 0.0 +.TP +.B permit\-small\-holddown: \fI<yes or no>\fP +Debug option that allows the autotrust 5011 rollover timers to assume very +small values. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B key\-cache\-size: \fI<number>\fP +Number of bytes size of the key cache. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes or gigabytes (1024*1024 bytes in a megabyte). -.TP -.B key\-cache\-slabs: \fI<number> -Number of slabs in the key cache. Slabs reduce lock contention by threads. -Must be set to a power of 2. Setting (close) to the number of cpus is a -reasonable guess. -.TP -.B neg\-cache\-size: \fI<number> -Number of bytes size of the aggressive negative cache. Default is 1 megabyte. -A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B key\-cache\-slabs: \fI<number>\fP +Number of slabs in the key cache. +Slabs reduce lock contention by threads. +Must be set to a power of 2. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.INDENT 0.0 +.TP +.B neg\-cache\-size: \fI<number>\fP +Number of bytes size of the aggressive negative cache. +A plain number is in bytes, append \(aqk\(aq, \(aqm\(aq or \(aqg\(aq for kilobytes, megabytes or gigabytes (1024*1024 bytes in a megabyte). -.TP -.B unblock\-lan\-zones: \fI<yes or no> -Default is disabled. If enabled, then for private address space, -the reverse lookups are no longer filtered. This allows Unbound when -running as dns service on a host where it provides service for that host, -to put out all of the queries for the 'lan' upstream. When enabled, -only localhost, 127.0.0.1 reverse and ::1 reverse zones are configured -with default local zones. Disable the option when Unbound is running -as a (DHCP-) DNS network resolver for a group of machines, where such -lookups should be filtered (RFC compliance), this also stops potential -data leakage about the local network to the upstream DNS servers. -.TP -.B insecure\-lan\-zones: \fI<yes or no> -Default is disabled. If enabled, then reverse lookups in private -address space are not validated. This is usually required whenever -\fIunblock\-lan\-zones\fR is used. -.TP -.B local\-zone: \fI<zone> <type> -Configure a local zone. The type determines the answer to give if -there is no match from local\-data. The types are deny, refuse, static, -transparent, redirect, nodefault, typetransparent, inform, inform_deny, -inform_redirect, always_transparent, block_a, always_refuse, always_nxdomain, -always_null, noview, and are explained below. After that the default settings -are listed. Use local\-data: to enter data into the local zone. Answers for -local zones are authoritative DNS answers. By default the zones are class IN. -.IP -If you need more complicated authoritative data, with referrals, wildcards, -CNAME/DNAME support, or DNSSEC authoritative service, setup a stub\-zone for -it as detailed in the stub zone section below. A stub\-zone can be used to -have unbound send queries to another server, an authoritative server, to -fetch the information. With a forward\-zone, unbound sends queries to a server -that is a recursive server to fetch the information. With an auth\-zone a -zone can be loaded from file and used, it can be used like a local\-zone -for users downstream, or the auth\-zone information can be used to fetch -information from when resolving like it is an upstream server. The -forward\-zone and auth\-zone options are described in their sections below. -If you want to perform filtering of the information that the users can fetch, -the local\-zone and local\-data statements allow for this, but also the -rpz functionality can be used, described in the RPZ section. -.TP 10 -\h'5'\fIdeny\fR +.sp +Default: 1m +.UNINDENT +.INDENT 0.0 +.TP +.B unblock\-lan\-zones: \fI<yes or no>\fP +If enabled, then for private address space, the reverse lookups are no +longer filtered. +This allows Unbound when running as dns service on a host where it provides +service for that host, to put out all of the queries for the \(aqlan\(aq +upstream. +When enabled, only localhost, \fB127.0.0.1\fP reverse and \fB::1\fP reverse +zones are configured with default local zones. +Disable the option when Unbound is running as a (DHCP\-) DNS network +resolver for a group of machines, where such lookups should be filtered +(RFC compliance), this also stops potential data leakage about the local +network to the upstream DNS servers. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B insecure\-lan\-zones: \fI<yes or no>\fP +If enabled, then reverse lookups in private address space are not +validated. +This is usually required whenever +\fI\%unblock\-lan\-zones\fP is used. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B local\-zone: \fI<zone> <type>\fP +Configure a local zone. +The type determines the answer to give if there is no match from +\fI\%local\-data\fP\&. +The types are +\fI\%deny\fP, +\fI\%refuse\fP, +\fI\%static\fP, +\fI\%transparent\fP, +\fI\%redirect\fP, +\fI\%nodefault\fP, +\fI\%typetransparent\fP, +\fI\%inform\fP, +\fI\%inform_deny\fP, +\fI\%inform_redirect\fP, +\fI\%always_transparent\fP, +\fI\%block_a\fP, +\fI\%always_refuse\fP, +\fI\%always_nxdomain\fP, +\fI\%always_null\fP, +\fI\%noview\fP, +and are explained below. +After that the default settings are listed. +Use \fI\%local\-data\fP to enter data into the +local zone. +Answers for local zones are authoritative DNS answers. +By default the zones are class IN. +.sp +If you need more complicated authoritative data, with referrals, +wildcards, CNAME/DNAME support, or DNSSEC authoritative service, +setup a \fI\%stub\-zone\fP for it as detailed in the +stub zone section below. +A \fI\%stub\-zone\fP can be used to have unbound +send queries to another server, an authoritative server, to fetch the +information. +With a \fI\%forward\-zone\fP, unbound sends +queries to a server that is a recursive server to fetch the information. +With an \fI\%auth\-zone\fP a zone can be loaded from +file and used, it can be used like a local zone for users downstream, or +the \fI\%auth\-zone\fP information can be used to fetch +information from when resolving like it is an upstream server. +The \fI\%forward\-zone\fP and +\fI\%auth\-zone\fP options are described in their +sections below. +If you want to perform filtering of the information that the users can +fetch, the \fI\%local\-zone\fP and +\fI\%local\-data\fP statements allow for this, but +also the \fI\%rpz\fP functionality can be used, described +in the RPZ section. +.INDENT 7.0 +.TP +.B deny Do not send an answer, drop the query. If there is a match from local data, the query is answered. -.TP 10 -\h'5'\fIrefuse\fR +.UNINDENT +.INDENT 7.0 +.TP +.B refuse Send an error message reply, with rcode REFUSED. If there is a match from local data, the query is answered. -.TP 10 -\h'5'\fIstatic\fR -If there is a match from local data, the query is answered. -Otherwise, the query is answered with nodata or nxdomain. -For a negative answer a SOA is included in the answer if present -as local\-data for the zone apex domain. -.TP 10 -\h'5'\fItransparent\fR +.UNINDENT +.INDENT 7.0 +.TP +.B static If there is a match from local data, the query is answered. -Otherwise if the query has a different name, the query is resolved normally. -If the query is for a name given in localdata but no such type of data is -given in localdata, then a noerror nodata answer is returned. -If no local\-zone is given local\-data causes a transparent zone +Otherwise, the query is answered with NODATA or NXDOMAIN. +For a negative answer a SOA is included in the answer if present as +\fI\%local\-data\fP for the zone apex domain. +.UNINDENT +.INDENT 7.0 +.TP +.B transparent +If there is a match from \fI\%local\-data\fP, +the query is answered. +Otherwise if the query has a different name, the query is resolved +normally. +If the query is for a name given in +\fI\%local\-data\fP but no such type of data is +given in localdata, then a NOERROR NODATA answer is returned. +If no \fI\%local\-zone\fP is given +\fI\%local\-data\fP causes a transparent zone to be created by default. -.TP 10 -\h'5'\fItypetransparent\fR -If there is a match from local data, the query is answered. If the query -is for a different name, or for the same name but for a different type, -the query is resolved normally. So, similar to transparent but types -that are not listed in local data are resolved normally, so if an A record -is in the local data that does not cause a nodata reply for AAAA queries. -.TP 10 -\h'5'\fIredirect\fR +.UNINDENT +.INDENT 7.0 +.TP +.B typetransparent +If there is a match from local data, the query is answered. +If the query is for a different name, or for the same name but for a +different type, the query is resolved normally. +So, similar to +\fI\%transparent\fP but types +that are not listed in local data are resolved normally, so if an A +record is in the local data that does not cause a NODATA reply for AAAA +queries. +.UNINDENT +.INDENT 7.0 +.TP +.B redirect The query is answered from the local data for the zone name. There may be no local data beneath the zone name. -This answers queries for the zone, and all subdomains of the zone -with the local data for the zone. -It can be used to redirect a domain to return a different address record -to the end user, with -local\-zone: "example.com." redirect and -local\-data: "example.com. A 127.0.0.1" -queries for www.example.com and www.foo.example.com are redirected, so -that users with web browsers cannot access sites with suffix example.com. -.TP 10 -\h'5'\fIinform\fR -The query is answered normally, same as transparent. The client IP -address (@portnumber) is printed to the logfile. The log message is: -timestamp, unbound-pid, info: zonename inform IP@port queryname type -class. This option can be used for normal resolution, but machines -looking up infected names are logged, eg. to run antivirus on them. -.TP 10 -\h'5'\fIinform_deny\fR -The query is dropped, like 'deny', and logged, like 'inform'. Ie. find -infected machines without answering the queries. -.TP 10 -\h'5'\fIinform_redirect\fR -The query is redirected, like 'redirect', and logged, like 'inform'. +This answers queries for the zone, and all subdomains of the zone with +the local data for the zone. +It can be used to redirect a domain to return a different address +record to the end user, with: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +local\-zone: \(dqexample.com.\(dq redirect +local\-data: \(dqexample.com. A 127.0.0.1\(dq +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +queries for \fBwww.example.com\fP and \fBwww.foo.example.com\fP are +redirected, so that users with web browsers cannot access sites with +suffix example.com. +.UNINDENT +.INDENT 7.0 +.TP +.B inform +The query is answered normally, same as +\fI\%transparent\fP\&. +The client IP address (@portnumber) is printed to the logfile. +The log message is: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +timestamp, unbound\-pid, info: zonename inform IP@port queryname type class. +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +This option can be used for normal resolution, but machines looking up +infected names are logged, eg. to run antivirus on them. +.UNINDENT +.INDENT 7.0 +.TP +.B inform_deny +The query is dropped, like +\fI\%deny\fP, and logged, like +\fI\%inform\fP\&. +Ie. find infected machines without answering the queries. +.UNINDENT +.INDENT 7.0 +.TP +.B inform_redirect +The query is redirected, like +\fI\%redirect\fP, and logged, +like \fI\%inform\fP\&. Ie. answer queries with fixed data and also log the machines that ask. -.TP 10 -\h'5'\fIalways_transparent\fR -Like transparent, but ignores local data and resolves normally. -.TP 10 -\h'5'\fIblock_a\fR -Like transparent, but ignores local data and resolves normally all query -types excluding A. For A queries it unconditionally returns NODATA. -Useful in cases when there is a need to explicitly force all apps to use -IPv6 protocol and avoid any queries to IPv4. -.TP 10 -\h'5'\fIalways_refuse\fR -Like refuse, but ignores local data and refuses the query. -.TP 10 -\h'5'\fIalways_nxdomain\fR -Like static, but ignores local data and returns nxdomain for the query. -.TP 10 -\h'5'\fIalways_nodata\fR -Like static, but ignores local data and returns nodata for the query. -.TP 10 -\h'5'\fIalways_deny\fR -Like deny, but ignores local data and drops the query. -.TP 10 -\h'5'\fIalways_null\fR -Always returns 0.0.0.0 or ::0 for every name in the zone. Like redirect -with zero data for A and AAAA. Ignores local data in the zone. Used for -some block lists. -.TP 10 -\h'5'\fInoview\fR -Breaks out of that view and moves towards the global local zones for answer -to the query. If the view first is no, it'll resolve normally. If view first -is enabled, it'll break perform that step and check the global answers. +.UNINDENT +.INDENT 7.0 +.TP +.B always_transparent +Like \fI\%transparent\fP, but +ignores local data and resolves normally. +.UNINDENT +.INDENT 7.0 +.TP +.B block_a +Like \fI\%transparent\fP, but +ignores local data and resolves normally all query types excluding A. +For A queries it unconditionally returns NODATA. +Useful in cases when there is a need to explicitly force all apps to +use IPv6 protocol and avoid any queries to IPv4. +.UNINDENT +.INDENT 7.0 +.TP +.B always_refuse +Like \fI\%refuse\fP, but ignores +local data and refuses the query. +.UNINDENT +.INDENT 7.0 +.TP +.B always_nxdomain +Like \fI\%static\fP, but ignores +local data and returns NXDOMAIN for the query. +.UNINDENT +.INDENT 7.0 +.TP +.B always_nodata +Like \fI\%static\fP, but ignores +local data and returns NODATA for the query. +.UNINDENT +.INDENT 7.0 +.TP +.B always_deny +Like \fI\%deny\fP, but ignores local +data and drops the query. +.UNINDENT +.INDENT 7.0 +.TP +.B always_null +Always returns \fB0.0.0.0\fP or \fB::0\fP for every name in the zone. +Like \fI\%redirect\fP with zero +data for A and AAAA. +Ignores local data in the zone. +Used for some block lists. +.UNINDENT +.INDENT 7.0 +.TP +.B noview +Breaks out of that view and moves towards the global local zones for +answer to the query. +If the \fI\%view\-first\fP is no, it\(aqll +resolve normally. +If \fI\%view\-first\fP is enabled, it\(aqll +break perform that step and check the global answers. For when the view has view specific overrides but some zone has to be answered from global local zone contents. -.TP 10 -\h'5'\fInodefault\fR -Used to turn off default contents for AS112 zones. The other types -also turn off default contents for the zone. The 'nodefault' option -has no other effect than turning off default contents for the -given zone. Use \fInodefault\fR if you use exactly that zone, if you want to -use a subzone, use \fItransparent\fR. -.P -The default zones are localhost, reverse 127.0.0.1 and ::1, the home.arpa, -the resolver.arpa, the service.arpa, -the onion, test, invalid and the AS112 zones. The AS112 zones are reverse -DNS zones for private use and reserved IP addresses for which the servers -on the internet cannot provide correct answers. They are configured by -default to give nxdomain (no reverse information) answers. The defaults -can be turned off by specifying your own local\-zone of that name, or -using the 'nodefault' type. Below is a list of the default zone contents. -.TP 10 -\h'5'\fIlocalhost\fR -The IP4 and IP6 localhost information is given. NS and SOA records are provided -for completeness and to satisfy some DNS update tools. Default content: +.UNINDENT +.INDENT 7.0 +.TP +.B nodefault +Used to turn off default contents for AS112 zones. +The other types also turn off default contents for the zone. +The \fI\%nodefault\fP option has +no other effect than turning off default contents for the given zone. +Use \fI\%nodefault\fP if you use +exactly that zone, if you want to use a subzone, use +\fI\%transparent\fP\&. +.UNINDENT +.sp +The default zones are localhost, reverse \fB127.0.0.1\fP and \fB::1\fP, the +\fBhome.arpa\fP, \fBresolver.arpa\fP, \fBservice.arpa\fP, \fBonion\fP, \fBtest\fP, +\fBinvalid\fP and the AS112 zones. +The AS112 zones are reverse DNS zones for private use and reserved IP +addresses for which the servers on the internet cannot provide correct +answers. +They are configured by default to give NXDOMAIN (no reverse information) +answers. +.sp +The defaults can be turned off by specifying your own +\fI\%local\-zone\fP of that name, or using the +\fI\%nodefault\fP type. +Below is a list of the default zone contents. +.INDENT 7.0 +.TP +.B localhost +The IPv4 and IPv6 localhost information is given. +NS and SOA records are provided for completeness and to satisfy some +DNS update tools. +Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "localhost." redirect -local\-data: "localhost. 10800 IN NS localhost." -local\-data: "localhost. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" -local\-data: "localhost. 10800 IN A 127.0.0.1" -local\-data: "localhost. 10800 IN AAAA ::1" +.ft C +local\-zone: \(dqlocalhost.\(dq redirect +local\-data: \(dqlocalhost. 10800 IN NS localhost.\(dq +local\-data: \(dqlocalhost. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +local\-data: \(dqlocalhost. 10800 IN A 127.0.0.1\(dq +local\-data: \(dqlocalhost. 10800 IN AAAA ::1\(dq +.ft P .fi -.TP 10 -\h'5'\fIreverse IPv4 loopback\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +.B reverse IPv4 loopback Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "127.in\-addr.arpa." static -local\-data: "127.in\-addr.arpa. 10800 IN NS localhost." -local\-data: "127.in\-addr.arpa. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" -local\-data: "1.0.0.127.in\-addr.arpa. 10800 IN - PTR localhost." +.ft C +local\-zone: \(dq127.in\-addr.arpa.\(dq static +local\-data: \(dq127.in\-addr.arpa. 10800 IN NS localhost.\(dq +local\-data: \(dq127.in\-addr.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +local\-data: \(dq1.0.0.127.in\-addr.arpa. 10800 IN PTR localhost.\(dq +.ft P .fi -.TP 10 -\h'5'\fIreverse IPv6 loopback\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +.B reverse IPv6 loopback Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0. - 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa." static -local\-data: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0. - 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN - NS localhost." -local\-data: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0. - 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" -local\-data: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0. - 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN - PTR localhost." +.ft C +local\-zone: \(dq1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.\(dq static +local\-data: \(dq1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN NS localhost.\(dq +local\-data: \(dq1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +local\-data: \(dq1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN PTR localhost.\(dq +.ft P .fi -.TP 10 -\h'5'\fIhome.arpa (RFC 8375)\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +home.arpa (\fI\%RFC 8375\fP) Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "home.arpa." static -local\-data: "home.arpa. 10800 IN NS localhost." -local\-data: "home.arpa. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" +.ft C +local\-zone: \(dqhome.arpa.\(dq static +local\-data: \(dqhome.arpa. 10800 IN NS localhost.\(dq +local\-data: \(dqhome.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +.ft P .fi -.TP 10 -\h'5'\fIresolver.arpa (RFC 9462)\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +resolver.arpa (\fI\%RFC 9462\fP) Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "resolver.arpa." static -local\-data: "resolver.arpa. 10800 IN NS localhost." -local\-data: "resolver.arpa. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" +.ft C +local\-zone: \(dqresolver.arpa.\(dq static +local\-data: \(dqresolver.arpa. 10800 IN NS localhost.\(dq +local\-data: \(dqresolver.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +.ft P .fi -.TP 10 -\h'5'\fIservice.arpa (draft-ietf-dnssd-srp-25)\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +.B service.arpa (draft\-ietf\-dnssd\-srp\-25) Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "service.arpa." static -local\-data: "service.arpa. 10800 IN NS localhost." -local\-data: "service.arpa. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" +.ft C +local\-zone: \(dqservice.arpa.\(dq static +local\-data: \(dqservice.arpa. 10800 IN NS localhost.\(dq +local\-data: \(dqservice.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +.ft P .fi -.TP 10 -\h'5'\fIonion (RFC 7686)\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +onion (\fI\%RFC 7686\fP) Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "onion." static -local\-data: "onion. 10800 IN NS localhost." -local\-data: "onion. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" +.ft C +local\-zone: \(dqonion.\(dq static +local\-data: \(dqonion. 10800 IN NS localhost.\(dq +local\-data: \(dqonion. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +.ft P .fi -.TP 10 -\h'5'\fItest (RFC 6761)\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +test (\fI\%RFC 6761\fP) Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "test." static -local\-data: "test. 10800 IN NS localhost." -local\-data: "test. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" +.ft C +local\-zone: \(dqtest.\(dq static +local\-data: \(dqtest. 10800 IN NS localhost.\(dq +local\-data: \(dqtest. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +.ft P .fi -.TP 10 -\h'5'\fIinvalid (RFC 6761)\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +invalid (\fI\%RFC 6761\fP) Default content: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -local\-zone: "invalid." static -local\-data: "invalid. 10800 IN NS localhost." -local\-data: "invalid. 10800 IN - SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" +.ft C +local\-zone: \(dqinvalid.\(dq static +local\-data: \(dqinvalid. 10800 IN NS localhost.\(dq +local\-data: \(dqinvalid. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800\(dq +.ft P .fi -.TP 10 -\h'5'\fIreverse RFC1918 local use zones\fR -Reverse data for zones 10.in\-addr.arpa, 16.172.in\-addr.arpa to -31.172.in\-addr.arpa, 168.192.in\-addr.arpa. -The \fBlocal\-zone:\fR is set static and as \fBlocal\-data:\fR SOA and NS -records are provided. -.TP 10 -\h'5'\fIreverse RFC3330 IP4 this, link\-local, testnet and broadcast\fR -Reverse data for zones 0.in\-addr.arpa, 254.169.in\-addr.arpa, -2.0.192.in\-addr.arpa (TEST NET 1), 100.51.198.in\-addr.arpa (TEST NET 2), -113.0.203.in\-addr.arpa (TEST NET 3), 255.255.255.255.in\-addr.arpa. -And from 64.100.in\-addr.arpa to 127.100.in\-addr.arpa (Shared Address Space). -.TP 10 -\h'5'\fIreverse RFC4291 IP6 unspecified\fR +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 7.0 +.TP +reverse local use zones (\fI\%RFC 1918\fP) +Reverse data for zones \fB10.in\-addr.arpa\fP, \fB16.172.in\-addr.arpa\fP to +\fB31.172.in\-addr.arpa\fP, \fB168.192.in\-addr.arpa\fP\&. +The \fI\%local\-zone\fP is set static and as +\fI\%local\-data\fP SOA and NS records are +provided. +.UNINDENT +.INDENT 7.0 +.TP +special\-use IPv4 Addresses (\fI\%RFC 3330\fP) +Reverse data for zones \fB0.in\-addr.arpa\fP (this), \fB254.169.in\-addr.arpa\fP (link\-local), +\fB2.0.192.in\-addr.arpa\fP (TEST NET 1), \fB100.51.198.in\-addr.arpa\fP +(TEST NET 2), \fB113.0.203.in\-addr.arpa\fP (TEST NET 3), +\fB255.255.255.255.in\-addr.arpa\fP (broadcast). +And from \fB64.100.in\-addr.arpa\fP to \fB127.100.in\-addr.arpa\fP (Shared +Address Space). +.UNINDENT +.INDENT 7.0 +.TP +reverse IPv6 unspecified (\fI\%RFC 4291\fP) Reverse data for zone +\fB0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.\fP +.UNINDENT +.INDENT 7.0 +.TP +reverse IPv6 Locally Assigned Local Addresses (\fI\%RFC 4193\fP) +Reverse data for zone \fBD.F.ip6.arpa\fP\&. +.UNINDENT +.INDENT 7.0 +.TP +reverse IPv6 Link Local Addresses (\fI\%RFC 4291\fP) +Reverse data for zones \fB8.E.F.ip6.arpa\fP to \fBB.E.F.ip6.arpa\fP\&. +.UNINDENT +.INDENT 7.0 +.TP +.B reverse IPv6 Example Prefix +Reverse data for zone \fB8.B.D.0.1.0.0.2.ip6.arpa\fP\&. +This zone is used for tutorials and examples. +You can remove the block on this zone with: +.INDENT 7.0 +.INDENT 3.5 +.sp .nf -0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0. -0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. -.fi -.TP 10 -\h'5'\fIreverse RFC4193 IPv6 Locally Assigned Local Addresses\fR -Reverse data for zone D.F.ip6.arpa. -.TP 10 -\h'5'\fIreverse RFC4291 IPv6 Link Local Addresses\fR -Reverse data for zones 8.E.F.ip6.arpa to B.E.F.ip6.arpa. -.TP 10 -\h'5'\fIreverse IPv6 Example Prefix\fR -Reverse data for zone 8.B.D.0.1.0.0.2.ip6.arpa. This zone is used for -tutorials and examples. You can remove the block on this zone with: -.nf - local\-zone: 8.B.D.0.1.0.0.2.ip6.arpa. nodefault +.ft C +local\-zone: 8.B.D.0.1.0.0.2.ip6.arpa. nodefault +.ft P .fi +.UNINDENT +.UNINDENT +.UNINDENT +.sp You can also selectively unblock a part of the zone by making that part -transparent with a local\-zone statement. +transparent with a \fI\%local\-zone\fP statement. This also works with the other default zones. -.\" End of local-zone listing. -.TP 5 -.B local\-data: \fI"<resource record string>" +.UNINDENT +.INDENT 0.0 +.TP +.B local\-data: \fI\(dq<resource record string>\(dq\fP Configure local data, which is served in reply to queries for it. -The query has to match exactly unless you configure the local\-zone as -redirect. If not matched exactly, the local\-zone type determines -further processing. If local\-data is configured that is not a subdomain of -a local\-zone, a transparent local\-zone is configured. -For record types such as TXT, use single quotes, as in -local\-data: 'example. TXT "text"'. -.IP -If you need more complicated authoritative data, with referrals, wildcards, -CNAME/DNAME support, or DNSSEC authoritative service, setup a stub\-zone for -it as detailed in the stub zone section below. -.TP 5 -.B local\-data\-ptr: \fI"IPaddr name" +The query has to match exactly unless you configure the +\fI\%local\-zone\fP as redirect. +If not matched exactly, the \fI\%local\-zone\fP +type determines further processing. +If \fI\%local\-data\fP is configured that is not a +subdomain of a \fI\%local\-zone\fP, a +\fI\%transparent local\-zone\fP is +configured. +For record types such as TXT, use single quotes, as in: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +local\-data: \(aqexample. TXT \(dqtext\(dq\(aq +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +If you need more complicated authoritative data, with referrals, +wildcards, CNAME/DNAME support, or DNSSEC authoritative service, setup +a \fI\%stub\-zone\fP for it as detailed in the stub +zone section below. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B local\-data\-ptr: \fI\(dqIPaddr name\(dq\fP Configure local data shorthand for a PTR record with the reversed IPv4 or -IPv6 address and the host name. For example "192.0.2.4 www.example.com". -TTL can be inserted like this: "2001:DB8::4 7200 www.example.com" -.TP 5 -.B local\-zone\-tag: \fI<zone> <"list of tags"> -Assign tags to localzones. Tagged localzones will only be applied when the -used access-control element has a matching tag. Tags must be defined in -\fIdefine\-tags\fR. Enclose list of tags in quotes ("") and put spaces between -tags. When there are multiple tags it checks if the intersection of the -list of tags for the query and local\-zone\-tag is non-empty. -.TP 5 -.B local\-zone\-override: \fI<zone> <IP netblock> <type> -Override the localzone type for queries from addresses matching netblock. -Use this localzone type, regardless the type configured for the local-zone +IPv6 address and the host name. +For example \fB\(dq192.0.2.4 www.example.com\(dq\fP\&. +TTL can be inserted like this: \fB\(dq2001:DB8::4 7200 www.example.com\(dq\fP +.UNINDENT +.INDENT 0.0 +.TP +.B local\-zone\-tag: \fI<zone> <\(dqlist of tags\(dq>\fP +Assign tags to local zones. +Tagged localzones will only be applied when the used +\fI\%access\-control\fP element has a matching +tag. +Tags must be defined in \fI\%define\-tag\fP\&. +Enclose list of tags in quotes (\fB\(dq\(dq\fP) and put spaces between tags. +When there are multiple tags it checks if the intersection of the list of +tags for the query and \fI\%local\-zone\-tag\fP +is non\-empty. +.UNINDENT +.INDENT 0.0 +.TP +.B local\-zone\-override: \fI<zone> <IP netblock> <type>\fP +Override the local zone type for queries from addresses matching netblock. +Use this localzone type, regardless the type configured for the local zone (both tagged and untagged) and regardless the type configured using -access\-control\-tag\-action. -.TP 5 -.B response\-ip: \fI<IP-netblock> <action> -This requires use of the "respip" module. -.IP -If the IP address in an AAAA or A RR in the answer section of a -response matches the specified IP netblock, the specified action will -apply. -\fI<action>\fR has generally the same semantics as that for -\fIaccess-control-tag-action\fR, but there are some exceptions. -.IP -Actions for \fIresponse-ip\fR are different from those for -\fIlocal-zone\fR in that in case of the former there is no point of -such conditions as "the query matches it but there is no local data". -Because of this difference, the semantics of \fIresponse-ip\fR actions -are modified or simplified as follows: The \fIstatic, refuse, -transparent, typetransparent,\fR and \fInodefault\fR actions are -invalid for \fIresponse-ip\fR. -Using any of these will cause the configuration to be rejected as -faulty. The \fIdeny\fR action is non-conditional, i.e. it always -results in dropping the corresponding query. -The resolution result before applying the deny action is still cached -and can be used for other queries. -.TP 5 -.B response-ip-data: \fI<IP-netblock> <"resource record string"> -This requires use of the "respip" module. -.IP -This specifies the action data for \fIresponse-ip\fR with action being -to redirect as specified by "\fIresource record string\fR". "Resource -record string" is similar to that of \fIaccess-control-tag-action\fR, +\fI\%access\-control\-tag\-action\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B response\-ip: \fI<IP\-netblock> <action>\fP +This requires use of the \fBrespip\fP module. +.sp +If the IP address in an AAAA or A RR in the answer section of a response +matches the specified IP netblock, the specified action will apply. +\fI<action>\fP has generally the same semantics as that for +\fI\%access\-control\-tag\-action\fP, +but there are some exceptions. +.sp +Actions for \fI\%response\-ip\fP are different +from those for \fI\%local\-zone\fP in that in case +of the former there is no point of such conditions as \(dqthe query matches it +but there is no local data\(dq. +Because of this difference, the semantics of +\fI\%response\-ip\fP actions are modified or +simplified as follows: The \fIstatic\fP, \fIrefuse\fP, \fItransparent\fP, +\fItypetransparent\fP, and \fInodefault\fP actions are invalid for \fIresponse\-ip\fP\&. +Using any of these will cause the configuration to be rejected as faulty. +The \fIdeny\fP action is non\-conditional, i.e. it always results in dropping +the corresponding query. +The resolution result before applying the \fIdeny\fP action is still cached and +can be used for other queries. +.UNINDENT +.INDENT 0.0 +.TP +.B response\-ip\-data: \fI<IP\-netblock> <\(dqresource record string\(dq>\fP +This requires use of the \fBrespip\fP module. +.sp +This specifies the action data for +\fI\%response\-ip\fP with action being to redirect +as specified by \fI<\(dqresource record string\(dq>\fP\&. +\fI<\(dqResource record string\(dq>\fP is similar to that of +\fI\%access\-control\-tag\-action\fP, but it must be of either AAAA, A or CNAME types. -If the IP-netblock is an IPv6/IPv4 prefix, the record -must be AAAA/A respectively, unless it is a CNAME (which can be used -for both versions of IP netblocks). If it is CNAME there must not be -more than one \fIresponse-ip-data\fR for the same IP-netblock. +If the \fI<IP\-netblock>\fP is an IPv6/IPv4 prefix, the record must be AAAA/A +respectively, unless it is a CNAME (which can be used for both versions of +IP netblocks). +If it is CNAME there must not be more than one +\fI\%response\-ip\-data\fP for the same +\fI<IP\-netblock>\fP\&. Also, CNAME and other types of records must not coexist for the same -IP-netblock, following the normal rules for CNAME records. +\fI<IP\-netblock>\fP, following the normal rules for CNAME records. The textual domain name for the CNAME does not have to be explicitly -terminated with a dot ("."); the root name is assumed to be the origin +terminated with a dot (\fB\(dq.\(dq\fP); the root name is assumed to be the origin for the name. -.TP 5 -.B response-ip-tag: \fI<IP-netblock> <"list of tags"> -This requires use of the "respip" module. -.IP -Assign tags to response IP-netblocks. If the IP address in an AAAA or -A RR in the answer section of a response matches the specified -IP-netblock, the specified tags are assigned to the IP address. -Then, if an \fIaccess-control-tag\fR is defined for the client and it -includes one of the tags for the response IP, the corresponding -\fIaccess-control-tag-action\fR will apply. -Tag matching rule is the same as that for \fIaccess-control-tag\fR and -\fIlocal-zones\fR. -Unlike \fIlocal-zone-tag\fR, \fIresponse-ip-tag\fR can be defined for -an IP-netblock even if no \fIresponse-ip\fR is defined for that -netblock. -If multiple \fIresponse-ip-tag\fR options are specified for the same -IP-netblock in different statements, all but the first will be -ignored. -However, this will not be flagged as a configuration error, but the -result is probably not what was intended. -.IP +.UNINDENT +.INDENT 0.0 +.TP +.B response\-ip\-tag: \fI<IP\-netblock> <\(dqlist of tags\(dq>\fP +This requires use of the \fBrespip\fP module. +.sp +Assign tags to response \fI<IP\-netblock>\fP\&. +If the IP address in an AAAA or A RR in the answer section of a response +matches the specified \fI<IP\-netblock>\fP, the specified tags are assigned to +the IP address. +Then, if an \fI\%access\-control\-tag\fP is +defined for the client and it includes one of the tags for the response IP, +the corresponding +\fI\%access\-control\-tag\-action\fP +will apply. +Tag matching rule is the same as that for +\fI\%access\-control\-tag\fP and +\fI\%local\-zone\fP\&. +Unlike \fI\%local\-zone\-tag\fP, +\fI\%response\-ip\-tag\fP can be defined for an +\fI<IP\-netblock>\fP even if no \fI\%response\-ip\fP is +defined for that netblock. +If multiple \fI\%response\-ip\-tag\fP options +are specified for the same \fI<IP\-netblock>\fP in different statements, all but +the first will be ignored. +However, this will not be flagged as a configuration error, but the result +is probably not what was intended. +.sp Actions specified in an -\fIaccess-control-tag-action\fR that has a matching tag with -\fIresponse-ip-tag\fR can be those that are "invalid" for -\fIresponse-ip\fR listed above, since \fIaccess-control-tag-action\fRs +\fI\%access\-control\-tag\-action\fP +that has a matching tag with +\fI\%response\-ip\-tag\fP can be those that are +\(dqinvalid\(dq for \fI\%response\-ip\fP listed above, +since +\fI\%access\-control\-tag\-action\fP can be shared with local zones. -For these actions, if they behave differently depending on whether -local data exists or not in case of local zones, the behavior for -\fIresponse-ip-data\fR will generally result in NOERROR/NODATA instead -of NXDOMAIN, since the \fIresponse-ip\fR data are inherently type -specific, and non-existence of data does not indicate anything about -the existence or non-existence of the qname itself. -For example, if the matching tag action is \fIstatic\fR but there is -no data for the corresponding \fIresponse-ip\fR configuration, then -the result will be NOERROR/NODATA. +For these actions, if they behave differently depending on whether local +data exists or not in case of local zones, the behavior for +\fI\%response\-ip\-data\fP will generally +result in NOERROR/NODATA instead of NXDOMAIN, since the +\fI\%response\-ip\fP data are inherently type +specific, and non\-existence of data does not indicate anything about the +existence or non\-existence of the qname itself. +For example, if the matching tag action is static but there is no data for +the corresponding \fI\%response\-ip\fP +configuration, then the result will be NOERROR/NODATA. The only case where NXDOMAIN is returned is when an -\fIalways_nxdomain\fR action applies. -.TP 5 -.B ratelimit: \fI<number or 0> +\fI\%always_nxdomain\fP +action applies. +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit: \fI<number or 0>\fP Enable ratelimiting of queries sent to nameserver for performing recursion. -If 0, the default, it is disabled. This option is experimental at this time. -The ratelimit is in queries per second that are allowed. More queries are -turned away with an error (servfail). This stops recursive floods, eg. random -query names, but not spoofed reflection floods. Cached responses are not -ratelimited by this setting. The zone of the query is determined by examining -the nameservers for it, the zone name is used to keep track of the rate. +0 disables the feature. +This option is experimental at this time. +.sp +The ratelimit is in queries per second that are allowed. +More queries are turned away with an error (SERVFAIL). +Cached responses are not ratelimited by this setting. +.sp +This stops recursive floods, eg. random query names, but not spoofed +reflection floods. +The zone of the query is determined by examining the nameservers for it, +the zone name is used to keep track of the rate. For example, 1000 may be a suitable value to stop the server from being -overloaded with random names, and keeps Unbound from sending traffic to the -nameservers for those zones. Configured forwarders are excluded from -ratelimiting. -.TP 5 -.B ratelimit\-size: \fI<memory size> +overloaded with random names, and keeps unbound from sending traffic to the +nameservers for those zones. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +Configured forwarders are excluded from ratelimiting. +.UNINDENT +.UNINDENT +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit\-size: \fI<memory size>\fP Give the size of the data structure in which the current ongoing rates are -kept track in. Default 4m. In bytes or use m(mega), k(kilo), g(giga). -The ratelimit structure is small, so this data structure likely does -not need to be large. -.TP 5 -.B ratelimit\-slabs: \fI<number> -Give power of 2 number of slabs, this is used to reduce lock contention -in the ratelimit tracking data structure. Close to the number of cpus is -a fairly good setting. -.TP 5 -.B ratelimit\-factor: \fI<number> +kept track in. +In bytes or use m(mega), k(kilo), g(giga). +The ratelimit structure is small, so this data structure likely does not +need to be large. +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit\-slabs: \fI<number>\fP +Number of slabs in the ratelimit tracking data structure. +Slabs reduce lock contention by threads. +Must be set to a power of 2. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit\-factor: \fI<number>\fP Set the amount of queries to rate limit when the limit is exceeded. If set to 0, all queries are dropped for domains where the limit is -exceeded. If set to another value, 1 in that number is allowed through -to complete. Default is 10, allowing 1/10 traffic to flow normally. -This can make ordinary queries complete (if repeatedly queried for), -and enter the cache, whilst also mitigating the traffic flow by the -factor given. -.TP 5 -.B ratelimit\-backoff: \fI<yes or no> -If enabled, the ratelimit is treated as a hard failure instead of the default -maximum allowed constant rate. When the limit is reached, traffic is -ratelimited and demand continues to be kept track of for a 2 second rate -window. No traffic is allowed, except for ratelimit\-factor, until demand -decreases below the configured ratelimit for a 2 second rate window. Useful to -set ratelimit to a suspicious rate to aggressively limit unusually high -traffic. Default is off. -.TP 5 -.B ratelimit\-for\-domain: \fI<domain> <number qps or 0> -Override the global ratelimit for an exact match domain name with the listed -number. You can give this for any number of names. For example, for -a top\-level\-domain you may want to have a higher limit than other names. +exceeded. +If set to another value, 1 in that number is allowed through to complete. +Default is 10, allowing 1/10 traffic to flow normally. +This can make ordinary queries complete (if repeatedly queried for), and +enter the cache, whilst also mitigating the traffic flow by the factor +given. +.sp +Default: 10 +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit\-backoff: \fI<yes or no>\fP +If enabled, the ratelimit is treated as a hard failure instead of the +default maximum allowed constant rate. +When the limit is reached, traffic is ratelimited and demand continues to +be kept track of for a 2 second rate window. +No traffic is allowed, except for +\fI\%ratelimit\-factor\fP, until demand +decreases below the configured ratelimit for a 2 second rate window. +Useful to set \fI\%ratelimit\fP to a suspicious +rate to aggressively limit unusually high traffic. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit\-for\-domain: \fI<domain> <number qps or 0>\fP +Override the global \fI\%ratelimit\fP for an exact +match domain name with the listed number. +You can give this for any number of names. +For example, for a top\-level\-domain you may want to have a higher limit +than other names. A value of 0 will disable ratelimiting for that domain. -.TP 5 -.B ratelimit\-below\-domain: \fI<domain> <number qps or 0> -Override the global ratelimit for a domain name that ends in this name. -You can give this multiple times, it then describes different settings -in different parts of the namespace. The closest matching suffix is used -to determine the qps limit. The rate for the exact matching domain name -is not changed, use ratelimit\-for\-domain to set that, you might want -to use different settings for a top\-level\-domain and subdomains. -A value of 0 will disable ratelimiting for domain names that end in this name. -.TP 5 -.B ip\-ratelimit: \fI<number or 0> -Enable global ratelimiting of queries accepted per IP address. +.UNINDENT +.INDENT 0.0 +.TP +.B ratelimit\-below\-domain: \fI<domain> <number qps or 0>\fP +Override the global \fI\%ratelimit\fP for a domain +name that ends in this name. +You can give this multiple times, it then describes different settings in +different parts of the namespace. +The closest matching suffix is used to determine the qps limit. +The rate for the exact matching domain name is not changed, use +\fI\%ratelimit\-for\-domain\fP to set +that, you might want to use different settings for a top\-level\-domain and +subdomains. +A value of 0 will disable ratelimiting for domain names that end in this +name. +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-ratelimit: \fI<number or 0>\fP +Enable global ratelimiting of queries accepted per ip address. This option is experimental at this time. -The ratelimit is in queries per second that are allowed. More queries are -completely dropped and will not receive a reply, SERVFAIL or otherwise. -IP ratelimiting happens before looking in the cache. This may be useful for -mitigating amplification attacks. +The ratelimit is in queries per second that are allowed. +More queries are completely dropped and will not receive a reply, SERVFAIL +or otherwise. +IP ratelimiting happens before looking in the cache. +This may be useful for mitigating amplification attacks. Clients with a valid DNS Cookie will bypass the ratelimit. -If a ratelimit for such clients is still needed, \fBip\-ratelimit\-cookie\fR +If a ratelimit for such clients is still needed, +\fI\%ip\-ratelimit\-cookie\fP can be used instead. -Default is 0 (disabled). -.TP 5 -.B ip\-ratelimit\-cookie: \fI<number or 0> -Enable global ratelimiting of queries accepted per IP address with a valid DNS -Cookie. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-ratelimit\-cookie: \fI<number or 0>\fP +Enable global ratelimiting of queries accepted per IP address with a valid +DNS Cookie. This option is experimental at this time. The ratelimit is in queries per second that are allowed. -More queries are completely dropped and will not receive a reply, SERVFAIL or -otherwise. +More queries are completely dropped and will not receive a reply, SERVFAIL +or otherwise. IP ratelimiting happens before looking in the cache. -This option could be useful in combination with \fIallow_cookie\fR in an +This option could be useful in combination with +\fI\%allow_cookie\fP, in an attempt to mitigate other amplification attacks than UDP reflections (e.g., -attacks targeting Unbound itself) which are already handled with DNS Cookies. -If used, the value is suggested to be higher than \fBip\-ratelimit\fR e.g., -tenfold. -Default is 0 (disabled). -.TP 5 -.B ip\-ratelimit\-size: \fI<memory size> +attacks targeting Unbound itself) which are already handled with DNS +Cookies. +If used, the value is suggested to be higher than +\fI\%ip\-ratelimit\fP e.g., tenfold. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-ratelimit\-size: \fI<memory size>\fP Give the size of the data structure in which the current ongoing rates are -kept track in. Default 4m. In bytes or use m(mega), k(kilo), g(giga). -The ip ratelimit structure is small, so this data structure likely does -not need to be large. -.TP 5 -.B ip\-ratelimit\-slabs: \fI<number> -Give power of 2 number of slabs, this is used to reduce lock contention -in the ip ratelimit tracking data structure. Close to the number of cpus is -a fairly good setting. -.TP 5 -.B ip\-ratelimit\-factor: \fI<number> +kept track in. +In bytes or use m(mega), k(kilo), g(giga). +The IP ratelimit structure is small, so this data structure likely does not +need to be large. +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-ratelimit\-slabs: \fI<number>\fP +Number of slabs in the ip ratelimit tracking data structure. +Slabs reduce lock contention by threads. +Must be set to a power of 2. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-ratelimit\-factor: \fI<number>\fP Set the amount of queries to rate limit when the limit is exceeded. If set to 0, all queries are dropped for addresses where the limit is -exceeded. If set to another value, 1 in that number is allowed through -to complete. Default is 10, allowing 1/10 traffic to flow normally. -This can make ordinary queries complete (if repeatedly queried for), -and enter the cache, whilst also mitigating the traffic flow by the -factor given. -.TP 5 -.B ip\-ratelimit\-backoff: \fI<yes or no> -If enabled, the ratelimit is treated as a hard failure instead of the default -maximum allowed constant rate. When the limit is reached, traffic is -ratelimited and demand continues to be kept track of for a 2 second rate -window. No traffic is allowed, except for ip\-ratelimit\-factor, until demand -decreases below the configured ratelimit for a 2 second rate window. Useful to -set ip\-ratelimit to a suspicious rate to aggressively limit unusually high -traffic. Default is off. -.TP 5 -.B outbound\-msg\-retry: \fI<number> -The number of retries, per upstream nameserver in a delegation, that Unbound -will attempt in case a throwaway response is received. +exceeded. +If set to another value, 1 in that number is allowed through to complete. +Default is 10, allowing 1/10 traffic to flow normally. +This can make ordinary queries complete (if repeatedly queried for), and +enter the cache, whilst also mitigating the traffic flow by the factor +given. +.sp +Default: 10 +.UNINDENT +.INDENT 0.0 +.TP +.B ip\-ratelimit\-backoff: \fI<yes or no>\fP +If enabled, the rate limit is treated as a hard failure instead of the +default maximum allowed constant rate. +When the limit is reached, traffic is ratelimited and demand continues to +be kept track of for a 2 second rate window. +No traffic is allowed, except for +\fI\%ip\-ratelimit\-factor\fP, until demand +decreases below the configured ratelimit for a 2 second rate window. +Useful to set \fI\%ip\-ratelimit\fP to a +suspicious rate to aggressively limit unusually high traffic. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B outbound\-msg\-retry: \fI<number>\fP +The number of retries, per upstream nameserver in a delegation, that +Unbound will attempt in case a throwaway response is received. No response (timeout) contributes to the retry counter. -If a forward/stub zone is used, this is the number of retries per nameserver in -the zone. -Default is 5. -.TP 5 -.B max\-sent\-count: \fI<number> -Hard limit on the number of outgoing queries Unbound will make while resolving -a name, making sure large NS sets do not loop. +If a forward/stub zone is used, this is the number of retries per +nameserver in the zone. +.sp +Default: 5 +.UNINDENT +.INDENT 0.0 +.TP +.B max\-sent\-count: \fI<number>\fP +Hard limit on the number of outgoing queries Unbound will make while +resolving a name, making sure large NS sets do not loop. Results in SERVFAIL when reached. It resets on query restarts (e.g., CNAME) and referrals. -Default is 32. -.TP 5 -.B max\-query\-restarts: \fI<number> -Hard limit on the number of times Unbound is allowed to restart a query upon -encountering a CNAME record. +.sp +Default: 32 +.UNINDENT +.INDENT 0.0 +.TP +.B max\-query\-restarts: \fI<number>\fP +Hard limit on the number of times Unbound is allowed to restart a query +upon encountering a CNAME record. Results in SERVFAIL when reached. Changing this value needs caution as it can allow long CNAME chains to be accepted, where Unbound needs to verify (resolve) each link individually. -Default is 11. -.TP 5 -.B iter\-scrub\-ns: \fI<number> +.sp +Default: 11 +.UNINDENT +.INDENT 0.0 +.TP +.B iter\-scrub\-ns: \fI<number>\fP Limit on the number of NS records allowed in an rrset of type NS, from the -iterator scrubber. This protects the internals of the resolver from overly -large NS sets. Default is 20. -.TP 5 -.B iter\-scrub\-cname: \fI<number> +iterator scrubber. +This protects the internals of the resolver from overly large NS sets. +.sp +Default: 20 +.UNINDENT +.INDENT 0.0 +.TP +.B iter\-scrub\-cname: \fI<number>\fP Limit on the number of CNAME, DNAME records in an answer, from the iterator -scrubber. This protects the internals of the resolver from overly long -indirection chains. Clips off the remainder of the reply packet at that point. -Default is 11. -.TP 5 -.B max\-global\-quota: \fI<number> +scrubber. +This protects the internals of the resolver from overly long indirection +chains. +Clips off the remainder of the reply packet at that point. +.sp +Default: 11 +.UNINDENT +.INDENT 0.0 +.TP +.B max\-global\-quota: \fI<number>\fP Limit on the number of upstream queries sent out for an incoming query and -its subqueries from recursion. It is not reset during the resolution. When -it is exceeded the query is failed and the lookup process stops. -Default is 200. -.TP 5 -.B fast\-server\-permil: \fI<number> +its subqueries from recursion. +It is not reset during the resolution. +When it is exceeded the query is failed and the lookup process stops. +.sp +Default: 200 +.UNINDENT +.INDENT 0.0 +.TP +.B fast\-server\-permil: \fI<number>\fP Specify how many times out of 1000 to pick from the set of fastest servers. -0 turns the feature off. A value of 900 would pick from the fastest -servers 90 percent of the time, and would perform normal exploration of random -servers for the remaining time. When prefetch is enabled (or serve\-expired), -such prefetches are not sped up, because there is no one waiting for it, and it -presents a good moment to perform server exploration. The -\fBfast\-server\-num\fR option can be used to specify the size of the fastest -servers set. The default for fast\-server\-permil is 0. -.TP 5 -.B fast\-server\-num: \fI<number> -Set the number of servers that should be used for fast server selection. Only -use the fastest specified number of servers with the fast\-server\-permil -option, that turns this on or off. The default is to use the fastest 3 servers. -.TP 5 -.B answer\-cookie: \fI<yes or no> +0 turns the feature off. +A value of 900 would pick from the fastest servers 90 percent of the time, +and would perform normal exploration of random servers for the remaining +time. +When \fI\%prefetch\fP is enabled (or +\fI\%serve\-expired\fP), such prefetches are not +sped up, because there is no one waiting for it, and it presents a good +moment to perform server exploration. +The \fI\%fast\-server\-num\fP option can be +used to specify the size of the fastest servers set. +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B fast\-server\-num: \fI<number>\fP +Set the number of servers that should be used for fast server selection. +Only use the fastest specified number of servers with the +\fI\%fast\-server\-permil\fP option, that +turns this on or off. +.sp +Default: 3 +.UNINDENT +.INDENT 0.0 +.TP +.B answer\-cookie: \fI<yes or no>\fP If enabled, Unbound will answer to requests containing DNS Cookies as specified in RFC 7873 and RFC 9018. -Default is no. -.TP 5 -.B cookie\-secret: \fI<128 bit hex string> -Server's secret for DNS Cookie generation. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B cookie\-secret: \fI\(dq<128 bit hex string>\(dq\fP +Server\(aqs secret for DNS Cookie generation. Useful to explicitly set for servers in an anycast deployment that need to -share the secret in order to verify each other's Server Cookies. -An example hex string would be "000102030405060708090a0b0c0d0e0f". -Default is a 128 bits random secret generated at startup time. -This option is ignored if a \fBcookie\-secret\-file\fR is -present. In that case the secrets from that file are used in DNS Cookie +share the secret in order to verify each other\(aqs Server Cookies. +An example hex string would be \(dq000102030405060708090a0b0c0d0e0f\(dq. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +This option is ignored if a +\fI\%cookie\-secret\-file\fP is present. +In that case the secrets from that file are used in DNS Cookie calculations. -.TP 5 -.B cookie\-secret\-file: \fI<filename> -File from which the secrets are read used in DNS Cookie calculations. When this -file exists, the secrets in this file are used and the secret specified by the -\fBcookie-secret\fR option is ignored. -Enable it by setting a filename, like "/usr/local/etc/unbound_cookiesecrets.txt". -The content of this file must be manipulated with the \fBadd_cookie_secret\fR, -\fBdrop_cookie_secret\fR and \fBactivate_cookie_secret\fR commands to the -\fIunbound\-control\fR(8) tool. Please see that manpage on how to perform a -safe cookie secret rollover. -Default is "" (disabled). -.TP 5 -.B edns\-client\-string: \fI<IP netblock> <string> -Include an EDNS0 option containing configured ascii string in queries with -destination address matching the configured IP netblock. This configuration -option can be used multiple times. The most specific match will be used. -.TP 5 -.B edns\-client\-string\-opcode: \fI<opcode> -EDNS0 option code for the \fIedns\-client\-string\fR option, from 0 to 65535. -A value from the `Reserved for Local/Experimental` range (65001-65534) should -be used. Default is 65001. -.TP 5 -.B ede: \fI<yes or no> -If enabled, Unbound will respond with Extended DNS Error codes (RFC8914). -These EDEs provide additional information with a response mainly for, but not -limited to, DNS and DNSSEC errors. - -When the \fBval-log-level\fR option is also set to \fB2\fR, responses with -Extended DNS Errors concerning DNSSEC failures will also contain a descriptive -text message about the reason for the failure. -Default is "no". -.TP 5 -.B ede\-serve\-expired: \fI<yes or no> -If enabled, Unbound will attach an Extended DNS Error (RFC8914) Code 3 - Stale -Answer as EDNS0 option to the expired response. -The \fBede\fR option needs to be enabled as well for this to work. -Default is "no". -.TP 5 -.B dns\-error\-reporting: \fI<yes or no> -If enabled, Unbound will send DNS Error Reports (RFC9567). -The name servers need to express support by attaching the Report-Channel EDNS0 -option on their replies specifying the reporting agent for the zone. +.UNINDENT +.UNINDENT +.sp +Default: 128 bits random secret generated at startup time +.UNINDENT +.INDENT 0.0 +.TP +.B cookie\-secret\-file: \fI<filename>\fP +File from which the secrets are read used in DNS Cookie calculations. +When this file exists, the secrets in this file are used and the secret +specified by the +\fI\%cookie\-secret\fP option is ignored. +Enable it by setting a filename, like +\(dq/usr/local/etc/unbound_cookiesecrets.txt\(dq. +The content of this file must be manipulated with the +\fI\%add_cookie_secret\fP, +\fI\%drop_cookie_secret\fP and +\fI\%activate_cookie_secret\fP +commands to the \fI\%unbound\-control(8)\fP tool. +Please see that manpage on how to perform a safe cookie secret rollover. +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B edns\-client\-string: \fI<IP netblock> <string>\fP +Include an EDNS0 option containing configured ASCII string in queries with +destination address matching the configured \fI<IP netblock>\fP\&. +This configuration option can be used multiple times. +The most specific match will be used. +.UNINDENT +.INDENT 0.0 +.TP +.B edns\-client\-string\-opcode: \fI<opcode>\fP +EDNS0 option code for the +\fI\%edns\-client\-string\fP option, from 0 +to 65535. +A value from the \(aqReserved for Local/Experimental\(aq range (65001\-65534) +should be used. +.sp +Default: 65001 +.UNINDENT +.INDENT 0.0 +.TP +.B ede: \fI<yes or no>\fP +If enabled, Unbound will respond with Extended DNS Error codes +(\fI\%RFC 8914\fP). +These EDEs provide additional information with a response mainly for, but +not limited to, DNS and DNSSEC errors. +.sp +When the \fI\%val\-log\-level\fP option is also +set to \fB2\fP, responses with Extended DNS Errors concerning DNSSEC failures +will also contain a descriptive text message about the reason for the +failure. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ede\-serve\-expired: \fI<yes or no>\fP +If enabled, Unbound will attach an Extended DNS Error (\fI\%RFC 8914\fP) \fICode 3 +\- Stale Answer\fP as EDNS0 option to the expired response. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +\fI\%ede: yes\fP needs to be set as well for this to +work. +.UNINDENT +.UNINDENT +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B dns\-error\-reporting: \fI<yes or no>\fP +If enabled, Unbound will send DNS Error Reports (\fI\%RFC 9567\fP). +The name servers need to express support by attaching the Report\-Channel +EDNS0 option on their replies specifying the reporting agent for the zone. Any errors encountered during resolution that would result in Unbound -generating an Extended DNS Error (RFC8914) will be reported to the zone's -reporting agent. -The \fBede\fR option does not need to be enabled for this to work. -It is advised that the \fBqname\-minimisation\fR option is also enabled to -increase privacy on the outgoing reports. -Default is "no". -.SS "Remote Control Options" -In the -.B remote\-control: -clause are the declarations for the remote control facility. If this is -enabled, the \fIunbound\-control\fR(8) utility can be used to send -commands to the running Unbound server. The server uses these clauses -to setup TLSv1 security for the connection. The -\fIunbound\-control\fR(8) utility also reads the \fBremote\-control\fR -section for options. To setup the correct self\-signed certificates use the -\fIunbound\-control\-setup\fR(8) utility. -.TP 5 -.B control\-enable: \fI<yes or no> -The option is used to enable remote control, default is "no". +generating an Extended DNS Error (\fI\%RFC 8914\fP) will be reported to the +zone\(aqs reporting agent. +.sp +The \fI\%ede\fP option does not need to be enabled for +this to work. +.sp +It is advised that the +\fI\%qname\-minimisation\fP option is also +enabled to increase privacy on the outgoing reports. +.sp +Default: no +.UNINDENT +.SS Remote Control Options +.sp +In the \fBremote\-control:\fP clause are the declarations for the remote control +facility. +If this is enabled, the \fI\%unbound\-control(8)\fP +utility can be used to send commands to the running Unbound server. +The server uses these clauses to setup TLSv1 security for the connection. +The \fI\%unbound\-control(8)\fP utility also reads the +\fBremote\-control:\fP section for options. +To setup the correct self\-signed certificates use the +\fIunbound\-control\-setup(8)\fP utility. +.INDENT 0.0 +.TP +.B control\-enable: \fI<yes or no>\fP +The option is used to enable remote control. If turned off, the server does not listen for control commands. -.TP 5 -.B control\-interface: \fI<ip address or interface name or path> -Give IPv4 or IPv6 addresses or local socket path to listen on for -control commands. -If an interface name is used instead of an ip address, the list of ip addresses -on that interface are used. -By default localhost (127.0.0.1 and ::1) is listened to. -Use 0.0.0.0 and ::0 to listen to all interfaces. -If you change this and permissions have been dropped, you must restart -the server for the change to take effect. -.IP -If you set it to an absolute path, a unix domain socket is used. This socket -does not use the certificates and keys, so those files need not be present. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B control\-interface: \fI<IP address or interface name or path>\fP +Give IPv4 or IPv6 addresses or local socket path to listen on for control +commands. +If an interface name is used instead of an IP address, the list of IP +addresses on that interface are used. +.sp +By default localhost (\fB127.0.0.1\fP and \fB::1\fP) is listened to. +Use \fB0.0.0.0\fP and \fB::0\fP to listen to all interfaces. +If you change this and permissions have been dropped, you must restart the +server for the change to take effect. +.sp +If you set it to an absolute path, a unix domain socket is used. +This socket does not use the certificates and keys, so those files need not +be present. To restrict access, Unbound sets permissions on the file to the user and -group that is configured, the access bits are set to allow the group members -to access the control socket file. Put users that need to access the socket -in the that group. To restrict access further, create a directory to put -the control socket in and restrict access to that directory. -.TP 5 -.B control\-port: \fI<port number> -The port number to listen on for IPv4 or IPv6 control interfaces, -default is 8953. +group that is configured, the access bits are set to allow the group +members to access the control socket file. +Put users that need to access the socket in the that group. +To restrict access further, create a directory to put the control socket in +and restrict access to that directory. +.UNINDENT +.INDENT 0.0 +.TP +.B control\-port: \fI<port number>\fP +The port number to listen on for IPv4 or IPv6 control interfaces. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 If you change this and permissions have been dropped, you must restart the server for the change to take effect. -.TP 5 -.B control\-use\-cert: \fI<yes or no> -For localhost control-interface you can disable the use of TLS by setting -this option to "no", default is "yes". For local sockets, TLS is disabled -and the value of this option is ignored. -.TP 5 -.B server\-key\-file: \fI<private key file> -Path to the server private key, by default unbound_server.key. -This file is generated by the \fIunbound\-control\-setup\fR utility. -This file is used by the Unbound server, but not by \fIunbound\-control\fR. -.TP 5 -.B server\-cert\-file: \fI<certificate file.pem> -Path to the server self signed certificate, by default unbound_server.pem. -This file is generated by the \fIunbound\-control\-setup\fR utility. -This file is used by the Unbound server, and also by \fIunbound\-control\fR. -.TP 5 -.B control\-key\-file: \fI<private key file> -Path to the control client private key, by default unbound_control.key. -This file is generated by the \fIunbound\-control\-setup\fR utility. -This file is used by \fIunbound\-control\fR. -.TP 5 -.B control\-cert\-file: \fI<certificate file.pem> -Path to the control client certificate, by default unbound_control.pem. +.UNINDENT +.UNINDENT +.sp +Default: 8953 +.UNINDENT +.INDENT 0.0 +.TP +.B control\-use\-cert: \fI<yes or no>\fP +For localhost +\fI\%control\-interface\fP you can +disable the use of TLS by setting this option to \(dqno\(dq. +For local sockets, TLS is disabled and the value of this option is ignored. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B server\-key\-file: \fI<private key file>\fP +Path to the server private key. +This file is generated by the +\fI\%unbound\-control\-setup(8)\fP utility. +This file is used by the Unbound server, but not by +\fI\%unbound\-control(8)\fP\&. +.sp +Default: unbound_server.key +.UNINDENT +.INDENT 0.0 +.TP +.B server\-cert\-file: \fI<certificate file.pem>\fP +Path to the server self signed certificate. +This file is generated by the +\fI\%unbound\-control\-setup(8)\fP utility. +This file is used by the Unbound server, and also by +\fI\%unbound\-control(8)\fP\&. +.sp +Default: unbound_server.pem +.UNINDENT +.INDENT 0.0 +.TP +.B control\-key\-file: \fI<private key file>\fP +Path to the control client private key. +This file is generated by the +\fI\%unbound\-control\-setup(8)\fP utility. +This file is used by \fI\%unbound\-control(8)\fP\&. +.sp +Default: unbound_control.key +.UNINDENT +.INDENT 0.0 +.TP +.B control\-cert\-file: \fI<certificate file.pem>\fP +Path to the control client certificate. This certificate has to be signed with the server certificate. -This file is generated by the \fIunbound\-control\-setup\fR utility. -This file is used by \fIunbound\-control\fR. -.SS "Stub Zone Options" -.LP -There may be multiple -.B stub\-zone: -clauses. Each with a name: and zero or more hostnames or IP addresses. -For the stub zone this list of nameservers is used. Class IN is assumed. -The servers should be authority servers, not recursors; Unbound performs -the recursive processing itself for stub zones. -.P -The stub zone can be used to configure authoritative data to be used -by the resolver that cannot be accessed using the public internet servers. -This is useful for company\-local data or private zones. Setup an -authoritative server on a different host (or different port). Enter a config -entry for Unbound with -.B stub\-addr: -<ip address of host[@port]>. -The Unbound resolver can then access the data, without referring to the -public internet for it. -.P -This setup allows DNSSEC signed zones to be served by that -authoritative server, in which case a trusted key entry with the public key -can be put in config, so that Unbound can validate the data and set the AD -bit on replies for the private zone (authoritative servers do not set the -AD bit). This setup makes Unbound capable of answering queries for the -private zone, and can even set the AD bit ('authentic'), but the AA -('authoritative') bit is not set on these replies. -.P -Consider adding \fBserver:\fR statements for \fBdomain\-insecure:\fR and -for \fBlocal\-zone:\fI name nodefault\fR for the zone if it is a locally -served zone. The insecure clause stops DNSSEC from invalidating the -zone. The local zone nodefault (or \fItransparent\fR) clause makes the -(reverse\-) zone bypass Unbound's filtering of RFC1918 zones. -.TP -.B name: \fI<domain name> -Name of the stub zone. This is the full domain name of the zone. -.TP -.B stub\-host: \fI<domain name> -Name of stub zone nameserver. Is itself resolved before it is used. -To use a nondefault port for DNS communication append '@' with the port number. -If tls is enabled, then you can append a '#' and a name, then it'll check the -tls authentication certificates with that name. If you combine the '@' -and '#', the '@' comes first. If only '#' is used the default port is the -configured tls\-port. -.TP -.B stub\-addr: \fI<IP address> -IP address of stub zone nameserver. Can be IP 4 or IP 6. -To use a nondefault port for DNS communication append '@' with the port number. -If tls is enabled, then you can append a '#' and a name, then it'll check the -tls authentication certificates with that name. If you combine the '@' -and '#', the '@' comes first. If only '#' is used the default port is the -configured tls\-port. -.TP -.B stub\-prime: \fI<yes or no> -This option is by default no. If enabled it performs NS set priming, -which is similar to root hints, where it starts using the list of nameservers -currently published by the zone. Thus, if the hint list is slightly outdated, -the resolver picks up a correct list online. -.TP -.B stub\-first: \fI<yes or no> +This file is generated by the +\fI\%unbound\-control\-setup(8)\fP utility. +This file is used by \fI\%unbound\-control(8)\fP\&. +.sp +Default: unbound_control.pem +.UNINDENT +.SS Stub Zone Options +.sp +There may be multiple \fBstub\-zone:\fP clauses. +Each with a \fI\%name\fP and zero or more hostnames or +IP addresses. +For the stub zone this list of nameservers is used. +Class IN is assumed. +The servers should be authority servers, not recursors; Unbound performs the +recursive processing itself for stub zones. +.sp +The stub zone can be used to configure authoritative data to be used by the +resolver that cannot be accessed using the public internet servers. +This is useful for company\-local data or private zones. +Setup an authoritative server on a different host (or different port). +Enter a config entry for Unbound with: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +stub\-addr: <ip address of host[@port]> +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +The Unbound resolver can then access the data, without referring to the public +internet for it. +.sp +This setup allows DNSSEC signed zones to be served by that authoritative +server, in which case a trusted key entry with the public key can be put in +config, so that Unbound can validate the data and set the AD bit on replies for +the private zone (authoritative servers do not set the AD bit). +This setup makes Unbound capable of answering queries for the private zone, and +can even set the AD bit (\(aqauthentic\(aq), but the AA (\(aqauthoritative\(aq) bit is not +set on these replies. +.sp +Consider adding \fI\%server\fP statements for +\fI\%domain\-insecure\fP and for +\fI\%local\-zone: <name> nodefault\fP +for the zone if it is a locally served zone. +The insecure clause stops DNSSEC from invalidating the zone. +The \fI\%local\-zone: nodefault\fP (or +\fI\%transparent\fP) clause makes the +(reverse\-) zone bypass Unbound\(aqs filtering of \fI\%RFC 1918\fP zones. +.INDENT 0.0 +.TP +.B name: \fI<domain name>\fP +Name of the stub zone. +This is the full domain name of the zone. +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-host: \fI<domain name>\fP +Name of stub zone nameserver. +Is itself resolved before it is used. +.sp +To use a non\-default port for DNS communication append \fB\(aq@\(aq\fP with the +port number. +.sp +If TLS is enabled, then you can append a \fB\(aq#\(aq\fP and a name, then it\(aqll +check the TLS authentication certificates with that name. +.sp +If you combine the \fB\(aq@\(aq\fP and \fB\(aq#\(aq\fP, the \fB\(aq@\(aq\fP comes first. +If only \fB\(aq#\(aq\fP is used the default port is the configured +\fI\%tls\-port\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-addr: \fI<IP address>\fP +IP address of stub zone nameserver. +Can be IPv4 or IPv6. +.sp +To use a non\-default port for DNS communication append \fB\(aq@\(aq\fP with the +port number. +.sp +If TLS is enabled, then you can append a \fB\(aq#\(aq\fP and a name, then it\(aqll +check the tls authentication certificates with that name. +.sp +If you combine the \fB\(aq@\(aq\fP and \fB\(aq#\(aq\fP, the \fB\(aq@\(aq\fP comes first. +If only \fB\(aq#\(aq\fP is used the default port is the configured +\fI\%tls\-port\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-prime: \fI<yes or no>\fP +If enabled it performs NS set priming, which is similar to root hints, +where it starts using the list of nameservers currently published by the +zone. +Thus, if the hint list is slightly outdated, the resolver picks up a +correct list online. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-first: \fI<yes or no>\fP If enabled, a query is attempted without the stub clause if it fails. -The data could not be retrieved and would have caused SERVFAIL because -the servers are unreachable, instead it is tried without this clause. -The default is no. -.TP -.B stub\-tls\-upstream: \fI<yes or no> +The data could not be retrieved and would have caused SERVFAIL because the +servers are unreachable, instead it is tried without this clause. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-tls\-upstream: \fI<yes or no>\fP Enabled or disable whether the queries to this stub use TLS for transport. -Default is no. -.TP -.B stub\-ssl\-upstream: \fI<yes or no> -Alternate syntax for \fBstub\-tls\-upstream\fR. -.TP -.B stub\-tcp\-upstream: \fI<yes or no> -If it is set to "yes" then upstream queries use TCP only for transport regardless of global flag tcp-upstream. -Default is no. -.TP -.B stub\-no\-cache: \fI<yes or no> -Default is no. If enabled, data inside the stub is not cached. This is -useful when you want immediate changes to be visible. -.SS "Forward Zone Options" -.LP -There may be multiple -.B forward\-zone: -clauses. Each with a \fBname:\fR and zero or more hostnames or IP -addresses. For the forward zone this list of nameservers is used to -forward the queries to. The servers listed as \fBforward\-host:\fR and -\fBforward\-addr:\fR have to handle further recursion for the query. Thus, -those servers are not authority servers, but are (just like Unbound is) +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-ssl\-upstream: \fI<yes or no>\fP +Alternate syntax for +\fI\%stub\-tls\-upstream\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-tcp\-upstream: \fI<yes or no>\fP +If it is set to \(dqyes\(dq then upstream queries use TCP only for transport +regardless of global flag \fI\%tcp\-upstream\fP\&. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B stub\-no\-cache: \fI<yes or no>\fP +If enabled, data inside the stub is not cached. +This is useful when you want immediate changes to be visible. +.sp +Default: no +.UNINDENT +.SS Forward Zone Options +.sp +There may be multiple \fBforward\-zone:\fP clauses. +Each with a \fI\%name\fP and zero or more hostnames +or IP addresses. +For the forward zone this list of nameservers is used to forward the queries +to. +The servers listed as \fI\%forward\-host\fP +and \fI\%forward\-addr\fP have to handle +further recursion for the query. +Thus, those servers are not authority servers, but are (just like Unbound is) recursive servers too; Unbound does not perform recursion itself for the -forward zone, it lets the remote server do it. Class IN is assumed. -CNAMEs are chased by Unbound itself, asking the remote server for every -name in the indirection chain, to protect the local cache from illegal -indirect referenced items. -A forward\-zone entry with name "." and a forward\-addr target will -forward all queries to that other server (unless it can answer from -the cache). -.TP -.B name: \fI<domain name> -Name of the forward zone. This is the full domain name of the zone. -.TP -.B forward\-host: \fI<domain name> -Name of server to forward to. Is itself resolved before it is used. -To use a nondefault port for DNS communication append '@' with the port number. -If tls is enabled, then you can append a '#' and a name, then it'll check the -tls authentication certificates with that name. If you combine the '@' -and '#', the '@' comes first. If only '#' is used the default port is the -configured tls\-port. -.TP -.B forward\-addr: \fI<IP address> -IP address of server to forward to. Can be IP 4 or IP 6. -To use a nondefault port for DNS communication append '@' with the port number. -If tls is enabled, then you can append a '#' and a name, then it'll check the -tls authentication certificates with that name. If you combine the '@' -and '#', the '@' comes first. If only '#' is used the default port is the -configured tls\-port. -.IP +forward zone, it lets the remote server do it. +Class IN is assumed. +CNAMEs are chased by Unbound itself, asking the remote server for every name in +the indirection chain, to protect the local cache from illegal indirect +referenced items. +A \fI\%forward\-zone\fP entry with name +\fB\(dq.\(dq\fP and a \fI\%forward\-addr\fP target +will forward all queries to that other server (unless it can answer from the +cache). +.INDENT 0.0 +.TP +.B name: \fI<domain name>\fP +Name of the forward zone. +This is the full domain name of the zone. +.UNINDENT +.INDENT 0.0 +.TP +.B forward\-host: \fI<domain name>\fP +Name of server to forward to. +Is itself resolved before it is used. +.sp +To use a non\-default port for DNS communication append \fB\(aq@\(aq\fP with the +port number. +.sp +If TLS is enabled, then you can append a \fB\(aq#\(aq\fP and a name, then it\(aqll +check the TLS authentication certificates with that name. +.sp +If you combine the \fB\(aq@\(aq\fP and \fB\(aq#\(aq\fP, the \fB\(aq@\(aq\fP comes first. +If only \fB\(aq#\(aq\fP is used the default port is the configured +\fI\%tls\-port\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B forward\-addr: \fI<IP address>\fP +IP address of server to forward to. +Can be IPv4 or IPv6. +.sp +To use a non\-default port for DNS communication append \fB\(aq@\(aq\fP with the +port number. +.sp +If TLS is enabled, then you can append a \fB\(aq#\(aq\fP and a name, then it\(aqll +check the tls authentication certificates with that name. +.sp +If you combine the \fB\(aq@\(aq\fP and \fB\(aq#\(aq\fP, the \fB\(aq@\(aq\fP comes first. +If only \fB\(aq#\(aq\fP is used the default port is the configured +\fI\%tls\-port\fP\&. +.sp At high verbosity it logs the TLS certificate, with TLS enabled. -If you leave out the '#' and auth name from the forward\-addr, any -name is accepted. The cert must also match a CA from the tls\-cert\-bundle. -.TP -.B forward\-first: \fI<yes or no> +If you leave out the \fB\(aq#\(aq\fP and auth name from the +\fI\%forward\-addr\fP, any name is +accepted. +The cert must also match a CA from the +\fI\%tls\-cert\-bundle\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B forward\-first: \fI<yes or no>\fP If a forwarded query is met with a SERVFAIL error, and this option is enabled, Unbound will fall back to normal recursive resolution for this -query as if no query forwarding had been specified. The default is "no". -.TP -.B forward\-tls\-upstream: \fI<yes or no> -Enabled or disable whether the queries to this forwarder use TLS for transport. -Default is no. -If you enable this, also configure a tls\-cert\-bundle or use tls\-win\-cert to -load CA certs, otherwise the connections cannot be authenticated. -.TP -.B forward\-ssl\-upstream: \fI<yes or no> -Alternate syntax for \fBforward\-tls\-upstream\fR. -.TP -.B forward\-tcp\-upstream: \fI<yes or no> -If it is set to "yes" then upstream queries use TCP only for transport regardless of global flag tcp-upstream. -Default is no. -.TP -.B forward\-no\-cache: \fI<yes or no> -Default is no. If enabled, data inside the forward is not cached. This is -useful when you want immediate changes to be visible. -.SS "Authority Zone Options" -.LP -Authority zones are configured with \fBauth\-zone:\fR, and each one must -have a \fBname:\fR. There can be multiple ones, by listing multiple auth\-zone clauses, each with a different name, pertaining to that part of the namespace. +query as if no query forwarding had been specified. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B forward\-tls\-upstream: \fI<yes or no>\fP +Enabled or disable whether the queries to this forwarder use TLS for +transport. +If you enable this, also configure a +\fI\%tls\-cert\-bundle\fP or use +\fI\%tls\-win\-cert\fP to load CA certs, otherwise +the connections cannot be authenticated. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B forward\-ssl\-upstream: \fI<yes or no>\fP +Alternate syntax for +\fI\%forward\-tls\-upstream\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B forward\-tcp\-upstream: \fI<yes or no>\fP +If it is set to \(dqyes\(dq then upstream queries use TCP only for transport +regardless of global flag \fI\%tcp\-upstream\fP\&. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B forward\-no\-cache: \fI<yes or no>\fP +If enabled, data inside the forward is not cached. +This is useful when you want immediate changes to be visible. +.sp +Default: no +.UNINDENT +.SS Authority Zone Options +.sp +Authority zones are configured with \fBauth\-zone:\fP, and each one must have a +\fI\%name\fP\&. +There can be multiple ones, by listing multiple auth\-zone clauses, each with a +different name, pertaining to that part of the namespace. The authority zone with the name closest to the name looked up is used. -Authority zones can be processed on two distinct, non-exclusive, configurable +Authority zones can be processed on two distinct, non\-exclusive, configurable stages. -.LP -With \fBfor\-downstream:\fR \fIyes\fR (default), authority zones are processed -after \fBlocal\-zones\fR and before cache. +.sp +With \fI\%for\-downstream: yes\fP (default), +authority zones are processed after \fBlocal\-zones\fP and before cache. When used in this manner, Unbound responds like an authority server with no further processing other than returning an answer from the zone contents. A notable example, in this case, is CNAME records which are returned verbatim to downstream clients without further resolution. -.LP -With \fBfor\-upstream:\fR \fIyes\fR (default), authority zones are processed -after the cache lookup, just before going to the network to fetch -information for recursion. +.sp +With \fI\%for\-upstream: yes\fP (default), +authority zones are processed after the cache lookup, just before going to the +network to fetch information for recursion. When used in this manner they provide a local copy of an authority server that speeds up lookups for that data during resolving. -.LP +.sp If both options are enabled (default), client queries for an authority zone are answered authoritatively from Unbound, while internal queries that require data from the authority zone consult the local zone data instead of going to the network. -.LP -An interesting configuration is \fBfor\-downstream:\fR \fIno\fR, -\fBfor\-upstream:\fR \fIyes\fR that allows for hyperlocal behavior where both -client and internal queries consult the local zone data while resolving. +.sp +An interesting configuration is +\fI\%for\-downstream: no\fP, +\fI\%for\-upstream: yes\fP +that allows for hyperlocal behavior where both client and internal queries +consult the local zone data while resolving. In this case, the aforementioned CNAME example will result in a thoroughly resolved answer. -.LP -Authority zones can be read from zonefile. And can be kept updated via -AXFR and IXFR. After update the zonefile is rewritten. The update mechanism -uses the SOA timer values and performs SOA UDP queries to detect zone changes. -.LP +.sp +Authority zones can be read from zonefile. +And can be kept updated via AXFR and IXFR. +After update the zonefile is rewritten. +The update mechanism uses the SOA timer values and performs SOA UDP queries to +detect zone changes. +.sp If the update fetch fails, the timers in the SOA record are used to time -another fetch attempt. Until the SOA expiry timer is reached. Then the -zone is expired. When a zone is expired, queries are SERVFAIL, and -any new serial number is accepted from the primary (even if older), and if -fallback is enabled, the fallback activates to fetch from the upstream instead -of the SERVFAIL. -.TP -.B name: \fI<zone name> +another fetch attempt. +Until the SOA expiry timer is reached. +Then the zone is expired. +When a zone is expired, queries are SERVFAIL, and any new serial number is +accepted from the primary (even if older), and if fallback is enabled, the +fallback activates to fetch from the upstream instead of the SERVFAIL. +.INDENT 0.0 +.TP +.B name: \fI<zone name>\fP Name of the authority zone. -.TP -.B primary: \fI<IP address or host name> -Where to download a copy of the zone from, with AXFR and IXFR. Multiple -primaries can be specified. They are all tried if one fails. -To use a nondefault port for DNS communication append '@' with the port number. -You can append a '#' and a name, then AXFR over TLS can be used and the tls authentication certificates will be checked with that name. If you combine -the '@' and '#', the '@' comes first. -If you point it at another Unbound instance, it would not work because -that does not support AXFR/IXFR for the zone, but if you used \fBurl:\fR to download -the zonefile as a text file from a webserver that would work. +.UNINDENT +.INDENT 0.0 +.TP +.B primary: \fI<IP address or host name>\fP +Where to download a copy of the zone from, with AXFR and IXFR. +Multiple primaries can be specified. +They are all tried if one fails. +.sp +To use a non\-default port for DNS communication append \fB\(aq@\(aq\fP with the +port number. +.sp +You can append a \fB\(aq#\(aq\fP and a name, then AXFR over TLS can be used and the +TLS authentication certificates will be checked with that name. +.sp +If you combine the \fB\(aq@\(aq\fP and \fB\(aq#\(aq\fP, the \fB\(aq@\(aq\fP comes first. +If you point it at another Unbound instance, it would not work because that +does not support AXFR/IXFR for the zone, but if you used +\fI\%url\fP to download the zonefile as a text file +from a webserver that would work. +.sp If you specify the hostname, you cannot use the domain from the zonefile, because it may not have that when retrieving that data, instead use a plain IP address to avoid a circular dependency on retrieving that IP address. -.TP -.B master: \fI<IP address or host name> -Alternate syntax for \fBprimary\fR. -.TP -.B url: \fI<url to zonefile> -Where to download a zonefile for the zone. With http or https. An example -for the url is "http://www.example.com/example.org.zone". Multiple url -statements can be given, they are tried in turn. If only urls are given -the SOA refresh timer is used to wait for making new downloads. If also -primaries are listed, the primaries are first probed with UDP SOA queries to -see if the SOA serial number has changed, reducing the number of downloads. +.UNINDENT +.INDENT 0.0 +.TP +.B master: \fI<IP address or host name>\fP +Alternate syntax for \fI\%primary\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B url: \fI<URL to zone file>\fP +Where to download a zonefile for the zone. +With HTTP or HTTPS. +An example for the url is: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +http://www.example.com/example.org.zone +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Multiple url statements can be given, they are tried in turn. +.sp +If only urls are given the SOA refresh timer is used to wait for making new +downloads. +If also primaries are listed, the primaries are first probed with UDP SOA +queries to see if the SOA serial number has changed, reducing the number of +downloads. If none of the urls work, the primaries are tried with IXFR and AXFR. -For https, the \fBtls\-cert\-bundle\fR and the hostname from the url are used -to authenticate the connection. +.sp +For HTTPS, the \fI\%tls\-cert\-bundle\fP and +the hostname from the url are used to authenticate the connection. +.sp If you specify a hostname in the URL, you cannot use the domain from the zonefile, because it may not have that when retrieving that data, instead use a plain IP address to avoid a circular dependency on retrieving that IP -address. Avoid dependencies on name lookups by using a notation like -"http://192.0.2.1/unbound-primaries/example.com.zone", with an explicit IP address. -.TP -.B allow\-notify: \fI<IP address or host name or netblockIP/prefix> -With allow\-notify you can specify additional sources of notifies. +address. +.sp +Avoid dependencies on name lookups by using a notation like +\fB\(dqhttp://192.0.2.1/unbound\-primaries/example.com.zone\(dq\fP, with an explicit +IP address. +.UNINDENT +.INDENT 0.0 +.TP +.B allow\-notify: \fI<IP address or host name or netblockIP/prefix>\fP +With \fI\%allow\-notify\fP you can specify +additional sources of notifies. When notified, the server attempts to first probe and then zone transfer. -If the notify is from a primary, it first attempts that primary. Otherwise -other primaries are attempted. If there are no primaries, but only urls, the -file is downloaded when notified. The primaries from primary: and url: -statements are allowed notify by default. -.TP -.B fallback\-enabled: \fI<yes or no> -Default no. If enabled, Unbound falls back to querying the internet as -a resolver for this zone when lookups fail. For example for DNSSEC -validation failures. -.TP -.B for\-downstream: \fI<yes or no> -Default yes. If enabled, Unbound serves authority responses to -downstream clients for this zone. This option makes Unbound behave, for -the queries with names in this zone, like one of the authority servers for -that zone. Turn it off if you want Unbound to provide recursion for the -zone but have a local copy of zone data. If for\-downstream is no and -for\-upstream is yes, then Unbound will DNSSEC validate the contents of the -zone before serving the zone contents to clients and store validation -results in the cache. -.TP -.B for\-upstream: \fI<yes or no> -Default yes. If enabled, Unbound fetches data from this data collection -for answering recursion queries. Instead of sending queries over the internet -to the authority servers for this zone, it'll fetch the data directly from -the zone data. Turn it on when you want Unbound to provide recursion for -downstream clients, and use the zone data as a local copy to speed up lookups. -.TP -.B zonemd\-check: \fI<yes or no> -Enable this option to check ZONEMD records in the zone. Default is disabled. -The ZONEMD record is a checksum over the zone data. This includes glue in -the zone and data from the zone file, and excludes comments from the zone file. +If the notify is from a primary, it first attempts that primary. +Otherwise other primaries are attempted. +If there are no primaries, but only urls, the file is downloaded when +notified. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The primaries from \fI\%primary\fP and +\fI\%url\fP statements are allowed notify by +default. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B fallback\-enabled: \fI<yes or no>\fP +If enabled, Unbound falls back to querying the internet as a resolver for +this zone when lookups fail. +For example for DNSSEC validation failures. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B for\-downstream: \fI<yes or no>\fP +If enabled, Unbound serves authority responses to downstream clients for +this zone. +This option makes Unbound behave, for the queries with names in this zone, +like one of the authority servers for that zone. +.sp +Turn it off if you want Unbound to provide recursion for the zone but have +a local copy of zone data. +.sp +If \fI\%for\-downstream: no\fP and +\fI\%for\-upstream: yes\fP are set, then +Unbound will DNSSEC validate the contents of the zone before serving the +zone contents to clients and store validation results in the cache. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B for\-upstream: \fI<yes or no>\fP +If enabled, Unbound fetches data from this data collection for answering +recursion queries. +Instead of sending queries over the internet to the authority servers for +this zone, it\(aqll fetch the data directly from the zone data. +.sp +Turn it on when you want Unbound to provide recursion for downstream +clients, and use the zone data as a local copy to speed up lookups. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B zonemd\-check: \fI<yes or no>\fP +Enable this option to check ZONEMD records in the zone. +The ZONEMD record is a checksum over the zone data. +This includes glue in the zone and data from the zone file, and excludes +comments from the zone file. When there is a DNSSEC chain of trust, DNSSEC signatures are checked too. -.TP -.B zonemd\-reject\-absence: \fI<yes or no> -Enable this option to reject the absence of the ZONEMD record. Without it, -when zonemd is not there it is not checked. It is useful to enable for a -nonDNSSEC signed zone where the operator wants to require the verification -of a ZONEMD, hence a missing ZONEMD is a failure. The action upon -failure is controlled by the \fBzonemd\-permissive\-mode\fR option, for -log only or also block the zone. The default is no. -.IP -Without the option absence of a ZONEMD is only a failure when the zone is +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B zonemd\-reject\-absence: \fI<yes or no>\fP +Enable this option to reject the absence of the ZONEMD record. +Without it, when ZONEMD is not there it is not checked. +.sp +It is useful to enable for a non\-DNSSEC signed zone where the operator +wants to require the verification of a ZONEMD, hence a missing ZONEMD is a +failure. +.sp +The action upon failure is controlled by the +\fI\%zonemd\-permissive\-mode\fP option, +for log only or also block the zone. +.sp +Without the option, absence of a ZONEMD is only a failure when the zone is DNSSEC signed, and we have a trust anchor, and the DNSSEC verification of -the absence of the ZONEMD fails. With the option enabled, the absence of -a ZONEMD is always a failure, also for nonDNSSEC signed zones. -.TP -.B zonefile: \fI<filename> -The filename where the zone is stored. If not given then no zonefile is used. +the absence of the ZONEMD fails. +With the option enabled, the absence of a ZONEMD is always a failure, also +for nonDNSSEC signed zones. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B zonefile: \fI<filename>\fP +The filename where the zone is stored. +If not given then no zonefile is used. If the file does not exist or is empty, Unbound will attempt to fetch zone data (eg. from the primary servers). -.SS "View Options" -.LP -There may be multiple -.B view: -clauses. Each with a \fBname:\fR and zero or more \fBlocal\-zone\fR and -\fBlocal\-data\fR elements. Views can also contain view\-first, -response\-ip, response\-ip\-data and local\-data\-ptr elements. -View can be mapped to requests by specifying the -view name in an \fBaccess\-control\-view\fR element. Options from matching -views will override global options. Global options will be used if no matching -view is found, or when the matching view does not have the option specified. -.TP -.B name: \fI<view name> -Name of the view. Must be unique. This name is used in access\-control\-view -elements. -.TP -.B local\-zone: \fI<zone> <type> -View specific local\-zone elements. Has the same types and behaviour as the -global local\-zone elements. When there is at least one local\-zone specified -and view\-first is no, the default local-zones will be added to this view. -Defaults can be disabled using the nodefault type. When view\-first is yes or -when a view does not have a local\-zone, the global local\-zone will be used -including it's default zones. -.TP -.B local\-data: \fI"<resource record string>" -View specific local\-data elements. Has the same behaviour as the global -local\-data elements. -.TP -.B local\-data\-ptr: \fI"IPaddr name" -View specific local\-data\-ptr elements. Has the same behaviour as the global -local\-data\-ptr elements. -.TP -.B view\-first: \fI<yes or no> -If enabled, it attempts to use the global local\-zone and local\-data if there -is no match in the view specific options. -The default is no. -.SS "Python Module Options" -.LP -The -.B python: -clause gives the settings for the \fIpython\fR(1) script module. This module -acts like the iterator and validator modules do, on queries and answers. -To enable the script module it has to be compiled into the daemon, -and the word "python" has to be put in the \fBmodule\-config:\fR option -(usually first, or between the validator and iterator). Multiple instances of -the python module are supported by adding the word "python" more than once. -.LP -If the \fBchroot:\fR option is enabled, you should make sure Python's -library directory structure is bind mounted in the new root environment, see -\fImount\fR(8). Also the \fBpython\-script:\fR path should be specified as an -absolute path relative to the new root, or as a relative path to the working +.UNINDENT +.SS View Options +.sp +There may be multiple \fBview:\fP clauses. +Each with a \fI\%name\fP and zero or more +\fI\%local\-zone\fP and +\fI\%local\-data\fP attributes. +Views can also contain \fI\%view\-first\fP, +\fI\%response\-ip\fP, +\fI\%response\-ip\-data\fP and +\fI\%local\-data\-ptr\fP attributes. +View can be mapped to requests by specifying the view name in an +\fI\%access\-control\-view\fP attribute. +Options from matching views will override global options. +Global options will be used if no matching view is found, or when the matching +view does not have the option specified. +.INDENT 0.0 +.TP +.B name: \fI<view name>\fP +Name of the view. +Must be unique. +This name is used in the +\fI\%access\-control\-view\fP attribute. +.UNINDENT +.INDENT 0.0 +.TP +.B local\-zone: \fI<zone> <type>\fP +View specific local zone elements. +Has the same types and behaviour as the global +\fI\%local\-zone\fP elements. +When there is at least one \fIlocal\-zone:\fP specified and \fI\%view\-first: +no\fP is set, the default local\-zones will be +added to this view. +Defaults can be disabled using the nodefault type. +When \fI\%view\-first: yes\fP is set or when a +view does not have a \fI\%local\-zone\fP, the +global \fI\%local\-zone\fP will be used including +it\(aqs default zones. +.UNINDENT +.INDENT 0.0 +.TP +.B local\-data: \fI\(dq<resource record string>\(dq\fP +View specific local data elements. +Has the same behaviour as the global +\fI\%local\-data\fP elements. +.UNINDENT +.INDENT 0.0 +.TP +.B local\-data\-ptr: \fI\(dqIPaddr name\(dq\fP +View specific local\-data\-ptr elements. +Has the same behaviour as the global +\fI\%local\-data\-ptr\fP elements. +.UNINDENT +.INDENT 0.0 +.TP +.B view\-first: \fI<yes or no>\fP +If enabled, it attempts to use the global +\fI\%local\-zone\fP and +\fI\%local\-data\fP if there is no match in the +view specific options. +.sp +Default: no +.UNINDENT +.SS Python Module Options +.sp +The \fBpython:\fP clause gives the settings for the \fIpython(1)\fP script module. +This module acts like the iterator and validator modules do, on queries and +answers. +To enable the script module it has to be compiled into the daemon, and the word +\fBpython\fP has to be put in the +\fI\%module\-config\fP option (usually first, or +between the validator and iterator). +Multiple instances of the python module are supported by adding the word +\fBpython\fP more than once. +.sp +If the \fI\%chroot\fP option is enabled, you should make +sure Python\(aqs library directory structure is bind mounted in the new root +environment, see \fImount(8)\fP\&. +Also the \fI\%python\-script\fP path should +be specified as an absolute path relative to the new root, or as a relative +path to the working directory. +.INDENT 0.0 +.TP +.B python\-script: \fI<python file>\fP +The script file to load. +Repeat this option for every python module instance added to the +\fI\%module\-config\fP option. +.UNINDENT +.SS Dynamic Library Module Options +.sp +The \fBdynlib:\fP clause gives the settings for the \fBdynlib\fP module. +This module is only a very small wrapper that allows dynamic modules to be +loaded on runtime instead of being compiled into the application. +To enable the dynlib module it has to be compiled into the daemon, and the word +\fBdynlib\fP has to be put in the +\fI\%module\-config\fP attribute. +Multiple instances of dynamic libraries are supported by adding the word +\fBdynlib\fP more than once. +.sp +The \fI\%dynlib\-file\fP path should be +specified as an absolute path relative to the new path set by +\fI\%chroot\fP, or as a relative path to the working directory. -.TP -.B python\-script: \fI<python file>\fR -The script file to load. Repeat this option for every python module instance -added to the \fBmodule\-config:\fR option. -.SS "Dynamic Library Module Options" -.LP -The -.B dynlib: -clause gives the settings for the \fIdynlib\fR module. This module is only -a very small wrapper that allows dynamic modules to be loaded on runtime -instead of being compiled into the application. To enable the dynlib module it -has to be compiled into the daemon, and the word "dynlib" has to be put in the -\fBmodule\-config:\fR option. Multiple instances of dynamic libraries are -supported by adding the word "dynlib" more than once. -.LP -The \fBdynlib\-file:\fR path should be specified as an absolute path relative -to the new path set by \fBchroot:\fR option, or as a relative path to the -working directory. -.TP -.B dynlib\-file: \fI<dynlib file>\fR -The dynamic library file to load. Repeat this option for every dynlib module -instance added to the \fBmodule\-config:\fR option. -.SS "DNS64 Module Options" -.LP -The dns64 module must be configured in the \fBmodule\-config:\fR directive -e.g., "dns64 validator iterator" and be compiled into the daemon to be -enabled. These settings go in the \fBserver:\fR section. -.TP -.B dns64\-prefix: \fI<IPv6 prefix>\fR +.INDENT 0.0 +.TP +.B dynlib\-file: \fI<dynlib file>\fP +The dynamic library file to load. +Repeat this option for every dynlib module instance added to the +\fI\%module\-config\fP option. +.UNINDENT +.SS DNS64 Module Options +.sp +The \fBdns64\fP module must be configured in the +\fI\%module\-config\fP directive, e.g.: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +module\-config: \(dqdns64 validator iterator\(dq +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +and be compiled into the daemon to be enabled. +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +These settings go in the \fI\%server:\fP section. +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B dns64\-prefix: \fI<IPv6 prefix>\fP This sets the DNS64 prefix to use to synthesize AAAA records with. -It must be /96 or shorter. The default prefix is 64:ff9b::/96. -.TP -.B dns64\-synthall: \fI<yes or no>\fR -Debug option, default no. If enabled, synthesize all AAAA records -despite the presence of actual AAAA records. -.TP -.B dns64\-ignore\-aaaa: \fI<name>\fR -List domain for which the AAAA records are ignored and the A record is -used by dns64 processing instead. Can be entered multiple times, list a -new domain for which it applies, one per line. Applies also to names -underneath the name given. -.SS "NAT64 Operation" -.LP -NAT64 operation allows using a NAT64 prefix for outbound requests to IPv4-only -servers. It is controlled by two options in the \fBserver:\fR section: -.TP -.B do\-nat64: \fI<yes or no>\fR -Use NAT64 to reach IPv4-only servers. -Consider also enabling \fBprefer\-ip6\fR to prefer native IPv6 connections to -nameservers. -Default no. -.TP -.B nat64\-prefix: \fI<IPv6 prefix>\fR -Use a specific NAT64 prefix to reach IPv4-only servers. Defaults to using -the prefix configured in \fBdns64\-prefix\fR, which in turn defaults to -64:ff9b::/96. The prefix length must be one of /32, /40, /48, /56, /64 or /96. -.SS "DNSCrypt Options" -.LP -The -.B dnscrypt: -clause gives the settings of the dnscrypt channel. While those options are -available, they are only meaningful if Unbound was compiled with -\fB\-\-enable\-dnscrypt\fR. +It must be /96 or shorter. +.sp +Default: 64:ff9b::/96 +.UNINDENT +.INDENT 0.0 +.TP +.B dns64\-synthall: \fI<yes or no>\fP +.sp +\fBWARNING:\fP +.INDENT 7.0 +.INDENT 3.5 +Debugging feature! +.UNINDENT +.UNINDENT +.sp +If enabled, synthesize all AAAA records despite the presence of actual AAAA +records. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B dns64\-ignore\-aaaa: \fI<domain name>\fP +List domain for which the AAAA records are ignored and the A record is used +by DNS64 processing instead. +Can be entered multiple times, list a new domain for which it applies, one +per line. +Applies also to names underneath the name given. +.UNINDENT +.SS NAT64 Operation +.sp +NAT64 operation allows using a NAT64 prefix for outbound requests to IPv4\-only +servers. +It is controlled by two options in the +\fI\%server:\fP section: +.INDENT 0.0 +.TP +.B do\-nat64: \fI<yes or no>\fP +Use NAT64 to reach IPv4\-only servers. +Consider also enabling \fI\%prefer\-ip6\fP +to prefer native IPv6 connections to nameservers. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B nat64\-prefix: \fI<IPv6 prefix>\fP +Use a specific NAT64 prefix to reach IPv4\-only servers. +The prefix length must be one of /32, /40, /48, /56, /64 or /96. +.sp +Default: 64:ff9b::/96 (same as \fI\%dns64\-prefix\fP) +.UNINDENT +.SS DNSCrypt Options +.sp +The \fBdnscrypt:\fP clause gives the settings of the dnscrypt channel. +While those options are available, they are only meaningful if Unbound was +compiled with \fB\-\-enable\-dnscrypt\fP\&. Currently certificate and secret/public keys cannot be generated by Unbound. -You can use dnscrypt-wrapper to generate those: https://github.com/cofyc/\ -dnscrypt-wrapper/blob/master/README.md#usage -.TP -.B dnscrypt\-enable: \fI<yes or no>\fR -Whether or not the \fBdnscrypt\fR config should be enabled. You may define -configuration but not activate it. -The default is no. -.TP -.B dnscrypt\-port: \fI<port number> -On which port should \fBdnscrypt\fR should be activated. Note that you should -have a matching \fBinterface\fR option defined in the \fBserver\fR section for -this port. -.TP -.B dnscrypt\-provider: \fI<provider name>\fR -The provider name to use to distribute certificates. This is of the form: -\fB2.dnscrypt-cert.example.com.\fR. The name \fIMUST\fR end with a dot. -.TP -.B dnscrypt\-secret\-key: \fI<path to secret key file>\fR -Path to the time limited secret key file. This option may be specified multiple -times. -.TP -.B dnscrypt\-provider\-cert: \fI<path to cert file>\fR -Path to the certificate related to the \fBdnscrypt\-secret\-key\fRs. +You can use dnscrypt\-wrapper to generate those: +\fI\%https://github.com/cofyc/dnscrypt\-wrapper/blob/master/README.md#usage\fP +.INDENT 0.0 +.TP +.B dnscrypt\-enable: \fI<yes or no>\fP +Whether or not the dnscrypt config should be enabled. +You may define configuration but not activate it. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-port: \fI<port number>\fP +On which port should dnscrypt should be activated. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +There should be a matching interface option defined in the +\fI\%server:\fP section for this port. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-provider: \fI<provider name>\fP +The provider name to use to distribute certificates. +This is of the form: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +2.dnscrypt\-cert.example.com. +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +\fBIMPORTANT:\fP +.INDENT 7.0 +.INDENT 3.5 +The name \fIMUST\fP end with a dot. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-secret\-key: \fI<path to secret key file>\fP +Path to the time limited secret key file. This option may be specified multiple times. +.UNINDENT +.INDENT 0.0 .TP -.B dnscrypt\-provider\-cert\-rotated: \fI<path to cert file>\fR -Path to a certificate that we should be able to serve existing connection from -but do not want to advertise over \fBdnscrypt\-provider\fR's TXT record certs -distribution. -A typical use case is when rotating certificates, existing clients may still use -the client magic from the old cert in their queries until they fetch and update -the new cert. Likewise, it would allow one to prime the new cert/key without -distributing the new cert yet, this can be useful when using a network of -servers using anycast and on which the configuration may not get updated at the -exact same time. By priming the cert, the servers can handle both old and new -certs traffic while distributing only one. +.B dnscrypt\-provider\-cert: \fI<path to cert file>\fP +Path to the certificate related to the +\fI\%dnscrypt\-secret\-key\fP\&. This option may be specified multiple times. -.TP -.B dnscrypt\-shared\-secret\-cache\-size: \fI<memory size> -Give the size of the data structure in which the shared secret keys are kept -in. Default 4m. In bytes or use m(mega), k(kilo), g(giga). -The shared secret cache is used when a same client is making multiple queries -using the same public key. It saves a substantial amount of CPU. -.TP -.B dnscrypt\-shared\-secret\-cache\-slabs: \fI<number> -Give power of 2 number of slabs, this is used to reduce lock contention -in the dnscrypt shared secrets cache. Close to the number of cpus is -a fairly good setting. -.TP -.B dnscrypt\-nonce\-cache\-size: \fI<memory size> +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-provider\-cert\-rotated: \fI<path to cert file>\fP +Path to a certificate that we should be able to serve existing connection +from but do not want to advertise over +\fI\%dnscrypt\-provider\fP \(aqs TXT +record certs distribution. +.sp +A typical use case is when rotating certificates, existing clients may +still use the client magic from the old cert in their queries until they +fetch and update the new cert. +Likewise, it would allow one to prime the new cert/key without distributing +the new cert yet, this can be useful when using a network of servers using +anycast and on which the configuration may not get updated at the exact +same time. +.sp +By priming the cert, the servers can handle both old and new certs traffic +while distributing only one. +.sp +This option may be specified multiple times. +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-shared\-secret\-cache\-size: \fI<memory size>\fP +Give the size of the data structure in which the shared secret keys are +kept in. +In bytes or use m(mega), k(kilo), g(giga). +The shared secret cache is used when a same client is making multiple +queries using the same public key. +It saves a substantial amount of CPU. +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-shared\-secret\-cache\-slabs: \fI<number>\fP +Number of slabs in the dnscrypt shared secrets cache. +Slabs reduce lock contention by threads. +Must be set to a power of 2. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-nonce\-cache\-size: \fI<memory size>\fP Give the size of the data structure in which the client nonces are kept in. -Default 4m. In bytes or use m(mega), k(kilo), g(giga). -The nonce cache is used to prevent dnscrypt message replaying. Client nonce -should be unique for any pair of client pk/server sk. -.TP -.B dnscrypt\-nonce\-cache\-slabs: \fI<number> -Give power of 2 number of slabs, this is used to reduce lock contention -in the dnscrypt nonce cache. Close to the number of cpus is -a fairly good setting. -.SS "EDNS Client Subnet Module Options" -.LP -The ECS module must be configured in the \fBmodule\-config:\fR directive e.g., -"subnetcache validator iterator" and be compiled into the daemon to be -enabled. These settings go in the \fBserver:\fR section. -.LP +In bytes or use m(mega), k(kilo), g(giga). +The nonce cache is used to prevent dnscrypt message replaying. +Client nonce should be unique for any pair of client pk/server sk. +.sp +Default: 4m +.UNINDENT +.INDENT 0.0 +.TP +.B dnscrypt\-nonce\-cache\-slabs: \fI<number>\fP +Number of slabs in the dnscrypt nonce cache. +Slabs reduce lock contention by threads. +Must be set to a power of 2. +Setting (close) to the number of cpus is a fairly good setting. +If left unconfigured, it will be configured automatically to be a power of +2 close to the number of configured threads in multi\-threaded environments. +.sp +Default: (unconfigured) +.UNINDENT +.SS EDNS Client Subnet Module Options +.sp +The ECS module must be configured in the +\fI\%module\-config\fP directive, e.g.: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +module\-config: \(dqsubnetcache validator iterator\(dq +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +and be compiled into the daemon to be enabled. +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +These settings go in the \fI\%server:\fP section. +.UNINDENT +.UNINDENT +.sp If the destination address is allowed in the configuration Unbound will add the -EDNS0 option to the query containing the relevant part of the client's address. -When an answer contains the ECS option the response and the option are placed in -a specialized cache. If the authority indicated no support, the response is -stored in the regular cache. -.LP +EDNS0 option to the query containing the relevant part of the client\(aqs address. +When an answer contains the ECS option the response and the option are placed +in a specialized cache. +If the authority indicated no support, the response is stored in the regular +cache. +.sp Additionally, when a client includes the option in its queries, Unbound will forward the option when sending the query to addresses that are explicitly -allowed in the configuration using \fBsend\-client\-subnet\fR. The option will -always be forwarded, regardless the allowed addresses, if -\fBclient\-subnet\-always\-forward\fR is set to yes. In this case the lookup in -the regular cache is skipped. -.LP -The maximum size of the ECS cache is controlled by 'msg-cache-size' in the -configuration file. On top of that, for each query only 100 different subnets -are allowed to be stored for each address family. Exceeding that number, older -entries will be purged from cache. -.LP +allowed in the configuration using +\fI\%send\-client\-subnet\fP\&. +The option will always be forwarded, regardless the allowed addresses, when +\fI\%client\-subnet\-always\-forward: yes\fP +is set. +In this case the lookup in the regular cache is skipped. +.sp +The maximum size of the ECS cache is controlled by +\fI\%msg\-cache\-size\fP in the configuration file. +On top of that, for each query only 100 different subnets are allowed to be +stored for each address family. +Exceeding that number, older entries will be purged from cache. +.sp Note that due to the nature of how EDNS Client Subnet works, by segregating the client IP space in order to try and have tailored responses for prefixes of unknown sizes, resolution and cache response performance are impacted as a @@ -2656,416 +4742,706 @@ Usage of the subnetcache module should only be enabled in installations that require such functionality where the resolver and the clients belong to different networks. An example of that is an open resolver installation. -.LP -This module does not interact with the \fBserve\-expired*\fR and -\fBprefetch:\fR options. -.TP -.B send\-client\-subnet: \fI<IP address>\fR -Send client source address to this authority. Append /num to indicate a -classless delegation netblock, for example like 10.2.3.4/24 or 2001::11/64. Can -be given multiple times. Authorities not listed will not receive edns-subnet -information, unless domain in query is specified in \fBclient\-subnet\-zone\fR. -.TP -.B client\-subnet\-zone: \fI<domain>\fR -Send client source address in queries for this domain and its subdomains. Can be -given multiple times. Zones not listed will not receive edns-subnet information, -unless hosted by authority specified in \fBsend\-client\-subnet\fR. -.TP -.B client\-subnet\-always\-forward: \fI<yes or no>\fR +.sp +This module does not interact with the +\fI\%serve\-expired*\fP and +\fI\%prefetch\fP options. +.INDENT 0.0 +.TP +.B send\-client\-subnet: \fI<IP address>\fP +Send client source address to this authority. +Append /num to indicate a classless delegation netblock, for example like +\fB10.2.3.4/24\fP or \fB2001::11/64\fP\&. +Can be given multiple times. +Authorities not listed will not receive edns\-subnet information, unless +domain in query is specified in +\fI\%client\-subnet\-zone\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B client\-subnet\-zone: \fI<domain>\fP +Send client source address in queries for this domain and its subdomains. +Can be given multiple times. +Zones not listed will not receive edns\-subnet information, unless hosted by +authority specified in +\fI\%send\-client\-subnet\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B client\-subnet\-always\-forward: \fI<yes or no>\fP Specify whether the ECS address check (configured using -\fBsend\-client\-subnet\fR) is applied for all queries, even if the triggering -query contains an ECS record, or only for queries for which the ECS record is -generated using the querier address (and therefore did not contain ECS data in -the client query). If enabled, the address check is skipped when the client -query contains an ECS record. And the lookup in the regular cache is skipped. -Default is no. -.TP -.B max\-client\-subnet\-ipv6: \fI<number>\fR -Specifies the maximum prefix length of the client source address we are willing -to expose to third parties for IPv6. Defaults to 56. -.TP -.B max\-client\-subnet\-ipv4: \fI<number>\fR -Specifies the maximum prefix length of the client source address we are willing -to expose to third parties for IPv4. Defaults to 24. -.TP -.B min\-client\-subnet\-ipv6: \fI<number>\fR -Specifies the minimum prefix length of the IPv6 source mask we are willing to -accept in queries. Shorter source masks result in REFUSED answers. Source mask -of 0 is always accepted. Default is 0. -.TP -.B min\-client\-subnet\-ipv4: \fI<number>\fR -Specifies the minimum prefix length of the IPv4 source mask we are willing to -accept in queries. Shorter source masks result in REFUSED answers. Source mask -of 0 is always accepted. Default is 0. -.TP -.B max\-ecs\-tree\-size\-ipv4: \fI<number>\fR -Specifies the maximum number of subnets ECS answers kept in the ECS radix tree. -This number applies for each qname/qclass/qtype tuple. Defaults to 100. -.TP -.B max\-ecs\-tree\-size\-ipv6: \fI<number>\fR -Specifies the maximum number of subnets ECS answers kept in the ECS radix tree. -This number applies for each qname/qclass/qtype tuple. Defaults to 100. -.SS "Opportunistic IPsec Support Module Options" -.LP -The IPsec module must be configured in the \fBmodule\-config:\fR directive -e.g., "ipsecmod validator iterator" and be compiled into Unbound by using -\fB\-\-enable\-ipsecmod\fR to be enabled. -These settings go in the \fBserver:\fR section. -.LP +\fI\%send\-client\-subnet\fP) is applied +for all queries, even if the triggering query contains an ECS record, or +only for queries for which the ECS record is generated using the querier +address (and therefore did not contain ECS data in the client query). +If enabled, the address check is skipped when the client query contains an +ECS record. +And the lookup in the regular cache is skipped. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B max\-client\-subnet\-ipv6: \fI<number>\fP +Specifies the maximum prefix length of the client source address we are +willing to expose to third parties for IPv6. +.sp +Default: 56 +.UNINDENT +.INDENT 0.0 +.TP +.B max\-client\-subnet\-ipv4: \fI<number>\fP +Specifies the maximum prefix length of the client source address we are +willing to expose to third parties for IPv4. +.sp +Default: 24 +.UNINDENT +.INDENT 0.0 +.TP +.B min\-client\-subnet\-ipv6: \fI<number>\fP +Specifies the minimum prefix length of the IPv6 source mask we are willing +to accept in queries. +Shorter source masks result in REFUSED answers. +Source mask of 0 is always accepted. +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B min\-client\-subnet\-ipv4: \fI<number>\fP +Specifies the minimum prefix length of the IPv4 source mask we are willing +to accept in queries. +Shorter source masks result in REFUSED answers. +Source mask of 0 is always accepted. +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B max\-ecs\-tree\-size\-ipv4: \fI<number>\fP +Specifies the maximum number of subnets ECS answers kept in the ECS radix +tree. +This number applies for each qname/qclass/qtype tuple. +.sp +Default: 100 +.UNINDENT +.INDENT 0.0 +.TP +.B max\-ecs\-tree\-size\-ipv6: \fI<number>\fP +Specifies the maximum number of subnets ECS answers kept in the ECS radix +tree. +This number applies for each qname/qclass/qtype tuple. +.sp +Default: 100 +.UNINDENT +.SS Opportunistic IPsec Support Module Options +.sp +The IPsec module must be configured in the +\fI\%module\-config\fP directive, e.g.: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +module\-config: \(dqipsecmod validator iterator\(dq +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +and be compiled into Unbound by using \fB\-\-enable\-ipsecmod\fP to be enabled. +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +These settings go in the \fI\%server:\fP section. +.UNINDENT +.UNINDENT +.sp When Unbound receives an A/AAAA query that is not in the cache and finds a valid answer, it will withhold returning the answer and instead will generate -an IPSECKEY subquery for the same domain name. If an answer was found, Unbound -will call an external hook passing the following arguments: -.TP 10 -\h'5'\fIQNAME\fR -Domain name of the A/AAAA and IPSECKEY query. In string format. -.TP 10 -\h'5'\fIIPSECKEY TTL\fR +an IPSECKEY subquery for the same domain name. +If an answer was found, Unbound will call an external hook passing the +following arguments: +.INDENT 0.0 +.TP +.B QNAME +Domain name of the A/AAAA and IPSECKEY query. +In string format. +.TP +.B IPSECKEY TTL TTL of the IPSECKEY RRset. -.TP 10 -\h'5'\fIA/AAAA\fR -String of space separated IP addresses present in the A/AAAA RRset. The IP -addresses are in string format. -.TP 10 -\h'5'\fIIPSECKEY\fR -String of space separated IPSECKEY RDATA present in the IPSECKEY RRset. The -IPSECKEY RDATA are in DNS presentation format. -.LP -The A/AAAA answer is then cached and returned to the client. If the external -hook was called the TTL changes to ensure it doesn't surpass -\fBipsecmod-max-ttl\fR. -.LP -The same procedure is also followed when \fBprefetch:\fR is used, but the -A/AAAA answer is given to the client before the hook is called. -\fBipsecmod-max-ttl\fR ensures that the A/AAAA answer given from cache is still -relevant for opportunistic IPsec. -.TP -.B ipsecmod-enabled: \fI<yes or no>\fR -Specifies whether the IPsec module is enabled or not. The IPsec module still -needs to be defined in the \fBmodule\-config:\fR directive. This option -facilitates turning on/off the module without restarting/reloading Unbound. -Defaults to yes. -.TP -.B ipsecmod\-hook: \fI<filename>\fR -Specifies the external hook that Unbound will call with \fIsystem\fR(3). The -file can be specified as an absolute/relative path. The file needs the proper -permissions to be able to be executed by the same user that runs Unbound. It -must be present when the IPsec module is defined in the \fBmodule\-config:\fR -directive. -.TP -.B ipsecmod-strict: \fI<yes or no>\fR -If enabled Unbound requires the external hook to return a success value of 0. -Failing to do so Unbound will reply with SERVFAIL. The A/AAAA answer will also -not be cached. Defaults to no. -.TP -.B ipsecmod\-max-ttl: \fI<seconds>\fR -Time to live maximum for A/AAAA cached records after calling the external hook. -Defaults to 3600. -.TP -.B ipsecmod-ignore-bogus: \fI<yes or no>\fR -Specifies the behaviour of Unbound when the IPSECKEY answer is bogus. If set -to yes, the hook will be called and the A/AAAA answer will be returned to the -client. If set to no, the hook will not be called and the answer to the -A/AAAA query will be SERVFAIL. Mainly used for testing. Defaults to no. -.TP -.B ipsecmod\-allow: \fI<domain>\fR -Allow the ipsecmod functionality for the domain so that the module logic will be -executed. Can be given multiple times, for different domains. If the option is -not specified, all domains are treated as being allowed (default). -.TP -.B ipsecmod\-whitelist: \fI<domain> -Alternate syntax for \fBipsecmod\-allow\fR. -.SS "Cache DB Module Options" -.LP -The Cache DB module must be configured in the \fBmodule\-config:\fR directive -e.g., "validator cachedb iterator" and be compiled into the daemon -with \fB\-\-enable\-cachedb\fR. -If this module is enabled and configured, the specified backend database -works as a second level cache: -When Unbound cannot find an answer to a query in its built-in in-memory -cache, it consults the specified backend. -If it finds a valid answer in the backend, Unbound uses it to respond -to the query without performing iterative DNS resolution. -If Unbound cannot even find an answer in the backend, it resolves the -query as usual, and stores the answer in the backend. -.P -This module interacts with the \fBserve\-expired\-*\fR options and will reply -with expired data if Unbound is configured for that. -.P -If Unbound was built with -\fB\-\-with\-libhiredis\fR -on a system that has installed the hiredis C client library of Redis, -then the "redis" backend can be used. -This backend communicates with the specified Redis server over a TCP -connection to store and retrieve cache data. -It can be used as a persistent and/or shared cache backend. -It should be noted that Unbound never removes data stored in the Redis server, -even if some data have expired in terms of DNS TTL or the Redis server has -cached too much data; -if necessary the Redis server must be configured to limit the cache size, -preferably with some kind of least-recently-used eviction policy. -Additionally, the \fBredis\-expire\-records\fR option can be used in order to -set the relative DNS TTL of the message as timeout to the Redis records; keep -in mind that some additional memory is used per key and that the expire -information is stored as absolute Unix timestamps in Redis (computer time must -be stable). -This backend uses synchronous communication with the Redis server -based on the assumption that the communication is stable and sufficiently -fast. -The thread waiting for a response from the Redis server cannot handle -other DNS queries. -Although the backend has the ability to reconnect to the server when -the connection is closed unexpectedly and there is a configurable timeout -in case the server is overly slow or hangs up, these cases are assumed -to be very rare. -If connection close or timeout happens too often, Unbound will be -effectively unusable with this backend. -It's the administrator's responsibility to make the assumption hold. -.P -The -.B cachedb: -clause gives custom settings of the cache DB module. .TP -.B backend: \fI<backend name>\fR +.B A/AAAA +String of space separated IP addresses present in the A/AAAA RRset. +The IP addresses are in string format. +.TP +.B IPSECKEY +String of space separated IPSECKEY RDATA present in the IPSECKEY RRset. +The IPSECKEY RDATA are in DNS presentation format. +.UNINDENT +.sp +The A/AAAA answer is then cached and returned to the client. +If the external hook was called the TTL changes to ensure it doesn\(aqt surpass +\fI\%ipsecmod\-max\-ttl\fP\&. +.sp +The same procedure is also followed when +\fI\%prefetch: yes\fP is set, but the A/AAAA answer is +given to the client before the hook is called. +\fI\%ipsecmod\-max\-ttl\fP ensures that the A/AAAA +answer given from cache is still relevant for opportunistic IPsec. +.INDENT 0.0 +.TP +.B ipsecmod\-enabled: \fI<yes or no>\fP +Specifies whether the IPsec module is enabled or not. +The IPsec module still needs to be defined in the +\fI\%module\-config\fP directive. +This option facilitates turning on/off the module without +restarting/reloading Unbound. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B ipsecmod\-hook: \fI<filename>\fP +Specifies the external hook that Unbound will call with \fIsystem(3)\fP\&. +The file can be specified as an absolute/relative path. +The file needs the proper permissions to be able to be executed by the same +user that runs Unbound. +It must be present when the IPsec module is defined in the +\fI\%module\-config\fP directive. +.UNINDENT +.INDENT 0.0 +.TP +.B ipsecmod\-strict: \fI<yes or no>\fP +If enabled Unbound requires the external hook to return a success value of +0. +Failing to do so Unbound will reply with SERVFAIL. +The A/AAAA answer will also not be cached. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ipsecmod\-max\-ttl: \fI<seconds>\fP +Time to live maximum for A/AAAA cached records after calling the external +hook. +.sp +Default: 3600 +.UNINDENT +.INDENT 0.0 +.TP +.B ipsecmod\-ignore\-bogus: \fI<yes or no>\fP +Specifies the behaviour of Unbound when the IPSECKEY answer is bogus. +If set to yes, the hook will be called and the A/AAAA answer will be +returned to the client. +If set to no, the hook will not be called and the answer to the A/AAAA +query will be SERVFAIL. +Mainly used for testing. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B ipsecmod\-allow: \fI<domain>\fP +Allow the IPsec module functionality for the domain so that the module +logic will be executed. +Can be given multiple times, for different domains. +If the option is not specified, all domains are treated as being allowed +(default). +.UNINDENT +.INDENT 0.0 +.TP +.B ipsecmod\-whitelist: \fI<domain>\fP +Alternate syntax for \fI\%ipsecmod\-allow\fP\&. +.UNINDENT +.SS Cache DB Module Options +.sp +The Cache DB module must be configured in the +\fI\%module\-config\fP directive, e.g.: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +module\-config: \(dqvalidator cachedb iterator\(dq +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +and be compiled into the daemon with \fB\-\-enable\-cachedb\fP\&. +.sp +If this module is enabled and configured, the specified backend database works +as a second level cache; when Unbound cannot find an answer to a query in its +built\-in in\-memory cache, it consults the specified backend. +If it finds a valid answer in the backend, Unbound uses it to respond to the +query without performing iterative DNS resolution. +If Unbound cannot even find an answer in the backend, it resolves the query as +usual, and stores the answer in the backend. +.sp +This module interacts with the \fIserve\-expired\-*\fP options and will reply with +expired data if Unbound is configured for that. +.sp +If Unbound was built with \fB\-\-with\-libhiredis\fP on a system that has installed +the hiredis C client library of Redis, then the \fBredis\fP backend can be used. +This backend communicates with the specified Redis server over a TCP connection +to store and retrieve cache data. +It can be used as a persistent and/or shared cache backend. +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +Unbound never removes data stored in the Redis server, even if some data +have expired in terms of DNS TTL or the Redis server has cached too much +data; if necessary the Redis server must be configured to limit the cache +size, preferably with some kind of least\-recently\-used eviction policy. +.UNINDENT +.UNINDENT +.sp +Additionally, the +\fI\%redis\-expire\-records\fP option +can be used in order to set the relative DNS TTL of the message as timeout to +the Redis records; keep in mind that some additional memory is used per key and +that the expire information is stored as absolute Unix timestamps in Redis +(computer time must be stable). +.sp +This backend uses synchronous communication with the Redis server based on the +assumption that the communication is stable and sufficiently fast. +The thread waiting for a response from the Redis server cannot handle other DNS +queries. +Although the backend has the ability to reconnect to the server when the +connection is closed unexpectedly and there is a configurable timeout in case +the server is overly slow or hangs up, these cases are assumed to be very rare. +If connection close or timeout happens too often, Unbound will be effectively +unusable with this backend. +It\(aqs the administrator\(aqs responsibility to make the assumption hold. +.sp +The \fBcachedb:\fP clause gives custom settings of the cache DB module. +.INDENT 0.0 +.TP +.B backend: \fI<backend name>\fP Specify the backend database name. -The default database is the in-memory backend named "testframe", which, +The default database is the in\-memory backend named \fBtestframe\fP, which, as the name suggests, is not of any practical use. -Depending on the build-time configuration, "redis" backend may also be +Depending on the build\-time configuration, \fBredis\fP backend may also be used as described above. +.sp +Default: testframe +.UNINDENT +.INDENT 0.0 .TP -.B secret-seed: \fI<"secret string">\fR +.B secret\-seed: \fI\(dq<secret string>\(dq\fP Specify a seed to calculate a hash value from query information. This value will be used as the key of the corresponding answer for the -backend database and can be customized if the hash should not be predictable -operationally. -If the backend database is shared by multiple Unbound instances, -all instances must use the same secret seed. -This option defaults to "default". -.TP -.B cachedb-no-store: \fI<yes or no>\fR -If the backend should be read from, but not written to. This makes this -instance not store dns messages in the backend. But if data is available it -is retrieved. The default is no. -.TP -.B cachedb-check-when-serve-expired: \fI<yes or no>\fR +backend database and can be customized if the hash should not be +predictable operationally. +If the backend database is shared by multiple Unbound instances, all +instances must use the same secret seed. +.sp +Default: \(dqdefault\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B cachedb\-no\-store: \fI<yes or no>\fP +If the backend should be read from, but not written to. +This makes this instance not store dns messages in the backend. +But if data is available it is retrieved. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B cachedb\-check\-when\-serve\-expired: \fI<yes or no>\fP If enabled, the cachedb is checked before an expired response is returned. -When \fBserve\-expired\fR is enabled, without \fBserve\-expired\-client\-timeout\fR, it then -does not immediately respond with an expired response from cache, but instead -first checks the cachedb for valid contents, and if so returns it. If the -cachedb also has no valid contents, the serve expired response is sent. -If also \fBserve\-expired\-client\-timeout\fR is enabled, the expired response -is delayed until the timeout expires. Unless the lookup succeeds within the -timeout. The default is yes. -.P -The following -.B cachedb -options are specific to the redis backend. -.TP -.B redis-server-host: \fI<server address or name>\fR +When +\fI\%serve\-expired\fP +is enabled, without +\fI\%serve\-expired\-client\-timeout\fP +, it then does not immediately respond with an expired response from cache, +but instead first checks the cachedb for valid contents, and if so returns it. +If the cachedb also has no valid contents, the serve expired response is sent. +If also +\fI\%serve\-expired\-client\-timeout\fP +is enabled, the expired response is delayed until the timeout expires. +Unless the lookup succeeds within the timeout. +.sp +Default: yes +.UNINDENT +.sp +The following \fBcachedb:\fP options are specific to the \fBredis\fP backend. +.INDENT 0.0 +.TP +.B redis\-server\-host: \fI<server address or name>\fP The IP (either v6 or v4) address or domain name of the Redis server. -In general an IP address should be specified as otherwise Unbound will have to -resolve the name of the server every time it establishes a connection -to the server. -This option defaults to "127.0.0.1". -.TP -.B redis-server-port: \fI<port number>\fR +In general an IP address should be specified as otherwise Unbound will have +to resolve the name of the server every time it establishes a connection to +the server. +.sp +Default: 127.0.0.1 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-server\-port: \fI<port number>\fP The TCP port number of the Redis server. -This option defaults to 6379. -.TP -.B redis-server-path: \fI<unix socket path>\fR -The unix socket path to connect to the Redis server. Off by default, and it -can be set to "" to turn this off. Unix sockets may have better throughput -than the IP address option. -.TP -.B redis-server-password: \fI"<password>"\fR +.sp +Default: 6379 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-server\-path: \fI<unix socket path>\fP +The unix socket path to connect to the Redis server. +Unix sockets may have better throughput than the IP address option. +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-server\-password: \fI\(dq<password>\(dq\fP The Redis AUTH password to use for the Redis server. Only relevant if Redis is configured for client password authorisation. -Off by default, and it can be set to "" to turn this off. -.TP -.B redis-timeout: \fI<msec>\fR -The period until when Unbound waits for a response from the Redis sever. -If this timeout expires Unbound closes the connection, treats it as -if the Redis server does not have the requested data, and will try to -re-establish a new connection later. -This option defaults to 100 milliseconds. -.TP -.B redis-command-timeout: \fI<msec>\fR +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-timeout: \fI<msec>\fP +The period until when Unbound waits for a response from the Redis server. +If this timeout expires Unbound closes the connection, treats it as if the +Redis server does not have the requested data, and will try to re\-establish +a new connection later. +.sp +Default: 100 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-command\-timeout: \fI<msec>\fP The timeout to use for Redis commands, in milliseconds. -If 0, it uses the \fBredis\-timeout\fR value. -The default is 0. -.TP -.B redis-connect-timeout: \fI<msec>\fR +If \fB0\fP, it uses the +\fI\%redis\-timeout\fP +value. +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-connect\-timeout: \fI<msec>\fP The timeout to use for Redis connection set up, in milliseconds. -If 0, it uses the \fBredis\-timeout\fR value. -The default is 0. -.TP -.B redis-expire-records: \fI<yes or no> -If Redis record expiration is enabled. If yes, Unbound sets timeout for Redis -records so that Redis can evict keys that have expired automatically. If -Unbound is configured with \fBserve-expired\fR and \fBserve-expired-ttl\fR is 0, -this option is internally reverted to "no". Redis SETEX support is required -for this option (Redis >= 2.0.0). -This option defaults to no. -.TP -.B redis-logical-db: \fI<logical database index> +If \fB0\fP, it uses the +\fI\%redis\-timeout\fP +value. +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-expire\-records: \fI<yes or no>\fP +If Redis record expiration is enabled. +If yes, Unbound sets timeout for Redis records so that Redis can evict keys +that have expired automatically. +If Unbound is configured with +\fI\%serve\-expired\fP and +\fI\%serve\-expired\-ttl: 0\fP, this option is +internally reverted to \(dqno\(dq. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +Redis \(dqSET ... EX\(dq support is required for this option (Redis >= 2.6.12). +.UNINDENT +.UNINDENT +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-logical\-db: \fI<logical database index>\fP The logical database in Redis to use. -These are databases in the same Redis instance sharing the same configuration -and persisted in the same RDB/AOF file. +These are databases in the same Redis instance sharing the same +configuration and persisted in the same RDB/AOF file. If unsure about using this option, Redis documentation -(https://redis.io/commands/select/) suggests not to use a single Redis instance -for multiple unrelated applications. +(\fI\%https://redis.io/commands/select/\fP) suggests not to use a single Redis +instance for multiple unrelated applications. The default database in Redis is 0 while other logical databases need to be -explicitly SELECT'ed upon connecting. -This option defaults to 0. -.TP -.B redis-replica-server-host: \fI<server address or name>\fR -The IP (either v6 or v4) address or domain name of the Redis replica server. -In general an IP address should be specified as otherwise Unbound will have to -resolve the name of the server every time it establishes a connection -to the server. -This server is treated as a read-only replica server -(https://redis.io/docs/management/replication/#read-only-replica). -If specified, all Redis read commands will go to this replica server, while -the write commands will go to the \fBredis-server-host\fR. -This option defaults to "" (disabled). +explicitly SELECT\(aqed upon connecting. +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 .TP -.B redis-replica-server-port: \fI<port number>\fR +.B redis\-replica\-server\-host: \fI<server address or name>\fP +The IP (either v6 or v4) address or domain name of the Redis server. +In general an IP address should be specified as otherwise Unbound will have +to resolve the name of the server every time it establishes a connection to +the server. +.sp +This server is treated as a read\-only replica server +(\fI\%https://redis.io/docs/management/replication/#read\-only\-replica\fP). +If specified, all Redis read commands will go to this replica server, while +the write commands will go to the +\fI\%redis\-server\-host\fP\&. +.sp +Default: \(dq\(dq (disabled). +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-replica\-server\-port: \fI<port number>\fP The TCP port number of the Redis replica server. -This option defaults to 6379. -.TP -.B redis-replica-server-path: \fI<unix socket path>\fR -The unix socket path to connect to the Redis server. Off by default, and it -can be set to "" to turn this off. Unix sockets may have better throughput -than the IP address option. -.TP -.B redis-replica-server-password: \fI"<password>"\fR -The Redis AUTH password to use for the Redis replica server. +.sp +Default: 6379 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-replica\-server\-path: \fI<unix socket path>\fP +The unix socket path to connect to the Redis replica server. +Unix sockets may have better throughput than the IP address option. +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-replica\-server\-password: \fI\(dq<password>\(dq\fP +The Redis AUTH password to use for the Redis server. Only relevant if Redis is configured for client password authorisation. -Off by default, and it can be set to "" to turn this off. +.sp +Default: \(dq\(dq (disabled) +.UNINDENT +.INDENT 0.0 .TP -.B redis-replica-timeout: \fI<msec>\fR -The period until when Unbound waits for a response from the Redis replica sever. -If this timeout expires Unbound closes the connection, treats it as -if the Redis replica server does not have the requested data, and will try to -re-establish a new connection later. -This option defaults to 100 milliseconds. -.TP -.B redis-replica-command-timeout: \fI<msec>\fR +.B redis\-replica\-timeout: \fI<msec>\fP +The period until when Unbound waits for a response from the Redis replica +server. +If this timeout expires Unbound closes the connection, treats it as if the +Redis server does not have the requested data, and will try to re\-establish +a new connection later. +.sp +Default: 100 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-replica\-command\-timeout: \fI<msec>\fP The timeout to use for Redis replica commands, in milliseconds. -If 0, it uses the \fBredis\-replica\-timeout\fR value. -The default is 0. -.TP -.B redis-replica-connect-timeout: \fI<msec>\fR +If \fB0\fP, it uses the +\fI\%redis\-replica\-timeout\fP +value. +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-replica\-connect\-timeout: \fI<msec>\fP The timeout to use for Redis replica connection set up, in milliseconds. -If 0, it uses the \fBredis\-replica\-timeout\fR value. -The default is 0. -.TP -.B redis-replica-logical-db: \fI<logical database index> -Same as \fBredis-logical-db\fR but for the Redis replica server. -This option defaults to 0. +If \fB0\fP, it uses the +\fI\%redis\-replica\-timeout\fP +value. +.sp +Default: 0 +.UNINDENT +.INDENT 0.0 +.TP +.B redis\-replica\-logical\-db: \fI<logical database index>\fP +Same as \fI\%redis\-logical\-db\fP but +for the Redis replica server. +.sp +Default: 0 +.UNINDENT .SS DNSTAP Logging Options -DNSTAP support, when compiled in by using \fB\-\-enable\-dnstap\fR, is enabled -in the \fBdnstap:\fR section. -This starts an extra thread (when compiled with threading) that writes -the log information to the destination. If Unbound is compiled without -threading it does not spawn a thread, but connects per-process to the -destination. -.TP -.B dnstap-enable: \fI<yes or no> -If dnstap is enabled. Default no. If yes, it connects to the dnstap server -and if any of the dnstap-log-..-messages options is enabled it sends logs -for those messages to the server. -.TP -.B dnstap-bidirectional: \fI<yes or no> -Use frame streams in bidirectional mode to transfer DNSTAP messages. Default is -yes. -.TP -.B dnstap-socket-path: \fI<file name> +.sp +DNSTAP support, when compiled in by using \fB\-\-enable\-dnstap\fP, is enabled in +the \fBdnstap:\fP section. +This starts an extra thread (when compiled with threading) that writes the log +information to the destination. +If Unbound is compiled without threading it does not spawn a thread, but +connects per\-process to the destination. +.INDENT 0.0 +.TP +.B dnstap\-enable: \fI<yes or no>\fP +If dnstap is enabled. +If yes, it connects to the DNSTAP server and if any of the +\fIdnstap\-log\-..\-messages:\fP options is enabled it sends logs for those +messages to the server. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-bidirectional: \fI<yes or no>\fP +Use frame streams in bidirectional mode to transfer DNSTAP messages. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-socket\-path: \fI<file name>\fP Sets the unix socket file name for connecting to the server that is -listening on that socket. Default is "@DNSTAP_SOCKET_PATH@". -.TP -.B dnstap-ip: \fI<IPaddress[@port]> -If "", the unix socket is used, if set with an IP address (IPv4 or IPv6) -that address is used to connect to the server. -.TP -.B dnstap-tls: \fI<yes or no> -Set this to use TLS to connect to the server specified in \fBdnstap-ip\fR. -The default is yes. If set to no, TCP is used to connect to the server. -.TP -.B dnstap-tls-server-name: \fI<name of TLS authentication> -The TLS server name to authenticate the server with. Used when \fBdnstap-tls\fR is enabled. If "" it is ignored, default "". -.TP -.B dnstap-tls-cert-bundle: \fI<file name of cert bundle> -The pem file with certs to verify the TLS server certificate. If "" the -server default cert bundle is used, or the windows cert bundle on windows. -Default is "". -.TP -.B dnstap-tls-client-key-file: \fI<file name> -The client key file for TLS client authentication. If "" client -authentication is not used. Default is "". -.TP -.B dnstap-tls-client-cert-file: \fI<file name> -The client cert file for TLS client authentication. Default is "". -.TP -.B dnstap-send-identity: \fI<yes or no> +listening on that socket. +.sp +Default: @DNSTAP_SOCKET_PATH@ +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-ip: \fI<IPaddress[@port]>\fP +If \fB\(dq\(dq\fP, the unix socket is used, if set with an IP address (IPv4 or +IPv6) that address is used to connect to the server. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-tls: \fI<yes or no>\fP +Set this to use TLS to connect to the server specified in +\fI\%dnstap\-ip\fP\&. +If set to no, TCP is used to connect to the server. +.sp +Default: yes +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-tls\-server\-name: \fI<name of TLS authentication>\fP +The TLS server name to authenticate the server with. +Used when \fI\%dnstap\-tls: yes\fP is set. +If \fB\(dq\(dq\fP it is ignored. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-tls\-cert\-bundle: \fI<file name of cert bundle>\fP +The pem file with certs to verify the TLS server certificate. +If \fB\(dq\(dq\fP the server default cert bundle is used, or the windows cert +bundle on windows. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-tls\-client\-key\-file: \fI<file name>\fP +The client key file for TLS client authentication. +If \fB\(dq\(dq\fP client authentication is not used. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-tls\-client\-cert\-file: \fI<file name>\fP +The client cert file for TLS client authentication. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-send\-identity: \fI<yes or no>\fP If enabled, the server identity is included in the log messages. -Default is no. +.sp +Default: no +.UNINDENT +.INDENT 0.0 .TP -.B dnstap-send-version: \fI<yes or no> +.B dnstap\-send\-version: \fI<yes or no>\fP If enabled, the server version if included in the log messages. -Default is no. -.TP -.B dnstap-identity: \fI<string> -The identity to send with messages, if "" the hostname is used. -Default is "". -.TP -.B dnstap-version: \fI<string> -The version to send with messages, if "" the package version is used. -Default is "". -.TP -.B dnstap-sample-rate: \fI<number> -The sample rate for log of messages, it logs only 1/N messages. With 0 it -is disabled. Default is 0. This is useful in a high volume environment, -where log functionality would otherwise not be reliable. For example 10 -would spend only 1/10th time on logging, and 100 would only spend a -hundredth of the time on logging. -.TP -.B dnstap-log-resolver-query-messages: \fI<yes or no> -Enable to log resolver query messages. Default is no. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-identity: \fI<string>\fP +The identity to send with messages, if \fB\(dq\(dq\fP the hostname is used. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-version: \fI<string>\fP +The version to send with messages, if \fB\(dq\(dq\fP the package version is used. +.sp +Default: \(dq\(dq +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-sample\-rate: \fI<number>\fP +The sample rate for log of messages, it logs only 1/N messages. +With 0 it is disabled. +This is useful in a high volume environment, where log functionality would +otherwise not be reliable. +For example 10 would spend only 1/10th time on logging, and 100 would only +spend a hundredth of the time on logging. +.sp +Default: 0 (disabled) +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-log\-resolver\-query\-messages: \fI<yes or no>\fP +Enable to log resolver query messages. These are messages from Unbound to upstream servers. +.sp +Default: no +.UNINDENT +.INDENT 0.0 .TP -.B dnstap-log-resolver-response-messages: \fI<yes or no> -Enable to log resolver response messages. Default is no. +.B dnstap\-log\-resolver\-response\-messages: \fI<yes or no>\fP +Enable to log resolver response messages. These are replies from upstream servers to Unbound. +.sp +Default: no +.UNINDENT +.INDENT 0.0 .TP -.B dnstap-log-client-query-messages: \fI<yes or no> -Enable to log client query messages. Default is no. +.B dnstap\-log\-client\-query\-messages: \fI<yes or no>\fP +Enable to log client query messages. These are client queries to Unbound. +.sp +Default: no +.UNINDENT +.INDENT 0.0 .TP -.B dnstap-log-client-response-messages: \fI<yes or no> -Enable to log client response messages. Default is no. +.B dnstap\-log\-client\-response\-messages: \fI<yes or no>\fP +Enable to log client response messages. These are responses from Unbound to clients. -.TP -.B dnstap-log-forwarder-query-messages: \fI<yes or no> -Enable to log forwarder query messages. Default is no. -.TP -.B dnstap-log-forwarder-response-messages: \fI<yes or no> -Enable to log forwarder response messages. Default is no. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-log\-forwarder\-query\-messages: \fI<yes or no>\fP +Enable to log forwarder query messages. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B dnstap\-log\-forwarder\-response\-messages: \fI<yes or no>\fP +Enable to log forwarder response messages. +.sp +Default: no +.UNINDENT .SS Response Policy Zone Options -.LP -Response Policy Zones are configured with \fBrpz:\fR, and each one must have a -\fBname:\fR. There can be multiple ones, by listing multiple RPZ clauses, each -with a different name. RPZ clauses are applied in order of configuration and -any match from an earlier RPZ zone will terminate the RPZ lookup. Note that a -PASSTHRU action is still considered a match. -The \fBrespip\fR module needs to be added to the \fBmodule-config\fR, e.g.: -\fBmodule-config: "respip validator iterator"\fR. -.P +.sp +Response Policy Zones are configured with \fBrpz:\fP, and each one must have a +\fI\%name\fP attribute. +There can be multiple ones, by listing multiple RPZ clauses, each with a +different name. +RPZ clauses are applied in order of configuration and any match from an earlier +RPZ zone will terminate the RPZ lookup. +Note that a PASSTHRU action is still considered a match. +The respip module needs to be added to the +\fI\%module\-config\fP, e.g.: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +module\-config: \(dqrespip validator iterator\(dq +.ft P +.fi +.UNINDENT +.UNINDENT +.sp QNAME, Response IP Address, nsdname, nsip and clientip triggers are supported. Supported actions are: NXDOMAIN, NODATA, PASSTHRU, DROP, Local Data, tcp\-only -and drop. RPZ QNAME triggers are applied after \fBlocal\-zones\fR and -before \fBauth\-zones\fR. -.P +and drop. +RPZ QNAME triggers are applied after any +\fI\%local\-zone\fP and before any +\fI\%auth\-zone\fP\&. +.sp The RPZ zone is a regular DNS zone formatted with a SOA start record as usual. The items in the zone are entries, that specify what to act on (the trigger) and what to do (the action). @@ -3073,167 +5449,278 @@ The trigger to act on is recorded in the name, the action to do is recorded as the resource record. The names all end in the zone name, so you could type the trigger names without a trailing dot in the zonefile. -.P -An example RPZ record, that answers example.com with NXDOMAIN +.sp +An example RPZ record, that answers \fBexample.com\fP with \fBNXDOMAIN\fP: +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - example.com CNAME . +.ft C +example.com CNAME . +.ft P .fi -.P +.UNINDENT +.UNINDENT +.sp The triggers are encoded in the name on the left +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - name query name - netblock.rpz-client-ip client IP address - netblock.rpz-ip response IP address in the answer - name.rpz-nsdname nameserver name - netblock.rpz-nsip nameserver IP address +.ft C +name query name +netblock.rpz\-client\-ip client IP address +netblock.rpz\-ip response IP address in the answer +name.rpz\-nsdname nameserver name +netblock.rpz\-nsip nameserver IP address +.ft P .fi -The netblock is written as <netblocklen>.<ip address in reverse>. -For IPv6 use 'zz' for '::'. Specify individual addresses with scope length -of 32 or 128. For example, 24.10.100.51.198.rpz-ip is 198.51.100.10/24 and -32.10.zz.db8.2001.rpz-ip is 2001:db8:0:0:0:0:0:10/32. -.P +.UNINDENT +.UNINDENT +.sp +The netblock is written as \fB<netblocklen>.<ip address in reverse>\fP\&. +For IPv6 use \fB\(aqzz\(aq\fP for \fB\(aq::\(aq\fP\&. +Specify individual addresses with scope length of 32 or 128. +For example, \fB24.10.100.51.198.rpz\-ip\fP is \fB198.51.100.10/24\fP and +\fB32.10.zz.db8.2001.rpz\-ip\fP is \fB2001:db8:0:0:0:0:0:10/32\fP\&. +.sp The actions are specified with the record on the right +.INDENT 0.0 +.INDENT 3.5 +.sp .nf - CNAME . nxdomain reply - CNAME *. nodata reply - CNAME rpz-passthru. do nothing, allow to continue - CNAME rpz-drop. the query is dropped - CNAME rpz-tcp-only. answer over TCP - A 192.0.2.1 answer with this IP address +.ft C +CNAME . nxdomain reply +CNAME *. nodata reply +CNAME rpz\-passthru. do nothing, allow to continue +CNAME rpz\-drop. the query is dropped +CNAME rpz\-tcp\-only. answer over TCP +A 192.0.2.1 answer with this IP address +.ft P .fi -Other records like AAAA, TXT and other CNAMEs (not rpz-..) can also be used to +.UNINDENT +.UNINDENT +.sp +Other records like AAAA, TXT and other CNAMEs (not rpz\-..) can also be used to answer queries with that content. -.P -The RPZ zones can be configured in the config file with these settings in the \fBrpz:\fR block. +.sp +The RPZ zones can be configured in the config file with these settings in the +\fBrpz:\fP block. +.INDENT 0.0 .TP -.B name: \fI<zone name> +.B name: \fI<zone name>\fP Name of the authority zone. -.TP -.B primary: \fI<IP address or host name> -Where to download a copy of the zone from, with AXFR and IXFR. Multiple -primaries can be specified. They are all tried if one fails. -To use a nondefault port for DNS communication append '@' with the port number. -You can append a '#' and a name, then AXFR over TLS can be used and the tls authentication certificates will be checked with that name. If you combine -the '@' and '#', the '@' comes first. -If you point it at another Unbound instance, it would not work because -that does not support AXFR/IXFR for the zone, but if you used \fBurl:\fR to download -the zonefile as a text file from a webserver that would work. +.UNINDENT +.INDENT 0.0 +.TP +.B primary: \fI<IP address or host name>\fP +Where to download a copy of the zone from, with AXFR and IXFR. +Multiple primaries can be specified. +They are all tried if one fails. +.sp +To use a non\-default port for DNS communication append \fB\(aq@\(aq\fP with the +port number. +.sp +You can append a \fB\(aq#\(aq\fP and a name, then AXFR over TLS can be used and the +TLS authentication certificates will be checked with that name. +.sp +If you combine the \fB\(aq@\(aq\fP and \fB\(aq#\(aq\fP, the \fB\(aq@\(aq\fP comes first. +If you point it at another Unbound instance, it would not work because that +does not support AXFR/IXFR for the zone, but if you used +\fI\%url\fP to download the zonefile as a text file +from a webserver that would work. +.sp If you specify the hostname, you cannot use the domain from the zonefile, because it may not have that when retrieving that data, instead use a plain IP address to avoid a circular dependency on retrieving that IP address. -.TP -.B master: \fI<IP address or host name> -Alternate syntax for \fBprimary\fR. -.TP -.B url: \fI<url to zonefile> -Where to download a zonefile for the zone. With http or https. An example -for the url is "http://www.example.com/example.org.zone". Multiple url -statements can be given, they are tried in turn. If only urls are given -the SOA refresh timer is used to wait for making new downloads. If also -primaries are listed, the primaries are first probed with UDP SOA queries to -see if the SOA serial number has changed, reducing the number of downloads. -If none of the urls work, the primaries are tried with IXFR and AXFR. -For https, the \fBtls\-cert\-bundle\fR and the hostname from the url are used -to authenticate the connection. -.TP -.B allow\-notify: \fI<IP address or host name or netblockIP/prefix> -With allow\-notify you can specify additional sources of notifies. +.UNINDENT +.INDENT 0.0 +.TP +.B master: \fI<IP address or host name>\fP +Alternate syntax for \fI\%primary\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B url: \fI<url to zonefile>\fP +Where to download a zonefile for the zone. +With HTTP or HTTPS. +An example for the url is: +.INDENT 7.0 +.INDENT 3.5 +.sp +.nf +.ft C +http://www.example.com/example.org.zone +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Multiple url statements can be given, they are tried in turn. +.sp +If only urls are given the SOA refresh timer is used to wait for making new +downloads. +If also primaries are listed, the primaries are first probed with UDP SOA +queries to see if the SOA serial number has changed, reducing the number of +downloads. +If none of the URLs work, the primaries are tried with IXFR and AXFR. +.sp +For HTTPS, the \fI\%tls\-cert\-bundle\fP and +the hostname from the url are used to authenticate the connection. +.UNINDENT +.INDENT 0.0 +.TP +.B allow\-notify: \fI<IP address or host name or netblockIP/prefix>\fP +With \fI\%allow\-notify\fP you can specify +additional sources of notifies. When notified, the server attempts to first probe and then zone transfer. -If the notify is from a primary, it first attempts that primary. Otherwise -other primaries are attempted. If there are no primaries, but only urls, the -file is downloaded when notified. The primaries from primary: and url: -statements are allowed notify by default. -.TP -.B zonefile: \fI<filename> -The filename where the zone is stored. If not given then no zonefile is used. +If the notify is from a primary, it first attempts that primary. +Otherwise other primaries are attempted. +If there are no primaries, but only urls, the file is downloaded when +notified. +.sp +\fBNOTE:\fP +.INDENT 7.0 +.INDENT 3.5 +The primaries from \fI\%primary\fP and +\fI\%url\fP statements are allowed notify by +default. +.UNINDENT +.UNINDENT +.UNINDENT +.INDENT 0.0 +.TP +.B zonefile: \fI<filename>\fP +The filename where the zone is stored. +If not given then no zonefile is used. If the file does not exist or is empty, Unbound will attempt to fetch zone data (eg. from the primary servers). +.UNINDENT +.INDENT 0.0 .TP -.B rpz\-action\-override: \fI<action> -Always use this RPZ action for matching triggers from this zone. Possible action -are: nxdomain, nodata, passthru, drop, disabled and cname. +.B rpz\-action\-override: \fI<action>\fP +Always use this RPZ action for matching triggers from this zone. +Possible actions are: \fInxdomain\fP, \fInodata\fP, \fIpassthru\fP, \fIdrop\fP, \fIdisabled\fP +and \fIcname\fP\&. +.UNINDENT +.INDENT 0.0 .TP -.B rpz\-cname\-override: \fI<domain> +.B rpz\-cname\-override: \fI<domain>\fP The CNAME target domain to use if the cname action is configured for -\fBrpz\-action\-override\fR. -.TP -.B rpz\-log: \fI<yes or no> -Log all applied RPZ actions for this RPZ zone. Default is no. -.TP -.B rpz\-log\-name: \fI<name> +\fI\%rpz\-action\-override\fP\&. +.UNINDENT +.INDENT 0.0 +.TP +.B rpz\-log: \fI<yes or no>\fP +Log all applied RPZ actions for this RPZ zone. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B rpz\-log\-name: \fI<name>\fP Specify a string to be part of the log line, for easy referencing. +.UNINDENT +.INDENT 0.0 .TP -.B rpz\-signal\-nxdomain\-ra: \fI<yes or no> -Signal when a query is blocked by the RPZ with NXDOMAIN with an unset RA flag. +.B rpz\-signal\-nxdomain\-ra: \fI<yes or no>\fP +Signal when a query is blocked by the RPZ with NXDOMAIN with an unset RA +flag. This allows certain clients, like dnsmasq, to infer that the domain is -externally blocked. Default is no. +externally blocked. +.sp +Default: no +.UNINDENT +.INDENT 0.0 .TP -.B for\-downstream: \fI<yes or no> +.B for\-downstream: \fI<yes or no>\fP If enabled the zone is authoritatively answered for and queries for the RPZ -zone information are answered to downstream clients. This is useful for -monitoring scripts, that can then access the SOA information to check if -the RPZ information is up to date. Default is no. -.TP -.B tags: \fI<list of tags> -Limit the policies from this RPZ clause to clients with a matching tag. Tags -need to be defined in \fBdefine\-tag\fR and can be assigned to client addresses -using \fBaccess\-control\-tag\fR. Enclose list of tags in quotes ("") and put -spaces between tags. If no tags are specified the policies from this clause will -be applied for all clients. -.SH "MEMORY CONTROL EXAMPLE" -In the example config settings below memory usage is reduced. Some service -levels are lower, notable very large data and a high TCP load are no longer -supported. Very large data and high TCP loads are exceptional for the DNS. +zone information are answered to downstream clients. +This is useful for monitoring scripts, that can then access the SOA +information to check if the RPZ information is up to date. +.sp +Default: no +.UNINDENT +.INDENT 0.0 +.TP +.B tags: \fI\(dq<list of tags>\(dq\fP +Limit the policies from this RPZ clause to clients with a matching tag. +.sp +Tags need to be defined in \fI\%define\-tag\fP and +can be assigned to client addresses using +\fI\%access\-control\-tag\fP or +\fI\%interface\-tag\fP\&. +Enclose list of tags in quotes (\fB\(dq\(dq\fP) and put spaces between tags. +.sp +If no tags are specified the policies from this clause will be applied for +all clients. +.UNINDENT +.SH MEMORY CONTROL EXAMPLE +.sp +In the example config settings below memory usage is reduced. +Some service levels are lower, notable very large data and a high TCP load are +no longer supported. +Very large data and high TCP loads are exceptional for the DNS. DNSSEC validation is enabled, just add trust anchors. -If you do not have to worry about programs using more than 3 Mb of memory, -the below example is not for you. Use the defaults to receive full service, -which on BSD\-32bit tops out at 30\-40 Mb after heavy usage. -.P +If you do not have to worry about programs using more than 3 Mb of memory, the +below example is not for you. +Use the defaults to receive full service, which on BSD\-32bit tops out at 30\-40 +Mb after heavy usage. +.INDENT 0.0 +.INDENT 3.5 +.sp .nf +.ft C # example settings that reduce memory usage server: - num\-threads: 1 - outgoing\-num\-tcp: 1 # this limits TCP service, uses less buffers. - incoming\-num\-tcp: 1 - outgoing\-range: 60 # uses less memory, but less performance. - msg\-buffer\-size: 8192 # note this limits service, 'no huge stuff'. - msg\-cache\-size: 100k - msg\-cache\-slabs: 1 - rrset\-cache\-size: 100k - rrset\-cache\-slabs: 1 - infra\-cache\-numhosts: 200 - infra\-cache\-slabs: 1 - key\-cache\-size: 100k - key\-cache\-slabs: 1 - neg\-cache\-size: 10k - num\-queries\-per\-thread: 30 - target\-fetch\-policy: "2 1 0 0 0 0" - harden\-large\-queries: "yes" - harden\-short\-bufsize: "yes" + num\-threads: 1 + outgoing\-num\-tcp: 1 # this limits TCP service, uses less buffers. + incoming\-num\-tcp: 1 + outgoing\-range: 60 # uses less memory, but less performance. + msg\-buffer\-size: 8192 # note this limits service, \(aqno huge stuff\(aq. + msg\-cache\-size: 100k + msg\-cache\-slabs: 1 + rrset\-cache\-size: 100k + rrset\-cache\-slabs: 1 + infra\-cache\-numhosts: 200 + infra\-cache\-slabs: 1 + key\-cache\-size: 100k + key\-cache\-slabs: 1 + neg\-cache\-size: 10k + num\-queries\-per\-thread: 30 + target\-fetch\-policy: \(dq2 1 0 0 0 0\(dq + harden\-large\-queries: \(dqyes\(dq + harden\-short\-bufsize: \(dqyes\(dq +.ft P .fi -.SH "FILES" +.UNINDENT +.UNINDENT +.SH FILES +.INDENT 0.0 .TP -.I @UNBOUND_RUN_DIR@ +.B @UNBOUND_RUN_DIR@ default Unbound working directory. .TP -.I @UNBOUND_CHROOT_DIR@ -default -\fIchroot\fR(2) -location. +.B @UNBOUND_CHROOT_DIR@ +default \fIchroot(2)\fP location. .TP -.I @ub_conf_file@ +.B @ub_conf_file@ Unbound configuration file. .TP -.I @UNBOUND_PIDFILE@ +.B @UNBOUND_PIDFILE@ default Unbound pidfile with process ID of the running daemon. .TP -.I unbound.log -Unbound log file. default is to log to -\fIsyslog\fR(3). -.SH "SEE ALSO" -\fIunbound\fR(8), -\fIunbound\-checkconf\fR(8). -.SH "AUTHORS" -.B Unbound -was written by NLnet Labs. Please see CREDITS file -in the distribution for further details. +.B unbound.log +Unbound log file. +Default is to log to \fIsyslog(3)\fP\&. +.UNINDENT +.SH SEE ALSO +.sp +\fI\%unbound(8)\fP, +\fI\%unbound\-checkonf(8)\fP\&. +.SH AUTHOR +Unbound developers are mentioned in the CREDITS file in the distribution. +.SH COPYRIGHT +1999-2025, NLnet Labs +.\" Generated by docutils manpage writer. +. diff --git a/contrib/unbound/doc/unbound.conf.rst b/contrib/unbound/doc/unbound.conf.rst new file mode 100644 index 000000000000..ad8404e113cf --- /dev/null +++ b/contrib/unbound/doc/unbound.conf.rst @@ -0,0 +1,4997 @@ +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +unbound.conf(5) +=============== + +Synopsis +-------- + +**unbound.conf** + +Description +----------- + +**unbound.conf** is used to configure :doc:`unbound(8)</manpages/unbound>`. +The file format has attributes and values. +Some attributes have attributes inside them. +The notation is: ``attribute: value``. + +Comments start with ``#`` and last to the end of line. +Empty lines are ignored as is whitespace at the beginning of a line. + +The utility :doc:`unbound-checkconf(8)</manpages/unbound-checkconf>` can be +used to check ``unbound.conf`` prior to usage. + +Example +------- + +An example config file is shown below. +Copy this to :file:`/etc/unbound/unbound.conf` and start the server with: + +.. code-block:: text + + $ unbound -c /etc/unbound/unbound.conf + +Most settings are the defaults. +Stop the server with: + +.. code-block:: text + + $ kill `cat /etc/unbound/unbound.pid` + +Below is a minimal config file. +The source distribution contains an extensive :file:`example.conf` file with +all the options. + +.. code-block:: text + + # unbound.conf(5) config file for unbound(8). + server: + directory: "/etc/unbound" + username: unbound + # make sure unbound can access entropy from inside the chroot. + # e.g. on linux the use these commands (on BSD, devfs(8) is used): + # mount --bind -n /dev/urandom /etc/unbound/dev/urandom + # and mount --bind -n /dev/log /etc/unbound/dev/log + chroot: "/etc/unbound" + # logfile: "/etc/unbound/unbound.log" #uncomment to use logfile. + pidfile: "/etc/unbound/unbound.pid" + # verbosity: 1 # uncomment and increase to get more logging. + # listen on all interfaces, answer queries from the local subnet. + interface: 0.0.0.0 + interface: ::0 + access-control: 10.0.0.0/8 allow + access-control: 2001:DB8::/64 allow + +File Format +----------- + +There must be whitespace between keywords. +Attribute keywords end with a colon ``':'``. +An attribute is followed by a value, or its containing attributes in which case +it is referred to as a clause. +Clauses can be repeated throughout the file (or included files) to group +attributes under the same clause. + +.. _unbound.conf.include: + +Files can be included using the **include:** directive. +It can appear anywhere, it accepts a single file name as argument. +Processing continues as if the text from the included file was copied into the +config file at that point. +If also using :ref:`chroot<unbound.conf.chroot>`, using full path names for +the included files works, relative pathnames for the included names work if the +directory where the daemon is started equals its chroot/working directory or is +specified before the include statement with :ref:`directory: +dir<unbound.conf.directory>`. +Wildcards can be used to include multiple files, see *glob(7)*. + +.. _unbound.conf.include-toplevel: + +For a more structural include option, the **include-toplevel:** directive can +be used. +This closes whatever clause is currently active (if any) and forces the use of +clauses in the included files and right after this directive. + +.. _unbound.conf.server: + +Server Options +^^^^^^^^^^^^^^ + +These options are part of the **server:** clause. + + +@@UAHL@unbound.conf@verbosity@@: *<number>* + The verbosity level. + + Level 0 + No verbosity, only errors. + + Level 1 + Gives operational information. + + Level 2 + Gives detailed operational information including short information per + query. + + Level 3 + Gives query level information, output per query. + + Level 4 + Gives algorithm level information. + + Level 5 + Logs client identification for cache misses. + + The verbosity can also be increased from the command line and during run + time via remote control. See :doc:`unbound(8)</manpages/unbound>` and + :doc:`unbound-control(8)</manpages/unbound-control>` respectively. + + Default: 1 + + +@@UAHL@unbound.conf@statistics-interval@@: *<seconds>* + The number of seconds between printing statistics to the log for every + thread. + Disable with value ``0`` or ``""``. + The histogram statistics are only printed if replies were sent during the + statistics interval, requestlist statistics are printed for every interval + (but can be 0). + This is because the median calculation requires data to be present. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@statistics-cumulative@@: *<yes or no>* + If enabled, statistics are cumulative since starting Unbound, without + clearing the statistics counters after logging the statistics. + + Default: no + + +@@UAHL@unbound.conf@extended-statistics@@: *<yes or no>* + If enabled, extended statistics are printed from + :doc:`unbound-control(8)</manpages/unbound-control>`. + The counters are listed in + :doc:`unbound-control(8)</manpages/unbound-control>`. + Keeping track of more statistics takes time. + + Default: no + + +@@UAHL@unbound.conf@statistics-inhibit-zero@@: *<yes or no>* + If enabled, selected extended statistics with a value of 0 are inhibited + from printing with + :doc:`unbound-control(8)</manpages/unbound-control>`. + These are query types, query classes, query opcodes, answer rcodes + (except NOERROR, FORMERR, SERVFAIL, NXDOMAIN, NOTIMPL, REFUSED) + and PRZ actions. + + Default: yes + + +@@UAHL@unbound.conf@num-threads@@: *<number>* + The number of threads to create to serve clients. Use 1 for no threading. + + Default: 1 + + +@@UAHL@unbound.conf@port@@: *<port number>* + The port number on which the server responds to queries. + + Default: 53 + + +@@UAHL@unbound.conf@interface@@: *<IP address or interface name[@port]>* + Interface to use to connect to the network. + This interface is listened to for queries from clients, and answers to + clients are given from it. + Can be given multiple times to work on several interfaces. + If none are given the default is to listen on localhost. + + If an interface name is used instead of an IP address, the list of IP + addresses on that interface are used. + The interfaces are not changed on a reload (``kill -HUP``) but only on + restart. + + A port number can be specified with @port (without spaces between interface + and port number), if not specified the default port (from + :ref:`port<unbound.conf.port>`) is used. + + +@@UAHL@unbound.conf@ip-address@@: *<IP address or interface name[@port]>* + Same as :ref:`interface<unbound.conf.interface>` (for ease of + compatibility with :external+nsd:doc:`manpages/nsd.conf`). + + +@@UAHL@unbound.conf@interface-automatic@@: *<yes or no>* + Listen on all addresses on all (current and future) interfaces, detect the + source interface on UDP queries and copy them to replies. + This is a lot like :ref:`ip-transparent<unbound.conf.ip-transparent>`, but + this option services all interfaces whilst with + :ref:`ip-transparent<unbound.conf.ip-transparent>` you can select which + (future) interfaces Unbound provides service on. + This feature is experimental, and needs support in your OS for particular + socket options. + + Default: no + + +@@UAHL@unbound.conf@interface-automatic-ports@@: *"<string>"* + List the port numbers that + :ref:`interface-automatic<unbound.conf.interface-automatic>` listens on. + If empty, the default port is listened on. + The port numbers are separated by spaces in the string. + + This can be used to have interface automatic to deal with the interface, + and listen on the normal port number, by including it in the list, and + also HTTPS or DNS-over-TLS port numbers by putting them in the list as + well. + + Default: "" + + +@@UAHL@unbound.conf@outgoing-interface@@: *<IPv4/IPv6 address or IPv6 netblock>* + Interface to use to connect to the network. + This interface is used to send queries to authoritative servers and receive + their replies. + Can be given multiple times to work on several interfaces. + If none are given the default (all) is used. + You can specify the same interfaces in + :ref:`interface<unbound.conf.interface>` and + :ref:`outgoing-interface<unbound.conf.outgoing-interface>` lines, the + interfaces are then used for both purposes. + Outgoing queries are sent via a random outgoing interface to counter + spoofing. + + If an IPv6 netblock is specified instead of an individual IPv6 address, + outgoing UDP queries will use a randomised source address taken from the + netblock to counter spoofing. + Requires the IPv6 netblock to be routed to the host running Unbound, and + requires OS support for unprivileged non-local binds (currently only + supported on Linux). + Several netblocks may be specified with multiple + :ref:`outgoing-interface<unbound.conf.outgoing-interface>` options, but do + not specify both an individual IPv6 address and an IPv6 netblock, or the + randomisation will be compromised. + Consider combining with :ref:`prefer-ip6: yes<unbound.conf.prefer-ip6>` to + increase the likelihood of IPv6 nameservers being selected for queries. + On Linux you need these two commands to be able to use the freebind socket + option to receive traffic for the ip6 netblock: + + .. code-block:: text + + ip -6 addr add mynetblock/64 dev lo && \ + ip -6 route add local mynetblock/64 dev lo + + +@@UAHL@unbound.conf@outgoing-range@@: *<number>* + Number of ports to open. + This number of file descriptors can be opened per thread. + Must be at least 1. + Default depends on compile options. + Larger numbers need extra resources from the operating system. + For performance a very large value is best, use libevent to make this + possible. + + Default: 4096 (libevent) / 960 (minievent) / 48 (windows) + + +@@UAHL@unbound.conf@outgoing-port-permit@@: *<port number or range>* + Permit Unbound to open this port or range of ports for use to send queries. + A larger number of permitted outgoing ports increases resilience against + spoofing attempts. + Make sure these ports are not needed by other daemons. + By default only ports above 1024 that have not been assigned by IANA are + used. + Give a port number or a range of the form "low-high", without spaces. + + The :ref:`outgoing-port-permit<unbound.conf.outgoing-port-permit>` and + :ref:`outgoing-port-avoid<unbound.conf.outgoing-port-avoid>` statements + are processed in the line order of the config file, adding the permitted + ports and subtracting the avoided ports from the set of allowed ports. + The processing starts with the non IANA allocated ports above 1024 in the + set of allowed ports. + + +@@UAHL@unbound.conf@outgoing-port-avoid@@: *<port number or range>* + Do not permit Unbound to open this port or range of ports for use to send + queries. + Use this to make sure Unbound does not grab a port that another daemon + needs. + The port is avoided on all outgoing interfaces, both IPv4 and IPv6. + By default only ports above 1024 that have not been assigned by IANA are + used. + Give a port number or a range of the form "low-high", without spaces. + + +@@UAHL@unbound.conf@outgoing-num-tcp@@: *<number>* + Number of outgoing TCP buffers to allocate per thread. + If set to 0, or if :ref:`do-tcp: no<unbound.conf.do-tcp>` is set, no TCP + queries to authoritative servers are done. + For larger installations increasing this value is a good idea. + + Default: 10 + + +@@UAHL@unbound.conf@incoming-num-tcp@@: *<number>* + Number of incoming TCP buffers to allocate per thread. + If set to 0, or if :ref:`do-tcp: no<unbound.conf.do-tcp>` is set, no TCP + queries from clients are accepted. + For larger installations increasing this value is a good idea. + + Default: 10 + + +@@UAHL@unbound.conf@edns-buffer-size@@: *<number>* + Number of bytes size to advertise as the EDNS reassembly buffer size. + This is the value put into datagrams over UDP towards peers. + The actual buffer size is determined by + :ref:`msg-buffer-size<unbound.conf.msg-buffer-size>` (both for TCP and + UDP). + Do not set higher than that value. + Setting to 512 bypasses even the most stringent path MTU problems, but is + seen as extreme, since the amount of TCP fallback generated is excessive + (probably also for this resolver, consider tuning + :ref:`outgoing-num-tcp<unbound.conf.outgoing-num-tcp>`). + + Default: 1232 (`DNS Flag Day 2020 recommendation + <https://dnsflagday.net/2020/>`__) + + +@@UAHL@unbound.conf@max-udp-size@@: *<number>* + Maximum UDP response size (not applied to TCP response). + 65536 disables the UDP response size maximum, and uses the choice from the + client, always. + Suggested values are 512 to 4096. + + Default: 1232 (same as :ref:`edns-buffer-size<unbound.conf.edns-buffer-size>`) + + +@@UAHL@unbound.conf@stream-wait-size@@: *<number>* + Number of bytes size maximum to use for waiting stream buffers. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + As TCP and TLS streams queue up multiple results, the amount of memory used + for these buffers does not exceed this number, otherwise the responses are + dropped. + This manages the total memory usage of the server (under heavy use), the + number of requests that can be queued up per connection is also limited, + with further requests waiting in TCP buffers. + + Default: 4m + + +@@UAHL@unbound.conf@msg-buffer-size@@: *<number>* + Number of bytes size of the message buffers. + Default is 65552 bytes, enough for 64 Kb packets, the maximum DNS message + size. + No message larger than this can be sent or received. + Can be reduced to use less memory, but some requests for DNS data, such as + for huge resource records, will result in a SERVFAIL reply to the client. + + Default: 65552 + + +@@UAHL@unbound.conf@msg-cache-size@@: *<number>* + Number of bytes size of the message cache. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + + Default: 4m + + +@@UAHL@unbound.conf@msg-cache-slabs@@: *<number>* + Number of slabs in the message cache. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + + +@@UAHL@unbound.conf@num-queries-per-thread@@: *<number>* + The number of queries that every thread will service simultaneously. + If more queries arrive that need servicing, and no queries can be jostled + out (see :ref:`jostle-timeout<unbound.conf.jostle-timeout>`), then the + queries are dropped. + This forces the client to resend after a timeout; allowing the server time + to work on the existing queries. + Default depends on compile options. + + Default: 2048 (libevent) / 512 (minievent) / 24 (windows) + + +@@UAHL@unbound.conf@jostle-timeout@@: *<msec>* + Timeout used when the server is very busy. + Set to a value that usually results in one roundtrip to the authority + servers. + + If too many queries arrive, then 50% of the queries are allowed to run to + completion, and the other 50% are replaced with the new incoming query if + they have already spent more than their allowed time. + This protects against denial of service by slow queries or high query + rates. + + The effect is that the qps for long-lasting queries is about: + + .. code-block:: text + + (num-queries-per-thread / 2) / (average time for such long queries) qps + + The qps for short queries can be about: + + .. code-block:: text + + (num-queries-per-thread / 2) / (jostle-timeout in whole seconds) qps per thread + + about (2048/2)*5 = 5120 qps by default. + + Default: 200 + + +@@UAHL@unbound.conf@delay-close@@: *<msec>* + Extra delay for timeouted UDP ports before they are closed, in msec. + This prevents very delayed answer packets from the upstream (recursive) + servers from bouncing against closed ports and setting off all sort of + close-port counters, with eg. 1500 msec. + When timeouts happen you need extra sockets, it checks the ID and remote IP + of packets, and unwanted packets are added to the unwanted packet counter. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@udp-connect@@: *<yes or no>* + Perform *connect(2)* for UDP sockets that mitigates ICMP side channel + leakage. + + Default: yes + + +@@UAHL@unbound.conf@unknown-server-time-limit@@: *<msec>* + The wait time in msec for waiting for an unknown server to reply. + Increase this if you are behind a slow satellite link, to eg. 1128. + That would then avoid re-querying every initial query because it times out. + + Default: 376 + + +@@UAHL@unbound.conf@discard-timeout@@: *<msec>* + The wait time in msec where recursion requests are dropped. + This is to stop a large number of replies from accumulating. + They receive no reply, the work item continues to recurse. + It is nice to be a bit larger than + :ref:`serve-expired-client-timeout<unbound.conf.serve-expired-client-timeout>` + if that is enabled. + A value of ``1900`` msec is suggested. + The value ``0`` disables it. + + Default: 1900 + + +@@UAHL@unbound.conf@wait-limit@@: *<number>* + The number of replies that can wait for recursion, for an IP address. + This makes a ratelimit per IP address of waiting replies for recursion. + It stops very large amounts of queries waiting to be returned to one + destination. + The value ``0`` disables wait limits. + + Default: 1000 + + +@@UAHL@unbound.conf@wait-limit-cookie@@: *<number>* + The number of replies that can wait for recursion, for an IP address + that sent the query with a valid DNS Cookie. + Since the cookie validates the client address, this limit can be higher. + + Default: 10000 + + +@@UAHL@unbound.conf@wait-limit-netblock@@: *<netblock>* *<number>* + The wait limit for the netblock. + If not given the + :ref:`wait-limit<unbound.conf.wait-limit>` + value is used. + The most specific netblock is used to determine the limit. + Useful for overriding the default for a specific, group or individual, + server. + The value ``-1`` disables wait limits for the netblock. + By default the loopback has a wait limit netblock of ``-1``, it is not + limited, because it is separated from the rest of network for spoofed + packets. + The loopback addresses ``127.0.0.0/8`` and ``::1/128`` are default at ``-1``. + + Default: (none) + + +@@UAHL@unbound.conf@wait-limit-cookie-netblock@@: *<netblock>* *<number>* + The wait limit for the netblock, when the query has a DNS Cookie. + If not given, the + :ref:`wait-limit-cookie<unbound.conf.wait-limit-cookie>` + value is used. + The value ``-1`` disables wait limits for the netblock. + The loopback addresses ``127.0.0.0/8`` and ``::1/128`` are default at ``-1``. + + Default: (none) + + +@@UAHL@unbound.conf@so-rcvbuf@@: *<number>* + If not 0, then set the SO_RCVBUF socket option to get more buffer space on + UDP port 53 incoming queries. + So that short spikes on busy servers do not drop packets (see counter in + ``netstat -su``). + Otherwise, the number of bytes to ask for, try "4m" on a busy server. + + The OS caps it at a maximum, on linux Unbound needs root permission to + bypass the limit, or the admin can use ``sysctl net.core.rmem_max``. + + On BSD change ``kern.ipc.maxsockbuf`` in ``/etc/sysctl.conf``. + + On OpenBSD change header and recompile kernel. + + On Solaris ``ndd -set /dev/udp udp_max_buf 8388608``. + + Default: 0 (use system value) + + +@@UAHL@unbound.conf@so-sndbuf@@: *<number>* + If not 0, then set the SO_SNDBUF socket option to get more buffer space on + UDP port 53 outgoing queries. + This for very busy servers handles spikes in answer traffic, otherwise: + + .. code-block:: text + + send: resource temporarily unavailable + + can get logged, the buffer overrun is also visible by ``netstat -su``. + If set to 0 it uses the system value. + Specify the number of bytes to ask for, try "8m" on a very busy server. + + It needs some space to be able to deal with packets that wait for local + address resolution, from like ARP and NDP discovery, before they are sent + out, hence it is elevated above the system default by default. + + The OS caps it at a maximum, on linux Unbound needs root permission to + bypass the limit, or the admin can use ``sysctl net.core.wmem_max``. + + On BSD, Solaris changes are similar to + :ref:`so-rcvbuf<unbound.conf.so-rcvbuf>`. + + Default: 4m + + +@@UAHL@unbound.conf@so-reuseport@@: *<yes or no>* + If yes, then open dedicated listening sockets for incoming queries for each + thread and try to set the SO_REUSEPORT socket option on each socket. + May distribute incoming queries to threads more evenly. + + On Linux it is supported in kernels >= 3.9. + + On other systems, FreeBSD, OSX it may also work. + + You can enable it (on any platform and kernel), it then attempts to open + the port and passes the option if it was available at compile time, if that + works it is used, if it fails, it continues silently (unless verbosity 3) + without the option. + + At extreme load it could be better to turn it off to distribute the queries + evenly, reported for Linux systems (4.4.x). + + Default: yes + + +@@UAHL@unbound.conf@ip-transparent@@: *<yes or no>* + If yes, then use IP_TRANSPARENT socket option on sockets where Unbound is + listening for incoming traffic. + Allows you to bind to non-local interfaces. + For example for non-existent IP addresses that are going to exist later on, + with host failover configuration. + + This is a lot like + :ref:`interface-automatic<unbound.conf.interface-automatic>`, but that one + services all interfaces and with this option you can select which (future) + interfaces Unbound provides service on. + + This option needs Unbound to be started with root permissions on some + systems. + The option uses IP_BINDANY on FreeBSD systems and SO_BINDANY on OpenBSD + systems. + + Default: no + + +@@UAHL@unbound.conf@ip-freebind@@: *<yes or no>* + If yes, then use IP_FREEBIND socket option on sockets where Unbound is + listening to incoming traffic. + Allows you to bind to IP addresses that are nonlocal or do not exist, like + when the network interface or IP address is down. + + Exists only on Linux, where the similar + :ref:`ip-transparent<unbound.conf.ip-transparent>` option is also + available. + + Default: no + + +@@UAHL@unbound.conf@ip-dscp@@: *<number>* + The value of the Differentiated Services Codepoint (DSCP) in the + differentiated services field (DS) of the outgoing IP packet headers. + The field replaces the outdated IPv4 Type-Of-Service field and the IPv6 + traffic class field. + + +@@UAHL@unbound.conf@rrset-cache-size@@: *<number>* + Number of bytes size of the RRset cache. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + + Default: 4m + + +@@UAHL@unbound.conf@rrset-cache-slabs@@: *<number>* + Number of slabs in the RRset cache. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + + +@@UAHL@unbound.conf@cache-max-ttl@@: *<seconds>* + Time to live maximum for RRsets and messages in the cache. + When the TTL expires, the cache item has expired. + Can be set lower to force the resolver to query for data often, and not + trust (very large) TTL values. + Downstream clients also see the lower TTL. + + + Default: 86400 (1 day) + + +@@UAHL@unbound.conf@cache-min-ttl@@: *<seconds>* + Time to live minimum for RRsets and messages in the cache. + If the minimum kicks in, the data is cached for longer than the domain + owner intended, and thus less queries are made to look up the data. + Zero makes sure the data in the cache is as the domain owner intended, + higher values, especially more than an hour or so, can lead to trouble as + the data in the cache does not match up with the actual data any more. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@cache-max-negative-ttl@@: *<seconds>* + Time to live maximum for negative responses, these have a SOA in the + authority section that is limited in time. + This applies to NXDOMAIN and NODATA answers. + + Default: 3600 + + +@@UAHL@unbound.conf@cache-min-negative-ttl@@: *<seconds>* + Time to live minimum for negative responses, these have a SOA in the + authority section that is limited in time. + If this is disabled and + :ref:`cache-min-ttl<unbound.conf.cache-min-ttl>` + is configured, it will take effect instead. + In that case you can set this to ``1`` to honor the upstream TTL. + This applies to NXDOMAIN and NODATA answers. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@infra-host-ttl@@: *<seconds>* + Time to live for entries in the host cache. + The host cache contains roundtrip timing, lameness and EDNS support + information. + + Default: 900 + + +@@UAHL@unbound.conf@infra-cache-slabs@@: *<number>* + Number of slabs in the infrastructure cache. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + + +@@UAHL@unbound.conf@infra-cache-numhosts@@: *<number>* + Number of hosts for which information is cached. + + Default: 10000 + + +@@UAHL@unbound.conf@infra-cache-min-rtt@@: *<msec>* + Lower limit for dynamic retransmit timeout calculation in infrastructure + cache. + Increase this value if using forwarders needing more time to do recursive + name resolution. + + Default: 50 + + +@@UAHL@unbound.conf@infra-cache-max-rtt@@: *<msec>* + Upper limit for dynamic retransmit timeout calculation in infrastructure + cache. + + Default: 120000 (2 minutes) + + +@@UAHL@unbound.conf@infra-keep-probing@@: *<yes or no>* + If enabled the server keeps probing hosts that are down, in the one probe + at a time regime. + Hosts that are down, eg. they did not respond during the one probe at a + time period, are marked as down and it may take + :ref:`infra-host-ttl<unbound.conf.infra-host-ttl>` time to get probed + again. + + Default: no + + +@@UAHL@unbound.conf@define-tag@@: *"<list of tags>"* + Define the tags that can be used with + :ref:`local-zone<unbound.conf.local-zone>` and + :ref:`access-control<unbound.conf.access-control>`. + Enclose the list between quotes (``""``) and put spaces between tags. + + +@@UAHL@unbound.conf@do-ip4@@: *<yes or no>* + Enable or disable whether IPv4 queries are answered or issued. + + Default: yes + + +@@UAHL@unbound.conf@do-ip6@@: *<yes or no>* + Enable or disable whether IPv6 queries are answered or issued. + If disabled, queries are not answered on IPv6, and queries are not sent on + IPv6 to the internet nameservers. + With this option you can disable the IPv6 transport for sending DNS + traffic, it does not impact the contents of the DNS traffic, which may have + IPv4 (A) and IPv6 (AAAA) addresses in it. + + Default: yes + + +@@UAHL@unbound.conf@prefer-ip4@@: *<yes or no>* + If enabled, prefer IPv4 transport for sending DNS queries to internet + nameservers. + Useful if the IPv6 netblock the server has, the entire /64 of that is not + owned by one operator and the reputation of the netblock /64 is an issue, + using IPv4 then uses the IPv4 filters that the upstream servers have. + + Default: no + + +@@UAHL@unbound.conf@prefer-ip6@@: *<yes or no>* + If enabled, prefer IPv6 transport for sending DNS queries to internet + nameservers. + + Default: no + + +@@UAHL@unbound.conf@do-udp@@: *<yes or no>* + Enable or disable whether UDP queries are answered or issued. + + Default: yes + + +@@UAHL@unbound.conf@do-tcp@@: *<yes or no>* + Enable or disable whether TCP queries are answered or issued. + + Default: yes + + +@@UAHL@unbound.conf@tcp-mss@@: *<number>* + Maximum segment size (MSS) of TCP socket on which the server responds to + queries. + Value lower than common MSS on Ethernet (1220 for example) will address + path MTU problem. + Note that not all platform supports socket option to set MSS (TCP_MAXSEG). + Default is system default MSS determined by interface MTU and negotiation + between server and client. + + +@@UAHL@unbound.conf@outgoing-tcp-mss@@: *<number>* + Maximum segment size (MSS) of TCP socket for outgoing queries (from Unbound + to other servers). + Value lower than common MSS on Ethernet (1220 for example) will address + path MTU problem. + Note that not all platform supports socket option to set MSS (TCP_MAXSEG). + Default is system default MSS determined by interface MTU and negotiation + between Unbound and other servers. + + +@@UAHL@unbound.conf@tcp-idle-timeout@@: *<msec>* + The period Unbound will wait for a query on a TCP connection. + If this timeout expires Unbound closes the connection. + When the number of free incoming TCP buffers falls below 50% of the total + number configured, the option value used is progressively reduced, first to + 1% of the configured value, then to 0.2% of the configured value if the + number of free buffers falls below 35% of the total number configured, and + finally to 0 if the number of free buffers falls below 20% of the total + number configured. + A minimum timeout of 200 milliseconds is observed regardless of the option + value used. + It will be overridden by + :ref:`edns-tcp-keepalive-timeout<unbound.conf.edns-tcp-keepalive-timeout>` + if + :ref:`edns-tcp-keepalive<unbound.conf.edns-tcp-keepalive>` + is enabled. + + Default: 30000 (30 seconds) + + +@@UAHL@unbound.conf@tcp-reuse-timeout@@: *<msec>* + The period Unbound will keep TCP persistent connections open to authority + servers. + + Default: 60000 (60 seconds) + + +@@UAHL@unbound.conf@max-reuse-tcp-queries@@: *<number>* + The maximum number of queries that can be sent on a persistent TCP + connection. + + Default: 200 + + +@@UAHL@unbound.conf@tcp-auth-query-timeout@@: *<number>* + Timeout in milliseconds for TCP queries to auth servers. + + Default: 3000 (3 seconds) + + +@@UAHL@unbound.conf@edns-tcp-keepalive@@: *<yes or no>* + Enable or disable EDNS TCP Keepalive. + + Default: no + + +@@UAHL@unbound.conf@edns-tcp-keepalive-timeout@@: *<msec>* + Overrides + :ref:`tcp-idle-timeout<unbound.conf.tcp-idle-timeout>` + when + :ref:`edns-tcp-keepalive<unbound.conf.edns-tcp-keepalive>` + is enabled. + If the client supports the EDNS TCP Keepalive option, + If the client supports the EDNS TCP Keepalive option, Unbound sends the + timeout value to the client to encourage it to close the connection before + the server times out. + + Default: 120000 (2 minutes) + + +@@UAHL@unbound.conf@sock-queue-timeout@@: *<sec>* + UDP queries that have waited in the socket buffer for a long time can be + dropped. + The time is set in seconds, 3 could be a good value to ignore old queries + that likely the client does not need a reply for any more. + This could happen if the host has not been able to service the queries for + a while, i.e. Unbound is not running, and then is enabled again. + It uses timestamp socket options. + The socket option is available on the Linux and FreeBSD platforms. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@tcp-upstream@@: *<yes or no>* + Enable or disable whether the upstream queries use TCP only for transport. + Useful in tunneling scenarios. + If set to no you can specify TCP transport only for selected forward or + stub zones using + :ref:`forward-tcp-upstream<unbound.conf.forward.forward-tcp-upstream>` or + :ref:`stub-tcp-upstream<unbound.conf.stub.stub-tcp-upstream>` + respectively. + + Default: no + + +@@UAHL@unbound.conf@udp-upstream-without-downstream@@: *<yes or no>* + Enable UDP upstream even if :ref:`do-udp: no<unbound.conf.do-udp>` is set. + Useful for TLS service providers, that want no UDP downstream but use UDP + to fetch data upstream. + + Default: no (no changes) + + +@@UAHL@unbound.conf@tls-upstream@@: *<yes or no>* + Enabled or disable whether the upstream queries use TLS only for transport. + Useful in tunneling scenarios. + The TLS contains plain DNS in TCP wireformat. + The other server must support this (see + :ref:`tls-service-key<unbound.conf.tls-service-key>`). + + If you enable this, also configure a + :ref:`tls-cert-bundle<unbound.conf.tls-cert-bundle>` or use + :ref:`tls-win-cert<unbound.conf.tls-win-cert>` or + :ref:`tls-system-cert<unbound.conf.tls-system-cert>` to load CA certs, + otherwise the connections cannot be authenticated. + + This option enables TLS for all of them, but if you do not set this you can + configure TLS specifically for some forward zones with + :ref:`forward-tls-upstream<unbound.conf.forward.forward-tls-upstream>`. + And also with + :ref:`stub-tls-upstream<unbound.conf.stub.stub-tls-upstream>`. + If the + :ref:`tls-upstream<unbound.conf.tls-upstream>` + option is enabled, it is for all the forwards and stubs, where the + :ref:`forward-tls-upstream<unbound.conf.forward.forward-tls-upstream>` + and + :ref:`stub-tls-upstream<unbound.conf.stub.stub-tls-upstream>` + options are ignored, as if they had been set to yes. + + Default: no + + +@@UAHL@unbound.conf@ssl-upstream@@: *<yes or no>* + Alternate syntax for :ref:`tls-upstream<unbound.conf.tls-upstream>`. + If both are present in the config file the last is used. + + +@@UAHL@unbound.conf@tls-service-key@@: *<file>* + If enabled, the server provides DNS-over-TLS or DNS-over-HTTPS service on + the TCP ports marked implicitly or explicitly for these services with + :ref:`tls-port<unbound.conf.tls-port>` or + :ref:`https-port<unbound.conf.https-port>`. + The file must contain the private key for the TLS session, the public + certificate is in the :ref:`tls-service-pem<unbound.conf.tls-service-pem>` + file and it must also be specified if + :ref:`tls-service-key<unbound.conf.tls-service-key>` is specified. + Enabling or disabling this service requires a restart (a reload is not + enough), because the key is read while root permissions are held and before + chroot (if any). + The ports enabled implicitly or explicitly via + :ref:`tls-port<unbound.conf.tls-port>` and + :ref:`https-port<unbound.conf.https-port>` do not provide normal DNS TCP + service. + + .. note:: + Unbound needs to be compiled with libnghttp2 in order to provide + DNS-over-HTTPS. + + Default: "" (disabled) + + +@@UAHL@unbound.conf@ssl-service-key@@: *<file>* + Alternate syntax for :ref:`tls-service-key<unbound.conf.tls-service-key>`. + + +@@UAHL@unbound.conf@tls-service-pem@@: *<file>* + The public key certificate pem file for the tls service. + + Default: "" (disabled) + + +@@UAHL@unbound.conf@ssl-service-pem@@: *<file>* + Alternate syntax for :ref:`tls-service-pem<unbound.conf.tls-service-pem>`. + + +@@UAHL@unbound.conf@tls-port@@: *<number>* + The port number on which to provide TCP TLS service. + Only interfaces configured with that port number as @number get the TLS + service. + + Default: 853 + + +@@UAHL@unbound.conf@ssl-port@@: *<number>* + Alternate syntax for :ref:`tls-port<unbound.conf.tls-port>`. + + +@@UAHL@unbound.conf@tls-cert-bundle@@: *<file>* + If null or ``""``, no file is used. + Set it to the certificate bundle file, for example + :file:`/etc/pki/tls/certs/ca-bundle.crt`. + These certificates are used for authenticating connections made to outside + peers. + For example :ref:`auth-zone urls<unbound.conf.auth.url>`, and also + DNS-over-TLS connections. + It is read at start up before permission drop and chroot. + + Default: "" (disabled) + + +@@UAHL@unbound.conf@ssl-cert-bundle@@: *<file>* + Alternate syntax for :ref:`tls-cert-bundle<unbound.conf.tls-cert-bundle>`. + + +@@UAHL@unbound.conf@tls-win-cert@@: *<yes or no>* + Add the system certificates to the cert bundle certificates for + authentication. + If no cert bundle, it uses only these certificates. + On windows this option uses the certificates from the cert store. + Use the :ref:`tls-cert-bundle<unbound.conf.tls-cert-bundle>` option on + other systems. + On other systems, this option enables the system certificates. + + Default: no + + +@@UAHL@unbound.conf@tls-system-cert@@: *<yes or no>* + This the same attribute as the + :ref:`tls-win-cert<unbound.conf.tls-win-cert>` attribute, under a + different name. + Because it is not windows specific. + + +@@UAHL@unbound.conf@tls-additional-port@@: *<portnr>* + List port numbers as + :ref:`tls-additional-port<unbound.conf.tls-additional-port>`, and when + interfaces are defined, eg. with the @port suffix, as this port number, + they provide DNS-over-TLS service. + Can list multiple, each on a new statement. + + +@@UAHL@unbound.conf@tls-session-ticket-keys@@: *<file>* + If not ``""``, lists files with 80 bytes of random contents that are used + to perform TLS session resumption for clients using the Unbound server. + These files contain the secret key for the TLS session tickets. + First key use to encrypt and decrypt TLS session tickets. + Other keys use to decrypt only. + + With this you can roll over to new keys, by generating a new first file and + allowing decrypt of the old file by listing it after the first file for + some time, after the wait clients are not using the old key any more and + the old key can be removed. + One way to create the file is: + + .. code-block:: text + + dd if=/dev/random bs=1 count=80 of=ticket.dat + + The first 16 bytes should be different from the old one if you create a + second key, that is the name used to identify the key. + Then there is 32 bytes random data for an AES key and then 32 bytes random + data for the HMAC key. + + Default: "" + + +@@UAHL@unbound.conf@tls-ciphers@@: *<string with cipher list>* + Set the list of ciphers to allow when serving TLS. + Use ``""`` for default ciphers. + + Default: "" + + +@@UAHL@unbound.conf@tls-ciphersuites@@: *<string with ciphersuites list>* + Set the list of ciphersuites to allow when serving TLS. + This is for newer TLS 1.3 connections. + Use ``""`` for default ciphersuites. + + Default: "" + + +@@UAHL@unbound.conf@pad-responses@@: *<yes or no>* + If enabled, TLS serviced queries that contained an EDNS Padding option will + cause responses padded to the closest multiple of the size specified in + :ref:`pad-responses-block-size<unbound.conf.pad-responses-block-size>`. + + Default: yes + + +@@UAHL@unbound.conf@pad-responses-block-size@@: *<number>* + The block size with which to pad responses serviced over TLS. + Only responses to padded queries will be padded. + + Default: 468 + + +@@UAHL@unbound.conf@pad-queries@@: *<yes or no>* + If enabled, all queries sent over TLS upstreams will be padded to the + closest multiple of the size specified in + :ref:`pad-queries-block-size<unbound.conf.pad-queries-block-size>`. + + Default: yes + + +@@UAHL@unbound.conf@pad-queries-block-size@@: *<number>* + The block size with which to pad queries sent over TLS upstreams. + + Default: 128 + + +@@UAHL@unbound.conf@tls-use-sni@@: *<yes or no>* + Enable or disable sending the SNI extension on TLS connections. + + .. note:: Changing the value requires a reload. + + Default: yes + + +@@UAHL@unbound.conf@https-port@@: *<number>* + The port number on which to provide DNS-over-HTTPS service. + Only interfaces configured with that port number as @number get the HTTPS + service. + + Default: 443 + + +@@UAHL@unbound.conf@http-endpoint@@: *<endpoint string>* + The HTTP endpoint to provide DNS-over-HTTPS service on. + + Default: /dns-query + + +@@UAHL@unbound.conf@http-max-streams@@: *<number of streams>* + Number used in the SETTINGS_MAX_CONCURRENT_STREAMS parameter in the HTTP/2 + SETTINGS frame for DNS-over-HTTPS connections. + + Default: 100 + + +@@UAHL@unbound.conf@http-query-buffer-size@@: *<size in bytes>* + Maximum number of bytes used for all HTTP/2 query buffers combined. + These buffers contain (partial) DNS queries waiting for request stream + completion. + An RST_STREAM frame will be send to streams exceeding this limit. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + + Default: 4m + + +@@UAHL@unbound.conf@http-response-buffer-size@@: *<size in bytes>* + Maximum number of bytes used for all HTTP/2 response buffers combined. + These buffers contain DNS responses waiting to be written back to the + clients. + An RST_STREAM frame will be send to streams exceeding this limit. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + + Default: 4m + + +@@UAHL@unbound.conf@http-nodelay@@: *<yes or no>* + Set TCP_NODELAY socket option on sockets used to provide DNS-over-HTTPS + service. + Ignored if the option is not available. + + Default: yes + + +@@UAHL@unbound.conf@http-notls-downstream@@: *<yes or no>* + Disable use of TLS for the downstream DNS-over-HTTP connections. + Useful for local back end servers. + + Default: no + + +@@UAHL@unbound.conf@proxy-protocol-port@@: *<portnr>* + List port numbers as + :ref:`proxy-protocol-port<unbound.conf.proxy-protocol-port>`, and when + interfaces are defined, eg. with the @port suffix, as this port number, + they support and expect PROXYv2. + + In this case the proxy address will only be used for the network + communication and initial ACL (check if the proxy itself is denied/refused + by configuration). + + The proxied address (if any) will then be used as the true client address + and will be used where applicable for logging, ACL, DNSTAP, RPZ and IP + ratelimiting. + + PROXYv2 is supported for UDP and TCP/TLS listening interfaces. + + There is no support for PROXYv2 on a DoH, DoQ or DNSCrypt listening interface. + + Can list multiple, each on a new statement. + + +@@UAHL@unbound.conf@quic-port@@: *<number>* + The port number on which to provide DNS-over-QUIC service. + Only interfaces configured with that port number as @number get the QUIC + service. + The interface uses QUIC for the UDP traffic on that port number. + + Default: 853 + + +@@UAHL@unbound.conf@quic-size@@: *<size in bytes>* + Maximum number of bytes for all QUIC buffers and data combined. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + New connections receive connection refused when the limit is exceeded. + New streams are reset when the limit is exceeded. + + Default: 8m + + +@@UAHL@unbound.conf@use-systemd@@: *<yes or no>* + Enable or disable systemd socket activation. + + Default: no + + +@@UAHL@unbound.conf@do-daemonize@@: *<yes or no>* + Enable or disable whether the Unbound server forks into the background as a + daemon. + Set the value to no when Unbound runs as systemd service. + + Default: yes + + +@@UAHL@unbound.conf@tcp-connection-limit@@: *<IP netblock> <limit>* + Allow up to limit simultaneous TCP connections from the given netblock. + When at the limit, further connections are accepted but closed immediately. + This option is experimental at this time. + + Default: (disabled) + + +@@UAHL@unbound.conf@access-control@@: *<IP netblock> <action>* + Specify treatment of incoming queries from their originating IP address. + Queries can be allowed to have access to this server that gives DNS + answers, or refused, with other actions possible. + The IP address range can be specified as a netblock, it is possible to give + the statement several times in order to specify the treatment of different + netblocks. + The netblock is given as an IPv4 or IPv6 address with /size appended for a + classless network block. + The most specific netblock match is used, if none match + :ref:`refuse<unbound.conf.access-control.action.refuse>` is used. + The order of the access-control statements therefore does not matter. + The action can be + :ref:`deny<unbound.conf.access-control.action.deny>`, + :ref:`refuse<unbound.conf.access-control.action.refuse>`, + :ref:`allow<unbound.conf.access-control.action.allow>`, + :ref:`allow_setrd<unbound.conf.access-control.action.allow_setrd>`, + :ref:`allow_snoop<unbound.conf.access-control.action.allow_snoop>`, + :ref:`allow_cookie<unbound.conf.access-control.action.allow_cookie>`, + :ref:`deny_non_local<unbound.conf.access-control.action.deny_non_local>` or + :ref:`refuse_non_local<unbound.conf.access-control.action.refuse_non_local>`. + + + @@UAHL@unbound.conf.access-control.action@deny@@ + Stops queries from hosts from that netblock. + + @@UAHL@unbound.conf.access-control.action@refuse@@ + Stops queries too, but sends a DNS rcode REFUSED error message back. + + @@UAHL@unbound.conf.access-control.action@allow@@ + Gives access to clients from that netblock. + It gives only access for recursion clients (which is what almost all + clients need). + Non-recursive queries are refused. + + The :ref:`allow<unbound.conf.access-control.action.allow>` action does + allow non-recursive queries to access the local-data that is + configured. + The reason is that this does not involve the Unbound server recursive + lookup algorithm, and static data is served in the reply. + This supports normal operations where non-recursive queries are made + for the authoritative data. + For non-recursive queries any replies from the dynamic cache are + refused. + + @@UAHL@unbound.conf.access-control.action@allow_setrd@@ + Ignores the recursion desired (RD) bit and treats all requests as if + the recursion desired bit is set. + + Note that this behavior violates :rfc:`1034` which states that a name + server should never perform recursive service unless asked via the RD + bit since this interferes with trouble shooting of name servers and + their databases. + This prohibited behavior may be useful if another DNS server must + forward requests for specific zones to a resolver DNS server, but only + supports stub domains and sends queries to the resolver DNS server with + the RD bit cleared. + + @@UAHL@unbound.conf.access-control.action@allow_snoop@@ + Gives non-recursive access too. + This gives both recursive and non recursive access. + The name *allow_snoop* refers to cache snooping, a technique to use + non-recursive queries to examine the cache contents (for malicious + acts). + However, non-recursive queries can also be a valuable debugging tool + (when you want to examine the cache contents). + + In that case use + :ref:`allow_snoop<unbound.conf.access-control.action.allow_snoop>` for + your administration host. + + @@UAHL@unbound.conf.access-control.action@allow_cookie@@ + Allows access only to UDP queries that contain a valid DNS Cookie as + specified in RFC 7873 and RFC 9018, when the + :ref:`answer-cookie<unbound.conf.answer-cookie>` option is enabled. + UDP queries containing only a DNS Client Cookie and no Server Cookie, + or an invalid DNS Cookie, will receive a BADCOOKIE response including a + newly generated DNS Cookie, allowing clients to retry with that DNS + Cookie. + The *allow_cookie* action will also accept requests over stateful + transports, regardless of the presence of an DNS Cookie and regardless + of the :ref:`answer-cookie<unbound.conf.answer-cookie>` setting. + UDP queries without a DNS Cookie receive REFUSED responses with the TC + flag set, that may trigger fall back to TCP for those clients. + + @@UAHL@unbound.conf.access-control.action@deny_non_local@@ + The + :ref:`deny_non_local<unbound.conf.access-control.action.deny_non_local>` + action is for hosts that are only allowed to query for the + authoritative :ref:`local-data<unbound.conf.local-data>`, they are not + allowed full recursion but only the static data. + Messages that are disallowed are dropped. + + @@UAHL@unbound.conf.access-control.action@refuse_non_local@@ + The + :ref:`refuse_non_local<unbound.conf.access-control.action.refuse_non_local>` + action is for hosts that are only allowed to query for the + authoritative :ref:`local-data<unbound.conf.local-data>`, they are not + allowed full recursion but only the static data. + Messages that are disallowed receive error code REFUSED. + + + By default only localhost (the 127.0.0.0/8 IP netblock, not the loopback + interface) is implicitly *allowed*, the rest is refused. + The default is *refused*, because that is protocol-friendly. + The DNS protocol is not designed to handle dropped packets due to policy, + and dropping may result in (possibly excessive) retried queries. + + +@@UAHL@unbound.conf@access-control-tag@@: *<IP netblock> "<list of tags>"* + Assign tags to :ref:`access-control<unbound.conf.access-control>` + elements. + Clients using this access control element use localzones that are tagged + with one of these tags. + + Tags must be defined in :ref:`define-tag<unbound.conf.define-tag>`. + Enclose list of tags in quotes (``""``) and put spaces between tags. + + If :ref:`access-control-tag<unbound.conf.access-control-tag>` is + configured for a netblock that does not have an + :ref:`access-control<unbound.conf.access-control>`, an access-control + element with action :ref:`allow<unbound.conf.access-control.action.allow>` + is configured for this netblock. + + +@@UAHL@unbound.conf@access-control-tag-action@@: *<IP netblock> <tag> <action>* + Set action for particular tag for given access control element. + If you have multiple tag values, the tag used to lookup the action is the + first tag match between + :ref:`access-control-tag<unbound.conf.access-control-tag>` and + :ref:`local-zone-tag<unbound.conf.local-zone-tag>` where "first" comes + from the order of the :ref:`define-tag<unbound.conf.define-tag>` values. + + +@@UAHL@unbound.conf@access-control-tag-data@@: *<IP netblock> <tag> "<resource record string>"* + Set redirect data for particular tag for given access control element. + + +@@UAHL@unbound.conf@access-control-view@@: *<IP netblock> <view name>* + Set view for given access control element. + + +@@UAHL@unbound.conf@interface-action@@: *<ip address or interface name [@port]> <action>* + Similar to :ref:`access-control<unbound.conf.access-control>` but for + interfaces. + + The action is the same as the ones defined under + :ref:`access-control<unbound.conf.access-control>`. + + Default action for interfaces is + :ref:`refuse<unbound.conf.access-control.action.refuse>`. + By default only localhost (the 127.0.0.0/8 IP netblock, not the loopback + interface) is implicitly allowed through the default + :ref:`access-control<unbound.conf.access-control>` behavior. + This also means that any attempt to use the **interface-\*:** options for + the loopback interface will not work as they will be overridden by the + implicit default "access-control: 127.0.0.0/8 allow" option. + + .. note:: + The interface needs to be already specified with + :ref:`interface<unbound.conf.interface>` and that any + **access-control\*:** attribute overrides all **interface-\*:** + attributes for targeted clients. + + +@@UAHL@unbound.conf@interface-tag@@: *<ip address or interface name [@port]> <"list of tags">* + Similar to :ref:`access-control-tag<unbound.conf.access-control-tag>` but + for interfaces. + + .. note:: + The interface needs to be already specified with + :ref:`interface<unbound.conf.interface>` and that any + **access-control\*:** attribute overrides all **interface-\*:** + attributes for targeted clients. + + +@@UAHL@unbound.conf@interface-tag-action@@: *<ip address or interface name [@port]> <tag> <action>* + Similar to + :ref:`access-control-tag-action<unbound.conf.access-control-tag-action>` + but for interfaces. + + .. note:: + The interface needs to be already specified with + :ref:`interface<unbound.conf.interface>` and that any + **access-control\*:** attribute overrides all **interface-\*:** + attributes for targeted clients. + + +@@UAHL@unbound.conf@interface-tag-data@@: *<ip address or interface name [@port]> <tag> <"resource record string">* + Similar to + :ref:`access-control-tag-data<unbound.conf.access-control-tag-data>` but + for interfaces. + + .. note:: + The interface needs to be already specified with + :ref:`interface<unbound.conf.interface>` and that any + **access-control\*:** attribute overrides all **interface-\*:** + attributes for targeted clients. + + +@@UAHL@unbound.conf@interface-view@@: *<ip address or interface name [@port]> <view name>* + Similar to :ref:`access-control-view<unbound.conf.access-control-view>` + but for interfaces. + + .. note:: + The interface needs to be already specified with + :ref:`interface<unbound.conf.interface>` and that any + **access-control\*:** attribute overrides all **interface-\*:** + attributes for targeted clients. + + +@@UAHL@unbound.conf@chroot@@: *<directory>* + If :ref:`chroot<unbound.conf.chroot>` is enabled, you should pass the + configfile (from the commandline) as a full path from the original root. + After the chroot has been performed the now defunct portion of the config + file path is removed to be able to reread the config after a reload. + + All other file paths (working dir, logfile, roothints, and key files) can + be specified in several ways: as an absolute path relative to the new root, + as a relative path to the working directory, or as an absolute path + relative to the original root. + In the last case the path is adjusted to remove the unused portion. + + The pidfile can be either a relative path to the working directory, or an + absolute path relative to the original root. + It is written just prior to chroot and dropping permissions. + This allows the pidfile to be :file:`/var/run/unbound.pid` and the chroot + to be :file:`/var/unbound`, for example. + Note that Unbound is not able to remove the pidfile after termination when + it is located outside of the chroot directory. + + Additionally, Unbound may need to access :file:`/dev/urandom` (for entropy) + from inside the chroot. + + If given, a *chroot(2)* is done to the given directory. + If you give ``""`` no *chroot(2)* is performed. + + Default: @UNBOUND_CHROOT_DIR@ + + +@@UAHL@unbound.conf@username@@: *<name>* + If given, after binding the port the user privileges are dropped. + If you give username: ``""`` no user change is performed. + + If this user is not capable of binding the port, reloads (by signal HUP) + will still retain the opened ports. + If you change the port number in the config file, and that new port number + requires privileges, then a reload will fail; a restart is needed. + + Default: @UNBOUND_USERNAME@ + + +@@UAHL@unbound.conf@directory@@: *<directory>* + Sets the working directory for the program. + On Windows the string "%EXECUTABLE%" tries to change to the directory that + :command:`unbound.exe` resides in. + If you give a :ref:`server: directory: + \<directory\><unbound.conf.directory>` before + :ref:`include<unbound.conf.include>` file statements then those includes + can be relative to the working directory. + + Default: @UNBOUND_RUN_DIR@ + + +@@UAHL@unbound.conf@logfile@@: *<filename>* + If ``""`` is given, logging goes to stderr, or nowhere once daemonized. + The logfile is appended to, in the following format: + + .. code-block:: text + + [seconds since 1970] unbound[pid:tid]: type: message. + + If this option is given, the :ref:`use-syslog<unbound.conf.use-syslog>` + attribute is internally set to ``no``. + + The logfile is reopened (for append) when the config file is reread, on + SIGHUP. + + Default: "" (disabled) + + +@@UAHL@unbound.conf@use-syslog@@: *<yes or no>* + Sets Unbound to send log messages to the syslogd, using *syslog(3)*. + The log facility LOG_DAEMON is used, with identity "unbound". + The logfile setting is overridden when + :ref:`use-syslog: yes<unbound.conf.use-syslog>` is set. + + Default: yes + + +@@UAHL@unbound.conf@log-identity@@: *<string>* + If ``""`` is given, then the name of the executable, usually + "unbound" is used to report to the log. + Enter a string to override it with that, which is useful on systems that + run more than one instance of Unbound, with different configurations, so + that the logs can be easily distinguished against. + + Default: "" + + +@@UAHL@unbound.conf@log-time-ascii@@: *<yes or no>* + Sets logfile lines to use a timestamp in UTC ASCII. + No effect if using syslog, in that case syslog formats the timestamp + printed into the log files. + + Default: no (prints the seconds since 1970 in brackets) + + +@@UAHL@unbound.conf@log-time-iso@@: *<yes or no>* + Log time in ISO8601 format, if + :ref:`log-time-ascii: yes<unbound.conf.log-time-ascii>` + is also set. + + Default: no + + +@@UAHL@unbound.conf@log-queries@@: *<yes or no>* + Prints one line per query to the log, with the log timestamp and IP + address, name, type and class. + Note that it takes time to print these lines which makes the server + (significantly) slower. + Odd (nonprintable) characters in names are printed as ``'?'``. + + Default: no + + +@@UAHL@unbound.conf@log-replies@@: *<yes or no>* + Prints one line per reply to the log, with the log timestamp and IP + address, name, type, class, return code, time to resolve, from cache and + response size. + Note that it takes time to print these lines which makes the server + (significantly) slower. + Odd (nonprintable) characters in names are printed as ``'?'``. + + Default: no + + +@@UAHL@unbound.conf@log-tag-queryreply@@: *<yes or no>* + Prints the word 'query' and 'reply' with + :ref:`log-queries<unbound.conf.log-queries>` and + :ref:`log-replies<unbound.conf.log-replies>`. + This makes filtering logs easier. + + Default: no (backwards compatible) + + +@@UAHL@unbound.conf@log-destaddr@@: *<yes or no>* + Prints the destination address, port and type in the + :ref:`log-replies<unbound.conf.log-replies>` output. + This disambiguates what type of traffic, eg. UDP or TCP, and to what local + port the traffic was sent to. + + Default: no + + +@@UAHL@unbound.conf@log-local-actions@@: *<yes or no>* + Print log lines to inform about local zone actions. + These lines are like the :ref:`local-zone type + inform<unbound.conf.local-zone.type.inform>` print outs, but they are also + printed for the other types of local zones. + + Default: no + + +@@UAHL@unbound.conf@log-servfail@@: *<yes or no>* + Print log lines that say why queries return SERVFAIL to clients. + This is separate from the verbosity debug logs, much smaller, and printed + at the error level, not the info level of debug info from verbosity. + + Default: no + + +@@UAHL@unbound.conf@pidfile@@: *<filename>* + The process id is written to the file. + Default is :file:`"@UNBOUND_PIDFILE@"`. + So, + + .. code-block:: text + + kill -HUP `cat @UNBOUND_PIDFILE@` + + triggers a reload, + + .. code-block:: text + + kill -TERM `cat @UNBOUND_PIDFILE@` + + gracefully terminates. + + Default: @UNBOUND_PIDFILE@ + + +@@UAHL@unbound.conf@root-hints@@: *<filename>* + Read the root hints from this file. + Default is nothing, using builtin hints for the IN class. + The file has the format of zone files, with root nameserver names and + addresses only. + The default may become outdated, when servers change, therefore it is good + practice to use a root hints file. + + Default: "" + + +@@UAHL@unbound.conf@hide-identity@@: *<yes or no>* + If enabled 'id.server' and 'hostname.bind' queries are REFUSED. + + Default: no + + +@@UAHL@unbound.conf@identity@@: *<string>* + Set the identity to report. + If set to ``""``, then the hostname of the server is returned. + + Default: "" + + +@@UAHL@unbound.conf@hide-version@@: *<yes or no>* + If enabled 'version.server' and 'version.bind' queries are REFUSED. + + Default: no + + +@@UAHL@unbound.conf@version@@: *<string>* + Set the version to report. + If set to ``""``, then the package version is returned. + + Default: "" + + +@@UAHL@unbound.conf@hide-http-user-agent@@: *<yes or no>* + If enabled the HTTP header User-Agent is not set. + Use with caution as some webserver configurations may reject HTTP requests + lacking this header. + If needed, it is better to explicitly set the + :ref:`http-user-agent<unbound.conf.http-user-agent>` below. + + Default: no + + +@@UAHL@unbound.conf@http-user-agent@@: *<string>* + Set the HTTP User-Agent header for outgoing HTTP requests. + If set to ``""``, then the package name and version are used. + + Default: "" + + +@@UAHL@unbound.conf@nsid@@: *<string>* + Add the specified nsid to the EDNS section of the answer when queried with + an NSID EDNS enabled packet. + As a sequence of hex characters or with 'ascii\_' prefix and then an ASCII + string. + + Default: (disabled) + + +@@UAHL@unbound.conf@hide-trustanchor@@: *<yes or no>* + If enabled 'trustanchor.unbound' queries are REFUSED. + + Default: no + + +@@UAHL@unbound.conf@target-fetch-policy@@: *<"list of numbers">* + Set the target fetch policy used by Unbound to determine if it should fetch + nameserver target addresses opportunistically. + The policy is described per dependency depth. + + The number of values determines the maximum dependency depth that Unbound + will pursue in answering a query. + A value of -1 means to fetch all targets opportunistically for that + dependency depth. + A value of 0 means to fetch on demand only. + A positive value fetches that many targets opportunistically. + + Enclose the list between quotes (``""``) and put spaces between numbers. + Setting all zeroes, "0 0 0 0 0" gives behaviour closer to that of BIND 9, + while setting "-1 -1 -1 -1 -1" gives behaviour rumoured to be closer to + that of BIND 8. + + Default: "3 2 1 0 0" + + +@@UAHL@unbound.conf@harden-short-bufsize@@: *<yes or no>* + Very small EDNS buffer sizes from queries are ignored. + + Default: yes (as described in the standard) + + +@@UAHL@unbound.conf@harden-large-queries@@: *<yes or no>* + Very large queries are ignored. + Default is no, since it is legal protocol wise to send these, and could be + necessary for operation if TSIG or EDNS payload is very large. + + Default: no + + +@@UAHL@unbound.conf@harden-glue@@: *<yes or no>* + Will trust glue only if it is within the servers authority. + + Default: yes + + +@@UAHL@unbound.conf@harden-unverified-glue@@: *<yes or no>* + Will trust only in-zone glue. + Will try to resolve all out of zone (*unverified*) glue. + Will fallback to the original glue if unable to resolve. + + Default: no + + +@@UAHL@unbound.conf@harden-dnssec-stripped@@: *<yes or no>* + Require DNSSEC data for trust-anchored zones, if such data is absent, the + zone becomes bogus. + If turned off, and no DNSSEC data is received (or the DNSKEY data fails to + validate), then the zone is made insecure, this behaves like there is no + trust anchor. + You could turn this off if you are sometimes behind an intrusive firewall + (of some sort) that removes DNSSEC data from packets, or a zone changes + from signed to unsigned to badly signed often. + If turned off you run the risk of a downgrade attack that disables security + for a zone. + + Default: yes + + +@@UAHL@unbound.conf@harden-below-nxdomain@@: *<yes or no>* + From :rfc:`8020` (with title "NXDOMAIN: There Really Is Nothing + Underneath"), returns NXDOMAIN to queries for a name below another name + that is already known to be NXDOMAIN. + DNSSEC mandates NOERROR for empty nonterminals, hence this is possible. + Very old software might return NXDOMAIN for empty nonterminals (that + usually happen for reverse IP address lookups), and thus may be + incompatible with this. + To try to avoid this only DNSSEC-secure NXDOMAINs are used, because the old + software does not have DNSSEC. + + .. note:: + The NXDOMAIN must be secure, this means NSEC3 with optout is + insufficient. + + Default: yes + + +@@UAHL@unbound.conf@harden-referral-path@@: *<yes or no>* + Harden the referral path by performing additional queries for + infrastructure data. + Validates the replies if trust anchors are configured and the zones are + signed. + This enforces DNSSEC validation on nameserver NS sets and the nameserver + addresses that are encountered on the referral path to the answer. + Default is off, because it burdens the authority servers, and it is not RFC + standard, and could lead to performance problems because of the extra query + load that is generated. + Experimental option. + If you enable it consider adding more numbers after the + :ref:`target-fetch-policy<unbound.conf.target-fetch-policy>` to increase + the max depth that is checked to. + + Default: no + + +@@UAHL@unbound.conf@harden-algo-downgrade@@: *<yes or no>* + Harden against algorithm downgrade when multiple algorithms are advertised + in the DS record. + This works by first choosing only the strongest DS digest type as per + :rfc:`4509` (Unbound treats the highest algorithm as the strongest) and + then expecting signatures from all the advertised signing algorithms from + the chosen DS(es) to be present. + If no, allows any one supported algorithm to validate the zone, even if + other advertised algorithms are broken. + :rfc:`6840` mandates that zone signers must produce zones signed with all + advertised algorithms, but sometimes they do not. + :rfc:`6840` also clarifies that this requirement is not for validators and + validators should accept any single valid path. + It should thus be explicitly noted that this option violates :rfc:`6840` + for DNSSEC validation and should only be used to perform a signature + completeness test to support troubleshooting. + + .. warning:: + Using this option may break DNSSEC resolution with non :rfc:`6840` + conforming signers and/or in multi-signer configurations that don't + send all the advertised signatures. + + Default: no + + +@@UAHL@unbound.conf@harden-unknown-additional@@: *<yes or no>* + Harden against unknown records in the authority section and additional + section. + If no, such records are copied from the upstream and presented to the + client together with the answer. + If yes, it could hamper future protocol developments that want to add + records. + + Default: no + + +@@UAHL@unbound.conf@use-caps-for-id@@: *<yes or no>* + Use 0x20-encoded random bits in the query to foil spoof attempts. + This perturbs the lowercase and uppercase of query names sent to authority + servers and checks if the reply still has the correct casing. + This feature is an experimental implementation of draft dns-0x20. + + Default: no + + +@@UAHL@unbound.conf@caps-exempt@@: *<domain>* + Exempt the domain so that it does not receive caps-for-id perturbed + queries. + For domains that do not support 0x20 and also fail with fallback because + they keep sending different answers, like some load balancers. + Can be given multiple times, for different domains. + + +@@UAHL@unbound.conf@caps-whitelist@@: *<domain>* + Alternate syntax for :ref:`caps-exempt<unbound.conf.caps-exempt>`. + + +@@UAHL@unbound.conf@qname-minimisation@@: *<yes or no>* + Send minimum amount of information to upstream servers to enhance privacy. + Only send minimum required labels of the QNAME and set QTYPE to A when + possible. + Best effort approach; full QNAME and original QTYPE will be sent when + upstream replies with a RCODE other than NOERROR, except when receiving + NXDOMAIN from a DNSSEC signed zone. + + Default: yes + + +@@UAHL@unbound.conf@qname-minimisation-strict@@: *<yes or no>* + QNAME minimisation in strict mode. + Do not fall-back to sending full QNAME to potentially broken nameservers. + A lot of domains will not be resolvable when this option in enabled. + Only use if you know what you are doing. + This option only has effect when + :ref:`qname-minimisation<unbound.conf.qname-minimisation>` is enabled. + + Default: no + + +@@UAHL@unbound.conf@aggressive-nsec@@: *<yes or no>* + Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN and other + denials, using information from previous NXDOMAINs answers. + It helps to reduce the query rate towards targets that get a very high + nonexistent name lookup rate. + + Default: yes + + +@@UAHL@unbound.conf@private-address@@: *<IP address or subnet>* + Give IPv4 of IPv6 addresses or classless subnets. + These are addresses on your private network, and are not allowed to be + returned for public internet names. + Any occurrence of such addresses are removed from DNS answers. + Additionally, the DNSSEC validator may mark the answers bogus. + This protects against so-called DNS Rebinding, where a user browser is + turned into a network proxy, allowing remote access through the browser to + other parts of your private network. + + Some names can be allowed to contain your private addresses, by default all + the :ref:`local-data<unbound.conf.local-data>` that you configured is + allowed to, and you can specify additional names using + :ref:`private-domain<unbound.conf.private-domain>`. + No private addresses are enabled by default. + + We consider to enable this for the :rfc:`1918` private IP address space by + default in later releases. + That would enable private addresses for ``10.0.0.0/8``, ``172.16.0.0/12``, + ``192.168.0.0/16``, ``169.254.0.0/16``, ``fd00::/8`` and ``fe80::/10``, + since the RFC standards say these addresses should not be visible on the + public internet. + + Turning on ``127.0.0.0/8`` would hinder many spamblocklists as they use + that. + Adding ``::ffff:0:0/96`` stops IPv4-mapped IPv6 addresses from bypassing + the filter. + + +@@UAHL@unbound.conf@private-domain@@: *<domain name>* + Allow this domain, and all its subdomains to contain private addresses. + Give multiple times to allow multiple domain names to contain private + addresses. + + Default: (none) + + +@@UAHL@unbound.conf@unwanted-reply-threshold@@: *<number>* + If set, a total number of unwanted replies is kept track of in every + thread. + When it reaches the threshold, a defensive action is taken and a warning is + printed to the log. + The defensive action is to clear the rrset and message caches, hopefully + flushing away any poison. + A value of 10 million is suggested. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@do-not-query-address@@: *<IP address>* + Do not query the given IP address. + Can be IPv4 or IPv6. + Append /num to indicate a classless delegation netblock, for example like + ``10.2.3.4/24`` or ``2001::11/64``. + + Default: (none) + + +@@UAHL@unbound.conf@do-not-query-localhost@@: *<yes or no>* + If yes, localhost is added to the + :ref:`do-not-query-address<unbound.conf.do-not-query-address>` entries, + both IPv6 ``::1`` and IPv4 ``127.0.0.1/8``. + If no, then localhost can be used to send queries to. + + Default: yes + + +@@UAHL@unbound.conf@prefetch@@: *<yes or no>* + If yes, cache hits on message cache elements that are on their last 10 + percent of their TTL value trigger a prefetch to keep the cache up to date. + Turning it on gives about 10 percent more traffic and load on the machine, + but popular items do not expire from the cache. + + Default: no + + +@@UAHL@unbound.conf@prefetch-key@@: *<yes or no>* + If yes, fetch the DNSKEYs earlier in the validation process, when a DS + record is encountered. + This lowers the latency of requests. + It does use a little more CPU. + Also if the cache is set to 0, it is no use. + + Default: no + + +@@UAHL@unbound.conf@deny-any@@: *<yes or no>* + If yes, deny queries of type ANY with an empty response. + If disabled, Unbound responds with a short list of resource records if some + can be found in the cache and makes the upstream type ANY query if there + are none. + + Default: no + + +@@UAHL@unbound.conf@rrset-roundrobin@@: *<yes or no>* + If yes, Unbound rotates RRSet order in response (the random number is taken + from the query ID, for speed and thread safety). + + Default: yes + + +@@UAHL@unbound.conf@minimal-responses@@: *<yes or no>* + If yes, Unbound does not insert authority/additional sections into response + messages when those sections are not required. + This reduces response size significantly, and may avoid TCP fallback for + some responses which may cause a slight speedup. + The default is yes, even though the DNS protocol RFCs mandate these + sections, and the additional content could save roundtrips for clients that + use the additional content. + However these sections are hardly used by clients. + Enabling prefetch can benefit clients that need the additional content + by trying to keep that content fresh in the cache. + + Default: yes + + +@@UAHL@unbound.conf@disable-dnssec-lame-check@@: *<yes or no>* + If yes, disables the DNSSEC lameness check in the iterator. + This check sees if RRSIGs are present in the answer, when DNSSEC is + expected, and retries another authority if RRSIGs are unexpectedly missing. + The validator will insist in RRSIGs for DNSSEC signed domains regardless of + this setting, if a trust anchor is loaded. + + Default: no + + +@@UAHL@unbound.conf@module-config@@: *"<module names>"* + Module configuration, a list of module names separated by spaces, surround + the string with quotes (``""``). + The modules can be ``respip``, ``validator``, or ``iterator`` (and possibly + more, see below). + + .. note:: + The ordering of the modules is significant, the order decides the order + of processing. + + Setting this to just "iterator" will result in a non-validating server. + Setting this to "validator iterator" will turn on DNSSEC validation. + + .. note:: + You must also set trust-anchors for validation to be useful. + + Adding ``respip`` to the front will cause RPZ processing to be done on all + queries. + + Most modules that need to be listed here have to be listed at the beginning + of the line. + + The ``subnetcache`` module has to be listed just before the iterator. + + The ``python`` module can be listed in different places, it then processes + the output of the module it is just before. + + The ``dynlib`` module can be listed pretty much anywhere, it is only a very + thin wrapper that allows dynamic libraries to run in its place. + + Default: "validator iterator" + + +@@UAHL@unbound.conf@trust-anchor-file@@: *<filename>* + File with trusted keys for validation. + Both DS and DNSKEY entries can appear in the file. + The format of the file is the standard DNS Zone file format. + + Default: "" (no trust anchor file) + + +@@UAHL@unbound.conf@auto-trust-anchor-file@@: *<filename>* + File with trust anchor for one zone, which is tracked with :rfc:`5011` + probes. + The probes are run several times per month, thus the machine must be online + frequently. + The initial file can be one with contents as described in + :ref:`trust-anchor-file<unbound.conf.trust-anchor-file>`. + The file is written to when the anchor is updated, so the Unbound user must + have write permission. + Write permission to the file, but also to the directory it is in (to create + a temporary file, which is necessary to deal with filesystem full events), + it must also be inside the :ref:`chroot<unbound.conf.chroot>` (if that is + used). + + Default: "" (no auto trust anchor file) + + +@@UAHL@unbound.conf@trust-anchor@@: *"<Resource Record>"* + A DS or DNSKEY RR for a key to use for validation. + Multiple entries can be given to specify multiple trusted keys, in addition + to the :ref:`trust-anchor-file<unbound.conf.trust-anchor-file>`. + The resource record is entered in the same format as *dig(1)* or *drill(1)* + prints them, the same format as in the zone file. + Has to be on a single line, with ``""`` around it. + A TTL can be specified for ease of cut and paste, but is ignored. + A class can be specified, but class IN is default. + + Default: (none) + + +@@UAHL@unbound.conf@trusted-keys-file@@: *<filename>* + File with trusted keys for validation. + Specify more than one file with several entries, one file per entry. + Like :ref:`trust-anchor-file<unbound.conf.trust-anchor-file>` but has a + different file format. + Format is BIND-9 style format, the ``trusted-keys { name flag proto algo + "key"; };`` clauses are read. + It is possible to use wildcards with this statement, the wildcard is + expanded on start and on reload. + + Default: "" (no trusted keys file) + + +@@UAHL@unbound.conf@trust-anchor-signaling@@: *<yes or no>* + Send :rfc:`8145` key tag query after trust anchor priming. + + Default: yes + + +@@UAHL@unbound.conf@root-key-sentinel@@: *<yes or no>* + Root key trust anchor sentinel. + + Default: yes + + +@@UAHL@unbound.conf@domain-insecure@@: *<domain name>* + Sets *<domain name>* to be insecure, DNSSEC chain of trust is ignored + towards the *<domain name>*. + So a trust anchor above the domain name can not make the domain secure with + a DS record, such a DS record is then ignored. + Can be given multiple times to specify multiple domains that are treated as + if unsigned. + If you set trust anchors for the domain they override this setting (and the + domain is secured). + + This can be useful if you want to make sure a trust anchor for external + lookups does not affect an (unsigned) internal domain. + A DS record externally can create validation failures for that internal + domain. + + Default: (none) + + +@@UAHL@unbound.conf@val-override-date@@: *<rrsig-style date spec>* + .. warning:: Debugging feature! + + If enabled by giving a RRSIG style date, that date is used for verifying + RRSIG inception and expiration dates, instead of the current date. + Do not set this unless you are debugging signature inception and + expiration. + The value -1 ignores the date altogether, useful for some special + applications. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@val-sig-skew-min@@: *<seconds>* + Minimum number of seconds of clock skew to apply to validated signatures. + A value of 10% of the signature lifetime (expiration - inception) is used, + capped by this setting. + Default is 3600 (1 hour) which allows for daylight savings differences. + Lower this value for more strict checking of short lived signatures. + + Default: 3600 (1 hour) + + +@@UAHL@unbound.conf@val-sig-skew-max@@: *<seconds>* + Maximum number of seconds of clock skew to apply to validated signatures. + A value of 10% of the signature lifetime (expiration - inception) is used, + capped by this setting. + Default is 86400 (24 hours) which allows for timezone setting problems in + stable domains. + Setting both min and max very low disables the clock skew allowances. + Setting both min and max very high makes the validator check the signature + timestamps less strictly. + + Default: 86400 (24 hours) + + +@@UAHL@unbound.conf@val-max-restart@@: *<number>* + The maximum number the validator should restart validation with another + authority in case of failed validation. + + Default: 5 + + +@@UAHL@unbound.conf@val-bogus-ttl@@: *<seconds>* + The time to live for bogus data. + This is data that has failed validation; due to invalid signatures or other + checks. + The TTL from that data cannot be trusted, and this value is used instead. + The time interval prevents repeated revalidation of bogus data. + + Default: 60 + + +@@UAHL@unbound.conf@val-clean-additional@@: *<yes or no>* + Instruct the validator to remove data from the additional section of secure + messages that are not signed properly. + Messages that are insecure, bogus, indeterminate or unchecked are not + affected. + Use this setting to protect the users that rely on this validator for + authentication from potentially bad data in the additional section. + + Default: yes + + +@@UAHL@unbound.conf@val-log-level@@: *<number>* + Have the validator print validation failures to the log. + Regardless of the verbosity setting. + + At 1, for every user query that fails a line is printed to the logs. + This way you can monitor what happens with validation. + Use a diagnosis tool, such as dig or drill, to find out why validation is + failing for these queries. + + At 2, not only the query that failed is printed but also the reason why + Unbound thought it was wrong and which server sent the faulty data. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@val-permissive-mode@@: *<yes or no>* + Instruct the validator to mark bogus messages as indeterminate. + The security checks are performed, but if the result is bogus (failed + security), the reply is not withheld from the client with SERVFAIL as + usual. + The client receives the bogus data. + For messages that are found to be secure the AD bit is set in replies. + Also logging is performed as for full validation. + + Default: no + + +@@UAHL@unbound.conf@ignore-cd-flag@@: *<yes or no>* + Instruct Unbound to ignore the CD flag from clients and refuse to return + bogus answers to them. + Thus, the CD (Checking Disabled) flag does not disable checking any more. + This is useful if legacy (w2008) servers that set the CD flag but cannot + validate DNSSEC themselves are the clients, and then Unbound provides them + with DNSSEC protection. + + Default: no + + +@@UAHL@unbound.conf@disable-edns-do@@: *<yes or no>* + Disable the EDNS DO flag in upstream requests. + It breaks DNSSEC validation for Unbound's clients. + This results in the upstream name servers to not include DNSSEC records in + their replies and could be helpful for devices that cannot handle DNSSEC + information. + When the option is enabled, clients that set the DO flag receive no EDNS + record in the response to indicate the lack of support to them. + If this option is enabled but Unbound is already configured for DNSSEC + validation (i.e., the validator module is enabled; default) this option is + implicitly turned off with a warning as to not break DNSSEC validation in + Unbound. + + Default: no + + +@@UAHL@unbound.conf@serve-expired@@: *<yes or no>* + If enabled, Unbound attempts to serve old responses from cache with a TTL + of :ref:`serve-expired-reply-ttl<unbound.conf.serve-expired-reply-ttl>` in + the response. + By default the expired answer will be used after a resolution attempt + errored out or is taking more than + :ref:`serve-expired-client-timeout<unbound.conf.serve-expired-client-timeout>` + to resolve. + + Default: no + + +@@UAHL@unbound.conf@serve-expired-ttl@@: *<seconds>* + Limit serving of expired responses to configured seconds after expiration. + ``0`` disables the limit. + This option only applies when + :ref:`serve-expired<unbound.conf.serve-expired>` is enabled. + A suggested value per RFC 8767 is between 86400 (1 day) and 259200 (3 days). + The default is 86400. + + Default: 86400 + + +@@UAHL@unbound.conf@serve-expired-ttl-reset@@: *<yes or no>* + Set the TTL of expired records to the + :ref:`serve-expired-ttl<unbound.conf.serve-expired-ttl>` value after a + failed attempt to retrieve the record from upstream. + This makes sure that the expired records will be served as long as there + are queries for it. + + Default: no + + +@@UAHL@unbound.conf@serve-expired-reply-ttl@@: *<seconds>* + TTL value to use when replying with expired data. + If + :ref:`serve-expired-client-timeout<unbound.conf.serve-expired-client-timeout>` + is also used then it is RECOMMENDED to use 30 as the value (:rfc:`8767`). + + Default: 30 + + +@@UAHL@unbound.conf@serve-expired-client-timeout@@: *<msec>* + Time in milliseconds before replying to the client with expired data. + This essentially enables the serve-stale behavior as specified in + :rfc:`8767` that first tries to resolve before immediately responding with + expired data. + Setting this to ``0`` will disable this behavior and instead serve the + expired record immediately from the cache before attempting to refresh it + via resolution. + + Default: 1800 + + +@@UAHL@unbound.conf@serve-original-ttl@@: *<yes or no>* + If enabled, Unbound will always return the original TTL as received from + the upstream name server rather than the decrementing TTL as stored in the + cache. + This feature may be useful if Unbound serves as a front-end to a hidden + authoritative name server. + + Enabling this feature does not impact cache expiry, it only changes the TTL + Unbound embeds in responses to queries. + + .. note:: + Enabling this feature implicitly disables enforcement of the configured + minimum and maximum TTL, as it is assumed users who enable this feature + do not want Unbound to change the TTL obtained from an upstream server. + + .. note:: + The values set using :ref:`cache-min-ttl<unbound.conf.cache-min-ttl>` + and :ref:`cache-max-ttl<unbound.conf.cache-max-ttl>` are ignored. + + Default: no + + +@@UAHL@unbound.conf@val-nsec3-keysize-iterations@@: <"list of values"> + List of keysize and iteration count values, separated by spaces, surrounded + by quotes. + This determines the maximum allowed NSEC3 iteration count before a message + is simply marked insecure instead of performing the many hashing + iterations. + The list must be in ascending order and have at least one entry. + If you set it to "1024 65535" there is no restriction to NSEC3 iteration + values. + + .. note:: + This table must be kept short; a very long list could cause slower + operation. + + Default: "1024 150 2048 150 4096 150" + + +@@UAHL@unbound.conf@zonemd-permissive-mode@@: *<yes or no>* + If enabled the ZONEMD verification failures are only logged and do not + cause the zone to be blocked and only return servfail. + Useful for testing out if it works, or if the operator only wants to be + notified of a problem without disrupting service. + + Default: no + + +@@UAHL@unbound.conf@add-holddown@@: *<seconds>* + Instruct the + :ref:`auto-trust-anchor-file<unbound.conf.auto-trust-anchor-file>` probe + mechanism for :rfc:`5011` autotrust updates to add new trust anchors only + after they have been visible for this time. + + Default: 2592000 (30 days as per the RFC) + + +@@UAHL@unbound.conf@del-holddown@@: *<seconds>* + Instruct the + :ref:`auto-trust-anchor-file<unbound.conf.auto-trust-anchor-file>` probe + mechanism for :rfc:`5011` autotrust updates to remove revoked trust anchors + after they have been kept in the revoked list for this long. + + Default: 2592000 (30 days as per the RFC) + + +@@UAHL@unbound.conf@keep-missing@@: *<seconds>* + Instruct the + :ref:`auto-trust-anchor-file<unbound.conf.auto-trust-anchor-file>` probe + mechanism for :rfc:`5011` autotrust updates to remove missing trust anchors + after they have been unseen for this long. + This cleans up the state file if the target zone does not perform trust + anchor revocation, so this makes the auto probe mechanism work with zones + that perform regular (non-5011) rollovers. + The value 0 does not remove missing anchors, as per the RFC. + + Default: 31622400 (366 days) + + +@@UAHL@unbound.conf@permit-small-holddown@@: *<yes or no>* + Debug option that allows the autotrust 5011 rollover timers to assume very + small values. + + Default: no + + +@@UAHL@unbound.conf@key-cache-size@@: *<number>* + Number of bytes size of the key cache. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + + Default: 4m + + +@@UAHL@unbound.conf@key-cache-slabs@@: *<number>* + Number of slabs in the key cache. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + + +@@UAHL@unbound.conf@neg-cache-size@@: *<number>* + Number of bytes size of the aggressive negative cache. + A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes + or gigabytes (1024*1024 bytes in a megabyte). + + Default: 1m + + +@@UAHL@unbound.conf@unblock-lan-zones@@: *<yes or no>* + If enabled, then for private address space, the reverse lookups are no + longer filtered. + This allows Unbound when running as dns service on a host where it provides + service for that host, to put out all of the queries for the 'lan' + upstream. + When enabled, only localhost, ``127.0.0.1`` reverse and ``::1`` reverse + zones are configured with default local zones. + Disable the option when Unbound is running as a (DHCP-) DNS network + resolver for a group of machines, where such lookups should be filtered + (RFC compliance), this also stops potential data leakage about the local + network to the upstream DNS servers. + + Default: no + + +@@UAHL@unbound.conf@insecure-lan-zones@@: *<yes or no>* + If enabled, then reverse lookups in private address space are not + validated. + This is usually required whenever + :ref:`unblock-lan-zones<unbound.conf.unblock-lan-zones>` is used. + + Default: no + + +@@UAHL@unbound.conf@local-zone@@: *<zone> <type>* + Configure a local zone. + The type determines the answer to give if there is no match from + :ref:`local-data<unbound.conf.local-data>`. + The types are + :ref:`deny<unbound.conf.local-zone.type.deny>`, + :ref:`refuse<unbound.conf.local-zone.type.refuse>`, + :ref:`static<unbound.conf.local-zone.type.static>`, + :ref:`transparent<unbound.conf.local-zone.type.transparent>`, + :ref:`redirect<unbound.conf.local-zone.type.redirect>`, + :ref:`nodefault<unbound.conf.local-zone.type.nodefault>`, + :ref:`typetransparent<unbound.conf.local-zone.type.typetransparent>`, + :ref:`inform<unbound.conf.local-zone.type.inform>`, + :ref:`inform_deny<unbound.conf.local-zone.type.inform_deny>`, + :ref:`inform_redirect<unbound.conf.local-zone.type.inform_redirect>`, + :ref:`always_transparent<unbound.conf.local-zone.type.always_transparent>`, + :ref:`block_a<unbound.conf.local-zone.type.block_a>`, + :ref:`always_refuse<unbound.conf.local-zone.type.always_refuse>`, + :ref:`always_nxdomain<unbound.conf.local-zone.type.always_nxdomain>`, + :ref:`always_null<unbound.conf.local-zone.type.always_null>`, + :ref:`noview<unbound.conf.local-zone.type.noview>`, + and are explained below. + After that the default settings are listed. + Use :ref:`local-data<unbound.conf.local-data>` to enter data into the + local zone. + Answers for local zones are authoritative DNS answers. + By default the zones are class IN. + + If you need more complicated authoritative data, with referrals, + wildcards, CNAME/DNAME support, or DNSSEC authoritative service, + setup a :ref:`stub-zone<unbound.conf.stub>` for it as detailed in the + stub zone section below. + A :ref:`stub-zone<unbound.conf.stub>` can be used to have unbound + send queries to another server, an authoritative server, to fetch the + information. + With a :ref:`forward-zone<unbound.conf.forward>`, unbound sends + queries to a server that is a recursive server to fetch the information. + With an :ref:`auth-zone<unbound.conf.auth>` a zone can be loaded from + file and used, it can be used like a local zone for users downstream, or + the :ref:`auth-zone<unbound.conf.auth>` information can be used to fetch + information from when resolving like it is an upstream server. + The :ref:`forward-zone<unbound.conf.forward>` and + :ref:`auth-zone<unbound.conf.auth>` options are described in their + sections below. + If you want to perform filtering of the information that the users can + fetch, the :ref:`local-zone<unbound.conf.local-zone>` and + :ref:`local-data<unbound.conf.local-data>` statements allow for this, but + also the :ref:`rpz<unbound.conf.rpz>` functionality can be used, described + in the RPZ section. + + @@UAHL@unbound.conf.local-zone.type@deny@@ + Do not send an answer, drop the query. + If there is a match from local data, the query is answered. + + @@UAHL@unbound.conf.local-zone.type@refuse@@ + Send an error message reply, with rcode REFUSED. + If there is a match from local data, the query is answered. + + @@UAHL@unbound.conf.local-zone.type@static@@ + If there is a match from local data, the query is answered. + Otherwise, the query is answered with NODATA or NXDOMAIN. + For a negative answer a SOA is included in the answer if present as + :ref:`local-data<unbound.conf.local-data>` for the zone apex domain. + + @@UAHL@unbound.conf.local-zone.type@transparent@@ + If there is a match from :ref:`local-data<unbound.conf.local-data>`, + the query is answered. + Otherwise if the query has a different name, the query is resolved + normally. + If the query is for a name given in + :ref:`local-data<unbound.conf.local-data>` but no such type of data is + given in localdata, then a NOERROR NODATA answer is returned. + If no :ref:`local-zone<unbound.conf.local-zone>` is given + :ref:`local-data<unbound.conf.local-data>` causes a transparent zone + to be created by default. + + @@UAHL@unbound.conf.local-zone.type@typetransparent@@ + If there is a match from local data, the query is answered. + If the query is for a different name, or for the same name but for a + different type, the query is resolved normally. + So, similar to + :ref:`transparent<unbound.conf.local-zone.type.transparent>` but types + that are not listed in local data are resolved normally, so if an A + record is in the local data that does not cause a NODATA reply for AAAA + queries. + + @@UAHL@unbound.conf.local-zone.type@redirect@@ + The query is answered from the local data for the zone name. + There may be no local data beneath the zone name. + This answers queries for the zone, and all subdomains of the zone with + the local data for the zone. + It can be used to redirect a domain to return a different address + record to the end user, with: + + .. code-block:: text + + local-zone: "example.com." redirect + local-data: "example.com. A 127.0.0.1" + + queries for ``www.example.com`` and ``www.foo.example.com`` are + redirected, so that users with web browsers cannot access sites with + suffix example.com. + + @@UAHL@unbound.conf.local-zone.type@inform@@ + The query is answered normally, same as + :ref:`transparent<unbound.conf.local-zone.type.transparent>`. + The client IP address (@portnumber) is printed to the logfile. + The log message is: + + .. code-block:: text + + timestamp, unbound-pid, info: zonename inform IP@port queryname type class. + + This option can be used for normal resolution, but machines looking up + infected names are logged, eg. to run antivirus on them. + + @@UAHL@unbound.conf.local-zone.type@inform_deny@@ + The query is dropped, like + :ref:`deny<unbound.conf.local-zone.type.deny>`, and logged, like + :ref:`inform<unbound.conf.local-zone.type.inform>`. + Ie. find infected machines without answering the queries. + + @@UAHL@unbound.conf.local-zone.type@inform_redirect@@ + The query is redirected, like + :ref:`redirect<unbound.conf.local-zone.type.redirect>`, and logged, + like :ref:`inform<unbound.conf.local-zone.type.inform>`. + Ie. answer queries with fixed data and also log the machines that ask. + + @@UAHL@unbound.conf.local-zone.type@always_transparent@@ + Like :ref:`transparent<unbound.conf.local-zone.type.transparent>`, but + ignores local data and resolves normally. + + @@UAHL@unbound.conf.local-zone.type@block_a@@ + Like :ref:`transparent<unbound.conf.local-zone.type.transparent>`, but + ignores local data and resolves normally all query types excluding A. + For A queries it unconditionally returns NODATA. + Useful in cases when there is a need to explicitly force all apps to + use IPv6 protocol and avoid any queries to IPv4. + + @@UAHL@unbound.conf.local-zone.type@always_refuse@@ + Like :ref:`refuse<unbound.conf.local-zone.type.refuse>`, but ignores + local data and refuses the query. + + @@UAHL@unbound.conf.local-zone.type@always_nxdomain@@ + Like :ref:`static<unbound.conf.local-zone.type.static>`, but ignores + local data and returns NXDOMAIN for the query. + + @@UAHL@unbound.conf.local-zone.type@always_nodata@@ + Like :ref:`static<unbound.conf.local-zone.type.static>`, but ignores + local data and returns NODATA for the query. + + @@UAHL@unbound.conf.local-zone.type@always_deny@@ + Like :ref:`deny<unbound.conf.local-zone.type.deny>`, but ignores local + data and drops the query. + + @@UAHL@unbound.conf.local-zone.type@always_null@@ + Always returns ``0.0.0.0`` or ``::0`` for every name in the zone. + Like :ref:`redirect<unbound.conf.local-zone.type.redirect>` with zero + data for A and AAAA. + Ignores local data in the zone. + Used for some block lists. + + @@UAHL@unbound.conf.local-zone.type@noview@@ + Breaks out of that view and moves towards the global local zones for + answer to the query. + If the :ref:`view-first<unbound.conf.view.view-first>` is no, it'll + resolve normally. + If :ref:`view-first<unbound.conf.view.view-first>` is enabled, it'll + break perform that step and check the global answers. + For when the view has view specific overrides but some zone has to be + answered from global local zone contents. + + @@UAHL@unbound.conf.local-zone.type@nodefault@@ + Used to turn off default contents for AS112 zones. + The other types also turn off default contents for the zone. + The :ref:`nodefault<unbound.conf.local-zone.type.nodefault>` option has + no other effect than turning off default contents for the given zone. + Use :ref:`nodefault<unbound.conf.local-zone.type.nodefault>` if you use + exactly that zone, if you want to use a subzone, use + :ref:`transparent<unbound.conf.local-zone.type.transparent>`. + + The default zones are localhost, reverse ``127.0.0.1`` and ``::1``, the + ``home.arpa``, ``resolver.arpa``, ``service.arpa``, ``onion``, ``test``, + ``invalid`` and the AS112 zones. + The AS112 zones are reverse DNS zones for private use and reserved IP + addresses for which the servers on the internet cannot provide correct + answers. + They are configured by default to give NXDOMAIN (no reverse information) + answers. + + The defaults can be turned off by specifying your own + :ref:`local-zone<unbound.conf.local-zone>` of that name, or using the + :ref:`nodefault<unbound.conf.local-zone.type.nodefault>` type. + Below is a list of the default zone contents. + + @@UAHL@unbound.conf.local-zone.defaults@localhost@@ + The IPv4 and IPv6 localhost information is given. + NS and SOA records are provided for completeness and to satisfy some + DNS update tools. + Default content: + + .. code-block:: text + + local-zone: "localhost." redirect + local-data: "localhost. 10800 IN NS localhost." + local-data: "localhost. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + local-data: "localhost. 10800 IN A 127.0.0.1" + local-data: "localhost. 10800 IN AAAA ::1" + + @@UAHL@unbound.conf.local-zone.defaults@reverse IPv4 loopback@@ + Default content: + + .. code-block:: text + + local-zone: "127.in-addr.arpa." static + local-data: "127.in-addr.arpa. 10800 IN NS localhost." + local-data: "127.in-addr.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + local-data: "1.0.0.127.in-addr.arpa. 10800 IN PTR localhost." + + @@UAHL@unbound.conf.local-zone.defaults@reverse IPv6 loopback@@ + Default content: + + .. code-block:: text + + local-zone: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa." static + local-data: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN NS localhost." + local-data: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + local-data: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa. 10800 IN PTR localhost." + + @@UAHL@unbound.conf.local-zone.defaults@home.arpa@@ (:rfc:`8375`) + Default content: + + .. code-block:: text + + local-zone: "home.arpa." static + local-data: "home.arpa. 10800 IN NS localhost." + local-data: "home.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + + @@UAHL@unbound.conf.local-zone.defaults@resolver.arpa@@ (:rfc:`9462`) + Default content: + + .. code-block:: text + + local-zone: "resolver.arpa." static + local-data: "resolver.arpa. 10800 IN NS localhost." + local-data: "resolver.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + + @@UAHL@unbound.conf.local-zone.defaults@service.arpa@@ (draft-ietf-dnssd-srp-25) + Default content: + + .. code-block:: text + + local-zone: "service.arpa." static + local-data: "service.arpa. 10800 IN NS localhost." + local-data: "service.arpa. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + + @@UAHL@unbound.conf.local-zone.defaults@onion@@ (:rfc:`7686`) + Default content: + + .. code-block:: text + + local-zone: "onion." static + local-data: "onion. 10800 IN NS localhost." + local-data: "onion. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + + @@UAHL@unbound.conf.local-zone.defaults@test@@ (:rfc:`6761`) + Default content: + + .. code-block:: text + + local-zone: "test." static + local-data: "test. 10800 IN NS localhost." + local-data: "test. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + + @@UAHL@unbound.conf.local-zone.defaults@invalid@@ (:rfc:`6761`) + Default content: + + .. code-block:: text + + local-zone: "invalid." static + local-data: "invalid. 10800 IN NS localhost." + local-data: "invalid. 10800 IN SOA localhost. nobody.invalid. 1 3600 1200 604800 10800" + + @@UAHL@unbound.conf.local-zone.defaults@reverse local use zones@@ (:rfc:`1918`) + Reverse data for zones ``10.in-addr.arpa``, ``16.172.in-addr.arpa`` to + ``31.172.in-addr.arpa``, ``168.192.in-addr.arpa``. + The :ref:`local-zone<unbound.conf.local-zone>` is set static and as + :ref:`local-data<unbound.conf.local-data>` SOA and NS records are + provided. + + @@UAHL@unbound.conf.local-zone.defaults@special-use IPv4 Addresses@@ (:rfc:`3330`) + Reverse data for zones ``0.in-addr.arpa`` (this), ``254.169.in-addr.arpa`` (link-local), + ``2.0.192.in-addr.arpa`` (TEST NET 1), ``100.51.198.in-addr.arpa`` + (TEST NET 2), ``113.0.203.in-addr.arpa`` (TEST NET 3), + ``255.255.255.255.in-addr.arpa`` (broadcast). + And from ``64.100.in-addr.arpa`` to ``127.100.in-addr.arpa`` (Shared + Address Space). + + @@UAHL@unbound.conf.local-zone.defaults@reverse IPv6 unspecified@@ (:rfc:`4291`) + Reverse data for zone + ``0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.`` + + @@UAHL@unbound.conf.local-zone.defaults@reverse IPv6 Locally Assigned Local Addresses@@ (:rfc:`4193`) + Reverse data for zone ``D.F.ip6.arpa``. + + @@UAHL@unbound.conf.local-zone.defaults@reverse IPv6 Link Local Addresses@@ (:rfc:`4291`) + Reverse data for zones ``8.E.F.ip6.arpa`` to ``B.E.F.ip6.arpa``. + + @@UAHL@unbound.conf.local-zone.defaults@reverse IPv6 Example Prefix@@ + Reverse data for zone ``8.B.D.0.1.0.0.2.ip6.arpa``. + This zone is used for tutorials and examples. + You can remove the block on this zone with: + + .. code-block:: text + + local-zone: 8.B.D.0.1.0.0.2.ip6.arpa. nodefault + + You can also selectively unblock a part of the zone by making that part + transparent with a :ref:`local-zone<unbound.conf.local-zone>` statement. + This also works with the other default zones. + + +@@UAHL@unbound.conf@local-data@@: *"<resource record string>"* + Configure local data, which is served in reply to queries for it. + The query has to match exactly unless you configure the + :ref:`local-zone<unbound.conf.local-zone>` as redirect. + If not matched exactly, the :ref:`local-zone<unbound.conf.local-zone>` + type determines further processing. + If :ref:`local-data<unbound.conf.local-data>` is configured that is not a + subdomain of a :ref:`local-zone<unbound.conf.local-zone>`, a + :ref:`transparent local-zone<unbound.conf.local-zone.type.transparent>` is + configured. + For record types such as TXT, use single quotes, as in: + + .. code-block:: text + + local-data: 'example. TXT "text"' + + .. note:: + If you need more complicated authoritative data, with referrals, + wildcards, CNAME/DNAME support, or DNSSEC authoritative service, setup + a :ref:`stub-zone<unbound.conf.stub>` for it as detailed in the stub + zone section below. + + +@@UAHL@unbound.conf@local-data-ptr@@: *"IPaddr name"* + Configure local data shorthand for a PTR record with the reversed IPv4 or + IPv6 address and the host name. + For example ``"192.0.2.4 www.example.com"``. + TTL can be inserted like this: ``"2001:DB8::4 7200 www.example.com"`` + + +@@UAHL@unbound.conf@local-zone-tag@@: *<zone> <"list of tags">* + Assign tags to local zones. + Tagged localzones will only be applied when the used + :ref:`access-control<unbound.conf.access-control>` element has a matching + tag. + Tags must be defined in :ref:`define-tag<unbound.conf.define-tag>`. + Enclose list of tags in quotes (``""``) and put spaces between tags. + When there are multiple tags it checks if the intersection of the list of + tags for the query and :ref:`local-zone-tag<unbound.conf.local-zone-tag>` + is non-empty. + + +@@UAHL@unbound.conf@local-zone-override@@: *<zone> <IP netblock> <type>* + Override the local zone type for queries from addresses matching netblock. + Use this localzone type, regardless the type configured for the local zone + (both tagged and untagged) and regardless the type configured using + :ref:`access-control-tag-action<unbound.conf.access-control-tag-action>`. + + +@@UAHL@unbound.conf@response-ip@@: *<IP-netblock> <action>* + This requires use of the ``respip`` module. + + If the IP address in an AAAA or A RR in the answer section of a response + matches the specified IP netblock, the specified action will apply. + *<action>* has generally the same semantics as that for + :ref:`access-control-tag-action<unbound.conf.access-control-tag-action>`, + but there are some exceptions. + + Actions for :ref:`response-ip<unbound.conf.response-ip>` are different + from those for :ref:`local-zone<unbound.conf.local-zone>` in that in case + of the former there is no point of such conditions as "the query matches it + but there is no local data". + Because of this difference, the semantics of + :ref:`response-ip<unbound.conf.response-ip>` actions are modified or + simplified as follows: The *static*, *refuse*, *transparent*, + *typetransparent*, and *nodefault* actions are invalid for *response-ip*. + Using any of these will cause the configuration to be rejected as faulty. + The *deny* action is non-conditional, i.e. it always results in dropping + the corresponding query. + The resolution result before applying the *deny* action is still cached and + can be used for other queries. + + +@@UAHL@unbound.conf@response-ip-data@@: *<IP-netblock> <"resource record string">* + This requires use of the ``respip`` module. + + This specifies the action data for + :ref:`response-ip<unbound.conf.response-ip>` with action being to redirect + as specified by *<"resource record string">*. + *<"Resource record string">* is similar to that of + :ref:`access-control-tag-action<unbound.conf.access-control-tag-action>`, + but it must be of either AAAA, A or CNAME types. + If the *<IP-netblock>* is an IPv6/IPv4 prefix, the record must be AAAA/A + respectively, unless it is a CNAME (which can be used for both versions of + IP netblocks). + If it is CNAME there must not be more than one + :ref:`response-ip-data<unbound.conf.response-ip-data>` for the same + *<IP-netblock>*. + Also, CNAME and other types of records must not coexist for the same + *<IP-netblock>*, following the normal rules for CNAME records. + The textual domain name for the CNAME does not have to be explicitly + terminated with a dot (``"."``); the root name is assumed to be the origin + for the name. + + +@@UAHL@unbound.conf@response-ip-tag@@: *<IP-netblock> <"list of tags">* + This requires use of the ``respip`` module. + + Assign tags to response *<IP-netblock>*. + If the IP address in an AAAA or A RR in the answer section of a response + matches the specified *<IP-netblock>*, the specified tags are assigned to + the IP address. + Then, if an :ref:`access-control-tag<unbound.conf.access-control-tag>` is + defined for the client and it includes one of the tags for the response IP, + the corresponding + :ref:`access-control-tag-action<unbound.conf.access-control-tag-action>` + will apply. + Tag matching rule is the same as that for + :ref:`access-control-tag<unbound.conf.access-control-tag>` and + :ref:`local-zone<unbound.conf.local-zone>`. + Unlike :ref:`local-zone-tag<unbound.conf.local-zone-tag>`, + :ref:`response-ip-tag<unbound.conf.response-ip-tag>` can be defined for an + *<IP-netblock>* even if no :ref:`response-ip<unbound.conf.response-ip>` is + defined for that netblock. + If multiple :ref:`response-ip-tag<unbound.conf.response-ip-tag>` options + are specified for the same *<IP-netblock>* in different statements, all but + the first will be ignored. + However, this will not be flagged as a configuration error, but the result + is probably not what was intended. + + Actions specified in an + :ref:`access-control-tag-action<unbound.conf.access-control-tag-action>` + that has a matching tag with + :ref:`response-ip-tag<unbound.conf.response-ip-tag>` can be those that are + "invalid" for :ref:`response-ip<unbound.conf.response-ip>` listed above, + since + :ref:`access-control-tag-action<unbound.conf.access-control-tag-action>` + can be shared with local zones. + For these actions, if they behave differently depending on whether local + data exists or not in case of local zones, the behavior for + :ref:`response-ip-data<unbound.conf.response-ip-data>` will generally + result in NOERROR/NODATA instead of NXDOMAIN, since the + :ref:`response-ip<unbound.conf.response-ip>` data are inherently type + specific, and non-existence of data does not indicate anything about the + existence or non-existence of the qname itself. + For example, if the matching tag action is static but there is no data for + the corresponding :ref:`response-ip<unbound.conf.response-ip>` + configuration, then the result will be NOERROR/NODATA. + The only case where NXDOMAIN is returned is when an + :ref:`always_nxdomain<unbound.conf.local-zone.type.always_nxdomain>` + action applies. + + +@@UAHL@unbound.conf@ratelimit@@: *<number or 0>* + Enable ratelimiting of queries sent to nameserver for performing recursion. + 0 disables the feature. + This option is experimental at this time. + + The ratelimit is in queries per second that are allowed. + More queries are turned away with an error (SERVFAIL). + Cached responses are not ratelimited by this setting. + + This stops recursive floods, eg. random query names, but not spoofed + reflection floods. + The zone of the query is determined by examining the nameservers for it, + the zone name is used to keep track of the rate. + For example, 1000 may be a suitable value to stop the server from being + overloaded with random names, and keeps unbound from sending traffic to the + nameservers for those zones. + + .. note:: Configured forwarders are excluded from ratelimiting. + + Default: 0 + + +@@UAHL@unbound.conf@ratelimit-size@@: *<memory size>* + Give the size of the data structure in which the current ongoing rates are + kept track in. + In bytes or use m(mega), k(kilo), g(giga). + The ratelimit structure is small, so this data structure likely does not + need to be large. + + Default: 4m + + +@@UAHL@unbound.conf@ratelimit-slabs@@: *<number>* + Number of slabs in the ratelimit tracking data structure. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + + +@@UAHL@unbound.conf@ratelimit-factor@@: *<number>* + Set the amount of queries to rate limit when the limit is exceeded. + If set to 0, all queries are dropped for domains where the limit is + exceeded. + If set to another value, 1 in that number is allowed through to complete. + Default is 10, allowing 1/10 traffic to flow normally. + This can make ordinary queries complete (if repeatedly queried for), and + enter the cache, whilst also mitigating the traffic flow by the factor + given. + + Default: 10 + + +@@UAHL@unbound.conf@ratelimit-backoff@@: *<yes or no>* + If enabled, the ratelimit is treated as a hard failure instead of the + default maximum allowed constant rate. + When the limit is reached, traffic is ratelimited and demand continues to + be kept track of for a 2 second rate window. + No traffic is allowed, except for + :ref:`ratelimit-factor<unbound.conf.ratelimit-factor>`, until demand + decreases below the configured ratelimit for a 2 second rate window. + Useful to set :ref:`ratelimit<unbound.conf.ratelimit>` to a suspicious + rate to aggressively limit unusually high traffic. + + Default: no + + +@@UAHL@unbound.conf@ratelimit-for-domain@@: *<domain> <number qps or 0>* + Override the global :ref:`ratelimit<unbound.conf.ratelimit>` for an exact + match domain name with the listed number. + You can give this for any number of names. + For example, for a top-level-domain you may want to have a higher limit + than other names. + A value of 0 will disable ratelimiting for that domain. + + +@@UAHL@unbound.conf@ratelimit-below-domain@@: *<domain> <number qps or 0>* + Override the global :ref:`ratelimit<unbound.conf.ratelimit>` for a domain + name that ends in this name. + You can give this multiple times, it then describes different settings in + different parts of the namespace. + The closest matching suffix is used to determine the qps limit. + The rate for the exact matching domain name is not changed, use + :ref:`ratelimit-for-domain<unbound.conf.ratelimit-for-domain>` to set + that, you might want to use different settings for a top-level-domain and + subdomains. + A value of 0 will disable ratelimiting for domain names that end in this + name. + + +@@UAHL@unbound.conf@ip-ratelimit@@: *<number or 0>* + Enable global ratelimiting of queries accepted per ip address. + This option is experimental at this time. + The ratelimit is in queries per second that are allowed. + More queries are completely dropped and will not receive a reply, SERVFAIL + or otherwise. + IP ratelimiting happens before looking in the cache. + This may be useful for mitigating amplification attacks. + Clients with a valid DNS Cookie will bypass the ratelimit. + If a ratelimit for such clients is still needed, + :ref:`ip-ratelimit-cookie<unbound.conf.ip-ratelimit-cookie>` + can be used instead. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@ip-ratelimit-cookie@@: *<number or 0>* + Enable global ratelimiting of queries accepted per IP address with a valid + DNS Cookie. + This option is experimental at this time. + The ratelimit is in queries per second that are allowed. + More queries are completely dropped and will not receive a reply, SERVFAIL + or otherwise. + IP ratelimiting happens before looking in the cache. + This option could be useful in combination with + :ref:`allow_cookie<unbound.conf.access-control.action.allow_cookie>`, in an + attempt to mitigate other amplification attacks than UDP reflections (e.g., + attacks targeting Unbound itself) which are already handled with DNS + Cookies. + If used, the value is suggested to be higher than + :ref:`ip-ratelimit<unbound.conf.ip-ratelimit>` e.g., tenfold. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf@ip-ratelimit-size@@: *<memory size>* + Give the size of the data structure in which the current ongoing rates are + kept track in. + In bytes or use m(mega), k(kilo), g(giga). + The IP ratelimit structure is small, so this data structure likely does not + need to be large. + + Default: 4m + + +@@UAHL@unbound.conf@ip-ratelimit-slabs@@: *<number>* + Number of slabs in the ip ratelimit tracking data structure. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + + +@@UAHL@unbound.conf@ip-ratelimit-factor@@: *<number>* + Set the amount of queries to rate limit when the limit is exceeded. + If set to 0, all queries are dropped for addresses where the limit is + exceeded. + If set to another value, 1 in that number is allowed through to complete. + Default is 10, allowing 1/10 traffic to flow normally. + This can make ordinary queries complete (if repeatedly queried for), and + enter the cache, whilst also mitigating the traffic flow by the factor + given. + + Default: 10 + + +@@UAHL@unbound.conf@ip-ratelimit-backoff@@: *<yes or no>* + If enabled, the rate limit is treated as a hard failure instead of the + default maximum allowed constant rate. + When the limit is reached, traffic is ratelimited and demand continues to + be kept track of for a 2 second rate window. + No traffic is allowed, except for + :ref:`ip-ratelimit-factor<unbound.conf.ip-ratelimit-factor>`, until demand + decreases below the configured ratelimit for a 2 second rate window. + Useful to set :ref:`ip-ratelimit<unbound.conf.ip-ratelimit>` to a + suspicious rate to aggressively limit unusually high traffic. + + Default: no + + +@@UAHL@unbound.conf@outbound-msg-retry@@: *<number>* + The number of retries, per upstream nameserver in a delegation, that + Unbound will attempt in case a throwaway response is received. + No response (timeout) contributes to the retry counter. + If a forward/stub zone is used, this is the number of retries per + nameserver in the zone. + + Default: 5 + + +@@UAHL@unbound.conf@max-sent-count@@: *<number>* + Hard limit on the number of outgoing queries Unbound will make while + resolving a name, making sure large NS sets do not loop. + Results in SERVFAIL when reached. + It resets on query restarts (e.g., CNAME) and referrals. + + Default: 32 + + +@@UAHL@unbound.conf@max-query-restarts@@: *<number>* + Hard limit on the number of times Unbound is allowed to restart a query + upon encountering a CNAME record. + Results in SERVFAIL when reached. + Changing this value needs caution as it can allow long CNAME chains to be + accepted, where Unbound needs to verify (resolve) each link individually. + + Default: 11 + + +@@UAHL@unbound.conf@iter-scrub-ns@@: *<number>* + Limit on the number of NS records allowed in an rrset of type NS, from the + iterator scrubber. + This protects the internals of the resolver from overly large NS sets. + + Default: 20 + + +@@UAHL@unbound.conf@iter-scrub-cname@@: *<number>* + Limit on the number of CNAME, DNAME records in an answer, from the iterator + scrubber. + This protects the internals of the resolver from overly long indirection + chains. + Clips off the remainder of the reply packet at that point. + + Default: 11 + + +@@UAHL@unbound.conf@max-global-quota@@: *<number>* + Limit on the number of upstream queries sent out for an incoming query and + its subqueries from recursion. + It is not reset during the resolution. + When it is exceeded the query is failed and the lookup process stops. + + Default: 200 + + +@@UAHL@unbound.conf@fast-server-permil@@: *<number>* + Specify how many times out of 1000 to pick from the set of fastest servers. + 0 turns the feature off. + A value of 900 would pick from the fastest servers 90 percent of the time, + and would perform normal exploration of random servers for the remaining + time. + When :ref:`prefetch<unbound.conf.prefetch>` is enabled (or + :ref:`serve-expired<unbound.conf.serve-expired>`), such prefetches are not + sped up, because there is no one waiting for it, and it presents a good + moment to perform server exploration. + The :ref:`fast-server-num<unbound.conf.fast-server-num>` option can be + used to specify the size of the fastest servers set. + + Default: 0 + + +@@UAHL@unbound.conf@fast-server-num@@: *<number>* + Set the number of servers that should be used for fast server selection. + Only use the fastest specified number of servers with the + :ref:`fast-server-permil<unbound.conf.fast-server-permil>` option, that + turns this on or off. + + Default: 3 + + +@@UAHL@unbound.conf@answer-cookie@@: *<yes or no>* + If enabled, Unbound will answer to requests containing DNS Cookies as + specified in RFC 7873 and RFC 9018. + + Default: no + + +@@UAHL@unbound.conf@cookie-secret@@: *"<128 bit hex string>"* + Server's secret for DNS Cookie generation. + Useful to explicitly set for servers in an anycast deployment that need to + share the secret in order to verify each other's Server Cookies. + An example hex string would be "000102030405060708090a0b0c0d0e0f". + + .. note:: + This option is ignored if a + :ref:`cookie-secret-file<unbound.conf.cookie-secret-file>` is present. + In that case the secrets from that file are used in DNS Cookie + calculations. + + Default: 128 bits random secret generated at startup time + + +@@UAHL@unbound.conf@cookie-secret-file@@: *<filename>* + File from which the secrets are read used in DNS Cookie calculations. + When this file exists, the secrets in this file are used and the secret + specified by the + :ref:`cookie-secret<unbound.conf.cookie-secret>` option is ignored. + Enable it by setting a filename, like + "/usr/local/etc/unbound_cookiesecrets.txt". + The content of this file must be manipulated with the + :ref:`add_cookie_secret<unbound-control.commands.add_cookie_secret>`, + :ref:`drop_cookie_secret<unbound-control.commands.drop_cookie_secret>` and + :ref:`activate_cookie_secret<unbound-control.commands.activate_cookie_secret>` + commands to the :doc:`unbound-control(8)</manpages/unbound-control>` tool. + Please see that manpage on how to perform a safe cookie secret rollover. + + Default: "" (disabled) + + +@@UAHL@unbound.conf@edns-client-string@@: *<IP netblock> <string>* + Include an EDNS0 option containing configured ASCII string in queries with + destination address matching the configured *<IP netblock>*. + This configuration option can be used multiple times. + The most specific match will be used. + + +@@UAHL@unbound.conf@edns-client-string-opcode@@: *<opcode>* + EDNS0 option code for the + :ref:`edns-client-string<unbound.conf.edns-client-string>` option, from 0 + to 65535. + A value from the 'Reserved for Local/Experimental' range (65001-65534) + should be used. + + Default: 65001 + + +@@UAHL@unbound.conf@ede@@: *<yes or no>* + If enabled, Unbound will respond with Extended DNS Error codes + (:rfc:`8914`). + These EDEs provide additional information with a response mainly for, but + not limited to, DNS and DNSSEC errors. + + When the :ref:`val-log-level<unbound.conf.val-log-level>` option is also + set to ``2``, responses with Extended DNS Errors concerning DNSSEC failures + will also contain a descriptive text message about the reason for the + failure. + + Default: no + + +@@UAHL@unbound.conf@ede-serve-expired@@: *<yes or no>* + If enabled, Unbound will attach an Extended DNS Error (:rfc:`8914`) *Code 3 + - Stale Answer* as EDNS0 option to the expired response. + + .. note:: + :ref:`ede: yes<unbound.conf.ede>` needs to be set as well for this to + work. + + Default: no + + +@@UAHL@unbound.conf@dns-error-reporting@@: *<yes or no>* + If enabled, Unbound will send DNS Error Reports (:rfc:`9567`). + The name servers need to express support by attaching the Report-Channel + EDNS0 option on their replies specifying the reporting agent for the zone. + Any errors encountered during resolution that would result in Unbound + generating an Extended DNS Error (:rfc:`8914`) will be reported to the + zone's reporting agent. + + The :ref:`ede<unbound.conf.ede>` option does not need to be enabled for + this to work. + + It is advised that the + :ref:`qname-minimisation<unbound.conf.qname-minimisation>` option is also + enabled to increase privacy on the outgoing reports. + + Default: no + +.. _unbound.conf.remote: + +Remote Control Options +^^^^^^^^^^^^^^^^^^^^^^ + +In the **remote-control:** clause are the declarations for the remote control +facility. +If this is enabled, the :doc:`unbound-control(8)</manpages/unbound-control>` +utility can be used to send commands to the running Unbound server. +The server uses these clauses to setup TLSv1 security for the connection. +The :doc:`unbound-control(8)</manpages/unbound-control>` utility also reads the +**remote-control:** section for options. +To setup the correct self-signed certificates use the +*unbound-control-setup(8)* utility. + + +@@UAHL@unbound.conf.remote@control-enable@@: *<yes or no>* + The option is used to enable remote control. + If turned off, the server does not listen for control commands. + + Default: no + + +@@UAHL@unbound.conf.remote@control-interface@@: *<IP address or interface name or path>* + Give IPv4 or IPv6 addresses or local socket path to listen on for control + commands. + If an interface name is used instead of an IP address, the list of IP + addresses on that interface are used. + + By default localhost (``127.0.0.1`` and ``::1``) is listened to. + Use ``0.0.0.0`` and ``::0`` to listen to all interfaces. + If you change this and permissions have been dropped, you must restart the + server for the change to take effect. + + If you set it to an absolute path, a unix domain socket is used. + This socket does not use the certificates and keys, so those files need not + be present. + To restrict access, Unbound sets permissions on the file to the user and + group that is configured, the access bits are set to allow the group + members to access the control socket file. + Put users that need to access the socket in the that group. + To restrict access further, create a directory to put the control socket in + and restrict access to that directory. + + +@@UAHL@unbound.conf.remote@control-port@@: *<port number>* + The port number to listen on for IPv4 or IPv6 control interfaces. + + .. note:: + If you change this and permissions have been dropped, you must restart + the server for the change to take effect. + + Default: 8953 + + +@@UAHL@unbound.conf.remote@control-use-cert@@: *<yes or no>* + For localhost + :ref:`control-interface<unbound.conf.remote.control-interface>` you can + disable the use of TLS by setting this option to "no". + For local sockets, TLS is disabled and the value of this option is ignored. + + Default: yes + + +@@UAHL@unbound.conf.remote@server-key-file@@: *<private key file>* + Path to the server private key. + This file is generated by the + :doc:`unbound-control-setup(8)</manpages/unbound-control>` utility. + This file is used by the Unbound server, but not by + :doc:`unbound-control(8)</manpages/unbound-control>`. + + Default: unbound_server.key + + +@@UAHL@unbound.conf.remote@server-cert-file@@: *<certificate file.pem>* + Path to the server self signed certificate. + This file is generated by the + :doc:`unbound-control-setup(8)</manpages/unbound-control>` utility. + This file is used by the Unbound server, and also by + :doc:`unbound-control(8)</manpages/unbound-control>`. + + Default: unbound_server.pem + + +@@UAHL@unbound.conf.remote@control-key-file@@: *<private key file>* + Path to the control client private key. + This file is generated by the + :doc:`unbound-control-setup(8)</manpages/unbound-control>` utility. + This file is used by :doc:`unbound-control(8)</manpages/unbound-control>`. + + Default: unbound_control.key + + +@@UAHL@unbound.conf.remote@control-cert-file@@: *<certificate file.pem>* + Path to the control client certificate. + This certificate has to be signed with the server certificate. + This file is generated by the + :doc:`unbound-control-setup(8)</manpages/unbound-control>` utility. + This file is used by :doc:`unbound-control(8)</manpages/unbound-control>`. + + Default: unbound_control.pem + +.. _unbound.conf.stub: + +Stub Zone Options +^^^^^^^^^^^^^^^^^ + +There may be multiple **stub-zone:** clauses. +Each with a :ref:`name<unbound.conf.stub.name>` and zero or more hostnames or +IP addresses. +For the stub zone this list of nameservers is used. +Class IN is assumed. +The servers should be authority servers, not recursors; Unbound performs the +recursive processing itself for stub zones. + +The stub zone can be used to configure authoritative data to be used by the +resolver that cannot be accessed using the public internet servers. +This is useful for company-local data or private zones. +Setup an authoritative server on a different host (or different port). +Enter a config entry for Unbound with: + +.. code-block:: text + + stub-addr: <ip address of host[@port]> + +The Unbound resolver can then access the data, without referring to the public +internet for it. + +This setup allows DNSSEC signed zones to be served by that authoritative +server, in which case a trusted key entry with the public key can be put in +config, so that Unbound can validate the data and set the AD bit on replies for +the private zone (authoritative servers do not set the AD bit). +This setup makes Unbound capable of answering queries for the private zone, and +can even set the AD bit ('authentic'), but the AA ('authoritative') bit is not +set on these replies. + +Consider adding :ref:`server<unbound.conf.server>` statements for +:ref:`domain-insecure<unbound.conf.domain-insecure>` and for +:ref:`local-zone: \<name\> nodefault<unbound.conf.local-zone.type.nodefault>` +for the zone if it is a locally served zone. +The insecure clause stops DNSSEC from invalidating the zone. +The :ref:`local-zone: nodefault<unbound.conf.local-zone.type.nodefault>` (or +:ref:`transparent<unbound.conf.local-zone.type.transparent>`) clause makes the +(reverse-) zone bypass Unbound's filtering of :rfc:`1918` zones. + + +@@UAHL@unbound.conf.stub@name@@: *<domain name>* + Name of the stub zone. + This is the full domain name of the zone. + + +@@UAHL@unbound.conf.stub@stub-host@@: *<domain name>* + Name of stub zone nameserver. + Is itself resolved before it is used. + + To use a non-default port for DNS communication append ``'@'`` with the + port number. + + If TLS is enabled, then you can append a ``'#'`` and a name, then it'll + check the TLS authentication certificates with that name. + + If you combine the ``'@'`` and ``'#'``, the ``'@'`` comes first. + If only ``'#'`` is used the default port is the configured + :ref:`tls-port<unbound.conf.tls-port>`. + + +@@UAHL@unbound.conf.stub@stub-addr@@: *<IP address>* + IP address of stub zone nameserver. + Can be IPv4 or IPv6. + + To use a non-default port for DNS communication append ``'@'`` with the + port number. + + If TLS is enabled, then you can append a ``'#'`` and a name, then it'll + check the tls authentication certificates with that name. + + If you combine the ``'@'`` and ``'#'``, the ``'@'`` comes first. + If only ``'#'`` is used the default port is the configured + :ref:`tls-port<unbound.conf.tls-port>`. + + +@@UAHL@unbound.conf.stub@stub-prime@@: *<yes or no>* + If enabled it performs NS set priming, which is similar to root hints, + where it starts using the list of nameservers currently published by the + zone. + Thus, if the hint list is slightly outdated, the resolver picks up a + correct list online. + + Default: no + + +@@UAHL@unbound.conf.stub@stub-first@@: *<yes or no>* + If enabled, a query is attempted without the stub clause if it fails. + The data could not be retrieved and would have caused SERVFAIL because the + servers are unreachable, instead it is tried without this clause. + + Default: no + + +@@UAHL@unbound.conf.stub@stub-tls-upstream@@: *<yes or no>* + Enabled or disable whether the queries to this stub use TLS for transport. + + Default: no + + +@@UAHL@unbound.conf.stub@stub-ssl-upstream@@: *<yes or no>* + Alternate syntax for + :ref:`stub-tls-upstream<unbound.conf.stub.stub-tls-upstream>`. + + +@@UAHL@unbound.conf.stub@stub-tcp-upstream@@: *<yes or no>* + If it is set to "yes" then upstream queries use TCP only for transport + regardless of global flag :ref:`tcp-upstream<unbound.conf.tcp-upstream>`. + + Default: no + + +@@UAHL@unbound.conf.stub@stub-no-cache@@: *<yes or no>* + If enabled, data inside the stub is not cached. + This is useful when you want immediate changes to be visible. + + Default: no + +.. _unbound.conf.forward: + +Forward Zone Options +^^^^^^^^^^^^^^^^^^^^ + +There may be multiple **forward-zone:** clauses. +Each with a :ref:`name<unbound.conf.forward.name>` and zero or more hostnames +or IP addresses. +For the forward zone this list of nameservers is used to forward the queries +to. +The servers listed as :ref:`forward-host<unbound.conf.forward.forward-host>` +and :ref:`forward-addr<unbound.conf.forward.forward-addr>` have to handle +further recursion for the query. +Thus, those servers are not authority servers, but are (just like Unbound is) +recursive servers too; Unbound does not perform recursion itself for the +forward zone, it lets the remote server do it. +Class IN is assumed. +CNAMEs are chased by Unbound itself, asking the remote server for every name in +the indirection chain, to protect the local cache from illegal indirect +referenced items. +A :ref:`forward-zone<unbound.conf.forward>` entry with name +``"."`` and a :ref:`forward-addr<unbound.conf.forward.forward-addr>` target +will forward all queries to that other server (unless it can answer from the +cache). + + +@@UAHL@unbound.conf.forward@name@@: *<domain name>* + Name of the forward zone. + This is the full domain name of the zone. + + +@@UAHL@unbound.conf.forward@forward-host@@: *<domain name>* + Name of server to forward to. + Is itself resolved before it is used. + + To use a non-default port for DNS communication append ``'@'`` with the + port number. + + If TLS is enabled, then you can append a ``'#'`` and a name, then it'll + check the TLS authentication certificates with that name. + + If you combine the ``'@'`` and ``'#'``, the ``'@'`` comes first. + If only ``'#'`` is used the default port is the configured + :ref:`tls-port<unbound.conf.tls-port>`. + + +@@UAHL@unbound.conf.forward@forward-addr@@: *<IP address>* + IP address of server to forward to. + Can be IPv4 or IPv6. + + To use a non-default port for DNS communication append ``'@'`` with the + port number. + + If TLS is enabled, then you can append a ``'#'`` and a name, then it'll + check the tls authentication certificates with that name. + + If you combine the ``'@'`` and ``'#'``, the ``'@'`` comes first. + If only ``'#'`` is used the default port is the configured + :ref:`tls-port<unbound.conf.tls-port>`. + + At high verbosity it logs the TLS certificate, with TLS enabled. + If you leave out the ``'#'`` and auth name from the + :ref:`forward-addr<unbound.conf.forward.forward-addr>`, any name is + accepted. + The cert must also match a CA from the + :ref:`tls-cert-bundle<unbound.conf.tls-cert-bundle>`. + + +@@UAHL@unbound.conf.forward@forward-first@@: *<yes or no>* + If a forwarded query is met with a SERVFAIL error, and this option is + enabled, Unbound will fall back to normal recursive resolution for this + query as if no query forwarding had been specified. + + Default: no + + +@@UAHL@unbound.conf.forward@forward-tls-upstream@@: *<yes or no>* + Enabled or disable whether the queries to this forwarder use TLS for + transport. + If you enable this, also configure a + :ref:`tls-cert-bundle<unbound.conf.tls-cert-bundle>` or use + :ref:`tls-win-cert<unbound.conf.tls-win-cert>` to load CA certs, otherwise + the connections cannot be authenticated. + + Default: no + + +@@UAHL@unbound.conf.forward@forward-ssl-upstream@@: *<yes or no>* + Alternate syntax for + :ref:`forward-tls-upstream<unbound.conf.forward.forward-tls-upstream>`. + + +@@UAHL@unbound.conf.forward@forward-tcp-upstream@@: *<yes or no>* + If it is set to "yes" then upstream queries use TCP only for transport + regardless of global flag :ref:`tcp-upstream<unbound.conf.tcp-upstream>`. + + Default: no + + +@@UAHL@unbound.conf.forward@forward-no-cache@@: *<yes or no>* + If enabled, data inside the forward is not cached. + This is useful when you want immediate changes to be visible. + + Default: no + +.. _unbound.conf.auth: + +Authority Zone Options +^^^^^^^^^^^^^^^^^^^^^^ + +Authority zones are configured with **auth-zone:**, and each one must have a +:ref:`name<unbound.conf.auth.name>`. +There can be multiple ones, by listing multiple auth-zone clauses, each with a +different name, pertaining to that part of the namespace. +The authority zone with the name closest to the name looked up is used. +Authority zones can be processed on two distinct, non-exclusive, configurable +stages. + +With :ref:`for-downstream: yes<unbound.conf.auth.for-downstream>` (default), +authority zones are processed after **local-zones** and before cache. +When used in this manner, Unbound responds like an authority server with no +further processing other than returning an answer from the zone contents. +A notable example, in this case, is CNAME records which are returned verbatim +to downstream clients without further resolution. + +With :ref:`for-upstream: yes<unbound.conf.auth.for-upstream>` (default), +authority zones are processed after the cache lookup, just before going to the +network to fetch information for recursion. +When used in this manner they provide a local copy of an authority server +that speeds up lookups for that data during resolving. + +If both options are enabled (default), client queries for an authority zone are +answered authoritatively from Unbound, while internal queries that require data +from the authority zone consult the local zone data instead of going to the +network. + +An interesting configuration is +:ref:`for-downstream: no<unbound.conf.auth.for-downstream>`, +:ref:`for-upstream: yes<unbound.conf.auth.for-upstream>` +that allows for hyperlocal behavior where both client and internal queries +consult the local zone data while resolving. +In this case, the aforementioned CNAME example will result in a thoroughly +resolved answer. + +Authority zones can be read from zonefile. +And can be kept updated via AXFR and IXFR. +After update the zonefile is rewritten. +The update mechanism uses the SOA timer values and performs SOA UDP queries to +detect zone changes. + +If the update fetch fails, the timers in the SOA record are used to time +another fetch attempt. +Until the SOA expiry timer is reached. +Then the zone is expired. +When a zone is expired, queries are SERVFAIL, and any new serial number is +accepted from the primary (even if older), and if fallback is enabled, the +fallback activates to fetch from the upstream instead of the SERVFAIL. + + +@@UAHL@unbound.conf.auth@name@@: *<zone name>* + Name of the authority zone. + + +@@UAHL@unbound.conf.auth@primary@@: *<IP address or host name>* + Where to download a copy of the zone from, with AXFR and IXFR. + Multiple primaries can be specified. + They are all tried if one fails. + + To use a non-default port for DNS communication append ``'@'`` with the + port number. + + You can append a ``'#'`` and a name, then AXFR over TLS can be used and the + TLS authentication certificates will be checked with that name. + + If you combine the ``'@'`` and ``'#'``, the ``'@'`` comes first. + If you point it at another Unbound instance, it would not work because that + does not support AXFR/IXFR for the zone, but if you used + :ref:`url<unbound.conf.auth.url>` to download the zonefile as a text file + from a webserver that would work. + + If you specify the hostname, you cannot use the domain from the zonefile, + because it may not have that when retrieving that data, instead use a plain + IP address to avoid a circular dependency on retrieving that IP address. + + +@@UAHL@unbound.conf.auth@master@@: *<IP address or host name>* + Alternate syntax for :ref:`primary<unbound.conf.auth.primary>`. + + +@@UAHL@unbound.conf.auth@url@@: *<URL to zone file>* + Where to download a zonefile for the zone. + With HTTP or HTTPS. + An example for the url is: + + .. code-block:: text + + http://www.example.com/example.org.zone + + Multiple url statements can be given, they are tried in turn. + + If only urls are given the SOA refresh timer is used to wait for making new + downloads. + If also primaries are listed, the primaries are first probed with UDP SOA + queries to see if the SOA serial number has changed, reducing the number of + downloads. + If none of the urls work, the primaries are tried with IXFR and AXFR. + + For HTTPS, the :ref:`tls-cert-bundle<unbound.conf.tls-cert-bundle>` and + the hostname from the url are used to authenticate the connection. + + If you specify a hostname in the URL, you cannot use the domain from the + zonefile, because it may not have that when retrieving that data, instead + use a plain IP address to avoid a circular dependency on retrieving that IP + address. + + Avoid dependencies on name lookups by using a notation like + ``"http://192.0.2.1/unbound-primaries/example.com.zone"``, with an explicit + IP address. + + +@@UAHL@unbound.conf.auth@allow-notify@@: *<IP address or host name or netblockIP/prefix>* + With :ref:`allow-notify<unbound.conf.auth.allow-notify>` you can specify + additional sources of notifies. + When notified, the server attempts to first probe and then zone transfer. + If the notify is from a primary, it first attempts that primary. + Otherwise other primaries are attempted. + If there are no primaries, but only urls, the file is downloaded when + notified. + + .. note:: + The primaries from :ref:`primary<unbound.conf.auth.primary>` and + :ref:`url<unbound.conf.auth.url>` statements are allowed notify by + default. + + +@@UAHL@unbound.conf.auth@fallback-enabled@@: *<yes or no>* + If enabled, Unbound falls back to querying the internet as a resolver for + this zone when lookups fail. + For example for DNSSEC validation failures. + + Default: no + + +@@UAHL@unbound.conf.auth@for-downstream@@: *<yes or no>* + If enabled, Unbound serves authority responses to downstream clients for + this zone. + This option makes Unbound behave, for the queries with names in this zone, + like one of the authority servers for that zone. + + Turn it off if you want Unbound to provide recursion for the zone but have + a local copy of zone data. + + If :ref:`for-downstream: no<unbound.conf.auth.for-downstream>` and + :ref:`for-upstream: yes<unbound.conf.auth.for-upstream>` are set, then + Unbound will DNSSEC validate the contents of the zone before serving the + zone contents to clients and store validation results in the cache. + + Default: yes + + + +@@UAHL@unbound.conf.auth@for-upstream@@: *<yes or no>* + If enabled, Unbound fetches data from this data collection for answering + recursion queries. + Instead of sending queries over the internet to the authority servers for + this zone, it'll fetch the data directly from the zone data. + + Turn it on when you want Unbound to provide recursion for downstream + clients, and use the zone data as a local copy to speed up lookups. + + Default: yes + + +@@UAHL@unbound.conf.auth@zonemd-check@@: *<yes or no>* + Enable this option to check ZONEMD records in the zone. + The ZONEMD record is a checksum over the zone data. + This includes glue in the zone and data from the zone file, and excludes + comments from the zone file. + When there is a DNSSEC chain of trust, DNSSEC signatures are checked too. + + Default: no + + +@@UAHL@unbound.conf.auth@zonemd-reject-absence@@: *<yes or no>* + Enable this option to reject the absence of the ZONEMD record. + Without it, when ZONEMD is not there it is not checked. + + It is useful to enable for a non-DNSSEC signed zone where the operator + wants to require the verification of a ZONEMD, hence a missing ZONEMD is a + failure. + + The action upon failure is controlled by the + :ref:`zonemd-permissive-mode<unbound.conf.zonemd-permissive-mode>` option, + for log only or also block the zone. + + Without the option, absence of a ZONEMD is only a failure when the zone is + DNSSEC signed, and we have a trust anchor, and the DNSSEC verification of + the absence of the ZONEMD fails. + With the option enabled, the absence of a ZONEMD is always a failure, also + for nonDNSSEC signed zones. + + Default: no + + +@@UAHL@unbound.conf.auth@zonefile@@: *<filename>* + The filename where the zone is stored. + If not given then no zonefile is used. + If the file does not exist or is empty, Unbound will attempt to fetch zone + data (eg. from the primary servers). + +.. _unbound.conf.view: + +View Options +^^^^^^^^^^^^ + +There may be multiple **view:** clauses. +Each with a :ref:`name<unbound.conf.view.name>` and zero or more +:ref:`local-zone<unbound.conf.view.local-zone>` and +:ref:`local-data<unbound.conf.view.local-data>` attributes. +Views can also contain :ref:`view-first<unbound.conf.view.view-first>`, +:ref:`response-ip<unbound.conf.response-ip>`, +:ref:`response-ip-data<unbound.conf.response-ip-data>` and +:ref:`local-data-ptr<unbound.conf.view.local-data-ptr>` attributes. +View can be mapped to requests by specifying the view name in an +:ref:`access-control-view<unbound.conf.access-control-view>` attribute. +Options from matching views will override global options. +Global options will be used if no matching view is found, or when the matching +view does not have the option specified. + + +@@UAHL@unbound.conf.view@name@@: *<view name>* + Name of the view. + Must be unique. + This name is used in the + :ref:`access-control-view<unbound.conf.access-control-view>` attribute. + + +@@UAHL@unbound.conf.view@local-zone@@: *<zone> <type>* + View specific local zone elements. + Has the same types and behaviour as the global + :ref:`local-zone<unbound.conf.local-zone>` elements. + When there is at least one *local-zone:* specified and :ref:`view-first: + no<unbound.conf.view.view-first>` is set, the default local-zones will be + added to this view. + Defaults can be disabled using the nodefault type. + When :ref:`view-first: yes<unbound.conf.view.view-first>` is set or when a + view does not have a :ref:`local-zone<unbound.conf.view.local-zone>`, the + global :ref:`local-zone<unbound.conf.local-zone>` will be used including + it's default zones. + + +@@UAHL@unbound.conf.view@local-data@@: *"<resource record string>"* + View specific local data elements. + Has the same behaviour as the global + :ref:`local-data<unbound.conf.local-data>` elements. + + +@@UAHL@unbound.conf.view@local-data-ptr@@: *"IPaddr name"* + View specific local-data-ptr elements. + Has the same behaviour as the global + :ref:`local-data-ptr<unbound.conf.local-data-ptr>` elements. + + +@@UAHL@unbound.conf.view@view-first@@: *<yes or no>* + If enabled, it attempts to use the global + :ref:`local-zone<unbound.conf.local-zone>` and + :ref:`local-data<unbound.conf.local-data>` if there is no match in the + view specific options. + + Default: no + +Python Module Options +^^^^^^^^^^^^^^^^^^^^^ + +The **python:** clause gives the settings for the *python(1)* script module. +This module acts like the iterator and validator modules do, on queries and +answers. +To enable the script module it has to be compiled into the daemon, and the word +``python`` has to be put in the +:ref:`module-config<unbound.conf.module-config>` option (usually first, or +between the validator and iterator). +Multiple instances of the python module are supported by adding the word +``python`` more than once. + +If the :ref:`chroot<unbound.conf.chroot>` option is enabled, you should make +sure Python's library directory structure is bind mounted in the new root +environment, see *mount(8)*. +Also the :ref:`python-script<unbound.conf.python.python-script>` path should +be specified as an absolute path relative to the new root, or as a relative +path to the working directory. + + +@@UAHL@unbound.conf.python@python-script@@: *<python file>* + The script file to load. + Repeat this option for every python module instance added to the + :ref:`module-config<unbound.conf.module-config>` option. + +Dynamic Library Module Options +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The **dynlib:** clause gives the settings for the ``dynlib`` module. +This module is only a very small wrapper that allows dynamic modules to be +loaded on runtime instead of being compiled into the application. +To enable the dynlib module it has to be compiled into the daemon, and the word +``dynlib`` has to be put in the +:ref:`module-config<unbound.conf.module-config>` attribute. +Multiple instances of dynamic libraries are supported by adding the word +``dynlib`` more than once. + +The :ref:`dynlib-file<unbound.conf.dynlib.dynlib-file>` path should be +specified as an absolute path relative to the new path set by +:ref:`chroot<unbound.conf.chroot>`, or as a relative path to the working +directory. + + +@@UAHL@unbound.conf.dynlib@dynlib-file@@: *<dynlib file>* + The dynamic library file to load. + Repeat this option for every dynlib module instance added to the + :ref:`module-config<unbound.conf.module-config>` option. + +DNS64 Module Options +^^^^^^^^^^^^^^^^^^^^ + +The ``dns64`` module must be configured in the +:ref:`module-config<unbound.conf.module-config>` directive, e.g.: + +.. code-block:: text + + module-config: "dns64 validator iterator" + +and be compiled into the daemon to be enabled. + +.. note:: + These settings go in the :ref:`server:<unbound.conf.server>` section. + + +@@UAHL@unbound.conf.dns64@dns64-prefix@@: *<IPv6 prefix>* + This sets the DNS64 prefix to use to synthesize AAAA records with. + It must be /96 or shorter. + + Default: 64:ff9b::/96 + + +@@UAHL@unbound.conf.dns64@dns64-synthall@@: *<yes or no>* + .. warning:: Debugging feature! + + If enabled, synthesize all AAAA records despite the presence of actual AAAA + records. + + Default: no + + +@@UAHL@unbound.conf.dns64@dns64-ignore-aaaa@@: *<domain name>* + List domain for which the AAAA records are ignored and the A record is used + by DNS64 processing instead. + Can be entered multiple times, list a new domain for which it applies, one + per line. + Applies also to names underneath the name given. + +NAT64 Operation +^^^^^^^^^^^^^^^ + +NAT64 operation allows using a NAT64 prefix for outbound requests to IPv4-only +servers. +It is controlled by two options in the +:ref:`server:<unbound.conf.server>` section: + + +@@UAHL@unbound.conf.nat64@do-nat64@@: *<yes or no>* + Use NAT64 to reach IPv4-only servers. + Consider also enabling :ref:`prefer-ip6<unbound.conf.prefer-ip6>` + to prefer native IPv6 connections to nameservers. + + Default: no + + +@@UAHL@unbound.conf.nat64@nat64-prefix@@: *<IPv6 prefix>* + Use a specific NAT64 prefix to reach IPv4-only servers. + The prefix length must be one of /32, /40, /48, /56, /64 or /96. + + Default: 64:ff9b::/96 (same as :ref:`dns64-prefix<unbound.conf.dns64.dns64-prefix>`) + +DNSCrypt Options +^^^^^^^^^^^^^^^^ + +The **dnscrypt:** clause gives the settings of the dnscrypt channel. +While those options are available, they are only meaningful if Unbound was +compiled with ``--enable-dnscrypt``. +Currently certificate and secret/public keys cannot be generated by Unbound. +You can use dnscrypt-wrapper to generate those: +https://github.com/cofyc/dnscrypt-wrapper/blob/master/README.md#usage + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-enable@@: *<yes or no>* + Whether or not the dnscrypt config should be enabled. + You may define configuration but not activate it. + + Default: no + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-port@@: *<port number>* + On which port should dnscrypt should be activated. + + .. note:: + There should be a matching interface option defined in the + :ref:`server:<unbound.conf.server>` section for this port. + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-provider@@: *<provider name>* + The provider name to use to distribute certificates. + This is of the form: + + .. code-block:: text + + 2.dnscrypt-cert.example.com. + + .. important:: The name *MUST* end with a dot. + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-secret-key@@: *<path to secret key file>* + Path to the time limited secret key file. + This option may be specified multiple times. + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-provider-cert@@: *<path to cert file>* + Path to the certificate related to the + :ref:`dnscrypt-secret-key<unbound.conf.dnscrypt.dnscrypt-secret-key>`. + This option may be specified multiple times. + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-provider-cert-rotated@@: *<path to cert file>* + Path to a certificate that we should be able to serve existing connection + from but do not want to advertise over + :ref:`dnscrypt-provider<unbound.conf.dnscrypt.dnscrypt-provider>` 's TXT + record certs distribution. + + A typical use case is when rotating certificates, existing clients may + still use the client magic from the old cert in their queries until they + fetch and update the new cert. + Likewise, it would allow one to prime the new cert/key without distributing + the new cert yet, this can be useful when using a network of servers using + anycast and on which the configuration may not get updated at the exact + same time. + + By priming the cert, the servers can handle both old and new certs traffic + while distributing only one. + + This option may be specified multiple times. + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-shared-secret-cache-size@@: *<memory size>* + Give the size of the data structure in which the shared secret keys are + kept in. + In bytes or use m(mega), k(kilo), g(giga). + The shared secret cache is used when a same client is making multiple + queries using the same public key. + It saves a substantial amount of CPU. + + Default: 4m + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-shared-secret-cache-slabs@@: *<number>* + Number of slabs in the dnscrypt shared secrets cache. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-nonce-cache-size@@: *<memory size>* + Give the size of the data structure in which the client nonces are kept in. + In bytes or use m(mega), k(kilo), g(giga). + The nonce cache is used to prevent dnscrypt message replaying. + Client nonce should be unique for any pair of client pk/server sk. + + Default: 4m + + +@@UAHL@unbound.conf.dnscrypt@dnscrypt-nonce-cache-slabs@@: *<number>* + Number of slabs in the dnscrypt nonce cache. + Slabs reduce lock contention by threads. + Must be set to a power of 2. + Setting (close) to the number of cpus is a fairly good setting. + If left unconfigured, it will be configured automatically to be a power of + 2 close to the number of configured threads in multi-threaded environments. + + Default: (unconfigured) + +EDNS Client Subnet Module Options +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ECS module must be configured in the +:ref:`module-config<unbound.conf.module-config>` directive, e.g.: + +.. code-block:: text + + module-config: "subnetcache validator iterator" + +and be compiled into the daemon to be enabled. + +.. note:: + These settings go in the :ref:`server:<unbound.conf.server>` section. + +If the destination address is allowed in the configuration Unbound will add the +EDNS0 option to the query containing the relevant part of the client's address. +When an answer contains the ECS option the response and the option are placed +in a specialized cache. +If the authority indicated no support, the response is stored in the regular +cache. + +Additionally, when a client includes the option in its queries, Unbound will +forward the option when sending the query to addresses that are explicitly +allowed in the configuration using +:ref:`send-client-subnet<unbound.conf.ecs.send-client-subnet>`. +The option will always be forwarded, regardless the allowed addresses, when +:ref:`client-subnet-always-forward: yes<unbound.conf.ecs.client-subnet-always-forward>` +is set. +In this case the lookup in the regular cache is skipped. + +The maximum size of the ECS cache is controlled by +:ref:`msg-cache-size<unbound.conf.msg-cache-size>` in the configuration file. +On top of that, for each query only 100 different subnets are allowed to be +stored for each address family. +Exceeding that number, older entries will be purged from cache. + +Note that due to the nature of how EDNS Client Subnet works, by segregating the +client IP space in order to try and have tailored responses for prefixes of +unknown sizes, resolution and cache response performance are impacted as a +result. +Usage of the subnetcache module should only be enabled in installations that +require such functionality where the resolver and the clients belong to +different networks. +An example of that is an open resolver installation. + +This module does not interact with the +:ref:`serve-expired\*<unbound.conf.serve-expired>` and +:ref:`prefetch<unbound.conf.prefetch>` options. + + +@@UAHL@unbound.conf.ecs@send-client-subnet@@: *<IP address>* + Send client source address to this authority. + Append /num to indicate a classless delegation netblock, for example like + ``10.2.3.4/24`` or ``2001::11/64``. + Can be given multiple times. + Authorities not listed will not receive edns-subnet information, unless + domain in query is specified in + :ref:`client-subnet-zone<unbound.conf.ecs.client-subnet-zone>`. + + +@@UAHL@unbound.conf.ecs@client-subnet-zone@@: *<domain>* + Send client source address in queries for this domain and its subdomains. + Can be given multiple times. + Zones not listed will not receive edns-subnet information, unless hosted by + authority specified in + :ref:`send-client-subnet<unbound.conf.ecs.send-client-subnet>`. + + +@@UAHL@unbound.conf.ecs@client-subnet-always-forward@@: *<yes or no>* + Specify whether the ECS address check (configured using + :ref:`send-client-subnet<unbound.conf.ecs.send-client-subnet>`) is applied + for all queries, even if the triggering query contains an ECS record, or + only for queries for which the ECS record is generated using the querier + address (and therefore did not contain ECS data in the client query). + If enabled, the address check is skipped when the client query contains an + ECS record. + And the lookup in the regular cache is skipped. + + Default: no + + +@@UAHL@unbound.conf.ecs@max-client-subnet-ipv6@@: *<number>* + Specifies the maximum prefix length of the client source address we are + willing to expose to third parties for IPv6. + + Default: 56 + + +@@UAHL@unbound.conf.ecs@max-client-subnet-ipv4@@: *<number>* + Specifies the maximum prefix length of the client source address we are + willing to expose to third parties for IPv4. + + Default: 24 + + +@@UAHL@unbound.conf.ecs@min-client-subnet-ipv6@@: *<number>* + Specifies the minimum prefix length of the IPv6 source mask we are willing + to accept in queries. + Shorter source masks result in REFUSED answers. + Source mask of 0 is always accepted. + + Default: 0 + + +@@UAHL@unbound.conf.ecs@min-client-subnet-ipv4@@: *<number>* + Specifies the minimum prefix length of the IPv4 source mask we are willing + to accept in queries. + Shorter source masks result in REFUSED answers. + Source mask of 0 is always accepted. + Default: 0 + + +@@UAHL@unbound.conf.ecs@max-ecs-tree-size-ipv4@@: *<number>* + Specifies the maximum number of subnets ECS answers kept in the ECS radix + tree. + This number applies for each qname/qclass/qtype tuple. + + Default: 100 + + +@@UAHL@unbound.conf.ecs@max-ecs-tree-size-ipv6@@: *<number>* + Specifies the maximum number of subnets ECS answers kept in the ECS radix + tree. + This number applies for each qname/qclass/qtype tuple. + + Default: 100 + +Opportunistic IPsec Support Module Options +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The IPsec module must be configured in the +:ref:`module-config<unbound.conf.module-config>` directive, e.g.: + +.. code-block:: text + + module-config: "ipsecmod validator iterator" + +and be compiled into Unbound by using ``--enable-ipsecmod`` to be enabled. + +.. note:: + These settings go in the :ref:`server:<unbound.conf.server>` section. + +When Unbound receives an A/AAAA query that is not in the cache and finds a +valid answer, it will withhold returning the answer and instead will generate +an IPSECKEY subquery for the same domain name. +If an answer was found, Unbound will call an external hook passing the +following arguments: + +QNAME + Domain name of the A/AAAA and IPSECKEY query. + In string format. + +IPSECKEY TTL + TTL of the IPSECKEY RRset. + +A/AAAA + String of space separated IP addresses present in the A/AAAA RRset. + The IP addresses are in string format. + +IPSECKEY + String of space separated IPSECKEY RDATA present in the IPSECKEY RRset. + The IPSECKEY RDATA are in DNS presentation format. + +The A/AAAA answer is then cached and returned to the client. +If the external hook was called the TTL changes to ensure it doesn't surpass +:ref:`ipsecmod-max-ttl<unbound.conf.ipsecmod-max-ttl>`. + +The same procedure is also followed when +:ref:`prefetch: yes<unbound.conf.prefetch>` is set, but the A/AAAA answer is +given to the client before the hook is called. +:ref:`ipsecmod-max-ttl<unbound.conf.ipsecmod-max-ttl>` ensures that the A/AAAA +answer given from cache is still relevant for opportunistic IPsec. + + +@@UAHL@unbound.conf@ipsecmod-enabled@@: *<yes or no>* + Specifies whether the IPsec module is enabled or not. + The IPsec module still needs to be defined in the + :ref:`module-config<unbound.conf.module-config>` directive. + This option facilitates turning on/off the module without + restarting/reloading Unbound. + + Default: yes + + +@@UAHL@unbound.conf@ipsecmod-hook@@: *<filename>* + Specifies the external hook that Unbound will call with *system(3)*. + The file can be specified as an absolute/relative path. + The file needs the proper permissions to be able to be executed by the same + user that runs Unbound. + It must be present when the IPsec module is defined in the + :ref:`module-config<unbound.conf.module-config>` directive. + + +@@UAHL@unbound.conf@ipsecmod-strict@@: *<yes or no>* + If enabled Unbound requires the external hook to return a success value of + 0. + Failing to do so Unbound will reply with SERVFAIL. + The A/AAAA answer will also not be cached. + + Default: no + + +@@UAHL@unbound.conf@ipsecmod-max-ttl@@: *<seconds>* + Time to live maximum for A/AAAA cached records after calling the external + hook. + + Default: 3600 + + +@@UAHL@unbound.conf@ipsecmod-ignore-bogus@@: *<yes or no>* + Specifies the behaviour of Unbound when the IPSECKEY answer is bogus. + If set to yes, the hook will be called and the A/AAAA answer will be + returned to the client. + If set to no, the hook will not be called and the answer to the A/AAAA + query will be SERVFAIL. + Mainly used for testing. + + Default: no + + +@@UAHL@unbound.conf@ipsecmod-allow@@: *<domain>* + Allow the IPsec module functionality for the domain so that the module + logic will be executed. + Can be given multiple times, for different domains. + If the option is not specified, all domains are treated as being allowed + (default). + + +@@UAHL@unbound.conf@ipsecmod-whitelist@@: *<domain>* + Alternate syntax for :ref:`ipsecmod-allow<unbound.conf.ipsecmod-allow>`. + +Cache DB Module Options +^^^^^^^^^^^^^^^^^^^^^^^ + +The Cache DB module must be configured in the +:ref:`module-config<unbound.conf.module-config>` directive, e.g.: + +.. code-block:: text + + module-config: "validator cachedb iterator" + +and be compiled into the daemon with ``--enable-cachedb``. + +If this module is enabled and configured, the specified backend database works +as a second level cache; when Unbound cannot find an answer to a query in its +built-in in-memory cache, it consults the specified backend. +If it finds a valid answer in the backend, Unbound uses it to respond to the +query without performing iterative DNS resolution. +If Unbound cannot even find an answer in the backend, it resolves the query as +usual, and stores the answer in the backend. + +This module interacts with the *serve-expired-\** options and will reply with +expired data if Unbound is configured for that. + +If Unbound was built with ``--with-libhiredis`` on a system that has installed +the hiredis C client library of Redis, then the ``redis`` backend can be used. +This backend communicates with the specified Redis server over a TCP connection +to store and retrieve cache data. +It can be used as a persistent and/or shared cache backend. + +.. note:: + Unbound never removes data stored in the Redis server, even if some data + have expired in terms of DNS TTL or the Redis server has cached too much + data; if necessary the Redis server must be configured to limit the cache + size, preferably with some kind of least-recently-used eviction policy. + +Additionally, the +:ref:`redis-expire-records<unbound.conf.cachedb.redis-expire-records>` option +can be used in order to set the relative DNS TTL of the message as timeout to +the Redis records; keep in mind that some additional memory is used per key and +that the expire information is stored as absolute Unix timestamps in Redis +(computer time must be stable). + +This backend uses synchronous communication with the Redis server based on the +assumption that the communication is stable and sufficiently fast. +The thread waiting for a response from the Redis server cannot handle other DNS +queries. +Although the backend has the ability to reconnect to the server when the +connection is closed unexpectedly and there is a configurable timeout in case +the server is overly slow or hangs up, these cases are assumed to be very rare. +If connection close or timeout happens too often, Unbound will be effectively +unusable with this backend. +It's the administrator's responsibility to make the assumption hold. + +The **cachedb:** clause gives custom settings of the cache DB module. + + +@@UAHL@unbound.conf.cachedb@backend@@: *<backend name>* + Specify the backend database name. + The default database is the in-memory backend named ``testframe``, which, + as the name suggests, is not of any practical use. + Depending on the build-time configuration, ``redis`` backend may also be + used as described above. + + Default: testframe + + +@@UAHL@unbound.conf.cachedb@secret-seed@@: *"<secret string>"* + Specify a seed to calculate a hash value from query information. + This value will be used as the key of the corresponding answer for the + backend database and can be customized if the hash should not be + predictable operationally. + If the backend database is shared by multiple Unbound instances, all + instances must use the same secret seed. + + Default: "default" + + +@@UAHL@unbound.conf.cachedb@cachedb-no-store@@: *<yes or no>* + If the backend should be read from, but not written to. + This makes this instance not store dns messages in the backend. + But if data is available it is retrieved. + + Default: no + + +@@UAHL@unbound.conf.cachedb@cachedb-check-when-serve-expired@@: *<yes or no>* + If enabled, the cachedb is checked before an expired response is returned. + When + :ref:`serve-expired<unbound.conf.serve-expired>` + is enabled, without + :ref:`serve-expired-client-timeout<unbound.conf.serve-expired-client-timeout>` + , it then does not immediately respond with an expired response from cache, + but instead first checks the cachedb for valid contents, and if so returns it. + If the cachedb also has no valid contents, the serve expired response is sent. + If also + :ref:`serve-expired-client-timeout<unbound.conf.serve-expired-client-timeout>` + is enabled, the expired response is delayed until the timeout expires. + Unless the lookup succeeds within the timeout. + + Default: yes + +The following **cachedb:** options are specific to the ``redis`` backend. + + +@@UAHL@unbound.conf.cachedb@redis-server-host@@: *<server address or name>* + The IP (either v6 or v4) address or domain name of the Redis server. + In general an IP address should be specified as otherwise Unbound will have + to resolve the name of the server every time it establishes a connection to + the server. + + Default: 127.0.0.1 + + +@@UAHL@unbound.conf.cachedb@redis-server-port@@: *<port number>* + The TCP port number of the Redis server. + + Default: 6379 + + +@@UAHL@unbound.conf.cachedb@redis-server-path@@: *<unix socket path>* + The unix socket path to connect to the Redis server. + Unix sockets may have better throughput than the IP address option. + + Default: "" (disabled) + + +@@UAHL@unbound.conf.cachedb@redis-server-password@@: *"<password>"* + The Redis AUTH password to use for the Redis server. + Only relevant if Redis is configured for client password authorisation. + + Default: "" (disabled) + + +@@UAHL@unbound.conf.cachedb@redis-timeout@@: *<msec>* + The period until when Unbound waits for a response from the Redis server. + If this timeout expires Unbound closes the connection, treats it as if the + Redis server does not have the requested data, and will try to re-establish + a new connection later. + + Default: 100 + + +@@UAHL@unbound.conf.cachedb@redis-command-timeout@@: *<msec>* + The timeout to use for Redis commands, in milliseconds. + If ``0``, it uses the + :ref:`redis-timeout<unbound.conf.cachedb.redis-timeout>` + value. + + Default: 0 + + +@@UAHL@unbound.conf.cachedb@redis-connect-timeout@@: *<msec>* + The timeout to use for Redis connection set up, in milliseconds. + If ``0``, it uses the + :ref:`redis-timeout<unbound.conf.cachedb.redis-timeout>` + value. + + Default: 0 + + +@@UAHL@unbound.conf.cachedb@redis-expire-records@@: *<yes or no>* + If Redis record expiration is enabled. + If yes, Unbound sets timeout for Redis records so that Redis can evict keys + that have expired automatically. + If Unbound is configured with + :ref:`serve-expired<unbound.conf.serve-expired>` and + :ref:`serve-expired-ttl: 0<unbound.conf.serve-expired-ttl>`, this option is + internally reverted to "no". + + .. note:: + Redis "SET ... EX" support is required for this option (Redis >= 2.6.12). + + Default: no + + +@@UAHL@unbound.conf.cachedb@redis-logical-db@@: *<logical database index>* + The logical database in Redis to use. + These are databases in the same Redis instance sharing the same + configuration and persisted in the same RDB/AOF file. + If unsure about using this option, Redis documentation + (https://redis.io/commands/select/) suggests not to use a single Redis + instance for multiple unrelated applications. + The default database in Redis is 0 while other logical databases need to be + explicitly SELECT'ed upon connecting. + + Default: 0 + + +@@UAHL@unbound.conf.cachedb@redis-replica-server-host@@: *<server address or name>* + The IP (either v6 or v4) address or domain name of the Redis server. + In general an IP address should be specified as otherwise Unbound will have + to resolve the name of the server every time it establishes a connection to + the server. + + This server is treated as a read-only replica server + (https://redis.io/docs/management/replication/#read-only-replica). + If specified, all Redis read commands will go to this replica server, while + the write commands will go to the + :ref:`redis-server-host<unbound.conf.cachedb.redis-server-host>`. + + Default: "" (disabled). + + +@@UAHL@unbound.conf.cachedb@redis-replica-server-port@@: *<port number>* + The TCP port number of the Redis replica server. + + Default: 6379 + + +@@UAHL@unbound.conf.cachedb@redis-replica-server-path@@: *<unix socket path>* + The unix socket path to connect to the Redis replica server. + Unix sockets may have better throughput than the IP address option. + + Default: "" (disabled) + + +@@UAHL@unbound.conf.cachedb@redis-replica-server-password@@: *"<password>"* + The Redis AUTH password to use for the Redis server. + Only relevant if Redis is configured for client password authorisation. + + Default: "" (disabled) + + +@@UAHL@unbound.conf.cachedb@redis-replica-timeout@@: *<msec>* + The period until when Unbound waits for a response from the Redis replica + server. + If this timeout expires Unbound closes the connection, treats it as if the + Redis server does not have the requested data, and will try to re-establish + a new connection later. + + Default: 100 + + +@@UAHL@unbound.conf.cachedb@redis-replica-command-timeout@@: *<msec>* + The timeout to use for Redis replica commands, in milliseconds. + If ``0``, it uses the + :ref:`redis-replica-timeout<unbound.conf.cachedb.redis-replica-timeout>` + value. + + Default: 0 + + +@@UAHL@unbound.conf.cachedb@redis-replica-connect-timeout@@: *<msec>* + The timeout to use for Redis replica connection set up, in milliseconds. + If ``0``, it uses the + :ref:`redis-replica-timeout<unbound.conf.cachedb.redis-replica-timeout>` + value. + + Default: 0 + + +@@UAHL@unbound.conf.cachedb@redis-replica-logical-db@@: *<logical database index>* + Same as :ref:`redis-logical-db<unbound.conf.cachedb.redis-logical-db>` but + for the Redis replica server. + + Default: 0 + + +.. _unbound.conf.dnstap: + +DNSTAP Logging Options +^^^^^^^^^^^^^^^^^^^^^^ + +DNSTAP support, when compiled in by using ``--enable-dnstap``, is enabled in +the **dnstap:** section. +This starts an extra thread (when compiled with threading) that writes the log +information to the destination. +If Unbound is compiled without threading it does not spawn a thread, but +connects per-process to the destination. + + +@@UAHL@unbound.conf.dnstap@dnstap-enable@@: *<yes or no>* + If dnstap is enabled. + If yes, it connects to the DNSTAP server and if any of the + *dnstap-log-..-messages:* options is enabled it sends logs for those + messages to the server. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-bidirectional@@: *<yes or no>* + Use frame streams in bidirectional mode to transfer DNSTAP messages. + + Default: yes + + +@@UAHL@unbound.conf.dnstap@dnstap-socket-path@@: *<file name>* + Sets the unix socket file name for connecting to the server that is + listening on that socket. + + Default: @DNSTAP_SOCKET_PATH@ + + +@@UAHL@unbound.conf.dnstap@dnstap-ip@@: *<IPaddress[@port]>* + If ``""``, the unix socket is used, if set with an IP address (IPv4 or + IPv6) that address is used to connect to the server. + + Default: "" + + +@@UAHL@unbound.conf.dnstap@dnstap-tls@@: *<yes or no>* + Set this to use TLS to connect to the server specified in + :ref:`dnstap-ip<unbound.conf.dnstap.dnstap-ip>`. + If set to no, TCP is used to connect to the server. + + Default: yes + + +@@UAHL@unbound.conf.dnstap@dnstap-tls-server-name@@: *<name of TLS authentication>* + The TLS server name to authenticate the server with. + Used when :ref:`dnstap-tls: yes<unbound.conf.dnstap.dnstap-tls>` is set. + If ``""`` it is ignored. + + Default: "" + + +@@UAHL@unbound.conf.dnstap@dnstap-tls-cert-bundle@@: *<file name of cert bundle>* + The pem file with certs to verify the TLS server certificate. + If ``""`` the server default cert bundle is used, or the windows cert + bundle on windows. + + Default: "" + + +@@UAHL@unbound.conf.dnstap@dnstap-tls-client-key-file@@: *<file name>* + The client key file for TLS client authentication. + If ``""`` client authentication is not used. + + Default: "" + + +@@UAHL@unbound.conf.dnstap@dnstap-tls-client-cert-file@@: *<file name>* + The client cert file for TLS client authentication. + + Default: "" + + +@@UAHL@unbound.conf.dnstap@dnstap-send-identity@@: *<yes or no>* + If enabled, the server identity is included in the log messages. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-send-version@@: *<yes or no>* + If enabled, the server version if included in the log messages. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-identity@@: *<string>* + The identity to send with messages, if ``""`` the hostname is used. + + Default: "" + + +@@UAHL@unbound.conf.dnstap@dnstap-version@@: *<string>* + The version to send with messages, if ``""`` the package version is used. + + Default: "" + + +@@UAHL@unbound.conf.dnstap@dnstap-sample-rate@@: *<number>* + The sample rate for log of messages, it logs only 1/N messages. + With 0 it is disabled. + This is useful in a high volume environment, where log functionality would + otherwise not be reliable. + For example 10 would spend only 1/10th time on logging, and 100 would only + spend a hundredth of the time on logging. + + Default: 0 (disabled) + + +@@UAHL@unbound.conf.dnstap@dnstap-log-resolver-query-messages@@: *<yes or no>* + Enable to log resolver query messages. + These are messages from Unbound to upstream servers. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-log-resolver-response-messages@@: *<yes or no>* + Enable to log resolver response messages. + These are replies from upstream servers to Unbound. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-log-client-query-messages@@: *<yes or no>* + Enable to log client query messages. + These are client queries to Unbound. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-log-client-response-messages@@: *<yes or no>* + Enable to log client response messages. + These are responses from Unbound to clients. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-log-forwarder-query-messages@@: *<yes or no>* + Enable to log forwarder query messages. + + Default: no + + +@@UAHL@unbound.conf.dnstap@dnstap-log-forwarder-response-messages@@: *<yes or no>* + Enable to log forwarder response messages. + + Default: no + +.. _unbound.conf.rpz: + +Response Policy Zone Options +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Response Policy Zones are configured with **rpz:**, and each one must have a +:ref:`name<unbound.conf.rpz.name>` attribute. +There can be multiple ones, by listing multiple RPZ clauses, each with a +different name. +RPZ clauses are applied in order of configuration and any match from an earlier +RPZ zone will terminate the RPZ lookup. +Note that a PASSTHRU action is still considered a match. +The respip module needs to be added to the +:ref:`module-config<unbound.conf.module-config>`, e.g.: + +.. code-block:: text + + module-config: "respip validator iterator" + +QNAME, Response IP Address, nsdname, nsip and clientip triggers are supported. +Supported actions are: NXDOMAIN, NODATA, PASSTHRU, DROP, Local Data, tcp-only +and drop. +RPZ QNAME triggers are applied after any +:ref:`local-zone<unbound.conf.local-zone>` and before any +:ref:`auth-zone<unbound.conf.auth>`. + +The RPZ zone is a regular DNS zone formatted with a SOA start record as usual. +The items in the zone are entries, that specify what to act on (the trigger) +and what to do (the action). +The trigger to act on is recorded in the name, the action to do is recorded as +the resource record. +The names all end in the zone name, so you could type the trigger names without +a trailing dot in the zonefile. + +An example RPZ record, that answers ``example.com`` with ``NXDOMAIN``: + +.. code-block:: text + + example.com CNAME . + +The triggers are encoded in the name on the left + +.. code-block:: text + + name query name + netblock.rpz-client-ip client IP address + netblock.rpz-ip response IP address in the answer + name.rpz-nsdname nameserver name + netblock.rpz-nsip nameserver IP address + +The netblock is written as ``<netblocklen>.<ip address in reverse>``. +For IPv6 use ``'zz'`` for ``'::'``. +Specify individual addresses with scope length of 32 or 128. +For example, ``24.10.100.51.198.rpz-ip`` is ``198.51.100.10/24`` and +``32.10.zz.db8.2001.rpz-ip`` is ``2001:db8:0:0:0:0:0:10/32``. + +The actions are specified with the record on the right + +.. code-block:: text + + CNAME . nxdomain reply + CNAME *. nodata reply + CNAME rpz-passthru. do nothing, allow to continue + CNAME rpz-drop. the query is dropped + CNAME rpz-tcp-only. answer over TCP + A 192.0.2.1 answer with this IP address + +Other records like AAAA, TXT and other CNAMEs (not rpz-..) can also be used to +answer queries with that content. + +The RPZ zones can be configured in the config file with these settings in the +**rpz:** block. + + +@@UAHL@unbound.conf.rpz@name@@: *<zone name>* + Name of the authority zone. + + +@@UAHL@unbound.conf.rpz@primary@@: *<IP address or host name>* + Where to download a copy of the zone from, with AXFR and IXFR. + Multiple primaries can be specified. + They are all tried if one fails. + + To use a non-default port for DNS communication append ``'@'`` with the + port number. + + You can append a ``'#'`` and a name, then AXFR over TLS can be used and the + TLS authentication certificates will be checked with that name. + + If you combine the ``'@'`` and ``'#'``, the ``'@'`` comes first. + If you point it at another Unbound instance, it would not work because that + does not support AXFR/IXFR for the zone, but if you used + :ref:`url<unbound.conf.rpz.url>` to download the zonefile as a text file + from a webserver that would work. + + If you specify the hostname, you cannot use the domain from the zonefile, + because it may not have that when retrieving that data, instead use a plain + IP address to avoid a circular dependency on retrieving that IP address. + + +@@UAHL@unbound.conf.rpz@master@@: *<IP address or host name>* + Alternate syntax for :ref:`primary<unbound.conf.rpz.primary>`. + + +@@UAHL@unbound.conf.rpz@url@@: *<url to zonefile>* + Where to download a zonefile for the zone. + With HTTP or HTTPS. + An example for the url is: + + .. code-block:: text + + http://www.example.com/example.org.zone + + Multiple url statements can be given, they are tried in turn. + + If only urls are given the SOA refresh timer is used to wait for making new + downloads. + If also primaries are listed, the primaries are first probed with UDP SOA + queries to see if the SOA serial number has changed, reducing the number of + downloads. + If none of the URLs work, the primaries are tried with IXFR and AXFR. + + For HTTPS, the :ref:`tls-cert-bundle<unbound.conf.tls-cert-bundle>` and + the hostname from the url are used to authenticate the connection. + + +@@UAHL@unbound.conf.rpz@allow-notify@@: *<IP address or host name or netblockIP/prefix>* + With :ref:`allow-notify<unbound.conf.rpz.allow-notify>` you can specify + additional sources of notifies. + When notified, the server attempts to first probe and then zone transfer. + If the notify is from a primary, it first attempts that primary. + Otherwise other primaries are attempted. + If there are no primaries, but only urls, the file is downloaded when + notified. + + .. note:: + The primaries from :ref:`primary<unbound.conf.rpz.primary>` and + :ref:`url<unbound.conf.rpz.url>` statements are allowed notify by + default. + + +@@UAHL@unbound.conf.rpz@zonefile@@: *<filename>* + The filename where the zone is stored. + If not given then no zonefile is used. + If the file does not exist or is empty, Unbound will attempt to fetch zone + data (eg. from the primary servers). + + +@@UAHL@unbound.conf.rpz@rpz-action-override@@: *<action>* + Always use this RPZ action for matching triggers from this zone. + Possible actions are: *nxdomain*, *nodata*, *passthru*, *drop*, *disabled* + and *cname*. + + +@@UAHL@unbound.conf.rpz@rpz-cname-override@@: *<domain>* + The CNAME target domain to use if the cname action is configured for + :ref:`rpz-action-override<unbound.conf.rpz.rpz-action-override>`. + + +@@UAHL@unbound.conf.rpz@rpz-log@@: *<yes or no>* + Log all applied RPZ actions for this RPZ zone. + + Default: no + + +@@UAHL@unbound.conf.rpz@rpz-log-name@@: *<name>* + Specify a string to be part of the log line, for easy referencing. + + +@@UAHL@unbound.conf.rpz@rpz-signal-nxdomain-ra@@: *<yes or no>* + Signal when a query is blocked by the RPZ with NXDOMAIN with an unset RA + flag. + This allows certain clients, like dnsmasq, to infer that the domain is + externally blocked. + + Default: no + + +@@UAHL@unbound.conf.rpz@for-downstream@@: *<yes or no>* + If enabled the zone is authoritatively answered for and queries for the RPZ + zone information are answered to downstream clients. + This is useful for monitoring scripts, that can then access the SOA + information to check if the RPZ information is up to date. + + Default: no + + +@@UAHL@unbound.conf.rpz@tags@@: *"<list of tags>"* + Limit the policies from this RPZ clause to clients with a matching tag. + + Tags need to be defined in :ref:`define-tag<unbound.conf.define-tag>` and + can be assigned to client addresses using + :ref:`access-control-tag<unbound.conf.access-control-tag>` or + :ref:`interface-tag<unbound.conf.interface-tag>`. + Enclose list of tags in quotes (``""``) and put spaces between tags. + + If no tags are specified the policies from this clause will be applied for + all clients. + +Memory Control Example +---------------------- + +In the example config settings below memory usage is reduced. +Some service levels are lower, notable very large data and a high TCP load are +no longer supported. +Very large data and high TCP loads are exceptional for the DNS. +DNSSEC validation is enabled, just add trust anchors. +If you do not have to worry about programs using more than 3 Mb of memory, the +below example is not for you. +Use the defaults to receive full service, which on BSD-32bit tops out at 30-40 +Mb after heavy usage. + +.. code-block:: text + + # example settings that reduce memory usage + server: + num-threads: 1 + outgoing-num-tcp: 1 # this limits TCP service, uses less buffers. + incoming-num-tcp: 1 + outgoing-range: 60 # uses less memory, but less performance. + msg-buffer-size: 8192 # note this limits service, 'no huge stuff'. + msg-cache-size: 100k + msg-cache-slabs: 1 + rrset-cache-size: 100k + rrset-cache-slabs: 1 + infra-cache-numhosts: 200 + infra-cache-slabs: 1 + key-cache-size: 100k + key-cache-slabs: 1 + neg-cache-size: 10k + num-queries-per-thread: 30 + target-fetch-policy: "2 1 0 0 0 0" + harden-large-queries: "yes" + harden-short-bufsize: "yes" + +Files +----- + +@UNBOUND_RUN_DIR@ + default Unbound working directory. + +@UNBOUND_CHROOT_DIR@ + default *chroot(2)* location. + +@ub_conf_file@ + Unbound configuration file. + +@UNBOUND_PIDFILE@ + default Unbound pidfile with process ID of the running daemon. + +unbound.log + Unbound log file. + Default is to log to *syslog(3)*. + +See Also +-------- + +:doc:`unbound(8)</manpages/unbound>`, +:doc:`unbound-checkonf(8)</manpages/unbound-checkconf>`. diff --git a/contrib/unbound/doc/unbound.rst b/contrib/unbound/doc/unbound.rst new file mode 100644 index 000000000000..eb36aa0cad3b --- /dev/null +++ b/contrib/unbound/doc/unbound.rst @@ -0,0 +1,119 @@ +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. + WHEN EDITING MAKE SURE EACH SENTENCE STARTS ON A NEW LINE + +.. + IT HELPS RENDERERS TO DO THE RIGHT THING WRT SPACE + +.. + IT HELPS PEOPLE DIFFING THE CHANGES + +.. program:: unbound + +unbound(8) +========== + +Synopsis +-------- + +**unbound** [``-hdpv``] [``-c <cfgfile>``] + +Description +----------- + +``unbound`` is a caching DNS resolver. + +It uses a built in list of authoritative nameservers for the root zone (``.``), +the so called root hints. +On receiving a DNS query it will ask the root nameservers for an answer and +will in almost all cases receive a delegation to a top level domain (TLD) +authoritative nameserver. +It will then ask that nameserver for an answer. +It will recursively continue until an answer is found or no answer is available +(NXDOMAIN). +For performance and efficiency reasons that answer is cached for a certain time +(the answer's time-to-live or TTL). +A second query for the same name will then be answered from the cache. +Unbound can also do DNSSEC validation. + +To use a locally running Unbound for resolving put: + +.. code-block:: text + + nameserver 127.0.0.1 + +into *resolv.conf(5)*. + +If authoritative DNS is needed as well using :external+nsd:doc:`manpages/nsd`, +careful setup is required because authoritative nameservers and resolvers are +using the same port number (53). + +The available options are: + +.. option:: -h + + Show the version number and commandline option help, and exit. + +.. option:: -c <cfgfile> + + Set the config file with settings for unbound to read instead of reading the + file at the default location, :file:`@ub_conf_file@`. + The syntax is described in :doc:`unbound.conf(5)</manpages/unbound.conf>`. + +.. option:: -d + + Debug flag: do not fork into the background, but stay attached to the + console. + This flag will also delay writing to the log file until the thread-spawn + time, so that most config and setup errors appear on stderr. + If given twice or more, logging does not switch to the log file or to + syslog, but the log messages are printed to stderr all the time. + +.. option:: -p + + Don't use a pidfile. + This argument should only be used by supervision systems which can ensure + that only one instance of Unbound will run concurrently. + +.. option:: -v + + Increase verbosity. + If given multiple times, more information is logged. + This is in addition to the verbosity (if any) from the config file. + +.. option:: -V + + Show the version number and build options, and exit. + +See Also +-------- + +:doc:`unbound.conf(5)</manpages/unbound.conf>`, +:doc:`unbound-checkconf(8)</manpages/unbound-checkconf>`, +:external+nsd:doc:`manpages/nsd`. diff --git a/contrib/unbound/edns-subnet/addrtree.h b/contrib/unbound/edns-subnet/addrtree.h index 0bc1837cdb80..2be530423db4 100644 --- a/contrib/unbound/edns-subnet/addrtree.h +++ b/contrib/unbound/edns-subnet/addrtree.h @@ -116,7 +116,7 @@ struct addredge { addrlen_t len; /** child node this edge is connected to */ struct addrnode *node; - /** Parent node this ege is connected to */ + /** Parent node this edge is connected to */ struct addrnode *parent_node; /** Index of this edge in parent_node */ int parent_index; diff --git a/contrib/unbound/edns-subnet/subnetmod.c b/contrib/unbound/edns-subnet/subnetmod.c index c5e215b8b684..88310a785d7a 100644 --- a/contrib/unbound/edns-subnet/subnetmod.c +++ b/contrib/unbound/edns-subnet/subnetmod.c @@ -154,6 +154,21 @@ int ecs_whitelist_check(struct query_info* qinfo, return 1; sn_env = (struct subnet_env*)qstate->env->modinfo[id]; + if(sq->is_subquery_nonsubnet) { + if(sq->is_subquery_scopezero) { + /* Check if the result can be stored in the global cache, + * this is okay if the address and name are not configured + * as subnet address and subnet zone. */ + if(!ecs_is_whitelisted(sn_env->whitelist, + addr, addrlen, qinfo->qname, qinfo->qname_len, + qinfo->qclass)) { + verbose(VERB_ALGO, "subnet store subquery global, name and addr have no subnet treatment."); + qstate->no_cache_store = 0; + } + } + return 1; + } + /* Cache by default, might be disabled after parsing EDNS option * received from nameserver. */ if(!iter_stub_fwd_no_cache(qstate, &qstate->qinfo, NULL, NULL, NULL, 0) @@ -234,13 +249,13 @@ subnetmod_init(struct module_env *env, int id) HASH_DEFAULT_STARTARRAY, env->cfg->msg_cache_size, msg_cache_sizefunc, query_info_compare, query_entry_delete, subnet_data_delete, NULL); - slabhash_setmarkdel(sn_env->subnet_msg_cache, &subnet_markdel); if(!sn_env->subnet_msg_cache) { log_err("subnetcache: could not create cache"); free(sn_env); env->modinfo[id] = NULL; return 0; } + slabhash_setmarkdel(sn_env->subnet_msg_cache, &subnet_markdel); /* whitelist for edns subnet capable servers */ sn_env->whitelist = ecs_whitelist_create(); if(!sn_env->whitelist || @@ -527,11 +542,12 @@ common_prefix(uint8_t *a, uint8_t *b, uint8_t net) /** * Create sub request that looks up the query. * @param qstate: query state + * @param id: module id. * @param sq: subnet qstate * @return false on failure. */ static int -generate_sub_request(struct module_qstate *qstate, struct subnet_qstate* sq) +generate_sub_request(struct module_qstate *qstate, int id, struct subnet_qstate* sq) { struct module_qstate* subq = NULL; uint16_t qflags = 0; /* OPCODE QUERY, no flags */ @@ -557,10 +573,22 @@ generate_sub_request(struct module_qstate *qstate, struct subnet_qstate* sq) } if(subq) { /* It is possible to access the subquery module state. */ + struct subnet_qstate* subsq; + if(!subnet_new_qstate(subq, id)) { + verbose(VERB_ALGO, "Could not allocate new subnet qstate"); + return 0; + } + subsq = (struct subnet_qstate*)subq->minfo[id]; + subsq->is_subquery_nonsubnet = 1; + + /* When the client asks 0.0.0.0/0 and the name is not treated + * as subnet, it is to be stored in the global cache. + * Store that the client asked for that, if so. */ if(sq->ecs_client_in.subnet_source_mask == 0 && edns_opt_list_find(qstate->edns_opts_front_in, qstate->env->cfg->client_subnet_opcode)) { subq->no_cache_store = 1; + subsq->is_subquery_scopezero = 1; } } return 1; @@ -569,17 +597,18 @@ generate_sub_request(struct module_qstate *qstate, struct subnet_qstate* sq) /** * Perform the query without subnet * @param qstate: query state + * @param id: module id. * @param sq: subnet qstate * @return module state */ static enum module_ext_state -generate_lookup_without_subnet(struct module_qstate *qstate, +generate_lookup_without_subnet(struct module_qstate *qstate, int id, struct subnet_qstate* sq) { verbose(VERB_ALGO, "subnetcache: make subquery to look up without subnet"); - if(!generate_sub_request(qstate, sq)) { + if(!generate_sub_request(qstate, id, sq)) { verbose(VERB_ALGO, "Could not generate sub query"); - qstate->return_rcode = LDNS_RCODE_FORMERR; + qstate->return_rcode = LDNS_RCODE_SERVFAIL; qstate->return_msg = NULL; return module_finished; } @@ -622,7 +651,7 @@ eval_response(struct module_qstate *qstate, int id, struct subnet_qstate *sq) * is still useful to put it in the edns subnet cache for * when a client explicitly asks for subnet specific answer. */ verbose(VERB_QUERY, "subnetcache: Authority indicates no support"); - return generate_lookup_without_subnet(qstate, sq); + return generate_lookup_without_subnet(qstate, id, sq); } /* Purposefully there was no sent subnet, and there is consequently @@ -654,7 +683,7 @@ eval_response(struct module_qstate *qstate, int id, struct subnet_qstate *sq) qstate->env->cfg->client_subnet_opcode); sq->subnet_sent = 0; sq->subnet_sent_no_subnet = 0; - return generate_lookup_without_subnet(qstate, sq); + return generate_lookup_without_subnet(qstate, id, sq); } lock_rw_wrlock(&sne->biglock); @@ -945,7 +974,7 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event, /* aggregated this deaggregated state */ qstate->ext_state[id] = generate_lookup_without_subnet( - qstate, sq); + qstate, id, sq); return; } verbose(VERB_ALGO, "subnetcache: pass to next module"); @@ -993,7 +1022,7 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event, qstate->env->cfg->client_subnet_opcode)) { /* client asked for resolution without edns subnet */ qstate->ext_state[id] = generate_lookup_without_subnet( - qstate, sq); + qstate, id, sq); return; } diff --git a/contrib/unbound/edns-subnet/subnetmod.h b/contrib/unbound/edns-subnet/subnetmod.h index 3893820fabaf..d2d9e957f0f2 100644 --- a/contrib/unbound/edns-subnet/subnetmod.h +++ b/contrib/unbound/edns-subnet/subnetmod.h @@ -106,6 +106,10 @@ struct subnet_qstate { int wait_subquery; /** The subquery waited for is done. */ int wait_subquery_done; + /** The subnet state is a subquery state for nonsubnet lookup. */ + int is_subquery_nonsubnet; + /** This is a subquery, and it is made due to a scope zero request. */ + int is_subquery_scopezero; }; void subnet_data_delete(void* d, void* ATTR_UNUSED(arg)); diff --git a/contrib/unbound/iterator/iter_delegpt.h b/contrib/unbound/iterator/iter_delegpt.h index 49f6f6b8130f..287bf92134d2 100644 --- a/contrib/unbound/iterator/iter_delegpt.h +++ b/contrib/unbound/iterator/iter_delegpt.h @@ -79,6 +79,16 @@ struct delegpt { * Also true if the delegationpoint was created from a delegation * message and thus contains the parent-side-info already. */ uint8_t has_parent_side_NS; + /** if true, the delegation point has reached last resort processing + * and the parent side information has been possibly added to the + * delegation point. + * For now this signals that further target lookups will ignore + * the configured target-fetch-policy and only resolve on + * demand to try and avoid triggering limits at this stage (.i.e, it + * is very likely that the A/AAAA queries for the newly added name + * servers will not yield new IP addresses and trigger NXNS + * countermeasures. */ + uint8_t fallback_to_parent_side_NS; /** for assertions on type of delegpt */ uint8_t dp_type_mlc; /** use SSL for upstream query */ diff --git a/contrib/unbound/iterator/iter_fwd.c b/contrib/unbound/iterator/iter_fwd.c index 5c104a0a3217..5d70c6664862 100644 --- a/contrib/unbound/iterator/iter_fwd.c +++ b/contrib/unbound/iterator/iter_fwd.c @@ -139,6 +139,17 @@ forwards_insert_data(struct iter_forwards* fwd, uint16_t c, uint8_t* nm, return 1; } +static struct iter_forward_zone* +fwd_zone_find(struct iter_forwards* fwd, uint16_t c, uint8_t* nm) +{ + struct iter_forward_zone key; + key.node.key = &key; + key.dclass = c; + key.name = nm; + key.namelabs = dname_count_size_labels(nm, &key.namelen); + return (struct iter_forward_zone*)rbtree_search(fwd->tree, &key); +} + /** insert new info into forward structure given dp */ static int forwards_insert(struct iter_forwards* fwd, uint16_t c, struct delegpt* dp) @@ -321,6 +332,11 @@ make_stub_holes(struct iter_forwards* fwd, struct config_file* cfg) log_err("cannot parse stub name '%s'", s->name); return 0; } + if(fwd_zone_find(fwd, LDNS_RR_CLASS_IN, dname) != NULL) { + /* Already a forward zone there. */ + free(dname); + continue; + } if(!fwd_add_stub_hole(fwd, LDNS_RR_CLASS_IN, dname)) { free(dname); log_err("out of memory"); @@ -345,6 +361,11 @@ make_auth_holes(struct iter_forwards* fwd, struct config_file* cfg) log_err("cannot parse auth name '%s'", a->name); return 0; } + if(fwd_zone_find(fwd, LDNS_RR_CLASS_IN, dname) != NULL) { + /* Already a forward zone there. */ + free(dname); + continue; + } if(!fwd_add_stub_hole(fwd, LDNS_RR_CLASS_IN, dname)) { free(dname); log_err("out of memory"); @@ -537,17 +558,6 @@ forwards_get_mem(struct iter_forwards* fwd) return s; } -static struct iter_forward_zone* -fwd_zone_find(struct iter_forwards* fwd, uint16_t c, uint8_t* nm) -{ - struct iter_forward_zone key; - key.node.key = &key; - key.dclass = c; - key.name = nm; - key.namelabs = dname_count_size_labels(nm, &key.namelen); - return (struct iter_forward_zone*)rbtree_search(fwd->tree, &key); -} - int forwards_add_zone(struct iter_forwards* fwd, uint16_t c, struct delegpt* dp, int nolock) diff --git a/contrib/unbound/iterator/iterator.c b/contrib/unbound/iterator/iterator.c index e64dfa61ba2d..71e64655f6d0 100644 --- a/contrib/unbound/iterator/iterator.c +++ b/contrib/unbound/iterator/iterator.c @@ -2152,6 +2152,7 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq, verbose(VERB_QUERY, "configured stub or forward servers failed -- returning SERVFAIL"); return error_response_cache(qstate, id, LDNS_RCODE_SERVFAIL); } + iq->dp->fallback_to_parent_side_NS = 1; if(qstate->env->cfg->harden_unverified_glue) { if(!cache_fill_missing(qstate->env, iq->qchase.qclass, qstate->region, iq->dp, PACKED_RRSET_UNVERIFIED_GLUE)) @@ -2180,6 +2181,10 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq, a->lame, a->tls_auth_name, -1, NULL); } lock_rw_unlock(&qstate->env->hints->lock); + /* copy over some configuration since we update the + * delegation point in place */ + iq->dp->tcp_upstream = dp->tcp_upstream; + iq->dp->ssl_upstream = dp->ssl_upstream; } iq->dp->has_parent_side_NS = 1; } else if(!iq->dp->has_parent_side_NS) { @@ -2768,7 +2773,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, } /* if the mesh query list is full, then do not waste cpu and sockets to * fetch promiscuous targets. They can be looked up when needed. */ - if(can_do_promisc && !mesh_jostle_exceeded(qstate->env->mesh)) { + if(!iq->dp->fallback_to_parent_side_NS && can_do_promisc + && !mesh_jostle_exceeded(qstate->env->mesh)) { tf_policy = ie->target_fetch_policy[iq->depth]; } @@ -3247,13 +3253,19 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, } } if(type == RESPONSE_TYPE_CNAME && - iq->qchase.qtype == LDNS_RR_TYPE_CNAME && + (iq->qchase.qtype == LDNS_RR_TYPE_CNAME || + iq->qchase.qtype == LDNS_RR_TYPE_ANY) && iq->minimisation_state == MINIMISE_STATE && query_dname_compare(iq->qchase.qname, iq->qinfo_out.qname) == 0) { /* The minimised query for full QTYPE and hidden QTYPE can be * classified as CNAME response type, even when the original * QTYPE=CNAME. This should be treated as answer response type. */ + /* For QTYPE=ANY, it is also considered the response, that + * is what the classifier would say, if it saw qtype ANY, + * and this same response was returned for that. The response + * can already be treated as such an answer, without having + * to send another query with a new qtype. */ type = RESPONSE_TYPE_ANSWER; } @@ -3510,6 +3522,15 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, iq->num_target_queries = 0; return processDSNSFind(qstate, iq, id); } + if(iq->minimisation_state == MINIMISE_STATE && + query_dname_compare(iq->qchase.qname, + iq->qinfo_out.qname) != 0) { + verbose(VERB_ALGO, "continue query minimisation, " + "downwards, after CNAME response for " + "intermediate label"); + /* continue query minimisation, downwards */ + return next_state(iq, QUERYTARGETS_STATE); + } /* Process the CNAME response. */ if(!handle_cname_response(qstate, iq, iq->response, &sname, &snamelen)) { @@ -3572,10 +3593,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq, iq->auth_zone_response = 0; iq->sent_count = 0; iq->dp_target_count = 0; - if(iq->minimisation_state != MINIMISE_STATE) - /* Only count as query restart when it is not an extra - * query as result of qname minimisation. */ - iq->query_restart_count++; + iq->query_restart_count++; if(qstate->env->cfg->qname_minimisation) iq->minimisation_state = INIT_MINIMISE_STATE; @@ -4147,7 +4165,7 @@ processFinished(struct module_qstate* qstate, struct iter_qstate* iq, /* store message with the finished prepended items, * but only if we did recursion. The nonrecursion referral * from cache does not need to be stored in the msg cache. */ - if(!qstate->no_cache_store && qstate->query_flags&BIT_RD) { + if(!qstate->no_cache_store && (qstate->query_flags&BIT_RD)) { iter_dns_store(qstate->env, &qstate->qinfo, iq->response->rep, 0, qstate->prefetch_leeway, iq->dp&&iq->dp->has_parent_side_NS, diff --git a/contrib/unbound/libunbound/libworker.c b/contrib/unbound/libunbound/libworker.c index f0496452b521..6e7244c03fee 100644 --- a/contrib/unbound/libunbound/libworker.c +++ b/contrib/unbound/libunbound/libworker.c @@ -630,8 +630,9 @@ int libworker_fg(struct ub_ctx* ctx, struct ctx_query* q) free(qinfo.qname); return UB_NOERROR; } - if(ctx->env->auth_zones && auth_zones_answer(ctx->env->auth_zones, - w->env, &qinfo, &edns, NULL, w->back->udp_buff, w->env->scratch)) { + if(ctx->env->auth_zones && auth_zones_downstream_answer( + ctx->env->auth_zones, w->env, &qinfo, &edns, NULL, + w->back->udp_buff, w->env->scratch)) { regional_free_all(w->env->scratch); libworker_fillup_fg(q, LDNS_RCODE_NOERROR, w->back->udp_buff, sec_status_insecure, NULL, 0); @@ -709,8 +710,9 @@ int libworker_attach_mesh(struct ub_ctx* ctx, struct ctx_query* q, w->back->udp_buff, sec_status_insecure, NULL, 0); return UB_NOERROR; } - if(ctx->env->auth_zones && auth_zones_answer(ctx->env->auth_zones, - w->env, &qinfo, &edns, NULL, w->back->udp_buff, w->env->scratch)) { + if(ctx->env->auth_zones && auth_zones_downstream_answer( + ctx->env->auth_zones, w->env, &qinfo, &edns, NULL, + w->back->udp_buff, w->env->scratch)) { regional_free_all(w->env->scratch); free(qinfo.qname); libworker_event_done_cb(q, LDNS_RCODE_NOERROR, @@ -847,8 +849,9 @@ handle_newq(struct libworker* w, uint8_t* buf, uint32_t len) free(qinfo.qname); return; } - if(w->ctx->env->auth_zones && auth_zones_answer(w->ctx->env->auth_zones, - w->env, &qinfo, &edns, NULL, w->back->udp_buff, w->env->scratch)) { + if(w->ctx->env->auth_zones && auth_zones_downstream_answer( + w->ctx->env->auth_zones, w->env, &qinfo, &edns, NULL, + w->back->udp_buff, w->env->scratch)) { regional_free_all(w->env->scratch); q->msg_security = sec_status_insecure; add_bg_result(w, q, w->back->udp_buff, UB_NOERROR, NULL, 0); diff --git a/contrib/unbound/libunbound/unbound.h b/contrib/unbound/libunbound/unbound.h index bdcf4edeca5f..c274f80ab897 100644 --- a/contrib/unbound/libunbound/unbound.h +++ b/contrib/unbound/libunbound/unbound.h @@ -772,6 +772,8 @@ struct ub_server_stats { long long ans_bogus; /** rrsets marked bogus by validator */ long long rrset_bogus; + /** number of signature validation operations performed by validator */ + long long val_ops; /** number of queries that have been ratelimited by domain recursion. */ long long queries_ratelimited; /** unwanted traffic received on server-facing ports */ diff --git a/contrib/unbound/respip/respip.h b/contrib/unbound/respip/respip.h index 6469854c53cb..83b6414737f7 100644 --- a/contrib/unbound/respip/respip.h +++ b/contrib/unbound/respip/respip.h @@ -276,7 +276,7 @@ void respip_inform_print(struct respip_action_info* respip_actinfo, * @param addrlen: length of addr. * @param net: netblock to lookup. * @param create: create node if it does not exist when 1. - * @param ipstr: human redable ip string, for logging. + * @param ipstr: human readable ip string, for logging. * @return newly created of found node, not holding lock. */ struct resp_addr* diff --git a/contrib/unbound/services/authzone.c b/contrib/unbound/services/authzone.c index 3c3dc9ad05d9..60ccc8698748 100644 --- a/contrib/unbound/services/authzone.c +++ b/contrib/unbound/services/authzone.c @@ -2413,14 +2413,12 @@ az_find_wildcard(struct auth_zone* z, struct query_info* qinfo, if(!dname_subdomain_c(nm, z->name)) return NULL; /* out of zone */ while((node=az_find_wildcard_domain(z, nm, nmlen))==NULL) { - /* see if we can go up to find the wildcard */ if(nmlen == z->namelen) return NULL; /* top of zone reached */ if(ce && nmlen == ce->namelen) return NULL; /* ce reached */ - if(dname_is_root(nm)) - return NULL; /* cannot go up */ - dname_remove_label(&nm, &nmlen); + if(!dname_remove_label_limit_len(&nm, &nmlen, z->namelen)) + return NULL; /* can't go up */ } return node; } @@ -2442,9 +2440,8 @@ az_find_candidate_ce(struct auth_zone* z, struct query_info* qinfo, n = az_find_name(z, nm, nmlen); /* delete labels and go up on name */ while(!n) { - if(dname_is_root(nm)) - return NULL; /* cannot go up */ - dname_remove_label(&nm, &nmlen); + if(!dname_remove_label_limit_len(&nm, &nmlen, z->namelen)) + return NULL; /* can't go up */ n = az_find_name(z, nm, nmlen); } return n; @@ -2456,8 +2453,7 @@ az_domain_go_up(struct auth_zone* z, struct auth_data* n) { uint8_t* nm = n->name; size_t nmlen = n->namelen; - while(!dname_is_root(nm)) { - dname_remove_label(&nm, &nmlen); + while(dname_remove_label_limit_len(&nm, &nmlen, z->namelen)) { if((n=az_find_name(z, nm, nmlen)) != NULL) return n; } @@ -2771,26 +2767,23 @@ az_change_dnames(struct dns_msg* msg, uint8_t* oldname, uint8_t* newname, } } -/** find NSEC record covering the query */ +/** find NSEC record covering the query, with the given node in the zone */ static struct auth_rrset* az_find_nsec_cover(struct auth_zone* z, struct auth_data** node) { - uint8_t* nm = (*node)->name; - size_t nmlen = (*node)->namelen; + uint8_t* nm; + size_t nmlen; struct auth_rrset* rrset; + log_assert(*node); /* we already have a node when calling this */ + nm = (*node)->name; + nmlen = (*node)->namelen; /* find the NSEC for the smallest-or-equal node */ - /* if node == NULL, we did not find a smaller name. But the zone - * name is the smallest name and should have an NSEC. So there is - * no NSEC to return (for a properly signed zone) */ - /* for empty nonterminals, the auth-data node should not exist, - * and thus we don't need to go rbtree_previous here to find - * a domain with an NSEC record */ - /* but there could be glue, and if this is node, then it has no NSEC. + /* But there could be glue, and then it has no NSEC. * Go up to find nonglue (previous) NSEC-holding nodes */ while((rrset=az_domain_rrset(*node, LDNS_RR_TYPE_NSEC)) == NULL) { - if(dname_is_root(nm)) return NULL; if(nmlen == z->namelen) return NULL; - dname_remove_label(&nm, &nmlen); + if(!dname_remove_label_limit_len(&nm, &nmlen, z->namelen)) + return NULL; /* can't go up */ /* adjust *node for the nsec rrset to find in */ *node = az_find_name(z, nm, nmlen); } @@ -3018,12 +3011,9 @@ az_nsec3_find_ce(struct auth_zone* z, uint8_t** cenm, size_t* cenmlen, struct auth_data* node; while((node = az_nsec3_find_exact(z, *cenm, *cenmlen, algo, iter, salt, saltlen)) == NULL) { - if(*cenmlen == z->namelen) { - /* next step up would take us out of the zone. fail */ - return NULL; - } + if(!dname_remove_label_limit_len(cenm, cenmlen, z->namelen)) + return NULL; /* can't go up */ *no_exact_ce = 1; - dname_remove_label(cenm, cenmlen); } return node; } @@ -3340,7 +3330,8 @@ az_generate_wildcard_answer(struct auth_zone* z, struct query_info* qinfo, } else if(ce) { uint8_t* wildup = wildcard->name; size_t wilduplen= wildcard->namelen; - dname_remove_label(&wildup, &wilduplen); + if(!dname_remove_label_limit_len(&wildup, &wilduplen, z->namelen)) + return 0; /* can't go up */ if(!az_add_nsec3_proof(z, region, msg, wildup, wilduplen, msg->qinfo.qname, msg->qinfo.qname_len, 0, insert_ce, 1, 0)) @@ -3399,7 +3390,7 @@ az_generate_answer_with_node(struct auth_zone* z, struct query_info* qinfo, } /** Generate answer without an existing-node that we can use. - * So it'll be a referral, DNAME or nxdomain */ + * So it'll be a referral, DNAME, notype, wildcard or nxdomain */ static int az_generate_answer_nonexistnode(struct auth_zone* z, struct query_info* qinfo, struct regional* region, struct dns_msg* msg, struct auth_data* ce, @@ -3565,14 +3556,17 @@ auth_error_encode(struct query_info* qinfo, struct module_env* env, sldns_buffer_read_u16_at(buf, 2), edns); } -int auth_zones_answer(struct auth_zones* az, struct module_env* env, +int auth_zones_downstream_answer(struct auth_zones* az, struct module_env* env, struct query_info* qinfo, struct edns_data* edns, - struct comm_reply* repinfo, struct sldns_buffer* buf, struct regional* temp) + struct comm_reply* repinfo, struct sldns_buffer* buf, + struct regional* temp) { struct dns_msg* msg = NULL; struct auth_zone* z; int r; int fallback = 0; + /* Copy the qinfo in case of cname aliasing from local-zone */ + struct query_info zqinfo = *qinfo; lock_rw_rdlock(&az->lock); if(!az->have_downstream) { @@ -3580,6 +3574,7 @@ int auth_zones_answer(struct auth_zones* az, struct module_env* env, lock_rw_unlock(&az->lock); return 0; } + if(qinfo->qtype == LDNS_RR_TYPE_DS) { uint8_t* delname = qinfo->qname; size_t delnamelen = qinfo->qname_len; @@ -3587,8 +3582,14 @@ int auth_zones_answer(struct auth_zones* az, struct module_env* env, z = auth_zones_find_zone(az, delname, delnamelen, qinfo->qclass); } else { - z = auth_zones_find_zone(az, qinfo->qname, qinfo->qname_len, - qinfo->qclass); + if(zqinfo.local_alias && !local_alias_shallow_copy_qname( + zqinfo.local_alias, &zqinfo.qname, + &zqinfo.qname_len)) { + lock_rw_unlock(&az->lock); + return 0; + } + z = auth_zones_find_zone(az, zqinfo.qname, zqinfo.qname_len, + zqinfo.qclass); } if(!z) { /* no zone above it */ @@ -3614,7 +3615,7 @@ int auth_zones_answer(struct auth_zones* az, struct module_env* env, } /* answer it from zone z */ - r = auth_zone_generate_answer(z, qinfo, temp, &msg, &fallback); + r = auth_zone_generate_answer(z, &zqinfo, temp, &msg, &fallback); lock_rw_unlock(&z->lock); if(!r && fallback) { /* fallback to regular answering (recursive) */ @@ -5023,6 +5024,7 @@ apply_axfr(struct auth_xfer* xfr, struct auth_zone* z, xfr->have_zone = 0; xfr->serial = 0; + xfr->soa_zone_acquired = 0; /* insert all RRs in to the zone */ /* insert the SOA only once, skip the last one */ @@ -5124,6 +5126,7 @@ apply_http(struct auth_xfer* xfr, struct auth_zone* z, xfr->have_zone = 0; xfr->serial = 0; + xfr->soa_zone_acquired = 0; chunk = xfr->task_transfer->chunks_first; chunk_pos = 0; @@ -5334,6 +5337,8 @@ xfr_process_chunk_list(struct auth_xfer* xfr, struct module_env* env, " (or malformed RR)", xfr->task_transfer->master->host); return 0; } + z->soa_zone_acquired = *env->now; + xfr->soa_zone_acquired = *env->now; /* release xfr lock while verifying zonemd because it may have * to spawn lookups in the state machines */ @@ -7003,13 +7008,23 @@ xfr_set_timeout(struct auth_xfer* xfr, struct module_env* env, comm_timer_set(xfr->task_nextprobe->timer, &tv); } +void auth_zone_pickup_initial_zone(struct auth_zone* z, struct module_env* env) +{ + /* Set the time, because we now have timestamp in env, + * (not earlier during startup and apply_cfg), and this + * notes the start time when the data was acquired. */ + z->soa_zone_acquired = *env->now; +} + void auth_xfer_pickup_initial_zone(struct auth_xfer* x, struct module_env* env) { /* set lease_time, because we now have timestamp in env, * (not earlier during startup and apply_cfg), and this * notes the start time when the data was acquired */ - if(x->have_zone) + if(x->have_zone) { x->lease_time = *env->now; + x->soa_zone_acquired = *env->now; + } if(x->task_nextprobe && x->task_nextprobe->worker == NULL) { xfr_set_timeout(x, env, 0, 1); } @@ -7020,7 +7035,13 @@ void auth_xfer_pickup_initial(struct auth_zones* az, struct module_env* env) { struct auth_xfer* x; + struct auth_zone* z; lock_rw_wrlock(&az->lock); + RBTREE_FOR(z, struct auth_zone*, &az->ztree) { + lock_rw_wrlock(&z->lock); + auth_zone_pickup_initial_zone(z, env); + lock_rw_unlock(&z->lock); + } RBTREE_FOR(x, struct auth_xfer*, &az->xtree) { lock_basic_lock(&x->lock); auth_xfer_pickup_initial_zone(x, env); @@ -7105,6 +7126,7 @@ auth_xfer_new(struct auth_zone* z) lock_protect(&xfr->lock, &xfr->notify_serial, sizeof(xfr->notify_serial)); lock_protect(&xfr->lock, &xfr->zone_expired, sizeof(xfr->zone_expired)); lock_protect(&xfr->lock, &xfr->have_zone, sizeof(xfr->have_zone)); + lock_protect(&xfr->lock, &xfr->soa_zone_acquired, sizeof(xfr->soa_zone_acquired)); lock_protect(&xfr->lock, &xfr->serial, sizeof(xfr->serial)); lock_protect(&xfr->lock, &xfr->retry, sizeof(xfr->retry)); lock_protect(&xfr->lock, &xfr->refresh, sizeof(xfr->refresh)); diff --git a/contrib/unbound/services/authzone.h b/contrib/unbound/services/authzone.h index 722781a063a8..d38cf9d26622 100644 --- a/contrib/unbound/services/authzone.h +++ b/contrib/unbound/services/authzone.h @@ -118,6 +118,8 @@ struct auth_zone { char* zonefile; /** fallback to the internet on failure or ttl-expiry of auth zone */ int fallback_enabled; + /** the time when zone was transferred from upstream */ + time_t soa_zone_acquired; /** the zone has expired (enabled by the xfer worker), fallback * happens if that option is enabled. */ int zone_expired; @@ -261,6 +263,8 @@ struct auth_xfer { int zone_expired; /** do we have a zone (if 0, no zone data at all) */ int have_zone; + /** the time when zone was transferred from upstream */ + time_t soa_zone_acquired; /** current serial (from SOA), if we have no zone, 0 */ uint32_t serial; @@ -550,9 +554,10 @@ int auth_zones_lookup(struct auth_zones* az, struct query_info* qinfo, * @param temp: temporary storage region. * @return false if not answered */ -int auth_zones_answer(struct auth_zones* az, struct module_env* env, +int auth_zones_downstream_answer(struct auth_zones* az, struct module_env* env, struct query_info* qinfo, struct edns_data* edns, - struct comm_reply* repinfo, struct sldns_buffer* buf, struct regional* temp); + struct comm_reply* repinfo, struct sldns_buffer* buf, + struct regional* temp); /** * Find the auth zone that is above the given qname. @@ -800,6 +805,14 @@ void auth_xfer_pickup_initial_zone(struct auth_xfer* x, struct module_env* env); /** + * Initial pick up of the auth zone, it sets the acquired time. + * @param z: the zone, write locked by caller. + * @param env: environment of the worker, with current time. + */ +void auth_zone_pickup_initial_zone(struct auth_zone* z, + struct module_env* env); + +/** * Delete auth xfer structure * @param xfr: delete this xfer and its tasks. */ diff --git a/contrib/unbound/services/cache/rrset.c b/contrib/unbound/services/cache/rrset.c index a05ae5a56b78..6d5c24f8053e 100644 --- a/contrib/unbound/services/cache/rrset.c +++ b/contrib/unbound/services/cache/rrset.c @@ -68,6 +68,8 @@ struct rrset_cache* rrset_cache_create(struct config_file* cfg, struct rrset_cache *r = (struct rrset_cache*)slabhash_create(slabs, startarray, maxmem, ub_rrset_sizefunc, ub_rrset_compare, ub_rrset_key_delete, rrset_data_delete, alloc); + if(!r) + return NULL; slabhash_setmarkdel(&r->table, &rrset_markdel); return r; } diff --git a/contrib/unbound/services/listen_dnsport.c b/contrib/unbound/services/listen_dnsport.c index 26efadc151a1..f7fcca194b40 100644 --- a/contrib/unbound/services/listen_dnsport.c +++ b/contrib/unbound/services/listen_dnsport.c @@ -90,10 +90,13 @@ #ifdef HAVE_NGTCP2 #include <ngtcp2/ngtcp2.h> #include <ngtcp2/ngtcp2_crypto.h> -#ifdef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H +#ifdef HAVE_NGTCP2_NGTCP2_CRYPTO_OSSL_H +#include <ngtcp2/ngtcp2_crypto_ossl.h> +#elif defined(HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H) #include <ngtcp2/ngtcp2_crypto_quictls.h> -#else +#elif defined(HAVE_NGTCP2_NGTCP2_CRYPTO_OPENSSL_H) #include <ngtcp2/ngtcp2_crypto_openssl.h> +#define MAKE_QUIC_METHOD 1 #endif #endif @@ -447,7 +450,7 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, * /proc/sys/net/core/wmem_max or sysctl net.core.wmem_max */ if(setsockopt(s, SOL_SOCKET, SO_SNDBUFFORCE, (void*)&snd, (socklen_t)sizeof(snd)) < 0) { - if(errno != EPERM) { + if(errno != EPERM && errno != ENOBUFS) { log_err("setsockopt(..., SO_SNDBUFFORCE, " "...) failed: %s", sock_strerror(errno)); sock_close(s); @@ -455,15 +458,23 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, *inuse = 0; return -1; } + if(errno != EPERM) { + verbose(VERB_ALGO, "setsockopt(..., SO_SNDBUFFORCE, " + "...) was not granted: %s", sock_strerror(errno)); + } # endif /* SO_SNDBUFFORCE */ if(setsockopt(s, SOL_SOCKET, SO_SNDBUF, (void*)&snd, (socklen_t)sizeof(snd)) < 0) { - log_err("setsockopt(..., SO_SNDBUF, " - "...) failed: %s", sock_strerror(errno)); - sock_close(s); - *noproto = 0; - *inuse = 0; - return -1; + if(errno != ENOSYS && errno != ENOBUFS) { + log_err("setsockopt(..., SO_SNDBUF, " + "...) failed: %s", sock_strerror(errno)); + sock_close(s); + *noproto = 0; + *inuse = 0; + return -1; + } + log_warn("setsockopt(..., SO_SNDBUF, " + "...) was not granted: %s", sock_strerror(errno)); } /* check if we got the right thing or if system * reduced to some system max. Warn if so */ @@ -473,7 +484,8 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, "Got %u. To fix: start with " "root permissions(linux) or sysctl " "bigger net.core.wmem_max(linux) or " - "kern.ipc.maxsockbuf(bsd) values.", + "kern.ipc.maxsockbuf(bsd) values. or " + "set so-sndbuf: 0 (use system value).", (unsigned)snd, (unsigned)got); } # ifdef SO_SNDBUFFORCE @@ -902,7 +914,7 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, against IP spoofing attacks as suggested in RFC7413 */ #ifdef __APPLE__ /* OS X implementation only supports qlen of 1 via this call. Actual - value is configured by the net.inet.tcp.fastopen_backlog kernel parm. */ + value is configured by the net.inet.tcp.fastopen_backlog kernel param. */ qlen = 1; #else /* 5 is recommended on linux */ @@ -1179,6 +1191,15 @@ set_recvtimestamp(int s) return 0; } return 1; +#elif defined(SO_TIMESTAMP) && defined(SCM_TIMESTAMP) + int on = 1; + /* FreeBSD and also Linux. */ + if (setsockopt(s, SOL_SOCKET, SO_TIMESTAMP, (void*)&on, (socklen_t)sizeof(on)) < 0) { + log_err("setsockopt(..., SO_TIMESTAMP, ...) failed: %s", + strerror(errno)); + return 0; + } + return 1; #else log_err("packets timestamping is not supported on this platform"); (void)s; @@ -1598,7 +1619,7 @@ listen_create(struct comm_base* base, struct listen_port* ports, front->udp_buff, ports->pp2_enabled, cb, cb_arg, ports->socket); #else - log_warn("This system does not support UDP ancilliary data."); + log_warn("This system does not support UDP ancillary data."); #endif } if(!cp) { @@ -3099,7 +3120,7 @@ static int http2_req_header_cb(nghttp2_session* session, return 0; } /* Content type is a SHOULD (rfc7231#section-3.1.1.5) when using POST, - * and not needed when using GET. Don't enfore. + * and not needed when using GET. Don't enforce. * If set only allow lowercase "application/dns-message". * * Clients SHOULD (rfc8484#section-4.1) set an accept header, but MUST @@ -3161,7 +3182,7 @@ static int http2_req_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session), qlen = h2_stream->content_length; } else if(len <= h2_session->c->http2_stream_max_qbuffer_size) { /* setting this to msg-buffer-size can result in a lot - * of memory consuption. Most queries should fit in a + * of memory consumption. Most queries should fit in a * single DATA frame, and most POST queries will * contain content-length which does not impose this * limit. */ @@ -3187,7 +3208,7 @@ static int http2_req_data_chunk_recv_cb(nghttp2_session* ATTR_UNUSED(session), if(!h2_stream->qbuffer || sldns_buffer_remaining(h2_stream->qbuffer) < len) { - verbose(VERB_ALGO, "http2 data_chunck_recv failed. Not enough " + verbose(VERB_ALGO, "http2 data_chunk_recv failed. Not enough " "buffer space for POST query. Can happen on multi " "frame requests without content-length header"); h2_stream->query_too_large = 1; @@ -3257,6 +3278,21 @@ doq_table_create(struct config_file* cfg, struct ub_randstate* rnd) struct doq_table* table = calloc(1, sizeof(*table)); if(!table) return NULL; +#ifdef USE_NGTCP2_CRYPTO_OSSL + /* Initialize the ossl crypto, it is harmless to call twice, + * and this is before use of doq connections. */ + if(ngtcp2_crypto_ossl_init() != 0) { + log_err("ngtcp2_crypto_oss_init failed"); + free(table); + return NULL; + } +#elif defined(HAVE_NGTCP2_CRYPTO_QUICTLS_INIT) + if(ngtcp2_crypto_quictls_init() != 0) { + log_err("ngtcp2_crypto_quictls_init failed"); + free(table); + return NULL; + } +#endif table->idle_timeout = ((uint64_t)cfg->tcp_idle_timeout)* NGTCP2_MILLISECONDS; table->sv_scidlen = 16; @@ -3596,12 +3632,18 @@ doq_conn_delete(struct doq_conn* conn, struct doq_table* table) lock_rw_wrlock(&conn->table->conid_lock); doq_conn_clear_conids(conn); lock_rw_unlock(&conn->table->conid_lock); - ngtcp2_conn_del(conn->conn); + /* Remove the app data from ngtcp2 before SSL_free of conn->ssl, + * because the ngtcp2 conn is deleted. */ + SSL_set_app_data(conn->ssl, NULL); if(conn->stream_tree.count != 0) { traverse_postorder(&conn->stream_tree, stream_tree_del, table); } free(conn->key.dcid); SSL_free(conn->ssl); +#ifdef USE_NGTCP2_CRYPTO_OSSL + ngtcp2_crypto_ossl_ctx_del(conn->ossl_ctx); +#endif + ngtcp2_conn_del(conn->conn); free(conn->close_pkt); free(conn); } @@ -4459,7 +4501,7 @@ doq_log_printf_cb(void* ATTR_UNUSED(user_data), const char* fmt, ...) va_end(ap); } -#ifndef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT +#ifdef MAKE_QUIC_METHOD /** the doq application tx key callback, false on failure */ static int doq_application_tx_key_cb(struct doq_conn* conn) @@ -4493,7 +4535,9 @@ doq_set_encryption_secrets(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level, ngtcp2_crypto_level #endif level = -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL +#ifdef USE_NGTCP2_CRYPTO_OSSL + ngtcp2_crypto_ossl_from_ossl_encryption_level(ossl_level); +#elif defined(HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL) ngtcp2_crypto_quictls_from_ossl_encryption_level(ossl_level); #else ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level); @@ -4539,7 +4583,9 @@ doq_add_handshake_data(SSL *ssl, OSSL_ENCRYPTION_LEVEL ossl_level, ngtcp2_crypto_level #endif level = -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL +#ifdef USE_NGTCP2_CRYPTO_OSSL + ngtcp2_crypto_ossl_from_ossl_encryption_level(ossl_level); +#elif defined(HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL) ngtcp2_crypto_quictls_from_ossl_encryption_level(ossl_level); #else ngtcp2_crypto_openssl_from_ossl_encryption_level(ossl_level); @@ -4574,7 +4620,7 @@ doq_send_alert(SSL *ssl, enum ssl_encryption_level_t ATTR_UNUSED(level), doq_conn->tls_alert = alert; return 1; } -#endif /* HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT */ +#endif /* MAKE_QUIC_METHOD */ /** ALPN select callback for the doq SSL context */ static int @@ -4596,7 +4642,7 @@ void* quic_sslctx_create(char* key, char* pem, char* verifypem) { #ifdef HAVE_NGTCP2 char* sid_ctx = "unbound server"; -#ifndef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT +#ifdef MAKE_QUIC_METHOD SSL_QUIC_METHOD* quic_method; #endif SSL_CTX* ctx = SSL_CTX_new(TLS_server_method()); @@ -4669,7 +4715,7 @@ void* quic_sslctx_create(char* key, char* pem, char* verifypem) SSL_CTX_free(ctx); return NULL; } -#else /* HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT */ +#elif defined(MAKE_QUIC_METHOD) /* The quic_method needs to remain valid during the SSL_CTX * lifetime, so we allocate it. It is freed with the * doq_server_socket. */ @@ -4704,12 +4750,29 @@ static ngtcp2_conn* doq_conn_ref_get_conn(ngtcp2_crypto_conn_ref* conn_ref) static SSL* doq_ssl_server_setup(SSL_CTX* ctx, struct doq_conn* conn) { +#ifdef USE_NGTCP2_CRYPTO_OSSL + int ret; +#endif SSL* ssl = SSL_new(ctx); if(!ssl) { log_crypto_err("doq: SSL_new failed"); return NULL; } -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT +#ifdef USE_NGTCP2_CRYPTO_OSSL + if((ret=ngtcp2_crypto_ossl_ctx_new(&conn->ossl_ctx, NULL)) != 0) { + log_err("doq: ngtcp2_crypto_ossl_ctx_new failed: %s", + ngtcp2_strerror(ret)); + SSL_free(ssl); + return NULL; + } + ngtcp2_crypto_ossl_ctx_set_ssl(conn->ossl_ctx, ssl); + if(ngtcp2_crypto_ossl_configure_server_session(ssl) != 0) { + log_err("doq: ngtcp2_crypto_ossl_configure_server_session failed"); + SSL_free(ssl); + return NULL; + } +#endif +#if defined(USE_NGTCP2_CRYPTO_OSSL) || defined(HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT) conn->conn_ref.get_conn = &doq_conn_ref_get_conn; conn->conn_ref.user_data = conn; SSL_set_app_data(ssl, &conn->conn_ref); @@ -4717,7 +4780,11 @@ doq_ssl_server_setup(SSL_CTX* ctx, struct doq_conn* conn) SSL_set_app_data(ssl, conn); #endif SSL_set_accept_state(ssl); +#ifdef USE_NGTCP2_CRYPTO_OSSL + SSL_set_quic_tls_early_data_enabled(ssl, 1); +#else SSL_set_quic_early_data_enabled(ssl, 1); +#endif return ssl; } @@ -4838,7 +4905,11 @@ doq_conn_setup(struct doq_conn* conn, uint8_t* scid, size_t scidlen, log_err("doq_ssl_server_setup failed"); return 0; } +#ifdef USE_NGTCP2_CRYPTO_OSSL + ngtcp2_conn_set_tls_native_handle(conn->conn, conn->ossl_ctx); +#else ngtcp2_conn_set_tls_native_handle(conn->conn, conn->ssl); +#endif doq_conn_write_enable(conn); return 1; } diff --git a/contrib/unbound/services/listen_dnsport.h b/contrib/unbound/services/listen_dnsport.h index f6275f805fba..963595a1ccc5 100644 --- a/contrib/unbound/services/listen_dnsport.h +++ b/contrib/unbound/services/listen_dnsport.h @@ -52,6 +52,9 @@ #ifdef HAVE_NGTCP2 #include <ngtcp2/ngtcp2.h> #include <ngtcp2/ngtcp2_crypto.h> +#ifdef USE_NGTCP2_CRYPTO_OSSL +struct ngtcp2_crypto_ossl_ctx; +#endif #endif struct listen_list; struct config_file; @@ -606,10 +609,14 @@ struct doq_conn { uint8_t tls_alert; /** the ssl context, SSL* */ void* ssl; -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT +#if defined(USE_NGTCP2_CRYPTO_OSSL) || defined(HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_SERVER_CONTEXT) /** the connection reference for ngtcp2_conn and userdata in ssl */ struct ngtcp2_crypto_conn_ref conn_ref; #endif +#ifdef USE_NGTCP2_CRYPTO_OSSL + /** the per-connection state for ngtcp2_crypto_ossl */ + struct ngtcp2_crypto_ossl_ctx* ossl_ctx; +#endif /** closure packet, if any */ uint8_t* close_pkt; /** length of closure packet. */ diff --git a/contrib/unbound/services/mesh.c b/contrib/unbound/services/mesh.c index 8a52fe4a6466..3212a6abf4c6 100644 --- a/contrib/unbound/services/mesh.c +++ b/contrib/unbound/services/mesh.c @@ -2265,6 +2265,7 @@ mesh_stats_clear(struct mesh_area* mesh) timehist_clear(mesh->histogram); mesh->ans_secure = 0; mesh->ans_bogus = 0; + mesh->val_ops = 0; mesh->ans_expired = 0; mesh->ans_cachedb = 0; memset(&mesh->ans_rcode[0], 0, sizeof(size_t)*UB_STATS_RCODE_NUM); diff --git a/contrib/unbound/services/mesh.h b/contrib/unbound/services/mesh.h index fd17c05da6d4..f19f423a8cd3 100644 --- a/contrib/unbound/services/mesh.h +++ b/contrib/unbound/services/mesh.h @@ -131,6 +131,8 @@ struct mesh_area { size_t ans_secure; /** (extended stats) bogus replies */ size_t ans_bogus; + /** (extended stats) number of validation operations */ + size_t val_ops; /** (extended stats) rcodes in replies */ size_t ans_rcode[UB_STATS_RCODE_NUM]; /** (extended stats) rcode nodata in replies */ diff --git a/contrib/unbound/services/modstack.c b/contrib/unbound/services/modstack.c index fa68cc71d2ff..2bc79c4adfd7 100644 --- a/contrib/unbound/services/modstack.c +++ b/contrib/unbound/services/modstack.c @@ -138,8 +138,8 @@ modstack_config(struct module_stack* stack, const char* module_conf) if(strchr(s, ' ')) *(strchr(s, ' ')) = 0; if(strchr(s, '\t')) *(strchr(s, '\t')) = 0; log_err("Unknown value in module-config, module: '%s'." - " This module is not present (not compiled in)," - " See the list of linked modules with unbound -V", s); + " This module is not present (not compiled in);" + " see the list of linked modules with unbound -V", s); return 0; } } diff --git a/contrib/unbound/services/modstack.h b/contrib/unbound/services/modstack.h index 5674aefdd018..03a4c82c40cd 100644 --- a/contrib/unbound/services/modstack.h +++ b/contrib/unbound/services/modstack.h @@ -67,7 +67,7 @@ void modstack_init(struct module_stack* stack); void modstack_free(struct module_stack* stack); /** - * Initialises modules and assignes ids. Calls module_startup(). + * Initialises modules and assigns ids. Calls module_startup(). * @param stack: Expected empty, filled according to module_conf * @param module_conf: string what modules to initialize * @param env: module environment which is inited by the modules. diff --git a/contrib/unbound/services/outside_network.c b/contrib/unbound/services/outside_network.c index 0d7ec890573b..2b7f7d0a2f21 100644 --- a/contrib/unbound/services/outside_network.c +++ b/contrib/unbound/services/outside_network.c @@ -2827,7 +2827,7 @@ serviced_perturb_qname(struct ub_randstate* rnd, uint8_t* qbuf, size_t len) random = ub_random(rnd); bits = 30; } - if(random & 0x1) { + if((random & 0x1)) { *d = (uint8_t)toupper((unsigned char)*d); } else { *d = (uint8_t)tolower((unsigned char)*d); @@ -2890,9 +2890,9 @@ serviced_encode(struct serviced_query* sq, sldns_buffer* buff, int with_edns) edns.opt_list_inplace_cb_out = NULL; edns.udp_size = serviced_query_udp_size(sq, sq->status); edns.bits = 0; - if(sq->dnssec & EDNS_DO) + if((sq->dnssec & EDNS_DO)) edns.bits = EDNS_DO; - if(sq->dnssec & BIT_CD) + if((sq->dnssec & BIT_CD)) LDNS_CD_SET(sldns_buffer_begin(buff)); if (sq->ssl_upstream && sq->padding_block_size) { padding_option.opt_code = LDNS_EDNS_PADDING; diff --git a/contrib/unbound/services/rpz.c b/contrib/unbound/services/rpz.c index df39e75b0596..f45cf65420d7 100644 --- a/contrib/unbound/services/rpz.c +++ b/contrib/unbound/services/rpz.c @@ -2121,8 +2121,17 @@ rpz_synthesize_nsdname_localdata(struct rpz* r, struct module_qstate* ms, rpz_log_dname("nsdname local data", key.name, key.namelen); ld = (struct local_data*)rbtree_search(&z->data, &key.node); + if(ld == NULL && dname_is_wild(z->name)) { + key.name = z->name; + key.namelen = z->namelen; + key.namelabs = z->namelabs; + ld = (struct local_data*)rbtree_search(&z->data, &key.node); + /* rpz_synthesize_localdata_from_rrset is going to make + * the rrset source name equal to the query name. So no need + * to make the wildcard rrset here. */ + } if(ld == NULL) { - verbose(VERB_ALGO, "rpz: nsdname: impossible: qname not found"); + verbose(VERB_ALGO, "rpz: nsdname: qname not found"); return NULL; } @@ -2148,6 +2157,15 @@ rpz_synthesize_qname_localdata_msg(struct rpz* r, struct module_qstate* ms, key.namelen = qinfo->qname_len; key.namelabs = dname_count_labels(qinfo->qname); ld = (struct local_data*)rbtree_search(&z->data, &key.node); + if(ld == NULL && dname_is_wild(z->name)) { + key.name = z->name; + key.namelen = z->namelen; + key.namelabs = z->namelabs; + ld = (struct local_data*)rbtree_search(&z->data, &key.node); + /* rpz_synthesize_localdata_from_rrset is going to make + * the rrset source name equal to the query name. So no need + * to make the wildcard rrset here. */ + } if(ld == NULL) { verbose(VERB_ALGO, "rpz: qname: name not found"); return NULL; diff --git a/contrib/unbound/sldns/keyraw.c b/contrib/unbound/sldns/keyraw.c index 90a6e85337c2..42a9262a30da 100644 --- a/contrib/unbound/sldns/keyraw.c +++ b/contrib/unbound/sldns/keyraw.c @@ -124,7 +124,7 @@ uint16_t sldns_calc_keytag_raw(uint8_t* key, size_t keysize) size_t i; uint32_t ac32 = 0; for (i = 0; i < keysize; ++i) { - ac32 += (i & 1) ? key[i] : key[i] << 8; + ac32 += ((i & 1)) ? key[i] : key[i] << 8; } ac32 += (ac32 >> 16) & 0xFFFF; return (uint16_t) (ac32 & 0xFFFF); @@ -272,7 +272,7 @@ sldns_key_buf2dsa_raw(unsigned char* key, size_t len) return NULL; } if (!DSA_set0_key(dsa, Y, NULL)) { - /* QPG attached, cleaned up by DSA_fre() */ + /* QPG attached, cleaned up by DSA_free() */ DSA_free(dsa); BN_free(Y); return NULL; diff --git a/contrib/unbound/sldns/str2wire.c b/contrib/unbound/sldns/str2wire.c index becd6d3855c9..392fc8f1d32a 100644 --- a/contrib/unbound/sldns/str2wire.c +++ b/contrib/unbound/sldns/str2wire.c @@ -857,7 +857,7 @@ rrinternal_parse_rdata(sldns_buffer* strbuf, char* token, size_t token_len, while (rdata_len && *rdata != 0) { uint8_t label_len; - if (*rdata & 0xC0) + if ((*rdata & 0xC0)) return LDNS_WIREPARSE_ERR_OK; label_len = *rdata + 1; diff --git a/contrib/unbound/sldns/wire2str.h b/contrib/unbound/sldns/wire2str.h index 772268b249c9..36c58b8b064d 100644 --- a/contrib/unbound/sldns/wire2str.h +++ b/contrib/unbound/sldns/wire2str.h @@ -262,7 +262,7 @@ int sldns_wire2str_rdata_unknown_scan(uint8_t** data, size_t* data_len, * @param pkt: packet for decompression, if NULL no decompression. * @param pktlen: length of packet buffer. * @param comprloop: inout bool, that is set true if compression loop failure - * happens. Pass in 0, if passsed in as true, a lower bound is set + * happens. Pass in 0, if passed in as true, a lower bound is set * on compression loops to stop arbitrary long packet parse times. * This is meant so you can set it to 0 at the start of a list of dnames, * and then scan all of them in sequence, if a loop happens, it becomes diff --git a/contrib/unbound/smallapp/unbound-anchor.c b/contrib/unbound/smallapp/unbound-anchor.c index 708731a09dd8..55d363da70bb 100644 --- a/contrib/unbound/smallapp/unbound-anchor.c +++ b/contrib/unbound/smallapp/unbound-anchor.c @@ -382,7 +382,7 @@ read_cert_file(const char* file) STACK_OF(X509)* sk; FILE* in; int content = 0; - char buf[128]; + long flen; if(file == NULL || strcmp(file, "") == 0) { return NULL; } @@ -399,6 +399,11 @@ read_cert_file(const char* file) #endif return NULL; } + if(fseek(in, 0, SEEK_END) < 0) + printf("%s fseek: %s\n", file, strerror(errno)); + flen = ftell(in); + if(fseek(in, 0, SEEK_SET) < 0) + printf("%s fseek: %s\n", file, strerror(errno)); while(!feof(in)) { X509* x = PEM_read_X509(in, NULL, NULL, NULL); if(x == NULL) { @@ -414,8 +419,9 @@ read_cert_file(const char* file) exit(0); } content = 1; - /* read away newline after --END CERT-- */ - if(!fgets(buf, (int)sizeof(buf), in)) + /* feof may not be true yet, but if the position is + * at end of file, stop reading more certificates. */ + if(ftell(in) == flen) break; } fclose(in); diff --git a/contrib/unbound/smallapp/unbound-checkconf.c b/contrib/unbound/smallapp/unbound-checkconf.c index 8fd821396025..b3c57fd2a52c 100644 --- a/contrib/unbound/smallapp/unbound-checkconf.c +++ b/contrib/unbound/smallapp/unbound-checkconf.c @@ -294,7 +294,8 @@ view_and_respipchecks(struct config_file* cfg) { struct views* views = NULL; struct respip_set* respip = NULL; - int ignored = 0; + int have_view_respip_cfg = 0; + int use_response_ip = 0; if(!(views = views_create())) fatal_exit("Could not create views: out of memory"); if(!(respip = respip_set_create())) @@ -303,8 +304,11 @@ view_and_respipchecks(struct config_file* cfg) fatal_exit("Could not set up views"); if(!respip_global_apply_cfg(respip, cfg)) fatal_exit("Could not setup respip set"); - if(!respip_views_apply_cfg(views, cfg, &ignored)) + if(!respip_views_apply_cfg(views, cfg, &have_view_respip_cfg)) fatal_exit("Could not setup per-view respip sets"); + use_response_ip = !respip_set_is_empty(respip) || have_view_respip_cfg; + if(use_response_ip && !strstr(cfg->module_conf, "respip")) + fatal_exit("response-ip options require respip module"); acl_view_tag_checks(cfg, views); views_delete(views); respip_set_delete(respip); @@ -450,6 +454,39 @@ ifautomaticportschecks(char* ifautomaticports) } } +/** check control interface strings */ +static void +controlinterfacechecks(struct config_file* cfg) +{ + struct config_strlist* p; + for(p = cfg->control_ifs.first; p; p = p->next) { + struct sockaddr_storage a; + socklen_t alen; + char** rcif = NULL; + int i, num_rcif = 0; + /* See if it is a local socket, starts with a '/'. */ + if(p->str && p->str[0] == '/') + continue; + if(!resolve_interface_names(&p->str, 1, NULL, &rcif, + &num_rcif)) { + fatal_exit("could not resolve interface names, for control-interface: %s", + p->str); + } + for(i=0; i<num_rcif; i++) { + if(!extstrtoaddr(rcif[i], &a, &alen, + cfg->control_port)) { + if(strcmp(p->str, rcif[i])!=0) + fatal_exit("cannot parse control-interface address '%s' from the control-interface specified as '%s'", + rcif[i], p->str); + else + fatal_exit("cannot parse control-interface specified as '%s'", + p->str); + } + } + config_del_strarray(rcif, num_rcif); + } +} + /** check acl ips */ static void aclchecks(struct config_file* cfg) @@ -636,8 +673,10 @@ check_modules_exist(const char* module_conf) } n[j] = s[j]; } - fatal_exit("module_conf lists module '%s' but that " - "module is not available.", n); + fatal_exit("Unknown value in module-config, module: " + "'%s'. This module is not present (not " + "compiled in); see the list of linked modules " + "with unbound -V", n); } s += strlen(names[i]); } @@ -926,6 +965,8 @@ morechecks(struct config_file* cfg) fatal_exit("control-cert-file: \"%s\" does not exist", cfg->control_cert_file); } + if(cfg->remote_control_enable) + controlinterfacechecks(cfg); donotquerylocalhostcheck(cfg); localzonechecks(cfg); @@ -966,6 +1007,8 @@ check_auth(struct config_file* cfg) if(!az || !auth_zones_apply_cfg(az, cfg, 0, &is_rpz, NULL, NULL)) { fatal_exit("Could not setup authority zones"); } + if(is_rpz && !strstr(cfg->module_conf, "respip")) + fatal_exit("RPZ requires the respip module"); auth_zones_delete(az); } diff --git a/contrib/unbound/smallapp/unbound-control.c b/contrib/unbound/smallapp/unbound-control.c index cf5abe7eb29d..b7e9d98a27b9 100644 --- a/contrib/unbound/smallapp/unbound-control.c +++ b/contrib/unbound/smallapp/unbound-control.c @@ -143,6 +143,8 @@ usage(void) printf(" load_cache load cache from stdin\n"); printf(" (not supported in remote unbounds in\n"); printf(" multi-process operation)\n"); + printf(" cache_lookup [+t] <names> print rrsets and msgs at or under the names\n"); + printf(" +t allow tld and root names.\n"); printf(" lookup <name> print nameservers for name\n"); printf(" flush [+c] <name> flushes common types for name from cache\n"); printf(" types: A, AAAA, MX, PTR, NS,\n"); @@ -409,6 +411,7 @@ static void print_extended(struct ub_stats_info* s, int inhibit_zero) PR_UL("num.answer.secure", s->svr.ans_secure); PR_UL("num.answer.bogus", s->svr.ans_bogus); PR_UL("num.rrset.bogus", s->svr.rrset_bogus); + PR_UL("num.valops", s->svr.val_ops); PR_UL("num.query.aggressive.NOERROR", s->svr.num_neg_cache_noerror); PR_UL("num.query.aggressive.NXDOMAIN", s->svr.num_neg_cache_nxdomain); /* threat detection */ diff --git a/contrib/unbound/testcode/doqclient.c b/contrib/unbound/testcode/doqclient.c index e6f63a761f35..238a9380306d 100644 --- a/contrib/unbound/testcode/doqclient.c +++ b/contrib/unbound/testcode/doqclient.c @@ -48,10 +48,13 @@ #ifdef HAVE_NGTCP2 #include <ngtcp2/ngtcp2.h> #include <ngtcp2/ngtcp2_crypto.h> -#ifdef HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H +#ifdef HAVE_NGTCP2_NGTCP2_CRYPTO_OSSL_H +#include <ngtcp2/ngtcp2_crypto_ossl.h> +#elif defined(HAVE_NGTCP2_NGTCP2_CRYPTO_QUICTLS_H) #include <ngtcp2/ngtcp2_crypto_quictls.h> -#else +#elif defined(HAVE_NGTCP2_NGTCP2_CRYPTO_OPENSSL_H) #include <ngtcp2/ngtcp2_crypto_openssl.h> +#define MAKE_QUIC_METHOD 1 #endif #include <openssl/ssl.h> #include <openssl/rand.h> @@ -107,10 +110,14 @@ struct doq_client_data { SSL_CTX* ctx; /** SSL object */ SSL* ssl; -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT +#if defined(USE_NGTCP2_CRYPTO_OSSL) || defined(HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT) /** the connection reference for ngtcp2_conn and userdata in ssl */ struct ngtcp2_crypto_conn_ref conn_ref; #endif +#ifdef USE_NGTCP2_CRYPTO_OSSL + /** the per-connection state for ngtcp2_crypto_ossl */ + struct ngtcp2_crypto_ossl_ctx* ossl_ctx; +#endif /** the quic version to use */ uint32_t quic_version; /** the last error */ @@ -197,11 +204,12 @@ struct doq_client_stream { int query_is_done; }; -#ifndef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT +#ifdef MAKE_QUIC_METHOD /** the quic method struct, must remain valid during the QUIC connection. */ static SSL_QUIC_METHOD quic_method; #endif +#if defined(USE_NGTCP2_CRYPTO_OSSL) || defined(HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT) /** Get the connection ngtcp2_conn from the ssl app data * ngtcp2_crypto_conn_ref */ static ngtcp2_conn* conn_ref_get_conn(ngtcp2_crypto_conn_ref* conn_ref) @@ -210,11 +218,12 @@ static ngtcp2_conn* conn_ref_get_conn(ngtcp2_crypto_conn_ref* conn_ref) conn_ref->user_data; return data->conn; } +#endif static void set_app_data(SSL* ssl, struct doq_client_data* data) { -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT +#if defined(USE_NGTCP2_CRYPTO_OSSL) || defined(HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT) data->conn_ref.get_conn = &conn_ref_get_conn; data->conn_ref.user_data = data; SSL_set_app_data(ssl, &data->conn_ref); @@ -227,7 +236,7 @@ static struct doq_client_data* get_app_data(SSL* ssl) { struct doq_client_data* data; -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT +#if defined(USE_NGTCP2_CRYPTO_OSSL) || defined(HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT) data = (struct doq_client_data*)((struct ngtcp2_crypto_conn_ref*) SSL_get_app_data(ssl))->user_data; #else @@ -893,7 +902,7 @@ handshake_completed(ngtcp2_conn* ATTR_UNUSED(conn), void* user_data) verbose(1, "early data was accepted by the server"); } } -#ifdef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT +#if defined(USE_NGTCP2_CRYPTO_OSSL) || defined(HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT) if(data->transport_file) { early_data_write_transport(data); } @@ -1207,7 +1216,7 @@ early_data_write_transport(struct doq_client_data* data) #endif } -#ifndef HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT +#ifdef MAKE_QUIC_METHOD /** applicatation rx key callback, this is where the rx key is set, * and streams can be opened, like http3 unidirectional streams, like * the http3 control and http3 qpack encode and decoder streams. */ @@ -1317,7 +1326,7 @@ send_alert(SSL *ssl, enum ssl_encryption_level_t ATTR_UNUSED(level), data->tls_alert = alert; return 1; } -#endif /* HAVE_NGTCP2_CRYPTO_QUICTLS_CONFIGURE_CLIENT_CONTEXT */ +#endif /* MAKE_QUIC_METHOD */ /** new session callback. We can write it to file for resumption later. */ static int @@ -1357,7 +1366,7 @@ ctx_client_setup(void) log_err("ngtcp2_crypto_quictls_configure_client_context failed"); exit(1); } -#else +#elif defined(MAKE_QUIC_METHOD) memset(&quic_method, 0, sizeof(quic_method)); quic_method.set_encryption_secrets = &set_encryption_secrets; quic_method.add_handshake_data = &add_handshake_data; @@ -1373,22 +1382,39 @@ ctx_client_setup(void) static SSL* ssl_client_setup(struct doq_client_data* data) { +#ifdef USE_NGTCP2_CRYPTO_OSSL + int ret; +#endif SSL* ssl = SSL_new(data->ctx); if(!ssl) { log_crypto_err("Could not SSL_new"); exit(1); } +#ifdef USE_NGTCP2_CRYPTO_OSSL + if((ret=ngtcp2_crypto_ossl_ctx_new(&data->ossl_ctx, NULL)) != 0) { + log_err("ngtcp2_crypto_ossl_ctx_new failed: %s", + ngtcp2_strerror(ret)); + exit(1); + } + ngtcp2_crypto_ossl_ctx_set_ssl(data->ossl_ctx, ssl); + if(ngtcp2_crypto_ossl_configure_client_session(ssl) != 0) { + log_err("ngtcp2_crypto_ossl_configure_client_session failed"); + exit(1); + } +#endif set_app_data(ssl, data); SSL_set_connect_state(ssl); if(!SSL_set_fd(ssl, data->fd)) { log_crypto_err("Could not SSL_set_fd"); exit(1); } +#ifndef USE_NGTCP2_CRYPTO_OSSL if((data->quic_version & 0xff000000) == 0xff000000) { SSL_set_quic_use_legacy_codepoint(ssl, 1); } else { SSL_set_quic_use_legacy_codepoint(ssl, 0); } +#endif SSL_set_alpn_protos(ssl, (const unsigned char *)"\x03""doq", 4); /* send the SNI host name */ SSL_set_tlsext_host_name(ssl, "localhost"); @@ -2072,7 +2098,11 @@ early_data_setup_session(struct doq_client_data* data) SSL_SESSION_free(session); return 0; } +#ifdef USE_NGTCP2_CRYPTO_OSSL + SSL_set_quic_tls_early_data_enabled(data->ssl, 1); +#else SSL_set_quic_early_data_enabled(data->ssl, 1); +#endif SSL_SESSION_free(session); return 1; } @@ -2221,6 +2251,15 @@ create_doq_client_data(const char* svr, int port, struct ub_event_base* base, data = calloc(1, sizeof(*data)); if(!data) fatal_exit("calloc failed: out of memory"); data->base = base; +#ifdef USE_NGTCP2_CRYPTO_OSSL + /* Initialize the ossl crypto, it is harmless to call twice, + * and this is before use of doq connections. */ + if(ngtcp2_crypto_ossl_init() != 0) + fatal_exit("ngtcp2_crypto_oss_init failed"); +#elif defined(HAVE_NGTCP2_CRYPTO_QUICTLS_INIT) + if(ngtcp2_crypto_quictls_init() != 0) + fatal_exit("ngtcp2_crypto_quictls_init failed"); +#endif data->rnd = ub_initstate(NULL); if(!data->rnd) fatal_exit("ub_initstate failed: out of memory"); data->svr = svr; @@ -2255,7 +2294,11 @@ create_doq_client_data(const char* svr, int port, struct ub_event_base* base, SSL_CTX_sess_set_new_cb(data->ctx, new_session_cb); } data->ssl = ssl_client_setup(data); +#ifdef USE_NGTCP2_CRYPTO_OSSL + ngtcp2_conn_set_tls_native_handle(data->conn, data->ossl_ctx); +#else ngtcp2_conn_set_tls_native_handle(data->conn, data->ssl); +#endif if(data->early_data_enabled) early_data_setup(data); @@ -2301,8 +2344,14 @@ delete_doq_client_data(struct doq_client_data* data) } } #endif - ngtcp2_conn_del(data->conn); + /* Remove the app data from ngtcp2 before SSL_free of conn->ssl, + * because the ngtcp2 conn is deleted. */ + SSL_set_app_data(data->ssl, NULL); SSL_free(data->ssl); +#ifdef USE_NGTCP2_CRYPTO_OSSL + ngtcp2_crypto_ossl_ctx_del(data->ossl_ctx); +#endif + ngtcp2_conn_del(data->conn); sldns_buffer_free(data->pkt_buf); sldns_buffer_free(data->blocked_pkt); if(data->fd != -1) diff --git a/contrib/unbound/testcode/fake_event.c b/contrib/unbound/testcode/fake_event.c index f7f3210790eb..ce439edd1294 100644 --- a/contrib/unbound/testcode/fake_event.c +++ b/contrib/unbound/testcode/fake_event.c @@ -188,6 +188,22 @@ delete_replay_answer(struct replay_answer* a) free(a); } +/** Log the packet for a reply_packet from testpkts. */ +static void +log_testpkt_reply_pkt(const char* txt, struct reply_packet* reppkt) +{ + if(!reppkt) { + log_info("%s <null>", txt); + return; + } + if(reppkt->reply_from_hex) { + log_pkt(txt, sldns_buffer_begin(reppkt->reply_from_hex), + sldns_buffer_limit(reppkt->reply_from_hex)); + return; + } + log_pkt(txt, reppkt->reply_pkt, reppkt->reply_len); +} + /** * return: true if pending query matches the now event. */ @@ -240,9 +256,8 @@ pending_find_match(struct replay_runtime* runtime, struct entry** entry, p->start_step, p->end_step, (*entry)->lineno); if(p->addrlen != 0) log_addr(0, "matched ip", &p->addr, p->addrlen); - log_pkt("matched pkt: ", - (*entry)->reply_list->reply_pkt, - (*entry)->reply_list->reply_len); + log_testpkt_reply_pkt("matched pkt: ", + (*entry)->reply_list); return 1; } p = p->next_range; @@ -330,7 +345,7 @@ fill_buffer_with_reply(sldns_buffer* buffer, struct entry* entry, uint8_t* q, while(reppkt && i--) reppkt = reppkt->next; if(!reppkt) fatal_exit("extra packet read from TCP stream but none is available"); - log_pkt("extra_packet ", reppkt->reply_pkt, reppkt->reply_len); + log_testpkt_reply_pkt("extra packet ", reppkt); } if(reppkt->reply_from_hex) { c = sldns_buffer_begin(reppkt->reply_from_hex); @@ -462,8 +477,7 @@ fake_front_query(struct replay_runtime* runtime, struct replay_moment *todo) repinfo.c->type = comm_udp; fill_buffer_with_reply(repinfo.c->buffer, todo->match, NULL, 0, 0); log_info("testbound: incoming QUERY"); - log_pkt("query pkt", todo->match->reply_list->reply_pkt, - todo->match->reply_list->reply_len); + log_testpkt_reply_pkt("query pkt ", todo->match->reply_list); /* call the callback for incoming queries */ if((*runtime->callback_query)(repinfo.c, runtime->cb_arg, NETEVENT_NOERROR, &repinfo)) { @@ -900,8 +914,10 @@ run_scenario(struct replay_runtime* runtime) runtime->now->evt_type == repevt_front_reply) { answer_check_it(runtime); advance_moment(runtime); - } else if(pending_matches_range(runtime, &entry, &pending)) { - answer_callback_from_entry(runtime, entry, pending); + } else if(runtime->now && pending_matches_range(runtime, + &entry, &pending)) { + if(entry) + answer_callback_from_entry(runtime, entry, pending); } else { do_moment_and_advance(runtime); } @@ -1254,7 +1270,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, struct query_info* qinfo, uint16_t flags, int dnssec, int ATTR_UNUSED(want_dnssec), int ATTR_UNUSED(nocaps), int ATTR_UNUSED(check_ratelimit), - int ATTR_UNUSED(tcp_upstream), int ATTR_UNUSED(ssl_upstream), + int tcp_upstream, int ATTR_UNUSED(ssl_upstream), char* ATTR_UNUSED(tls_auth_name), struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone, size_t zonelen, struct module_qstate* qstate, comm_point_callback_type* callback, @@ -1274,7 +1290,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, (flags&~(BIT_RD|BIT_CD))?" MORE":"", (dnssec)?" DO":""); /* create packet with EDNS */ - pend->buffer = sldns_buffer_new(512); + pend->buffer = sldns_buffer_new(4096); log_assert(pend->buffer); sldns_buffer_write_u16(pend->buffer, 0); /* id */ sldns_buffer_write_u16(pend->buffer, flags); @@ -1334,7 +1350,13 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, edns.opt_list_in = NULL; edns.opt_list_out = per_upstream_opt_list; edns.opt_list_inplace_cb_out = NULL; - attach_edns_record(pend->buffer, &edns); + if(sldns_buffer_capacity(pend->buffer) >= + sldns_buffer_limit(pend->buffer) + +calc_edns_field_size(&edns)) { + attach_edns_record(pend->buffer, &edns); + } else { + verbose(VERB_ALGO, "edns field too large to fit"); + } } memcpy(&pend->addr, addr, addrlen); pend->addrlen = addrlen; @@ -1345,7 +1367,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, pend->callback = callback; pend->cb_arg = callback_arg; pend->timeout = UDP_AUTH_QUERY_TIMEOUT/1000; - pend->transport = transport_udp; /* pretend UDP */ + pend->transport = tcp_upstream?transport_tcp:transport_udp; pend->pkt = NULL; pend->runtime = runtime; pend->serviced = 1; diff --git a/contrib/unbound/testcode/testbound.c b/contrib/unbound/testcode/testbound.c index 6da4ceaf2ebf..063037df4e80 100644 --- a/contrib/unbound/testcode/testbound.c +++ b/contrib/unbound/testcode/testbound.c @@ -293,6 +293,16 @@ setup_config(FILE* in, int* lineno, int* pass_argc, char* pass_argv[]) fclose(cfg); return; } + if(strncmp(parse, "fake-sha1: yes", 14) == 0) { + /* Allow the use of SHA1 signatures for the test, + * in case that OpenSSL disallows use of RSASHA1 + * with rh-allow-sha1-signatures disabled. */ +#ifndef UB_ON_WINDOWS + setenv("OPENSSL_ENABLE_SHA1_SIGNATURES", "1", 0); +#else + _putenv("OPENSSL_ENABLE_SHA1_SIGNATURES=1"); +#endif + } fputs(line, cfg); } fatal_exit("No CONFIG_END in input file"); @@ -333,6 +343,35 @@ static void remove_configfile(void) cfgfiles = NULL; } +/** perform the playback on the playback_file with the args. */ +static int +perform_playback(char* playback_file, int pass_argc, char** pass_argv) +{ + struct replay_scenario* scen = NULL; + int c, res; + + /* setup test environment */ + scen = setup_playback(playback_file, &pass_argc, pass_argv); + /* init fake event backend */ + fake_event_init(scen); + + pass_argv[pass_argc] = NULL; + echo_cmdline(pass_argc, pass_argv); + + /* run the normal daemon */ + res = daemon_main(pass_argc, pass_argv); + + fake_event_cleanup(); + for(c=1; c<pass_argc; c++) + free(pass_argv[c]); + return res; +} + +/* For fuzzing the main routine is replaced with + * LLVMFuzzerTestOneInput. */ +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION +#define main dummy_main +#endif /** * Main fake event test program. Setup, teardown and report errors. * @param argc: arg count. @@ -348,7 +387,6 @@ main(int argc, char* argv[]) char* playback_file = NULL; int init_optind = optind; char* init_optarg = optarg; - struct replay_scenario* scen = NULL; /* we do not want the test to depend on the timezone */ (void)putenv("TZ=UTC"); @@ -456,24 +494,11 @@ main(int argc, char* argv[]) if(atexit(&remove_configfile) != 0) fatal_exit("atexit() failed: %s", strerror(errno)); - /* setup test environment */ - scen = setup_playback(playback_file, &pass_argc, pass_argv); - /* init fake event backend */ - fake_event_init(scen); - - pass_argv[pass_argc] = NULL; - echo_cmdline(pass_argc, pass_argv); - /* reset getopt processing */ optind = init_optind; optarg = init_optarg; - /* run the normal daemon */ - res = daemon_main(pass_argc, pass_argv); - - fake_event_cleanup(); - for(c=1; c<pass_argc; c++) - free(pass_argv[c]); + res = perform_playback(playback_file, pass_argc, pass_argv); if(res == 0) { log_info("Testbound Exit Success\n"); /* remove configfile from here, the atexit() is for when @@ -493,6 +518,101 @@ main(int argc, char* argv[]) return res; } +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION +static int delete_file(const char *pathname) { + int ret = unlink(pathname); + free((void *)pathname); + return ret; +} + +static char *buf_to_file(const uint8_t *buf, size_t size) { + int fd; + size_t pos; + char *pathname = strdup("/tmp/fuzz-XXXXXX"); + if (pathname == NULL) + return NULL; + + fd = mkstemp(pathname); + if (fd == -1) { + log_err("mkstemp of file %s failed: %s", pathname, strerror(errno)); + free(pathname); + return NULL; + } + pos = 0; + while (pos < size) { + int nbytes = write(fd, &buf[pos], size - pos); + if (nbytes <= 0) { + if (nbytes == -1 && errno == EINTR) + continue; + log_err("write to file %s failed: %s", pathname, strerror(errno)); + goto err; + } + pos += nbytes; + } + + if (close(fd) == -1) { + log_err("close of file %s failed: %s", pathname, strerror(errno)); + goto err; + } + + return pathname; +err: + delete_file(pathname); + return NULL; +} + +/* based on main() above, but with: hard-coded passed args, file created from fuzz input */ +int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) +{ + int c, res; + int pass_argc = 0; + char* pass_argv[MAXARG]; + char* playback_file = NULL; + + /* we do not want the test to depend on the timezone */ + (void)putenv("TZ=UTC"); + memset(pass_argv, 0, sizeof(pass_argv)); +#ifdef HAVE_SYSTEMD + /* we do not want the test to use systemd daemon startup notification*/ + (void)unsetenv("NOTIFY_SOCKET"); +#endif /* HAVE_SYSTEMD */ + + checklock_start(); + log_init(NULL, 0, NULL); + /* determine commandline options for the daemon */ + pass_argc = 1; + pass_argv[0] = "unbound"; + add_opts("-d", &pass_argc, pass_argv); + + playback_file = buf_to_file(Data, Size); + if (playback_file) { + log_info("Start of %s testbound program.", PACKAGE_STRING); + + res = perform_playback(playback_file, pass_argc, pass_argv); + if(res == 0) { + log_info("Testbound Exit Success\n"); + /* remove configfile from here, the atexit() is for when + * there is a crash to remove the tmpdir file. + * This one removes the file while alloc and log locks are + * still valid, and can be logged (for memory calculation), + * it leaves the ptr NULL so the atexit does nothing. */ + remove_configfile(); +#ifdef HAVE_PTHREAD + /* dlopen frees its thread state (dlopen of gost engine) */ + pthread_exit(NULL); +#endif + } + + delete_file(playback_file); + } + + if(log_get_lock()) { + lock_basic_destroy((lock_basic_type*)log_get_lock()); + } + return res; +} +#endif /* FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */ + /* fake remote control */ struct listen_port* daemon_remote_open_ports(struct config_file* ATTR_UNUSED(cfg)) diff --git a/contrib/unbound/testcode/unitdname.c b/contrib/unbound/testcode/unitdname.c index 08a2dbad774d..95c6e1fda705 100644 --- a/contrib/unbound/testcode/unitdname.c +++ b/contrib/unbound/testcode/unitdname.c @@ -45,6 +45,7 @@ #include "util/data/dname.h" #include "sldns/sbuffer.h" #include "sldns/str2wire.h" +#include "sldns/wire2str.h" /** put dname into buffer */ static sldns_buffer* @@ -476,6 +477,23 @@ dname_test_removelabel(void) unit_assert( l == 1 ); } +/** test dname_remove_label_limit_len */ +static void +dname_test_removelabellimitlen(void) +{ + uint8_t* orig = (uint8_t*)"\007example\003com\000"; + uint8_t* n = orig; + size_t l = 13; + size_t lenlimit = 5; /* com.*/ + unit_show_func("util/data/dname.c", "dname_remove_label_limit_len"); + unit_assert(dname_remove_label_limit_len(&n, &l, lenlimit) == 1); + unit_assert( n == orig+8 ); + unit_assert( l == 5 ); + unit_assert(dname_remove_label_limit_len(&n, &l, lenlimit) == 0); + unit_assert( n == orig+8 ); + unit_assert( l == 5 ); +} + /** test dname_signame_label_count */ static void dname_test_sigcount(void) @@ -859,6 +877,262 @@ dname_setup_bufs(sldns_buffer* loopbuf, sldns_buffer* boundbuf) sldns_buffer_flip(boundbuf); } +/* Test strings for the test_long_names test. */ +/* Each label begins with the length of the label including the length octet. */ + +char desc_1[] = "Domain is 1 octet too long."; + +uint8_t wire_dom_1[] = { /* Bad: Domain: (8x)0031abcdefghijklmnopqrstuvwxyz.0007ab. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, /* Bad: */ 0x06, 0x30, 0x30, 0x30, 0x37, 0x61, 0x62, 0x00 +}; + +char desc_2[] = "Domain has the maximum allowed length (255)."; + +uint8_t wire_dom_2[] = { /* Good: Domain: (8x)0031abcdefghijklmnopqrstuvwxyz.00076a. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, /* Good: */ 0x05, 0x30, 0x30, 0x30, 0x36, 0x61, 0x00 +}; + +char desc_3[] = "Domain has a length one label in the 255th position for a total of 257."; + +uint8_t wire_dom_3[] = { /* Bad: Domain: (8x(0031abcdefghijklmnopqrstuvwxyz.0006ab.1. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, /* Bad: */ 0x05, 0x30, 0x30, 0x30, 0x36, 0x61, 0x01, 0x32, 0x00 +}; + +char desc_4[] = "Domain has the maximum allowed length (255)."; + +uint8_t wire_dom_4[] = { /* Good: Domain: (8x)0031abcdefghijklmnopqrstuvwxyz.03.03. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, /* Good: */ 0x02, 0x30, 0x33, 0x02, 0x30, 0x33, 0x00 +}; + +char desc_5[] = "Domain has a maximum length label (63) in the 255th position."; + +uint8_t wire_dom_5[] = { /* Bad: Domain: (8x)0031abcdefghijklmnopqrstuvwxyz.03.03.65abc...zab...zab...ghi. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, /* Bad: */ 0x02, 0x30, 0x33, 0x02, 0x30, 0x33, 0x3f, 0x36, + 0x33, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, + 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, + 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x00 +}; + +char desc_6[] = "Domain has a too long label (65) in the 255th position."; + +uint8_t wire_dom_6[] = { /* Bad: Domain: (8x)0031abcdefghijklmnopqrstuvwxyz.03.03.66abc...zab...zab...ijk. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, + 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, + 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, /* Bad: */ 0x02, 0x30, 0x33, 0x02, 0x30, 0x33, 0x41, 0x36, + 0x36, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, + 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, + 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x00 +}; + +char desc_7[] = "Domain has a too long label (65) in the 187th position."; + +uint8_t wire_dom_7[] = { /* Bad: Domain: (6x)0031abcdefghijklmnopqrstuvwxyz.65abc..zab...zab...ijk. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, + /* Bad: */ 0x41, 0x36, + 0x36, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, + 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, + 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x00 +}; + +char desc_8[] = "Domains has the maximum allowed length and ends with a maximum length label."; + +uint8_t wire_dom_8[] = { /* Good: Domain: (6x)0031abcdefghijklmnopqrstuvwxyz.0004.0064abc..zab...zabcdefg. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x03, 0x30, 0x30, 0x34 ,/* Good: */ 0x3f, 0x30, + 0x30, 0x36, 0x34, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, + 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x00 +}; + +char desc_9[] = "Domains has 254 octets, one less than the maximum allowed length."; + +uint8_t wire_dom_9[] = { /* Good: Domain: (6x)0031abcdefghijklmnopqrstuvwxyz.0004.0064abc..zab...zabcdef. */ + 0x1e, 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, + 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, + 0x30, 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, + 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, + 0x30, 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, + 0x33, 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, + 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, + 0x31, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x1e, 0x30, 0x30, 0x33, 0x31, + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, + 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x03, 0x30, 0x30, 0x34 ,/* Good: */ 0x3e, 0x30, + 0x30, 0x35, 0x34, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, + 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, + 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, + 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x00 +}; + + /** Test dname to string with long domain names. */ +static void +test_long_names(void) +{ + /* Set to 1 for verbose output, 0 turns it off. */ + int verbtest = 0; + + uint8_t* wire_doms[] = {wire_dom_1, wire_dom_2, wire_dom_3, + wire_dom_4, wire_dom_5, wire_dom_6, wire_dom_7, wire_dom_8, + wire_dom_9, 0}; + char* descs[] = {desc_1, desc_2, desc_3, desc_4, desc_5, desc_6, + desc_7, desc_8, desc_9, 0}; + + int n; + char string_domain[260]; + uint8_t** wd = wire_doms; + int di = 0; + int skip = 5; /* 0..6 */ + + while (*wd) { + + if(verbtest) + printf("Test: %s\n", descs[di++]); + + memset(string_domain, 0xff, sizeof(string_domain)); + dname_str(*wd, string_domain); + for (n = 0 ; n < (int)sizeof(string_domain); ++n) { + if ((uint8_t)string_domain[n] == 0xff) + break; + } + if(verbtest) + printf("dname_str: L=%d, S=Skipping %d labels...%s\n", + n, skip, string_domain + skip*31); + unit_assert(n <= 255); + + memset(string_domain, 0xff, sizeof(string_domain)); + sldns_wire2str_dname_buf(*wd, + strlen((char*)*wd)+1 /* strlen works with these test strings */, + string_domain, + 255 /* for comparable result to dname_str */ ); + for (n = 0 ; n < (int)sizeof(string_domain); ++n) { + if ((uint8_t)string_domain[n] == 0xff) + break; + } + if(verbtest) + printf("sldns_wire2str_dname_buf: L=%d, S=Skipping %d labels...%s\n", + n, skip, string_domain + skip*31); + unit_assert(n <= 255); + + ++wd; + } +} + static void dname_test_str(sldns_buffer* buff) { @@ -1002,6 +1276,8 @@ dname_test_str(sldns_buffer* buff) unit_assert(0); } } + + test_long_names(); } void dname_test(void) @@ -1024,6 +1300,7 @@ void dname_test(void) dname_test_subdomain(); dname_test_isroot(); dname_test_removelabel(); + dname_test_removelabellimitlen(); dname_test_sigcount(); dname_test_iswild(); dname_test_canoncmp(); diff --git a/contrib/unbound/testcode/unitinfra.c b/contrib/unbound/testcode/unitinfra.c index 6834c51eeab8..91a88f6ae8a9 100644 --- a/contrib/unbound/testcode/unitinfra.c +++ b/contrib/unbound/testcode/unitinfra.c @@ -131,6 +131,7 @@ void infra_test(void) unit_show_feature("infra cache"); unit_assert(ipstrtoaddr("127.0.0.1", 53, &one, &onelen)); + config_auto_slab_values(cfg); slab = infra_create(cfg); /* insert new record */ unit_assert( infra_host(slab, &one, onelen, zone, zonelen, now, diff --git a/contrib/unbound/testcode/unitmain.c b/contrib/unbound/testcode/unitmain.c index 334c1af93033..07c016d7ba74 100644 --- a/contrib/unbound/testcode/unitmain.c +++ b/contrib/unbound/testcode/unitmain.c @@ -205,6 +205,8 @@ net_test(void) unit_assert(memcmp(&a6.sin6_addr, "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\000", 16) == 0); addr_mask((struct sockaddr_storage*)&a6, l6, 64); unit_assert(memcmp(&a6.sin6_addr, "\377\377\377\377\377\377\377\377\000\000\000\000\000\000\000\000", 16) == 0); + /* Check that negative value in net is not problematic. */ + addr_mask((struct sockaddr_storage*)&a6, l6, -100); addr_mask((struct sockaddr_storage*)&a6, l6, 0); unit_assert(memcmp(&a6.sin6_addr, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000", 16) == 0); } @@ -266,6 +268,28 @@ net_test(void) (struct sockaddr_storage*)&b6, i, l6) == i); } } + /* test netblockstrtoaddr */ + unit_show_func("util/net_help.c", "netblockstrtoaddr"); + if(1) { + struct sockaddr_storage a; + socklen_t alen = 0; + int net = 0, res; + char astr[128]; + memset(&a, 0, sizeof(a)); + + res = netblockstrtoaddr("1.2.3.0/24", 53, &a, &alen, &net); + unit_assert(res!=0 && net == 24); + addr_to_str(&a, alen, astr, sizeof(astr)); + unit_assert(strcmp(astr, "1.2.3.0") == 0); + unit_assert(ntohs(((struct sockaddr_in*)&a)->sin_port)==53); + + res = netblockstrtoaddr("2001:DB8:33:44::/64", 53, + &a, &alen, &net); + unit_assert(res!=0 && net == 64); + addr_to_str(&a, alen, astr, sizeof(astr)); + unit_assert(strcmp(astr, "2001:db8:33:44::") == 0); + unit_assert(ntohs(((struct sockaddr_in6*)&a)->sin6_port)==53); + } /* test sockaddr_cmp_addr */ unit_show_func("util/net_help.c", "sockaddr_cmp_addr"); if(1) { diff --git a/contrib/unbound/testcode/unitverify.c b/contrib/unbound/testcode/unitverify.c index 81c8b13c6d65..12d5205b07da 100644 --- a/contrib/unbound/testcode/unitverify.c +++ b/contrib/unbound/testcode/unitverify.c @@ -61,6 +61,12 @@ #include "sldns/str2wire.h" #include "sldns/wire2str.h" +#ifdef HAVE_SSL +#ifdef HAVE_OPENSSL_ERR_H +#include <openssl/err.h> +#endif +#endif + /** verbose signature test */ static int vsig = 0; @@ -509,10 +515,137 @@ nsec3_hash_test(const char* fname) #define SRCDIRSTR xstr(SRCDIR) +#if defined(HAVE_SSL) && defined(USE_SHA1) +/* Detect if openssl is configured to disable RSASHA1 signatures, + * with the rh-allow-sha1-signatures disabled. */ +static int +rh_allow_sha1_signatures_disabled(void) +{ + EVP_MD_CTX* ctx; + EVP_PKEY* evp_key; + /* This key is rdata from nlnetlabs.nl DNSKEY from 20250424005001, + * with id=50602 (ksk), size=2048b. + * A 2048 bit key is taken to avoid key too small errors. */ + unsigned char key[] = { + 0x03, 0x01, 0x00, 0x01, 0xBC, 0x0B, 0xE8, 0xBB, + 0x97, 0x4C, 0xB5, 0xED, 0x6F, 0x6D, 0xC2, 0xB1, + 0x78, 0x69, 0x93, 0x1C, 0x72, 0x19, 0xB1, 0x05, + 0x51, 0x13, 0xA1, 0xFC, 0xBF, 0x01, 0x58, 0x0D, + 0x44, 0x10, 0x5F, 0x0B, 0x75, 0x0E, 0x11, 0x9A, + 0xC8, 0xF8, 0x0F, 0x90, 0xFC, 0xB8, 0x09, 0xD1, + 0x14, 0x39, 0x0D, 0x84, 0xCE, 0x97, 0x88, 0x82, + 0x3D, 0xC5, 0xCB, 0x1A, 0xBF, 0x00, 0x46, 0x37, + 0x01, 0xF1, 0xCD, 0x46, 0xA2, 0x8F, 0x83, 0x19, + 0x42, 0xED, 0x6F, 0xAF, 0x37, 0x1F, 0x18, 0x82, + 0x4B, 0x70, 0x2D, 0x50, 0xA5, 0xA6, 0x66, 0x48, + 0x7F, 0x56, 0xA8, 0x86, 0x05, 0x41, 0xC8, 0xBE, + 0x4F, 0x8B, 0x38, 0x51, 0xF0, 0xEB, 0xAD, 0x2F, + 0x7A, 0xC0, 0xEF, 0xC7, 0xD2, 0x72, 0x6F, 0x16, + 0x66, 0xAF, 0x59, 0x55, 0xFF, 0xEE, 0x9D, 0x50, + 0xE9, 0xDB, 0xF4, 0x02, 0xBC, 0x33, 0x5C, 0xC5, + 0xDA, 0x1C, 0x6A, 0xD1, 0x55, 0xD1, 0x20, 0x2B, + 0x63, 0x03, 0x4B, 0x77, 0x45, 0x46, 0x78, 0x31, + 0xE4, 0x90, 0xB9, 0x7F, 0x00, 0xFB, 0x62, 0x7C, + 0x07, 0xD3, 0xC1, 0x00, 0xA0, 0x54, 0x63, 0x74, + 0x0A, 0x17, 0x7B, 0xE7, 0xAD, 0x38, 0x07, 0x86, + 0x68, 0xE4, 0xFD, 0x20, 0x68, 0xD5, 0x33, 0x92, + 0xCA, 0x90, 0xDD, 0xA4, 0xE9, 0xF2, 0x11, 0xBD, + 0x9D, 0xA5, 0xF5, 0xEB, 0xB9, 0xFE, 0x8F, 0xA1, + 0xE4, 0xBF, 0xA4, 0xA4, 0x34, 0x5C, 0x6A, 0x95, + 0xB6, 0x42, 0x22, 0xF6, 0xD6, 0x10, 0x9C, 0x9B, + 0x0A, 0x56, 0xE7, 0x42, 0xE5, 0x7F, 0x1F, 0x4E, + 0xBE, 0x4F, 0x8C, 0xED, 0x30, 0x63, 0xA7, 0x88, + 0x93, 0xED, 0x37, 0x3C, 0x80, 0xBC, 0xD1, 0x66, + 0xBD, 0xB8, 0x2E, 0x65, 0xC4, 0xC8, 0x00, 0x5B, + 0xE7, 0x85, 0x96, 0xDD, 0xAA, 0x05, 0xE6, 0x4F, + 0x03, 0x64, 0xFA, 0x2D, 0xF6, 0x88, 0x14, 0x8F, + 0x15, 0x4D, 0xFD, 0xD3 + }; + size_t keylen = 260; + +#ifdef HAVE_EVP_MD_CTX_NEW + ctx = EVP_MD_CTX_new(); +#else + ctx = (EVP_MD_CTX*)malloc(sizeof(*ctx)); + if(ctx) EVP_MD_CTX_init(ctx); +#endif + if(!ctx) return 0; + + evp_key = sldns_key_rsa2pkey_raw(key, keylen); + if(!evp_key) { +#ifdef HAVE_EVP_MD_CTX_NEW + EVP_MD_CTX_destroy(ctx); +#else + EVP_MD_CTX_cleanup(ctx); + free(ctx); +#endif + return 0; + } + +#ifndef HAVE_EVP_DIGESTVERIFY + (void)evp_key; /* not used */ + if(EVP_DigestInit(ctx, EVP_sha1()) == 0) +#else + if(EVP_DigestVerifyInit(ctx, NULL, EVP_sha1(), NULL, evp_key) == 0) +#endif + { + unsigned long e = ERR_get_error(); +#ifdef EVP_R_INVALID_DIGEST + if (ERR_GET_LIB(e) == ERR_LIB_EVP && + ERR_GET_REASON(e) == EVP_R_INVALID_DIGEST) { + /* rh-allow-sha1-signatures makes use of sha1 invalid. */ + if(vsig) + printf("Detected that rh-allow-sha1-signatures is off, and disables SHA1 signatures\n"); +#ifdef HAVE_EVP_MD_CTX_NEW + EVP_MD_CTX_destroy(ctx); +#else + EVP_MD_CTX_cleanup(ctx); + free(ctx); +#endif + EVP_PKEY_free(evp_key); + return 1; + } +#endif /* EVP_R_INVALID_DIGEST */ + /* The signature verify failed for another reason. */ + log_crypto_err_code("EVP_DigestVerifyInit", e); +#ifdef HAVE_EVP_MD_CTX_NEW + EVP_MD_CTX_destroy(ctx); +#else + EVP_MD_CTX_cleanup(ctx); + free(ctx); +#endif + EVP_PKEY_free(evp_key); + return 0; + } +#ifdef HAVE_EVP_MD_CTX_NEW + EVP_MD_CTX_destroy(ctx); +#else + EVP_MD_CTX_cleanup(ctx); + free(ctx); +#endif + EVP_PKEY_free(evp_key); + return 0; +} +#endif /* HAVE_SSL && USE_SHA1 */ + void verify_test(void) { unit_show_feature("signature verify"); + +#if defined(HAVE_SSL) && defined(USE_SHA1) + if(rh_allow_sha1_signatures_disabled()) { + /* Allow the use of SHA1 signatures for the test, + * in case that OpenSSL disallows use of RSASHA1 + * with rh-allow-sha1-signatures disabled. */ +#ifndef UB_ON_WINDOWS + setenv("OPENSSL_ENABLE_SHA1_SIGNATURES", "1", 0); +#else + _putenv("OPENSSL_ENABLE_SHA1_SIGNATURES=1"); +#endif + } +#endif + #ifdef USE_SHA1 verifytest_file(SRCDIRSTR "/testdata/test_signatures.1", "20070818005004"); #endif diff --git a/contrib/unbound/testcode/unitzonemd.c b/contrib/unbound/testcode/unitzonemd.c index 63dc13edab33..0420b0361590 100644 --- a/contrib/unbound/testcode/unitzonemd.c +++ b/contrib/unbound/testcode/unitzonemd.c @@ -267,6 +267,7 @@ static void zonemd_verify_test(char* zname, char* zfile, char* tastr, env.cfg = config_create(); if(!env.cfg) fatal_exit("out of memory"); + config_auto_slab_values(env.cfg); env.now = &now; env.cfg->val_date_override = cfg_convert_timeval(date_override); if(!env.cfg->val_date_override) diff --git a/contrib/unbound/testdata/auth_nsec3_ent_with_out_of_zone_data.rpl b/contrib/unbound/testdata/auth_nsec3_ent_with_out_of_zone_data.rpl new file mode 100644 index 000000000000..3381515659b0 --- /dev/null +++ b/contrib/unbound/testdata/auth_nsec3_ent_with_out_of_zone_data.rpl @@ -0,0 +1,228 @@ +; config options +server: + target-fetch-policy: "0 0 0 0 0" + +auth-zone: + name: "unbound-auth-test.nlnetlabs.nl." + ## zonefile (or none). + ## zonefile: "example.com.zone" + ## master by IP address or hostname + ## can list multiple masters, each on one line. + ## master: + ## url for http fetch + ## url: + ## queries from downstream clients get authoritative answers. + ## for-downstream: yes + for-downstream: yes + ## queries are used to fetch authoritative answers from this zone, + ## instead of unbound itself sending queries there. + ## for-upstream: yes + for-upstream: yes + ## on failures with for-upstream, fallback to sending queries to + ## the authority servers + ## fallback-enabled: no + + ## this line generates zonefile: \n"/tmp/xxx.example.com"\n + zonefile: +TEMPFILE_NAME unbound-auth-test.nlnetlabs.nl + ## this is the inline file /tmp/xxx.unbound-auth-test.nlnetlabs.nl + ## the tempfiles are deleted when the testrun is over. +TEMPFILE_CONTENTS unbound-auth-test.nlnetlabs.nl +;; Zone: unbound-auth-test.nlnetlabs.nl. +; +unbound-auth-test.nlnetlabs.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 1554201247 14400 3600 604800 3600 +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG SOA 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. NLFcC2oet+HC+1dhT4D/2JJFIcMiRtTM81KwvT7u8ybF3iDE4bnyrILvQk8DsizpYKwk+D3J3tMC3TV5+//qFw== +;; Out of zone record that shouldn't break NSEC3 proofs. +;; There was a bug that would keep removing labels and use this out of zone +;; record. +nlnetlabs.nl. 3600 IN NS ns.nlnetlabs.nl. +; +unbound-auth-test.nlnetlabs.nl. 3600 IN NS ns.nlnetlabs.nl. +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NS 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. Gm0UF77ljiInG4/HZ6Tkzx7z9N45WwwmbBt9KxeN3z1BkdBLiy10Du71ZBFLP71b+USs1rv5SJQ0hteZFbl8sg== +unbound-auth-test.nlnetlabs.nl. 3600 IN DNSKEY 256 3 13 S3Da9HqpFj0pEbI8WXOdkvN3vgZ6qxNSz4XyKkmWWAG28kq5T+/lWp36DUDvnMI9wJNuixzUHtgZ6oZoAaVrPg== ;{id = 15486 (zsk), size = 256b} +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG DNSKEY 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. 1cLFaDb6kP8KnRJujW1ieHUdS5Tgdv59TCZ+FloCRJMJBwQAow6UKAIY7HHlTb8IHTajyUrjlxX/dN8S/5VwuA== +unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3PARAM 1 0 1 - +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3PARAM 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. GWgtJArNpfJ4ifoinUBUVRTlkk0CMemdozhMKY13dk3EQMP0jb4g49PcTAgEP2dBUs9efttQVQQpmFPyTGfN1w== +tvdhfml24jp7cott1qijj9812qu9ibh3.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - 41pcah2j3fr8k99gj5pveh4igrjfc871 NS SOA RRSIG DNSKEY NSEC3PARAM ;{ flags: -, from: unbound-auth-test.nlnetlabs.nl. to: b.b.unbound-auth-test.nlnetlabs.nl.} +tvdhfml24jp7cott1qijj9812qu9ibh3.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. DzwQTaZj4j29eHXEKllIFcq4yNWA7VMqkh8+gCrBO+GEek9+hGxL6ANsU0Hv6glyBmPDeYUZcy4xy0EEj1R4hQ== +; +;; Empty nonterminal: b.unbound-auth-test.nlnetlabs.nl. +apejmh1fqds9gir0nnsf4d5gtno10tg1.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - dbs0aj50410urbvt3ghfr644n7h06gs5 ;{ flags: -, from: b.unbound-auth-test.nlnetlabs.nl. to: c.b.unbound-auth-test.nlnetlabs.nl.} +apejmh1fqds9gir0nnsf4d5gtno10tg1.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. m9B0W8xDZF6ml/m8OujrZZBiF1O0wAeKciK/5FMT/hCjHR0hMrbXBPg/ZntpVJD/Pko2HcBvWKu87U721yTHyQ== +; +;; Empty nonterminal: a.b.unbound-auth-test.nlnetlabs.nl. +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - tvdhfml24jp7cott1qijj9812qu9ibh3 ;{ flags: -, from: a.b.unbound-auth-test.nlnetlabs.nl. to: unbound-auth-test.nlnetlabs.nl.} +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. Jr1oPPs+DGBVV13n4gG4AGVFsleItluLbtCIyQDcYZEA+e5JMkrLzfW3rXqXaUSUauR4iEu5FmTfs4GTsumdUw== +; +*.a.b.unbound-auth-test.nlnetlabs.nl. 3600 IN TXT "*.a.b" +*.a.b.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG TXT 13 5 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. NrMUaNzZp88lXit/HLL/iDBHspDSfoM//K+/0VwUYRZjmVJQQHCHtHBGgR4NgrLi3ffvCAWq2LNGxDm+YMSl3g== +jrtu61ssgd18lfjglqrbbs5b2vmbh6cl.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - k8r2bchsbehs5dbu5d6ivjfnmjb3jc8s TXT RRSIG ;{ flags: -, from: *.a.b.unbound-auth-test.nlnetlabs.nl. to: *.c.b.unbound-auth-test.nlnetlabs.nl.} +jrtu61ssgd18lfjglqrbbs5b2vmbh6cl.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. kLIhE9+iz1OybJwXbtRJZst+Mk5u4OAtpZGWSwJUfqD6dXAk+h6msKAR18jpPeL7cCjXjIAKIv3x4oYRkl+uKw== +; +;; Empty nonterminal: b.b.unbound-auth-test.nlnetlabs.nl. +41pcah2j3fr8k99gj5pveh4igrjfc871.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - apejmh1fqds9gir0nnsf4d5gtno10tg1 ;{ flags: -, from: b.b.unbound-auth-test.nlnetlabs.nl. to: b.unbound-auth-test.nlnetlabs.nl.} +41pcah2j3fr8k99gj5pveh4igrjfc871.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. XlIjnuF313w0GXn6vymrAcsyuxZSaN6IShFjxQ5T2HUFePHBNvtRkL+TtMQZNlR8nTR3+MWcON0cOZIGjVCCjg== +; +*.b.b.unbound-auth-test.nlnetlabs.nl. 3600 IN TXT "*.b.b" +*.b.b.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG TXT 13 5 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. FkS3ceWpoHyOKaa8OtywIl148Bwo0vkzBd263vqYe0puhuRa6IvNEk5ERdwfWt9eNEq+6IlizPT/dYxA2fXYXA== +ft7dasbom0copm9e2ak9k151dj08kjfs.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - jrtu61ssgd18lfjglqrbbs5b2vmbh6cl TXT RRSIG ;{ flags: -, from: *.b.b.unbound-auth-test.nlnetlabs.nl. to: *.a.b.unbound-auth-test.nlnetlabs.nl.} +ft7dasbom0copm9e2ak9k151dj08kjfs.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. 5QhLGohTRLQSGC8vstzDjqcwfrbOnLUG2OelSjvsZFy1smsWUxJBCQXQdx1+JX7xamZHlZESQtS+cELuZUqpvA== +; +;; Empty nonterminal: c.b.unbound-auth-test.nlnetlabs.nl. +dbs0aj50410urbvt3ghfr644n7h06gs5.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - ft7dasbom0copm9e2ak9k151dj08kjfs ;{ flags: -, from: c.b.unbound-auth-test.nlnetlabs.nl. to: *.b.b.unbound-auth-test.nlnetlabs.nl.} +dbs0aj50410urbvt3ghfr644n7h06gs5.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. hjk1foJWW68JK3O1Ktf0ZogoXVrMDw3mHVBBYTrpaBKX1gWR5icmJiOCYZWYx3z88PUnGkfH+kx4oDUjioqN+Q== +; +*.c.b.unbound-auth-test.nlnetlabs.nl. 3600 IN TXT "*.c.b" +*.c.b.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG TXT 13 5 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. b7rFR5tlx5Y5SQqNdYBtfD6DrkNx9h79GCmnZfWrUzRz+A256k2v08IPRJDK+WxEHuYHjfNnVWxjRr9M1OW2Iw== +k8r2bchsbehs5dbu5d6ivjfnmjb3jc8s.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - toqivctpt4pdcp5g19neqt19fvtgbgeu TXT RRSIG ;{ flags: -, from: *.c.b.unbound-auth-test.nlnetlabs.nl. to: a.b.unbound-auth-test.nlnetlabs.nl.} +k8r2bchsbehs5dbu5d6ivjfnmjb3jc8s.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. 34BS1ajedCNdfXgUfxTyiAK1ichfFLshhJ3TnfplrUps0UsZaQLEG+EIlP4wTBtro2c6V8YCSmOuxuce4gYoDw== +; +TEMPFILE_END + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test authority zone with NSEC3 empty nonterminal +; with exact match NSEC3 in existence (eg. not a CE-proof) + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION ANSWER +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.44 +ENTRY_END +RANGE_END + +; ns.example.net. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.44 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.net. IN NS +SECTION ANSWER +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +ns.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN A +SECTION ANSWER +ns.example.net. IN A 1.2.3.44 +SECTION AUTHORITY +example.net. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN AAAA +SECTION AUTHORITY +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +www.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +a.b.unbound-auth-test.nlnetlabs.nl. IN TXT +ENTRY_END + +; recursion happens here. +STEP 20 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR AA RD RA DO NOERROR +SECTION QUESTION +a.b.unbound-auth-test.nlnetlabs.nl. IN TXT +SECTION ANSWER +SECTION AUTHORITY +unbound-auth-test.nlnetlabs.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 1554201247 14400 3600 604800 3600 +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG SOA 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. NLFcC2oet+HC+1dhT4D/2JJFIcMiRtTM81KwvT7u8ybF3iDE4bnyrILv Qk8DsizpYKwk+D3J3tMC3TV5+//qFw== +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - TVDHFML24JP7COTT1QIJJ9812QU9IBH3 +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. Jr1oPPs+DGBVV13n4gG4AGVFsleItluLbtCIyQDcYZEA+e5JMkrLzfW3 rXqXaUSUauR4iEu5FmTfs4GTsumdUw== +ENTRY_END + +SCENARIO_END diff --git a/contrib/unbound/testdata/auth_nsec3_wild_with_out_of_zone_data.rpl b/contrib/unbound/testdata/auth_nsec3_wild_with_out_of_zone_data.rpl new file mode 100644 index 000000000000..8c5a00861021 --- /dev/null +++ b/contrib/unbound/testdata/auth_nsec3_wild_with_out_of_zone_data.rpl @@ -0,0 +1,234 @@ +; config options +server: + target-fetch-policy: "0 0 0 0 0" + +auth-zone: + name: "test-ns-signed.dev.internet.nl." + ## zonefile (or none). + ## zonefile: "example.com.zone" + ## master by IP address or hostname + ## can list multiple masters, each on one line. + ## master: + ## url for http fetch + ## url: + ## queries from downstream clients get authoritative answers. + ## for-downstream: yes + for-downstream: yes + ## queries are used to fetch authoritative answers from this zone, + ## instead of unbound itself sending queries there. + ## for-upstream: yes + for-upstream: yes + ## on failures with for-upstream, fallback to sending queries to + ## the authority servers + ## fallback-enabled: no + + ## this line generates zonefile: \n"/tmp/xxx.example.com"\n + zonefile: +TEMPFILE_NAME test-ns-signed.dev.internet.nl + ## this is the inline file /tmp/xxx.test-ns-signed.dev.internet.nl + ## the tempfiles are deleted when the testrun is over. +TEMPFILE_CONTENTS test-ns-signed.dev.internet.nl +test-ns-signed.dev.internet.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 4 14400 3600 604800 3600 +test-ns-signed.dev.internet.nl. 3600 IN RRSIG SOA 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. ybb0Hc7NC+QOFEEv4cX2+Umlk+miiOAHmeP2Uwvg6lqfxkk+3g7yWBEKMinXjLKz0odWZ6fki6M/3yBPQX8SV0OCRY5gYvAHAjbxAIHozIM+5iwOkRQhNF1DRgQ3BLjL93f6T5e5Z4y1812iOpu4GYswXW/UTOZACXz2UiaCPAg= +;; Out of zone record that shouldn't break NSEC3 proofs. +;; There was a bug that would keep removing labels and use this out of zone +;; record. +dev.internet.nl. 3600 IN NS ns.test-ns-signed.dev.internet.nl. +test-ns-signed.dev.internet.nl. 3600 IN NS ns.test-ns-signed.dev.internet.nl. +test-ns-signed.dev.internet.nl. 3600 IN RRSIG NS 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. KqiwTF3hKm1ZHGbgx6MVzZYHlS1p7+Xrikx4izMHFbWiD6ki6lrJBJsnH9j/hH1cwHxjXslOeJh0hdBdbn8la0meZPsebOyUbEjoLPzRLzKNLDBuA4BUJnRGQJy21CX7XooXAMAmR8YFipO8CojI9EogU2m2o9YkfbpacFWQoTk= +test-ns-signed.dev.internet.nl. 3600 IN DNSKEY 256 3 8 AwEAAc6c8tpMXBSOFLu/9n4aUUDK43wN4B7A2UDqZi0IOkyptxWCFghleyZeeN5uq6p9MoUt8lS73mFmIYC0ux5zBO3uVaJQ9u+00qRAEVg/RgBwa58y2f/zNtFV/f7mBSPcPTiEjUh0bwHSiTvUn/8JkrvjyAcbQMO0YOsRof5q6tzl ;{id = 32784 (zsk), size = 1024b} +test-ns-signed.dev.internet.nl. 3600 IN DNSKEY 257 3 8 AwEAAdC0hBJP1U8lbZ6JFXn0ouK6VipiraN7I8oog62SuEd/fqAupys7A/Ih6WK/UoJorjlnccEL8euNMaS4kNogvoBrFx8ciIWKcbot5mtwc4WDr3cnR+HIZNCUFVkIxsMqE7HCD0yn0zhkB60shED+ZHs8zpyU+cjnsOSizxOnIY+F ;{id = 54502 (ksk), size = 1024b} +test-ns-signed.dev.internet.nl. 3600 IN RRSIG DNSKEY 8 4 3600 20190205132351 20190108132351 54502 test-ns-signed.dev.internet.nl. X3qN+plfjf45FA4pr/tcUqUCR9ajDqwtNe4TS19WOJogVL/Gf/N5/ToOCrs3s+a7VrJl58WvSJquDM8xAS8f4oJggKgHFhopce8tMTGRxkRvJo4y+tt3vCveh/zjHLAnbOaBGA4CJ/IPhRqzHzcX/SjSv0EACWd6XpQIWogRv6c= +test-ns-signed.dev.internet.nl. 3600 IN NSEC3PARAM 1 0 1 - +test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3PARAM 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. A/1xUGO46uIz+9vjPGfWVD99akwU9bd/UlnVG9LPfoTzG7TMWSoZ4ksg8k8ub8K1TrkDmQokNHSW0Gt6qwoRh17c+p1h/SFlDVL83wgTc4NqG43OQjgGU9RV035XU+VESlO3lavifhlu8rHWBJTlhiXcMGq6H+zvoz4sx9p5GNM= +93stp7o7i5n9gb83uu7vv6h8qltk14ig.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - fee0c2kfhi6bnljce6vehaenqq3pbupu NS SOA RRSIG DNSKEY NSEC3PARAM +93stp7o7i5n9gb83uu7vv6h8qltk14ig.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. YoTRDQ7sSvERcY1WwAH4oRRR7DmaAwA8/H70jdMeSU4wsnM/VM03kDcc2sgq5edmHiZoTWnq7nEb/1Y7Ro0YrqTUQdYFZvXi6UjZQrKI9nqAGnhdXZWlZJHmYpn2+2Emd+bYHkwvKaPnfnnKjUoGVBH8Hly0HBYKPUF1/viquB0= +kl94uofq16t2vlq0bmampf6e4o9k5hbi.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - 7ag3p2pfrvq09dpn63cvga8ub1rnrrg1 +kl94uofq16t2vlq0bmampf6e4o9k5hbi.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. NI5zJ/k1kPVZ1abms5OoME/wazb77Ltduyk6ZevAnt4tKydZYwSsjEd0Ixknw9xnakCABn5rAYEXctARN0KCwCkNHR7TYlTAJT14hlDYjbad2u2HT9L1kzAnfj3BeLZl/LRADeMbTtzrkTSF3Dnezurb94fMnUnKt2hPfQfj560= +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. WIb3ISP1nlafbyWoWa4z7sG5IS+V86PyvEMHdD/64hgsFkrCu483XK7VNnBz28SL/631JXA1R19O+UxeWhTUyctp8QSt6cEZcMPY8b7yG97rNFNvhSw75rSXXt+JwgIYHPHQV5oqPtVmEpQM5SfJd+hs+Nn1bJcWB3UaESNNAMQ= +*.a.b.test-ns-signed.dev.internet.nl. 3600 IN TXT "a" +*.a.b.test-ns-signed.dev.internet.nl. 3600 IN RRSIG TXT 8 6 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. eNcJkQXdTO1z21od0sXbgqtABhhr/9tNC/Zx8zYbhXkfj7rufN71yk9xqgu6TG0MeJV26ISrqIGRVFJFmTRvO1LLxoKkEPhqe+08nqRztxXZajCV+dDeFoGIDcXJg6tAxB+MJznkKDtZPpIWvyt1WwdYfcMrGtE9AmR3K1/P/xE= +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - 93stp7o7i5n9gb83uu7vv6h8qltk14ig TXT RRSIG +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. gtxoiTa3FRUqoRLvkWSxmWQ+DfijVd26gpKH3+GmGIcNB/sr/Cf8kERRwVVHvgzYIcvdJcys5b2LUXnZJwcdAlx7efZPWgNZzWxJrw6ES25LCWJOrp31isWn9FlAZGIbnpyEXxD2apBSmtyPnKbTgU6lHHS9jrsYHu4G8Zouv3k= +ns.test-ns-signed.dev.internet.nl. 3600 IN A 185.49.141.11 +ns.test-ns-signed.dev.internet.nl. 3600 IN RRSIG A 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. F9sXEVAmlRn+/84WbuvegiCwstNxMDMQLl0Obv2CTPpee4U6psbmXrlzczjjjkE6aLjsIHYdcXCzEWTrmukT+V9jzaGPRJvxNvC0ASWyzggAoh0Z++Hl4cVa9587o6I9ODayehFI9Pgdem+RVdb4zlWuzi9FmKXgeTlgWN54tPg= +ns.test-ns-signed.dev.internet.nl. 3600 IN AAAA 2a04:b900:0:100::11 +ns.test-ns-signed.dev.internet.nl. 3600 IN RRSIG AAAA 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. F1XRrx/QgfzJ1RS7d0m23QoIPx1G8WL1SrlTOm7pk5vWTL07w7HEw2TETblkjnitJGKfN9ebsIum/cDPUZc3UqLkguP2UCWpePnlllTJuwmG0Z+wyINIR4xF4PQlqttvzThBkD2JKWb/o0W8dQyXTj+jJ1vCZ0NjjA2N4+iJIQE= +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - kl94uofq16t2vlq0bmampf6e4o9k5hbi A AAAA RRSIG +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. xLysIqn3r3rdHE3GvwVjZwUyuFClhkhgrQdwyc66RuHKE3MfSuhVr9cHTCJzhipF5TwQTbUpLOr74r99bzdiIY8Xkgjy2M0nc76v1ObSGJdPPjGTevbhDOnavUURwOR/q0NqqO2iPrgFjOVMZ+8uwRJtCty2iAVZfVG+qDzs8hU= +TEMPFILE_END + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test authority zone with NSEC3 wildcard + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION ANSWER +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.44 +ENTRY_END +RANGE_END + +; ns.example.net. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.44 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.net. IN NS +SECTION ANSWER +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +ns.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN A +SECTION ANSWER +ns.example.net. IN A 1.2.3.44 +SECTION AUTHORITY +example.net. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN AAAA +SECTION AUTHORITY +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +www.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN TXT +ENTRY_END + +; recursion happens here. +STEP 20 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR AA RD RA DO NOERROR +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN TXT +SECTION ANSWER +something.a.b.test-ns-signed.dev.internet.nl. IN TXT "a" +something.a.b.test-ns-signed.dev.internet.nl. 3600 IN RRSIG TXT 8 6 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. eNcJkQXdTO1z21od0sXbgqtABhhr/9tNC/Zx8zYbhXkfj7rufN71yk9xqgu6TG0MeJV26ISrqIGRVFJFmTRvO1LLxoKkEPhqe+08nqRztxXZajCV+dDeFoGIDcXJg6tAxB+MJznkKDtZPpIWvyt1WwdYfcMrGtE9AmR3K1/P/xE= +SECTION AUTHORITY +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - KL94UOFQ16T2VLQ0BMAMPF6E4O9K5HBI A AAAA RRSIG +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. xLysIqn3r3rdHE3GvwVjZwUyuFClhkhgrQdwyc66RuHKE3MfSuhVr9cHTCJzhipF5TwQTbUpLOr74r99bzdiIY8Xkgjy2M0nc76v1ObSGJdPPjGTevbhDOnavUURwOR/q0NqqO2iPrgFjOVMZ+8uwRJtCty2iAVZfVG+qDzs8hU= +ENTRY_END + +; Check that the reply for a wildcard nodata answer contains the NSEC3s. +; qname denial NSEC3, closest encloser NSEC3, and type bitmap NSEC3. +STEP 30 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN AAAA +ENTRY_END + +STEP 40 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR AA RD RA DO NOERROR +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN AAAA +SECTION ANSWER +SECTION AUTHORITY +test-ns-signed.dev.internet.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 4 14400 3600 604800 3600 +test-ns-signed.dev.internet.nl. 3600 IN RRSIG SOA 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. ybb0Hc7NC+QOFEEv4cX2+Umlk+miiOAHmeP2Uwvg6lqfxkk+3g7yWBEKMinXjLKz0odWZ6fki6M/3yBPQX8SV0OCRY5gYvAHAjbxAIHozIM+5iwOkRQhNF1DRgQ3BLjL93f6T5e5Z4y1812iOpu4GYswXW/UTOZACXz2UiaCPAg= ;{id = 32784} +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - 93stp7o7i5n9gb83uu7vv6h8qltk14ig TXT RRSIG +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. gtxoiTa3FRUqoRLvkWSxmWQ+DfijVd26gpKH3+GmGIcNB/sr/Cf8kERRwVVHvgzYIcvdJcys5b2LUXnZJwcdAlx7efZPWgNZzWxJrw6ES25LCWJOrp31isWn9FlAZGIbnpyEXxD2apBSmtyPnKbTgU6lHHS9jrsYHu4G8Zouv3k= ;{id = 32784} +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. WIb3ISP1nlafbyWoWa4z7sG5IS+V86PyvEMHdD/64hgsFkrCu483XK7VNnBz28SL/631JXA1R19O+UxeWhTUyctp8QSt6cEZcMPY8b7yG97rNFNvhSw75rSXXt+JwgIYHPHQV5oqPtVmEpQM5SfJd+hs+Nn1bJcWB3UaESNNAMQ= ;{id = 32784} +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - kl94uofq16t2vlq0bmampf6e4o9k5hbi A AAAA RRSIG +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. xLysIqn3r3rdHE3GvwVjZwUyuFClhkhgrQdwyc66RuHKE3MfSuhVr9cHTCJzhipF5TwQTbUpLOr74r99bzdiIY8Xkgjy2M0nc76v1ObSGJdPPjGTevbhDOnavUURwOR/q0NqqO2iPrgFjOVMZ+8uwRJtCty2iAVZfVG+qDzs8hU= ;{id = 32784} +ENTRY_END + +SCENARIO_END diff --git a/contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl b/contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl new file mode 100644 index 000000000000..72dd441f50a3 --- /dev/null +++ b/contrib/unbound/testdata/iter_fwdfirstequaltcp.rpl @@ -0,0 +1,163 @@ +; config options +server: + target-fetch-policy: "0 0 0 0 0" + minimal-responses: no + tcp-upstream: no + #tls-upstream:no # same case but not testable in rpl. + +# Builtin hints work similar to this explicit '.' stub-zone. +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. + +forward-zone: + name: "." + forward-addr: 1.2.3.6 # failing resolver + forward-first: yes + forward-tcp-upstream: yes + #forward-tls-upstream:yes # same case but not testable in rpl. + +CONFIG_END + +SCENARIO_BEGIN Test forward-first directive in forward zone configured with explicit tcp upstream next to an equal stub name. + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH UDP opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH UDP opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN A +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH UDP opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION ANSWER +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END + +ENTRY_BEGIN +MATCH UDP opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN A +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.4 +ENTRY_BEGIN +MATCH UDP opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH UDP opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; local resolver (that fails a lot) +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.6 + +ENTRY_BEGIN +MATCH TCP opcode qtype qname +ADJUST copy_id +REPLY QR RA SERVFAIL +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +;example.com. IN NS ns.example.com. +SECTION ADDITIONAL +;ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH TCP opcode qtype qname +ADJUST copy_id +REPLY QR RA SERVFAIL +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +;www.example.com. IN A 10.20.30.50 +SECTION AUTHORITY +;example.com. IN NS ns.example.com. +SECTION ADDITIONAL +;ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +www.example.com. IN A +ENTRY_END + +; recursion happens here. +STEP 10 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +SCENARIO_END diff --git a/contrib/unbound/testdata/iter_minimise_chain.rpl b/contrib/unbound/testdata/iter_minimise_chain.rpl new file mode 100644 index 000000000000..97fefaf952aa --- /dev/null +++ b/contrib/unbound/testdata/iter_minimise_chain.rpl @@ -0,0 +1,623 @@ +; config options +server: + target-fetch-policy: "0 0 0 0 0" + qname-minimisation: yes + max-query-restarts: 11 + max-global-quota: 120 + +stub-zone: + name: "." + stub-addr: 193.0.14.129 +CONFIG_END + +SCENARIO_BEGIN Test qname minimisation and long cname chain. + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 1000 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 1000 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +com. IN A +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 0 1000 + ADDRESS 1.2.3.4 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain1.example.com. IN CNAME +SECTION ANSWER +chain1.example.com. IN CNAME chain2.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain2.example.com. IN CNAME +SECTION ANSWER +chain2.example.com. IN CNAME chain3.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain3.example.com. IN CNAME +SECTION ANSWER +chain3.example.com. IN CNAME chain4.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain4.example.com. IN CNAME +SECTION ANSWER +chain4.example.com. IN CNAME chain5.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain5.example.com. IN CNAME +SECTION ANSWER +chain5.example.com. IN CNAME chain6.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain6.example.com. IN CNAME +SECTION ANSWER +chain6.example.com. IN CNAME chain7.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain7.example.com. IN CNAME +SECTION ANSWER +chain7.example.com. IN CNAME chain8.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain8.example.com. IN CNAME +SECTION ANSWER +chain8.example.com. IN CNAME chain9.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain9.example.com. IN CNAME +SECTION ANSWER +chain9.example.com. IN CNAME chain10.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain10.example.com. IN CNAME +SECTION ANSWER +chain10.example.com. IN CNAME chain11.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain11.example.com. IN CNAME +SECTION ANSWER +chain11.example.com. IN CNAME chain12.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain12.example.com. IN CNAME +SECTION ANSWER +chain12.example.com. IN CNAME chain13.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain13.example.com. IN CNAME +SECTION ANSWER +chain13.example.com. IN CNAME chain14.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain14.example.com. IN CNAME +SECTION ANSWER +chain14.example.com. IN CNAME chain15.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain15.example.com. IN CNAME +SECTION ANSWER +chain15.example.com. IN CNAME chain16.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain16.example.com. IN CNAME +SECTION ANSWER +chain16.example.com. IN CNAME chain17.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain17.example.com. IN CNAME +SECTION ANSWER +chain17.example.com. IN CNAME chain18.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain18.example.com. IN CNAME +SECTION ANSWER +chain18.example.com. IN CNAME chain19.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain19.example.com. IN CNAME +SECTION ANSWER +chain19.example.com. IN CNAME chain20.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain20.example.com. IN CNAME +SECTION ANSWER +chain20.example.com. IN CNAME chain21.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain21.example.com. IN CNAME +SECTION ANSWER +chain21.example.com. IN CNAME chain22.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain22.example.com. IN CNAME +SECTION ANSWER +chain22.example.com. IN CNAME chain23.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain23.example.com. IN CNAME +SECTION ANSWER +chain23.example.com. IN CNAME chain24.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain24.example.com. IN CNAME +SECTION ANSWER +chain24.example.com. IN CNAME chain25.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain25.example.com. IN CNAME +SECTION ANSWER +chain25.example.com. IN CNAME chain26.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain26.example.com. IN CNAME +SECTION ANSWER +chain26.example.com. IN CNAME chain27.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain27.example.com. IN CNAME +SECTION ANSWER +chain27.example.com. IN CNAME chain28.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain28.example.com. IN CNAME +SECTION ANSWER +chain28.example.com. IN CNAME chain29.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain29.example.com. IN CNAME +SECTION ANSWER +chain29.example.com. IN CNAME chain30.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain30.example.com. IN CNAME +SECTION ANSWER +chain30.example.com. IN CNAME chain31.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain31.example.com. IN CNAME +SECTION ANSWER +chain31.example.com. IN CNAME chain32.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain32.example.com. IN CNAME +SECTION ANSWER +chain32.example.com. IN CNAME chain33.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain33.example.com. IN CNAME +SECTION ANSWER +chain33.example.com. IN CNAME chain34.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain34.example.com. IN CNAME +SECTION ANSWER +chain34.example.com. IN CNAME chain35.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain35.example.com. IN CNAME +SECTION ANSWER +chain35.example.com. IN CNAME chain36.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain36.example.com. IN CNAME +SECTION ANSWER +chain36.example.com. IN CNAME chain37.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain37.example.com. IN CNAME +SECTION ANSWER +chain37.example.com. IN CNAME chain38.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain38.example.com. IN CNAME +SECTION ANSWER +chain38.example.com. IN CNAME chain39.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain39.example.com. IN CNAME +SECTION ANSWER +chain39.example.com. IN CNAME chain40.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +chain40.example.com. IN CNAME +SECTION ANSWER +chain40.example.com. IN CNAME chain41.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +sub1.chain1.example.com. IN A +SECTION ANSWER +sub1.chain1.example.com. IN A 1.2.3.5 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +sub1.chain1.example.com. IN ANY +SECTION ANSWER +sub1.chain1.example.com. IN A 1.2.3.5 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +sub2.chain2.example.com. IN A +SECTION ANSWER +sub2.chain2.example.com. IN CNAME sub2-2.chain2.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qname +ADJUST copy_id copy_query +REPLY QR AA NOERROR +SECTION QUESTION +sub2-2.chain2.example.com. IN A +SECTION ANSWER +sub2-2.chain2.example.com. IN CNAME sub2-3.chain2.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +sub2-3.chain1.example.com. IN ANY +SECTION ANSWER +sub2-3.chain1.example.com. IN A 1.2.3.6 +ENTRY_END +RANGE_END + +STEP 10 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +chain1.example.com. IN A +ENTRY_END + +STEP 20 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA SERVFAIL +SECTION QUESTION +chain1.example.com. IN A +SECTION ANSWER +ENTRY_END + +STEP 30 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +chain13.example.com. IN ANY +ENTRY_END + +STEP 40 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +chain13.example.com. IN ANY +SECTION ANSWER +chain13.example.com. IN CNAME chain14.example.com. +ENTRY_END + +STEP 49 TIME_PASSES ELAPSE 7200 ; expire the previous records. +STEP 50 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +chain1.example.com. IN ANY +ENTRY_END + +STEP 60 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +chain1.example.com. IN ANY +SECTION ANSWER +chain1.example.com. IN CNAME chain2.example.com. +ENTRY_END + +STEP 69 TIME_PASSES ELAPSE 7200 ; expire the previous records. +STEP 70 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +sub1.chain1.example.com. IN ANY +ENTRY_END + +STEP 80 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +sub1.chain1.example.com. IN ANY +SECTION ANSWER +sub1.chain1.example.com. IN A 1.2.3.5 +ENTRY_END + +STEP 90 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +sub2.chain2.example.com. IN ANY +ENTRY_END + +STEP 100 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +sub2.chain2.example.com. IN ANY +SECTION ANSWER +sub2.chain2.example.com. IN CNAME sub2-2.chain2.example.com. +ENTRY_END + +SCENARIO_END diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/after.zone b/contrib/unbound/testdata/redis_reconnect_interval.tdir/after.zone new file mode 100644 index 000000000000..11c268f81497 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/after.zone @@ -0,0 +1,2 @@ +redis.com. IN SOA server. ma.il 1 2 3 4 5 +redis.com. IN A 2.2.2.2 diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/before.zone b/contrib/unbound/testdata/redis_reconnect_interval.tdir/before.zone new file mode 100644 index 000000000000..8e50c6267516 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/before.zone @@ -0,0 +1,2 @@ +redis.com. IN SOA server. ma.il 1 2 3 4 5 +redis.com. IN A 1.1.1.1 diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis.conf b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis.conf new file mode 100644 index 000000000000..3b80736e2438 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis.conf @@ -0,0 +1,583 @@ +### +### Settings for this test ################################################### +### + +# Accept connections on the specified port, default is 6379 (IANA #815344). +# If port 0 is specified Redis will not listen on a TCP socket. +port 0 + +# Unix socket. +# +# Specify the path for the Unix socket that will be used to listen for +# incoming connections. There is no default, so Redis will not listen +# on a unix socket when not specified. +# +unixsocket @SOCKET@ +# unixsocketperm 700 + +# By default Redis does not run as a daemon. Use 'yes' if you need it. +# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. +# When Redis is supervised by upstart or systemd, this parameter has no impact. +daemonize no + +# Specify the server verbosity level. +# This can be one of: +# debug (a lot of information, useful for development/testing) +# verbose (many rarely useful info, but not a mess like the debug level) +# notice (moderately verbose, what you want in production probably) +# warning (only very important / critical messages are logged) +# nothing (nothing is logged) +loglevel notice + +# Specify the log file name. Also the empty string can be used to force +# Redis to log on the standard output. Note that if you use standard +# output for logging but daemonize, logs will be sent to /dev/null +logfile @LOGFILE@ + +# To enable logging to the system logger, just set 'syslog-enabled' to yes, +# and optionally update the other syslog parameters to suit your needs. +syslog-enabled no + +# Set the number of databases. The default database is DB 0, you can select +# a different one on a per-connection basis using SELECT <dbid> where +# dbid is a number between 0 and 'databases'-1 +databases 2 + +# Snapshotting can be completely disabled with a single empty string argument +# as in following example: +# +save "" + +# The working directory. +# +# The DB will be written inside this directory, with the filename specified +# above using the 'dbfilename' configuration directive. +# +# The Append Only File will also be created inside this directory. +# +# Note that you must specify a directory here, not a file name. +dir . + +### +### Rest of the default Redis settings ####################################### +### + +bind 127.0.0.1 -::1 + +# When protected mode is on and the default user has no password, the server +# only accepts local connections from the IPv4 address (127.0.0.1), IPv6 address +# (::1) or Unix domain sockets. +protected-mode yes + +# TCP listen() backlog. +# +# In high requests-per-second environments you need a high backlog in order +# to avoid slow clients connection issues. Note that the Linux kernel +# will silently truncate it to the value of /proc/sys/net/core/somaxconn so +# make sure to raise both the value of somaxconn and tcp_max_syn_backlog +# in order to get the desired effect. +tcp-backlog 511 + +# Close the connection after a client is idle for N seconds (0 to disable) +timeout 0 + +# TCP keepalive. +# A reasonable value for this option is 300 seconds, which is the new +# Redis default starting with Redis 3.2.1. +tcp-keepalive 300 + +# By default Redis shows an ASCII art logo only when started to log to the +# standard output and if the standard output is a TTY and syslog logging is +# disabled. Basically this means that normally a logo is displayed only in +# interactive sessions. +# +# However it is possible to force the pre-4.0 behavior and always show a +# ASCII art logo in startup logs by setting the following option to yes. +always-show-logo no + +# By default, Redis modifies the process title (as seen in 'top' and 'ps') to +# provide some runtime information. It is possible to disable this and leave +# the process name as executed by setting the following to no. +set-proc-title yes + +# When changing the process title, Redis uses the following template to construct +# the modified title. +# +# Template variables are specified in curly brackets. The following variables are +# supported: +# +# {title} Name of process as executed if parent, or type of child process. +# {listen-addr} Bind address or '*' followed by TCP or TLS port listening on, or +# Unix socket if only that's available. +# {server-mode} Special mode, i.e. "[sentinel]" or "[cluster]". +# {port} TCP port listening on, or 0. +# {tls-port} TLS port listening on, or 0. +# {unixsocket} Unix domain socket listening on, or "". +# {config-file} Name of configuration file used. +# +proc-title-template "{title} {listen-addr} {server-mode}" + +# Set the local environment which is used for string comparison operations, and +# also affect the performance of Lua scripts. Empty String indicates the locale +# is derived from the environment variables. +#locale-collate "" + +# By default Redis will stop accepting writes if RDB snapshots are enabled +# (at least one save point) and the latest background save failed. +# This will make the user aware (in a hard way) that data is not persisting +# on disk properly, otherwise chances are that no one will notice and some +# disaster will happen. +# +# If the background saving process will start working again Redis will +# automatically allow writes again. +# +# However if you have setup your proper monitoring of the Redis server +# and persistence, you may want to disable this feature so that Redis will +# continue to work as usual even if there are problems with disk, +# permissions, and so forth. +stop-writes-on-bgsave-error yes + +# Compress string objects using LZF when dump .rdb databases? +# By default compression is enabled as it's almost always a win. +# If you want to save some CPU in the saving child set it to 'no' but +# the dataset will likely be bigger if you have compressible values or keys. +rdbcompression yes + +# Since version 5 of RDB a CRC64 checksum is placed at the end of the file. +# This makes the format more resistant to corruption but there is a performance +# hit to pay (around 10%) when saving and loading RDB files, so you can disable it +# for maximum performances. +# +# RDB files created with checksum disabled have a checksum of zero that will +# tell the loading code to skip the check. +rdbchecksum yes + +# The filename where to dump the DB +dbfilename redis.rdb + +# Remove RDB files used by replication in instances without persistence +# enabled. By default this option is disabled, however there are environments +# where for regulations or other security concerns, RDB files persisted on +# disk by masters in order to feed replicas, or stored on disk by replicas +# in order to load them for the initial synchronization, should be deleted +# ASAP. Note that this option ONLY WORKS in instances that have both AOF +# and RDB persistence disabled, otherwise is completely ignored. +# +# An alternative (and sometimes better) way to obtain the same effect is +# to use diskless replication on both master and replicas instances. However +# in the case of replicas, diskless is not always an option. +rdb-del-sync-files no + +# When a replica loses its connection with the master, or when the replication +# is still in progress, the replica can act in two different ways: +# +# 1) if replica-serve-stale-data is set to 'yes' (the default) the replica will +# still reply to client requests, possibly with out of date data, or the +# data set may just be empty if this is the first synchronization. +# +# 2) If replica-serve-stale-data is set to 'no' the replica will reply with error +# "MASTERDOWN Link with MASTER is down and replica-serve-stale-data is set to 'no'" +# to all data access commands, excluding commands such as: +# INFO, REPLICAOF, AUTH, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE, +# UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST, +# HOST and LATENCY. +# +replica-serve-stale-data yes + +# You can configure a replica instance to accept writes or not. Writing against +# a replica instance may be useful to store some ephemeral data (because data +# written on a replica will be easily deleted after resync with the master) but +# may also cause problems if clients are writing to it because of a +# misconfiguration. +# +# Since Redis 2.6 by default replicas are read-only. +# +# Note: read only replicas are not designed to be exposed to untrusted clients +# on the internet. It's just a protection layer against misuse of the instance. +# Still a read only replica exports by default all the administrative commands +# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve +# security of read only replicas using 'rename-command' to shadow all the +# administrative / dangerous commands. +replica-read-only yes + +# Replication SYNC strategy: disk or socket. +# +# New replicas and reconnecting replicas that are not able to continue the +# replication process just receiving differences, need to do what is called a +# "full synchronization". An RDB file is transmitted from the master to the +# replicas. +# +# The transmission can happen in two different ways: +# +# 1) Disk-backed: The Redis master creates a new process that writes the RDB +# file on disk. Later the file is transferred by the parent +# process to the replicas incrementally. +# 2) Diskless: The Redis master creates a new process that directly writes the +# RDB file to replica sockets, without touching the disk at all. +# +# With disk-backed replication, while the RDB file is generated, more replicas +# can be queued and served with the RDB file as soon as the current child +# producing the RDB file finishes its work. With diskless replication instead +# once the transfer starts, new replicas arriving will be queued and a new +# transfer will start when the current one terminates. +# +# When diskless replication is used, the master waits a configurable amount of +# time (in seconds) before starting the transfer in the hope that multiple +# replicas will arrive and the transfer can be parallelized. +# +# With slow disks and fast (large bandwidth) networks, diskless replication +# works better. +repl-diskless-sync yes + +# When diskless replication is enabled, it is possible to configure the delay +# the server waits in order to spawn the child that transfers the RDB via socket +# to the replicas. +# +# This is important since once the transfer starts, it is not possible to serve +# new replicas arriving, that will be queued for the next RDB transfer, so the +# server waits a delay in order to let more replicas arrive. +# +# The delay is specified in seconds, and by default is 5 seconds. To disable +# it entirely just set it to 0 seconds and the transfer will start ASAP. +repl-diskless-sync-delay 5 + +# When diskless replication is enabled with a delay, it is possible to let +# the replication start before the maximum delay is reached if the maximum +# number of replicas expected have connected. Default of 0 means that the +# maximum is not defined and Redis will wait the full delay. +#repl-diskless-sync-max-replicas 0 + +# ----------------------------------------------------------------------------- +# WARNING: Since in this setup the replica does not immediately store an RDB on +# disk, it may cause data loss during failovers. RDB diskless load + Redis +# modules not handling I/O reads may cause Redis to abort in case of I/O errors +# during the initial synchronization stage with the master. +# ----------------------------------------------------------------------------- +# +# Replica can load the RDB it reads from the replication link directly from the +# socket, or store the RDB to a file and read that file after it was completely +# received from the master. +# +# In many cases the disk is slower than the network, and storing and loading +# the RDB file may increase replication time (and even increase the master's +# Copy on Write memory and replica buffers). +# However, when parsing the RDB file directly from the socket, in order to avoid +# data loss it's only safe to flush the current dataset when the new dataset is +# fully loaded in memory, resulting in higher memory usage. +# For this reason we have the following options: +# +# "disabled" - Don't use diskless load (store the rdb file to the disk first) +# "swapdb" - Keep current db contents in RAM while parsing the data directly +# from the socket. Replicas in this mode can keep serving current +# dataset while replication is in progress, except for cases where +# they can't recognize master as having a data set from same +# replication history. +# Note that this requires sufficient memory, if you don't have it, +# you risk an OOM kill. +# "on-empty-db" - Use diskless load only when current dataset is empty. This is +# safer and avoid having old and new dataset loaded side by side +# during replication. +repl-diskless-load disabled + +# Master send PINGs to its replicas in a predefined interval. It's possible to +# change this interval with the repl_ping_replica_period option. The default +# value is 10 seconds. +# +# repl-ping-replica-period 10 + +# The following option sets the replication timeout for: +# +# 1) Bulk transfer I/O during SYNC, from the point of view of replica. +# 2) Master timeout from the point of view of replicas (data, pings). +# 3) Replica timeout from the point of view of masters (REPLCONF ACK pings). +# +# It is important to make sure that this value is greater than the value +# specified for repl-ping-replica-period otherwise a timeout will be detected +# every time there is low traffic between the master and the replica. The default +# value is 60 seconds. +# +# repl-timeout 60 + +# Disable TCP_NODELAY on the replica socket after SYNC? +# +# If you select "yes" Redis will use a smaller number of TCP packets and +# less bandwidth to send data to replicas. But this can add a delay for +# the data to appear on the replica side, up to 40 milliseconds with +# Linux kernels using a default configuration. +# +# If you select "no" the delay for data to appear on the replica side will +# be reduced but more bandwidth will be used for replication. +# +# By default we optimize for low latency, but in very high traffic conditions +# or when the master and replicas are many hops away, turning this to "yes" may +# be a good idea. +repl-disable-tcp-nodelay no + +# The replica priority is an integer number published by Redis in the INFO +# output. It is used by Redis Sentinel in order to select a replica to promote +# into a master if the master is no longer working correctly. +# +# A replica with a low priority number is considered better for promotion, so +# for instance if there are three replicas with priority 10, 100, 25 Sentinel +# will pick the one with priority 10, that is the lowest. +# +# However a special priority of 0 marks the replica as not able to perform the +# role of master, so a replica with priority of 0 will never be selected by +# Redis Sentinel for promotion. +# +# By default the priority is 100. +replica-priority 100 + +# ACL LOG +# +# The ACL Log tracks failed commands and authentication events associated +# with ACLs. The ACL Log is useful to troubleshoot failed commands blocked +# by ACLs. The ACL Log is stored in memory. You can reclaim memory with +# ACL LOG RESET. Define the maximum entry length of the ACL Log below. +acllog-max-len 128 + +lazyfree-lazy-eviction no +lazyfree-lazy-expire no +lazyfree-lazy-server-del no +replica-lazy-flush no + +# It is also possible, for the case when to replace the user code DEL calls +# with UNLINK calls is not easy, to modify the default behavior of the DEL +# command to act exactly like UNLINK, using the following configuration +# directive: +lazyfree-lazy-user-del no + +# FLUSHDB, FLUSHALL, SCRIPT FLUSH and FUNCTION FLUSH support both asynchronous and synchronous +# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the +# commands. When neither flag is passed, this directive will be used to determine +# if the data should be deleted asynchronously. +lazyfree-lazy-user-flush no + +# On Linux, it is possible to hint the kernel OOM killer on what processes +# should be killed first when out of memory. +# +# Enabling this feature makes Redis actively control the oom_score_adj value +# for all its processes, depending on their role. The default scores will +# attempt to have background child processes killed before all others, and +# replicas killed before masters. +# +# Redis supports these options: +# +# no: Don't make changes to oom-score-adj (default). +# yes: Alias to "relative" see below. +# absolute: Values in oom-score-adj-values are written as is to the kernel. +# relative: Values are used relative to the initial value of oom_score_adj when +# the server starts and are then clamped to a range of -1000 to 1000. +# Because typically the initial value is 0, they will often match the +# absolute values. +oom-score-adj no + +# When oom-score-adj is used, this directive controls the specific values used +# for master, replica and background child processes. Values range -2000 to +# 2000 (higher means more likely to be killed). +# +# Unprivileged processes (not root, and without CAP_SYS_RESOURCE capabilities) +# can freely increase their value, but not decrease it below its initial +# settings. This means that setting oom-score-adj to "relative" and setting the +# oom-score-adj-values to positive values will always succeed. +oom-score-adj-values 0 200 800 + +# Usually the kernel Transparent Huge Pages control is set to "madvise" or +# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which +# case this config has no effect. On systems in which it is set to "always", +# redis will attempt to disable it specifically for the redis process in order +# to avoid latency problems specifically with fork(2) and CoW. +# If for some reason you prefer to keep it enabled, you can set this config to +# "no" and the kernel global to "always". +disable-thp yes + +# By default Redis asynchronously dumps the dataset on disk. This mode is +# good enough in many applications, but an issue with the Redis process or +# a power outage may result into a few minutes of writes lost (depending on +# the configured save points). +# +# The Append Only File is an alternative persistence mode that provides +# much better durability. For instance using the default data fsync policy +# (see later in the config file) Redis can lose just one second of writes in a +# dramatic event like a server power outage, or a single write if something +# wrong with the Redis process itself happens, but the operating system is +# still running correctly. +# +# AOF and RDB persistence can be enabled at the same time without problems. +# If the AOF is enabled on startup Redis will load the AOF, that is the file +# with the better durability guarantees. +# +# Please check https://redis.io/topics/persistence for more information. +appendonly no + +# The following time is expressed in microseconds, so 1000000 is equivalent +# to one second. Note that a negative number disables the slow log, while +# a value of zero forces the logging of every command. +slowlog-log-slower-than 10000 + +# There is no limit to this length. Just be aware that it will consume memory. +# You can reclaim memory used by the slow log with SLOWLOG RESET. +slowlog-max-len 128 + +# By default latency monitoring is disabled since it is mostly not needed +# if you don't have latency issues, and collecting data has a performance +# impact, that while very small, can be measured under big load. Latency +# monitoring can easily be enabled at runtime using the command +# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed. +latency-monitor-threshold 0 + +# By default all notifications are disabled because most users don't need +# this feature and the feature has some overhead. Note that if you don't +# specify at least one of K or E, no events will be delivered. +notify-keyspace-events "" + +# Hashes are encoded using a memory efficient data structure when they have a +# small number of entries, and the biggest entry does not exceed a given +# threshold. These thresholds can be configured using the following directives. +#hash-max-listpack-entries 512 +#hash-max-listpack-value 64 + +# Lists are also encoded in a special way to save a lot of space. +# The number of entries allowed per internal list node can be specified +# as a fixed maximum size or a maximum number of elements. +# For a fixed maximum size, use -5 through -1, meaning: +# -5: max size: 64 Kb <-- not recommended for normal workloads +# -4: max size: 32 Kb <-- not recommended +# -3: max size: 16 Kb <-- probably not recommended +# -2: max size: 8 Kb <-- good +# -1: max size: 4 Kb <-- good +# Positive numbers mean store up to _exactly_ that number of elements +# per list node. +# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), +# but if your use case is unique, adjust the settings as necessary. +#list-max-listpack-size -2 + +# Lists may also be compressed. +# Compress depth is the number of quicklist ziplist nodes from *each* side of +# the list to *exclude* from compression. The head and tail of the list +# are always uncompressed for fast push/pop operations. Settings are: +# 0: disable all list compression +# 1: depth 1 means "don't start compressing until after 1 node into the list, +# going from either the head or tail" +# So: [head]->node->node->...->node->[tail] +# [head], [tail] will always be uncompressed; inner nodes will compress. +# 2: [head]->[next]->node->node->...->node->[prev]->[tail] +# 2 here means: don't compress head or head->next or tail->prev or tail, +# but compress all nodes between them. +# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail] +# etc. +list-compress-depth 0 + +# Sets have a special encoding when a set is composed +# of just strings that happen to be integers in radix 10 in the range +# of 64 bit signed integers. +# The following configuration setting sets the limit in the size of the +# set in order to use this special memory saving encoding. +set-max-intset-entries 512 + +# Sets containing non-integer values are also encoded using a memory efficient +# data structure when they have a small number of entries, and the biggest entry +# does not exceed a given threshold. These thresholds can be configured using +# the following directives. +#set-max-listpack-entries 128 +#set-max-listpack-value 64 + +# Similarly to hashes and lists, sorted sets are also specially encoded in +# order to save a lot of space. This encoding is only used when the length and +# elements of a sorted set are below the following limits: +#zset-max-listpack-entries 128 +#zset-max-listpack-value 64 + +# HyperLogLog sparse representation bytes limit. The limit includes the +# 16 bytes header. When a HyperLogLog using the sparse representation crosses +# this limit, it is converted into the dense representation. +# +# A value greater than 16000 is totally useless, since at that point the +# dense representation is more memory efficient. +# +# The suggested value is ~ 3000 in order to have the benefits of +# the space efficient encoding without slowing down too much PFADD, +# which is O(N) with the sparse encoding. The value can be raised to +# ~ 10000 when CPU is not a concern, but space is, and the data set is +# composed of many HyperLogLogs with cardinality in the 0 - 15000 range. +hll-sparse-max-bytes 3000 + +# Streams macro node max size / items. The stream data structure is a radix +# tree of big nodes that encode multiple items inside. Using this configuration +# it is possible to configure how big a single node can be in bytes, and the +# maximum number of items it may contain before switching to a new node when +# appending new stream entries. If any of the following settings are set to +# zero, the limit is ignored, so for instance it is possible to set just a +# max entries limit by setting max-bytes to 0 and max-entries to the desired +# value. +stream-node-max-bytes 4096 +stream-node-max-entries 100 + +# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in +# order to help rehashing the main Redis hash table (the one mapping top-level +# keys to values). The hash table implementation Redis uses (see dict.c) +# performs a lazy rehashing: the more operation you run into a hash table +# that is rehashing, the more rehashing "steps" are performed, so if the +# server is idle the rehashing is never complete and some more memory is used +# by the hash table. +# +# The default is to use this millisecond 10 times every second in order to +# actively rehash the main dictionaries, freeing memory when possible. +# +# If unsure: +# use "activerehashing no" if you have hard latency requirements and it is +# not a good thing in your environment that Redis can reply from time to time +# to queries with 2 milliseconds delay. +# +# use "activerehashing yes" if you don't have such hard requirements but +# want to free memory asap when possible. +activerehashing yes + +# The client output buffer limits can be used to force disconnection of clients +# that are not reading data from the server fast enough for some reason (a +# common reason is that a Pub/Sub client can't consume messages as fast as the +# publisher can produce them). +# +# Both the hard or the soft limit can be disabled by setting them to zero. +client-output-buffer-limit normal 0 0 0 +client-output-buffer-limit replica 256mb 64mb 60 +client-output-buffer-limit pubsub 32mb 8mb 60 + +# Redis calls an internal function to perform many background tasks, like +# closing connections of clients in timeout, purging expired keys that are +# never requested, and so forth. +# +# Not all tasks are performed with the same frequency, but Redis checks for +# tasks to perform according to the specified "hz" value. +# +# By default "hz" is set to 10. Raising the value will use more CPU when +# Redis is idle, but at the same time will make Redis more responsive when +# there are many keys expiring at the same time, and timeouts may be +# handled with more precision. +# +# The range is between 1 and 500, however a value over 100 is usually not +# a good idea. Most users should use the default of 10 and raise this up to +# 100 only in environments where very low latency is required. +hz 10 + +# When dynamic HZ is enabled, the actual configured HZ will be used +# as a baseline, but multiples of the configured HZ value will be actually +# used as needed once more clients are connected. In this way an idle +# instance will use very little CPU time while a busy instance will be +# more responsive. +dynamic-hz yes + +# When a child rewrites the AOF file, if the following option is enabled +# the file will be fsync-ed every 4 MB of data generated. This is useful +# in order to commit the file to the disk more incrementally and avoid +# big latency spikes. +aof-rewrite-incremental-fsync yes + +# When redis saves RDB file, if the following option is enabled +# the file will be fsync-ed every 4 MB of data generated. This is useful +# in order to commit the file to the disk more incrementally and avoid +# big latency spikes. +rdb-save-incremental-fsync yes + +# Jemalloc background thread for purging will be enabled by default +jemalloc-bg-thread yes diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.conf b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.conf new file mode 100644 index 000000000000..eb76de8db9f6 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.conf @@ -0,0 +1,33 @@ +server: + verbosity: 7 + num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: "" + pidfile: "unbound.pid" + chroot: "" + username: "" + module-config: "cachedb iterator" + root-key-sentinel: no + trust-anchor-signaling: no + log-time-ascii: yes + log-time-iso: yes +cachedb: + backend: redis + redis-server-path: @REDIS_SOCKET@ + redis-replica-server-path: @REDIS_REPLICA_SOCKET@ +auth-zone: + name: "redis.com" + for-upstream: yes + for-downstream: no + zonefile: "redis.zone" +remote-control: + control-enable: yes + control-interface: 127.0.0.1 + # control-interface: ::1 + control-port: @CONTROL_PORT@ + server-key-file: "unbound_server.key" + server-cert-file: "unbound_server.pem" + control-key-file: "unbound_control.key" + control-cert-file: "unbound_control.pem" diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.dsc b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.dsc new file mode 100644 index 000000000000..b07612d3366e --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.dsc @@ -0,0 +1,16 @@ +BaseName: redis_reconnect_interval +Version: 1.0 +Description: Test redis reconnect interval +CreationDate: Thu 24 July 09:29:09 CEST 2025 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: redis_reconnect_interval.pre +Post: redis_reconnect_interval.post +Test: redis_reconnect_interval.test +AuxFiles: +Passed: +Failure: diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.post b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.post new file mode 100644 index 000000000000..fc48d7e38145 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.post @@ -0,0 +1,18 @@ +# #-- redis_reconnect_interval.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +. ../common.sh +kill_pid $REDIS_PID +kill_pid $REDIS_REPLICA_PID +kill_pid $UNBOUND_PID +echo "> cat logfiles" +echo "redis server.log" +cat server.log +echo "redis replica.log" +cat replica.log +echo "unbound.log" +cat unbound.log diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.pre b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.pre new file mode 100644 index 000000000000..1c7a7f3978c0 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.pre @@ -0,0 +1,46 @@ +# #-- redis_reconnect_interval.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +PRE="../.." +. ../common.sh + +if grep "define USE_REDIS 1" $PRE/config.h; then echo test enabled; else skip_test "test skipped"; fi + +get_random_port 2 +UNBOUND_PORT=$RND_PORT +CONTROL_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "CONTROL_PORT=$CONTROL_PORT" >> .tpkg.var.test + +REDIS_SOCKET=server.sock +REDIS_REPLICA_SOCKET=replica.sock +echo "REDIS_SOCKET=$REDIS_SOCKET" >> .tpkg.var.test +echo "REDIS_REPLICA_SOCKET=$REDIS_REPLICA_SOCKET" >> .tpkg.var.test + +# start redis +sed -e 's/@SOCKET\@/'$REDIS_SOCKET'/' -e 's/@LOGFILE\@/server.log/' < redis.conf > server.conf +redis-server server.conf & +REDIS_PID=$! +echo "REDIS_PID=$REDIS_PID" >> .tpkg.var.test + +# start redis replica +sed -e 's/@SOCKET\@/'$REDIS_REPLICA_SOCKET'/' -e 's/@LOGFILE\@/replica.log/' < redis.conf > replica.conf +redis-server replica.conf & +REDIS_REPLICA_PID=$! +echo "REDIS_REPLICA_PID=$REDIS_REPLICA_PID" >> .tpkg.var.test + +# Copy initial zonefile +cp before.zone redis.zone + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@REDIS_SOCKET\@/'$REDIS_SOCKET'/' -e 's/@REDIS_REPLICA_SOCKET\@/'$REDIS_REPLICA_SOCKET'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < redis_reconnect_interval.conf > ub.conf +# start unbound in the background +$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test + +cat .tpkg.var.test +wait_unbound_up unbound.log diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.test b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.test new file mode 100644 index 000000000000..ac15f50b06a9 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/redis_reconnect_interval.test @@ -0,0 +1,121 @@ +# #-- redis_reconnect_interval.test --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +PRE="../.." +. ../common.sh +# do the test + +# Check number of keys in the db +# $1: socket to connect to +# $2: expected number of keys +redis_cli_check_keys () { + echo "> redis-cli connecting to $1 to check number of keys; expecting $2" + keys=$(redis-cli --no-raw -s $1 keys "*" | grep -vF empty | wc -l) + if test $keys -ne $2 + then + echo "Expected $2 keys, got $keys" + exit 1 + fi + echo "OK" +} + +# Query and check the expected result +# $1: query +# $2: expected answer +expect_answer () { + echo "> dig @127.0.0.1 -p $UNBOUND_PORT $1" + dig @127.0.0.1 -p $UNBOUND_PORT $1 > tmp.answer + if ! grep -F $2 tmp.answer + then + echo "Expected $2 in the answer, got:" + cat tmp.answer + exit 1 + fi + echo "OK" +} + +# Start test + +# check Redis server has no keys +redis_cli_check_keys $REDIS_SOCKET 0 + +# check Redis replica server has no keys +redis_cli_check_keys $REDIS_REPLICA_SOCKET 0 + +# query and check answer +expect_answer redis.com 1.1.1.1 + +# check Redis server has 1 key +redis_cli_check_keys $REDIS_SOCKET 1 + +# check Redis replica server has no keys +redis_cli_check_keys $REDIS_REPLICA_SOCKET 0 + +# change auth zone and reload +cp after.zone redis.zone +echo "$PRE/unbound-control -c ub.conf reload" +$PRE/unbound-control -c ub.conf reload +if test $? -ne 0; then + echo "wrong exit value after success" + exit 1 +fi + +# query and check answer +# we are writing to server but reading from replica; which is not actually +# replicating so the new answer will come through while overwriting the record +# in the server. +expect_answer redis.com 2.2.2.2 + +# check Redis server has 1 key +redis_cli_check_keys $REDIS_SOCKET 1 + +# check Redis replica server has no keys +redis_cli_check_keys $REDIS_REPLICA_SOCKET 0 + +echo "> OK" + +# take down the redis server and observe reconnect attempts. +# first the replica that it tries to read from. +kill_pid $REDIS_REPLICA_PID +$PRE/unbound-control -c ub.conf reload +expect_answer redis.com 2.2.2.2 +# some more queries to exceed the limit on reconnects. +expect_answer d1.redis.com NXDOMAIN +expect_answer d2.redis.com NXDOMAIN +expect_answer d3.redis.com NXDOMAIN +expect_answer d4.redis.com NXDOMAIN +expect_answer d5.redis.com NXDOMAIN +# it has entered the wait period +sleep 2 +expect_answer d6.redis.com NXDOMAIN + +kill_pid $REDIS_PID +$PRE/unbound-control -c ub.conf reload +expect_answer redis.com 2.2.2.2 +expect_answer d1.redis.com NXDOMAIN +expect_answer d2.redis.com NXDOMAIN +expect_answer d3.redis.com NXDOMAIN +expect_answer d4.redis.com NXDOMAIN +expect_answer d5.redis.com NXDOMAIN +# it has entered the wait period +sleep 2 +expect_answer d6.redis.com NXDOMAIN + +# bring up the redis server again. +redis-server server.conf & +REDIS_PID=$! +echo "REDIS_PID=$REDIS_PID" >> .tpkg.var.test +redis-server replica.conf & +REDIS_REPLICA_PID=$! +echo "REDIS_REPLICA_PID=$REDIS_REPLICA_PID" >> .tpkg.var.test + +expect_answer d7.redis.com NXDOMAIN +expect_answer d8.redis.com NXDOMAIN +sleep 2 +expect_answer d9.redis.com NXDOMAIN +expect_answer d10.redis.com NXDOMAIN + +exit 0 diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.key b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.key new file mode 100644 index 000000000000..753a4ef6162e --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.key @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG4gIBAAKCAYEAstEp+Pyh8XGrtZ77A4FhYjvbeB3dMa7Q2rGWxobzlA9przhA +1aChAvUtCOAuM+rB6NTNB8YWfZJbQHawyMNpmC77cg6vXLYCGUQHZyAqidN049RJ +F5T7j4N8Vniv17LiRdr0S6swy4PRvEnIPPV43EQHZqC5jVvHsKkhIfmBF/Dj5TXR +ypeawWV/m5jeU6/4HRYMfytBZdO1mPXuWLh0lgbQ4SCbgrOUVD3rniMk1yZIbQOm +vlDHYqekjDb/vOW2KxUQLG04aZMJ1mWfdbwG0CKQkSjISEDZ1l76vhM6mTM0fwXb +IvyFZ9yPPCle1mF5aSlxS2cmGuGVSRQaw8XF9fe3a9ACJJTr33HdSpyaZkKRAUzL +cKqLCl323daKv3NwwAT03Tj4iQM416ASMoiyfFa/2GWTKQVjddu8Crar7tGaf5xr +lig4DBmrBvdYA3njy72/RD71hLwmlRoCGU7dRuDr9O6KASUm1Ri91ONZ/qdjMvov +15l2vj4GV+KXR00dAgMBAAECggGAHepIL1N0dEQkCdpy+/8lH54L9WhpnOo2HqAf +LU9eaKK7d4jdr9+TkD8cLaPzltPrZNxVALvu/0sA4SP6J1wpyj/x6P7z73qzly5+ +Xo5PD4fEwmi9YaiW/UduAblnEZrnp/AddptJKoL/D5T4XtpiQddPtael4zQ7kB57 +YIexRSQTvEDovA/o3/nvA0TrzOxfgd4ycQP3iOWGN/TMzyLsvjydrUwbOB567iz9 +whL3Etdgvnwh5Sz2blbFfH+nAR8ctvFFz+osPvuIVR21VMEI6wm7kTpSNnQ6sh/c +lrLb/bTADn4g7z/LpIZJ+MrLvyEcoqValrLYeFBhM9CV8woPxvkO2P3pU47HVGax +tC7GV6a/kt5RoKFd/TNdiA3OC7NGZtaeXv9VkPf4fVwBtSO9d5ZZXTGEynDD/rUQ +U4KFJe6OD23APjse08HiiKqTPhsOneOONU67iqoaTdIkT2R4EdlkVEDpXVtWb+G9 +Q+IqYzVljlzuyHrhWXLJw/FMa2aBAoHBAOnZbi4gGpH+P6886WDWVgIlTccuXoyc +Mg9QQYk9UDeXxL0AizR5bZy49Sduegz9vkHpAiZARQsUnizHjZ8YlRcrmn4t6tx3 +ahTIKAjdprnxJfYINM580j8CGbXvX5LhIlm3O267D0Op+co3+7Ujy+cjsIuFQrP+ +1MqMgXSeBjzC1APivmps7HeFE+4w0k2PfN5wSMDNCzLo99PZuUG5XZ93OVOS5dpN +b+WskdcD8NOoJy/X/5A08veEI/jYO/DyqQKBwQDDwUQCOWf41ecvJLtBHKmEnHDz +ftzHino9DRKG8a9XaN4rmetnoWEaM2vHGX3pf3mwH+dAe8vJdAQueDhBKYeEpm6C +TYNOpou1+Zs5s99BilCTNYo8fkMOAyqwRwmz9zgHS6QxXuPwsghKefLJGt6o6RFF +tfWVTfLlYJ+I3GQe3ySsk3wjVz4oUTKiyiq5+KzD+HhEkS7u+RQ7Z0ZI2xd2cF8Y +aN2hjKDpcOiFf3CDoqka5D1qMNLgIHO52AHww1UCgcA1h7o7AMpURRka6hyaODY0 +A4oMYEbwdQjYjIyT998W+rzkbu1us6UtzQEBZ760npkgyU/epbOoV63lnkCC/MOU +LD0PST+L/CHiY/cWIHb79YG1EifUZKpUFg0Aoq0EGFkepF0MefGCkbRGYA5UZr9U +R80wAu9D+L+JJiS0J0BSRF74DL196zUuHt5zFeXuLzxsRtPAnq9DliS08BACRYZy +7H3I7cWD9Vn5/0jbKWHFcaaWwyETR6uekTcSzZzbCRECgcBeoE3/xUA9SSk34Mmj +7/cB4522Ft0imA3+9RK/qJTZ7Bd5fC4PKjOGNtUiqW/0L2rjeIiQ40bfWvWqgPKw +jSK1PL6uvkl6+4cNsFsYyZpiVDoe7wKju2UuoNlB3RUTqa2r2STFuNj2wRjA57I1 +BIgdnox65jqQsd14g/yaa+75/WP9CE45xzKEyrtvdcqxm0Pod3OrsYK+gikFjiar +kT0GQ8u0QPzh2tjt/2ZnIfOBrl+QYERP0MofDZDjhUdq2wECgcB0Lu841+yP5cdR +qbJhXO4zJNh7oWNcJlOuQp3ZMNFrA1oHpe9pmLukiROOy01k9WxIMQDzU5GSqRv3 +VLkYOIcbhJ3kClKAcM3j95SkKbU2H5/RENb3Ck52xtl4pNU1x/3PnVFZfDVuuHO9 +MZ9YBcIeK98MyP2jr5JtFKnOyPE7xKq0IHIhXadpbc2wjje5FtZ1cUtMyEECCXNa +C1TpXebHGyXGpY9WdWXhjdE/1jPvfS+uO5WyuDpYPr339gsdq1g= +-----END RSA PRIVATE KEY----- diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.pem b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.pem new file mode 100644 index 000000000000..a1edf7017f1d --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_control.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDszCCAhsCFGD5193whHQ2bVdzbaQfdf1gc4SkMA0GCSqGSIb3DQEBCwUAMBIx +EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjMwWhcNNDAwMzI1MTMzMjMw +WjAaMRgwFgYDVQQDDA91bmJvdW5kLWNvbnRyb2wwggGiMA0GCSqGSIb3DQEBAQUA +A4IBjwAwggGKAoIBgQCy0Sn4/KHxcau1nvsDgWFiO9t4Hd0xrtDasZbGhvOUD2mv +OEDVoKEC9S0I4C4z6sHo1M0HxhZ9kltAdrDIw2mYLvtyDq9ctgIZRAdnICqJ03Tj +1EkXlPuPg3xWeK/XsuJF2vRLqzDLg9G8Scg89XjcRAdmoLmNW8ewqSEh+YEX8OPl +NdHKl5rBZX+bmN5Tr/gdFgx/K0Fl07WY9e5YuHSWBtDhIJuCs5RUPeueIyTXJkht +A6a+UMdip6SMNv+85bYrFRAsbThpkwnWZZ91vAbQIpCRKMhIQNnWXvq+EzqZMzR/ +Bdsi/IVn3I88KV7WYXlpKXFLZyYa4ZVJFBrDxcX197dr0AIklOvfcd1KnJpmQpEB +TMtwqosKXfbd1oq/c3DABPTdOPiJAzjXoBIyiLJ8Vr/YZZMpBWN127wKtqvu0Zp/ +nGuWKDgMGasG91gDeePLvb9EPvWEvCaVGgIZTt1G4Ov07ooBJSbVGL3U41n+p2My ++i/XmXa+PgZX4pdHTR0CAwEAATANBgkqhkiG9w0BAQsFAAOCAYEAd++Wen6l8Ifj +4h3p/y16PhSsWJWuJ4wdNYy3/GM84S26wGjzlEEwiW76HpH6VJzPOiBAeWnFKE83 +hFyetEIxgJeIPbcs9ZP/Uoh8GZH9tRISBSN9Hgk2Slr9llo4t1H0g/XTgA5HqMQU +9YydlBh43G7Vw3FVwh09OM6poNOGQKNc/tq2/QdKeUMtyBbLWpRmjH5XcCT35fbn +ZiVOUldqSHD4kKrFO4nJYXZyipRbcXybsLiX9GP0GLemc3IgIvOXyJ2RPp06o/SJ +pzlMlkcAfLJaSuEW57xRakhuNK7m051TKKzJzIEX+NFYOVdafFHS8VwGrYsdrFvD +72tMfu+Fu55y3awdWWGc6YlaGogZiuMnJkvQphwgn+5qE/7CGEckoKEsH601rqIZ +muaIc85+nEcHJeijd/ZlBN9zeltjFoMuqTUENgmv8+tUAdVm/UMY9Vjme6b43ydP +uv6DS02+k9z8toxXworLiPr94BGaiGV1NxgwZKLZigYJt/Fi2Qte +-----END CERTIFICATE----- diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.key b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.key new file mode 100644 index 000000000000..370a7bbb2f22 --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.key @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG5AIBAAKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI +0x41iG32a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+Nqq +GRS7XVQ24vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Z +uh9MDgotaBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8K +WaBe1ca4TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5 +FzUReSXZuTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xP +q6O9UPj4+nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XL +A5UoZgRzXgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP +7kFZSngxdy1+A/bNAgMBAAECggGBALpTOIqQwVg4CFBylL/a8K1IWJTI/I65sklf +XxYL7G7SB2HlEJ//z+E+F0+S4Vlao1vyLQ5QkgE82pAUB8FoMWvY1qF0Y8A5wtm6 +iZSGk4OLK488ZbT8Ii9i+AGKgPe2XbVxsJwj8N4k7Zooqec9hz73Up8ATEWJkRz7 +2u7oMGG4z91E0PULA64dOi3l/vOQe5w/Aa+CwVbAWtI05o7kMvQEBMDJn6C7CByo +MB5op9wueJMnz7PM7hns+U7Dy6oE4ljuolJUy51bDzFWwoM54cRoQqLFNHd8JVQj +WxldCkbfF43iyprlsEcUrTyUjtdA+ZeiG39vg/mtdmgNpGmdupHJZQvSuG8IcVlz +O+eMSeQS1QXPD6Ik8UK4SU0h+zOl8xIWtRrsxQuh4fnTN40udm/YUWl/6gOebsBI +IrVLlKGqJSfB3tMjpCRqdTzJ0dA9keVpkqm2ugZkxEf1+/efq/rFIQ2pUBLCqNTN +qpNqruK8y8FphP30I2uI4Ej2UIB8AQKBwQDd2Yptj2FyDyaXCycsyde0wYkNyzGU +dRnzdibfHnMZwjgTjwAwgIUBVIS8H0/z7ZJQKN7osJfddMrtjJtYYUk9g/dCpHXs +bNh2QSoWah3FdzNGuWd0iRf9+LFxhjAAMo/FS8zFJAJKrFsBdCGTfFUMdsLC0bjr +YjiWBuvV72uKf8XIZX5KIZruKdWBBcWukcb21R1UDyFYyXRBsly5XHaIYKZql3km +7pV7MKWO0IYgHbHIqGUqPQlzZ/lkunS1jKECgcEA23wHffD6Ou9/x3okPx2AWpTr +gh8rgqbyo6hQkBW5Y90Wz824cqaYebZDaBR/xlVx/YwjKkohv8Bde2lpH/ZxRZ1Z +5Sk2s6GJ/vU0L9RsJZgCgj4L6Coal1NMxuZtCXAlnOpiCdxSZgfqbshbTVz30KsG +ZJG361Cua1ScdAHxlZBxT52/1Sm0zRC2hnxL7h4qo7Idmtzs40LAJvYOKekR0pPN +oWeJfra7vgx/jVNvMFWoOoSLpidVO4g+ot4ery6tAoHAdW3rCic1C2zdnmH28Iw+ +s50l8Lk3mz+I5wgJd1zkzCO0DxZIoWPGA3g7cmCYr6N3KRsZMs4W9NAXgjpFGDkW +zYsG3K21BdpvkdjYcFjnPVjlOXB2RIc0vehf9Jl02wXoeCSxVUDEPcaRvWk9RJYx +ZpGOchUU7vNkxHURbIJ4yCzuAi9G8/Jp0dsu+kaV5tufF5SjG5WOrzKjaQsCbdN1 +oqaWMCHRrTvov/Z2C+xwsptFOdN5CSyZzg6hQiI4GMlBAoHAXyb6KINcOEi0YMp3 +BFXJ23tMTnEs78tozcKeipigcsbaqORK3omS+NEnj+uzKUzJyl4CsMbKstK2tFYS +mSTCHqgE3PBtIpsZtEqhgUraR8IK9GPpzZDTTl9ynZgwFTNlWw3RyuyVXF56J+T8 +kCGJ3hEHCHqT/ZRQyX85BKIDFhA0z4tYKxWVqIFiYBNq56R0X9tMMmMs36mEnF93 +7Ht6mowxTZQRa7nU0qOgeKh/P7ki4Zus3y+WJ+T9IqahLtlRAoHBAIhqMrcxSAB8 +RpB9jukJlAnidw2jCMPgrFE8tP0khhVvGrXMldxAUsMKntDIo8dGCnG1KTcWDI0O +jepvSPHSsxVLFugL79h0eVIS5z4huW48i9xgU8VlHdgAcgEPIAOFcOw2BCu/s0Vp +O+MM/EyUOdo3NsibB3qc/GJI6iNBYS7AljYEVo6rXo5V/MZvZUF4vClen6Obzsre +MTTb+4sJjfqleWuvr1XNMeu2mBfXBQkWGZP1byBK0MvD/aQ2PWq92A== +-----END RSA PRIVATE KEY----- diff --git a/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.pem b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.pem new file mode 100644 index 000000000000..986807310f2b --- /dev/null +++ b/contrib/unbound/testdata/redis_reconnect_interval.tdir/unbound_server.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDqzCCAhMCFBHWXeQ6ZIa9QcQbXLFfC6tj+KA+MA0GCSqGSIb3DQEBCwUAMBIx +EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjI5WhcNNDAwMzI1MTMzMjI5 +WjASMRAwDgYDVQQDDAd1bmJvdW5kMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB +igKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI0x41iG32 +a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+NqqGRS7XVQ2 +4vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Zuh9MDgot +aBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8KWaBe1ca4 +TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5FzUReSXZ +uTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xPq6O9UPj4 ++nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XLA5UoZgRz +XgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP7kFZSngx +dy1+A/bNAgMBAAEwDQYJKoZIhvcNAQELBQADggGBABunf93MKaCUHiZgnoOTinsW +84/EgInrgtKzAyH+BhnKkJOhhR0kkIAx5d9BpDlaSiRTACFon9moWCgDIIsK/Ar7 +JE0Kln9cV//wiiNoFU0O4mnzyGUIMvlaEX6QHMJJQYvL05+w/3AAcf5XmMJtR5ca +fJ8FqvGC34b2WxX9lTQoyT52sRt+1KnQikiMEnEyAdKktMG+MwKsFDdOwDXyZhZg +XZhRrfX3/NVJolqB6EahjWIGXDeKuSSKZVtCyib6LskyeMzN5lcRfvubKDdlqFVF +qlD7rHBsKhQUWK/IO64mGf7y/de+CgHtED5vDvr/p2uj/9sABATfbrOQR3W/Of25 +sLBj4OEfrJ7lX8hQgFaxkMI3x6VFT3W8dTCp7xnQgb6bgROWB5fNEZ9jk/gjSRmD +yIU+r0UbKe5kBk/CmZVFXL2TyJ92V5NYEQh8V4DGy19qZ6u/XKYyNJL4ocs35GGe +CA8SBuyrmdhx38h1RHErR2Skzadi1S7MwGf1y431fQ== +-----END CERTIFICATE----- diff --git a/contrib/unbound/testdata/rpz_cname_wild.rpl b/contrib/unbound/testdata/rpz_cname_wild.rpl new file mode 100644 index 000000000000..ce7200acc781 --- /dev/null +++ b/contrib/unbound/testdata/rpz_cname_wild.rpl @@ -0,0 +1,190 @@ +; config options +server: + module-config: "respip validator iterator" + target-fetch-policy: "0 0 0 0 0" + qname-minimisation: no + access-control: 192.0.0.0/8 allow + +rpz: + name: "rpz.example.com." + rpz-log: yes + rpz-log-name: "rpz.example.com" + zonefile: +TEMPFILE_NAME rpz.example.com +TEMPFILE_CONTENTS rpz.example.com +$ORIGIN example.com. +rpz 3600 IN SOA ns1.rpz.example.com. hostmaster.rpz.example.com. ( + 1379078166 28800 7200 604800 7200 ) + 3600 IN NS ns1.rpz.example.com. + 3600 IN NS ns2.rpz.example.com. +$ORIGIN rpz.example.com. +*.gotham5.a CNAME static.gotham6.a. +*.gotham7.a.rpz-nsdname CNAME static.gotham8.a. +TEMPFILE_END + +stub-zone: + name: "a." + stub-addr: 10.20.30.40 +CONFIG_END + +SCENARIO_BEGIN Test RPZ with CNAME with a wildcarded qname trigger after it. + +; a. +RANGE_BEGIN 0 100 + ADDRESS 10.20.30.40 +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +gotham.a. IN NS +SECTION AUTHORITY +gotham.a. NS ns1.gotham.a. +SECTION ADDITIONAL +ns1.gotham.a. A 10.20.30.41 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +gotham2.a. IN NS +SECTION AUTHORITY +gotham2.a. NS ns1.gotham2.a. +SECTION ADDITIONAL +ns1.gotham2.a. A 10.20.30.42 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +gotham6.a. IN NS +SECTION AUTHORITY +gotham6.a. NS ns1.gotham6.a. +SECTION ADDITIONAL +ns1.gotham6.a. A 10.20.30.46 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +gotham7.a. IN NS +SECTION AUTHORITY +gotham7.a. NS ns1.gotham7.a. +SECTION ADDITIONAL +ns1.gotham7.a. A 10.20.30.47 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +gotham8.a. IN NS +SECTION AUTHORITY +gotham8.a. NS ns1.gotham8.a. +SECTION ADDITIONAL +ns1.gotham8.a. A 10.20.30.48 +ENTRY_END +RANGE_END + +; gotham.a. +RANGE_BEGIN 0 100 + ADDRESS 10.20.30.41 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.gotham.a. IN A +SECTION ANSWER +www.gotham.a. CNAME host.gotham5.a. +ENTRY_END +RANGE_END + +; gotham2.a. +RANGE_BEGIN 0 100 + ADDRESS 10.20.30.42 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.gotham2.a. IN A +SECTION ANSWER +www.gotham2.a. CNAME host.gotham7.a. +ENTRY_END +RANGE_END + +; gotham6.a. +RANGE_BEGIN 0 100 + ADDRESS 10.20.30.46 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +static.gotham6.a. IN A +SECTION ANSWER +static.gotham6.a. A 1.2.3.4 +ENTRY_END +RANGE_END + +; gotham8.a. +RANGE_BEGIN 0 100 + ADDRESS 10.20.30.48 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +static.gotham8.a. IN A +SECTION ANSWER +static.gotham8.a. A 1.2.3.5 +ENTRY_END +RANGE_END + +STEP 10 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +www.gotham.a. IN A +ENTRY_END + +STEP 20 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +www.gotham.a. IN A +SECTION ANSWER +www.gotham.a. CNAME host.gotham5.a. +host.gotham5.a CNAME static.gotham6.a. +static.gotham6.a. A 1.2.3.4 +ENTRY_END + +STEP 30 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +www.gotham2.a. IN A +ENTRY_END + +STEP 40 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +www.gotham2.a. IN A +SECTION ANSWER +www.gotham2.a. CNAME host.gotham7.a. +host.gotham7.a CNAME static.gotham8.a. +static.gotham8.a. A 1.2.3.5 +ENTRY_END + +SCENARIO_END diff --git a/contrib/unbound/testdata/stat_values.tdir/stat_values.conf b/contrib/unbound/testdata/stat_values.tdir/stat_values.conf index 312a7e17494f..a22746297dce 100644 --- a/contrib/unbound/testdata/stat_values.tdir/stat_values.conf +++ b/contrib/unbound/testdata/stat_values.tdir/stat_values.conf @@ -17,7 +17,7 @@ server: serve-expired-client-timeout: 0 dns-error-reporting: yes - trust-anchor: "bogusdnssec. DS 1444 8 2 5224fb17d630a2e3efdc863a05a4032c5db415b5de3f32472ee9abed42e10146" + trust-anchor: "bogusdnssec. DNSKEY 257 3 8 AwEAAbwL6LuXTLXtb23CsXhpkxxyGbEFUROh/L8BWA1EEF8LdQ4Rmsj4 D5D8uAnRFDkNhM6XiII9xcsavwBGNwHxzUaij4MZQu1vrzcfGIJLcC1Q paZmSH9WqIYFQci+T4s4UfDrrS96wO/H0nJvFmavWVX/7p1Q6dv0Arwz XMXaHGrRVdEgK2MDS3dFRngx5JC5fwD7YnwH08EAoFRjdAoXe+etOAeG aOT9IGjVM5LKkN2k6fIRvZ2l9eu5/o+h5L+kpDRcapW2QiL21hCcmwpW 50Llfx9Ovk+M7TBjp4iT7Tc8gLzRZr24LmXEyABb54WW3aoF5k8DZPot 9ogUjxVN/dM=" local-zone: local.zone static local-data: "www.local.zone A 192.0.2.1" diff --git a/contrib/unbound/testdata/stat_values.tdir/stat_values.test b/contrib/unbound/testdata/stat_values.tdir/stat_values.test index d538e4d60ec2..7dd71edd6b3b 100644 --- a/contrib/unbound/testdata/stat_values.tdir/stat_values.test +++ b/contrib/unbound/testdata/stat_values.tdir/stat_values.test @@ -448,7 +448,8 @@ num.query.flags.RD=1 num.query.opcode.QUERY=1 num.query.type.A=1 num.query.udpout=9 -rrset.cache.count=4 +num.valops=6 +rrset.cache.count=5 total.num.cachemiss=1 total.num.dns_error_reports=1 total.num.queries=1 diff --git a/contrib/unbound/testdata/stat_values.tdir/stat_values.testns b/contrib/unbound/testdata/stat_values.tdir/stat_values.testns index a5c0ae92b599..8dd8e26ee04b 100644 --- a/contrib/unbound/testdata/stat_values.tdir/stat_values.testns +++ b/contrib/unbound/testdata/stat_values.tdir/stat_values.testns @@ -43,6 +43,11 @@ ADJUST copy_id SECTION QUESTION @ IN DNSKEY SECTION ANSWER +;; random keys with bogus rrsig (originally from nlnetlabs.nl) +;; These will result in 6 validation attempts (1 + 5 retries) when trying to prime the configured trust anchor +@ IN DNSKEY 256 3 8 AwEAAdR7XR95OaAN9Rz7TbtPalQ9guQk7zfxTHYNKhsiwTZA9z+F16nD 0VeBlk7dNik3ETpT2GLAwr9sntG898JwurCDe353wHPvjZtMCdiTVp3c RCrjuCEvoFpmZNN82H0gaH/4v8mkv/QBDAkDSncYjz/FqHKAeYy3cMcj Y6RyVweh +@ IN DNSKEY 257 3 8 AwEAAbwL6LuXTLXtb23CsXhpkxxyGbEFUROh/L8BWA1EEF8LdQ4Rmsj4 D5D8uAnRFDkNhM6XiII9xcsavwBGNwHxzUaij4MZQu1vrzcfGIJLcC1Q paZmSH9WqIYFQci+T4s4UfDrrS96wO/H0nJvFmavWVX/7p1Q6dv0Arwz XMXaHGrRVdEgK2MDS3dFRngx5JC5fwD7YnwH08EAoFRjdAoXe+etOAeG aOT9IGjVM5LKkN2k6fIRvZ2l9eu5/o+h5L+kpDRcapW2QiL21hCcmwpW 50Llfx9Ovk+M7TBjp4iT7Tc8gLzRZr24LmXEyABb54WW3aoF5k8DZPot 9ogUjxVN/dM= +@ IN RRSIG DNSKEY 8 1 3600 20250806005014 20250709005014 50602 bogusdnssec. WIv6Qe9RAALyMK04dnDfOHtudHzIyk2DcwBLupbPdmSu+0NcAjcQBo2x rWNrdvNHVCAi5OvRwIz/ac81TptsnsSd6zcOtbeSijWpQj21vnSHhlWv zvJW+/WAm3h/XbOPFSE08FNaig9CeRE2GmKemKAdUeDbWoNrku8klCG+ GHJCCyqdmgS6249oUvIgV/m6OwRSCEeUxHlDqbM+OF+Up3dj0iQ61n9l 2nrQR9WNFn9YGTNHiA9bhdFfiCmrAb6X01IrlmSe+ENiQPeRnOWv24ls V5Re9zAOz+X26vjev/wMTEhlrAvl6FIRg7hIgnd3UxQ/UCQ5gxSriaWi YoiH6g== ENTRY_END ENTRY_BEGIN diff --git a/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.conf b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.conf new file mode 100644 index 000000000000..81072c70b999 --- /dev/null +++ b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.conf @@ -0,0 +1,36 @@ +server: + verbosity: 7 + # num-threads: 1 + interface: 127.0.0.1 + interface: 127.0.0.1@@PROXYPORT@ + port: @PORT@ + proxy-protocol-port: @PROXYPORT@ + access-control: 1.0.0.0/8 allow + use-syslog: no + directory: "" + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + target-fetch-policy: "0 0 0 0 0" + send-client-subnet: 127.0.0.1 + max-client-subnet-ipv4: 17 + module-config: "subnetcache iterator" + qname-minimisation: no + minimal-responses: no +remote-control: + control-enable: yes + control-interface: @CONTROL_PATH@/controlpipe.@CONTROL_PID@ + control-use-cert: no +stub-zone: + name: "." + stub-prime: no + stub-addr: "127.0.0.1@@TOPORT@" +stub-zone: + name: "example.com" + stub-prime: no + stub-addr: "127.0.0.1@@TOPORT@" +stub-zone: + name: "example.net" + stub-prime: no + stub-addr: "127.0.0.1@@TOPORT@" diff --git a/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.dsc b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.dsc new file mode 100644 index 000000000000..5f478e9353cc --- /dev/null +++ b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.dsc @@ -0,0 +1,16 @@ +BaseName: subnet_cache_lookup +Version: 1.0 +Description: Subnet cache contents with unbound-control cache_lookup +CreationDate: Fri Aug 15 11:00:00 CEST 2025 +Maintainer: dr. W.C.A. Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: subnet_cache_lookup.pre +Post: subnet_cache_lookup.post +Test: subnet_cache_lookup.test +AuxFiles: +Passed: +Failure: diff --git a/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.post b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.post new file mode 100644 index 000000000000..247ea68a6cc2 --- /dev/null +++ b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.post @@ -0,0 +1,15 @@ +# #-- subnet_cache_lookup.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +PRE="../.." +. ../common.sh +echo "> cat logfiles" +kill_pid $FWD_PID +kill_pid $UNBOUND_PID +rm -f $CONTROL_PATH/controlpipe.$CONTROL_PID +cat fwd.log +cat unbound.log diff --git a/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.pre b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.pre new file mode 100644 index 000000000000..ce007c4fa852 --- /dev/null +++ b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.pre @@ -0,0 +1,42 @@ +# #-- subnet_cache_lookup.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +PRE="../.." +. ../common.sh +if grep "define CLIENT_SUBNET 1" $PRE/config.h; then echo test enabled; else skip_test "test skipped"; fi + +get_make +(cd $PRE; $MAKE streamtcp) + +get_random_port 3 +UNBOUND_PORT=$RND_PORT +PROXY_PORT=$(($RND_PORT + 1)) +FWD_PORT=$(($RND_PORT + 2)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "PROXY_PORT=$PROXY_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT subnet_cache_lookup.testns >fwd.log 2>&1 & +FWD_PID=$! +echo "FWD_PID=$FWD_PID" >> .tpkg.var.test + +# make config file +CONTROL_PATH=/tmp +CONTROL_PID=$$ +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@PROXYPORT\@/'$PROXY_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's?@CONTROL_PATH\@?'$CONTROL_PATH'?' -e 's/@CONTROL_PID@/'$CONTROL_PID'/' < subnet_cache_lookup.conf > ub.conf +# start unbound in the background +$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test +echo "CONTROL_PATH=$CONTROL_PATH" >> .tpkg.var.test +echo "CONTROL_PID=$CONTROL_PID" >> .tpkg.var.test + +cat .tpkg.var.test +wait_ldns_testns_up fwd.log +wait_unbound_up unbound.log + diff --git a/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.test b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.test new file mode 100644 index 000000000000..8838a64edc1c --- /dev/null +++ b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.test @@ -0,0 +1,121 @@ +# #-- subnet_cache_lookup.test --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +PRE="../.." +# do the test +echo "> dig www.example.com." +dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile +if grep SERVFAIL outfile; then + echo "> try again" + dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile +fi +if grep SERVFAIL outfile; then + echo "> try again" + sleep 1 + dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile +fi +if grep SERVFAIL outfile; then + echo "> try again" + sleep 1 + dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile +fi +if grep SERVFAIL outfile; then + echo "> try again" + sleep 1 + dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile +fi +if grep SERVFAIL outfile; then + echo "> try again" + sleep 10 + dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile +fi +if grep SERVFAIL outfile; then + echo "> try again" + sleep 10 + dig @127.0.0.1 -p $UNBOUND_PORT www.example.com. | tee outfile +fi +#echo "> cat logfiles" +#cat fwd.log +#cat unbound.log +echo "> check answer" +if grep www.example.com outfile | grep "10.20.30.40"; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +echo "> unbound-control status" +$PRE/unbound-control -c ub.conf status +if test $? -ne 0; then + echo "wrong exit value." + exit 1 +else + echo "exit value: OK" +fi + +echo "> unbound-control cache_lookup example.com" +$PRE/unbound-control -c ub.conf cache_lookup example.com 2>&1 | tee outfile +if test $? -ne 0; then + echo "wrong exit value." + exit 1 +fi +echo "> check unbound-control output" +if grep "subnet" outfile; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +echo "> use proxy-protocol to put more addresses in the edns subnet cache" +$PRE/streamtcp -f 127.0.0.1@$PROXY_PORT -p 1.1.3.4 www.example.net. A IN | tee outfile +if grep www.example.net outfile | grep "10.20.30.41"; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +$PRE/streamtcp -f 127.0.0.1@$PROXY_PORT -p 1.2.3.4 www.example.net. A IN | tee outfile +if grep www.example.net outfile | grep "10.20.30.42"; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +$PRE/streamtcp -f 127.0.0.1@$PROXY_PORT -p 1.3.3.4 www.example.net. A IN | tee outfile +if grep www.example.net outfile | grep "10.20.30.43"; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +$PRE/streamtcp -f 127.0.0.1@$PROXY_PORT -p 1.4.3.4 www.example.net. A IN | tee outfile +if grep www.example.net outfile | grep "10.20.30.44"; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +echo "> unbound-control cache_lookup example.net" +$PRE/unbound-control -c ub.conf cache_lookup example.net 2>&1 | tee outfile +if test $? -ne 0; then + echo "wrong exit value." + exit 1 +fi +echo "> check unbound-control output" +if grep "subnet" outfile; then + echo "OK" +else + echo "Not OK" + exit 1 +fi + +exit 0 diff --git a/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.testns b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.testns new file mode 100644 index 000000000000..ebdbffa71c70 --- /dev/null +++ b/contrib/unbound/testdata/subnet_cache_lookup.tdir/subnet_cache_lookup.testns @@ -0,0 +1,181 @@ +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS test.ns. +SECTION ADDITIONAL +test.ns. IN A 127.0.0.1 +ENTRY_END + +; response to query of interest +ENTRY_BEGIN +;MATCH opcode qtype qname ednsdata +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + ; client is 127.0.0.1 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 11 ; source mask, scopemask + 7f 00 00 ; address +HEX_EDNSDATA_END +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +example.com. IN SOA +SECTION ANSWER +example.com. IN SOA ns.example.com. hostmaster.example.com. 1 3600 900 86400 3600 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.net. IN A +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + ; client is 1.1.3.4 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 00 ; source mask, scopemask + 01 01 00 ; address +HEX_EDNSDATA_END +HEX_ANSWER_BEGIN + 00 00 84 00 00 01 00 01 ;ID 0, QR AA + 00 00 00 01 03 77 77 77 ; www.example.net. A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 6e 65 74 00 00 01 00 + 01 + ; www.example.net. A 10.20.30.41 + 03 77 77 77 07 65 78 61 6d 70 6c 65 03 6e 65 74 00 + 00 01 00 01 00 00 0e 10 00 04 + 0a 14 1e 29 + + 00 00 29 10 00 00 00 + 80 00 00 0b + 00 08 00 07 ; OPC, optlen + 00 01 11 11 ; ip4, scope 17, source 17 + 01 01 00 ;1.1.0.0/17 +HEX_ANSWER_END +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.net. IN A +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + ; client is 1.2.3.4 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 00 ; source mask, scopemask + 01 02 00 ; address +HEX_EDNSDATA_END +HEX_ANSWER_BEGIN + 00 00 84 00 00 01 00 01 ;ID 0, QR AA + 00 00 00 01 03 77 77 77 ; www.example.net. A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 6e 65 74 00 00 01 00 + 01 + ; www.example.net. A 10.20.30.42 + 03 77 77 77 07 65 78 61 6d 70 6c 65 03 6e 65 74 00 + 00 01 00 01 00 00 0e 10 00 04 + 0a 14 1e 2a + + 00 00 29 10 00 00 00 + 80 00 00 0b + 00 08 00 07 ; OPC, optlen + 00 01 11 11 ; ip4, scope 17, source 17 + 01 02 00 ;1.2.0.0/17 +HEX_ANSWER_END +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.net. IN A +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + ; client is 1.3.3.4 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 00 ; source mask, scopemask + 01 03 00 ; address +HEX_EDNSDATA_END +HEX_ANSWER_BEGIN + 00 00 84 00 00 01 00 01 ;ID 0, QR AA + 00 00 00 01 03 77 77 77 ; www.example.net. A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 6e 65 74 00 00 01 00 + 01 + ; www.example.net. A 10.20.30.43 + 03 77 77 77 07 65 78 61 6d 70 6c 65 03 6e 65 74 00 + 00 01 00 01 00 00 0e 10 00 04 + 0a 14 1e 2b + + 00 00 29 10 00 00 00 + 80 00 00 0b + 00 08 00 07 ; OPC, optlen + 00 01 11 11 ; ip4, scope 17, source 17 + 01 03 00 ;1.3.0.0/17 +HEX_ANSWER_END +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.net. IN A +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + ; client is 1.4.3.4 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 00 ; source mask, scopemask + 01 04 00 ; address +HEX_EDNSDATA_END +HEX_ANSWER_BEGIN + 00 00 84 00 00 01 00 01 ;ID 0, QR AA + 00 00 00 01 03 77 77 77 ; www.example.net. A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 6e 65 74 00 00 01 00 + 01 + ; www.example.net. A 10.20.30.44 + 03 77 77 77 07 65 78 61 6d 70 6c 65 03 6e 65 74 00 + 00 01 00 01 00 00 0e 10 00 04 + 0a 14 1e 2c + + 00 00 29 10 00 00 00 + 80 00 00 0b + 00 08 00 07 ; OPC, optlen + 00 01 11 11 ; ip4, scope 17, source 17 + 01 04 00 ;1.4.0.0/17 +HEX_ANSWER_END +ENTRY_END diff --git a/contrib/unbound/testdata/subnet_cached_servfail.crpl b/contrib/unbound/testdata/subnet_cached_servfail.crpl index f1a66159c4ee..1bcd05f2f888 100644 --- a/contrib/unbound/testdata/subnet_cached_servfail.crpl +++ b/contrib/unbound/testdata/subnet_cached_servfail.crpl @@ -118,7 +118,7 @@ HEX_EDNSDATA_BEGIN HEX_EDNSDATA_END ENTRY_END -; This answer was cached but a prefetch was triggerred +; This answer was cached but a prefetch was triggered STEP 12 CHECK_ANSWER ENTRY_BEGIN MATCH opcode qtype qname diff --git a/contrib/unbound/testdata/subnet_noecs_mult.crpl b/contrib/unbound/testdata/subnet_noecs_mult.crpl new file mode 100644 index 000000000000..3e2acefb0094 --- /dev/null +++ b/contrib/unbound/testdata/subnet_noecs_mult.crpl @@ -0,0 +1,334 @@ +# config +server: + send-client-subnet: 1.2.3.4 + max-client-subnet-ipv4: 17 + module-config: "subnetcache iterator" + qname-minimisation: no + minimal-responses: yes + target-fetch-policy: "0 0 0 0 0" + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test subnet with no edns subnet from server multiple times +; Multiple queries are sent to a server that does not reply with the +; edns-subnet option. + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 50 52 + ADDRESS 1.2.3.4 + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +ns.example.com. IN A +SECTION ANSWER +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +ns.example.com. IN AAAA +SECTION ANSWER +SECTION AUTHORITY +example.com. IN SOA ns.example.com. host.example.com. 4 86400 3600 86400 3600 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +SECTION ADDITIONAL + ; Match this subnet option + HEX_EDNSDATA_BEGIN + ; client is 127.0.0.1 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 00 ; source mask, scopemask + 7f 00 00 ; address + HEX_EDNSDATA_END + ; This is the response, without the subnet option + HEX_ANSWER_BEGIN; + 00 00 84 00 00 01 00 01 ; ID 0 QR AA NOERROR + 00 00 00 01 03 77 77 77 ; www.example.com A (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 + C0 0C 00 01 00 01 00 00 0E 10 ; www.example.com. A IN 3600 + 00 04 0A 14 1E 2C ; rdata 10.20.30.44 + 00 00 29 10 00 00 00 + 80 00 00 00 + HEX_ANSWER_END +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +SECTION ADDITIONAL + ; Match this subnet option + HEX_EDNSDATA_BEGIN + ; client is 127.2.0.1 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 00 ; source mask, scopemask + 7f 02 00 ; address + HEX_EDNSDATA_END + ; This is the response, without the subnet option + HEX_ANSWER_BEGIN; + 00 00 84 00 00 01 00 01 ; ID 0 QR AA NOERROR + 00 00 00 01 03 77 77 77 ; www.example.com A (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 + C0 0C 00 01 00 01 00 00 0E 10 ; www.example.com. A IN 3600 + 00 04 0A 14 1E 2C ; rdata 10.20.30.44 + 00 00 29 10 00 00 00 + 80 00 00 00 + HEX_ANSWER_END +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +SECTION ADDITIONAL + ; Match this subnet option + HEX_EDNSDATA_BEGIN + ; client is 127.3.0.1 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 11 00 ; source mask, scopemask + 7f 03 00 ; address + HEX_EDNSDATA_END + ; This is the response, without the subnet option + HEX_ANSWER_BEGIN; + 00 00 84 00 00 01 00 01 ; ID 0 QR AA NOERROR + 00 00 00 01 03 77 77 77 ; www.example.com A (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 + C0 0C 00 01 00 01 00 00 0E 10 ; www.example.com. A IN 3600 + 00 04 0A 14 1E 2C ; rdata 10.20.30.44 + 00 00 29 10 00 00 00 + 80 00 00 00 + HEX_ANSWER_END +ENTRY_END + +; The answer for a query without subnet +;ENTRY_BEGIN +;MATCH opcode qtype qname +;ADJUST copy_id +;REPLY QR AA NOERROR +;SECTION QUESTION +;www.example.com. IN A +;SECTION ANSWER +;www.example.com. IN A 10.20.30.40 +;ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 53 57 + ADDRESS 1.2.3.4 +; The answer for a query without subnet +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +RANGE_END + +STEP 10 QUERY +ENTRY_BEGIN + HEX_ANSWER_BEGIN; + 00 00 01 00 00 01 00 00 ; ID 0 + 00 00 00 01 03 77 77 77 ; www.example.com A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 00 00 29 10 00 00 00 + 80 00 00 0b + + 00 08 00 07 ; OPC, optlen + 00 01 11 00 ; ip4, scope 17, source 0 + 7f 00 00 ; 127.0.0.0/17 + HEX_ANSWER_END +ENTRY_END + +STEP 20 QUERY +ENTRY_BEGIN + HEX_ANSWER_BEGIN; + 00 00 01 00 00 01 00 00 ; ID 0 + 00 00 00 01 03 77 77 77 ; www.example.com A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 00 00 29 10 00 00 00 + 80 00 00 0b + + 00 08 00 07 ; OPC, optlen + 00 01 11 00 ; ip4, scope 17, source 0 + 7f 02 00 ; 127.2.0.0/17 + HEX_ANSWER_END +ENTRY_END + +STEP 30 QUERY +ENTRY_BEGIN + HEX_ANSWER_BEGIN; + 00 00 01 00 00 01 00 00 ; ID 0 + 00 00 00 01 03 77 77 77 ; www.example.com A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 00 00 29 10 00 00 00 + 80 00 00 0b + + 00 08 00 07 ; OPC, optlen + 00 01 11 00 ; ip4, scope 17, source 0 + 7f 03 00 ; 127.3.0.0/17 + HEX_ANSWER_END +ENTRY_END + +; recursion happens here. +; The upstream server RANGE starts responding at STEP 50. +STEP 50 TRAFFIC + +; The upstream server now responds for the nonsubnet response. +STEP 55 TRAFFIC + +STEP 60 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA DO NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +;www.example.com. IN A 10.20.30.44 +SECTION ADDITIONAL +; HEX_EDNSDATA_BEGIN +; ; client is 127.3.0.1 +; 00 08 ; OPC +; 00 07 ; option length +; 00 01 ; Family +; 11 00 ; source mask, scopemask +; 7f 03 00 ; address +; HEX_EDNSDATA_END +ENTRY_END + +STEP 70 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA DO NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +;www.example.com. IN A 10.20.30.44 +SECTION ADDITIONAL +; HEX_EDNSDATA_BEGIN +; ; client is 127.2.0.1 +; 00 08 ; OPC +; 00 07 ; option length +; 00 01 ; Family +; 11 00 ; source mask, scopemask +; 7f 02 00 ; address +; HEX_EDNSDATA_END +ENTRY_END + +STEP 80 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA DO NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +;www.example.com. IN A 10.20.30.44 +SECTION ADDITIONAL +; HEX_EDNSDATA_BEGIN +; ; client is 127.0.0.1 +; 00 08 ; OPC +; 00 07 ; option length +; 00 01 ; Family +; 11 00 ; source mask, scopemask +; 7f 00 00 ; address +; HEX_EDNSDATA_END +ENTRY_END + +SCENARIO_END diff --git a/contrib/unbound/testdata/subnet_noecs_refused.crpl b/contrib/unbound/testdata/subnet_noecs_refused.crpl new file mode 100644 index 000000000000..39fbe85b4777 --- /dev/null +++ b/contrib/unbound/testdata/subnet_noecs_refused.crpl @@ -0,0 +1,159 @@ +# config +server: + send-client-subnet: 1.2.3.4 + max-client-subnet-ipv4: 17 + module-config: "subnetcache iterator" + qname-minimisation: no + minimal-responses: yes + target-fetch-policy: "0 0 0 0 0" + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test subnet with no edns subnet support but it is refused +; The query is sent to a server that does not reply with the edns-subnet +; option. The upstream server sends rcode refused. That results in a +; NULL return_msg. + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.4 + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +ns.example.com. IN A +SECTION ANSWER +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +ns.example.com. IN AAAA +SECTION ANSWER +SECTION AUTHORITY +example.com. IN SOA ns.example.com. host.example.com. 4 86400 3600 86400 3600 +ENTRY_END + +; This matches the no EDNS subnet info queries that are made for the +; fallback without subnet. The answer is refused. +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR AA REFUSED +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +;www.example.com. IN A 10.20.30.40 +ENTRY_END + +; This matches the initial query with edns subnet in the query, +; the answer has no edns subnet in the reply. +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +RANGE_END + +STEP 1 QUERY +;ENTRY_BEGIN +;REPLY RD DO +;SECTION QUESTION +;www.example.com. IN A +; but send this query with subnet scope zero in the query, because that +; makes the reply possibly get stored in the cache. +; +; query with subnet 0.0.0.0/0. +ENTRY_BEGIN +HEX_ANSWER_BEGIN + 00 00 01 00 00 01 00 00 ;ID 0 + 00 00 00 01 03 77 77 77 ; www.example.com A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 00 00 29 10 00 00 00 + 80 00 00 08 + + 00 08 00 04 ; OPC, optlen + 00 01 00 00 ; ip4, scope 0, source 0 + ;0.0.0.0/0 +HEX_ANSWER_END +ENTRY_END + +; recursion happens here. +STEP 10 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA DO SERVFAIL +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +;www.example.com. IN A 10.20.30.40 +ENTRY_END +SCENARIO_END diff --git a/contrib/unbound/testdata/subnet_noecs_support.crpl b/contrib/unbound/testdata/subnet_noecs_support.crpl new file mode 100644 index 000000000000..0c9826c834cb --- /dev/null +++ b/contrib/unbound/testdata/subnet_noecs_support.crpl @@ -0,0 +1,127 @@ +# config +server: + send-client-subnet: 1.2.3.4 + max-client-subnet-ipv4: 17 + module-config: "subnetcache iterator" + qname-minimisation: no + minimal-responses: yes + target-fetch-policy: "0 0 0 0 0" + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test subnet with no edns subnet support from the server +; The query is sent to a server that does not reply with the edns-subnet +; option. + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.4 +ENTRY_END +RANGE_END + +; ns.example.com. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.4 + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.com. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +ns.example.com. IN A +SECTION ANSWER +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +ns.example.com. IN AAAA +SECTION ANSWER +SECTION AUTHORITY +example.com. IN SOA ns.example.com. host.example.com. 4 86400 3600 86400 3600 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +www.example.com. IN A +ENTRY_END + +; recursion happens here. +STEP 10 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA DO NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +SCENARIO_END diff --git a/contrib/unbound/testdata/subnet_scopezero_global.crpl b/contrib/unbound/testdata/subnet_scopezero_global.crpl new file mode 100644 index 000000000000..1db7cc322f8c --- /dev/null +++ b/contrib/unbound/testdata/subnet_scopezero_global.crpl @@ -0,0 +1,280 @@ +; config options +server: + target-fetch-policy: "0 0 0 0 0" + module-config: "subnetcache validator iterator" + verbosity: 4 + qname-minimisation: no + ; the domain is not configured for edns-subnet + ;send-client-subnet: 1.2.3.4 + client-subnet-zone: "ex2.com" + +stub-zone: + name: "." + stub-addr: 193.0.14.129 + +stub-zone: + name: "example.com" + stub-addr: 1.2.3.4 +stub-zone: + name: "ex2.com" + stub-addr: 1.2.3.5 +CONFIG_END + +SCENARIO_BEGIN Test subnet cache with scope zero for global cache store. + +; the upstream server. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 + +ENTRY_BEGIN +MATCH opcode qtype qname ednsdata +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + ;; we expect to receive empty +HEX_EDNSDATA_END +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END +RANGE_END + +RANGE_BEGIN 0 21 + ADDRESS 1.2.3.4 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +SECTION AUTHORITY +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +RANGE_BEGIN 20 61 + ADDRESS 1.2.3.5 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR AA NOERROR +SECTION QUESTION +www.ex2.com. IN A +SECTION ANSWER +www.ex2.com. IN A 10.20.30.41 +SECTION AUTHORITY +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +RANGE_BEGIN 90 101 + ADDRESS 1.2.3.5 +ENTRY_BEGIN + MATCH opcode qtype qname ednsdata + ADJUST copy_id copy_ednsdata_assume_clientsubnet + REPLY QR NOERROR + SECTION QUESTION + www.ex2.com. IN A + SECTION ANSWER + www.ex2.com. 10 IN A 10.20.30.42 + SECTION AUTHORITY + ex2.com. IN NS ns.ex2.com. + SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + ; client is 127.0.0.1 + 00 08 ; OPC + 00 07 ; option length + 00 01 ; Family + 18 00 ; source mask, scopemask + 7f 00 00 ; address + HEX_EDNSDATA_END + ns.ex2.com. IN A 1.2.3.5 +ENTRY_END +RANGE_END + +; query for 0.0.0.0/0 +STEP 10 QUERY +ENTRY_BEGIN +HEX_ANSWER_BEGIN + 00 00 01 00 00 01 00 00 ;ID 0 + 00 00 00 01 03 77 77 77 ; www.example.com A? (DO) + 07 65 78 61 6d 70 6c 65 + 03 63 6f 6d 00 00 01 00 + 01 00 00 29 10 00 00 00 + 80 00 00 08 + + 00 08 00 04 ; OPC, optlen + 00 01 00 00 ; ip4, scope 0, source 0 + ;0.0.0.0/0 +HEX_ANSWER_END +ENTRY_END + +STEP 20 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +SECTION AUTHORITY +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + 00 08 ; OPC + 00 04 ; option length + 00 01 ; Family + 00 00 ; source mask, scopemask + ; address +HEX_EDNSDATA_END +ENTRY_END + +; That that it is in global cache. +STEP 30 QUERY +ENTRY_BEGIN +REPLY RD NOERROR +SECTION QUESTION +www.example.com. IN A +ENTRY_END + +STEP 40 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END + +; With a query where the name is whitelisted, it should not be stored +; in global cache. +STEP 50 QUERY +ENTRY_BEGIN +HEX_ANSWER_BEGIN + 00 00 01 00 00 01 00 00 ;ID 0 + 00 00 00 01 03 77 77 77 ; www.ex2.com A? (DO) + 03 65 78 32 03 63 6f 6d + 00 00 01 00 01 00 00 29 + 10 00 00 00 80 00 00 08 + + 00 08 00 04 ; OPC, optlen + 00 01 00 00 ; ip4, scope 0, source 0 + ;0.0.0.0/0 +HEX_ANSWER_END +ENTRY_END + +STEP 60 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA NOERROR +SECTION QUESTION +www.ex2.com. IN A +SECTION ANSWER +www.ex2.com. IN A 10.20.30.41 +SECTION AUTHORITY +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + 00 08 ; OPC + 00 04 ; option length + 00 01 ; Family + 00 00 ; source mask, scopemask + ; address +HEX_EDNSDATA_END +ENTRY_END + +STEP 70 QUERY +ENTRY_BEGIN +HEX_ANSWER_BEGIN + 00 00 01 00 00 01 00 00 ;ID 0 + 00 00 00 01 03 77 77 77 ; www.ex2.com A? (DO) + 03 65 78 32 03 63 6f 6d + 00 00 01 00 01 00 00 29 + 10 00 00 00 80 00 00 08 + + 00 08 00 04 ; OPC, optlen + 00 01 00 00 ; ip4, scope 0, source 0 + ;0.0.0.0/0 +HEX_ANSWER_END +ENTRY_END + +STEP 80 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA NOERROR +SECTION QUESTION +www.ex2.com. IN A +SECTION ANSWER +www.ex2.com. IN A 10.20.30.41 +SECTION AUTHORITY +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + 00 08 ; OPC + 00 04 ; option length + 00 01 ; Family + 00 00 ; source mask, scopemask + ; address +HEX_EDNSDATA_END +ENTRY_END + +; www.ex2.com is not in the global cache. and gets subnet treatment +STEP 90 QUERY +ENTRY_BEGIN +REPLY RD NOERROR +SECTION QUESTION +www.ex2.com. IN A +ENTRY_END + +STEP 100 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA NOERROR +SECTION QUESTION +www.ex2.com. IN A +SECTION ANSWER +www.ex2.com. IN A 10.20.30.42 +ENTRY_END + +; that result is in the subnet cache +STEP 110 QUERY +ENTRY_BEGIN +HEX_ANSWER_BEGIN + 00 00 01 00 00 01 00 00 ;ID 0 + 00 00 00 01 03 77 77 77 ; www.ex2.com A? (DO) + 03 65 78 32 03 63 6f 6d + 00 00 01 00 01 00 00 29 + 10 00 00 00 80 00 00 0b + + 00 08 00 07 ; OPC, optlen + ; ip4 127.0.0.0/24 scope /0 + 00 01 ; Family + 18 00 ; source mask, scopemask + 7f 00 00 ; address +HEX_ANSWER_END +ENTRY_END + +STEP 120 CHECK_ANSWER +ENTRY_BEGIN +MATCH all ednsdata +REPLY QR RD RA NOERROR +SECTION QUESTION +www.ex2.com. IN A +SECTION ANSWER +www.ex2.com. IN A 10.20.30.42 +SECTION AUTHORITY +SECTION ADDITIONAL +HEX_EDNSDATA_BEGIN + 00 08 ; OPC + 00 07 ; option length + ; ip4 127.0.0.0/24 scope /24 + 00 01 ; Family + 18 18 ; source mask, scopemask + 7f 00 00 ; address +HEX_EDNSDATA_END +ENTRY_END + +SCENARIO_END diff --git a/contrib/unbound/testdata/val_failure_dnskey.rpl b/contrib/unbound/testdata/val_failure_dnskey.rpl index c5f1af2ff349..8b8d7f3fe208 100644 --- a/contrib/unbound/testdata/val_failure_dnskey.rpl +++ b/contrib/unbound/testdata/val_failure_dnskey.rpl @@ -17,7 +17,7 @@ stub-zone: stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. CONFIG_END -SCENARIO_BEGIN Test validator with failure for chaing of trust lookup. +SCENARIO_BEGIN Test validator with failure for chain of trust lookup. ; The error message that is created, also for EDE is more extensive. ; K.ROOT-SERVERS.NET. diff --git a/contrib/unbound/util/config_file.c b/contrib/unbound/util/config_file.c index cf610efc6a7c..1820e1dcd91b 100644 --- a/contrib/unbound/util/config_file.c +++ b/contrib/unbound/util/config_file.c @@ -155,7 +155,7 @@ config_create(void) # else /* libevent can use many sockets */ cfg->outgoing_num_ports = 4096; - cfg->num_queries_per_thread = 1024; + cfg->num_queries_per_thread = 2048; # endif cfg->outgoing_num_tcp = 10; cfg->incoming_num_tcp = 10; @@ -169,10 +169,10 @@ config_create(void) 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->msg_cache_slabs = 0; cfg->jostle_time = 200; cfg->rrset_cache_size = 4 * 1024 * 1024; - cfg->rrset_cache_slabs = 4; + cfg->rrset_cache_slabs = 0; cfg->host_ttl = 900; cfg->bogus_ttl = 60; cfg->min_ttl = 0; @@ -182,7 +182,7 @@ config_create(void) cfg->prefetch = 0; cfg->prefetch_key = 0; cfg->deny_any = 0; - cfg->infra_cache_slabs = 4; + cfg->infra_cache_slabs = 0; cfg->infra_cache_numhosts = 10000; cfg->infra_cache_min_rtt = 50; cfg->infra_cache_max_rtt = 120000; @@ -210,7 +210,7 @@ config_create(void) cfg->if_automatic = 0; cfg->if_automatic_ports = NULL; cfg->so_rcvbuf = 0; - cfg->so_sndbuf = 0; + cfg->so_sndbuf = 4*1024*1024; cfg->so_reuseport = REUSEPORT_DEFAULT; cfg->ip_transparent = 0; cfg->ip_freebind = 0; @@ -291,7 +291,7 @@ config_create(void) 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->key_cache_slabs = 0; cfg->neg_cache_size = 1 * 1024 * 1024; cfg->local_zones = NULL; cfg->local_zones_nodefault = NULL; @@ -341,8 +341,8 @@ config_create(void) cfg->ip_ratelimit_cookie = 0; cfg->ip_ratelimit = 0; cfg->ratelimit = 0; - cfg->ip_ratelimit_slabs = 4; - cfg->ratelimit_slabs = 4; + cfg->ip_ratelimit_slabs = 0; + cfg->ratelimit_slabs = 0; cfg->ip_ratelimit_size = 4*1024*1024; cfg->ratelimit_size = 4*1024*1024; cfg->ratelimit_for_domain = NULL; @@ -367,9 +367,9 @@ config_create(void) 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_shared_secret_cache_slabs = 0; cfg->dnscrypt_nonce_cache_size = 4*1024*1024; - cfg->dnscrypt_nonce_cache_slabs = 4; + cfg->dnscrypt_nonce_cache_slabs = 0; cfg->pad_responses = 1; cfg->pad_responses_block_size = 468; /* from RFC8467 */ cfg->pad_queries = 1; @@ -454,6 +454,11 @@ struct config_file* config_create_forlib(void) cfg->val_log_squelch = 1; cfg->minimal_responses = 0; cfg->harden_short_bufsize = 1; + /* Need to explicitly define the slabs from their 0 default value */ + cfg->ip_ratelimit_slabs = 1; + cfg->ratelimit_slabs = 1; + cfg->dnscrypt_shared_secret_cache_slabs = 1; + cfg->dnscrypt_nonce_cache_slabs = 1; return cfg; } @@ -1448,6 +1453,41 @@ create_cfg_parser(struct config_file* cfg, char* filename, const char* chroot) init_cfg_parse(); } +void +config_auto_slab_values(struct config_file* cfg) +{ +#define SET_AUTO_SLAB(var, name, val) \ +do { \ + if(cfg->var == 0) { \ + cfg->var = val; \ + verbose(VERB_QUERY, "setting "name": %lu", (unsigned long)val); \ + } \ +} while(0); +#ifdef THREADS_DISABLED + size_t pow_2_threads = 1; +#else + size_t pow_2_threads = 4; /* pow2 start */ + while (pow_2_threads < (size_t)(cfg->num_threads?cfg->num_threads:1) && + /* 1/3 of the distance to the next pow2 value stays with the + * lower value */ + (size_t)cfg->num_threads > pow_2_threads + (pow_2_threads - 1)/3) { + pow_2_threads <<= 1; + } + log_assert((pow_2_threads & (pow_2_threads - 1)) == 0); /* powerof2? */ +#endif /* THREADS_DISABLED */ + + SET_AUTO_SLAB(msg_cache_slabs, "msg-cache-slabs", pow_2_threads); + SET_AUTO_SLAB(rrset_cache_slabs, "rrset-cache-slabs", pow_2_threads); + SET_AUTO_SLAB(infra_cache_slabs, "infra-cache-slabs", pow_2_threads); + SET_AUTO_SLAB(key_cache_slabs, "key-cache-slabs", pow_2_threads); + SET_AUTO_SLAB(ip_ratelimit_slabs, "ip-ratelimit-slabs", pow_2_threads); + SET_AUTO_SLAB(ratelimit_slabs, "ratelimit-slabs", pow_2_threads); + SET_AUTO_SLAB(dnscrypt_shared_secret_cache_slabs, + "dnscrypt-shared-secret-cache-slabs", pow_2_threads); + SET_AUTO_SLAB(dnscrypt_nonce_cache_slabs, + "dnscrypt-nonce-cache-slabs", pow_2_threads); +} + int config_read(struct config_file* cfg, const char* filename, const char* chroot) { @@ -1512,6 +1552,7 @@ config_read(struct config_file* cfg, const char* filename, const char* chroot) } } globfree(&g); + config_auto_slab_values(cfg); return 1; } #endif /* HAVE_GLOB */ @@ -1535,6 +1576,7 @@ config_read(struct config_file* cfg, const char* filename, const char* chroot) return 0; } + config_auto_slab_values(cfg); return 1; } diff --git a/contrib/unbound/util/config_file.h b/contrib/unbound/util/config_file.h index 89bbc1c7d856..44ac036b88df 100644 --- a/contrib/unbound/util/config_file.h +++ b/contrib/unbound/util/config_file.h @@ -967,6 +967,17 @@ struct config_file* config_create(void); struct config_file* config_create_forlib(void); /** + * If _slabs values are not explicitly configured, 0 value, put them in a + * pow2 value close to the number of threads used. + * Starts at the current default 4. + * If num_threads is in between two pow2 values, 1/3 of the way stays with + * the lower pow2 value. + * Exported for unit testing. + * @param config: where the _slabs values reside. + */ +void config_auto_slab_values(struct config_file* config); + +/** * Read the config file from the specified filename. * @param config: where options are stored into, must be freshly created. * @param filename: name of configfile. If NULL nothing is done. diff --git a/contrib/unbound/util/configparser.c b/contrib/unbound/util/configparser.c index 10eb29579c41..363e4a8c3d9b 100644 --- a/contrib/unbound/util/configparser.c +++ b/contrib/unbound/util/configparser.c @@ -1365,45 +1365,45 @@ static const yytype_int16 yyrline[] = 838, 847, 856, 865, 874, 883, 890, 899, 908, 917, 926, 935, 944, 953, 962, 971, 984, 995, 1006, 1017, 1026, 1039, 1052, 1061, 1070, 1079, 1086, 1093, 1102, 1109, - 1118, 1126, 1133, 1140, 1148, 1157, 1165, 1181, 1189, 1197, - 1205, 1213, 1221, 1234, 1241, 1250, 1259, 1273, 1282, 1291, - 1300, 1309, 1318, 1327, 1336, 1345, 1352, 1359, 1385, 1393, - 1400, 1407, 1414, 1421, 1429, 1437, 1445, 1452, 1463, 1474, - 1481, 1490, 1499, 1508, 1517, 1524, 1531, 1538, 1554, 1562, - 1570, 1580, 1590, 1600, 1614, 1622, 1635, 1646, 1654, 1667, - 1676, 1685, 1694, 1703, 1713, 1723, 1731, 1744, 1753, 1761, - 1770, 1778, 1791, 1800, 1809, 1819, 1826, 1836, 1846, 1856, - 1866, 1876, 1886, 1896, 1906, 1916, 1926, 1933, 1940, 1947, - 1956, 1965, 1974, 1983, 1990, 2000, 2008, 2017, 2024, 2042, - 2055, 2068, 2081, 2090, 2099, 2108, 2117, 2126, 2136, 2146, - 2157, 2166, 2175, 2184, 2193, 2202, 2211, 2220, 2229, 2238, - 2251, 2264, 2273, 2280, 2289, 2298, 2307, 2316, 2326, 2334, - 2347, 2355, 2411, 2418, 2433, 2443, 2453, 2460, 2467, 2474, - 2481, 2496, 2511, 2518, 2525, 2534, 2542, 2549, 2563, 2584, - 2605, 2617, 2629, 2641, 2650, 2671, 2683, 2695, 2704, 2725, - 2734, 2743, 2752, 2760, 2768, 2781, 2794, 2809, 2824, 2833, - 2842, 2852, 2862, 2871, 2880, 2889, 2895, 2904, 2913, 2923, - 2933, 2943, 2952, 2962, 2971, 2984, 2997, 3009, 3023, 3035, - 3049, 3058, 3069, 3078, 3087, 3094, 3104, 3111, 3118, 3127, - 3136, 3146, 3156, 3166, 3176, 3183, 3190, 3199, 3208, 3218, - 3228, 3238, 3245, 3252, 3259, 3267, 3277, 3287, 3297, 3307, - 3317, 3327, 3383, 3393, 3401, 3409, 3424, 3433, 3439, 3440, - 3441, 3441, 3441, 3442, 3442, 3442, 3443, 3443, 3445, 3455, - 3464, 3471, 3478, 3485, 3492, 3499, 3506, 3512, 3513, 3514, - 3514, 3514, 3515, 3515, 3515, 3516, 3517, 3517, 3518, 3518, - 3519, 3519, 3520, 3521, 3522, 3523, 3524, 3525, 3526, 3528, - 3537, 3547, 3554, 3561, 3570, 3577, 3584, 3591, 3598, 3607, - 3616, 3623, 3630, 3640, 3650, 3660, 3670, 3680, 3690, 3701, - 3707, 3708, 3709, 3711, 3718, 3724, 3725, 3726, 3728, 3735, - 3745, 3752, 3761, 3769, 3775, 3776, 3778, 3778, 3778, 3779, - 3779, 3780, 3781, 3782, 3783, 3784, 3786, 3795, 3804, 3811, - 3820, 3827, 3836, 3844, 3857, 3865, 3878, 3884, 3885, 3886, - 3886, 3887, 3887, 3888, 3888, 3889, 3889, 3890, 3890, 3891, - 3891, 3892, 3892, 3893, 3893, 3894, 3894, 3895, 3895, 3896, - 3898, 3910, 3922, 3935, 3948, 3960, 3972, 3987, 4002, 4014, - 4026, 4038, 4050, 4063, 4076, 4089, 4102, 4115, 4128, 4141, - 4156, 4171, 4182, 4191, 4207, 4214, 4223, 4232, 4241, 4247, - 4248, 4249, 4249, 4251, 4266 + 1118, 1126, 1133, 1140, 1148, 1157, 1165, 1183, 1191, 1199, + 1207, 1215, 1223, 1236, 1243, 1252, 1261, 1275, 1284, 1293, + 1302, 1311, 1320, 1329, 1338, 1347, 1354, 1361, 1387, 1395, + 1402, 1409, 1416, 1423, 1431, 1439, 1447, 1454, 1465, 1476, + 1483, 1492, 1501, 1510, 1519, 1526, 1533, 1540, 1556, 1564, + 1572, 1582, 1592, 1602, 1616, 1624, 1637, 1648, 1656, 1669, + 1678, 1687, 1696, 1705, 1715, 1725, 1733, 1746, 1755, 1763, + 1772, 1780, 1793, 1802, 1811, 1821, 1828, 1838, 1848, 1858, + 1868, 1878, 1888, 1898, 1908, 1918, 1928, 1935, 1942, 1949, + 1958, 1967, 1976, 1985, 1992, 2002, 2010, 2019, 2026, 2044, + 2057, 2070, 2083, 2092, 2101, 2110, 2119, 2128, 2138, 2148, + 2159, 2168, 2177, 2186, 2195, 2204, 2213, 2222, 2231, 2240, + 2253, 2266, 2275, 2282, 2291, 2300, 2309, 2318, 2328, 2336, + 2349, 2357, 2413, 2420, 2435, 2445, 2455, 2462, 2469, 2476, + 2483, 2498, 2513, 2520, 2527, 2536, 2544, 2551, 2565, 2586, + 2607, 2619, 2631, 2643, 2652, 2673, 2685, 2697, 2706, 2727, + 2736, 2745, 2754, 2762, 2770, 2783, 2796, 2811, 2826, 2835, + 2844, 2854, 2864, 2873, 2882, 2891, 2897, 2906, 2915, 2925, + 2935, 2945, 2954, 2964, 2973, 2986, 2999, 3011, 3025, 3037, + 3051, 3060, 3071, 3080, 3089, 3096, 3106, 3113, 3120, 3129, + 3138, 3148, 3158, 3168, 3178, 3185, 3192, 3201, 3210, 3220, + 3230, 3240, 3247, 3254, 3261, 3269, 3279, 3289, 3299, 3309, + 3319, 3329, 3385, 3395, 3403, 3411, 3426, 3435, 3441, 3442, + 3443, 3443, 3443, 3444, 3444, 3444, 3445, 3445, 3447, 3457, + 3466, 3473, 3480, 3487, 3494, 3501, 3508, 3514, 3515, 3516, + 3516, 3516, 3517, 3517, 3517, 3518, 3519, 3519, 3520, 3520, + 3521, 3521, 3522, 3523, 3524, 3525, 3526, 3527, 3528, 3530, + 3539, 3549, 3556, 3563, 3572, 3579, 3586, 3593, 3600, 3609, + 3618, 3625, 3632, 3642, 3652, 3662, 3672, 3682, 3692, 3703, + 3709, 3710, 3711, 3713, 3720, 3726, 3727, 3728, 3730, 3737, + 3747, 3754, 3763, 3771, 3777, 3778, 3780, 3780, 3780, 3781, + 3781, 3782, 3783, 3784, 3785, 3786, 3788, 3797, 3806, 3813, + 3822, 3829, 3838, 3846, 3859, 3867, 3880, 3886, 3887, 3888, + 3888, 3889, 3889, 3890, 3890, 3891, 3891, 3892, 3892, 3893, + 3893, 3894, 3894, 3895, 3895, 3896, 3896, 3897, 3897, 3898, + 3900, 3912, 3924, 3937, 3950, 3962, 3974, 3989, 4004, 4016, + 4028, 4040, 4052, 4065, 4078, 4091, 4104, 4117, 4130, 4143, + 4158, 4173, 4184, 4193, 4209, 4216, 4225, 4234, 4243, 4249, + 4250, 4251, 4251, 4253, 4268 }; #endif @@ -3798,7 +3798,7 @@ yyreduce: { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) - yyerror("number expected"); + yyerror("number expected"); else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } @@ -4082,21 +4082,23 @@ yyreduce: free(cfg_parser->cfg->http_endpoint); if((yyvsp[0].str) && (yyvsp[0].str)[0] != '/') { cfg_parser->cfg->http_endpoint = malloc(strlen((yyvsp[0].str))+2); - if(!cfg_parser->cfg->http_endpoint) + if(cfg_parser->cfg->http_endpoint) { + cfg_parser->cfg->http_endpoint[0] = '/'; + memmove(cfg_parser->cfg->http_endpoint+1, (yyvsp[0].str), + strlen((yyvsp[0].str))+1); + } else { yyerror("out of memory"); - cfg_parser->cfg->http_endpoint[0] = '/'; - memmove(cfg_parser->cfg->http_endpoint+1, (yyvsp[0].str), - strlen((yyvsp[0].str))+1); + } free((yyvsp[0].str)); } else { cfg_parser->cfg->http_endpoint = (yyvsp[0].str); } } -#line 4096 "util/configparser.c" +#line 4098 "util/configparser.c" break; case 407: /* server_http_max_streams: VAR_HTTP_MAX_STREAMS STRING_ARG */ -#line 1182 "util/configparser.y" +#line 1184 "util/configparser.y" { OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4104,11 +4106,11 @@ yyreduce: else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4108 "util/configparser.c" +#line 4110 "util/configparser.c" break; case 408: /* server_http_query_buffer_size: VAR_HTTP_QUERY_BUFFER_SIZE STRING_ARG */ -#line 1190 "util/configparser.y" +#line 1192 "util/configparser.y" { OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -4116,11 +4118,11 @@ yyreduce: yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4120 "util/configparser.c" +#line 4122 "util/configparser.c" break; case 409: /* server_http_response_buffer_size: VAR_HTTP_RESPONSE_BUFFER_SIZE STRING_ARG */ -#line 1198 "util/configparser.y" +#line 1200 "util/configparser.y" { OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -4128,11 +4130,11 @@ yyreduce: yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4132 "util/configparser.c" +#line 4134 "util/configparser.c" break; case 410: /* server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG */ -#line 1206 "util/configparser.y" +#line 1208 "util/configparser.y" { OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4140,11 +4142,11 @@ yyreduce: else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4144 "util/configparser.c" +#line 4146 "util/configparser.c" break; case 411: /* server_http_notls_downstream: VAR_HTTP_NOTLS_DOWNSTREAM STRING_ARG */ -#line 1214 "util/configparser.y" +#line 1216 "util/configparser.y" { OUTYY(("P(server_http_notls_downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4152,11 +4154,11 @@ yyreduce: else cfg_parser->cfg->http_notls_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4156 "util/configparser.c" +#line 4158 "util/configparser.c" break; case 412: /* server_quic_port: VAR_QUIC_PORT STRING_ARG */ -#line 1222 "util/configparser.y" +#line 1224 "util/configparser.y" { OUTYY(("P(server_quic_port:%s)\n", (yyvsp[0].str))); #ifndef HAVE_NGTCP2 @@ -4169,22 +4171,22 @@ yyreduce: else cfg_parser->cfg->quic_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4173 "util/configparser.c" +#line 4175 "util/configparser.c" break; case 413: /* server_quic_size: VAR_QUIC_SIZE STRING_ARG */ -#line 1235 "util/configparser.y" +#line 1237 "util/configparser.y" { OUTYY(("P(server_quic_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->quic_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4184 "util/configparser.c" +#line 4186 "util/configparser.c" break; case 414: /* server_use_systemd: VAR_USE_SYSTEMD STRING_ARG */ -#line 1242 "util/configparser.y" +#line 1244 "util/configparser.y" { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4192,11 +4194,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4196 "util/configparser.c" +#line 4198 "util/configparser.c" break; case 415: /* server_do_daemonize: VAR_DO_DAEMONIZE STRING_ARG */ -#line 1251 "util/configparser.y" +#line 1253 "util/configparser.y" { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4204,11 +4206,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4208 "util/configparser.c" +#line 4210 "util/configparser.c" break; case 416: /* server_use_syslog: VAR_USE_SYSLOG STRING_ARG */ -#line 1260 "util/configparser.y" +#line 1262 "util/configparser.y" { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4221,11 +4223,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4225 "util/configparser.c" +#line 4227 "util/configparser.c" break; case 417: /* server_log_time_ascii: VAR_LOG_TIME_ASCII STRING_ARG */ -#line 1274 "util/configparser.y" +#line 1276 "util/configparser.y" { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4233,11 +4235,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4237 "util/configparser.c" +#line 4239 "util/configparser.c" break; case 418: /* server_log_time_iso: VAR_LOG_TIME_ISO STRING_ARG */ -#line 1283 "util/configparser.y" +#line 1285 "util/configparser.y" { OUTYY(("P(server_log_time_iso:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4245,11 +4247,11 @@ yyreduce: else cfg_parser->cfg->log_time_iso = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4249 "util/configparser.c" +#line 4251 "util/configparser.c" break; case 419: /* server_log_queries: VAR_LOG_QUERIES STRING_ARG */ -#line 1292 "util/configparser.y" +#line 1294 "util/configparser.y" { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4257,11 +4259,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4261 "util/configparser.c" +#line 4263 "util/configparser.c" break; case 420: /* server_log_replies: VAR_LOG_REPLIES STRING_ARG */ -#line 1301 "util/configparser.y" +#line 1303 "util/configparser.y" { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4269,11 +4271,11 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4273 "util/configparser.c" +#line 4275 "util/configparser.c" break; case 421: /* server_log_tag_queryreply: VAR_LOG_TAG_QUERYREPLY STRING_ARG */ -#line 1310 "util/configparser.y" +#line 1312 "util/configparser.y" { OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4281,11 +4283,11 @@ yyreduce: else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4285 "util/configparser.c" +#line 4287 "util/configparser.c" break; case 422: /* server_log_servfail: VAR_LOG_SERVFAIL STRING_ARG */ -#line 1319 "util/configparser.y" +#line 1321 "util/configparser.y" { OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4293,11 +4295,11 @@ yyreduce: else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4297 "util/configparser.c" +#line 4299 "util/configparser.c" break; case 423: /* server_log_destaddr: VAR_LOG_DESTADDR STRING_ARG */ -#line 1328 "util/configparser.y" +#line 1330 "util/configparser.y" { OUTYY(("P(server_log_destaddr:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4305,11 +4307,11 @@ yyreduce: else cfg_parser->cfg->log_destaddr = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4309 "util/configparser.c" +#line 4311 "util/configparser.c" break; case 424: /* server_log_local_actions: VAR_LOG_LOCAL_ACTIONS STRING_ARG */ -#line 1337 "util/configparser.y" +#line 1339 "util/configparser.y" { OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4317,31 +4319,31 @@ yyreduce: else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4321 "util/configparser.c" +#line 4323 "util/configparser.c" break; case 425: /* server_chroot: VAR_CHROOT STRING_ARG */ -#line 1346 "util/configparser.y" +#line 1348 "util/configparser.y" { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 4331 "util/configparser.c" +#line 4333 "util/configparser.c" break; case 426: /* server_username: VAR_USERNAME STRING_ARG */ -#line 1353 "util/configparser.y" +#line 1355 "util/configparser.y" { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 4341 "util/configparser.c" +#line 4343 "util/configparser.c" break; case 427: /* server_directory: VAR_DIRECTORY STRING_ARG */ -#line 1360 "util/configparser.y" +#line 1362 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -4366,105 +4368,105 @@ yyreduce: } } } -#line 4370 "util/configparser.c" +#line 4372 "util/configparser.c" break; case 428: /* server_logfile: VAR_LOGFILE STRING_ARG */ -#line 1386 "util/configparser.y" +#line 1388 "util/configparser.y" { OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->logfile); cfg_parser->cfg->logfile = (yyvsp[0].str); cfg_parser->cfg->use_syslog = 0; } -#line 4381 "util/configparser.c" +#line 4383 "util/configparser.c" break; case 429: /* server_pidfile: VAR_PIDFILE STRING_ARG */ -#line 1394 "util/configparser.y" +#line 1396 "util/configparser.y" { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 4391 "util/configparser.c" +#line 4393 "util/configparser.c" break; case 430: /* server_root_hints: VAR_ROOT_HINTS STRING_ARG */ -#line 1401 "util/configparser.y" +#line 1403 "util/configparser.y" { OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4401 "util/configparser.c" +#line 4403 "util/configparser.c" break; case 431: /* server_dlv_anchor_file: VAR_DLV_ANCHOR_FILE STRING_ARG */ -#line 1408 "util/configparser.y" +#line 1410 "util/configparser.y" { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); log_warn("option dlv-anchor-file ignored: DLV is decommissioned"); free((yyvsp[0].str)); } -#line 4411 "util/configparser.c" +#line 4413 "util/configparser.c" break; case 432: /* server_dlv_anchor: VAR_DLV_ANCHOR STRING_ARG */ -#line 1415 "util/configparser.y" +#line 1417 "util/configparser.y" { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); log_warn("option dlv-anchor ignored: DLV is decommissioned"); free((yyvsp[0].str)); } -#line 4421 "util/configparser.c" +#line 4423 "util/configparser.c" break; case 433: /* server_auto_trust_anchor_file: VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG */ -#line 1422 "util/configparser.y" +#line 1424 "util/configparser.y" { OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> auto_trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4432 "util/configparser.c" +#line 4434 "util/configparser.c" break; case 434: /* server_trust_anchor_file: VAR_TRUST_ANCHOR_FILE STRING_ARG */ -#line 1430 "util/configparser.y" +#line 1432 "util/configparser.y" { OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trust_anchor_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4443 "util/configparser.c" +#line 4445 "util/configparser.c" break; case 435: /* server_trusted_keys_file: VAR_TRUSTED_KEYS_FILE STRING_ARG */ -#line 1438 "util/configparser.y" +#line 1440 "util/configparser.y" { OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg-> trusted_keys_file_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4454 "util/configparser.c" +#line 4456 "util/configparser.c" break; case 436: /* server_trust_anchor: VAR_TRUST_ANCHOR STRING_ARG */ -#line 1446 "util/configparser.y" +#line 1448 "util/configparser.y" { OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4464 "util/configparser.c" +#line 4466 "util/configparser.c" break; case 437: /* server_trust_anchor_signaling: VAR_TRUST_ANCHOR_SIGNALING STRING_ARG */ -#line 1453 "util/configparser.y" +#line 1455 "util/configparser.y" { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4474,11 +4476,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4478 "util/configparser.c" +#line 4480 "util/configparser.c" break; case 438: /* server_root_key_sentinel: VAR_ROOT_KEY_SENTINEL STRING_ARG */ -#line 1464 "util/configparser.y" +#line 1466 "util/configparser.y" { OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4488,21 +4490,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4492 "util/configparser.c" +#line 4494 "util/configparser.c" break; case 439: /* server_domain_insecure: VAR_DOMAIN_INSECURE STRING_ARG */ -#line 1475 "util/configparser.y" +#line 1477 "util/configparser.y" { OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4502 "util/configparser.c" +#line 4504 "util/configparser.c" break; case 440: /* server_hide_identity: VAR_HIDE_IDENTITY STRING_ARG */ -#line 1482 "util/configparser.y" +#line 1484 "util/configparser.y" { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4510,11 +4512,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4514 "util/configparser.c" +#line 4516 "util/configparser.c" break; case 441: /* server_hide_version: VAR_HIDE_VERSION STRING_ARG */ -#line 1491 "util/configparser.y" +#line 1493 "util/configparser.y" { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4522,11 +4524,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4526 "util/configparser.c" +#line 4528 "util/configparser.c" break; case 442: /* server_hide_trustanchor: VAR_HIDE_TRUSTANCHOR STRING_ARG */ -#line 1500 "util/configparser.y" +#line 1502 "util/configparser.y" { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4534,11 +4536,11 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4538 "util/configparser.c" +#line 4540 "util/configparser.c" break; case 443: /* server_hide_http_user_agent: VAR_HIDE_HTTP_USER_AGENT STRING_ARG */ -#line 1509 "util/configparser.y" +#line 1511 "util/configparser.y" { OUTYY(("P(server_hide_user_agent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4546,41 +4548,41 @@ yyreduce: else cfg_parser->cfg->hide_http_user_agent = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4550 "util/configparser.c" +#line 4552 "util/configparser.c" break; case 444: /* server_identity: VAR_IDENTITY STRING_ARG */ -#line 1518 "util/configparser.y" +#line 1520 "util/configparser.y" { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 4560 "util/configparser.c" +#line 4562 "util/configparser.c" break; case 445: /* server_version: VAR_VERSION STRING_ARG */ -#line 1525 "util/configparser.y" +#line 1527 "util/configparser.y" { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 4570 "util/configparser.c" +#line 4572 "util/configparser.c" break; case 446: /* server_http_user_agent: VAR_HTTP_USER_AGENT STRING_ARG */ -#line 1532 "util/configparser.y" +#line 1534 "util/configparser.y" { OUTYY(("P(server_http_user_agent:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->http_user_agent); cfg_parser->cfg->http_user_agent = (yyvsp[0].str); } -#line 4580 "util/configparser.c" +#line 4582 "util/configparser.c" break; case 447: /* server_nsid: VAR_NSID STRING_ARG */ -#line 1539 "util/configparser.y" +#line 1541 "util/configparser.y" { OUTYY(("P(server_nsid:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->nsid_cfg_str); @@ -4595,33 +4597,33 @@ yyreduce: yyerror("the NSID must be either a hex string or an " "ascii character string prepended with ascii_."); } -#line 4599 "util/configparser.c" +#line 4601 "util/configparser.c" break; case 448: /* server_so_rcvbuf: VAR_SO_RCVBUF STRING_ARG */ -#line 1555 "util/configparser.y" +#line 1557 "util/configparser.y" { OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 4610 "util/configparser.c" +#line 4612 "util/configparser.c" break; case 449: /* server_so_sndbuf: VAR_SO_SNDBUF STRING_ARG */ -#line 1563 "util/configparser.y" +#line 1565 "util/configparser.y" { OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf)) yyerror("buffer size expected"); free((yyvsp[0].str)); } -#line 4621 "util/configparser.c" +#line 4623 "util/configparser.c" break; case 450: /* server_so_reuseport: VAR_SO_REUSEPORT STRING_ARG */ -#line 1571 "util/configparser.y" +#line 1573 "util/configparser.y" { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4630,11 +4632,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4634 "util/configparser.c" +#line 4636 "util/configparser.c" break; case 451: /* server_ip_transparent: VAR_IP_TRANSPARENT STRING_ARG */ -#line 1581 "util/configparser.y" +#line 1583 "util/configparser.y" { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4643,11 +4645,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4647 "util/configparser.c" +#line 4649 "util/configparser.c" break; case 452: /* server_ip_freebind: VAR_IP_FREEBIND STRING_ARG */ -#line 1591 "util/configparser.y" +#line 1593 "util/configparser.y" { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4656,11 +4658,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4660 "util/configparser.c" +#line 4662 "util/configparser.c" break; case 453: /* server_ip_dscp: VAR_IP_DSCP STRING_ARG */ -#line 1601 "util/configparser.y" +#line 1603 "util/configparser.y" { OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4673,22 +4675,22 @@ yyreduce: cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4677 "util/configparser.c" +#line 4679 "util/configparser.c" break; case 454: /* server_stream_wait_size: VAR_STREAM_WAIT_SIZE STRING_ARG */ -#line 1615 "util/configparser.y" +#line 1617 "util/configparser.y" { OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4688 "util/configparser.c" +#line 4690 "util/configparser.c" break; case 455: /* server_edns_buffer_size: VAR_EDNS_BUFFER_SIZE STRING_ARG */ -#line 1623 "util/configparser.y" +#line 1625 "util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4700,11 +4702,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4704 "util/configparser.c" +#line 4706 "util/configparser.c" break; case 456: /* server_msg_buffer_size: VAR_MSG_BUFFER_SIZE STRING_ARG */ -#line 1636 "util/configparser.y" +#line 1638 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4714,22 +4716,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4718 "util/configparser.c" +#line 4720 "util/configparser.c" break; case 457: /* server_msg_cache_size: VAR_MSG_CACHE_SIZE STRING_ARG */ -#line 1647 "util/configparser.y" +#line 1649 "util/configparser.y" { OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4729 "util/configparser.c" +#line 4731 "util/configparser.c" break; case 458: /* server_msg_cache_slabs: VAR_MSG_CACHE_SLABS STRING_ARG */ -#line 1655 "util/configparser.y" +#line 1657 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -4741,11 +4743,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4745 "util/configparser.c" +#line 4747 "util/configparser.c" break; case 459: /* server_num_queries_per_thread: VAR_NUM_QUERIES_PER_THREAD STRING_ARG */ -#line 1668 "util/configparser.y" +#line 1670 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4753,11 +4755,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4757 "util/configparser.c" +#line 4759 "util/configparser.c" break; case 460: /* server_jostle_timeout: VAR_JOSTLE_TIMEOUT STRING_ARG */ -#line 1677 "util/configparser.y" +#line 1679 "util/configparser.y" { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4765,11 +4767,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4769 "util/configparser.c" +#line 4771 "util/configparser.c" break; case 461: /* server_delay_close: VAR_DELAY_CLOSE STRING_ARG */ -#line 1686 "util/configparser.y" +#line 1688 "util/configparser.y" { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4777,11 +4779,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4781 "util/configparser.c" +#line 4783 "util/configparser.c" break; case 462: /* server_udp_connect: VAR_UDP_CONNECT STRING_ARG */ -#line 1695 "util/configparser.y" +#line 1697 "util/configparser.y" { OUTYY(("P(server_udp_connect:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4789,11 +4791,11 @@ yyreduce: else cfg_parser->cfg->udp_connect = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4793 "util/configparser.c" +#line 4795 "util/configparser.c" break; case 463: /* server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG */ -#line 1704 "util/configparser.y" +#line 1706 "util/configparser.y" { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4802,11 +4804,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4806 "util/configparser.c" +#line 4808 "util/configparser.c" break; case 464: /* server_insecure_lan_zones: VAR_INSECURE_LAN_ZONES STRING_ARG */ -#line 1714 "util/configparser.y" +#line 1716 "util/configparser.y" { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4815,22 +4817,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4819 "util/configparser.c" +#line 4821 "util/configparser.c" break; case 465: /* server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG */ -#line 1724 "util/configparser.y" +#line 1726 "util/configparser.y" { OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 4830 "util/configparser.c" +#line 4832 "util/configparser.c" break; case 466: /* server_rrset_cache_slabs: VAR_RRSET_CACHE_SLABS STRING_ARG */ -#line 1732 "util/configparser.y" +#line 1734 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -4842,11 +4844,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4846 "util/configparser.c" +#line 4848 "util/configparser.c" break; case 467: /* server_infra_host_ttl: VAR_INFRA_HOST_TTL STRING_ARG */ -#line 1745 "util/configparser.y" +#line 1747 "util/configparser.y" { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4854,22 +4856,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4858 "util/configparser.c" +#line 4860 "util/configparser.c" break; case 468: /* server_infra_lame_ttl: VAR_INFRA_LAME_TTL STRING_ARG */ -#line 1754 "util/configparser.y" +#line 1756 "util/configparser.y" { OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option " "removed, use infra-host-ttl)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4869 "util/configparser.c" +#line 4871 "util/configparser.c" break; case 469: /* server_infra_cache_numhosts: VAR_INFRA_CACHE_NUMHOSTS STRING_ARG */ -#line 1762 "util/configparser.y" +#line 1764 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4877,22 +4879,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4881 "util/configparser.c" +#line 4883 "util/configparser.c" break; case 470: /* server_infra_cache_lame_size: VAR_INFRA_CACHE_LAME_SIZE STRING_ARG */ -#line 1771 "util/configparser.y" +#line 1773 "util/configparser.y" { OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str))); verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s " "(option removed, use infra-cache-numhosts)", (yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4892 "util/configparser.c" +#line 4894 "util/configparser.c" break; case 471: /* server_infra_cache_slabs: VAR_INFRA_CACHE_SLABS STRING_ARG */ -#line 1779 "util/configparser.y" +#line 1781 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -4904,11 +4906,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4908 "util/configparser.c" +#line 4910 "util/configparser.c" break; case 472: /* server_infra_cache_min_rtt: VAR_INFRA_CACHE_MIN_RTT STRING_ARG */ -#line 1792 "util/configparser.y" +#line 1794 "util/configparser.y" { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4916,11 +4918,11 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4920 "util/configparser.c" +#line 4922 "util/configparser.c" break; case 473: /* server_infra_cache_max_rtt: VAR_INFRA_CACHE_MAX_RTT STRING_ARG */ -#line 1801 "util/configparser.y" +#line 1803 "util/configparser.y" { OUTYY(("P(server_infra_cache_max_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4928,11 +4930,11 @@ yyreduce: else cfg_parser->cfg->infra_cache_max_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4932 "util/configparser.c" +#line 4934 "util/configparser.c" break; case 474: /* server_infra_keep_probing: VAR_INFRA_KEEP_PROBING STRING_ARG */ -#line 1810 "util/configparser.y" +#line 1812 "util/configparser.y" { OUTYY(("P(server_infra_keep_probing:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4941,21 +4943,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4945 "util/configparser.c" +#line 4947 "util/configparser.c" break; case 475: /* server_target_fetch_policy: VAR_TARGET_FETCH_POLICY STRING_ARG */ -#line 1820 "util/configparser.y" +#line 1822 "util/configparser.y" { OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->target_fetch_policy); cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str); } -#line 4955 "util/configparser.c" +#line 4957 "util/configparser.c" break; case 476: /* server_harden_short_bufsize: VAR_HARDEN_SHORT_BUFSIZE STRING_ARG */ -#line 1827 "util/configparser.y" +#line 1829 "util/configparser.y" { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4964,11 +4966,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4968 "util/configparser.c" +#line 4970 "util/configparser.c" break; case 477: /* server_harden_large_queries: VAR_HARDEN_LARGE_QUERIES STRING_ARG */ -#line 1837 "util/configparser.y" +#line 1839 "util/configparser.y" { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4977,11 +4979,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4981 "util/configparser.c" +#line 4983 "util/configparser.c" break; case 478: /* server_harden_glue: VAR_HARDEN_GLUE STRING_ARG */ -#line 1847 "util/configparser.y" +#line 1849 "util/configparser.y" { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4990,11 +4992,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4994 "util/configparser.c" +#line 4996 "util/configparser.c" break; case 479: /* server_harden_unverified_glue: VAR_HARDEN_UNVERIFIED_GLUE STRING_ARG */ -#line 1857 "util/configparser.y" +#line 1859 "util/configparser.y" { OUTYY(("P(server_harden_unverified_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5003,11 +5005,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5007 "util/configparser.c" +#line 5009 "util/configparser.c" break; case 480: /* server_harden_dnssec_stripped: VAR_HARDEN_DNSSEC_STRIPPED STRING_ARG */ -#line 1867 "util/configparser.y" +#line 1869 "util/configparser.y" { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5016,11 +5018,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5020 "util/configparser.c" +#line 5022 "util/configparser.c" break; case 481: /* server_harden_below_nxdomain: VAR_HARDEN_BELOW_NXDOMAIN STRING_ARG */ -#line 1877 "util/configparser.y" +#line 1879 "util/configparser.y" { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5029,11 +5031,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5033 "util/configparser.c" +#line 5035 "util/configparser.c" break; case 482: /* server_harden_referral_path: VAR_HARDEN_REFERRAL_PATH STRING_ARG */ -#line 1887 "util/configparser.y" +#line 1889 "util/configparser.y" { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5042,11 +5044,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5046 "util/configparser.c" +#line 5048 "util/configparser.c" break; case 483: /* server_harden_algo_downgrade: VAR_HARDEN_ALGO_DOWNGRADE STRING_ARG */ -#line 1897 "util/configparser.y" +#line 1899 "util/configparser.y" { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5055,11 +5057,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5059 "util/configparser.c" +#line 5061 "util/configparser.c" break; case 484: /* server_harden_unknown_additional: VAR_HARDEN_UNKNOWN_ADDITIONAL STRING_ARG */ -#line 1907 "util/configparser.y" +#line 1909 "util/configparser.y" { OUTYY(("P(server_harden_unknown_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5068,11 +5070,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5072 "util/configparser.c" +#line 5074 "util/configparser.c" break; case 485: /* server_use_caps_for_id: VAR_USE_CAPS_FOR_ID STRING_ARG */ -#line 1917 "util/configparser.y" +#line 1919 "util/configparser.y" { OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5081,41 +5083,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5085 "util/configparser.c" +#line 5087 "util/configparser.c" break; case 486: /* server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG */ -#line 1927 "util/configparser.y" +#line 1929 "util/configparser.y" { OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5095 "util/configparser.c" +#line 5097 "util/configparser.c" break; case 487: /* server_private_address: VAR_PRIVATE_ADDRESS STRING_ARG */ -#line 1934 "util/configparser.y" +#line 1936 "util/configparser.y" { OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5105 "util/configparser.c" +#line 5107 "util/configparser.c" break; case 488: /* server_private_domain: VAR_PRIVATE_DOMAIN STRING_ARG */ -#line 1941 "util/configparser.y" +#line 1943 "util/configparser.y" { OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5115 "util/configparser.c" +#line 5117 "util/configparser.c" break; case 489: /* server_prefetch: VAR_PREFETCH STRING_ARG */ -#line 1948 "util/configparser.y" +#line 1950 "util/configparser.y" { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5123,11 +5125,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5127 "util/configparser.c" +#line 5129 "util/configparser.c" break; case 490: /* server_prefetch_key: VAR_PREFETCH_KEY STRING_ARG */ -#line 1957 "util/configparser.y" +#line 1959 "util/configparser.y" { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5135,11 +5137,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5139 "util/configparser.c" +#line 5141 "util/configparser.c" break; case 491: /* server_deny_any: VAR_DENY_ANY STRING_ARG */ -#line 1966 "util/configparser.y" +#line 1968 "util/configparser.y" { OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5147,11 +5149,11 @@ yyreduce: else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5151 "util/configparser.c" +#line 5153 "util/configparser.c" break; case 492: /* server_unwanted_reply_threshold: VAR_UNWANTED_REPLY_THRESHOLD STRING_ARG */ -#line 1975 "util/configparser.y" +#line 1977 "util/configparser.y" { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5159,21 +5161,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5163 "util/configparser.c" +#line 5165 "util/configparser.c" break; case 493: /* server_do_not_query_address: VAR_DO_NOT_QUERY_ADDRESS STRING_ARG */ -#line 1984 "util/configparser.y" +#line 1986 "util/configparser.y" { OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 5173 "util/configparser.c" +#line 5175 "util/configparser.c" break; case 494: /* server_do_not_query_localhost: VAR_DO_NOT_QUERY_LOCALHOST STRING_ARG */ -#line 1991 "util/configparser.y" +#line 1993 "util/configparser.y" { OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5182,22 +5184,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5186 "util/configparser.c" +#line 5188 "util/configparser.c" break; case 495: /* server_access_control: VAR_ACCESS_CONTROL STRING_ARG STRING_ARG */ -#line 2001 "util/configparser.y" +#line 2003 "util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_acl_action((yyvsp[0].str)); if(!cfg_str2list_insert(&cfg_parser->cfg->acls, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding acl"); } -#line 5197 "util/configparser.c" +#line 5199 "util/configparser.c" break; case 496: /* server_interface_action: VAR_INTERFACE_ACTION STRING_ARG STRING_ARG */ -#line 2009 "util/configparser.y" +#line 2011 "util/configparser.y" { OUTYY(("P(server_interface_action:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_acl_action((yyvsp[0].str)); @@ -5205,21 +5207,21 @@ yyreduce: &cfg_parser->cfg->interface_actions, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding acl"); } -#line 5209 "util/configparser.c" +#line 5211 "util/configparser.c" break; case 497: /* server_module_conf: VAR_MODULE_CONF STRING_ARG */ -#line 2018 "util/configparser.y" +#line 2020 "util/configparser.y" { OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->module_conf); cfg_parser->cfg->module_conf = (yyvsp[0].str); } -#line 5219 "util/configparser.c" +#line 5221 "util/configparser.c" break; case 498: /* server_val_override_date: VAR_VAL_OVERRIDE_DATE STRING_ARG */ -#line 2025 "util/configparser.y" +#line 2027 "util/configparser.y" { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -5236,11 +5238,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5240 "util/configparser.c" +#line 5242 "util/configparser.c" break; case 499: /* server_val_sig_skew_min: VAR_VAL_SIG_SKEW_MIN STRING_ARG */ -#line 2043 "util/configparser.y" +#line 2045 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -5252,11 +5254,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5256 "util/configparser.c" +#line 5258 "util/configparser.c" break; case 500: /* server_val_sig_skew_max: VAR_VAL_SIG_SKEW_MAX STRING_ARG */ -#line 2056 "util/configparser.y" +#line 2058 "util/configparser.y" { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -5268,11 +5270,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5272 "util/configparser.c" +#line 5274 "util/configparser.c" break; case 501: /* server_val_max_restart: VAR_VAL_MAX_RESTART STRING_ARG */ -#line 2069 "util/configparser.y" +#line 2071 "util/configparser.y" { OUTYY(("P(server_val_max_restart:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -5284,11 +5286,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5288 "util/configparser.c" +#line 5290 "util/configparser.c" break; case 502: /* server_cache_max_ttl: VAR_CACHE_MAX_TTL STRING_ARG */ -#line 2082 "util/configparser.y" +#line 2084 "util/configparser.y" { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5296,11 +5298,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5300 "util/configparser.c" +#line 5302 "util/configparser.c" break; case 503: /* server_cache_max_negative_ttl: VAR_CACHE_MAX_NEGATIVE_TTL STRING_ARG */ -#line 2091 "util/configparser.y" +#line 2093 "util/configparser.y" { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5308,11 +5310,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5312 "util/configparser.c" +#line 5314 "util/configparser.c" break; case 504: /* server_cache_min_negative_ttl: VAR_CACHE_MIN_NEGATIVE_TTL STRING_ARG */ -#line 2100 "util/configparser.y" +#line 2102 "util/configparser.y" { OUTYY(("P(server_cache_min_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5320,11 +5322,11 @@ yyreduce: else cfg_parser->cfg->min_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5324 "util/configparser.c" +#line 5326 "util/configparser.c" break; case 505: /* server_cache_min_ttl: VAR_CACHE_MIN_TTL STRING_ARG */ -#line 2109 "util/configparser.y" +#line 2111 "util/configparser.y" { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5332,11 +5334,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5336 "util/configparser.c" +#line 5338 "util/configparser.c" break; case 506: /* server_bogus_ttl: VAR_BOGUS_TTL STRING_ARG */ -#line 2118 "util/configparser.y" +#line 2120 "util/configparser.y" { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5344,11 +5346,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5348 "util/configparser.c" +#line 5350 "util/configparser.c" break; case 507: /* server_val_clean_additional: VAR_VAL_CLEAN_ADDITIONAL STRING_ARG */ -#line 2127 "util/configparser.y" +#line 2129 "util/configparser.y" { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5357,11 +5359,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5361 "util/configparser.c" +#line 5363 "util/configparser.c" break; case 508: /* server_val_permissive_mode: VAR_VAL_PERMISSIVE_MODE STRING_ARG */ -#line 2137 "util/configparser.y" +#line 2139 "util/configparser.y" { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5370,11 +5372,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5374 "util/configparser.c" +#line 5376 "util/configparser.c" break; case 509: /* server_aggressive_nsec: VAR_AGGRESSIVE_NSEC STRING_ARG */ -#line 2147 "util/configparser.y" +#line 2149 "util/configparser.y" { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5384,11 +5386,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5388 "util/configparser.c" +#line 5390 "util/configparser.c" break; case 510: /* server_ignore_cd_flag: VAR_IGNORE_CD_FLAG STRING_ARG */ -#line 2158 "util/configparser.y" +#line 2160 "util/configparser.y" { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5396,11 +5398,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5400 "util/configparser.c" +#line 5402 "util/configparser.c" break; case 511: /* server_disable_edns_do: VAR_DISABLE_EDNS_DO STRING_ARG */ -#line 2167 "util/configparser.y" +#line 2169 "util/configparser.y" { OUTYY(("P(server_disable_edns_do:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5408,11 +5410,11 @@ yyreduce: else cfg_parser->cfg->disable_edns_do = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5412 "util/configparser.c" +#line 5414 "util/configparser.c" break; case 512: /* server_serve_expired: VAR_SERVE_EXPIRED STRING_ARG */ -#line 2176 "util/configparser.y" +#line 2178 "util/configparser.y" { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5420,11 +5422,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5424 "util/configparser.c" +#line 5426 "util/configparser.c" break; case 513: /* server_serve_expired_ttl: VAR_SERVE_EXPIRED_TTL STRING_ARG */ -#line 2185 "util/configparser.y" +#line 2187 "util/configparser.y" { OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5432,11 +5434,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5436 "util/configparser.c" +#line 5438 "util/configparser.c" break; case 514: /* server_serve_expired_ttl_reset: VAR_SERVE_EXPIRED_TTL_RESET STRING_ARG */ -#line 2194 "util/configparser.y" +#line 2196 "util/configparser.y" { OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5444,11 +5446,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5448 "util/configparser.c" +#line 5450 "util/configparser.c" break; case 515: /* server_serve_expired_reply_ttl: VAR_SERVE_EXPIRED_REPLY_TTL STRING_ARG */ -#line 2203 "util/configparser.y" +#line 2205 "util/configparser.y" { OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5456,11 +5458,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5460 "util/configparser.c" +#line 5462 "util/configparser.c" break; case 516: /* server_serve_expired_client_timeout: VAR_SERVE_EXPIRED_CLIENT_TIMEOUT STRING_ARG */ -#line 2212 "util/configparser.y" +#line 2214 "util/configparser.y" { OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5468,11 +5470,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5472 "util/configparser.c" +#line 5474 "util/configparser.c" break; case 517: /* server_ede_serve_expired: VAR_EDE_SERVE_EXPIRED STRING_ARG */ -#line 2221 "util/configparser.y" +#line 2223 "util/configparser.y" { OUTYY(("P(server_ede_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5480,11 +5482,11 @@ yyreduce: else cfg_parser->cfg->ede_serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5484 "util/configparser.c" +#line 5486 "util/configparser.c" break; case 518: /* server_serve_original_ttl: VAR_SERVE_ORIGINAL_TTL STRING_ARG */ -#line 2230 "util/configparser.y" +#line 2232 "util/configparser.y" { OUTYY(("P(server_serve_original_ttl:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5492,11 +5494,11 @@ yyreduce: else cfg_parser->cfg->serve_original_ttl = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5496 "util/configparser.c" +#line 5498 "util/configparser.c" break; case 519: /* server_fake_dsa: VAR_FAKE_DSA STRING_ARG */ -#line 2239 "util/configparser.y" +#line 2241 "util/configparser.y" { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5508,11 +5510,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5512 "util/configparser.c" +#line 5514 "util/configparser.c" break; case 520: /* server_fake_sha1: VAR_FAKE_SHA1 STRING_ARG */ -#line 2252 "util/configparser.y" +#line 2254 "util/configparser.y" { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5524,11 +5526,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5528 "util/configparser.c" +#line 5530 "util/configparser.c" break; case 521: /* server_val_log_level: VAR_VAL_LOG_LEVEL STRING_ARG */ -#line 2265 "util/configparser.y" +#line 2267 "util/configparser.y" { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5536,21 +5538,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5540 "util/configparser.c" +#line 5542 "util/configparser.c" break; case 522: /* server_val_nsec3_keysize_iterations: VAR_VAL_NSEC3_KEYSIZE_ITERATIONS STRING_ARG */ -#line 2274 "util/configparser.y" +#line 2276 "util/configparser.y" { OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->val_nsec3_key_iterations); cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str); } -#line 5550 "util/configparser.c" +#line 5552 "util/configparser.c" break; case 523: /* server_zonemd_permissive_mode: VAR_ZONEMD_PERMISSIVE_MODE STRING_ARG */ -#line 2281 "util/configparser.y" +#line 2283 "util/configparser.y" { OUTYY(("P(server_zonemd_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5558,11 +5560,11 @@ yyreduce: else cfg_parser->cfg->zonemd_permissive_mode = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5562 "util/configparser.c" +#line 5564 "util/configparser.c" break; case 524: /* server_add_holddown: VAR_ADD_HOLDDOWN STRING_ARG */ -#line 2290 "util/configparser.y" +#line 2292 "util/configparser.y" { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5570,11 +5572,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5574 "util/configparser.c" +#line 5576 "util/configparser.c" break; case 525: /* server_del_holddown: VAR_DEL_HOLDDOWN STRING_ARG */ -#line 2299 "util/configparser.y" +#line 2301 "util/configparser.y" { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5582,11 +5584,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5586 "util/configparser.c" +#line 5588 "util/configparser.c" break; case 526: /* server_keep_missing: VAR_KEEP_MISSING STRING_ARG */ -#line 2308 "util/configparser.y" +#line 2310 "util/configparser.y" { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5594,11 +5596,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5598 "util/configparser.c" +#line 5600 "util/configparser.c" break; case 527: /* server_permit_small_holddown: VAR_PERMIT_SMALL_HOLDDOWN STRING_ARG */ -#line 2317 "util/configparser.y" +#line 2319 "util/configparser.y" { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5607,22 +5609,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5611 "util/configparser.c" +#line 5613 "util/configparser.c" break; case 528: /* server_key_cache_size: VAR_KEY_CACHE_SIZE STRING_ARG */ -#line 2327 "util/configparser.y" +#line 2329 "util/configparser.y" { OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5622 "util/configparser.c" +#line 5624 "util/configparser.c" break; case 529: /* server_key_cache_slabs: VAR_KEY_CACHE_SLABS STRING_ARG */ -#line 2335 "util/configparser.y" +#line 2337 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -5634,22 +5636,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5638 "util/configparser.c" +#line 5640 "util/configparser.c" break; case 530: /* server_neg_cache_size: VAR_NEG_CACHE_SIZE STRING_ARG */ -#line 2348 "util/configparser.y" +#line 2350 "util/configparser.y" { OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 5649 "util/configparser.c" +#line 5651 "util/configparser.c" break; case 531: /* server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG */ -#line 2356 "util/configparser.y" +#line 2358 "util/configparser.y" { OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -5704,21 +5706,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5708 "util/configparser.c" +#line 5710 "util/configparser.c" break; case 532: /* server_local_data: VAR_LOCAL_DATA STRING_ARG */ -#line 2412 "util/configparser.y" +#line 2414 "util/configparser.y" { OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str))) fatal_exit("out of memory adding local-data"); } -#line 5718 "util/configparser.c" +#line 5720 "util/configparser.c" break; case 533: /* server_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG */ -#line 2419 "util/configparser.y" +#line 2421 "util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5732,11 +5734,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5736 "util/configparser.c" +#line 5738 "util/configparser.c" break; case 534: /* server_minimal_responses: VAR_MINIMAL_RESPONSES STRING_ARG */ -#line 2434 "util/configparser.y" +#line 2436 "util/configparser.y" { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5745,11 +5747,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5749 "util/configparser.c" +#line 5751 "util/configparser.c" break; case 535: /* server_rrset_roundrobin: VAR_RRSET_ROUNDROBIN STRING_ARG */ -#line 2444 "util/configparser.y" +#line 2446 "util/configparser.y" { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5758,51 +5760,51 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5762 "util/configparser.c" +#line 5764 "util/configparser.c" break; case 536: /* server_unknown_server_time_limit: VAR_UNKNOWN_SERVER_TIME_LIMIT STRING_ARG */ -#line 2454 "util/configparser.y" +#line 2456 "util/configparser.y" { OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5772 "util/configparser.c" +#line 5774 "util/configparser.c" break; case 537: /* server_discard_timeout: VAR_DISCARD_TIMEOUT STRING_ARG */ -#line 2461 "util/configparser.y" +#line 2463 "util/configparser.y" { OUTYY(("P(server_discard_timeout:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->discard_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5782 "util/configparser.c" +#line 5784 "util/configparser.c" break; case 538: /* server_wait_limit: VAR_WAIT_LIMIT STRING_ARG */ -#line 2468 "util/configparser.y" +#line 2470 "util/configparser.y" { OUTYY(("P(server_wait_limit:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->wait_limit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5792 "util/configparser.c" +#line 5794 "util/configparser.c" break; case 539: /* server_wait_limit_cookie: VAR_WAIT_LIMIT_COOKIE STRING_ARG */ -#line 2475 "util/configparser.y" +#line 2477 "util/configparser.y" { OUTYY(("P(server_wait_limit_cookie:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->wait_limit_cookie = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5802 "util/configparser.c" +#line 5804 "util/configparser.c" break; case 540: /* server_wait_limit_netblock: VAR_WAIT_LIMIT_NETBLOCK STRING_ARG STRING_ARG */ -#line 2482 "util/configparser.y" +#line 2484 "util/configparser.y" { OUTYY(("P(server_wait_limit_netblock:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -5816,11 +5818,11 @@ yyreduce: "wait-limit-netblock"); } } -#line 5820 "util/configparser.c" +#line 5822 "util/configparser.c" break; case 541: /* server_wait_limit_cookie_netblock: VAR_WAIT_LIMIT_COOKIE_NETBLOCK STRING_ARG STRING_ARG */ -#line 2497 "util/configparser.y" +#line 2499 "util/configparser.y" { OUTYY(("P(server_wait_limit_cookie_netblock:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -5834,31 +5836,31 @@ yyreduce: "wait-limit-cookie-netblock"); } } -#line 5838 "util/configparser.c" +#line 5840 "util/configparser.c" break; case 542: /* server_max_udp_size: VAR_MAX_UDP_SIZE STRING_ARG */ -#line 2512 "util/configparser.y" +#line 2514 "util/configparser.y" { OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5848 "util/configparser.c" +#line 5850 "util/configparser.c" break; case 543: /* server_dns64_prefix: VAR_DNS64_PREFIX STRING_ARG */ -#line 2519 "util/configparser.y" +#line 2521 "util/configparser.y" { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 5858 "util/configparser.c" +#line 5860 "util/configparser.c" break; case 544: /* server_dns64_synthall: VAR_DNS64_SYNTHALL STRING_ARG */ -#line 2526 "util/configparser.y" +#line 2528 "util/configparser.y" { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5866,32 +5868,32 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5870 "util/configparser.c" +#line 5872 "util/configparser.c" break; case 545: /* server_dns64_ignore_aaaa: VAR_DNS64_IGNORE_AAAA STRING_ARG */ -#line 2535 "util/configparser.y" +#line 2537 "util/configparser.y" { OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa, (yyvsp[0].str))) fatal_exit("out of memory adding dns64-ignore-aaaa"); } -#line 5881 "util/configparser.c" +#line 5883 "util/configparser.c" break; case 546: /* server_nat64_prefix: VAR_NAT64_PREFIX STRING_ARG */ -#line 2543 "util/configparser.y" +#line 2545 "util/configparser.y" { OUTYY(("P(nat64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->nat64_prefix); cfg_parser->cfg->nat64_prefix = (yyvsp[0].str); } -#line 5891 "util/configparser.c" +#line 5893 "util/configparser.c" break; case 547: /* server_define_tag: VAR_DEFINE_TAG STRING_ARG */ -#line 2550 "util/configparser.y" +#line 2552 "util/configparser.y" { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -5904,11 +5906,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5908 "util/configparser.c" +#line 5910 "util/configparser.c" break; case 548: /* server_local_zone_tag: VAR_LOCAL_ZONE_TAG STRING_ARG STRING_ARG */ -#line 2564 "util/configparser.y" +#line 2566 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5928,11 +5930,11 @@ yyreduce: } } } -#line 5932 "util/configparser.c" +#line 5934 "util/configparser.c" break; case 549: /* server_access_control_tag: VAR_ACCESS_CONTROL_TAG STRING_ARG STRING_ARG */ -#line 2585 "util/configparser.y" +#line 2587 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5952,11 +5954,11 @@ yyreduce: } } } -#line 5956 "util/configparser.c" +#line 5958 "util/configparser.c" break; case 550: /* server_access_control_tag_action: VAR_ACCESS_CONTROL_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG */ -#line 2606 "util/configparser.y" +#line 2608 "util/configparser.y" { OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions, @@ -5967,11 +5969,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5971 "util/configparser.c" +#line 5973 "util/configparser.c" break; case 551: /* server_access_control_tag_data: VAR_ACCESS_CONTROL_TAG_DATA STRING_ARG STRING_ARG STRING_ARG */ -#line 2618 "util/configparser.y" +#line 2620 "util/configparser.y" { OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas, @@ -5982,11 +5984,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5986 "util/configparser.c" +#line 5988 "util/configparser.c" break; case 552: /* server_local_zone_override: VAR_LOCAL_ZONE_OVERRIDE STRING_ARG STRING_ARG STRING_ARG */ -#line 2630 "util/configparser.y" +#line 2632 "util/configparser.y" { OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides, @@ -5997,11 +5999,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 6001 "util/configparser.c" +#line 6003 "util/configparser.c" break; case 553: /* server_access_control_view: VAR_ACCESS_CONTROL_VIEW STRING_ARG STRING_ARG */ -#line 2642 "util/configparser.y" +#line 2644 "util/configparser.y" { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -6009,11 +6011,11 @@ yyreduce: yyerror("out of memory"); } } -#line 6013 "util/configparser.c" +#line 6015 "util/configparser.c" break; case 554: /* server_interface_tag: VAR_INTERFACE_TAG STRING_ARG STRING_ARG */ -#line 2651 "util/configparser.y" +#line 2653 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -6033,11 +6035,11 @@ yyreduce: } } } -#line 6037 "util/configparser.c" +#line 6039 "util/configparser.c" break; case 555: /* server_interface_tag_action: VAR_INTERFACE_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG */ -#line 2672 "util/configparser.y" +#line 2674 "util/configparser.y" { OUTYY(("P(server_interface_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->interface_tag_actions, @@ -6048,11 +6050,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 6052 "util/configparser.c" +#line 6054 "util/configparser.c" break; case 556: /* server_interface_tag_data: VAR_INTERFACE_TAG_DATA STRING_ARG STRING_ARG STRING_ARG */ -#line 2684 "util/configparser.y" +#line 2686 "util/configparser.y" { OUTYY(("P(server_interface_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str3list_insert(&cfg_parser->cfg->interface_tag_datas, @@ -6063,11 +6065,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 6067 "util/configparser.c" +#line 6069 "util/configparser.c" break; case 557: /* server_interface_view: VAR_INTERFACE_VIEW STRING_ARG STRING_ARG */ -#line 2696 "util/configparser.y" +#line 2698 "util/configparser.y" { OUTYY(("P(server_interface_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->interface_view, @@ -6075,11 +6077,11 @@ yyreduce: yyerror("out of memory"); } } -#line 6079 "util/configparser.c" +#line 6081 "util/configparser.c" break; case 558: /* server_response_ip_tag: VAR_RESPONSE_IP_TAG STRING_ARG STRING_ARG */ -#line 2705 "util/configparser.y" +#line 2707 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -6099,11 +6101,11 @@ yyreduce: } } } -#line 6103 "util/configparser.c" +#line 6105 "util/configparser.c" break; case 559: /* server_ip_ratelimit: VAR_IP_RATELIMIT STRING_ARG */ -#line 2726 "util/configparser.y" +#line 2728 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6111,11 +6113,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6115 "util/configparser.c" +#line 6117 "util/configparser.c" break; case 560: /* server_ip_ratelimit_cookie: VAR_IP_RATELIMIT_COOKIE STRING_ARG */ -#line 2735 "util/configparser.y" +#line 2737 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_cookie:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6123,11 +6125,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_cookie = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6127 "util/configparser.c" +#line 6129 "util/configparser.c" break; case 561: /* server_ratelimit: VAR_RATELIMIT STRING_ARG */ -#line 2744 "util/configparser.y" +#line 2746 "util/configparser.y" { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6135,33 +6137,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6139 "util/configparser.c" +#line 6141 "util/configparser.c" break; case 562: /* server_ip_ratelimit_size: VAR_IP_RATELIMIT_SIZE STRING_ARG */ -#line 2753 "util/configparser.y" +#line 2755 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 6150 "util/configparser.c" +#line 6152 "util/configparser.c" break; case 563: /* server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG */ -#line 2761 "util/configparser.y" +#line 2763 "util/configparser.y" { OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 6161 "util/configparser.c" +#line 6163 "util/configparser.c" break; case 564: /* server_ip_ratelimit_slabs: VAR_IP_RATELIMIT_SLABS STRING_ARG */ -#line 2769 "util/configparser.y" +#line 2771 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -6173,11 +6175,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6177 "util/configparser.c" +#line 6179 "util/configparser.c" break; case 565: /* server_ratelimit_slabs: VAR_RATELIMIT_SLABS STRING_ARG */ -#line 2782 "util/configparser.y" +#line 2784 "util/configparser.y" { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -6189,11 +6191,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6193 "util/configparser.c" +#line 6195 "util/configparser.c" break; case 566: /* server_ratelimit_for_domain: VAR_RATELIMIT_FOR_DOMAIN STRING_ARG STRING_ARG */ -#line 2795 "util/configparser.y" +#line 2797 "util/configparser.y" { OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -6207,11 +6209,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 6211 "util/configparser.c" +#line 6213 "util/configparser.c" break; case 567: /* server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG */ -#line 2810 "util/configparser.y" +#line 2812 "util/configparser.y" { OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) { @@ -6225,11 +6227,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 6229 "util/configparser.c" +#line 6231 "util/configparser.c" break; case 568: /* server_ip_ratelimit_factor: VAR_IP_RATELIMIT_FACTOR STRING_ARG */ -#line 2825 "util/configparser.y" +#line 2827 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6237,11 +6239,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6241 "util/configparser.c" +#line 6243 "util/configparser.c" break; case 569: /* server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG */ -#line 2834 "util/configparser.y" +#line 2836 "util/configparser.y" { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6249,11 +6251,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6253 "util/configparser.c" +#line 6255 "util/configparser.c" break; case 570: /* server_ip_ratelimit_backoff: VAR_IP_RATELIMIT_BACKOFF STRING_ARG */ -#line 2843 "util/configparser.y" +#line 2845 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_backoff:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6262,11 +6264,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6266 "util/configparser.c" +#line 6268 "util/configparser.c" break; case 571: /* server_ratelimit_backoff: VAR_RATELIMIT_BACKOFF STRING_ARG */ -#line 2853 "util/configparser.y" +#line 2855 "util/configparser.y" { OUTYY(("P(server_ratelimit_backoff:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6275,11 +6277,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6279 "util/configparser.c" +#line 6281 "util/configparser.c" break; case 572: /* server_outbound_msg_retry: VAR_OUTBOUND_MSG_RETRY STRING_ARG */ -#line 2863 "util/configparser.y" +#line 2865 "util/configparser.y" { OUTYY(("P(server_outbound_msg_retry:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6287,11 +6289,11 @@ yyreduce: else cfg_parser->cfg->outbound_msg_retry = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6291 "util/configparser.c" +#line 6293 "util/configparser.c" break; case 573: /* server_max_sent_count: VAR_MAX_SENT_COUNT STRING_ARG */ -#line 2872 "util/configparser.y" +#line 2874 "util/configparser.y" { OUTYY(("P(server_max_sent_count:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6299,11 +6301,11 @@ yyreduce: else cfg_parser->cfg->max_sent_count = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6303 "util/configparser.c" +#line 6305 "util/configparser.c" break; case 574: /* server_max_query_restarts: VAR_MAX_QUERY_RESTARTS STRING_ARG */ -#line 2881 "util/configparser.y" +#line 2883 "util/configparser.y" { OUTYY(("P(server_max_query_restarts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6311,20 +6313,20 @@ yyreduce: else cfg_parser->cfg->max_query_restarts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6315 "util/configparser.c" +#line 6317 "util/configparser.c" break; case 575: /* server_low_rtt: VAR_LOW_RTT STRING_ARG */ -#line 2890 "util/configparser.y" +#line 2892 "util/configparser.y" { OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n")); free((yyvsp[0].str)); } -#line 6324 "util/configparser.c" +#line 6326 "util/configparser.c" break; case 576: /* server_fast_server_num: VAR_FAST_SERVER_NUM STRING_ARG */ -#line 2896 "util/configparser.y" +#line 2898 "util/configparser.y" { OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) <= 0) @@ -6332,11 +6334,11 @@ yyreduce: else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6336 "util/configparser.c" +#line 6338 "util/configparser.c" break; case 577: /* server_fast_server_permil: VAR_FAST_SERVER_PERMIL STRING_ARG */ -#line 2905 "util/configparser.y" +#line 2907 "util/configparser.y" { OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6344,11 +6346,11 @@ yyreduce: else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6348 "util/configparser.c" +#line 6350 "util/configparser.c" break; case 578: /* server_qname_minimisation: VAR_QNAME_MINIMISATION STRING_ARG */ -#line 2914 "util/configparser.y" +#line 2916 "util/configparser.y" { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6357,11 +6359,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6361 "util/configparser.c" +#line 6363 "util/configparser.c" break; case 579: /* server_qname_minimisation_strict: VAR_QNAME_MINIMISATION_STRICT STRING_ARG */ -#line 2924 "util/configparser.y" +#line 2926 "util/configparser.y" { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6370,11 +6372,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6374 "util/configparser.c" +#line 6376 "util/configparser.c" break; case 580: /* server_pad_responses: VAR_PAD_RESPONSES STRING_ARG */ -#line 2934 "util/configparser.y" +#line 2936 "util/configparser.y" { OUTYY(("P(server_pad_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6383,11 +6385,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6387 "util/configparser.c" +#line 6389 "util/configparser.c" break; case 581: /* server_pad_responses_block_size: VAR_PAD_RESPONSES_BLOCK_SIZE STRING_ARG */ -#line 2944 "util/configparser.y" +#line 2946 "util/configparser.y" { OUTYY(("P(server_pad_responses_block_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6395,11 +6397,11 @@ yyreduce: else cfg_parser->cfg->pad_responses_block_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6399 "util/configparser.c" +#line 6401 "util/configparser.c" break; case 582: /* server_pad_queries: VAR_PAD_QUERIES STRING_ARG */ -#line 2953 "util/configparser.y" +#line 2955 "util/configparser.y" { OUTYY(("P(server_pad_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6408,11 +6410,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6412 "util/configparser.c" +#line 6414 "util/configparser.c" break; case 583: /* server_pad_queries_block_size: VAR_PAD_QUERIES_BLOCK_SIZE STRING_ARG */ -#line 2963 "util/configparser.y" +#line 2965 "util/configparser.y" { OUTYY(("P(server_pad_queries_block_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6420,11 +6422,11 @@ yyreduce: else cfg_parser->cfg->pad_queries_block_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6424 "util/configparser.c" +#line 6426 "util/configparser.c" break; case 584: /* server_ipsecmod_enabled: VAR_IPSECMOD_ENABLED STRING_ARG */ -#line 2972 "util/configparser.y" +#line 2974 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -6436,11 +6438,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6440 "util/configparser.c" +#line 6442 "util/configparser.c" break; case 585: /* server_ipsecmod_ignore_bogus: VAR_IPSECMOD_IGNORE_BOGUS STRING_ARG */ -#line 2985 "util/configparser.y" +#line 2987 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -6452,11 +6454,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6456 "util/configparser.c" +#line 6458 "util/configparser.c" break; case 586: /* server_ipsecmod_hook: VAR_IPSECMOD_HOOK STRING_ARG */ -#line 2998 "util/configparser.y" +#line 3000 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -6467,11 +6469,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6471 "util/configparser.c" +#line 6473 "util/configparser.c" break; case 587: /* server_ipsecmod_max_ttl: VAR_IPSECMOD_MAX_TTL STRING_ARG */ -#line 3010 "util/configparser.y" +#line 3012 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -6484,11 +6486,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6488 "util/configparser.c" +#line 6490 "util/configparser.c" break; case 588: /* server_ipsecmod_whitelist: VAR_IPSECMOD_WHITELIST STRING_ARG */ -#line 3024 "util/configparser.y" +#line 3026 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -6499,11 +6501,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6503 "util/configparser.c" +#line 6505 "util/configparser.c" break; case 589: /* server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG */ -#line 3036 "util/configparser.y" +#line 3038 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -6516,11 +6518,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6520 "util/configparser.c" +#line 6522 "util/configparser.c" break; case 590: /* server_edns_client_string: VAR_EDNS_CLIENT_STRING STRING_ARG STRING_ARG */ -#line 3050 "util/configparser.y" +#line 3052 "util/configparser.y" { OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert( @@ -6528,11 +6530,11 @@ yyreduce: fatal_exit("out of memory adding " "edns-client-string"); } -#line 6532 "util/configparser.c" +#line 6534 "util/configparser.c" break; case 591: /* server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG */ -#line 3059 "util/configparser.y" +#line 3061 "util/configparser.y" { OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -6542,11 +6544,11 @@ yyreduce: else cfg_parser->cfg->edns_client_string_opcode = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6546 "util/configparser.c" +#line 6548 "util/configparser.c" break; case 592: /* server_ede: VAR_EDE STRING_ARG */ -#line 3070 "util/configparser.y" +#line 3072 "util/configparser.y" { OUTYY(("P(server_ede:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6554,11 +6556,11 @@ yyreduce: else cfg_parser->cfg->ede = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6558 "util/configparser.c" +#line 6560 "util/configparser.c" break; case 593: /* server_dns_error_reporting: VAR_DNS_ERROR_REPORTING STRING_ARG */ -#line 3079 "util/configparser.y" +#line 3081 "util/configparser.y" { OUTYY(("P(server_dns_error_reporting:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6566,21 +6568,21 @@ yyreduce: else cfg_parser->cfg->dns_error_reporting = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6570 "util/configparser.c" +#line 6572 "util/configparser.c" break; case 594: /* server_proxy_protocol_port: VAR_PROXY_PROTOCOL_PORT STRING_ARG */ -#line 3088 "util/configparser.y" +#line 3090 "util/configparser.y" { OUTYY(("P(server_proxy_protocol_port:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->proxy_protocol_port, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6580 "util/configparser.c" +#line 6582 "util/configparser.c" break; case 595: /* stub_name: VAR_NAME STRING_ARG */ -#line 3095 "util/configparser.y" +#line 3097 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -6589,31 +6591,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 6593 "util/configparser.c" +#line 6595 "util/configparser.c" break; case 596: /* stub_host: VAR_STUB_HOST STRING_ARG */ -#line 3105 "util/configparser.y" +#line 3107 "util/configparser.y" { OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6603 "util/configparser.c" +#line 6605 "util/configparser.c" break; case 597: /* stub_addr: VAR_STUB_ADDR STRING_ARG */ -#line 3112 "util/configparser.y" +#line 3114 "util/configparser.y" { OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6613 "util/configparser.c" +#line 6615 "util/configparser.c" break; case 598: /* stub_first: VAR_STUB_FIRST STRING_ARG */ -#line 3119 "util/configparser.y" +#line 3121 "util/configparser.y" { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6621,11 +6623,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6625 "util/configparser.c" +#line 6627 "util/configparser.c" break; case 599: /* stub_no_cache: VAR_STUB_NO_CACHE STRING_ARG */ -#line 3128 "util/configparser.y" +#line 3130 "util/configparser.y" { OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6633,11 +6635,11 @@ yyreduce: else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6637 "util/configparser.c" +#line 6639 "util/configparser.c" break; case 600: /* stub_ssl_upstream: VAR_STUB_SSL_UPSTREAM STRING_ARG */ -#line 3137 "util/configparser.y" +#line 3139 "util/configparser.y" { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6646,11 +6648,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6650 "util/configparser.c" +#line 6652 "util/configparser.c" break; case 601: /* stub_tcp_upstream: VAR_STUB_TCP_UPSTREAM STRING_ARG */ -#line 3147 "util/configparser.y" +#line 3149 "util/configparser.y" { OUTYY(("P(stub-tcp-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6659,11 +6661,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6663 "util/configparser.c" +#line 6665 "util/configparser.c" break; case 602: /* stub_prime: VAR_STUB_PRIME STRING_ARG */ -#line 3157 "util/configparser.y" +#line 3159 "util/configparser.y" { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6672,11 +6674,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6676 "util/configparser.c" +#line 6678 "util/configparser.c" break; case 603: /* forward_name: VAR_NAME STRING_ARG */ -#line 3167 "util/configparser.y" +#line 3169 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -6685,31 +6687,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 6689 "util/configparser.c" +#line 6691 "util/configparser.c" break; case 604: /* forward_host: VAR_FORWARD_HOST STRING_ARG */ -#line 3177 "util/configparser.y" +#line 3179 "util/configparser.y" { OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6699 "util/configparser.c" +#line 6701 "util/configparser.c" break; case 605: /* forward_addr: VAR_FORWARD_ADDR STRING_ARG */ -#line 3184 "util/configparser.y" +#line 3186 "util/configparser.y" { OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6709 "util/configparser.c" +#line 6711 "util/configparser.c" break; case 606: /* forward_first: VAR_FORWARD_FIRST STRING_ARG */ -#line 3191 "util/configparser.y" +#line 3193 "util/configparser.y" { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6717,11 +6719,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6721 "util/configparser.c" +#line 6723 "util/configparser.c" break; case 607: /* forward_no_cache: VAR_FORWARD_NO_CACHE STRING_ARG */ -#line 3200 "util/configparser.y" +#line 3202 "util/configparser.y" { OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6729,11 +6731,11 @@ yyreduce: else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6733 "util/configparser.c" +#line 6735 "util/configparser.c" break; case 608: /* forward_ssl_upstream: VAR_FORWARD_SSL_UPSTREAM STRING_ARG */ -#line 3209 "util/configparser.y" +#line 3211 "util/configparser.y" { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6742,11 +6744,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6746 "util/configparser.c" +#line 6748 "util/configparser.c" break; case 609: /* forward_tcp_upstream: VAR_FORWARD_TCP_UPSTREAM STRING_ARG */ -#line 3219 "util/configparser.y" +#line 3221 "util/configparser.y" { OUTYY(("P(forward-tcp-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6755,11 +6757,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6759 "util/configparser.c" +#line 6761 "util/configparser.c" break; case 610: /* auth_name: VAR_NAME STRING_ARG */ -#line 3229 "util/configparser.y" +#line 3231 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -6768,52 +6770,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 6772 "util/configparser.c" +#line 6774 "util/configparser.c" break; case 611: /* auth_zonefile: VAR_ZONEFILE STRING_ARG */ -#line 3239 "util/configparser.y" +#line 3241 "util/configparser.y" { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 6782 "util/configparser.c" +#line 6784 "util/configparser.c" break; case 612: /* auth_master: VAR_MASTER STRING_ARG */ -#line 3246 "util/configparser.y" +#line 3248 "util/configparser.y" { OUTYY(("P(master:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6792 "util/configparser.c" +#line 6794 "util/configparser.c" break; case 613: /* auth_url: VAR_URL STRING_ARG */ -#line 3253 "util/configparser.y" +#line 3255 "util/configparser.y" { OUTYY(("P(url:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6802 "util/configparser.c" +#line 6804 "util/configparser.c" break; case 614: /* auth_allow_notify: VAR_ALLOW_NOTIFY STRING_ARG */ -#line 3260 "util/configparser.y" +#line 3262 "util/configparser.y" { OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify, (yyvsp[0].str))) yyerror("out of memory"); } -#line 6813 "util/configparser.c" +#line 6815 "util/configparser.c" break; case 615: /* auth_zonemd_check: VAR_ZONEMD_CHECK STRING_ARG */ -#line 3268 "util/configparser.y" +#line 3270 "util/configparser.y" { OUTYY(("P(zonemd-check:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6822,11 +6824,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6826 "util/configparser.c" +#line 6828 "util/configparser.c" break; case 616: /* auth_zonemd_reject_absence: VAR_ZONEMD_REJECT_ABSENCE STRING_ARG */ -#line 3278 "util/configparser.y" +#line 3280 "util/configparser.y" { OUTYY(("P(zonemd-reject-absence:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6835,11 +6837,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6839 "util/configparser.c" +#line 6841 "util/configparser.c" break; case 617: /* auth_for_downstream: VAR_FOR_DOWNSTREAM STRING_ARG */ -#line 3288 "util/configparser.y" +#line 3290 "util/configparser.y" { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6848,11 +6850,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6852 "util/configparser.c" +#line 6854 "util/configparser.c" break; case 618: /* auth_for_upstream: VAR_FOR_UPSTREAM STRING_ARG */ -#line 3298 "util/configparser.y" +#line 3300 "util/configparser.y" { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6861,11 +6863,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6865 "util/configparser.c" +#line 6867 "util/configparser.c" break; case 619: /* auth_fallback_enabled: VAR_FALLBACK_ENABLED STRING_ARG */ -#line 3308 "util/configparser.y" +#line 3310 "util/configparser.y" { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -6874,11 +6876,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6878 "util/configparser.c" +#line 6880 "util/configparser.c" break; case 620: /* view_name: VAR_NAME STRING_ARG */ -#line 3318 "util/configparser.y" +#line 3320 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -6887,11 +6889,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 6891 "util/configparser.c" +#line 6893 "util/configparser.c" break; case 621: /* view_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG */ -#line 3328 "util/configparser.y" +#line 3330 "util/configparser.y" { OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 && @@ -6946,11 +6948,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 6950 "util/configparser.c" +#line 6952 "util/configparser.c" break; case 622: /* view_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG */ -#line 3384 "util/configparser.y" +#line 3386 "util/configparser.y" { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -6959,33 +6961,33 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 6963 "util/configparser.c" +#line 6965 "util/configparser.c" break; case 623: /* view_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG */ -#line 3394 "util/configparser.y" +#line 3396 "util/configparser.y" { OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert( &cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 6974 "util/configparser.c" +#line 6976 "util/configparser.c" break; case 624: /* view_local_data: VAR_LOCAL_DATA STRING_ARG */ -#line 3402 "util/configparser.y" +#line 3404 "util/configparser.y" { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { fatal_exit("out of memory adding local-data"); } } -#line 6985 "util/configparser.c" +#line 6987 "util/configparser.c" break; case 625: /* view_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG */ -#line 3410 "util/configparser.y" +#line 3412 "util/configparser.y" { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -6999,11 +7001,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 7003 "util/configparser.c" +#line 7005 "util/configparser.c" break; case 626: /* view_first: VAR_VIEW_FIRST STRING_ARG */ -#line 3425 "util/configparser.y" +#line 3427 "util/configparser.y" { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7011,20 +7013,20 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7015 "util/configparser.c" +#line 7017 "util/configparser.c" break; case 627: /* rcstart: VAR_REMOTE_CONTROL */ -#line 3434 "util/configparser.y" +#line 3436 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); cfg_parser->started_toplevel = 1; } -#line 7024 "util/configparser.c" +#line 7026 "util/configparser.c" break; case 638: /* rc_control_enable: VAR_CONTROL_ENABLE STRING_ARG */ -#line 3446 "util/configparser.y" +#line 3448 "util/configparser.y" { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7033,11 +7035,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7037 "util/configparser.c" +#line 7039 "util/configparser.c" break; case 639: /* rc_control_port: VAR_CONTROL_PORT STRING_ARG */ -#line 3456 "util/configparser.y" +#line 3458 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -7045,80 +7047,80 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 7049 "util/configparser.c" +#line 7051 "util/configparser.c" break; case 640: /* rc_control_interface: VAR_CONTROL_INTERFACE STRING_ARG */ -#line 3465 "util/configparser.y" +#line 3467 "util/configparser.y" { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 7059 "util/configparser.c" +#line 7061 "util/configparser.c" break; case 641: /* rc_control_use_cert: VAR_CONTROL_USE_CERT STRING_ARG */ -#line 3472 "util/configparser.y" +#line 3474 "util/configparser.y" { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7069 "util/configparser.c" +#line 7071 "util/configparser.c" break; case 642: /* rc_server_key_file: VAR_SERVER_KEY_FILE STRING_ARG */ -#line 3479 "util/configparser.y" +#line 3481 "util/configparser.y" { OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_key_file); cfg_parser->cfg->server_key_file = (yyvsp[0].str); } -#line 7079 "util/configparser.c" +#line 7081 "util/configparser.c" break; case 643: /* rc_server_cert_file: VAR_SERVER_CERT_FILE STRING_ARG */ -#line 3486 "util/configparser.y" +#line 3488 "util/configparser.y" { OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->server_cert_file); cfg_parser->cfg->server_cert_file = (yyvsp[0].str); } -#line 7089 "util/configparser.c" +#line 7091 "util/configparser.c" break; case 644: /* rc_control_key_file: VAR_CONTROL_KEY_FILE STRING_ARG */ -#line 3493 "util/configparser.y" +#line 3495 "util/configparser.y" { OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_key_file); cfg_parser->cfg->control_key_file = (yyvsp[0].str); } -#line 7099 "util/configparser.c" +#line 7101 "util/configparser.c" break; case 645: /* rc_control_cert_file: VAR_CONTROL_CERT_FILE STRING_ARG */ -#line 3500 "util/configparser.y" +#line 3502 "util/configparser.y" { OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->control_cert_file); cfg_parser->cfg->control_cert_file = (yyvsp[0].str); } -#line 7109 "util/configparser.c" +#line 7111 "util/configparser.c" break; case 646: /* dtstart: VAR_DNSTAP */ -#line 3507 "util/configparser.y" +#line 3509 "util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); cfg_parser->started_toplevel = 1; } -#line 7118 "util/configparser.c" +#line 7120 "util/configparser.c" break; case 669: /* dt_dnstap_enable: VAR_DNSTAP_ENABLE STRING_ARG */ -#line 3529 "util/configparser.y" +#line 3531 "util/configparser.y" { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7126,11 +7128,11 @@ yyreduce: else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7130 "util/configparser.c" +#line 7132 "util/configparser.c" break; case 670: /* dt_dnstap_bidirectional: VAR_DNSTAP_BIDIRECTIONAL STRING_ARG */ -#line 3538 "util/configparser.y" +#line 3540 "util/configparser.y" { OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7139,31 +7141,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7143 "util/configparser.c" +#line 7145 "util/configparser.c" break; case 671: /* dt_dnstap_socket_path: VAR_DNSTAP_SOCKET_PATH STRING_ARG */ -#line 3548 "util/configparser.y" +#line 3550 "util/configparser.y" { OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_socket_path); cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str); } -#line 7153 "util/configparser.c" +#line 7155 "util/configparser.c" break; case 672: /* dt_dnstap_ip: VAR_DNSTAP_IP STRING_ARG */ -#line 3555 "util/configparser.y" +#line 3557 "util/configparser.y" { OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_ip); cfg_parser->cfg->dnstap_ip = (yyvsp[0].str); } -#line 7163 "util/configparser.c" +#line 7165 "util/configparser.c" break; case 673: /* dt_dnstap_tls: VAR_DNSTAP_TLS STRING_ARG */ -#line 3562 "util/configparser.y" +#line 3564 "util/configparser.y" { OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7171,51 +7173,51 @@ yyreduce: else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7175 "util/configparser.c" +#line 7177 "util/configparser.c" break; case 674: /* dt_dnstap_tls_server_name: VAR_DNSTAP_TLS_SERVER_NAME STRING_ARG */ -#line 3571 "util/configparser.y" +#line 3573 "util/configparser.y" { OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_server_name); cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str); } -#line 7185 "util/configparser.c" +#line 7187 "util/configparser.c" break; case 675: /* dt_dnstap_tls_cert_bundle: VAR_DNSTAP_TLS_CERT_BUNDLE STRING_ARG */ -#line 3578 "util/configparser.y" +#line 3580 "util/configparser.y" { OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_cert_bundle); cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str); } -#line 7195 "util/configparser.c" +#line 7197 "util/configparser.c" break; case 676: /* dt_dnstap_tls_client_key_file: VAR_DNSTAP_TLS_CLIENT_KEY_FILE STRING_ARG */ -#line 3585 "util/configparser.y" +#line 3587 "util/configparser.y" { OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_client_key_file); cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str); } -#line 7205 "util/configparser.c" +#line 7207 "util/configparser.c" break; case 677: /* dt_dnstap_tls_client_cert_file: VAR_DNSTAP_TLS_CLIENT_CERT_FILE STRING_ARG */ -#line 3592 "util/configparser.y" +#line 3594 "util/configparser.y" { OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_tls_client_cert_file); cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str); } -#line 7215 "util/configparser.c" +#line 7217 "util/configparser.c" break; case 678: /* dt_dnstap_send_identity: VAR_DNSTAP_SEND_IDENTITY STRING_ARG */ -#line 3599 "util/configparser.y" +#line 3601 "util/configparser.y" { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7223,11 +7225,11 @@ yyreduce: else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7227 "util/configparser.c" +#line 7229 "util/configparser.c" break; case 679: /* dt_dnstap_send_version: VAR_DNSTAP_SEND_VERSION STRING_ARG */ -#line 3608 "util/configparser.y" +#line 3610 "util/configparser.y" { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7235,31 +7237,31 @@ yyreduce: else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7239 "util/configparser.c" +#line 7241 "util/configparser.c" break; case 680: /* dt_dnstap_identity: VAR_DNSTAP_IDENTITY STRING_ARG */ -#line 3617 "util/configparser.y" +#line 3619 "util/configparser.y" { OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_identity); cfg_parser->cfg->dnstap_identity = (yyvsp[0].str); } -#line 7249 "util/configparser.c" +#line 7251 "util/configparser.c" break; case 681: /* dt_dnstap_version: VAR_DNSTAP_VERSION STRING_ARG */ -#line 3624 "util/configparser.y" +#line 3626 "util/configparser.y" { OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnstap_version); cfg_parser->cfg->dnstap_version = (yyvsp[0].str); } -#line 7259 "util/configparser.c" +#line 7261 "util/configparser.c" break; case 682: /* dt_dnstap_log_resolver_query_messages: VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES STRING_ARG */ -#line 3631 "util/configparser.y" +#line 3633 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7268,11 +7270,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7272 "util/configparser.c" +#line 7274 "util/configparser.c" break; case 683: /* dt_dnstap_log_resolver_response_messages: VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES STRING_ARG */ -#line 3641 "util/configparser.y" +#line 3643 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7281,11 +7283,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7285 "util/configparser.c" +#line 7287 "util/configparser.c" break; case 684: /* dt_dnstap_log_client_query_messages: VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES STRING_ARG */ -#line 3651 "util/configparser.y" +#line 3653 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7294,11 +7296,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7298 "util/configparser.c" +#line 7300 "util/configparser.c" break; case 685: /* dt_dnstap_log_client_response_messages: VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES STRING_ARG */ -#line 3661 "util/configparser.y" +#line 3663 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7307,11 +7309,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7311 "util/configparser.c" +#line 7313 "util/configparser.c" break; case 686: /* dt_dnstap_log_forwarder_query_messages: VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES STRING_ARG */ -#line 3671 "util/configparser.y" +#line 3673 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7320,11 +7322,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7324 "util/configparser.c" +#line 7326 "util/configparser.c" break; case 687: /* dt_dnstap_log_forwarder_response_messages: VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES STRING_ARG */ -#line 3681 "util/configparser.y" +#line 3683 "util/configparser.y" { OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7333,11 +7335,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7337 "util/configparser.c" +#line 7339 "util/configparser.c" break; case 688: /* dt_dnstap_sample_rate: VAR_DNSTAP_SAMPLE_RATE STRING_ARG */ -#line 3691 "util/configparser.y" +#line 3693 "util/configparser.y" { OUTYY(("P(dt_dnstap_sample_rate:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -7347,49 +7349,49 @@ yyreduce: else cfg_parser->cfg->dnstap_sample_rate = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 7351 "util/configparser.c" +#line 7353 "util/configparser.c" break; case 689: /* pythonstart: VAR_PYTHON */ -#line 3702 "util/configparser.y" +#line 3704 "util/configparser.y" { OUTYY(("\nP(python:)\n")); cfg_parser->started_toplevel = 1; } -#line 7360 "util/configparser.c" +#line 7362 "util/configparser.c" break; case 693: /* py_script: VAR_PYTHON_SCRIPT STRING_ARG */ -#line 3712 "util/configparser.y" +#line 3714 "util/configparser.y" { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str))) yyerror("out of memory"); } -#line 7370 "util/configparser.c" +#line 7372 "util/configparser.c" break; case 694: /* dynlibstart: VAR_DYNLIB */ -#line 3719 "util/configparser.y" +#line 3721 "util/configparser.y" { OUTYY(("\nP(dynlib:)\n")); cfg_parser->started_toplevel = 1; } -#line 7379 "util/configparser.c" +#line 7381 "util/configparser.c" break; case 698: /* dl_file: VAR_DYNLIB_FILE STRING_ARG */ -#line 3729 "util/configparser.y" +#line 3731 "util/configparser.y" { OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str))) yyerror("out of memory"); } -#line 7389 "util/configparser.c" +#line 7391 "util/configparser.c" break; case 699: /* server_disable_dnssec_lame_check: VAR_DISABLE_DNSSEC_LAME_CHECK STRING_ARG */ -#line 3736 "util/configparser.y" +#line 3738 "util/configparser.y" { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7398,21 +7400,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7402 "util/configparser.c" +#line 7404 "util/configparser.c" break; case 700: /* server_log_identity: VAR_LOG_IDENTITY STRING_ARG */ -#line 3746 "util/configparser.y" +#line 3748 "util/configparser.y" { OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->log_identity); cfg_parser->cfg->log_identity = (yyvsp[0].str); } -#line 7412 "util/configparser.c" +#line 7414 "util/configparser.c" break; case 701: /* server_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG */ -#line 3753 "util/configparser.y" +#line 3755 "util/configparser.y" { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -7420,31 +7422,31 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 7424 "util/configparser.c" +#line 7426 "util/configparser.c" break; case 702: /* server_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG */ -#line 3762 "util/configparser.y" +#line 3764 "util/configparser.y" { OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip-data"); } -#line 7435 "util/configparser.c" +#line 7437 "util/configparser.c" break; case 703: /* dnscstart: VAR_DNSCRYPT */ -#line 3770 "util/configparser.y" +#line 3772 "util/configparser.y" { OUTYY(("\nP(dnscrypt:)\n")); cfg_parser->started_toplevel = 1; } -#line 7444 "util/configparser.c" +#line 7446 "util/configparser.c" break; case 716: /* dnsc_dnscrypt_enable: VAR_DNSCRYPT_ENABLE STRING_ARG */ -#line 3787 "util/configparser.y" +#line 3789 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7452,11 +7454,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7456 "util/configparser.c" +#line 7458 "util/configparser.c" break; case 717: /* dnsc_dnscrypt_port: VAR_DNSCRYPT_PORT STRING_ARG */ -#line 3796 "util/configparser.y" +#line 3798 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -7464,21 +7466,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 7468 "util/configparser.c" +#line 7470 "util/configparser.c" break; case 718: /* dnsc_dnscrypt_provider: VAR_DNSCRYPT_PROVIDER STRING_ARG */ -#line 3805 "util/configparser.y" +#line 3807 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dnscrypt_provider); cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str); } -#line 7478 "util/configparser.c" +#line 7480 "util/configparser.c" break; case 719: /* dnsc_dnscrypt_provider_cert: VAR_DNSCRYPT_PROVIDER_CERT STRING_ARG */ -#line 3812 "util/configparser.y" +#line 3814 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -7486,21 +7488,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 7490 "util/configparser.c" +#line 7492 "util/configparser.c" break; case 720: /* dnsc_dnscrypt_provider_cert_rotated: VAR_DNSCRYPT_PROVIDER_CERT_ROTATED STRING_ARG */ -#line 3821 "util/configparser.y" +#line 3823 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert-rotated"); } -#line 7500 "util/configparser.c" +#line 7502 "util/configparser.c" break; case 721: /* dnsc_dnscrypt_secret_key: VAR_DNSCRYPT_SECRET_KEY STRING_ARG */ -#line 3828 "util/configparser.y" +#line 3830 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -7508,22 +7510,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 7512 "util/configparser.c" +#line 7514 "util/configparser.c" break; case 722: /* dnsc_dnscrypt_shared_secret_cache_size: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE STRING_ARG */ -#line 3837 "util/configparser.y" +#line 3839 "util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 7523 "util/configparser.c" +#line 7525 "util/configparser.c" break; case 723: /* dnsc_dnscrypt_shared_secret_cache_slabs: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS STRING_ARG */ -#line 3845 "util/configparser.y" +#line 3847 "util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -7535,22 +7537,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 7539 "util/configparser.c" +#line 7541 "util/configparser.c" break; case 724: /* dnsc_dnscrypt_nonce_cache_size: VAR_DNSCRYPT_NONCE_CACHE_SIZE STRING_ARG */ -#line 3858 "util/configparser.y" +#line 3860 "util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size)) yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 7550 "util/configparser.c" +#line 7552 "util/configparser.c" break; case 725: /* dnsc_dnscrypt_nonce_cache_slabs: VAR_DNSCRYPT_NONCE_CACHE_SLABS STRING_ARG */ -#line 3866 "util/configparser.y" +#line 3868 "util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) { @@ -7562,20 +7564,20 @@ yyreduce: } free((yyvsp[0].str)); } -#line 7566 "util/configparser.c" +#line 7568 "util/configparser.c" break; case 726: /* cachedbstart: VAR_CACHEDB */ -#line 3879 "util/configparser.y" +#line 3881 "util/configparser.y" { OUTYY(("\nP(cachedb:)\n")); cfg_parser->started_toplevel = 1; } -#line 7575 "util/configparser.c" +#line 7577 "util/configparser.c" break; case 750: /* cachedb_backend_name: VAR_CACHEDB_BACKEND STRING_ARG */ -#line 3899 "util/configparser.y" +#line 3901 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -7586,11 +7588,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7590 "util/configparser.c" +#line 7592 "util/configparser.c" break; case 751: /* cachedb_secret_seed: VAR_CACHEDB_SECRETSEED STRING_ARG */ -#line 3911 "util/configparser.y" +#line 3913 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -7601,11 +7603,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7605 "util/configparser.c" +#line 7607 "util/configparser.c" break; case 752: /* cachedb_no_store: VAR_CACHEDB_NO_STORE STRING_ARG */ -#line 3923 "util/configparser.y" +#line 3925 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(cachedb_no_store:%s)\n", (yyvsp[0].str))); @@ -7617,11 +7619,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7621 "util/configparser.c" +#line 7623 "util/configparser.c" break; case 753: /* cachedb_check_when_serve_expired: VAR_CACHEDB_CHECK_WHEN_SERVE_EXPIRED STRING_ARG */ -#line 3936 "util/configparser.y" +#line 3938 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(cachedb_check_when_serve_expired:%s)\n", (yyvsp[0].str))); @@ -7633,11 +7635,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7637 "util/configparser.c" +#line 7639 "util/configparser.c" break; case 754: /* redis_server_host: VAR_CACHEDB_REDISHOST STRING_ARG */ -#line 3949 "util/configparser.y" +#line 3951 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -7648,11 +7650,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7652 "util/configparser.c" +#line 7654 "util/configparser.c" break; case 755: /* redis_replica_server_host: VAR_CACHEDB_REDISREPLICAHOST STRING_ARG */ -#line 3961 "util/configparser.y" +#line 3963 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_replica_server_host:%s)\n", (yyvsp[0].str))); @@ -7663,11 +7665,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7667 "util/configparser.c" +#line 7669 "util/configparser.c" break; case 756: /* redis_server_port: VAR_CACHEDB_REDISPORT STRING_ARG */ -#line 3973 "util/configparser.y" +#line 3975 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -7681,11 +7683,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7685 "util/configparser.c" +#line 7687 "util/configparser.c" break; case 757: /* redis_replica_server_port: VAR_CACHEDB_REDISREPLICAPORT STRING_ARG */ -#line 3988 "util/configparser.y" +#line 3990 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -7699,11 +7701,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7703 "util/configparser.c" +#line 7705 "util/configparser.c" break; case 758: /* redis_server_path: VAR_CACHEDB_REDISPATH STRING_ARG */ -#line 4003 "util/configparser.y" +#line 4005 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_path:%s)\n", (yyvsp[0].str))); @@ -7714,11 +7716,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7718 "util/configparser.c" +#line 7720 "util/configparser.c" break; case 759: /* redis_replica_server_path: VAR_CACHEDB_REDISREPLICAPATH STRING_ARG */ -#line 4015 "util/configparser.y" +#line 4017 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_replica_server_path:%s)\n", (yyvsp[0].str))); @@ -7729,11 +7731,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7733 "util/configparser.c" +#line 7735 "util/configparser.c" break; case 760: /* redis_server_password: VAR_CACHEDB_REDISPASSWORD STRING_ARG */ -#line 4027 "util/configparser.y" +#line 4029 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_password:%s)\n", (yyvsp[0].str))); @@ -7744,11 +7746,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7748 "util/configparser.c" +#line 7750 "util/configparser.c" break; case 761: /* redis_replica_server_password: VAR_CACHEDB_REDISREPLICAPASSWORD STRING_ARG */ -#line 4039 "util/configparser.y" +#line 4041 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_replica_server_password:%s)\n", (yyvsp[0].str))); @@ -7759,11 +7761,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 7763 "util/configparser.c" +#line 7765 "util/configparser.c" break; case 762: /* redis_timeout: VAR_CACHEDB_REDISTIMEOUT STRING_ARG */ -#line 4051 "util/configparser.y" +#line 4053 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -7775,11 +7777,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7779 "util/configparser.c" +#line 7781 "util/configparser.c" break; case 763: /* redis_replica_timeout: VAR_CACHEDB_REDISREPLICATIMEOUT STRING_ARG */ -#line 4064 "util/configparser.y" +#line 4066 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_replica_timeout:%s)\n", (yyvsp[0].str))); @@ -7791,11 +7793,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7795 "util/configparser.c" +#line 7797 "util/configparser.c" break; case 764: /* redis_command_timeout: VAR_CACHEDB_REDISCOMMANDTIMEOUT STRING_ARG */ -#line 4077 "util/configparser.y" +#line 4079 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_command_timeout:%s)\n", (yyvsp[0].str))); @@ -7807,11 +7809,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7811 "util/configparser.c" +#line 7813 "util/configparser.c" break; case 765: /* redis_replica_command_timeout: VAR_CACHEDB_REDISREPLICACOMMANDTIMEOUT STRING_ARG */ -#line 4090 "util/configparser.y" +#line 4092 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_replica_command_timeout:%s)\n", (yyvsp[0].str))); @@ -7823,11 +7825,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7827 "util/configparser.c" +#line 7829 "util/configparser.c" break; case 766: /* redis_connect_timeout: VAR_CACHEDB_REDISCONNECTTIMEOUT STRING_ARG */ -#line 4103 "util/configparser.y" +#line 4105 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_connect_timeout:%s)\n", (yyvsp[0].str))); @@ -7839,11 +7841,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7843 "util/configparser.c" +#line 7845 "util/configparser.c" break; case 767: /* redis_replica_connect_timeout: VAR_CACHEDB_REDISREPLICACONNECTTIMEOUT STRING_ARG */ -#line 4116 "util/configparser.y" +#line 4118 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_replica_connect_timeout:%s)\n", (yyvsp[0].str))); @@ -7855,11 +7857,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7859 "util/configparser.c" +#line 7861 "util/configparser.c" break; case 768: /* redis_expire_records: VAR_CACHEDB_REDISEXPIRERECORDS STRING_ARG */ -#line 4129 "util/configparser.y" +#line 4131 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str))); @@ -7871,11 +7873,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7875 "util/configparser.c" +#line 7877 "util/configparser.c" break; case 769: /* redis_logical_db: VAR_CACHEDB_REDISLOGICALDB STRING_ARG */ -#line 4142 "util/configparser.y" +#line 4144 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int db; @@ -7889,11 +7891,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7893 "util/configparser.c" +#line 7895 "util/configparser.c" break; case 770: /* redis_replica_logical_db: VAR_CACHEDB_REDISREPLICALOGICALDB STRING_ARG */ -#line 4157 "util/configparser.y" +#line 4159 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int db; @@ -7907,11 +7909,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 7911 "util/configparser.c" +#line 7913 "util/configparser.c" break; case 771: /* server_tcp_connection_limit: VAR_TCP_CONNECTION_LIMIT STRING_ARG STRING_ARG */ -#line 4172 "util/configparser.y" +#line 4174 "util/configparser.y" { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -7921,11 +7923,11 @@ yyreduce: fatal_exit("out of memory adding tcp connection limit"); } } -#line 7925 "util/configparser.c" +#line 7927 "util/configparser.c" break; case 772: /* server_answer_cookie: VAR_ANSWER_COOKIE STRING_ARG */ -#line 4183 "util/configparser.y" +#line 4185 "util/configparser.y" { OUTYY(("P(server_answer_cookie:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -7933,11 +7935,11 @@ yyreduce: else cfg_parser->cfg->do_answer_cookie = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 7937 "util/configparser.c" +#line 7939 "util/configparser.c" break; case 773: /* server_cookie_secret: VAR_COOKIE_SECRET STRING_ARG */ -#line 4192 "util/configparser.y" +#line 4194 "util/configparser.y" { uint8_t secret[32]; size_t secret_len = sizeof(secret); @@ -7952,21 +7954,21 @@ yyreduce: } free((yyvsp[0].str)); } -#line 7956 "util/configparser.c" +#line 7958 "util/configparser.c" break; case 774: /* server_cookie_secret_file: VAR_COOKIE_SECRET_FILE STRING_ARG */ -#line 4208 "util/configparser.y" +#line 4210 "util/configparser.y" { OUTYY(("P(cookie_secret_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->cookie_secret_file); cfg_parser->cfg->cookie_secret_file = (yyvsp[0].str); } -#line 7966 "util/configparser.c" +#line 7968 "util/configparser.c" break; case 775: /* server_iter_scrub_ns: VAR_ITER_SCRUB_NS STRING_ARG */ -#line 4215 "util/configparser.y" +#line 4217 "util/configparser.y" { OUTYY(("P(server_iter_scrub_ns:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -7974,11 +7976,11 @@ yyreduce: else cfg_parser->cfg->iter_scrub_ns = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 7978 "util/configparser.c" +#line 7980 "util/configparser.c" break; case 776: /* server_iter_scrub_cname: VAR_ITER_SCRUB_CNAME STRING_ARG */ -#line 4224 "util/configparser.y" +#line 4226 "util/configparser.y" { OUTYY(("P(server_iter_scrub_cname:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -7986,11 +7988,11 @@ yyreduce: else cfg_parser->cfg->iter_scrub_cname = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 7990 "util/configparser.c" +#line 7992 "util/configparser.c" break; case 777: /* server_max_global_quota: VAR_MAX_GLOBAL_QUOTA STRING_ARG */ -#line 4233 "util/configparser.y" +#line 4235 "util/configparser.y" { OUTYY(("P(server_max_global_quota:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -7998,20 +8000,20 @@ yyreduce: else cfg_parser->cfg->max_global_quota = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 8002 "util/configparser.c" +#line 8004 "util/configparser.c" break; case 778: /* ipsetstart: VAR_IPSET */ -#line 4242 "util/configparser.y" +#line 4244 "util/configparser.y" { OUTYY(("\nP(ipset:)\n")); cfg_parser->started_toplevel = 1; } -#line 8011 "util/configparser.c" +#line 8013 "util/configparser.c" break; case 783: /* ipset_name_v4: VAR_IPSET_NAME_V4 STRING_ARG */ -#line 4252 "util/configparser.y" +#line 4254 "util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str))); @@ -8025,11 +8027,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 8029 "util/configparser.c" +#line 8031 "util/configparser.c" break; case 784: /* ipset_name_v6: VAR_IPSET_NAME_V6 STRING_ARG */ -#line 4267 "util/configparser.y" +#line 4269 "util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str))); @@ -8043,11 +8045,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 8047 "util/configparser.c" +#line 8049 "util/configparser.c" break; -#line 8051 "util/configparser.c" +#line 8053 "util/configparser.c" default: break; } @@ -8241,7 +8243,7 @@ yyreturn: return yyresult; } -#line 4281 "util/configparser.y" +#line 4283 "util/configparser.y" /* parse helper routines could be here */ diff --git a/contrib/unbound/util/configparser.y b/contrib/unbound/util/configparser.y index ebb23f41cbd3..82e1d8782bb5 100644 --- a/contrib/unbound/util/configparser.y +++ b/contrib/unbound/util/configparser.y @@ -954,7 +954,7 @@ server_tcp_mss: VAR_TCP_MSS STRING_ARG { OUTYY(("P(server_tcp_mss:%s)\n", $2)); if(atoi($2) == 0 && strcmp($2, "0") != 0) - yyerror("number expected"); + yyerror("number expected"); else cfg_parser->cfg->tcp_mss = atoi($2); free($2); } @@ -1168,11 +1168,13 @@ server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG free(cfg_parser->cfg->http_endpoint); if($2 && $2[0] != '/') { cfg_parser->cfg->http_endpoint = malloc(strlen($2)+2); - if(!cfg_parser->cfg->http_endpoint) + if(cfg_parser->cfg->http_endpoint) { + cfg_parser->cfg->http_endpoint[0] = '/'; + memmove(cfg_parser->cfg->http_endpoint+1, $2, + strlen($2)+1); + } else { yyerror("out of memory"); - cfg_parser->cfg->http_endpoint[0] = '/'; - memmove(cfg_parser->cfg->http_endpoint+1, $2, - strlen($2)+1); + } free($2); } else { cfg_parser->cfg->http_endpoint = $2; diff --git a/contrib/unbound/util/data/dname.c b/contrib/unbound/util/data/dname.c index f08760e2f9fc..5370aa6f9585 100644 --- a/contrib/unbound/util/data/dname.c +++ b/contrib/unbound/util/data/dname.c @@ -57,7 +57,7 @@ query_dname_len(sldns_buffer* query) if(sldns_buffer_remaining(query) < 1) return 0; /* parse error, need label len */ labellen = sldns_buffer_read_u8(query); - if(labellen&0xc0) + if((labellen&0xc0)) return 0; /* no compression allowed in queries */ len += labellen + 1; if(len > LDNS_MAX_DOMAINLEN) @@ -79,7 +79,7 @@ dname_valid(uint8_t* dname, size_t maxlen) return 0; /* too short, shortest is '0' root label */ labellen = *dname++; while(labellen) { - if(labellen&0xc0) + if((labellen&0xc0)) return 0; /* no compression ptrs allowed */ len += labellen + 1; if(len >= LDNS_MAX_DOMAINLEN) @@ -644,20 +644,22 @@ void dname_str(uint8_t* dname, char* str) if(!dname || !*dname) { *s++ = '.'; *s = 0; - goto out; + return; } lablen = *dname++; while(lablen) { - if(lablen > LDNS_MAX_LABELLEN) { - *s++ = '#'; - *s = 0; - goto out; - } len += lablen+1; if(len >= LDNS_MAX_DOMAINLEN) { + if ((s-str) >= (LDNS_MAX_DOMAINLEN-1)) + s = str + LDNS_MAX_DOMAINLEN - 2; *s++ = '&'; *s = 0; - goto out; + return; + } + if(lablen > LDNS_MAX_LABELLEN) { + *s++ = '#'; + *s = 0; + return; } while(lablen--) { if(isalnum((unsigned char)*dname) @@ -673,10 +675,6 @@ void dname_str(uint8_t* dname, char* str) lablen = *dname++; } *s = 0; - -out: - log_assert(s - str < LDNS_MAX_DOMAINLEN); - return; } int @@ -728,7 +726,7 @@ dname_is_root(uint8_t* dname) return (len == 0); } -void +void dname_remove_label(uint8_t** dname, size_t* len) { size_t lablen; @@ -742,7 +740,23 @@ dname_remove_label(uint8_t** dname, size_t* len) *dname += lablen+1; } -void +int +dname_remove_label_limit_len(uint8_t** dname, size_t* len, size_t lenlimit) +{ + size_t lablen; + log_assert(dname && *dname && len); + lablen = (*dname)[0]; + log_assert(!LABEL_IS_PTR(lablen)); + log_assert(*len > lablen); + if(lablen == 0) + return 0; /* do not modify root label */ + if(*len - (lablen + 1) < lenlimit) return 0; + *len -= lablen+1; + *dname += lablen+1; + return 1; +} + +void dname_remove_labels(uint8_t** dname, size_t* len, int n) { int i; diff --git a/contrib/unbound/util/data/dname.h b/contrib/unbound/util/data/dname.h index 6e4cf7ea3be7..f68c64a03f0d 100644 --- a/contrib/unbound/util/data/dname.h +++ b/contrib/unbound/util/data/dname.h @@ -262,11 +262,24 @@ int dname_is_root(uint8_t* dname); * Snip off first label from a dname, returning the parent zone. * @param dname: from what to strip off. uncompressed wireformat. * @param len: length, adjusted to become less. - * return stripped off, or "." if input was ".". + * return dname stripped off, or "." if input was ".". */ void dname_remove_label(uint8_t** dname, size_t* len); /** + * Same as dname_remove_label but fails if removal would surpass lenlimit. + * If no failure, + * snip off first label from a dname, returning the parent zone. + * @param dname: from what to strip off. uncompressed wireformat. + * @param len: length, adjusted to become less. + * @param lenlimit: length limit that we can't surpass (usually the zone apex). + * @return + * o 1, and dname stripped off, or "." if input was ".", else + * o 0, if going up would surpass lenlimit. + */ +int dname_remove_label_limit_len(uint8_t** dname, size_t* len, size_t lenlimit); + +/** * Snip off first N labels from a dname, returning the parent zone. * @param dname: from what to strip off. uncompressed wireformat. * @param len: length, adjusted to become less. diff --git a/contrib/unbound/util/data/msgencode.c b/contrib/unbound/util/data/msgencode.c index 6d116fb52d6d..84aa3b9e75ae 100644 --- a/contrib/unbound/util/data/msgencode.c +++ b/contrib/unbound/util/data/msgencode.c @@ -365,7 +365,7 @@ compress_any_dname(uint8_t* dname, sldns_buffer* pkt, int labs, /** return true if type needs domain name compression in rdata */ static const sldns_rr_descriptor* -type_rdata_compressable(struct ub_packed_rrset_key* key) +type_rdata_compressible(struct ub_packed_rrset_key* key) { uint16_t t = ntohs(key->rk.type); if(sldns_rr_descript(t) && @@ -486,7 +486,7 @@ packed_rrset_encode(struct ub_packed_rrset_key* key, sldns_buffer* pkt, adjust = SERVE_ORIGINAL_TTL ? data->ttl_add : timenow; if(do_data) { - const sldns_rr_descriptor* c = type_rdata_compressable(key); + const sldns_rr_descriptor* c = type_rdata_compressible(key); for(i=0; i<data->count; i++) { /* rrset roundrobin */ j = (i + rr_offset) % data->count; @@ -1021,7 +1021,7 @@ reply_info_answer_encode(struct query_info* qinf, struct reply_info* rep, flags |= BIT_AA; flags &= ~BIT_AD; } - log_assert(flags & BIT_QR); /* QR bit must be on in our replies */ + log_assert((flags & BIT_QR)); /* QR bit must be on in our replies */ if(udpsize < LDNS_HEADER_SIZE) return 0; /* currently edns does not change during calculations; diff --git a/contrib/unbound/util/data/msgencode.h b/contrib/unbound/util/data/msgencode.h index 6aff06099ee9..08fcb59b8e36 100644 --- a/contrib/unbound/util/data/msgencode.h +++ b/contrib/unbound/util/data/msgencode.h @@ -117,7 +117,7 @@ uint16_t calc_edns_field_size(struct edns_data* edns); uint16_t calc_edns_option_size(struct edns_data* edns, uint16_t code); /** - * Calculate the size of the EDE option(s) in packet. Also calculate seperately + * Calculate the size of the EDE option(s) in packet. Also calculate separately * the size of the EXTRA-TEXT field(s) in case we can trim them to fit. * In this case include any LDNS_EDE_OTHER options in their entirety since they * are useless without extra text. diff --git a/contrib/unbound/util/data/msgparse.h b/contrib/unbound/util/data/msgparse.h index 62f0d5aacd80..7de4e394f2ae 100644 --- a/contrib/unbound/util/data/msgparse.h +++ b/contrib/unbound/util/data/msgparse.h @@ -308,16 +308,16 @@ int parse_extract_edns_from_response_msg(struct msg_parse* msg, /** * Skip RRs from packet * @param pkt: the packet. position at start must be right after the query - * section. At end, right after EDNS data or no movement if failed. + * section. At end, right after EDNS data or partial movement if failed. * @param num: Limit of the number of records we want to parse. - * @return: 0 on success, 1 on failure. + * @return: 1 on success, 0 on failure. */ int skip_pkt_rrs(struct sldns_buffer* pkt, int num); /** * If EDNS data follows a query section, extract it and initialize edns struct. * @param pkt: the packet. position at start must be right after the query - * section. At end, right after EDNS data or no movement if failed. + * section. At end, right after EDNS data or partial movement if failed. * @param edns: the edns data allocated by the caller. Does not have to be * initialised. * @param cfg: the configuration (with nsid value etc.) diff --git a/contrib/unbound/util/data/msgreply.c b/contrib/unbound/util/data/msgreply.c index e98dce133039..02e1230e96e7 100644 --- a/contrib/unbound/util/data/msgreply.c +++ b/contrib/unbound/util/data/msgreply.c @@ -251,7 +251,7 @@ rdata_copy(sldns_buffer* pkt, struct packed_rrset_data* data, uint8_t* to, *rr_ttl = sldns_read_uint32(rr->ttl_data); /* RFC 2181 Section 8. if msb of ttl is set treat as if zero. */ - if(*rr_ttl & 0x80000000U) + if((*rr_ttl & 0x80000000U)) *rr_ttl = 0; if(type == LDNS_RR_TYPE_SOA && section == LDNS_SECTION_AUTHORITY) { /* negative response. see if TTL of SOA record larger than the @@ -984,14 +984,14 @@ log_reply_info(enum verbosity_value v, struct query_info *qinf, if(daddr->ss_family == AF_INET6) { struct sockaddr_in6 *d = (struct sockaddr_in6 *)daddr; if(inet_ntop(d->sin6_family, &d->sin6_addr, da, - sizeof(*d)) == 0) + sizeof(da)) == 0) snprintf(dest_buf, sizeof(dest_buf), "(inet_ntop_error)"); port = ntohs(d->sin6_port); } else if(daddr->ss_family == AF_INET) { struct sockaddr_in *d = (struct sockaddr_in *)daddr; if(inet_ntop(d->sin_family, &d->sin_addr, da, - sizeof(*d)) == 0) + sizeof(da)) == 0) snprintf(dest_buf, sizeof(dest_buf), "(inet_ntop_error)"); port = ntohs(d->sin_port); @@ -1129,7 +1129,7 @@ int edns_opt_list_append_ede(struct edns_option** list, struct regional* region, prevp = list; while(*prevp != NULL) prevp = &((*prevp)->next); - verbose(VERB_ALGO, "attached EDE code: %d with message: %s", code, (txt?txt:"\"\"")); + verbose(VERB_ALGO, "attached EDE code: %d with message: '%s'", code, (txt?txt:"")); *prevp = opt; return 1; } @@ -1471,3 +1471,22 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code) } return NULL; } + +int local_alias_shallow_copy_qname(struct local_rrset* local_alias, uint8_t** qname, + size_t* qname_len) +{ + struct ub_packed_rrset_key* rrset = local_alias->rrset; + struct packed_rrset_data* d = rrset->entry.data; + + /* Sanity check: our current implementation only supports + * a single CNAME RRset as a local alias. */ + if(local_alias->next || + rrset->rk.type != htons(LDNS_RR_TYPE_CNAME) || + d->count != 1) { + log_err("assumption failure: unexpected local alias"); + return 0; + } + *qname = d->rr_data[0] + 2; + *qname_len = d->rr_len[0] - 2; + return 1; +} diff --git a/contrib/unbound/util/data/msgreply.h b/contrib/unbound/util/data/msgreply.h index 9c701f07d0c4..1ec4e850b8e1 100644 --- a/contrib/unbound/util/data/msgreply.h +++ b/contrib/unbound/util/data/msgreply.h @@ -597,7 +597,7 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len, char text[sizeof(TXT) - 1]; \ } ede = { htons(CODE), TXT }; \ verbose(VERB_ALGO, "attached EDE code: %d with" \ - " message: %s", CODE, TXT); \ + " message: '%s'", CODE, TXT); \ edns_opt_list_append((LIST), LDNS_EDNS_EDE, \ sizeof(uint16_t) + sizeof(TXT) - 1, \ (void *)&ede, (REGION)); \ @@ -801,4 +801,14 @@ int edns_opt_compare(struct edns_option* p, struct edns_option* q); */ int edns_opt_list_compare(struct edns_option* p, struct edns_option* q); +/** + * Swallow copy the local_alias into the given qname and qname_len. + * @param local_alias: the local_alias. + * @param qname: the qname to copy to. + * @param qname_len: the qname_len to copy to. + * @return false on current local_alias assumptions, true otherwise. + */ +int local_alias_shallow_copy_qname(struct local_rrset* local_alias, uint8_t** qname, + size_t* qname_len); + #endif /* UTIL_DATA_MSGREPLY_H */ diff --git a/contrib/unbound/util/iana_ports.inc b/contrib/unbound/util/iana_ports.inc index 198a47eb1777..6d8cfd27b88e 100644 --- a/contrib/unbound/util/iana_ports.inc +++ b/contrib/unbound/util/iana_ports.inc @@ -3873,6 +3873,7 @@ 4486, 4488, 4500, +4503, 4534, 4535, 4536, @@ -3979,6 +3980,7 @@ 4790, 4791, 4792, +4793, 4800, 4801, 4802, diff --git a/contrib/unbound/util/mini_event.c b/contrib/unbound/util/mini_event.c index c05dc668c676..2be42b2ccf05 100644 --- a/contrib/unbound/util/mini_event.c +++ b/contrib/unbound/util/mini_event.c @@ -297,10 +297,10 @@ int event_add(struct event* ev, struct timeval* tv) return -1; if( (ev->ev_events&(EV_READ|EV_WRITE)) && ev->ev_fd != -1) { ev->ev_base->fds[ev->ev_fd] = ev; - if(ev->ev_events&EV_READ) { + if((ev->ev_events&EV_READ)) { FD_SET(FD_SET_T ev->ev_fd, &ev->ev_base->reads); } - if(ev->ev_events&EV_WRITE) { + if((ev->ev_events&EV_WRITE)) { FD_SET(FD_SET_T ev->ev_fd, &ev->ev_base->writes); } FD_SET(FD_SET_T ev->ev_fd, &ev->ev_base->content); diff --git a/contrib/unbound/util/net_help.c b/contrib/unbound/util/net_help.c index 8eca6b757ca8..6ce0d9131300 100644 --- a/contrib/unbound/util/net_help.c +++ b/contrib/unbound/util/net_help.c @@ -317,6 +317,11 @@ int netblockstrtoaddr(const char* str, int port, struct sockaddr_storage* addr, log_err("cannot parse netblock: '%s'", str); return 0; } + if(*net < 0) { + log_err("netblock value %d is negative in: '%s'", + *net, str); + return 0; + } strlcpy(buf, str, sizeof(buf)); s = strchr(buf, '/'); if(s) *s = 0; @@ -430,6 +435,8 @@ int netblockdnametoaddr(uint8_t* dname, size_t dnamelen, *net = atoi(buff); if(*net == 0 && strcmp(buff, "0") != 0) return 0; + if(*net < 0) + return 0; dname += nlablen; dname++; if(!ipdnametoaddr(dname, dnamelen-1-nlablen, addr, addrlen, af)) @@ -797,7 +804,7 @@ addr_mask(struct sockaddr_storage* addr, socklen_t len, int net) s = (uint8_t*)&((struct sockaddr_in*)addr)->sin_addr; max = 32; } - if(net >= max) + if(net >= max || net < 0) return; for(i=net/8+1; i<max/8; i++) { s[i] = 0; @@ -1028,7 +1035,7 @@ void log_crypto_err_code(const char* str, unsigned long err) } #ifdef HAVE_SSL -/** Print crypt erro with SSL_get_error want code and err_get_error code */ +/** Print crypt error with SSL_get_error want code and err_get_error code */ static void log_crypto_err_io_code_arg(const char* str, int r, unsigned long err, int err_present) { @@ -1252,6 +1259,14 @@ listen_sslctx_setup(void* ctxt) return 0; } #endif +#if defined(SSL_OP_NO_TLSv1_2) && defined(SSL_OP_NO_TLSv1_3) + /* if we have tls 1.3 disable 1.2 */ + if((SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_2) & SSL_OP_NO_TLSv1_2) + != SSL_OP_NO_TLSv1_2){ + log_crypto_err("could not set SSL_OP_NO_TLSv1_2"); + return 0; + } +#endif #if defined(SSL_OP_NO_RENEGOTIATION) /* disable client renegotiation */ if((SSL_CTX_set_options(ctx, SSL_OP_NO_RENEGOTIATION) & @@ -1305,7 +1320,7 @@ listen_sslctx_setup_2(void* ctxt) if(!SSL_CTX_set_ecdh_auto(ctx,1)) { log_crypto_err("Error in SSL_CTX_ecdh_auto, not enabling ECDHE"); } -#elif defined(USE_ECDSA) && defined(HAVE_SSL_CTX_SET_TMP_ECDH) +#elif defined(USE_ECDSA) && HAVE_DECL_SSL_CTX_SET_TMP_ECDH if(1) { EC_KEY *ecdh = EC_KEY_new_by_curve_name (NID_X9_62_prime256v1); if (!ecdh) { diff --git a/contrib/unbound/util/netevent.c b/contrib/unbound/util/netevent.c index 0d0fff429c03..aedcb5e07a30 100644 --- a/contrib/unbound/util/netevent.c +++ b/contrib/unbound/util/netevent.c @@ -1083,6 +1083,11 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg) } else if( cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMP) { memmove(&rep.c->recv_tv, CMSG_DATA(cmsg), sizeof(struct timeval)); +#elif defined(SO_TIMESTAMP) && defined(SCM_TIMESTAMP) + } else if( cmsg->cmsg_level == SOL_SOCKET && + cmsg->cmsg_type == SCM_TIMESTAMP) { + /* FreeBSD and also Linux. */ + memmove(&rep.c->recv_tv, CMSG_DATA(cmsg), sizeof(struct timeval)); #endif /* HAVE_LINUX_NET_TSTAMP_H */ } } @@ -3213,6 +3218,9 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) } /* accept incoming connection. */ c_hdl = c->tcp_free; + /* Should not happen: inconsistent tcp_free state in + * accept_callback. */ + log_assert(c_hdl->is_in_tcp_free); /* clear leftover flags from previous use, and then set the * correct event base for the event structure for libevent */ ub_event_free(c_hdl->ev->ev); @@ -3287,10 +3295,15 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) #endif } + /* Paranoia: Check that the state has not changed from above: */ + /* Should not happen: tcp_free state changed within accept_callback. */ + log_assert(c_hdl == c->tcp_free); + log_assert(c_hdl->is_in_tcp_free); /* grab the tcp handler buffers */ c->cur_tcp_count++; c->tcp_free = c_hdl->tcp_free; c_hdl->tcp_free = NULL; + c_hdl->is_in_tcp_free = 0; if(!c->tcp_free) { /* stop accepting incoming queries for now. */ comm_point_stop_listening(c); @@ -3311,12 +3324,14 @@ reclaim_tcp_handler(struct comm_point* c) #endif } comm_point_close(c); - if(c->tcp_parent) { - if(c != c->tcp_parent->tcp_free) { - c->tcp_parent->cur_tcp_count--; - c->tcp_free = c->tcp_parent->tcp_free; - c->tcp_parent->tcp_free = c; - } + if(c->tcp_parent && !c->is_in_tcp_free) { + /* Should not happen: bad tcp_free state in reclaim_tcp. */ + log_assert(c->tcp_free == NULL); + log_assert(c->tcp_parent->cur_tcp_count > 0); + c->tcp_parent->cur_tcp_count--; + c->tcp_free = c->tcp_parent->tcp_free; + c->tcp_parent->tcp_free = c; + c->is_in_tcp_free = 1; if(!c->tcp_free) { /* re-enable listening on accept socket */ comm_point_start_listening(c->tcp_parent, -1, -1); @@ -4630,7 +4645,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) } #endif - if(event&UB_EV_TIMEOUT) { + if((event&UB_EV_TIMEOUT)) { verbose(VERB_QUERY, "tcp took too long, dropped"); reclaim_tcp_handler(c); if(!c->tcp_do_close) { @@ -4640,7 +4655,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) } return; } - if(event&UB_EV_READ + if((event&UB_EV_READ) #ifdef USE_MSG_FASTOPEN && !(c->tcp_do_fastopen && (event&UB_EV_WRITE)) #endif @@ -4665,7 +4680,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) tcp_more_read_again(fd, c); return; } - if(event&UB_EV_WRITE) { + if((event&UB_EV_WRITE)) { int has_tcpq = (c->tcp_req_info != NULL); int* morewrite = c->tcp_more_write_again; if(!comm_point_tcp_handle_write(fd, c)) { @@ -4702,12 +4717,14 @@ reclaim_http_handler(struct comm_point* c) #endif } comm_point_close(c); - if(c->tcp_parent) { - if(c != c->tcp_parent->tcp_free) { - c->tcp_parent->cur_tcp_count--; - c->tcp_free = c->tcp_parent->tcp_free; - c->tcp_parent->tcp_free = c; - } + if(c->tcp_parent && !c->is_in_tcp_free) { + /* Should not happen: bad tcp_free state in reclaim_http. */ + log_assert(c->tcp_free == NULL); + log_assert(c->tcp_parent->cur_tcp_count > 0); + c->tcp_parent->cur_tcp_count--; + c->tcp_free = c->tcp_parent->tcp_free; + c->tcp_parent->tcp_free = c; + c->is_in_tcp_free = 1; if(!c->tcp_free) { /* re-enable listening on accept socket */ comm_point_start_listening(c->tcp_parent, -1, -1); @@ -5144,6 +5161,15 @@ ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf, log_assert(h2_session->c->type == comm_http); log_assert(h2_session->c->h2_session); + if(++h2_session->reads_count > h2_session->c->http2_max_streams) { + /* We are somewhat arbitrarily capping the amount of + * consecutive reads on the HTTP2 session to the number of max + * allowed streams. + * When we reach the cap, error out with NGHTTP2_ERR_WOULDBLOCK + * to signal nghttp2_session_recv() to stop reading for now. */ + h2_session->reads_count = 0; + return NGHTTP2_ERR_WOULDBLOCK; + } #ifdef HAVE_SSL if(h2_session->c->ssl) { @@ -5177,7 +5203,7 @@ ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf, } #endif /* HAVE_SSL */ - ret = recv(h2_session->c->fd, buf, len, MSG_DONTWAIT); + ret = recv(h2_session->c->fd, (void*)buf, len, MSG_DONTWAIT); if(ret == 0) { return NGHTTP2_ERR_EOF; } else if(ret < 0) { @@ -5505,7 +5531,7 @@ ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf, } #endif /* HAVE_SSL */ - ret = send(h2_session->c->fd, buf, len, 0); + ret = send(h2_session->c->fd, (void*)buf, len, 0); if(ret == 0) { return NGHTTP2_ERR_CALLBACK_FAILURE; } else if(ret < 0) { @@ -5648,7 +5674,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg) log_assert(c->type == comm_http); ub_comm_base_now(c->ev->base); - if(event&UB_EV_TIMEOUT) { + if((event&UB_EV_TIMEOUT)) { verbose(VERB_QUERY, "http took too long, dropped"); reclaim_http_handler(c); if(!c->tcp_do_close) { @@ -5658,7 +5684,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg) } return; } - if(event&UB_EV_READ) { + if((event&UB_EV_READ)) { if(!comm_point_http_handle_read(fd, c)) { reclaim_http_handler(c); if(!c->tcp_do_close) { @@ -5670,7 +5696,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg) } return; } - if(event&UB_EV_WRITE) { + if((event&UB_EV_WRITE)) { if(!comm_point_http_handle_write(fd, c)) { reclaim_http_handler(c); if(!c->tcp_do_close) { @@ -5691,7 +5717,7 @@ void comm_point_local_handle_callback(int fd, short event, void* arg) log_assert(c->type == comm_local); ub_comm_base_now(c->ev->base); - if(event&UB_EV_READ) { + if((event&UB_EV_READ)) { if(!comm_point_tcp_handle_read(fd, c, 1)) { fptr_ok(fptr_whitelist_comm_point(c->callback)); (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, @@ -5710,7 +5736,7 @@ void comm_point_raw_handle_callback(int ATTR_UNUSED(fd), log_assert(c->type == comm_raw); ub_comm_base_now(c->ev->base); - if(event&UB_EV_TIMEOUT) + if((event&UB_EV_TIMEOUT)) err = NETEVENT_TIMEOUT; fptr_ok(fptr_whitelist_comm_point_raw(c->callback)); (void)(*c->callback)(c, c->cb_arg, err, NULL); @@ -5743,6 +5769,7 @@ comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_udp; c->tcp_do_close = 0; c->do_not_close = 0; @@ -5807,6 +5834,7 @@ comm_point_create_udp_ancil(struct comm_base *base, int fd, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_udp; c->tcp_do_close = 0; c->do_not_close = 0; @@ -5874,6 +5902,7 @@ comm_point_create_doq(struct comm_base *base, int fd, sldns_buffer* buffer, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_doq; c->tcp_do_close = 0; c->do_not_close = 0; @@ -5974,6 +6003,7 @@ comm_point_create_tcp_handler(struct comm_base *base, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_tcp; c->tcp_do_close = 0; c->do_not_close = 0; @@ -6011,6 +6041,7 @@ comm_point_create_tcp_handler(struct comm_base *base, /* add to parent free list */ c->tcp_free = parent->tcp_free; parent->tcp_free = c; + c->is_in_tcp_free = 1; /* ub_event stuff */ evbits = UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT; c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits, @@ -6073,6 +6104,7 @@ comm_point_create_http_handler(struct comm_base *base, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_http; c->tcp_do_close = 1; c->do_not_close = 0; @@ -6131,6 +6163,7 @@ comm_point_create_http_handler(struct comm_base *base, /* add to parent free list */ c->tcp_free = parent->tcp_free; parent->tcp_free = c; + c->is_in_tcp_free = 1; /* ub_event stuff */ evbits = UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT; c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits, @@ -6192,6 +6225,7 @@ comm_point_create_tcp(struct comm_base *base, int fd, int num, return NULL; } c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_tcp_accept; c->tcp_do_close = 0; c->do_not_close = 0; @@ -6286,6 +6320,7 @@ comm_point_create_tcp_out(struct comm_base *base, size_t bufsize, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_tcp; c->tcp_do_close = 0; c->do_not_close = 0; @@ -6350,6 +6385,7 @@ comm_point_create_http_out(struct comm_base *base, size_t bufsize, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_http; c->tcp_do_close = 0; c->do_not_close = 0; @@ -6420,6 +6456,7 @@ comm_point_create_local(struct comm_base *base, int fd, size_t bufsize, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_local; c->tcp_do_close = 0; c->do_not_close = 1; @@ -6483,6 +6520,7 @@ comm_point_create_raw(struct comm_base* base, int fd, int writing, c->cur_tcp_count = 0; c->tcp_handlers = NULL; c->tcp_free = NULL; + c->is_in_tcp_free = 0; c->type = comm_raw; c->tcp_do_close = 0; c->do_not_close = 1; diff --git a/contrib/unbound/util/netevent.h b/contrib/unbound/util/netevent.h index 96de0032cef6..c5114bbbef27 100644 --- a/contrib/unbound/util/netevent.h +++ b/contrib/unbound/util/netevent.h @@ -238,6 +238,8 @@ struct comm_point { /** linked list of free tcp_handlers to use for new queries. For tcp_accept the first entry, for tcp_handlers the next one. */ struct comm_point* tcp_free; + /** Whether this struct is in its parent's tcp_free list */ + int is_in_tcp_free; /* -------- SSL TCP DNS ------- */ /** the SSL object with rw bio (owned) or for commaccept ctx ref */ @@ -937,6 +939,8 @@ struct http2_session { /** comm point containing buffer used to build answer in worker or * module */ struct comm_point* c; + /** count the number of consecutive reads on the session */ + uint32_t reads_count; /** session is instructed to get dropped (comm port will be closed) */ int is_drop; /** postpone dropping the session, can be used to prevent dropping diff --git a/contrib/unbound/util/random.c b/contrib/unbound/util/random.c index 6eb102c634b9..92a4f6dd0bd6 100644 --- a/contrib/unbound/util/random.c +++ b/contrib/unbound/util/random.c @@ -78,6 +78,37 @@ */ #define MAX_VALUE 0x7fffffff +/* If the build mode is for fuzzing this removes randomness from the output. + * This helps fuzz engines from having state increase due to the randomness. */ +#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION +struct ub_randstate { + unsigned int dummy; +}; + +struct ub_randstate* ub_initstate(struct ub_randstate* ATTR_UNUSED(from)) +{ + struct ub_randstate* s = (struct ub_randstate*)calloc(1, sizeof(*s)); + if(!s) { + log_err("malloc failure in random init"); + return NULL; + } + return s; +} + +long int ub_random(struct ub_randstate* state) +{ + state->dummy++; + return (long int)(state->dummy & MAX_VALUE); +} + +long int +ub_random_max(struct ub_randstate* state, long int x) +{ + state->dummy++; + return ((long int)state->dummy % x); +} +#else /* !FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */ + #if defined(HAVE_SSL) || defined(HAVE_LIBBSD) struct ub_randstate* ub_initstate(struct ub_randstate* ATTR_UNUSED(from)) @@ -200,6 +231,8 @@ ub_random_max(struct ub_randstate* state, long int x) } #endif /* HAVE_NSS or HAVE_NETTLE and !HAVE_LIBBSD */ +#endif /* FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION */ + void ub_randfree(struct ub_randstate* s) { diff --git a/contrib/unbound/validator/val_sigcrypt.c b/contrib/unbound/validator/val_sigcrypt.c index 9251d2b1f38a..86de6fb8e80f 100644 --- a/contrib/unbound/validator/val_sigcrypt.c +++ b/contrib/unbound/validator/val_sigcrypt.c @@ -57,6 +57,7 @@ #include "sldns/sbuffer.h" #include "sldns/parseutil.h" #include "sldns/wire2str.h" +#include "services/mesh.h" #include <ctype.h> #if !defined(HAVE_SSL) && !defined(HAVE_NSS) && !defined(HAVE_NETTLE) @@ -1677,6 +1678,10 @@ dnskey_verify_rrset_sig(struct regional* region, sldns_buffer* buf, /* verify */ sec = verify_canonrrset(buf, (int)sig[2+2], sigblock, sigblock_len, key, keylen, reason); + + /* count validation operation */ + if(qstate && qstate->env && qstate->env->mesh) + qstate->env->mesh->val_ops++; if(sec == sec_status_secure) { /* check if TTL is too high - reduce if so */ diff --git a/contrib/unbound/validator/validator.c b/contrib/unbound/validator/validator.c index a0550b484eae..5817fc8085a2 100644 --- a/contrib/unbound/validator/validator.c +++ b/contrib/unbound/validator/validator.c @@ -76,7 +76,7 @@ static void process_ds_response(struct module_qstate* qstate, struct module_qstate* sub_qstate); -/* Updates the suplied EDE (RFC8914) code selectively so we don't lose +/* Updates the supplied EDE (RFC8914) code selectively so we don't lose * a more specific code */ static void update_reason_bogus(struct reply_info* rep, sldns_ede_code reason_bogus) @@ -399,7 +399,7 @@ needs_validation(struct module_qstate* qstate, int ret_rc, * For DNS64 bit_cd signals no dns64 processing, but we want to * provide validation there too */ /* - if(qstate->query_flags & BIT_CD) { + if((qstate->query_flags & BIT_CD)) { verbose(VERB_ALGO, "not validating response due to CD bit"); return 0; } @@ -2593,8 +2593,17 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq, /* Update rep->reason_bogus as it is the one being cached */ update_reason_bogus(vq->orig_msg->rep, errinf_to_reason_bogus(qstate)); + if(vq->orig_msg->rep->security != sec_status_bogus && + vq->orig_msg->rep->security != sec_status_secure_sentinel_fail + && vq->orig_msg->rep->reason_bogus == LDNS_EDE_DNSSEC_BOGUS) { + /* Not interested in any DNSSEC EDE here, validator by default + * uses LDNS_EDE_DNSSEC_BOGUS; + * TODO revisit default value for the module */ + vq->orig_msg->rep->reason_bogus = LDNS_EDE_NONE; + } + /* store results in cache */ - if(qstate->query_flags&BIT_RD) { + if((qstate->query_flags&BIT_RD)) { /* if secure, this will override cache anyway, no need * to check if from parentNS */ if(!qstate->no_cache_store) { @@ -2908,7 +2917,7 @@ ds_response_to_ke(struct module_qstate* qstate, struct val_qstate* vq, struct ub_packed_rrset_key* ds; enum sec_status sec; ds = reply_find_answer_rrset(qinfo, msg->rep); - /* If there was no DS rrset, then we have mis-classified + /* If there was no DS rrset, then we have misclassified * this message. */ if(!ds) { log_warn("internal error: POSITIVE DS response was " @@ -3460,7 +3469,7 @@ val_inform_super(struct module_qstate* qstate, int id, if(suspend) { /* deep copy the return_msg to vq->sub_ds_msg; it will * be resumed later in the super state with the caveat - * that the initial calculations will be re-caclulated + * that the initial calculations will be re-calculated * and re-suspended there before continuing. */ vq->sub_ds_msg = dns_msg_deepcopy_region( qstate->return_msg, super->region); diff --git a/contrib/unbound/winrc/win_svc.c b/contrib/unbound/winrc/win_svc.c index 40e12f1cff87..429b045dc289 100644 --- a/contrib/unbound/winrc/win_svc.c +++ b/contrib/unbound/winrc/win_svc.c @@ -328,6 +328,7 @@ service_init(int r, struct daemon** d, struct config_file** c) return 0; } log_warn("could not open config file, using defaults"); + config_auto_slab_values(cfg); } if(!r) report_status(SERVICE_START_PENDING, NO_ERROR, 2600); diff --git a/crypto/heimdal/kadmin/dump.c b/crypto/heimdal/kadmin/dump.c index 91a5ada86607..2c302eced210 100644 --- a/crypto/heimdal/kadmin/dump.c +++ b/crypto/heimdal/kadmin/dump.c @@ -42,32 +42,51 @@ dump(struct dump_options *opt, int argc, char **argv) { krb5_error_code ret; FILE *f; + struct hdb_print_entry_arg parg; HDB *db = NULL; - if(!local_flag) { + if (!local_flag) { krb5_warnx(context, "dump is only available in local (-l) mode"); return 0; } db = _kadm5_s_get_db(kadm_handle); - if(argc == 0) + if (argc == 0) f = stdout; else f = fopen(argv[0], "w"); - if(f == NULL) { + if (f == NULL) { krb5_warn(context, errno, "open: %s", argv[0]); goto out; } ret = db->hdb_open(context, db, O_RDONLY, 0600); - if(ret) { + if (ret) { krb5_warn(context, ret, "hdb_open"); goto out; } + if (!opt->format_string || strcmp(opt->format_string, "Heimdal") == 0) { + parg.fmt = HDB_DUMP_HEIMDAL; + } else if (opt->format_string && strcmp(opt->format_string, "MIT") == 0) { + parg.fmt = HDB_DUMP_MIT; + fprintf(f, "kdb5_util load_dump version 5\n"); /* 5||6, either way */ + } else if (opt->format_string) { + /* Open the format string as a MIT mkey file. */ + ret = hdb_read_master_key(context, opt->format_string, &db->hdb_mit_key); + if (ret) + krb5_errx(context, 1, "Cannot open MIT mkey file"); + db->hdb_mit_key_set = 1; + parg.fmt = HDB_DUMP_MIT; + opt->decrypt_flag = 1; + fprintf(f, "kdb5_util load_dump version 5\n"); /* 5||6, either way */ + } else { + krb5_errx(context, 1, "Supported dump formats: Heimdal and MIT"); + } + parg.out = f; hdb_foreach(context, db, opt->decrypt_flag ? HDB_F_DECRYPT : 0, - hdb_print_entry, f); + hdb_print_entry, &parg); db->hdb_close(context, db); out: diff --git a/crypto/heimdal/kadmin/kadmin-commands.in b/crypto/heimdal/kadmin/kadmin-commands.in index 4396ff800441..dc36db4e0a00 100644 --- a/crypto/heimdal/kadmin/kadmin-commands.in +++ b/crypto/heimdal/kadmin/kadmin-commands.in @@ -76,6 +76,12 @@ command = { type = "flag" help = "decrypt keys" } + option = { + long = "format" + short = "f" + type = "string" + help = "dump format, mit or heimdal (default: heimdal)" + } argument = "[dump-file]" min_args = "0" max_args = "1" diff --git a/crypto/heimdal/kadmin/kadmin.8 b/crypto/heimdal/kadmin/kadmin.8 index bd2fd4e7363f..e4555cd529f4 100644 --- a/crypto/heimdal/kadmin/kadmin.8 +++ b/crypto/heimdal/kadmin/kadmin.8 @@ -31,7 +31,7 @@ .\" .\" $Id$ .\" -.Dd Feb 22, 2007 +.Dd October 5, 2025 .Dt KADMIN 8 .Os HEIMDAL .Sh NAME @@ -286,14 +286,39 @@ When running in local mode, the following commands can also be used: .Pp .Nm dump .Op Fl d | Fl Fl decrypt +.Op Fl f Ns Ar format | Fl Fl format= Ns Ar format .Op Ar dump-file .Bd -ragged -offset indent Writes the database in -.Dq human readable +.Dq machine readable text form to the specified file, or standard out. If the database is encrypted, the dump will also have encrypted keys, unless .Fl Fl decrypt is used. +.Pp +If +.Fl Fl format=MIT +is used then the dump will be in MIT format. +This option may be used if you require that all principal +passwords be changed after loading the dump into an MIT KDC database. +.Pp +If +.Fl Fl format=<keytab-file> +is used, the +.Dq <keytab-file> +should hold the master key for the +MIT KDC (usually a file called /var/db/krb5kdc/.k5.YOUR.REALM). +This will cause the keys to be re-encrypted in the MIT master +key as well as doing the dump in MIT format. +When this dump is loaded into the MIT KDC's database, +the principals that had at least one strong encryption type +key should work and any keytabs for those principals should still work. +The principcals with only weak encryption keys will require a +.Dq change_password +be done on the MIT KDC to get them working. +The +.Fl Fl decrypt +flag is meaningless for this case. .Ed .Pp .Nm init diff --git a/crypto/heimdal/kdc/hpropd.c b/crypto/heimdal/kdc/hpropd.c index 1cfc688b2a6c..c76be0446705 100644 --- a/crypto/heimdal/kdc/hpropd.c +++ b/crypto/heimdal/kdc/hpropd.c @@ -85,23 +85,23 @@ main(int argc, char **argv) setprogname(argv[0]); ret = krb5_init_context(&context); - if(ret) + if (ret) exit(1); ret = krb5_openlog(context, "hpropd", &fac); - if(ret) + if (ret) errx(1, "krb5_openlog"); krb5_set_warn_dest(context, fac); - if(getarg(args, num_args, argc, argv, &optidx)) + if (getarg(args, num_args, argc, argv, &optidx)) usage(1); - if(local_realm != NULL) + if (local_realm != NULL) krb5_set_default_realm(context, local_realm); - if(help_flag) + if (help_flag) usage(0); - if(version_flag) { + if (version_flag) { print_version(NULL); exit(0); } @@ -117,7 +117,7 @@ main(int argc, char **argv) if (database == NULL) database = hdb_default_db(context); - if(from_stdin) { + if (from_stdin) { sock = STDIN_FILENO; } else { struct sockaddr_storage ss; @@ -145,7 +145,7 @@ main(int argc, char **argv) HPROP_PORT), &sock); } sin_len = sizeof(ss); - if(getpeername(sock, sa, &sin_len) < 0) + if (getpeername(sock, sa, &sin_len) < 0) krb5_err(context, 1, errno, "getpeername"); if (inet_ntop(sa->sa_family, @@ -158,7 +158,7 @@ main(int argc, char **argv) krb5_log(context, fac, 0, "Connection from %s", addr_name); ret = krb5_kt_register(context, &hdb_kt_ops); - if(ret) + if (ret) krb5_err(context, 1, ret, "krb5_kt_register"); if (ktname != NULL) { @@ -173,7 +173,7 @@ main(int argc, char **argv) ret = krb5_recvauth(context, &ac, &sock, HPROP_VERSION, NULL, 0, keytab, &ticket); - if(ret) + if (ret) krb5_err(context, 1, ret, "krb5_recvauth"); ret = krb5_unparse_name(context, ticket->server, &server); @@ -186,15 +186,15 @@ main(int argc, char **argv) krb5_free_ticket (context, ticket); ret = krb5_auth_con_getauthenticator(context, ac, &authent); - if(ret) + if (ret) krb5_err(context, 1, ret, "krb5_auth_con_getauthenticator"); ret = krb5_make_principal(context, &c1, NULL, "kadmin", "hprop", NULL); - if(ret) + if (ret) krb5_err(context, 1, ret, "krb5_make_principal"); _krb5_principalname2krb5_principal(context, &c2, authent->cname, authent->crealm); - if(!krb5_principal_compare(context, c1, c2)) { + if (!krb5_principal_compare(context, c1, c2)) { char *s; ret = krb5_unparse_name(context, c2, &s); if (ret) @@ -205,48 +205,48 @@ main(int argc, char **argv) krb5_free_principal(context, c2); ret = krb5_kt_close(context, keytab); - if(ret) + if (ret) krb5_err(context, 1, ret, "krb5_kt_close"); } - if(!print_dump) { + if (!print_dump) { asprintf(&tmp_db, "%s~", database); ret = hdb_create(context, &db, tmp_db); - if(ret) + if (ret) krb5_err(context, 1, ret, "hdb_create(%s)", tmp_db); ret = db->hdb_open(context, db, O_RDWR | O_CREAT | O_TRUNC, 0600); - if(ret) + if (ret) krb5_err(context, 1, ret, "hdb_open(%s)", tmp_db); } nprincs = 0; - while(1){ + while (1){ krb5_data data; hdb_entry_ex entry; - if(from_stdin) { + if (from_stdin) { ret = krb5_read_message(context, &sock, &data); - if(ret != 0 && ret != HEIM_ERR_EOF) + if (ret != 0 && ret != HEIM_ERR_EOF) krb5_err(context, 1, ret, "krb5_read_message"); } else { ret = krb5_read_priv_message(context, ac, &sock, &data); - if(ret) + if (ret) krb5_err(context, 1, ret, "krb5_read_priv_message"); } - if(ret == HEIM_ERR_EOF || data.length == 0) { - if(!from_stdin) { + if (ret == HEIM_ERR_EOF || data.length == 0) { + if (!from_stdin) { data.data = NULL; data.length = 0; krb5_write_priv_message(context, ac, &sock, &data); } - if(!print_dump) { + if (!print_dump) { ret = db->hdb_close(context, db); - if(ret) + if (ret) krb5_err(context, 1, ret, "db_close"); ret = db->hdb_rename(context, db, database); - if(ret) + if (ret) krb5_err(context, 1, ret, "db_rename"); } break; @@ -254,20 +254,24 @@ main(int argc, char **argv) memset(&entry, 0, sizeof(entry)); ret = hdb_value2entry(context, &data, &entry.entry); krb5_data_free(&data); - if(ret) + if (ret) krb5_err(context, 1, ret, "hdb_value2entry"); - if(print_dump) - hdb_print_entry(context, db, &entry, stdout); - else { + if (print_dump) { + struct hdb_print_entry_arg parg; + + parg.out = stdout; + parg.fmt = HDB_DUMP_HEIMDAL; + hdb_print_entry(context, db, &entry, &parg); + } else { ret = db->hdb_store(context, db, 0, &entry); - if(ret == HDB_ERR_EXISTS) { + if (ret == HDB_ERR_EXISTS) { char *s; ret = krb5_unparse_name(context, entry.entry.principal, &s); if (ret) s = strdup(unparseable_name); krb5_warnx(context, "Entry exists: %s", s); free(s); - } else if(ret) + } else if (ret) krb5_err(context, 1, ret, "db_store"); else nprincs++; diff --git a/crypto/heimdal/kdc/mit_dump.c b/crypto/heimdal/kdc/mit_dump.c index f28e932b15b4..4397d1ad897d 100644 --- a/crypto/heimdal/kdc/mit_dump.c +++ b/crypto/heimdal/kdc/mit_dump.c @@ -33,6 +33,17 @@ #include "hprop.h" +extern krb5_error_code _hdb_mdb_value2entry(krb5_context context, + krb5_data *data, + krb5_kvno target_kvno, + hdb_entry *entry); + +extern int _hdb_mit_dump2mitdb_entry(krb5_context context, + char *line, + krb5_storage *sp); + + + /* can have any number of princ stanzas. format is as follows (only \n indicates newlines) @@ -74,19 +85,6 @@ unless no extra data */ -static int -hex_to_octet_string(const char *ptr, krb5_data *data) -{ - size_t i; - unsigned int v; - for(i = 0; i < data->length; i++) { - if(sscanf(ptr + 2 * i, "%02x", &v) != 1) - return -1; - ((unsigned char*)data->data)[i] = v; - } - return 2 * i; -} - static char * nexttoken(char **p) { @@ -97,321 +95,116 @@ nexttoken(char **p) return q; } -static size_t -getdata(char **p, unsigned char *buf, size_t len) -{ - size_t i; - int v; - char *q = nexttoken(p); - i = 0; - while(*q && i < len) { - if(sscanf(q, "%02x", &v) != 1) - break; - buf[i++] = v; - q += 2; - } - return i; -} - -static int -getint(char **p) -{ - int val; - char *q = nexttoken(p); - sscanf(q, "%d", &val); - return val; -} - #include <kadm5/admin.h> -static void -attr_to_flags(unsigned attr, HDBFlags *flags) -{ - flags->postdate = !(attr & KRB5_KDB_DISALLOW_POSTDATED); - flags->forwardable = !(attr & KRB5_KDB_DISALLOW_FORWARDABLE); - flags->initial = !!(attr & KRB5_KDB_DISALLOW_TGT_BASED); - flags->renewable = !(attr & KRB5_KDB_DISALLOW_RENEWABLE); - flags->proxiable = !(attr & KRB5_KDB_DISALLOW_PROXIABLE); - /* DUP_SKEY */ - flags->invalid = !!(attr & KRB5_KDB_DISALLOW_ALL_TIX); - flags->require_preauth = !!(attr & KRB5_KDB_REQUIRES_PRE_AUTH); - flags->require_hwauth = !!(attr & KRB5_KDB_REQUIRES_HW_AUTH); - flags->server = !(attr & KRB5_KDB_DISALLOW_SVR); - flags->change_pw = !!(attr & KRB5_KDB_PWCHANGE_SERVICE); - flags->client = 1; /* XXX */ -} - -#define KRB5_KDB_SALTTYPE_NORMAL 0 -#define KRB5_KDB_SALTTYPE_V4 1 -#define KRB5_KDB_SALTTYPE_NOREALM 2 -#define KRB5_KDB_SALTTYPE_ONLYREALM 3 -#define KRB5_KDB_SALTTYPE_SPECIAL 4 -#define KRB5_KDB_SALTTYPE_AFS3 5 - -static krb5_error_code -fix_salt(krb5_context context, hdb_entry *ent, int key_num) +static int +my_fgetln(FILE *f, char **buf, size_t *sz, size_t *len) { - krb5_error_code ret; - Salt *salt = ent->keys.val[key_num].salt; - /* fix salt type */ - switch((int)salt->type) { - case KRB5_KDB_SALTTYPE_NORMAL: - salt->type = KRB5_PADATA_PW_SALT; - break; - case KRB5_KDB_SALTTYPE_V4: - krb5_data_free(&salt->salt); - salt->type = KRB5_PADATA_PW_SALT; - break; - case KRB5_KDB_SALTTYPE_NOREALM: - { - size_t len; - size_t i; - char *p; - - len = 0; - for (i = 0; i < ent->principal->name.name_string.len; ++i) - len += strlen(ent->principal->name.name_string.val[i]); - ret = krb5_data_alloc (&salt->salt, len); - if (ret) - return ret; - p = salt->salt.data; - for (i = 0; i < ent->principal->name.name_string.len; ++i) { - memcpy (p, - ent->principal->name.name_string.val[i], - strlen(ent->principal->name.name_string.val[i])); - p += strlen(ent->principal->name.name_string.val[i]); - } - - salt->type = KRB5_PADATA_PW_SALT; - break; + char *p, *n; + + if (!*buf) { + *buf = malloc(*sz ? *sz : 2048); + if (!*buf) + return ENOMEM; + if (!*sz) + *sz = 2048; } - case KRB5_KDB_SALTTYPE_ONLYREALM: - krb5_data_free(&salt->salt); - ret = krb5_data_copy(&salt->salt, - ent->principal->realm, - strlen(ent->principal->realm)); - if(ret) - return ret; - salt->type = KRB5_PADATA_PW_SALT; - break; - case KRB5_KDB_SALTTYPE_SPECIAL: - salt->type = KRB5_PADATA_PW_SALT; - break; - case KRB5_KDB_SALTTYPE_AFS3: - krb5_data_free(&salt->salt); - ret = krb5_data_copy(&salt->salt, - ent->principal->realm, - strlen(ent->principal->realm)); - if(ret) - return ret; - salt->type = KRB5_PADATA_AFS3_SALT; - break; - default: - abort(); + *len = 0; + while ((p = fgets(&(*buf)[*len], *sz, f))) { + if (strcspn(*buf, "\r\n") || feof(f)) { + *len = strlen(*buf); + return 0; + } + *len += strlen(&(*buf)[*len]); /* *len should be == *sz */ + n = realloc(buf, *sz + (*sz >> 1)); + if (!n) { + free(*buf); + *buf = NULL; + *sz = 0; + *len = 0; + return ENOMEM; + } + *buf = n; + *sz += *sz >> 1; } - return 0; + return 0; /* *len == 0 || no EOL -> EOF */ } int mit_prop_dump(void *arg, const char *file) { krb5_error_code ret; - char line [2048]; - FILE *f; + size_t line_bufsz = 0; + size_t line_len = 0; + char *line = NULL; int lineno = 0; + FILE *f; struct hdb_entry_ex ent; - struct prop_data *pd = arg; + krb5_storage *sp = NULL; + krb5_data kdb_ent; + memset(&ent, 0, sizeof (ent)); f = fopen(file, "r"); - if(f == NULL) + if (f == NULL) return errno; - while(fgets(line, sizeof(line), f)) { - char *p = line, *q; - - int i; - - int num_tl_data; - int num_key_data; - int high_kvno; - int attributes; + ret = ENOMEM; + sp = krb5_storage_emem(); + if (!sp) + goto out; + while ((ret = my_fgetln(f, &line, &line_bufsz, &line_len)) == 0) { + char *p = line; + char *q; + lineno++; - int tmp; - - lineno++; - - memset(&ent, 0, sizeof(ent)); - - q = nexttoken(&p); - if(strcmp(q, "kdb5_util") == 0) { + if(strncmp(line, "kdb5_util", strlen("kdb5_util")) == 0) { int major; + q = nexttoken(&p); + if (strcmp(q, "kdb5_util")) + errx(1, "line %d: unknown version", lineno); q = nexttoken(&p); /* load_dump */ - if(strcmp(q, "load_dump")) + if (strcmp(q, "load_dump")) errx(1, "line %d: unknown version", lineno); q = nexttoken(&p); /* load_dump */ - if(strcmp(q, "version")) + if (strcmp(q, "version")) errx(1, "line %d: unknown version", lineno); q = nexttoken(&p); /* x.0 */ - if(sscanf(q, "%d", &major) != 1) + if (sscanf(q, "%d", &major) != 1) errx(1, "line %d: unknown version", lineno); - if(major != 4 && major != 5 && major != 6) + if (major != 4 && major != 5 && major != 6) errx(1, "unknown dump file format, got %d, expected 4-6", major); continue; - } else if(strcmp(q, "policy") == 0) { + } else if(strncmp(p, "policy", strlen("policy")) == 0) { + warnx("line: %d: ignoring policy (not supported)", lineno); continue; - } else if(strcmp(q, "princ") != 0) { + } else if(strncmp(p, "princ", strlen("princ")) != 0) { warnx("line %d: not a principal", lineno); continue; } - tmp = getint(&p); - if(tmp != 38) { - warnx("line %d: bad base length %d != 38", lineno, tmp); - continue; - } - nexttoken(&p); /* length of principal */ - num_tl_data = getint(&p); /* number of tl-data */ - num_key_data = getint(&p); /* number of key-data */ - getint(&p); /* length of extra data */ - q = nexttoken(&p); /* principal name */ - krb5_parse_name(pd->context, q, &ent.entry.principal); - attributes = getint(&p); /* attributes */ - attr_to_flags(attributes, &ent.entry.flags); - tmp = getint(&p); /* max life */ - if(tmp != 0) { - ALLOC(ent.entry.max_life); - *ent.entry.max_life = tmp; - } - tmp = getint(&p); /* max renewable life */ - if(tmp != 0) { - ALLOC(ent.entry.max_renew); - *ent.entry.max_renew = tmp; - } - tmp = getint(&p); /* expiration */ - if(tmp != 0 && tmp != 2145830400) { - ALLOC(ent.entry.valid_end); - *ent.entry.valid_end = tmp; - } - tmp = getint(&p); /* pw expiration */ - if(tmp != 0) { - ALLOC(ent.entry.pw_end); - *ent.entry.pw_end = tmp; - } - nexttoken(&p); /* last auth */ - nexttoken(&p); /* last failed auth */ - nexttoken(&p); /* fail auth count */ - for(i = 0; i < num_tl_data; i++) { - unsigned long val; - int tl_type, tl_length; - unsigned char *buf; - krb5_principal princ; - - tl_type = getint(&p); /* data type */ - tl_length = getint(&p); /* data length */ - -#define mit_KRB5_TL_LAST_PWD_CHANGE 1 -#define mit_KRB5_TL_MOD_PRINC 2 - switch(tl_type) { - case mit_KRB5_TL_LAST_PWD_CHANGE: - buf = malloc(tl_length); - if (buf == NULL) - errx(ENOMEM, "malloc"); - getdata(&p, buf, tl_length); /* data itself */ - val = buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); - free(buf); - ALLOC(ent.entry.extensions); - ALLOC_SEQ(ent.entry.extensions, 1); - ent.entry.extensions->val[0].mandatory = 0; - ent.entry.extensions->val[0].data.element - = choice_HDB_extension_data_last_pw_change; - ent.entry.extensions->val[0].data.u.last_pw_change = val; - break; - case mit_KRB5_TL_MOD_PRINC: - buf = malloc(tl_length); - if (buf == NULL) - errx(ENOMEM, "malloc"); - getdata(&p, buf, tl_length); /* data itself */ - val = buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); - ret = krb5_parse_name(pd->context, (char *)buf + 4, &princ); - if (ret) - krb5_err(pd->context, 1, ret, - "parse_name: %s", (char *)buf + 4); - free(buf); - ALLOC(ent.entry.modified_by); - ent.entry.modified_by->time = val; - ent.entry.modified_by->principal = princ; - break; - default: - nexttoken(&p); - break; - } - } - ALLOC_SEQ(&ent.entry.keys, num_key_data); - high_kvno = -1; - for(i = 0; i < num_key_data; i++) { - int key_versions; - int kvno; - key_versions = getint(&p); /* key data version */ - kvno = getint(&p); - - /* - * An MIT dump file may contain multiple sets of keys with - * different kvnos. Since the Heimdal database can only represent - * one kvno per principal, we only want the highest set. Assume - * that set will be given first, and discard all keys with lower - * kvnos. - */ - if (kvno > high_kvno && high_kvno != -1) - errx(1, "line %d: high kvno keys given after low kvno keys", - lineno); - else if (kvno < high_kvno) { - nexttoken(&p); /* key type */ - nexttoken(&p); /* key length */ - nexttoken(&p); /* key */ - if (key_versions > 1) { - nexttoken(&p); /* salt type */ - nexttoken(&p); /* salt length */ - nexttoken(&p); /* salt */ - } - ent.entry.keys.len--; - continue; - } - ent.entry.kvno = kvno; - high_kvno = kvno; - ALLOC(ent.entry.keys.val[i].mkvno); - *ent.entry.keys.val[i].mkvno = 1; - - /* key version 0 -- actual key */ - ent.entry.keys.val[i].key.keytype = getint(&p); /* key type */ - tmp = getint(&p); /* key length */ - /* the first two bytes of the key is the key length -- - skip it */ - krb5_data_alloc(&ent.entry.keys.val[i].key.keyvalue, tmp - 2); - q = nexttoken(&p); /* key itself */ - hex_to_octet_string(q + 4, &ent.entry.keys.val[i].key.keyvalue); - - if(key_versions > 1) { - /* key version 1 -- optional salt */ - ALLOC(ent.entry.keys.val[i].salt); - ent.entry.keys.val[i].salt->type = getint(&p); /* salt type */ - tmp = getint(&p); /* salt length */ - if(tmp > 0) { - krb5_data_alloc(&ent.entry.keys.val[i].salt->salt, tmp - 2); - q = nexttoken(&p); /* salt itself */ - hex_to_octet_string(q + 4, - &ent.entry.keys.val[i].salt->salt); - } else { - ent.entry.keys.val[i].salt->salt.length = 0; - ent.entry.keys.val[i].salt->salt.data = NULL; - getint(&p); /* -1, if no data. */ - } - fix_salt(pd->context, &ent.entry, i); - } - } - nexttoken(&p); /* extra data */ - v5_prop(pd->context, NULL, &ent, arg); + krb5_storage_truncate(sp, 0); + ret = _hdb_mit_dump2mitdb_entry(pd->context, line, sp); + if (ret) break; + ret = krb5_storage_to_data(sp, &kdb_ent); + if (ret) break; + ret = _hdb_mdb_value2entry(pd->context, &kdb_ent, 0, &ent.entry); + krb5_data_free(&kdb_ent); + if (ret) break; + ret = v5_prop(pd->context, NULL, &ent, arg); + hdb_free_entry(pd->context, &ent); + if (ret) break; } + +out: fclose(f); - return 0; + free(line); + if (sp) + krb5_storage_free(sp); + if (ret && ret == ENOMEM) + errx(1, "out of memory"); + if (ret) + errx(1, "line %d: problem parsing dump line", lineno); + return ret; } + diff --git a/crypto/heimdal/lib/hdb/Makefile.am b/crypto/heimdal/lib/hdb/Makefile.am index b629f56258d2..fd009bd26867 100644 --- a/crypto/heimdal/lib/hdb/Makefile.am +++ b/crypto/heimdal/lib/hdb/Makefile.am @@ -29,6 +29,7 @@ gen_files_hdb = \ asn1_HDB_Ext_Lan_Manager_OWF.x \ asn1_HDB_Ext_Password.x \ asn1_HDB_Ext_Aliases.x \ + asn1_HDB_Ext_KeySet.x \ asn1_HDB_extension.x \ asn1_HDB_extensions.x \ asn1_hdb_entry.x \ diff --git a/crypto/heimdal/lib/hdb/common.c b/crypto/heimdal/lib/hdb/common.c index 2715adf63dca..80482e7a4c1c 100644 --- a/crypto/heimdal/lib/hdb/common.c +++ b/crypto/heimdal/lib/hdb/common.c @@ -105,7 +105,6 @@ _hdb_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal principal, krb5_principal enterprise_principal = NULL; krb5_data key, value; krb5_error_code ret; - int code; if (principal->name.name_type == KRB5_NT_ENTERPRISE_PRINCIPAL) { if (principal->name.name_string.len != 1) { @@ -125,43 +124,74 @@ _hdb_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal principal, hdb_principal2key(context, principal, &key); if (enterprise_principal) krb5_free_principal(context, enterprise_principal); - code = db->hdb__get(context, db, key, &value); + ret = db->hdb__get(context, db, key, &value); krb5_data_free(&key); - if(code) - return code; - code = hdb_value2entry(context, &value, &entry->entry); - if (code == ASN1_BAD_ID && (flags & HDB_F_CANON) == 0) { + if(ret) + return ret; + ret = hdb_value2entry(context, &value, &entry->entry); + if (ret == ASN1_BAD_ID && (flags & HDB_F_CANON) == 0) { krb5_data_free(&value); return HDB_ERR_NOENTRY; - } else if (code == ASN1_BAD_ID) { + } else if (ret == ASN1_BAD_ID) { hdb_entry_alias alias; - code = hdb_value2entry_alias(context, &value, &alias); - if (code) { + ret = hdb_value2entry_alias(context, &value, &alias); + if (ret) { krb5_data_free(&value); - return code; + return ret; } hdb_principal2key(context, alias.principal, &key); krb5_data_free(&value); free_hdb_entry_alias(&alias); - code = db->hdb__get(context, db, key, &value); + ret = db->hdb__get(context, db, key, &value); krb5_data_free(&key); - if (code) - return code; - code = hdb_value2entry(context, &value, &entry->entry); - if (code) { + if (ret) + return ret; + ret = hdb_value2entry(context, &value, &entry->entry); + if (ret) { krb5_data_free(&value); - return code; + return ret; } } krb5_data_free(&value); if (db->hdb_master_key_set && (flags & HDB_F_DECRYPT)) { - code = hdb_unseal_keys (context, db, &entry->entry); - if (code) +#ifdef notnow + if ((flags & HDB_F_KVNO_SPECIFIED) == 0 && + (flags & HDB_F_CURRENT_KVNO) == 0) { + + /* + * Decrypt all the old keys too, since we don't know which + * the caller will need. + */ + ret = hdb_unseal_keys_kvno(context, db, 0, &entry->entry); + if (ret) { + hdb_free_entry(context, entry); + return ret; + } + } else if ((flags & HDB_F_KVNO_SPECIFIED) != 0 && + kvno != entry->entry.kvno && + kvno < entry->entry.kvno && + kvno > 0) { + + /* Decrypt the keys we were asked for, if not the current ones */ + ret = hdb_unseal_keys_kvno(context, db, kvno, &entry->entry); + if (ret) { + hdb_free_entry(context, entry); + return ret; + } + } +#endif + + /* Always decrypt the current keys too */ + ret = hdb_unseal_keys(context, db, &entry->entry); + if (ret) { hdb_free_entry(context, entry); + return ret; + } } - return code; + + return ret; } static krb5_error_code diff --git a/crypto/heimdal/lib/hdb/ext.c b/crypto/heimdal/lib/hdb/ext.c index d2a4373b9b38..5f7a19a55e04 100644 --- a/crypto/heimdal/lib/hdb/ext.c +++ b/crypto/heimdal/lib/hdb/ext.c @@ -432,3 +432,34 @@ hdb_entry_get_aliases(const hdb_entry *entry, const HDB_Ext_Aliases **a) return 0; } + +krb5_error_code +hdb_set_last_modified_by(krb5_context context, hdb_entry *entry, + krb5_principal modby, time_t modtime) +{ + krb5_error_code ret; + Event *old_ev; + Event *ev; + + old_ev = entry->modified_by; + + ev = calloc(1, sizeof (*ev)); + if (!ev) + return ENOMEM; + if (modby) + ret = krb5_copy_principal(context, modby, &ev->principal); + else + ret = krb5_parse_name(context, "root/admin", &ev->principal); + if (ret) { + free(ev); + return ret; + } + ev->time = modtime; + if (!ev->time) + time(&ev->time); + + entry->modified_by = ev; + if (old_ev) + free_Event(old_ev); + return 0; +} diff --git a/crypto/heimdal/lib/hdb/hdb-mitdb.c b/crypto/heimdal/lib/hdb/hdb-mitdb.c index 02c575050fe2..1dfe7835cb4d 100644 --- a/crypto/heimdal/lib/hdb/hdb-mitdb.c +++ b/crypto/heimdal/lib/hdb/hdb-mitdb.c @@ -91,18 +91,28 @@ salt: #include "hdb_locl.h" -#define KDB_V1_BASE_LENGTH 38 - -#if HAVE_DB1 +static void +attr_to_flags(unsigned attr, HDBFlags *flags) +{ + flags->postdate = !(attr & KRB5_KDB_DISALLOW_POSTDATED); + flags->forwardable = !(attr & KRB5_KDB_DISALLOW_FORWARDABLE); + flags->initial = !!(attr & KRB5_KDB_DISALLOW_TGT_BASED); + flags->renewable = !(attr & KRB5_KDB_DISALLOW_RENEWABLE); + flags->proxiable = !(attr & KRB5_KDB_DISALLOW_PROXIABLE); + /* DUP_SKEY */ + flags->invalid = !!(attr & KRB5_KDB_DISALLOW_ALL_TIX); + flags->require_preauth = !!(attr & KRB5_KDB_REQUIRES_PRE_AUTH); + flags->require_hwauth = !!(attr & KRB5_KDB_REQUIRES_HW_AUTH); + flags->server = !(attr & KRB5_KDB_DISALLOW_SVR); + flags->change_pw = !!(attr & KRB5_KDB_PWCHANGE_SERVICE); + flags->client = 1; /* XXX */ +} -#if defined(HAVE_DB_185_H) -#include <db_185.h> -#elif defined(HAVE_DB_H) -#include <db.h> -#endif +#define KDB_V1_BASE_LENGTH 38 #define CHECK(x) do { if ((x)) goto out; } while(0) +#ifdef HAVE_DB1 static krb5_error_code mdb_principal2key(krb5_context context, krb5_const_principal principal, @@ -118,6 +128,7 @@ mdb_principal2key(krb5_context context, key->length = strlen(str) + 1; return 0; } +#endif /* HAVE_DB1 */ #define KRB5_KDB_SALTTYPE_NORMAL 0 #define KRB5_KDB_SALTTYPE_V4 1 @@ -197,13 +208,15 @@ fix_salt(krb5_context context, hdb_entry *ent, int key_num) } -static krb5_error_code -mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry *entry) +krb5_error_code +_hdb_mdb_value2entry(krb5_context context, krb5_data *data, + krb5_kvno kvno, hdb_entry *entry) { krb5_error_code ret; krb5_storage *sp; uint32_t u32; uint16_t u16, num_keys, num_tl; + ssize_t sz; size_t i, j; char *p; @@ -234,18 +247,7 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry if (u16 != KDB_V1_BASE_LENGTH) { ret = EINVAL; goto out; } /* 32: attributes */ CHECK(ret = krb5_ret_uint32(sp, &u32)); - entry->flags.postdate = !(u32 & KRB5_KDB_DISALLOW_POSTDATED); - entry->flags.forwardable = !(u32 & KRB5_KDB_DISALLOW_FORWARDABLE); - entry->flags.initial = !!(u32 & KRB5_KDB_DISALLOW_TGT_BASED); - entry->flags.renewable = !(u32 & KRB5_KDB_DISALLOW_RENEWABLE); - entry->flags.proxiable = !(u32 & KRB5_KDB_DISALLOW_PROXIABLE); - /* DUP_SKEY */ - entry->flags.invalid = !!(u32 & KRB5_KDB_DISALLOW_ALL_TIX); - entry->flags.require_preauth =!!(u32 & KRB5_KDB_REQUIRES_PRE_AUTH); - entry->flags.require_hwauth =!!(u32 & KRB5_KDB_REQUIRES_HW_AUTH); - entry->flags.server = !(u32 & KRB5_KDB_DISALLOW_SVR); - entry->flags.change_pw = !!(u32 & KRB5_KDB_PWCHANGE_SERVICE); - entry->flags.client = 1; /* XXX */ + attr_to_flags(u32, &entry->flags); /* 32: max time */ CHECK(ret = krb5_ret_uint32(sp, &u32)); @@ -296,7 +298,11 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry ret = ENOMEM; goto out; } - krb5_storage_read(sp, p, u16); + sz = krb5_storage_read(sp, p, u16); + if (sz != u16) { + ret = EINVAL; /* XXX */ + goto out; + } p[u16] = '\0'; CHECK(ret = krb5_parse_name(context, p, &entry->principal)); free(p); @@ -305,12 +311,53 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry 16: tl data type 16: tl data length length: length */ +#define mit_KRB5_TL_LAST_PWD_CHANGE 1 +#define mit_KRB5_TL_MOD_PRINC 2 for (i = 0; i < num_tl; i++) { + int tl_type; + krb5_principal modby; /* 16: TL data type */ CHECK(ret = krb5_ret_uint16(sp, &u16)); + tl_type = u16; /* 16: TL data length */ CHECK(ret = krb5_ret_uint16(sp, &u16)); - krb5_storage_seek(sp, u16, SEEK_CUR); + /* + * For rollback to MIT purposes we really must understand some + * TL data! + * + * XXX Move all this to separate functions, one per-TL type. + */ + switch (tl_type) { + case mit_KRB5_TL_LAST_PWD_CHANGE: + CHECK(ret = krb5_ret_uint32(sp, &u32)); + CHECK(ret = hdb_entry_set_pw_change_time(context, entry, u32)); + break; + case mit_KRB5_TL_MOD_PRINC: + if (u16 < 5) { + ret = EINVAL; /* XXX */ + goto out; + } + CHECK(ret = krb5_ret_uint32(sp, &u32)); /* mod time */ + p = malloc(u16 - 4 + 1); + if (!p) { + ret = ENOMEM; + goto out; + } + p[u16 - 4] = '\0'; + sz = krb5_storage_read(sp, p, u16 - 4); + if (sz != u16 - 4) { + ret = EINVAL; /* XXX */ + goto out; + } + CHECK(ret = krb5_parse_name(context, p, &modby)); + ret = hdb_set_last_modified_by(context, entry, modby, u32); + krb5_free_principal(context, modby); + free(p); + break; + default: + krb5_storage_seek(sp, u16, SEEK_CUR); + break; + } } /* * for num key data times @@ -471,6 +518,14 @@ mdb_entry2value(krb5_context context, hdb_entry *entry, krb5_data *data) } #endif +#if HAVE_DB1 + +#if defined(HAVE_DB_185_H) +#include <db_185.h> +#elif defined(HAVE_DB_H) +#include <db.h> +#endif + static krb5_error_code mdb_close(krb5_context context, HDB *db) @@ -551,7 +606,7 @@ mdb_seq(krb5_context context, HDB *db, data.length = value.size; memset(entry, 0, sizeof(*entry)); - if (mdb_value2entry(context, &data, 0, &entry->entry)) + if (_hdb_mdb_value2entry(context, &data, 0, &entry->entry)) return mdb_seq(context, db, flags, entry, R_NEXT); if (db->hdb_master_key_set && (flags & HDB_F_DECRYPT)) { @@ -684,24 +739,26 @@ mdb_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal principal, unsigned flags, krb5_kvno kvno, hdb_entry_ex *entry) { krb5_data key, value; - krb5_error_code code; + krb5_error_code ret; - code = mdb_principal2key(context, principal, &key); - if (code) - return code; - code = db->hdb__get(context, db, key, &value); + ret = mdb_principal2key(context, principal, &key); + if (ret) + return ret; + ret = db->hdb__get(context, db, key, &value); krb5_data_free(&key); - if(code) - return code; - code = mdb_value2entry(context, &value, kvno, &entry->entry); + if(ret) + return ret; + ret = _hdb_mdb_value2entry(context, &value, kvno, &entry->entry); krb5_data_free(&value); - if (code) - return code; + if (ret) + return ret; if (db->hdb_master_key_set && (flags & HDB_F_DECRYPT)) { - code = hdb_unseal_keys (context, db, &entry->entry); - if (code) + ret = hdb_unseal_keys (context, db, &entry->entry); + if (ret) { hdb_free_entry(context, entry); + return ret; + } } return 0; @@ -710,8 +767,48 @@ mdb_fetch_kvno(krb5_context context, HDB *db, krb5_const_principal principal, static krb5_error_code mdb_store(krb5_context context, HDB *db, unsigned flags, hdb_entry_ex *entry) { - krb5_set_error_message(context, EINVAL, "can't set principal in mdb"); - return EINVAL; + krb5_error_code ret; + krb5_storage *sp = NULL; + krb5_storage *spent = NULL; + krb5_data line = { 0, 0 }; + krb5_data kdb_ent = { 0, 0 }; + krb5_data key = { 0, 0 }; + ssize_t sz; + + sp = krb5_storage_emem(); + if (!sp) return ENOMEM; + ret = _hdb_set_master_key_usage(context, db, 0); /* MIT KDB uses KU 0 */ + ret = hdb_seal_keys(context, db, &entry->entry); + if (ret) return ret; + ret = entry2mit_string_int(context, sp, &entry->entry); + if (ret) goto out; + sz = krb5_storage_write(sp, "\n", 2); /* NUL-terminate */ + ret = ENOMEM; + if (sz == -1) goto out; + ret = krb5_storage_to_data(sp, &line); + if (ret) goto out; + + ret = ENOMEM; + spent = krb5_storage_emem(); + if (!spent) goto out; + ret = _hdb_mit_dump2mitdb_entry(context, line.data, spent); + if (ret) goto out; + ret = krb5_storage_to_data(spent, &kdb_ent); + if (ret) goto out; + ret = mdb_principal2key(context, entry->entry.principal, &key); + if (ret) goto out; + ret = mdb__put(context, db, 1, key, kdb_ent); + +out: + if (sp) + krb5_storage_free(sp); + if (spent) + krb5_storage_free(spent); + krb5_data_free(&line); + krb5_data_free(&kdb_ent); + krb5_data_free(&key); + + return ret; } static krb5_error_code @@ -729,25 +826,31 @@ static krb5_error_code mdb_open(krb5_context context, HDB *db, int flags, mode_t mode) { char *fn; + char *actual_fn; krb5_error_code ret; + struct stat st; asprintf(&fn, "%s.db", db->hdb_name); if (fn == NULL) { krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); return ENOMEM; } - db->hdb_db = dbopen(fn, flags, mode, DB_BTREE, NULL); - free(fn); + if (stat(fn, &st) == 0) + actual_fn = fn; + else + actual_fn = db->hdb_name; + db->hdb_db = dbopen(actual_fn, flags, mode, DB_BTREE, NULL); if (db->hdb_db == NULL) { switch (errno) { #ifdef EFTYPE case EFTYPE: #endif case EINVAL: - db->hdb_db = dbopen(fn, flags, mode, DB_BTREE, NULL); + db->hdb_db = dbopen(actual_fn, flags, mode, DB_BTREE, NULL); } } + free(fn); /* try to open without .db extension */ if(db->hdb_db == NULL && errno == ENOENT) @@ -758,11 +861,16 @@ mdb_open(krb5_context context, HDB *db, int flags, mode_t mode) db->hdb_name, strerror(ret)); return ret; } - if((flags & O_ACCMODE) == O_RDONLY) - ret = hdb_check_db_format(context, db); - else +#if 0 + /* + * Don't do this -- MIT won't be able to handle the + * HDB_DB_FORMAT_ENTRY key. + */ + if ((flags & O_ACCMODE) != O_RDONLY) ret = hdb_init_db(context, db); - if(ret == HDB_ERR_NOENTRY) { +#endif + ret = hdb_check_db_format(context, db); + if (ret == HDB_ERR_NOENTRY) { krb5_clear_error_message(context); return 0; } @@ -815,3 +923,280 @@ hdb_mdb_create(krb5_context context, HDB **db, } #endif /* HAVE_DB1 */ + +/* +can have any number of princ stanzas. +format is as follows (only \n indicates newlines) +princ\t%d\t (%d is KRB5_KDB_V1_BASE_LENGTH, always 38) +%d\t (strlen of principal e.g. shadow/foo@ANDREW.CMU.EDU) +%d\t (number of tl_data) +%d\t (number of key data, e.g. how many keys for this user) +%d\t (extra data length) +%s\t (principal name) +%d\t (attributes) +%d\t (max lifetime, seconds) +%d\t (max renewable life, seconds) +%d\t (expiration, seconds since epoch or 2145830400 for never) +%d\t (password expiration, seconds, 0 for never) +%d\t (last successful auth, seconds since epoch) +%d\t (last failed auth, per above) +%d\t (failed auth count) +foreach tl_data 0 to number of tl_data - 1 as above + %d\t%d\t (data type, data length) + foreach tl_data 0 to length-1 + %02x (tl data contents[element n]) + except if tl_data length is 0 + %d (always -1) + \t +foreach key 0 to number of keys - 1 as above + %d\t%d\t (key data version, kvno) + foreach version 0 to key data version - 1 (a key or a salt) + %d\t%d\t(data type for this key, data length for this key) + foreach key data length 0 to length-1 + %02x (key data contents[element n]) + except if key_data length is 0 + %d (always -1) + \t +foreach extra data length 0 to length - 1 + %02x (extra data part) +unless no extra data + %d (always -1) +;\n + +*/ + +static char * +nexttoken(char **p) +{ + char *q; + do { + q = strsep(p, " \t"); + } while(q && *q == '\0'); + return q; +} + +static size_t +getdata(char **p, unsigned char *buf, size_t len) +{ + size_t i; + int v; + char *q = nexttoken(p); + i = 0; + while(*q && i < len) { + if(sscanf(q, "%02x", &v) != 1) + break; + buf[i++] = v; + q += 2; + } + return i; +} + +static int +getint(char **p) +{ + int val; + char *q = nexttoken(p); + sscanf(q, "%d", &val); + return val; +} + +static unsigned int +getuint(char **p) +{ + int val; + char *q = nexttoken(p); + sscanf(q, "%u", &val); + return val; +} + +#define KRB5_KDB_SALTTYPE_NORMAL 0 +#define KRB5_KDB_SALTTYPE_V4 1 +#define KRB5_KDB_SALTTYPE_NOREALM 2 +#define KRB5_KDB_SALTTYPE_ONLYREALM 3 +#define KRB5_KDB_SALTTYPE_SPECIAL 4 +#define KRB5_KDB_SALTTYPE_AFS3 5 + +#define CHECK_UINT(num) \ + if ((num) < 0 || (num) > INT_MAX) return EINVAL +#define CHECK_UINT16(num) \ + if ((num) < 0 || (num) > 1<<15) return EINVAL +#define CHECK_NUM(num, maxv) \ + if ((num) > (maxv)) return EINVAL + +/* + * This utility function converts an MIT dump entry to an MIT on-disk + * encoded entry, which can then be decoded with _hdb_mdb_value2entry(). + * This allows us to have a single decoding function (_hdb_mdb_value2entry), + * which makes the code cleaner (less code duplication), if a bit less + * efficient. It also will allow us to have a function to dump an HDB + * entry in MIT format so we can dump HDB into MIT format for rollback + * purposes. And that will allow us to write to MIT KDBs, again + * somewhat inefficiently, also for migration/rollback purposes. + */ +int +_hdb_mit_dump2mitdb_entry(krb5_context context, char *line, krb5_storage *sp) +{ + krb5_error_code ret = EINVAL; + char *p = line, *q; + char *princ; + ssize_t sz; + size_t i; + size_t princ_len; + unsigned int num_tl_data; + size_t num_key_data; + unsigned int attributes; + int tmp; + + krb5_storage_set_byteorder(sp, KRB5_STORAGE_BYTEORDER_LE); + + q = nexttoken(&p); + if (strcmp(q, "kdb5_util") == 0 || strcmp(q, "policy") == 0 || + strcmp(q, "princ") != 0) { + return -1; + } + if (getint(&p) != 38) + return EINVAL; +#define KDB_V1_BASE_LENGTH 38 + ret = krb5_store_int16(sp, KDB_V1_BASE_LENGTH); + if (ret) return ret; + + nexttoken(&p); /* length of principal */ + num_tl_data = getuint(&p); /* number of tl-data */ + num_key_data = getuint(&p); /* number of key-data */ + getint(&p); /* length of extra data */ + princ = nexttoken(&p); /* principal name */ + + attributes = getuint(&p); /* attributes */ + ret = krb5_store_uint32(sp, attributes); + if (ret) return ret; + + tmp = getint(&p); /* max life */ + CHECK_UINT(tmp); + ret = krb5_store_uint32(sp, tmp); + if (ret) return ret; + + tmp = getint(&p); /* max renewable life */ + CHECK_UINT(tmp); + ret = krb5_store_uint32(sp, tmp); + if (ret) return ret; + + tmp = getint(&p); /* expiration */ + CHECK_UINT(tmp); + ret = krb5_store_uint32(sp, tmp); + if (ret) return ret; + + tmp = getint(&p); /* pw expiration */ + CHECK_UINT(tmp); + ret = krb5_store_uint32(sp, tmp); + if (ret) return ret; + + tmp = getint(&p); /* last auth */ + CHECK_UINT(tmp); + ret = krb5_store_uint32(sp, tmp); + if (ret) return ret; + + tmp = getint(&p); /* last failed auth */ + CHECK_UINT(tmp); + ret = krb5_store_uint32(sp, tmp); + if (ret) return ret; + + tmp = getint(&p); /* fail auth count */ + CHECK_UINT(tmp); + ret = krb5_store_uint32(sp, tmp); + if (ret) return ret; + + /* add TL data count */ + CHECK_NUM(num_tl_data, 1023); + ret = krb5_store_uint16(sp, num_tl_data); + if (ret) return ret; + + /* add key count */ + CHECK_NUM(num_key_data, 1023); + ret = krb5_store_uint16(sp, num_key_data); + if (ret) return ret; + + /* add principal unparsed name length and unparsed name */ + princ_len = strlen(princ); + if (princ_len > (1<<15) - 1) return EINVAL; + princ_len++; /* must count and write the NUL in the on-disk encoding */ + ret = krb5_store_uint16(sp, princ_len); + if (ret) return ret; + sz = krb5_storage_write(sp, princ, princ_len); + if (sz == -1) return ENOMEM; + + /* scan and write TL data */ + for (i = 0; i < num_tl_data; i++) { + int tl_type, tl_length; + unsigned char *buf; + + tl_type = getint(&p); /* data type */ + tl_length = getint(&p); /* data length */ + + CHECK_UINT16(tl_type); + ret = krb5_store_uint16(sp, tl_type); + if (ret) return ret; + CHECK_UINT16(tl_length); + ret = krb5_store_uint16(sp, tl_length); + if (ret) return ret; + + if (tl_length) { + buf = malloc(tl_length); + if (!buf) return ENOMEM; + if (getdata(&p, buf, tl_length) != tl_length) return EINVAL; + sz = krb5_storage_write(sp, buf, tl_length); + free(buf); + if (sz == -1) return ENOMEM; + } else { + if (strcmp(nexttoken(&p), "-1") != 0) return EINVAL; + } + } + + for (i = 0; i < num_key_data; i++) { + unsigned char *buf; + int key_versions; + int kvno; + int keytype; + int keylen; + size_t k; + + key_versions = getint(&p); /* key data version */ + CHECK_UINT16(key_versions); + ret = krb5_store_int16(sp, key_versions); + if (ret) return ret; + + kvno = getint(&p); + CHECK_UINT16(kvno); + ret = krb5_store_int16(sp, kvno); + if (ret) return ret; + + for (k = 0; k < key_versions; k++) { + keytype = getint(&p); + CHECK_UINT16(keytype); + ret = krb5_store_int16(sp, keytype); + if (ret) return ret; + + keylen = getint(&p); + CHECK_UINT16(keylen); + ret = krb5_store_int16(sp, keylen); + if (ret) return ret; + + if (keylen) { + buf = malloc(keylen); + if (!buf) return ENOMEM; + if (getdata(&p, buf, keylen) != keylen) return EINVAL; + sz = krb5_storage_write(sp, buf, keylen); + free(buf); + if (sz == -1) return ENOMEM; + } else { + if (strcmp(nexttoken(&p), "-1") != 0) return EINVAL; + } + } + } + /* + * The rest is "extra data", but there's never any and we wouldn't + * know what to do with it. + */ + /* nexttoken(&p); */ + return 0; +} + diff --git a/crypto/heimdal/lib/hdb/hdb-protos.h b/crypto/heimdal/lib/hdb/hdb-protos.h index 44a1bddc7625..2b692855c405 100644 --- a/crypto/heimdal/lib/hdb/hdb-protos.h +++ b/crypto/heimdal/lib/hdb/hdb-protos.h @@ -9,6 +9,17 @@ extern "C" { #endif krb5_error_code +entry2mit_string_int ( + krb5_context /*context*/, + krb5_storage */*sp*/, + hdb_entry */*ent*/); + +krb5_error_code +hdb_add_current_keys_to_history ( + krb5_context /*context*/, + hdb_entry */*entry*/); + +krb5_error_code hdb_add_master_key ( krb5_context /*context*/, krb5_keyblock */*key*/, @@ -347,6 +358,13 @@ hdb_seal_keys_mkey ( hdb_master_key /*mkey*/); krb5_error_code +hdb_set_last_modified_by ( + krb5_context /*context*/, + hdb_entry */*entry*/, + krb5_principal /*modby*/, + time_t /*modtime*/); + +krb5_error_code hdb_set_master_key ( krb5_context /*context*/, HDB */*db*/, @@ -386,6 +404,13 @@ hdb_unseal_keys ( hdb_entry */*ent*/); krb5_error_code +hdb_unseal_keys_kvno ( + krb5_context /*context*/, + HDB */*db*/, + krb5_kvno /*kvno*/, + hdb_entry */*ent*/); + +krb5_error_code hdb_unseal_keys_mkey ( krb5_context /*context*/, hdb_entry */*ent*/, diff --git a/crypto/heimdal/lib/hdb/hdb.asn1 b/crypto/heimdal/lib/hdb/hdb.asn1 index a72851c9f201..d24737fbf6e8 100644 --- a/crypto/heimdal/lib/hdb/hdb.asn1 +++ b/crypto/heimdal/lib/hdb/hdb.asn1 @@ -87,6 +87,14 @@ HDB-Ext-Aliases ::= SEQUENCE { aliases[1] SEQUENCE OF Principal -- all names, inc primary } +hdb_keyset ::= SEQUENCE { + kvno[0] INTEGER (0..4294967295), + replace-time[1] KerberosTime, -- time this key was replaced + keys[2] SEQUENCE OF Key +} + +HDB-Ext-KeySet ::= SEQUENCE OF hdb_keyset + HDB-extension ::= SEQUENCE { mandatory[0] BOOLEAN, -- kdc MUST understand this extension, @@ -102,6 +110,7 @@ HDB-extension ::= SEQUENCE { aliases[6] HDB-Ext-Aliases, last-pw-change[7] KerberosTime, pkinit-cert[8] HDB-Ext-PKINIT-cert, + hist-keys[9] HDB-Ext-KeySet, ... }, ... @@ -109,11 +118,6 @@ HDB-extension ::= SEQUENCE { HDB-extensions ::= SEQUENCE OF HDB-extension -hdb_keyset ::= SEQUENCE { - kvno[1] INTEGER (0..4294967295), - keys[0] SEQUENCE OF Key -} - hdb_entry ::= SEQUENCE { principal[0] Principal OPTIONAL, -- this is optional only -- for compatibility with libkrb5 diff --git a/crypto/heimdal/lib/hdb/hdb.c b/crypto/heimdal/lib/hdb/hdb.c index ca05cc4a1785..aff576a30d37 100644 --- a/crypto/heimdal/lib/hdb/hdb.c +++ b/crypto/heimdal/lib/hdb/hdb.c @@ -168,13 +168,14 @@ hdb_unlock(int fd) void hdb_free_entry(krb5_context context, hdb_entry_ex *ent) { - size_t i; + Key *k; + int i; if (ent->free_entry) (*ent->free_entry)(context, ent); - for(i = 0; i < ent->entry.keys.len; ++i) { - Key *k = &ent->entry.keys.val[i]; + for(i = 0; i < ent->entry.keys.len; i++) { + k = &ent->entry.keys.val[i]; memset (k->key.keyvalue.data, 0, k->key.keyvalue.length); } diff --git a/crypto/heimdal/lib/hdb/hdb.h b/crypto/heimdal/lib/hdb/hdb.h index a1692ce82ca2..4c4c2c2b1a5c 100644 --- a/crypto/heimdal/lib/hdb/hdb.h +++ b/crypto/heimdal/lib/hdb/hdb.h @@ -99,7 +99,7 @@ typedef struct hdb_entry_ex { * query the backend database when talking about principals. */ -typedef struct HDB{ +typedef struct HDB { void *hdb_db; void *hdb_dbc; /** don't use, only for DB3 */ char *hdb_name; @@ -256,6 +256,8 @@ typedef struct HDB{ * Check if s4u2self is allowed from this client to this server */ krb5_error_code (*hdb_check_s4u2self)(krb5_context, struct HDB *, hdb_entry_ex *, krb5_const_principal); + int hdb_mit_key_set; + hdb_master_key hdb_mit_key; }HDB; #define HDB_INTERFACE_VERSION 7 @@ -266,6 +268,17 @@ struct hdb_so_method { krb5_error_code (*create)(krb5_context, HDB **, const char *filename); }; +/* dump entry format, for hdb_print_entry() */ +typedef enum hdb_dump_format { + HDB_DUMP_HEIMDAL = 0, + HDB_DUMP_MIT = 1, +} hdb_dump_format_t; + +struct hdb_print_entry_arg { + FILE *out; + hdb_dump_format_t fmt; +}; + typedef krb5_error_code (*hdb_foreach_func_t)(krb5_context, HDB*, hdb_entry_ex*, void*); extern krb5_kt_ops hdb_kt_ops; diff --git a/crypto/heimdal/lib/hdb/hdb_locl.h b/crypto/heimdal/lib/hdb/hdb_locl.h index e896b5802575..5aad504589df 100644 --- a/crypto/heimdal/lib/hdb/hdb_locl.h +++ b/crypto/heimdal/lib/hdb/hdb_locl.h @@ -38,6 +38,8 @@ #include <config.h> +#include <heimbase.h> + #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -67,4 +69,9 @@ #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal" #define HDB_DB_FORMAT_ENTRY "hdb/db-format" +/* Test for strong key etypes accepted by MIT's KDC. */ +#define mit_strong_etype(t) \ + ((t) == ETYPE_AES128_CTS_HMAC_SHA1_96 || \ + (t) == ETYPE_AES256_CTS_HMAC_SHA1_96) + #endif /* __HDB_LOCL_H__ */ diff --git a/crypto/heimdal/lib/hdb/keys.c b/crypto/heimdal/lib/hdb/keys.c index 3d0b9d7c1b31..9c0af5c47f23 100644 --- a/crypto/heimdal/lib/hdb/keys.c +++ b/crypto/heimdal/lib/hdb/keys.c @@ -39,7 +39,7 @@ */ void -hdb_free_keys (krb5_context context, int len, Key *keys) +hdb_free_keys(krb5_context context, int len, Key *keys) { int i; @@ -56,6 +56,19 @@ hdb_free_keys (krb5_context context, int len, Key *keys) free (keys); } +void +hdb_free_keysets(krb5_context context, int len, hdb_keyset *keysets) +{ + int i; + + for (i = 0; i < len; i++) { + hdb_free_keys(context, keysets[i].keys.len, keysets[i].keys.val); + keysets[i].keys.val = NULL; + keysets[i].keys.len = 0; + } + free (keysets); +} + /* * for each entry in `default_keys' try to parse it as a sequence * of etype:salttype:salt, syntax of this if something like: @@ -196,6 +209,60 @@ parse_key_set(krb5_context context, const char *key, return 0; } + +krb5_error_code +hdb_add_current_keys_to_history(krb5_context context, hdb_entry *entry) +{ + krb5_error_code ret; + HDB_extension *ext; + HDB_Ext_KeySet *hist_keys; + hdb_keyset *tmp_keysets; + int add = 0; + + ext = hdb_find_extension(entry, choice_HDB_extension_data_hist_keys); + if (ext != NULL) { + hist_keys = &ext->data.u.hist_keys; + tmp_keysets = realloc(hist_keys->val, + sizeof (*hist_keys->val) * (hist_keys->len + 1)); + if (tmp_keysets == NULL) + return ENOMEM; + hist_keys->val = tmp_keysets; + memmove(&hist_keys->val[1], hist_keys->val, + sizeof (*hist_keys->val) * hist_keys->len++); + } else { + add = 1; + ext = calloc(1, sizeof (*ext)); + if (ext == NULL) + return ENOMEM; + ext->data.element = choice_HDB_extension_data_hist_keys; + hist_keys = &ext->data.u.hist_keys; + hist_keys->val = calloc(1, sizeof (*hist_keys->val)); + if (hist_keys->val == NULL) { + free(hist_keys); + return ENOMEM; + } + hist_keys->len = 1; + } + + hist_keys->val[0].keys.val = entry->keys.val; + hist_keys->val[0].keys.len = entry->keys.len; + hist_keys->val[0].kvno = entry->kvno; + hist_keys->val[0].replace_time = time(NULL); + + if (add) { + ret = hdb_replace_extension(context, entry, ext); + if (ret) { + free_HDB_extension(ext); + return ret; + } + } + + /* hdb_replace_extension() copies ext, so we have to free it */ + free_HDB_extension(ext); + return 0; +} + + static krb5_error_code add_enctype_to_key_set(Key **key_set, size_t *nkeyset, krb5_enctype enctype, krb5_salt *salt) diff --git a/crypto/heimdal/lib/hdb/mkey.c b/crypto/heimdal/lib/hdb/mkey.c index 9eb98fca32c0..78a9e51a132c 100644 --- a/crypto/heimdal/lib/hdb/mkey.c +++ b/crypto/heimdal/lib/hdb/mkey.c @@ -32,6 +32,7 @@ */ #include "hdb_locl.h" +#include <assert.h> #ifndef O_BINARY #define O_BINARY 0 #endif @@ -40,6 +41,7 @@ struct hdb_master_key_data { krb5_keytab_entry keytab; krb5_crypto crypto; struct hdb_master_key_data *next; + unsigned int key_usage; }; void @@ -68,6 +70,7 @@ hdb_process_master_key(krb5_context context, krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); return ENOMEM; } + (*mkey)->key_usage = HDB_KU_MKEY; (*mkey)->keytab.vno = kvno; ret = krb5_parse_name(context, "K/M", &(*mkey)->keytab.principal); if(ret) @@ -362,6 +365,15 @@ hdb_write_master_key(krb5_context context, const char *filename, return ret; } +krb5_error_code +_hdb_set_master_key_usage(krb5_context context, HDB *db, unsigned int key_usage) +{ + if (db->hdb_master_key_set == 0) + return HDB_ERR_NO_MKEY; + db->hdb_master_key->key_usage = key_usage; + return 0; +} + hdb_master_key _hdb_find_master_key(uint32_t *mkvno, hdb_master_key mkey) { @@ -403,15 +415,20 @@ _hdb_mkey_encrypt(krb5_context context, hdb_master_key key, ptr, size, res); } -krb5_error_code -hdb_unseal_key_mkey(krb5_context context, Key *k, hdb_master_key mkey) +/* + * Unseal and optionally reseal the key in the MIT KDC master key. + * If mit_key != NULL, the key is sealed using this key. + */ +static krb5_error_code +_hdb_reseal_key_mkey(krb5_context context, Key *k, hdb_master_key mkey, + hdb_master_key mit_key) { krb5_error_code ret; - krb5_data res; + krb5_data mitres, res; size_t keysize; - hdb_master_key key; + hdb_master_key key, mitkey; if(k->mkvno == NULL) return 0; @@ -428,9 +445,9 @@ hdb_unseal_key_mkey(krb5_context context, Key *k, hdb_master_key mkey) if(ret == KRB5KRB_AP_ERR_BAD_INTEGRITY) { /* try to decrypt with MIT key usage */ ret = _hdb_mkey_decrypt(context, key, 0, - k->key.keyvalue.data, - k->key.keyvalue.length, - &res); + k->key.keyvalue.data, + k->key.keyvalue.length, + &res); } if (ret) return ret; @@ -446,25 +463,81 @@ hdb_unseal_key_mkey(krb5_context context, Key *k, hdb_master_key mkey) return KRB5_BAD_KEYSIZE; } - memset(k->key.keyvalue.data, 0, k->key.keyvalue.length); - free(k->key.keyvalue.data); - k->key.keyvalue = res; - k->key.keyvalue.length = keysize; - free(k->mkvno); - k->mkvno = NULL; + /* For mit_key != NULL, re-encrypt the key using the mitkey. */ + if (mit_key != NULL) { + mitkey = _hdb_find_master_key(NULL, mit_key); + if (mitkey == NULL) { + krb5_data_free(&res); + return HDB_ERR_NO_MKEY; + } + + ret = _hdb_mkey_encrypt(context, mitkey, 0, + res.data, + keysize, + &mitres); + krb5_data_free(&res); + if (ret) + return ret; + } + + krb5_data_free(&k->key.keyvalue); + if (mit_key == NULL) { + k->key.keyvalue = res; + k->key.keyvalue.length = keysize; + free(k->mkvno); + k->mkvno = NULL; + } else { + k->key.keyvalue = mitres; + *k->mkvno = mitkey->keytab.vno; + } return 0; } krb5_error_code -hdb_unseal_keys_mkey(krb5_context context, hdb_entry *ent, hdb_master_key mkey) +hdb_unseal_key_mkey(krb5_context context, Key *k, hdb_master_key mkey) +{ + + krb5_error_code ret; + + ret = _hdb_reseal_key_mkey(context, k, mkey, NULL); + return ret; +} + +static krb5_error_code +_hdb_unseal_keys_mkey(krb5_context context, hdb_entry *ent, hdb_master_key mkey, + hdb_master_key mitkey) { + krb5_error_code ret; size_t i; + int got_one = 0; for(i = 0; i < ent->keys.len; i++){ - krb5_error_code ret; + if (mitkey == NULL || mit_strong_etype(ent->keys.val[i].key.keytype)) { + ret = _hdb_reseal_key_mkey(context, &ent->keys.val[i], mkey, + mitkey); + if (ret) + return ret; + got_one = 1; + } + } - ret = hdb_unseal_key_mkey(context, &ent->keys.val[i], mkey); + /* + * If none of the keys were string enough, create a strong key, + * but one that is not encrypted in the MIT master key. As such, + * it will require a "change_password" once in the MIT KDC to + * make it work. + */ + if (got_one == 0 && mitkey != NULL && ent->keys.len > 0) { + krb5_keyblock key; + krb5_salt salt; + + krb5_free_keyblock_contents(context, &ent->keys.val[0].key); + salt.salttype = KRB5_PW_SALT; + salt.saltvalue.data = NULL; + salt.saltvalue.length = 0; + ret = krb5_string_to_key_salt(context, ETYPE_AES256_CTS_HMAC_SHA1_96, + "XXXX", salt, &ent->keys.val[0].key); if (ret) return ret; } @@ -472,19 +545,114 @@ hdb_unseal_keys_mkey(krb5_context context, hdb_entry *ent, hdb_master_key mkey) } krb5_error_code +hdb_unseal_keys_mkey(krb5_context context, hdb_entry *ent, hdb_master_key mkey) +{ + krb5_error_code ret; + + ret = _hdb_unseal_keys_mkey(context, ent, mkey, NULL); + return ret; +} + +krb5_error_code hdb_unseal_keys(krb5_context context, HDB *db, hdb_entry *ent) { if (db->hdb_master_key_set == 0) return 0; - return hdb_unseal_keys_mkey(context, ent, db->hdb_master_key); + if (db->hdb_mit_key_set != 0) + return _hdb_unseal_keys_mkey(context, ent, db->hdb_master_key, + db->hdb_mit_key); + else + return _hdb_unseal_keys_mkey(context, ent, db->hdb_master_key, + NULL); +} + +#ifdef notnow +krb5_error_code +hdb_unseal_keys_kvno(krb5_context context, HDB *db, krb5_kvno kvno, + hdb_entry *ent) +{ + krb5_error_code ret = KRB5KRB_AP_ERR_NOKEY; /* XXX need a better code? */ + HDB_extension *tmp; + HDB_Ext_KeySet *hist_keys; + hdb_keyset *tmp_keys; + Key *tmp_val; + unsigned int tmp_len; + krb5_kvno tmp_kvno; + int i, k; + + assert(kvno == 0 || kvno < ent->kvno); + + tmp = hdb_find_extension(ent, choice_HDB_extension_data_hist_keys); + if (tmp == NULL) + return ret; + + tmp_len = ent->keys.len; + tmp_val = ent->keys.val; + tmp_kvno = ent->kvno; + + hist_keys = &tmp->data.u.hist_keys; + + for (i = hist_keys->len - 1; i >= 0; i++) { + if (kvno != 0 && hist_keys->val[i].kvno != kvno) + continue; + for (k = 0; k < hist_keys->val[i].keys.len; k++) { + ret = _hdb_reseal_key_mkey(context, + &hist_keys->val[i].keys.val[k], + db->hdb_master_key, NULL); + if (ret) + return (ret); + } + + if (kvno == 0) + continue; + + /* + * NOTE: What follows is a bit of an ugly hack. + * + * This is the keyset we're being asked for, so we add the + * current keyset to the history, leave the one we were asked + * for in the history, and pretend the one we were asked for is + * also the current keyset. + * + * This is a bit of a defensive hack in case an entry fetched + * this way ever gets modified then stored: if the keyset is not + * changed we can detect this and put things back, else we won't + * drop any keysets from history by accident. + * + * Note too that we only ever get called with a non-zero kvno + * either in the KDC or in cases where we aren't changing the + * HDB entry anyways, which is why this is just a defensive + * hack. We also don't fetch specific kvnos in the dump case, + * so there's no danger that we'll dump this entry and load it + * again, repeatedly causing the history to grow boundelessly. + */ + tmp_keys = realloc(hist_keys->val, + sizeof (*hist_keys->val) * (hist_keys->len + 1)); + if (tmp_keys == NULL) + return ENOMEM; + + memmove(&tmp_keys[1], tmp_keys, + sizeof (*hist_keys->val) * hist_keys->len++); + tmp_keys[0].keys.len = ent->keys.len; + tmp_keys[0].keys.val = ent->keys.val; + tmp_keys[0].kvno = ent->kvno; + tmp_keys[0].replace_time = time(NULL); + i++; + ent->keys.len = hist_keys->val[i].keys.len; + ent->keys.val = hist_keys->val[i].keys.val; + ent->kvno = kvno; + } + + return (ret); } +#endif krb5_error_code hdb_unseal_key(krb5_context context, HDB *db, Key *k) { if (db->hdb_master_key_set == 0) return 0; - return hdb_unseal_key_mkey(context, k, db->hdb_master_key); + return _hdb_reseal_key_mkey(context, k, db->hdb_master_key, NULL); } krb5_error_code @@ -556,9 +724,9 @@ hdb_seal_key(krb5_context context, HDB *db, Key *k) } krb5_error_code -hdb_set_master_key (krb5_context context, - HDB *db, - krb5_keyblock *key) +hdb_set_master_key(krb5_context context, + HDB *db, + krb5_keyblock *key) { krb5_error_code ret; hdb_master_key mkey; @@ -571,6 +739,7 @@ hdb_set_master_key (krb5_context context, des_set_random_generator_seed(key.keyvalue.data); #endif db->hdb_master_key_set = 1; + db->hdb_master_key->key_usage = HDB_KU_MKEY; return 0; } diff --git a/crypto/heimdal/lib/hdb/print.c b/crypto/heimdal/lib/hdb/print.c index 697d32d2909c..d5359f538056 100644 --- a/crypto/heimdal/lib/hdb/print.c +++ b/crypto/heimdal/lib/hdb/print.c @@ -57,44 +57,57 @@ generation number */ -static krb5_error_code +/* + * These utility functions return the number of bytes written or -1, and + * they set an error in the context. + */ +static ssize_t append_string(krb5_context context, krb5_storage *sp, const char *fmt, ...) { - krb5_error_code ret; + ssize_t sz; char *s; + int rc; va_list ap; va_start(ap, fmt); - vasprintf(&s, fmt, ap); + rc = vasprintf(&s, fmt, ap); va_end(ap); - if(s == NULL) { + if(rc < 0) { krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); - return ENOMEM; + return -1; } - ret = krb5_storage_write(sp, s, strlen(s)); + sz = krb5_storage_write(sp, s, strlen(s)); free(s); - return ret; + return sz; } static krb5_error_code -append_hex(krb5_context context, krb5_storage *sp, krb5_data *data) +append_hex(krb5_context context, krb5_storage *sp, + int always_encode, int lower, krb5_data *data) { + ssize_t sz; int printable = 1; size_t i; char *p; p = data->data; - for(i = 0; i < data->length; i++) - if(!isalnum((unsigned char)p[i]) && p[i] != '.'){ - printable = 0; - break; - } - if(printable) + if (!always_encode) { + for (i = 0; i < data->length; i++) { + if (!isalnum((unsigned char)p[i]) && p[i] != '.'){ + printable = 0; + break; + } + } + } + if (printable && !always_encode) return append_string(context, sp, "\"%.*s\"", data->length, data->data); - hex_encode(data->data, data->length, &p); - append_string(context, sp, "%s", p); + sz = hex_encode(data->data, data->length, &p); + if (sz == -1) return sz; + if (lower) + strlwr(p); + sz = append_string(context, sp, "%s", p); free(p); - return 0; + return sz; } static char * @@ -105,29 +118,97 @@ time2str(time_t t) return buf; } -static krb5_error_code +static ssize_t append_event(krb5_context context, krb5_storage *sp, Event *ev) { - char *pr = NULL; krb5_error_code ret; + ssize_t sz; + char *pr = NULL; if(ev == NULL) return append_string(context, sp, "- "); if (ev->principal != NULL) { ret = krb5_unparse_name(context, ev->principal, &pr); - if(ret) - return ret; + if (ret) return -1; /* krb5_unparse_name() sets error info */ } - ret = append_string(context, sp, "%s:%s ", - time2str(ev->time), pr ? pr : "UNKNOWN"); + sz = append_string(context, sp, "%s:%s ", time2str(ev->time), + pr ? pr : "UNKNOWN"); free(pr); - return ret; + return sz; +} + +#define KRB5_KDB_SALTTYPE_NORMAL 0 +#define KRB5_KDB_SALTTYPE_V4 1 +#define KRB5_KDB_SALTTYPE_NOREALM 2 +#define KRB5_KDB_SALTTYPE_ONLYREALM 3 +#define KRB5_KDB_SALTTYPE_SPECIAL 4 +#define KRB5_KDB_SALTTYPE_AFS3 5 + +static ssize_t +append_mit_key(krb5_context context, krb5_storage *sp, + krb5_const_principal princ, + unsigned int kvno, Key *key) +{ + krb5_error_code ret; + ssize_t sz; + size_t key_versions = key->salt ? 2 : 1; + size_t decrypted_key_length; + char buf[2]; + krb5_data keylenbytes; + unsigned int salttype; + + sz = append_string(context, sp, "\t%u\t%u\t%d\t%d\t", key_versions, kvno, + key->key.keytype, key->key.keyvalue.length + 2); + if (sz == -1) return sz; + ret = krb5_enctype_keysize(context, key->key.keytype, &decrypted_key_length); + if (ret) return -1; /* XXX we lose the error code */ + buf[0] = decrypted_key_length & 0xff; + buf[1] = (decrypted_key_length & 0xff00) >> 8; + keylenbytes.data = buf; + keylenbytes.length = sizeof (buf); + sz = append_hex(context, sp, 1, 1, &keylenbytes); + if (sz == -1) return sz; + sz = append_hex(context, sp, 1, 1, &key->key.keyvalue); + if (!key->salt) + return sz; + + /* Map salt to MIT KDB style */ + if (key->salt->type == KRB5_PADATA_PW_SALT) { + krb5_salt k5salt; + + /* + * Compute normal salt and then see whether it matches the stored one + */ + ret = krb5_get_pw_salt(context, princ, &k5salt); + if (ret) return -1; + if (k5salt.saltvalue.length == key->salt->salt.length && + memcmp(k5salt.saltvalue.data, key->salt->salt.data, + k5salt.saltvalue.length) == 0) + salttype = KRB5_KDB_SALTTYPE_NORMAL; /* matches */ + else if (key->salt->salt.length == strlen(princ->realm) && + memcmp(key->salt->salt.data, princ->realm, + key->salt->salt.length) == 0) + salttype = KRB5_KDB_SALTTYPE_ONLYREALM; /* matches realm */ + else if (key->salt->salt.length == k5salt.saltvalue.length - strlen(princ->realm) && + memcmp((char *)k5salt.saltvalue.data + strlen(princ->realm), + key->salt->salt.data, key->salt->salt.length) == 0) + salttype = KRB5_KDB_SALTTYPE_NOREALM; /* matches w/o realm */ + else + salttype = KRB5_KDB_SALTTYPE_NORMAL; /* hope for best */ + + } else if (key->salt->type == KRB5_PADATA_AFS3_SALT) { + salttype = KRB5_KDB_SALTTYPE_AFS3; + } + sz = append_string(context, sp, "\t%u\t%u\t", salttype, + key->salt->salt.length); + if (sz == -1) return sz; + return append_hex(context, sp, 1, 1, &key->salt->salt); } static krb5_error_code entry2string_int (krb5_context context, krb5_storage *sp, hdb_entry *ent) { char *p; - size_t i; + int i; krb5_error_code ret; /* --- principal */ @@ -149,12 +230,12 @@ entry2string_int (krb5_context context, krb5_storage *sp, hdb_entry *ent) append_string(context, sp, "::%d:", ent->keys.val[i].key.keytype); /* --- keydata */ - append_hex(context, sp, &ent->keys.val[i].key.keyvalue); + append_hex(context, sp, 0, 0, &ent->keys.val[i].key.keyvalue); append_string(context, sp, ":"); /* --- salt */ if(ent->keys.val[i].salt){ append_string(context, sp, "%u/", ent->keys.val[i].salt->type); - append_hex(context, sp, &ent->keys.val[i].salt->salt); + append_hex(context, sp, 0, 0, &ent->keys.val[i].salt->salt); }else append_string(context, sp, "-"); } @@ -234,25 +315,266 @@ entry2string_int (krb5_context context, krb5_storage *sp, hdb_entry *ent) } else append_string(context, sp, "-"); + return 0; +} + +#define KRB5_KDB_DISALLOW_POSTDATED 0x00000001 +#define KRB5_KDB_DISALLOW_FORWARDABLE 0x00000002 +#define KRB5_KDB_DISALLOW_TGT_BASED 0x00000004 +#define KRB5_KDB_DISALLOW_RENEWABLE 0x00000008 +#define KRB5_KDB_DISALLOW_PROXIABLE 0x00000010 +#define KRB5_KDB_DISALLOW_DUP_SKEY 0x00000020 +#define KRB5_KDB_DISALLOW_ALL_TIX 0x00000040 +#define KRB5_KDB_REQUIRES_PRE_AUTH 0x00000080 +#define KRB5_KDB_REQUIRES_HW_AUTH 0x00000100 +#define KRB5_KDB_REQUIRES_PWCHANGE 0x00000200 +#define KRB5_KDB_DISALLOW_SVR 0x00001000 +#define KRB5_KDB_PWCHANGE_SERVICE 0x00002000 +#define KRB5_KDB_SUPPORT_DESMD5 0x00004000 +#define KRB5_KDB_NEW_PRINC 0x00008000 + +static int +flags_to_attr(HDBFlags flags) +{ + int a = 0; + + if (!flags.postdate) + a |= KRB5_KDB_DISALLOW_POSTDATED; + if (!flags.forwardable) + a |= KRB5_KDB_DISALLOW_FORWARDABLE; + if (flags.initial) + a |= KRB5_KDB_DISALLOW_TGT_BASED; + if (!flags.renewable) + a |= KRB5_KDB_DISALLOW_RENEWABLE; + if (!flags.proxiable) + a |= KRB5_KDB_DISALLOW_PROXIABLE; + if (flags.invalid) + a |= KRB5_KDB_DISALLOW_ALL_TIX; + if (flags.require_preauth) + a |= KRB5_KDB_REQUIRES_PRE_AUTH; + if (flags.require_hwauth) + a |= KRB5_KDB_REQUIRES_HW_AUTH; + if (!flags.server) + a |= KRB5_KDB_DISALLOW_SVR; + if (flags.change_pw) + a |= KRB5_KDB_PWCHANGE_SERVICE; + return a; +} +krb5_error_code +entry2mit_string_int(krb5_context context, krb5_storage *sp, hdb_entry *ent) +{ + krb5_error_code ret; + ssize_t sz; + size_t i, k; + size_t num_tl_data = 0; + size_t num_key_data = 0; + char *p; + HDB_Ext_KeySet *hist_keys = NULL; + HDB_extension *extp; + time_t last_pw_chg = 0; + time_t exp = 0; + time_t pwexp = 0; + unsigned int max_life = 0; + unsigned int max_renew = 0; + + /* Always create a modified_by entry. */ + num_tl_data++; + + ret = hdb_entry_get_pw_change_time(ent, &last_pw_chg); + if (ret) return ret; + if (last_pw_chg) + num_tl_data++; + + extp = hdb_find_extension(ent, choice_HDB_extension_data_hist_keys); + if (extp) + hist_keys = &extp->data.u.hist_keys; + + for (i = 0; i < ent->keys.len;i++) { + if (!mit_strong_etype(ent->keys.val[i].key.keytype)) + continue; + num_key_data++; + } + if (hist_keys) { + for (i = 0; i < hist_keys->len; i++) { + /* + * MIT uses the highest kvno as the current kvno instead of + * tracking kvno separately, so we can't dump keysets with kvno + * higher than the entry's kvno. + */ + if (hist_keys->val[i].kvno >= ent->kvno) + continue; + for (k = 0; k < hist_keys->val[i].keys.len; k++) { + if (ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD4 || + ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD5) + continue; + num_key_data++; + } + } + } + + ret = krb5_unparse_name(context, ent->principal, &p); + if (ret) return ret; + sz = append_string(context, sp, "princ\t38\t%u\t%u\t%u\t0\t%s\t%d", + strlen(p), num_tl_data, num_key_data, p, + flags_to_attr(ent->flags)); + if (sz == -1) { + free(p); + return ENOMEM; + } + + if (ent->max_life) + max_life = *ent->max_life; + if (ent->max_renew) + max_renew = *ent->max_renew; + if (ent->valid_end) + exp = *ent->valid_end; + if (ent->pw_end) + pwexp = *ent->pw_end; + + sz = append_string(context, sp, "\t%u\t%u\t%u\t%u\t0\t0\t0", + max_life, max_renew, exp, pwexp); + if (sz == -1) { + free(p); + return ENOMEM; + } + + /* Dump TL data we know: last pw chg and modified_by */ +#define mit_KRB5_TL_LAST_PWD_CHANGE 1 +#define mit_KRB5_TL_MOD_PRINC 2 + if (last_pw_chg) { + krb5_data d; + time_t val; + unsigned char *ptr; + + ptr = (unsigned char *)&last_pw_chg; + val = ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24); + d.data = &val; + d.length = sizeof (last_pw_chg); + sz = append_string(context, sp, "\t%u\t%u\t", + mit_KRB5_TL_LAST_PWD_CHANGE, d.length); + if (sz == -1) { + free(p); + return ENOMEM; + } + sz = append_hex(context, sp, 1, 1, &d); + if (sz == -1) { + free(p); + return ENOMEM; + } + } + if (ent->modified_by) { + krb5_data d; + unsigned int val; + size_t plen; + unsigned char *ptr; + char *modby_p; + + free(p); + ptr = (unsigned char *)&ent->modified_by->time; + val = ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24); + d.data = &val; + d.length = sizeof (ent->modified_by->time); + ret = krb5_unparse_name(context, ent->modified_by->principal, &modby_p); + if (ret) return ret; + plen = strlen(modby_p); + sz = append_string(context, sp, "\t%u\t%u\t", + mit_KRB5_TL_MOD_PRINC, + d.length + plen + 1 /* NULL counted */); + if (sz == -1) { + free(modby_p); + return ENOMEM; + } + sz = append_hex(context, sp, 1, 1, &d); + if (sz == -1) { + free(modby_p); + return ENOMEM; + } + d.data = modby_p; + d.length = plen + 1; + sz = append_hex(context, sp, 1, 1, &d); + free(modby_p); + if (sz == -1) return ENOMEM; + } else { + krb5_data d; + unsigned int val; + size_t plen; + unsigned char *ptr; + + /* Fake the entry to make MIT happy. */ + ptr = (unsigned char *)&last_pw_chg; + val = ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24); + d.data = &val; + d.length = sizeof (last_pw_chg); + plen = strlen(p); + sz = append_string(context, sp, "\t%u\t%u\t", + mit_KRB5_TL_MOD_PRINC, + d.length + plen + 1 /* NULL counted */); + if (sz == -1) { + free(p); + return ENOMEM; + } + sz = append_hex(context, sp, 1, 1, &d); + if (sz == -1) { + free(p); + return ENOMEM; + } + d.data = p; + d.length = plen + 1; + sz = append_hex(context, sp, 1, 1, &d); + free(p); + if (sz == -1) return ENOMEM; + } + /* + * Dump keys (remembering to not include any with kvno higher than + * the entry's because MIT doesn't track entry kvno separately from + * the entry's keys -- max kvno is it) + */ + for (i = 0; i < ent->keys.len; i++) { + if (!mit_strong_etype(ent->keys.val[i].key.keytype)) + continue; + sz = append_mit_key(context, sp, ent->principal, ent->kvno, + &ent->keys.val[i]); + if (sz == -1) return ENOMEM; + } + for (i = 0; hist_keys && i < ent->kvno; i++) { + size_t m; + + /* dump historical keys */ + for (k = 0; k < hist_keys->len; k++) { + if (hist_keys->val[k].kvno != ent->kvno - i) + continue; + for (m = 0; m < hist_keys->val[k].keys.len; m++) { + if (ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD4 || + ent->keys.val[k].key.keytype == ETYPE_DES_CBC_MD5) + continue; + sz = append_mit_key(context, sp, ent->principal, + hist_keys->val[k].kvno, + &hist_keys->val[k].keys.val[m]); + if (sz == -1) return ENOMEM; + } + } + } + sz = append_string(context, sp, "\t-1;"); /* "extra data" */ + if (sz == -1) return ENOMEM; return 0; } krb5_error_code -hdb_entry2string (krb5_context context, hdb_entry *ent, char **str) +hdb_entry2string(krb5_context context, hdb_entry *ent, char **str) { krb5_error_code ret; krb5_data data; krb5_storage *sp; sp = krb5_storage_emem(); - if(sp == NULL) { + if (sp == NULL) { krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); return ENOMEM; } ret = entry2string_int(context, sp, ent); - if(ret) { + if (ret) { krb5_storage_free(sp); return ret; } @@ -267,22 +589,31 @@ hdb_entry2string (krb5_context context, hdb_entry *ent, char **str) /* print a hdb_entry to (FILE*)data; suitable for hdb_foreach */ krb5_error_code -hdb_print_entry(krb5_context context, HDB *db, hdb_entry_ex *entry, void *data) +hdb_print_entry(krb5_context context, HDB *db, hdb_entry_ex *entry, + void *data) { + struct hdb_print_entry_arg *parg = data; krb5_error_code ret; krb5_storage *sp; - FILE *f = data; - - fflush(f); - sp = krb5_storage_from_fd(fileno(f)); - if(sp == NULL) { + fflush(parg->out); + sp = krb5_storage_from_fd(fileno(parg->out)); + if (sp == NULL) { krb5_set_error_message(context, ENOMEM, "malloc: out of memory"); return ENOMEM; } - ret = entry2string_int(context, sp, &entry->entry); - if(ret) { + switch (parg->fmt) { + case HDB_DUMP_HEIMDAL: + ret = entry2string_int(context, sp, &entry->entry); + break; + case HDB_DUMP_MIT: + ret = entry2mit_string_int(context, sp, &entry->entry); + break; + default: + heim_abort("Only two dump formats supported: Heimdal and MIT"); + } + if (ret) { krb5_storage_free(sp); return ret; } diff --git a/crypto/heimdal/lib/hdb/version-script.map b/crypto/heimdal/lib/hdb/version-script.map index 50a36cec0aa9..42e2043b4b47 100644 --- a/crypto/heimdal/lib/hdb/version-script.map +++ b/crypto/heimdal/lib/hdb/version-script.map @@ -4,6 +4,7 @@ HEIMDAL_HDB_1.0 { global: encode_hdb_keyset; hdb_add_master_key; + hdb_add_current_keys_to_history; hdb_check_db_format; hdb_clear_extension; hdb_clear_master_key; @@ -57,6 +58,7 @@ HEIMDAL_HDB_1.0 { hdb_seal_key_mkey; hdb_seal_keys; hdb_seal_keys_mkey; + hdb_set_last_modified_by; hdb_set_master_key; hdb_set_master_keyfile; hdb_unlock; @@ -71,6 +73,10 @@ HEIMDAL_HDB_1.0 { hdb_interface_version; initialize_hdb_error_table_r; + # MIT KDB related entries + _hdb_mdb_value2entry; + _hdb_mit_dump2mitdb_entry; + hdb_kt_ops; # some random bits needed for libkadm diff --git a/crypto/heimdal/lib/kadm5/chpass_s.c b/crypto/heimdal/lib/kadm5/chpass_s.c index 624293e5c3a3..22f65517fcc5 100644 --- a/crypto/heimdal/lib/kadm5/chpass_s.c +++ b/crypto/heimdal/lib/kadm5/chpass_s.c @@ -58,6 +58,10 @@ change(void *server_handle, if(ret) goto out; + ret = hdb_add_current_keys_to_history(context->context, &ent.entry); + if (ret) + goto out; + if (context->db->hdb_capability_flags & HDB_CAP_F_HANDLE_PASSWORDS) { ret = context->db->hdb_password(context->context, context->db, &ent, password, cond); @@ -170,6 +174,9 @@ kadm5_s_chpass_principal_with_key(void *server_handle, HDB_F_GET_ANY|HDB_F_ADMIN_DATA, &ent); if(ret) goto out; + ret = hdb_add_current_keys_to_history(context->context, &ent.entry); + if (ret) + goto out2; ret = _kadm5_set_keys2(context, &ent.entry, n_key_data, key_data); if(ret) goto out2; diff --git a/crypto/heimdal/lib/kadm5/randkey_s.c b/crypto/heimdal/lib/kadm5/randkey_s.c index dcb179aac40f..adb3564be719 100644 --- a/crypto/heimdal/lib/kadm5/randkey_s.c +++ b/crypto/heimdal/lib/kadm5/randkey_s.c @@ -59,6 +59,10 @@ kadm5_s_randkey_principal(void *server_handle, if(ret) goto out; + ret = hdb_add_current_keys_to_history(context->context, &ent.entry); + if (ret) + goto out2; + ret = _kadm5_set_keys_randomly (context, &ent.entry, new_keys, diff --git a/crypto/openssl/CHANGES.md b/crypto/openssl/CHANGES.md index 5f5ba3ef1751..b991285aedb2 100644 --- a/crypto/openssl/CHANGES.md +++ b/crypto/openssl/CHANGES.md @@ -28,6 +28,72 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Changes between 3.5.3 and 3.5.4 [30 Sep 2025] + + * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap + + Issue summary: An application trying to decrypt CMS messages encrypted using + password based encryption can trigger an out-of-bounds read and write. + + Impact summary: This out-of-bounds read may trigger a crash which leads to + Denial of Service for an application. The out-of-bounds write can cause + a memory corruption which can have various consequences including + a Denial of Service or Execution of attacker-supplied code. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9230]) + + *Viktor Dukhovni* + + * Fix Timing side-channel in SM2 algorithm on 64 bit ARM + + Issue summary: A timing side-channel which could potentially allow remote + recovery of the private key exists in the SM2 algorithm implementation on + 64 bit ARM platforms. + + Impact summary: A timing side-channel in SM2 signature computations on + 64 bit ARM platforms could allow recovering the private key by an attacker. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9231]) + + *Stanislav Fort and Tomáš Mráz* + + * Fix Out-of-bounds read in HTTP client no_proxy handling + + Issue summary: An application using the OpenSSL HTTP client API functions + may trigger an out-of-bounds read if the "no_proxy" environment variable is + set and the host portion of the authority component of the HTTP URL is an + IPv6 address. + + Impact summary: An out-of-bounds read can trigger a crash which leads to + Denial of Service for an application. + + The issue was reported by Stanislav Fort (Aisle Research). + + ([CVE-2025-9232]) + + *Stanislav Fort* + + * The FIPS provider no longer performs a PCT on key import for ECX keys + (that was introduced in 3.5.2), following the latest update + on that requirement in FIPS 140-3 IG 10.3.A additional comment 1. + + *Eugene Syromiatnikov* + + * Fixed the length of the ASN.1 sequence for the SM3 digests of RSA-encrypted + signatures. + + *Xiao Lou Dong Feng* + + * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release + builds, as it broke some exiting applications that relied on the previous + 3.x semantics, as documented in `OpenSSL_version(3)`. + + *Richard Levitte* + ### Changes between 3.5.2 and 3.5.3 [16 Sep 2025] * Avoided a potential race condition introduced in 3.5.1, where @@ -21284,6 +21350,9 @@ ndif <!-- Links --> +[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232 +[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231 +[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230 [CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 diff --git a/crypto/openssl/NEWS.md b/crypto/openssl/NEWS.md index 5d8a83f43068..b194dfb7cb06 100644 --- a/crypto/openssl/NEWS.md +++ b/crypto/openssl/NEWS.md @@ -23,19 +23,46 @@ OpenSSL Releases OpenSSL 3.5 ----------- +### Major changes between OpenSSL 3.5.3 and OpenSSL 3.5.4 [30 Sep 2025] + +OpenSSL 3.5.4 is a security patch release. The most severe CVE fixed in this +release is Moderate. + +This release incorporates the following bug fixes and mitigations: + + * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap. + ([CVE-2025-9230]) + + * Fix Timing side-channel in SM2 algorithm on 64 bit ARM. + ([CVE-2025-9231]) + + * Fix Out-of-bounds read in HTTP client no_proxy handling. + ([CVE-2025-9232]) + + * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release + builds, as it broke some exiting applications that relied on the previous + 3.x semantics, as documented in `OpenSSL_version(3)`. + ### Major changes between OpenSSL 3.5.2 and OpenSSL 3.5.3 [16 Sep 2025] - * Added FIPS 140-3 PCT on DH key generation. +OpenSSL 3.5.3 is a bug fix release. + +This release incorporates the following bug fixes and mitigations: - *Nikola Pajkovsky* + * Added FIPS 140-3 PCT on DH key generation. * Fixed the synthesised `OPENSSL_VERSION_NUMBER`. - *Richard Levitte* + * Removed PCT on key import in the FIPS provider as it is not required by + the standard. ### Major changes between OpenSSL 3.5.1 and OpenSSL 3.5.2 [5 Aug 2025] - * none +OpenSSL 3.5.2 is a bug fix release. + +This release incorporates the following bug fixes and mitigations: + + * The FIPS provider now performs a PCT on key import for RSA, EC and ECX. ### Major changes between OpenSSL 3.5.0 and OpenSSL 3.5.1 [1 Jul 2025] @@ -45,7 +72,7 @@ release is Low. This release incorporates the following bug fixes and mitigations: * Fix x509 application adds trusted use instead of rejected use. - ([CVE-2025-4575]) + ([CVE-2025-4575]) ### Major changes between OpenSSL 3.4 and OpenSSL 3.5.0 [8 Apr 2025] @@ -1913,6 +1940,9 @@ OpenSSL 0.9.x * Support for various new platforms <!-- Links --> +[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232 +[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231 +[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230 [CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143 diff --git a/crypto/openssl/VERSION.dat b/crypto/openssl/VERSION.dat index 8a2893b68006..a8eb3ac9c421 100644 --- a/crypto/openssl/VERSION.dat +++ b/crypto/openssl/VERSION.dat @@ -1,7 +1,7 @@ MAJOR=3 MINOR=5 -PATCH=3 +PATCH=4 PRE_RELEASE_TAG= BUILD_METADATA= -RELEASE_DATE="16 Sep 2025" +RELEASE_DATE="30 Sep 2025" SHLIB_VERSION=3 diff --git a/crypto/openssl/apps/storeutl.c b/crypto/openssl/apps/storeutl.c index 62f0e6135640..f8ebde44481c 100644 --- a/crypto/openssl/apps/storeutl.c +++ b/crypto/openssl/apps/storeutl.c @@ -331,14 +331,22 @@ int storeutl_main(int argc, char *argv[]) static int indent_printf(int indent, BIO *bio, const char *format, ...) { va_list args; - int ret; + int ret, vret; + + ret = BIO_printf(bio, "%*s", indent, ""); + if (ret < 0) + return ret; va_start(args, format); + vret = BIO_vprintf(bio, format, args); + va_end(args); - ret = BIO_printf(bio, "%*s", indent, "") + BIO_vprintf(bio, format, args); + if (vret < 0) + return vret; + if (vret > INT_MAX - ret) + return INT_MAX; - va_end(args); - return ret; + return ret + vret; } static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata, diff --git a/crypto/openssl/crypto/bio/bss_file.c b/crypto/openssl/crypto/bio/bss_file.c index 2743a14417cf..ddcb4feb6a58 100644 --- a/crypto/openssl/crypto/bio/bss_file.c +++ b/crypto/openssl/crypto/bio/bss_file.c @@ -287,7 +287,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) if (fp == NULL) { ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(), "calling fopen(%s, %s)", - ptr, p); + (const char *)ptr, p); ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB); ret = 0; break; diff --git a/crypto/openssl/crypto/ec/ecp_sm2p256.c b/crypto/openssl/crypto/ec/ecp_sm2p256.c index ffb58399dfd0..4c39be2186fb 100644 --- a/crypto/openssl/crypto/ec/ecp_sm2p256.c +++ b/crypto/openssl/crypto/ec/ecp_sm2p256.c @@ -1,5 +1,5 @@ /* - * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2023-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/crypto/evp/bio_ok.c b/crypto/openssl/crypto/evp/bio_ok.c index 20811ffded6f..d7f6c71ee1ad 100644 --- a/crypto/openssl/crypto/evp/bio_ok.c +++ b/crypto/openssl/crypto/evp/bio_ok.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -560,7 +560,7 @@ static int block_in(BIO *b) { BIO_OK_CTX *ctx; EVP_MD_CTX *md; - unsigned long tl = 0; + size_t tl = 0; unsigned char tmp[EVP_MAX_MD_SIZE]; int md_size; @@ -571,15 +571,18 @@ static int block_in(BIO *b) goto berr; assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */ - tl = ctx->buf[0]; - tl <<= 8; - tl |= ctx->buf[1]; - tl <<= 8; - tl |= ctx->buf[2]; - tl <<= 8; - tl |= ctx->buf[3]; - - if (ctx->buf_len < tl + OK_BLOCK_BLOCK + md_size) + tl = ((size_t)ctx->buf[0] << 24) + | ((size_t)ctx->buf[1] << 16) + | ((size_t)ctx->buf[2] << 8) + | ((size_t)ctx->buf[3]); + + if (tl > OK_BLOCK_SIZE) + goto berr; + + if (tl > SIZE_MAX - OK_BLOCK_BLOCK - (size_t)md_size) + goto berr; + + if (ctx->buf_len < tl + OK_BLOCK_BLOCK + (size_t)md_size) return 1; if (!EVP_DigestUpdate(md, @@ -587,7 +590,7 @@ static int block_in(BIO *b) goto berr; if (!EVP_DigestFinal_ex(md, tmp, NULL)) goto berr; - if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, md_size) == 0) { + if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, (size_t)md_size) == 0) { /* there might be parts from next block lurking around ! */ ctx->buf_off_save = tl + OK_BLOCK_BLOCK + md_size; ctx->buf_len_save = ctx->buf_len; diff --git a/crypto/openssl/crypto/evp/ctrl_params_translate.c b/crypto/openssl/crypto/evp/ctrl_params_translate.c index ed73fc0fbb8d..c846353200b2 100644 --- a/crypto/openssl/crypto/evp/ctrl_params_translate.c +++ b/crypto/openssl/crypto/evp/ctrl_params_translate.c @@ -1356,7 +1356,7 @@ static int fix_rsa_padding_mode(enum state state, if (i == OSSL_NELEM(str_value_map)) { ERR_raise_data(ERR_LIB_RSA, RSA_R_UNKNOWN_PADDING_TYPE, "[action:%d, state:%d] padding name %s", - ctx->action_type, state, ctx->p1); + ctx->action_type, state, (const char *)ctx->p2); ctx->p1 = ret = -2; } else if (state == POST_CTRL_TO_PARAMS) { /* EVP_PKEY_CTRL_GET_RSA_PADDING weirdness explained further up */ diff --git a/crypto/openssl/crypto/evp/p_lib.c b/crypto/openssl/crypto/evp/p_lib.c index 7f4508169dfa..63953a84e1f5 100644 --- a/crypto/openssl/crypto/evp/p_lib.c +++ b/crypto/openssl/crypto/evp/p_lib.c @@ -1146,15 +1146,14 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey) } else { const OSSL_PROVIDER *prov = EVP_KEYMGMT_get0_provider(pkey->keymgmt); OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov); - const char *supported_sig = - pkey->keymgmt->query_operation_name != NULL - ? pkey->keymgmt->query_operation_name(OSSL_OP_SIGNATURE) - : EVP_KEYMGMT_get0_name(pkey->keymgmt); - EVP_SIGNATURE *signature = NULL; - - signature = EVP_SIGNATURE_fetch(libctx, supported_sig, NULL); - if (signature != NULL) { - EVP_SIGNATURE_free(signature); + EVP_SIGNATURE *sig; + const char *name; + + name = evp_keymgmt_util_query_operation_name(pkey->keymgmt, + OSSL_OP_SIGNATURE); + sig = EVP_SIGNATURE_fetch(libctx, name, NULL); + if (sig != NULL) { + EVP_SIGNATURE_free(sig); return 1; } } diff --git a/crypto/openssl/crypto/info.c b/crypto/openssl/crypto/info.c index 4d70471be255..e760ec094027 100644 --- a/crypto/openssl/crypto/info.c +++ b/crypto/openssl/crypto/info.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -23,6 +23,9 @@ #if defined(__arm__) || defined(__arm) || defined(__aarch64__) # include "arm_arch.h" # define CPU_INFO_STR_LEN 128 +#elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC) +# include "crypto/ppc_arch.h" +# define CPU_INFO_STR_LEN 128 #elif defined(__s390__) || defined(__s390x__) # include "s390x_arch.h" # define CPU_INFO_STR_LEN 2048 @@ -77,6 +80,15 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings) BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str), sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str), " env:%s", env); +# elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC) + const char *env; + + BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str), + CPUINFO_PREFIX "OPENSSL_ppccap=0x%x", OPENSSL_ppccap_P); + if ((env = getenv("OPENSSL_ppccap")) != NULL) + BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str), + sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str), + " env:%s", env); # elif defined(__s390__) || defined(__s390x__) const char *env; diff --git a/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c b/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c index 41df1a956fb8..50e3b5433085 100644 --- a/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c +++ b/crypto/openssl/crypto/ml_dsa/ml_dsa_key.c @@ -311,6 +311,7 @@ int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection) static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx, VECTOR *t1, VECTOR *t0) { + int ret = 0; const ML_DSA_PARAMS *params = key->params; uint32_t k = params->k, l = params->l; POLY *polys; @@ -343,9 +344,10 @@ static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx, /* Zeroize secret */ vector_zero(&s1_ntt); + ret = 1; err: OPENSSL_free(polys); - return 1; + return ret; } int ossl_ml_dsa_key_public_from_private(ML_DSA_KEY *key) diff --git a/crypto/openssl/crypto/ml_kem/ml_kem.c b/crypto/openssl/crypto/ml_kem/ml_kem.c index 4474af0f87cb..716c3bf4275e 100644 --- a/crypto/openssl/crypto/ml_kem/ml_kem.c +++ b/crypto/openssl/crypto/ml_kem/ml_kem.c @@ -2046,5 +2046,5 @@ int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2) * No match if just one of the public keys is not available, otherwise both * are unavailable, and for now such keys are considered equal. */ - return (ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2)); + return (!(ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2))); } diff --git a/crypto/openssl/crypto/modes/siv128.c b/crypto/openssl/crypto/modes/siv128.c index 72526b849eaf..4e52d8eb8782 100644 --- a/crypto/openssl/crypto/modes/siv128.c +++ b/crypto/openssl/crypto/modes/siv128.c @@ -202,9 +202,12 @@ int ossl_siv128_init(SIV128_CONTEXT *ctx, const unsigned char *key, int klen, || !EVP_MAC_final(mac_ctx, ctx->d.byte, &out_len, sizeof(ctx->d.byte))) { EVP_CIPHER_CTX_free(ctx->cipher_ctx); + ctx->cipher_ctx = NULL; EVP_MAC_CTX_free(ctx->mac_ctx_init); + ctx->mac_ctx_init = NULL; EVP_MAC_CTX_free(mac_ctx); EVP_MAC_free(ctx->mac); + ctx->mac = NULL; return 0; } EVP_MAC_CTX_free(mac_ctx); diff --git a/crypto/openssl/crypto/property/property_parse.c b/crypto/openssl/crypto/property/property_parse.c index 3a67754224f0..23963c89bc46 100644 --- a/crypto/openssl/crypto/property/property_parse.c +++ b/crypto/openssl/crypto/property/property_parse.c @@ -641,7 +641,7 @@ static void put_str(const char *str, char **buf, size_t *remain, size_t *needed) } quotes = quote != '\0'; - if (*remain == 0) { + if (*remain <= (size_t)quotes) { *needed += 2 * quotes; return; } diff --git a/crypto/openssl/crypto/rsa/rsa_gen.c b/crypto/openssl/crypto/rsa/rsa_gen.c index 033f66714add..f76bb7748369 100644 --- a/crypto/openssl/crypto/rsa/rsa_gen.c +++ b/crypto/openssl/crypto/rsa/rsa_gen.c @@ -734,18 +734,3 @@ err: return ret; } - -#ifdef FIPS_MODULE -int ossl_rsa_key_pairwise_test(RSA *rsa) -{ - OSSL_CALLBACK *stcb; - void *stcbarg; - int res; - - OSSL_SELF_TEST_get_callback(rsa->libctx, &stcb, &stcbarg); - res = rsa_keygen_pairwise_test(rsa, stcb, stcbarg); - if (res <= 0) - ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT_IMPORT); - return res; -} -#endif /* FIPS_MODULE */ diff --git a/crypto/openssl/crypto/rsa/rsa_sign.c b/crypto/openssl/crypto/rsa/rsa_sign.c index 78e4bad69e49..bb6e99acf9d3 100644 --- a/crypto/openssl/crypto/rsa/rsa_sign.c +++ b/crypto/openssl/crypto/rsa/rsa_sign.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -129,7 +129,7 @@ static const unsigned char digestinfo_ripemd160_der[] = { # ifndef OPENSSL_NO_SM3 /* SM3 (1 2 156 10197 1 401) */ static const unsigned char digestinfo_sm3_der[] = { - ASN1_SEQUENCE, 0x0f + SM3_DIGEST_LENGTH, + ASN1_SEQUENCE, 0x10 + SM3_DIGEST_LENGTH, ASN1_SEQUENCE, 0x0c, ASN1_OID, 0x08, 1 * 40 + 2, 0x81, 0x1c, 0xcf, 0x55, 1, 0x83, 0x78, ASN1_NULL, 0x00, diff --git a/crypto/openssl/crypto/threads_pthread.c b/crypto/openssl/crypto/threads_pthread.c index 44d6ebe09231..ace2dc499061 100644 --- a/crypto/openssl/crypto/threads_pthread.c +++ b/crypto/openssl/crypto/threads_pthread.c @@ -62,8 +62,10 @@ __tsan_mutex_post_lock((x), 0, 0) /* * The Non-Stop KLT thread model currently seems broken in its rwlock * implementation + * Likewise is there a problem with the glibc implementation on riscv. */ -# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) +# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) \ + && !defined(__riscv) # define USE_RWLOCK # endif @@ -279,7 +281,7 @@ static struct rcu_qp *get_hold_current_qp(struct rcu_lock_st *lock) /* if the idx hasn't changed, we're good, else try again */ if (qp_idx == ATOMIC_LOAD_N(uint32_t, &lock->reader_idx, - __ATOMIC_RELAXED)) + __ATOMIC_ACQUIRE)) break; ATOMIC_SUB_FETCH(&lock->qp_group[qp_idx].users, (uint64_t)1, @@ -403,8 +405,12 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id) *curr_id = lock->id_ctr; lock->id_ctr++; + /* + * make the current state of everything visible by this release + * when get_hold_current_qp acquires the next qp + */ ATOMIC_STORE_N(uint32_t, &lock->reader_idx, lock->current_alloc_idx, - __ATOMIC_RELAXED); + __ATOMIC_RELEASE); /* * this should make sure that the new value of reader_idx is visible in diff --git a/crypto/openssl/crypto/x509/t_x509.c b/crypto/openssl/crypto/x509/t_x509.c index 7d693669cd36..d849e642ce8b 100644 --- a/crypto/openssl/crypto/x509/t_x509.c +++ b/crypto/openssl/crypto/x509/t_x509.c @@ -219,7 +219,8 @@ int X509_ocspid_print(BIO *bp, X509 *x) goto err; if ((der = dertmp = OPENSSL_malloc(derlen)) == NULL) goto err; - i2d_X509_NAME(subj, &dertmp); + if (i2d_X509_NAME(subj, &dertmp) < 0) + goto err; md = EVP_MD_fetch(x->libctx, SN_sha1, x->propq); if (md == NULL) diff --git a/crypto/openssl/crypto/x509/x509_lu.c b/crypto/openssl/crypto/x509/x509_lu.c index 05ee7c8c6b51..eb2d47955b2e 100644 --- a/crypto/openssl/crypto/x509/x509_lu.c +++ b/crypto/openssl/crypto/x509/x509_lu.c @@ -408,7 +408,6 @@ static int x509_store_add(X509_STORE *store, void *x, int crl) } if (!X509_STORE_lock(store)) { - obj->type = X509_LU_NONE; X509_OBJECT_free(obj); return 0; } diff --git a/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod b/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod index ff2074820f68..eeb882f291e4 100644 --- a/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod +++ b/crypto/openssl/doc/man3/DEFINE_STACK_OF.pod @@ -170,15 +170,14 @@ B<sk_I<TYPE>_set>() sets element I<idx> of I<sk> to I<ptr> replacing the current element. The new element value is returned or NULL if an error occurred: this will only happen if I<sk> is NULL or I<idx> is out of range. -B<sk_I<TYPE>_find>() searches I<sk> for the element I<ptr>. In the case -where no comparison function has been specified, the function performs -a linear search for a pointer equal to I<ptr>. The index of the first -matching element is returned or B<-1> if there is no match. In the case -where a comparison function has been specified, I<sk> is sorted and -B<sk_I<TYPE>_find>() returns the index of a matching element or B<-1> if there -is no match. Note that, in this case the comparison function will usually -compare the values pointed to rather than the pointers themselves and -the order of elements in I<sk> can change. +B<sk_I<TYPE>_find>() searches I<sk> for the element I<ptr>. In the +case where no comparison function has been specified, the function +performs a linear search for a pointer equal to I<ptr>. In the case +where a comparison function has been specified, the function performs +a search for a element that the comparison function indicates is a +match. If the stack is sorted, a binary search is used, otherwise, a +linear search is used. B<sk_I<TYPE>_find>() returns the index of a +matching element or B<-1> if there is no match. B<sk_I<TYPE>_find_ex>() operates like B<sk_I<TYPE>_find>() except when a comparison function has been specified and no matching element is found. @@ -301,7 +300,7 @@ was changed to return 0 in this condition as for other errors. =head1 COPYRIGHT -Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/OpenSSL_version.pod b/crypto/openssl/doc/man3/OpenSSL_version.pod index e5dff33dcdda..6b899cbe5438 100644 --- a/crypto/openssl/doc/man3/OpenSSL_version.pod +++ b/crypto/openssl/doc/man3/OpenSSL_version.pod @@ -256,9 +256,16 @@ L<crypto(7)> The macros and functions described here were added in OpenSSL 3.0, except for OPENSSL_VERSION_NUMBER and OpenSSL_version_num(). +=head1 BUGS + +There was a discrepancy between this manual and commentary + code +in F<< <openssl/opensslv.h> >>, where the latter suggested that the +four least significant bits of B<OPENSSL_VERSION_NUMBER> could be +C<0x0f> in released OpenSSL versions. + =head1 COPYRIGHT -Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2018-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod b/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod index 09b7280bdd58..a10942433aa7 100644 --- a/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod +++ b/crypto/openssl/doc/man3/SSL_CIPHER_get_name.pod @@ -37,7 +37,7 @@ SSL_CIPHER_get_protocol_id int SSL_CIPHER_is_aead(const SSL_CIPHER *c); const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr); uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c); - uint32_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c); + uint16_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c); =head1 DESCRIPTION @@ -203,7 +203,7 @@ The OPENSSL_cipher_name() function was added in OpenSSL 1.1.1. =head1 COPYRIGHT -Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved. Licensed under the Apache License 2.0 (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod b/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod index f7add16d7bdd..0140deee9a5e 100644 --- a/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod +++ b/crypto/openssl/doc/man3/SSL_SESSION_get0_hostname.pod @@ -23,9 +23,10 @@ SSL_SESSION_set1_alpn_selected =head1 DESCRIPTION -SSL_SESSION_get0_hostname() retrieves the SNI value that was sent by the -client when the session was created if it was accepted by the server. Otherwise -NULL is returned. +SSL_SESSION_get0_hostname() retrieves the Server Name Indication (SNI) value +that was sent by the client when the session was created if the server +acknowledged the client's SNI extension by including an empty SNI extension +in response. Otherwise NULL is returned. The value returned is a pointer to memory maintained within B<s> and should not be free'd. @@ -44,8 +45,7 @@ B<alpn>. =head1 RETURN VALUES -SSL_SESSION_get0_hostname() returns either a string or NULL based on if there -is the SNI value sent by client. +SSL_SESSION_get0_hostname() returns the SNI string if available, or NULL if not. SSL_SESSION_set1_hostname() returns 1 on success or 0 on error. diff --git a/crypto/openssl/include/crypto/rsa.h b/crypto/openssl/include/crypto/rsa.h index ffbc95a77888..55cc814ce913 100644 --- a/crypto/openssl/include/crypto/rsa.h +++ b/crypto/openssl/include/crypto/rsa.h @@ -124,10 +124,6 @@ ASN1_STRING *ossl_rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx); int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx, const X509_ALGOR *sigalg, EVP_PKEY *pkey); -# ifdef FIPS_MODULE -int ossl_rsa_key_pairwise_test(RSA *rsa); -# endif /* FIPS_MODULE */ - # if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS) int ossl_rsa_acvp_test_gen_params_new(OSSL_PARAM **dst, const OSSL_PARAM src[]); void ossl_rsa_acvp_test_gen_params_free(OSSL_PARAM *dst); diff --git a/crypto/openssl/include/openssl/opensslv.h.in b/crypto/openssl/include/openssl/opensslv.h.in index e547281ff527..69b9caacf4dc 100644 --- a/crypto/openssl/include/openssl/opensslv.h.in +++ b/crypto/openssl/include/openssl/opensslv.h.in @@ -89,12 +89,12 @@ extern "C" { # define OPENSSL_VERSION_TEXT "OpenSSL {- "$config{full_version} $config{release_date}" -}" -/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ +/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */ # define OPENSSL_VERSION_NUMBER \ ( (OPENSSL_VERSION_MAJOR<<28) \ |(OPENSSL_VERSION_MINOR<<20) \ |(OPENSSL_VERSION_PATCH<<4) \ - |{- @config{prerelease} ? "0x0L" : "0xfL" -} ) + |0x0L ) # ifdef __cplusplus } diff --git a/crypto/openssl/providers/fips-sources.checksums b/crypto/openssl/providers/fips-sources.checksums index d48a9c85f57b..334b4ad6b7f2 100644 --- a/crypto/openssl/providers/fips-sources.checksums +++ b/crypto/openssl/providers/fips-sources.checksums @@ -250,7 +250,7 @@ c685813be6ad35b0861ba888670ef54aa2b399d003472698e39426de6e52db59 crypto/initthr f866aafae928db1b439ac950dc90744a2397dfe222672fe68b3798396190c8b0 crypto/mem_clr.c 18127868d868ca5705444c24f7dc385391ba31154fc04ff54949739e8fa7fdfc crypto/ml_dsa/ml_dsa_encoders.c 825105b0a2c4844b2b4229001650ff7e61e1348e52f1072210f70b97cd4adb71 crypto/ml_dsa/ml_dsa_hash.h -c82201cf1a17ff2d4b169dcd4402d3d56f4685e460a1447e021db4abd67f7f0e crypto/ml_dsa/ml_dsa_key.c +c467f4400d399aad6b51746ef2575d1e04d260a1bf901b35ca55624fe62e650e crypto/ml_dsa/ml_dsa_key.c 579c1a12a5c5f014476a6bf695dc271f63074fb187e23ffc3f9ccb5b7ea044f1 crypto/ml_dsa/ml_dsa_key.h 3f98eb0467033d0a40867ef1c1036dcfea5d231eeac2321196f7d7c7243edace crypto/ml_dsa/ml_dsa_key_compress.c 983d164bfa3dbe8d85ad1fdc24d897e79d9246d96d9c1862855c6c538b387ad9 crypto/ml_dsa/ml_dsa_local.h @@ -263,7 +263,7 @@ ff65c82c56e341f47df03d0c74de7fb537de0e68a4fa23fa07a9fdb51c511f1c crypto/ml_dsa/ 1d7f57a41034988a4e7d4c9a998760d2ef802c5e90275d09a3ca31c5f3403d94 crypto/ml_dsa/ml_dsa_sign.c 5217ef237e21872205703b95577290c34898423466a465c7bd609b2eb4627964 crypto/ml_dsa/ml_dsa_sign.h abd934284bcd8061027a69f437fa4410c6b72cd950be1ebe048244d036371208 crypto/ml_dsa/ml_dsa_vector.h -defc2e4e81ff1b78056c795bc0565f4241a259c2957abe84a51bcbc1e4ace3f1 crypto/ml_kem/ml_kem.c +8c4f7238f68f959f2ad1e2529c567364c5a8818898355c82818521e03239ea76 crypto/ml_kem/ml_kem.c 36e24eae5d38cc9666ae40e4e8a2dc12328e1159fea68447cb19dab174d25adf crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl 33357356cd739d4ae89d52f0804b6900e4b94d8829323819c6f64c8908e978df crypto/modes/asm/aes-gcm-armv8_64.pl bcc09bdb474f045d04c983fa09c31a010c5a25513f53a5d3653ade91304f0f96 crypto/modes/asm/aes-gcm-avx512.pl @@ -306,7 +306,7 @@ f50450f7e5f6896fb8e3cde2fdc11cc543124c854ef9d88252a166606ca80081 crypto/params_ 467c416422ecf61e3b713c5eb259fdbcb4aa73ae8dee61804d0b85cfd3fff4f7 crypto/property/defn_cache.c 91c1f1f8eb5588ed9da17386c244ae68a6a81717b1c7ab6c9f1a6a57973a039f crypto/property/property.c 66da4f28d408133fb544b14aeb9ad4913e7c5c67e2826e53f0dc5bf4d8fada26 crypto/property/property_local.h -d32105cb087d708d0504a787f74bc163cc398c299faf2e98d6bb5ae02f5ce9b7 crypto/property/property_parse.c +1e99a3934812f99dad79cbfbb6727ad61b6093711c1a6c74d4b50f9318152611 crypto/property/property_parse.c a7cefda6a117550e2c76e0f307565ce1e11640b11ba10c80e469a837fd1212a3 crypto/property/property_query.c 20e69b9d594dfc443075eddbb0e6bcc0ed36ca51993cd50cc5a4f86eb31127f8 crypto/property/property_string.c 10644e9d20214660706de58d34edf635c110d4e4f2628cd5284a08c60ed9aff8 crypto/provider_core.c @@ -322,7 +322,7 @@ f0c8792a99132e0b9c027cfa7370f45594a115934cdc9e8f23bdd64abecaf7fd crypto/rsa/rsa 1b828f428f0e78b591378f7b780164c4574620c68f9097de041cbd576f811bf6 crypto/rsa/rsa_backend.c 38a102cd1da1f6ca5a46e6a22f018237964336274385f5c70cbedcaa6997647e crypto/rsa/rsa_chk.c e762c599b17d5c89f4b1c9eb7d0ca1f04a95d815c86a3e72c30b231ce57fb199 crypto/rsa/rsa_crpt.c -0fa3e4687510e2d91c8f4b1c460b1d51375d9855ed825b3d6697620b146b52d1 crypto/rsa/rsa_gen.c +a3d20f27ae3cb41af5b62febd0bb19025e59d401b136306d570cdba103b15542 crypto/rsa/rsa_gen.c f22bc4e2c3acab83e67820c906c1caf048ec1f0d4fcb7472c1bec753c75f8e93 crypto/rsa/rsa_lib.c 5ae8edaf654645996385fbd420ef73030762fc146bf41deb5294d6d83e257a16 crypto/rsa/rsa_local.h cf0b75cd54b61b9b9a290ef18d0ddce9fb26a029a54eb3f720d9b25188440f00 crypto/rsa/rsa_mp_names.c @@ -416,7 +416,7 @@ a00e16963e1e2a0126c6a8e62da8a14f98de9736027654c925925dadd0ca3cc1 crypto/thread/ 27ec0090f4243c96e4fbe1babfd4320c2a16615ffa368275433217d50a1ef76c crypto/thread/internal.c 67ba8d87fbbb7c9a9e438018e7ecfd1cedd4d00224be05755580d044f5f1317a crypto/threads_lib.c b1a828491d9ce305802662561788facac92dff70cca9ead807f3e28741ff21e0 crypto/threads_none.c -c659f7ce5c4b59d2a1cff78485fa8e89c8d20d5798df4afc1b94ff635ffc0262 crypto/threads_pthread.c +491e9c29d4a7b4dd627ea25c20ce4a33103565b3108b618c41c6816dfc675569 crypto/threads_pthread.c 9c3bf7b4baa302a4017150fbcaa114ee9df935b18d5a3a8c8015003780d4e7de crypto/threads_win.c 7edd638df588b14711a50c98d458c4fc83f223ed03bc6c39c7c8edf7915b7cfa crypto/time.c 88c5f9f4d2611223d283ebd2ae10ae5ecbb9972d00f747d93fcb74b62641e3f9 crypto/x86_64cpuid.pl @@ -445,7 +445,7 @@ bbe5e52d84e65449a13e42cd2d6adce59b8ed6e73d6950917aa77dc1f3f5dff6 include/crypto 6e7762e7fb63f56d25b24f70209f4dc834c59a87f74467531ec81646f565dbe3 include/crypto/modes.h 920bc48a4dad3712bdcef188c0ce8e8a8304e0ce332b54843bab366fc5eab472 include/crypto/rand.h 71f23915ea74e93971fb0205901031be3abea7ffef2c52e4cc4848515079f68d include/crypto/rand_pool.h -b1df067691f9741ef9c42b2e5f12461bcd87b745514fc5701b9c9402fb10b224 include/crypto/rsa.h +6f16685ffbc97dc2ac1240bfddf4bbac2dd1ad83fff6da91aee6f3f64c6ee8ff include/crypto/rsa.h 32f0149ab1d82fddbdfbbc44e3078b4a4cc6936d35187e0f8d02cc0bc19f2401 include/crypto/security_bits.h 80338f3865b7c74aab343879432a6399507b834e2f55dd0e9ee7a5eeba11242a include/crypto/sha.h dc7808729c3231a08bbe470b3e1b562420030f59f7bc05b14d7b516fa77b4f3a include/crypto/slh_dsa.h @@ -546,7 +546,7 @@ a8a45996fd21411cb7ed610bc202dbd06570cdfa0a2d14f7dfc8bfadc820e636 include/openss cb6bca3913c60a57bac39583eee0f789d49c3d29be3ecde9aecc7f3287117aa5 include/openssl/objects.h d25537af264684dff033dd8ae62b0348f868fcfec4aa51fa8f07bcfa4bd807ad include/openssl/objectserr.h fe6acd42c3e90db31aaafc2236a7d30ebfa53c4c07ea4d8265064c7fcb951970 include/openssl/opensslconf.h -fc914a750d798ac9fc9287e6359cfa1da214b91651deaaaa7e1a46b595cd0425 include/openssl/opensslv.h.in +6c1a8837bbba633db2a8951ff29ccfe09e7d2a24a37ee2af90f2d897c190da9a include/openssl/opensslv.h.in 767d9d7d5051c937a3ce8a268c702902fda93eeaa210a94dfde1f45c23277d20 include/openssl/param_build.h 1c442aaaa4dda7fbf727a451bc676fb4d855ef617c14dc77ff2a5e958ae33c3e include/openssl/params.h 44f178176293c6ce8142890ff9dc2d466364c734e4e811f56bd62010c5403183 include/openssl/pkcs7.h.in @@ -618,8 +618,8 @@ f2581d7b4e105f2bb6d30908f3c2d9959313be08cec6dbeb49030c125a7676d3 providers/fips 669f76f742bcaaf28846b057bfab97da7c162d69da244de71b7c743bf16e430f providers/fips/include/fipscommon.h f111fd7e016af8cc6f96cd8059c28227b328dd466ed137ae0c0bc0c3c3eec3ba providers/fips/self_test.c 5c2c6c2f69e2eb01b88fa35630f27948e00dd2c2fd351735c74f34ccb2005cbe providers/fips/self_test.h -663441de9aba1d1b81ce02b3acded520b88cc460330d4d98adb7450d9664c474 providers/fips/self_test_data.inc -2e568e2b161131240e97bd77a730c2299f961c2f1409ea8466422fc07f9be23f providers/fips/self_test_kats.c +df83c901ad13675fbbb4708b6087feba6099870ad3dd0e8d09cfdb6798419770 providers/fips/self_test_data.inc +6779d5afb3f48d82868b247ffb0a6a572f6e3964738296ad47e7ccafdb263c88 providers/fips/self_test_kats.c dde79dfdedfe0e73006a0cf912fdde1ff109dfbc5ba6ecab319c938bc4275950 providers/implementations/asymciphers/rsa_enc.c c2f1b12c64fc369dfc3b9bc9e76a76de7280e6429adaee55d332eb1971ad1879 providers/implementations/ciphers/cipher_aes.c 6ba7d817081cf0d87ba7bfb38cd9d70e41505480bb8bc796ef896f68d4514ea6 providers/implementations/ciphers/cipher_aes.h @@ -699,7 +699,7 @@ c764555b9dc9b273c280514a5d2d44156f82f3e99155a77c627f2c773209bcd7 providers/impl 24cc3cc8e8681c77b7f96c83293bd66045fd8ad69f756e673ca7f8ca9e82b0af providers/implementations/keymgmt/dsa_kmgmt.c 36a9c1c8658ce7918453827cb58ed52787e590e3f148c5510deeb2c16c25a29d providers/implementations/keymgmt/ec_kmgmt.c 258ae17bb2dd87ed1511a8eb3fe99eed9b77f5c2f757215ff6b3d0e8791fc251 providers/implementations/keymgmt/ec_kmgmt_imexport.inc -9728d696d249b2d224724c9872138a60e1998e5cfa5c49f3f48ad0666f7eed34 providers/implementations/keymgmt/ecx_kmgmt.c +11c27cc3c9f38885c484f25d11987e93f197aa90bef2fc1d6e8f508c2d014d4d providers/implementations/keymgmt/ecx_kmgmt.c daf35a7ab961ef70aefca981d80407935904c5da39dca6692432d6e6bc98759d providers/implementations/keymgmt/kdf_legacy_kmgmt.c d97d7c8d3410b3e560ef2becaea2a47948e22205be5162f964c5e51a7eef08cb providers/implementations/keymgmt/mac_legacy_kmgmt.c a428de71082fd01e5dcfa030a6fc34f6700b86d037b4e22f015c917862a158ce providers/implementations/keymgmt/ml_dsa_kmgmt.c diff --git a/crypto/openssl/providers/fips.checksum b/crypto/openssl/providers/fips.checksum index 7fa4ea19bba3..5d1117361d27 100644 --- a/crypto/openssl/providers/fips.checksum +++ b/crypto/openssl/providers/fips.checksum @@ -1 +1 @@ -8d0c2c2b986f4c98f511c9aa020e98aa984dce5976d8e1966a7721f8b559cda8 providers/fips-sources.checksums +c342f9dc7075a6ecd0e4b3c9db06e180765278a7bbae233ec1a65095a0e524ec providers/fips-sources.checksums diff --git a/crypto/openssl/providers/fips/self_test_data.inc b/crypto/openssl/providers/fips/self_test_data.inc index b6aa433ca93c..6abab0a7a173 100644 --- a/crypto/openssl/providers/fips/self_test_data.inc +++ b/crypto/openssl/providers/fips/self_test_data.inc @@ -1308,6 +1308,18 @@ static const ST_KAT_PARAM rsa_priv_key[] = { ST_KAT_PARAM_END() }; +/*- + * Using OSSL_PKEY_RSA_PAD_MODE_NONE directly in the expansion of the + * ST_KAT_PARAM_UTF8STRING macro below causes a failure on ancient + * HP/UX PA-RISC compilers. + */ +static const char pad_mode_none[] = OSSL_PKEY_RSA_PAD_MODE_NONE; + +static const ST_KAT_PARAM rsa_enc_params[] = { + ST_KAT_PARAM_UTF8STRING(OSSL_ASYM_CIPHER_PARAM_PAD_MODE, pad_mode_none), + ST_KAT_PARAM_END() +}; + static const unsigned char rsa_sig_msg[] = "Hello World!"; static const unsigned char rsa_expected_sig[256] = { @@ -3497,3 +3509,33 @@ static const ST_KAT_ASYM_KEYGEN st_kat_asym_keygen_tests[] = { # endif }; #endif /* !OPENSSL_NO_ML_DSA || !OPENSSL_NO_SLH_DSA */ + +static const ST_KAT_ASYM_CIPHER st_kat_asym_cipher_tests[] = { + { + OSSL_SELF_TEST_DESC_ASYM_RSA_ENC, + "RSA", + 1, + rsa_pub_key, + rsa_enc_params, + ITM(rsa_asym_plaintext_encrypt), + ITM(rsa_asym_expected_encrypt), + }, + { + OSSL_SELF_TEST_DESC_ASYM_RSA_DEC, + "RSA", + 0, + rsa_priv_key, + rsa_enc_params, + ITM(rsa_asym_expected_encrypt), + ITM(rsa_asym_plaintext_encrypt), + }, + { + OSSL_SELF_TEST_DESC_ASYM_RSA_DEC, + "RSA", + 0, + rsa_crt_key, + rsa_enc_params, + ITM(rsa_asym_expected_encrypt), + ITM(rsa_asym_plaintext_encrypt), + }, +}; diff --git a/crypto/openssl/providers/fips/self_test_kats.c b/crypto/openssl/providers/fips/self_test_kats.c index 35ecb43598ee..acb0b85f7343 100644 --- a/crypto/openssl/providers/fips/self_test_kats.c +++ b/crypto/openssl/providers/fips/self_test_kats.c @@ -813,6 +813,93 @@ err: #endif /* + * Test an encrypt or decrypt KAT.. + * + * FIPS 140-2 IG D.9 states that separate KAT tests are needed for encrypt + * and decrypt.. + */ +static int self_test_asym_cipher(const ST_KAT_ASYM_CIPHER *t, OSSL_SELF_TEST *st, + OSSL_LIB_CTX *libctx) +{ + int ret = 0; + OSSL_PARAM *keyparams = NULL, *initparams = NULL; + OSSL_PARAM_BLD *keybld = NULL, *initbld = NULL; + EVP_PKEY_CTX *encctx = NULL, *keyctx = NULL; + EVP_PKEY *key = NULL; + BN_CTX *bnctx = NULL; + unsigned char out[256]; + size_t outlen = sizeof(out); + + OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_KAT_ASYM_CIPHER, t->desc); + + bnctx = BN_CTX_new_ex(libctx); + if (bnctx == NULL) + goto err; + + /* Load a public or private key from data */ + keybld = OSSL_PARAM_BLD_new(); + if (keybld == NULL + || !add_params(keybld, t->key, bnctx)) + goto err; + keyparams = OSSL_PARAM_BLD_to_param(keybld); + keyctx = EVP_PKEY_CTX_new_from_name(libctx, t->algorithm, NULL); + if (keyctx == NULL || keyparams == NULL) + goto err; + if (EVP_PKEY_fromdata_init(keyctx) <= 0 + || EVP_PKEY_fromdata(keyctx, &key, EVP_PKEY_KEYPAIR, keyparams) <= 0) + goto err; + + /* Create a EVP_PKEY_CTX to use for the encrypt or decrypt operation */ + encctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL); + if (encctx == NULL + || (t->encrypt && EVP_PKEY_encrypt_init(encctx) <= 0) + || (!t->encrypt && EVP_PKEY_decrypt_init(encctx) <= 0)) + goto err; + + /* Add any additional parameters such as padding */ + if (t->postinit != NULL) { + initbld = OSSL_PARAM_BLD_new(); + if (initbld == NULL) + goto err; + if (!add_params(initbld, t->postinit, bnctx)) + goto err; + initparams = OSSL_PARAM_BLD_to_param(initbld); + if (initparams == NULL) + goto err; + if (EVP_PKEY_CTX_set_params(encctx, initparams) <= 0) + goto err; + } + + if (t->encrypt) { + if (EVP_PKEY_encrypt(encctx, out, &outlen, + t->in, t->in_len) <= 0) + goto err; + } else { + if (EVP_PKEY_decrypt(encctx, out, &outlen, + t->in, t->in_len) <= 0) + goto err; + } + /* Check the KAT */ + OSSL_SELF_TEST_oncorrupt_byte(st, out); + if (outlen != t->expected_len + || memcmp(out, t->expected, t->expected_len) != 0) + goto err; + + ret = 1; +err: + BN_CTX_free(bnctx); + EVP_PKEY_free(key); + EVP_PKEY_CTX_free(encctx); + EVP_PKEY_CTX_free(keyctx); + OSSL_PARAM_free(keyparams); + OSSL_PARAM_BLD_free(keybld); + OSSL_PARAM_free(initparams); + OSSL_PARAM_BLD_free(initbld); + OSSL_SELF_TEST_onend(st, ret); + return ret; +} + +/* * Test a data driven list of KAT's for digest algorithms. * All tests are run regardless of if they fail or not. * Return 0 if any test fails. @@ -853,6 +940,17 @@ static int self_test_kems(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx) return ret; } +static int self_test_asym_ciphers(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx) +{ + int i, ret = 1; + + for (i = 0; i < (int)OSSL_NELEM(st_kat_asym_cipher_tests); ++i) { + if (!self_test_asym_cipher(&st_kat_asym_cipher_tests[i], st, libctx)) + ret = 0; + } + return ret; +} + static int self_test_kdfs(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx) { int i, ret = 1; @@ -1092,6 +1190,8 @@ int SELF_TEST_kats(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx) ret = 0; if (!self_test_kems(st, libctx)) ret = 0; + if (!self_test_asym_ciphers(st, libctx)) + ret = 0; RAND_set0_private(libctx, saved_rand); return ret; diff --git a/crypto/openssl/providers/implementations/kdfs/krb5kdf.c b/crypto/openssl/providers/implementations/kdfs/krb5kdf.c index 566afa74fece..13623ec7302e 100644 --- a/crypto/openssl/providers/implementations/kdfs/krb5kdf.c +++ b/crypto/openssl/providers/implementations/kdfs/krb5kdf.c @@ -1,5 +1,5 @@ /* - * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2018-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -350,7 +350,7 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, { int klen, ret; - ret = EVP_EncryptInit_ex(ctx, cipher, engine, key, NULL); + ret = EVP_EncryptInit_ex(ctx, cipher, engine, NULL, NULL); if (!ret) goto out; /* set the key len for the odd variable key len cipher */ @@ -362,6 +362,9 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, goto out; } } + ret = EVP_EncryptInit_ex(ctx, NULL, NULL, key, NULL); + if (!ret) + goto out; /* we never want padding, either the length requested is a multiple of * the cipher block size or we are passed a cipher that can cope with * partial blocks via techniques like cipher text stealing */ diff --git a/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c b/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c index e6d326a90705..0ebe8b4d59b1 100644 --- a/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/crypto/openssl/providers/implementations/keymgmt/ecx_kmgmt.c @@ -218,14 +218,6 @@ static int ecx_import(void *keydata, int selection, const OSSL_PARAM params[]) include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0; ok = ok && ossl_ecx_key_fromdata(key, params, include_private); -#ifdef FIPS_MODULE - if (ok > 0 && ecx_key_type_is_ed(key->type) && !ossl_fips_self_testing()) - if (key->haspubkey && key->privkey != NULL) { - ok = ecd_fips140_pairwise_test(key, key->type, 1); - if (ok <= 0) - ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT_IMPORT); - } -#endif /* FIPS_MODULE */ return ok; } diff --git a/crypto/openssl/ssl/quic/quic_impl.c b/crypto/openssl/ssl/quic/quic_impl.c index c44e6b33c2a8..cec05d5bd37b 100644 --- a/crypto/openssl/ssl/quic/quic_impl.c +++ b/crypto/openssl/ssl/quic/quic_impl.c @@ -3197,6 +3197,7 @@ int ossl_quic_conn_stream_conclude(SSL *s) QCTX ctx; QUIC_STREAM *qs; int err; + int ret; if (!expect_quic_with_stream_lock(s, /*remote_init=*/0, /*io=*/0, &ctx)) return 0; @@ -3204,13 +3205,15 @@ int ossl_quic_conn_stream_conclude(SSL *s) qs = ctx.xso->stream; if (!quic_mutation_allowed(ctx.qc, /*req_active=*/1)) { + ret = QUIC_RAISE_NON_NORMAL_ERROR(&ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL); qctx_unlock(&ctx); - return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL); + return ret; } if (!quic_validate_for_write(ctx.xso, &err)) { + ret = QUIC_RAISE_NON_NORMAL_ERROR(&ctx, err, NULL); qctx_unlock(&ctx); - return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, err, NULL); + return ret; } if (ossl_quic_sstream_get_final_size(qs->sstream, NULL)) { diff --git a/crypto/openssl/ssl/record/methods/tls_common.c b/crypto/openssl/ssl/record/methods/tls_common.c index 80d4477bd0c0..b9c79099462d 100644 --- a/crypto/openssl/ssl/record/methods/tls_common.c +++ b/crypto/openssl/ssl/record/methods/tls_common.c @@ -1,5 +1,5 @@ /* - * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1093,9 +1093,12 @@ int tls13_common_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec) return 0; } - if (rl->msg_callback != NULL) - rl->msg_callback(0, rl->version, SSL3_RT_INNER_CONTENT_TYPE, &rec->type, - 1, rl->cbarg); + if (rl->msg_callback != NULL) { + unsigned char ctype = (unsigned char)rec->type; + + rl->msg_callback(0, rl->version, SSL3_RT_INNER_CONTENT_TYPE, &ctype, + 1, rl->cbarg); + } /* * TLSv1.3 alert and handshake records are required to be non-zero in diff --git a/crypto/openssl/ssl/ssl_rsa.c b/crypto/openssl/ssl/ssl_rsa.c index e833bcdbc377..f4731a87af90 100644 --- a/crypto/openssl/ssl/ssl_rsa.c +++ b/crypto/openssl/ssl/ssl_rsa.c @@ -1056,10 +1056,13 @@ static int ssl_set_cert_and_key(SSL *ssl, SSL_CTX *ctx, X509 *x509, EVP_PKEY *pr } } - if (!X509_up_ref(x509)) + if (!X509_up_ref(x509)) { + OSSL_STACK_OF_X509_free(dup_chain); goto out; + } if (!EVP_PKEY_up_ref(privatekey)) { + OSSL_STACK_OF_X509_free(dup_chain); X509_free(x509); goto out; } diff --git a/crypto/openssl/ssl/t1_trce.c b/crypto/openssl/ssl/t1_trce.c index 35c60feb4371..73fd4ebaa4b0 100644 --- a/crypto/openssl/ssl/t1_trce.c +++ b/crypto/openssl/ssl/t1_trce.c @@ -549,8 +549,12 @@ static const ssl_trace_tbl ssl_groups_tbl[] = { {258, "ffdhe4096"}, {259, "ffdhe6144"}, {260, "ffdhe8192"}, + {512, "MLKEM512"}, + {513, "MLKEM768"}, + {514, "MLKEM1024"}, {4587, "SecP256r1MLKEM768"}, {4588, "X25519MLKEM768"}, + {4589, "SecP384r1MLKEM1024"}, {25497, "X25519Kyber768Draft00"}, {25498, "SecP256r1Kyber768Draft00"}, {0xFF01, "arbitrary_explicit_prime_curves"}, diff --git a/crypto/openssl/test/build.info b/crypto/openssl/test/build.info index 9d9be6b642e9..3dca6117796b 100644 --- a/crypto/openssl/test/build.info +++ b/crypto/openssl/test/build.info @@ -31,7 +31,8 @@ IF[{- !$disabled{tests} -}] testutil/format_output.c testutil/load.c testutil/fake_random.c \ testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \ testutil/options.c testutil/test_options.c testutil/provider.c \ - testutil/apps_shims.c testutil/random.c testutil/helper.c $LIBAPPSSRC + testutil/apps_shims.c testutil/random.c testutil/helper.c \ + testutil/compare.c $LIBAPPSSRC INCLUDE[libtestutil.a]=../include ../apps/include .. DEPEND[libtestutil.a]=../libcrypto diff --git a/crypto/openssl/test/fake_rsaprov.c b/crypto/openssl/test/fake_rsaprov.c index 46fc9104ef95..6ed121554336 100644 --- a/crypto/openssl/test/fake_rsaprov.c +++ b/crypto/openssl/test/fake_rsaprov.c @@ -35,6 +35,8 @@ static int exptypes_selection; static int query_id; static int key_deleted; +unsigned fake_rsa_query_operation_name = 0; + typedef struct { OSSL_LIB_CTX *libctx; } PROV_FAKE_RSA_CTX; @@ -90,7 +92,7 @@ static const char *fake_rsa_keymgmt_query(int id) /* record global for checking */ query_id = id; - return "RSA"; + return fake_rsa_query_operation_name ? NULL: "RSA"; } static int fake_rsa_keymgmt_import(void *keydata, int selection, diff --git a/crypto/openssl/test/fake_rsaprov.h b/crypto/openssl/test/fake_rsaprov.h index cb2e66eb68ef..00e7dccb4872 100644 --- a/crypto/openssl/test/fake_rsaprov.h +++ b/crypto/openssl/test/fake_rsaprov.h @@ -1,5 +1,5 @@ /* - * Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2021-2025 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -14,5 +14,14 @@ /* Fake RSA provider implementation */ OSSL_PROVIDER *fake_rsa_start(OSSL_LIB_CTX *libctx); void fake_rsa_finish(OSSL_PROVIDER *p); + OSSL_PARAM *fake_rsa_key_params(int priv); void fake_rsa_restore_store_state(void); + +/* + * When fake_rsa_query_operation_name is set to a non-zero value, + * query_operation_name() will return NULL. + * + * By default, it is 0, in which case query_operation_name() will return "RSA". + */ +extern unsigned fake_rsa_query_operation_name; diff --git a/crypto/openssl/test/ml_kem_evp_extra_test.c b/crypto/openssl/test/ml_kem_evp_extra_test.c index bfa52c9af2e6..b867b14ad1d4 100644 --- a/crypto/openssl/test/ml_kem_evp_extra_test.c +++ b/crypto/openssl/test/ml_kem_evp_extra_test.c @@ -140,9 +140,19 @@ static int test_ml_kem(void) if (!TEST_int_gt(EVP_PKEY_copy_parameters(bkey, akey), 0)) goto err; + /* Bob's empty key is not equal to Alice's */ + if (!TEST_false(EVP_PKEY_eq(akey, bkey)) + || !TEST_false(EVP_PKEY_eq(bkey, akey))) + goto err; + if (!TEST_true(EVP_PKEY_set1_encoded_public_key(bkey, rawpub, publen))) goto err; + /* Bob's copy of Alice's public key makes the two equal */ + if (!TEST_true(EVP_PKEY_eq(akey, bkey)) + || !TEST_true(EVP_PKEY_eq(bkey, akey))) + goto err; + /* Encapsulate Bob's key */ ctx = EVP_PKEY_CTX_new_from_pkey(testctx, bkey, NULL); if (!TEST_ptr(ctx)) diff --git a/crypto/openssl/test/property_test.c b/crypto/openssl/test/property_test.c index 18f8cc8740e0..e62ff247c42c 100644 --- a/crypto/openssl/test/property_test.c +++ b/crypto/openssl/test/property_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use @@ -687,6 +687,22 @@ static int test_property_list_to_string(int i) return ret; } +static int test_property_list_to_string_bounds(void) +{ + OSSL_PROPERTY_LIST *pl = NULL; + char buf[16]; + int ret = 0; + + if (!TEST_ptr(pl = ossl_parse_query(NULL, "provider='$1'", 1))) + goto err; + if (!TEST_size_t_eq(ossl_property_list_to_string(NULL, pl, buf, 10), 14)) + goto err; + ret = 1; + err: + ossl_property_free(pl); + return ret; +} + int setup_tests(void) { ADD_TEST(test_property_string); @@ -701,5 +717,6 @@ int setup_tests(void) ADD_TEST(test_query_cache_stochastic); ADD_TEST(test_fips_mode); ADD_ALL_TESTS(test_property_list_to_string, OSSL_NELEM(to_string_tests)); + ADD_TEST(test_property_list_to_string_bounds); return 1; } diff --git a/crypto/openssl/test/provider_pkey_test.c b/crypto/openssl/test/provider_pkey_test.c index cb656a62a650..9ffe3581d62a 100644 --- a/crypto/openssl/test/provider_pkey_test.c +++ b/crypto/openssl/test/provider_pkey_test.c @@ -239,6 +239,77 @@ end: return ret; } +static int test_pkey_can_sign(void) +{ + OSSL_PROVIDER *fake_rsa = NULL; + EVP_PKEY *pkey_fake = NULL; + EVP_PKEY_CTX *ctx = NULL; + OSSL_PARAM *params = NULL; + int ret = 0; + + if (!TEST_ptr(fake_rsa = fake_rsa_start(libctx))) + return 0; + + /* + * Ensure other tests did not forget to reset fake_rsa_query_operation_name + * to its default value: 0 + */ + if (!TEST_int_eq(fake_rsa_query_operation_name, 0)) + goto end; + + if (!TEST_ptr(params = fake_rsa_key_params(0)) + || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA", + "provider=fake-rsa")) + || !TEST_true(EVP_PKEY_fromdata_init(ctx)) + || !TEST_true(EVP_PKEY_fromdata(ctx, &pkey_fake, EVP_PKEY_PUBLIC_KEY, + params)) + || !TEST_true(EVP_PKEY_can_sign(pkey_fake)) + || !TEST_ptr(pkey_fake)) + goto end; + + EVP_PKEY_CTX_free(ctx); + ctx = NULL; + EVP_PKEY_free(pkey_fake); + pkey_fake = NULL; + OSSL_PARAM_free(params); + params = NULL; + + /* + * Documented behavior for OSSL_FUNC_keymgmt_query_operation_name() + * allows it to return NULL, in which case the fallback should be to use + * EVP_KEYMGMT_get0_name(). That is exactly the thing we are testing here. + */ + fake_rsa_query_operation_name = 1; + + if (!TEST_ptr(params = fake_rsa_key_params(0)) + || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA", + "provider=fake-rsa")) + || !TEST_true(EVP_PKEY_fromdata_init(ctx)) + || !TEST_true(EVP_PKEY_fromdata(ctx, &pkey_fake, EVP_PKEY_PUBLIC_KEY, + params)) + || !TEST_true(EVP_PKEY_can_sign(pkey_fake)) + || !TEST_ptr(pkey_fake)) + goto end; + + EVP_PKEY_CTX_free(ctx); + ctx = NULL; + EVP_PKEY_free(pkey_fake); + pkey_fake = NULL; + OSSL_PARAM_free(params); + params = NULL; + + ret = 1; +end: + + EVP_PKEY_CTX_free(ctx); + EVP_PKEY_free(pkey_fake); + OSSL_PARAM_free(params); + fake_rsa_query_operation_name = 0; + + fake_rsa_finish(fake_rsa); + return ret; +} + static int test_pkey_store(int idx) { OSSL_PROVIDER *deflt = NULL; @@ -719,6 +790,7 @@ int setup_tests(void) ADD_TEST(test_pkey_sig); ADD_TEST(test_alternative_keygen_init); ADD_TEST(test_pkey_eq); + ADD_TEST(test_pkey_can_sign); ADD_ALL_TESTS(test_pkey_store, 2); ADD_TEST(test_pkey_delete); ADD_TEST(test_pkey_store_open_ex); diff --git a/crypto/openssl/test/quicapitest.c b/crypto/openssl/test/quicapitest.c index f665c511bb72..4e887c13d14c 100644 --- a/crypto/openssl/test/quicapitest.c +++ b/crypto/openssl/test/quicapitest.c @@ -428,91 +428,6 @@ static int test_version(void) } #if defined(DO_SSL_TRACE_TEST) -static void strip_line_ends(char *str) -{ - size_t i; - - for (i = strlen(str); - i > 0 && (str[i - 1] == '\n' || str[i - 1] == '\r'); - i--); - - str[i] = '\0'; -} - -static int compare_with_file(BIO *membio) -{ - BIO *file = NULL, *newfile = NULL; - char buf1[8192], buf2[8192]; - char *reffile; - int ret = 0; - size_t i; - -#ifdef OPENSSL_NO_ZLIB - reffile = test_mk_file_path(datadir, "ssltraceref.txt"); -#else - reffile = test_mk_file_path(datadir, "ssltraceref-zlib.txt"); -#endif - if (!TEST_ptr(reffile)) - goto err; - - file = BIO_new_file(reffile, "rb"); - if (!TEST_ptr(file)) - goto err; - - newfile = BIO_new_file("ssltraceref-new.txt", "wb"); - if (!TEST_ptr(newfile)) - goto err; - - while (BIO_gets(membio, buf2, sizeof(buf2)) > 0) - if (BIO_puts(newfile, buf2) <= 0) { - TEST_error("Failed writing new file data"); - goto err; - } - - if (!TEST_int_ge(BIO_seek(membio, 0), 0)) - goto err; - - while (BIO_gets(file, buf1, sizeof(buf1)) > 0) { - size_t line_len; - - if (BIO_gets(membio, buf2, sizeof(buf2)) <= 0) { - TEST_error("Failed reading mem data"); - goto err; - } - strip_line_ends(buf1); - strip_line_ends(buf2); - line_len = strlen(buf1); - if (line_len > 0 && buf1[line_len - 1] == '?') { - /* Wildcard at the EOL means ignore anything after it */ - if (strlen(buf2) > line_len) - buf2[line_len] = '\0'; - } - if (line_len != strlen(buf2)) { - TEST_error("Actual and ref line data length mismatch"); - TEST_info("%s", buf1); - TEST_info("%s", buf2); - goto err; - } - for (i = 0; i < line_len; i++) { - /* '?' is a wild card character in the reference text */ - if (buf1[i] == '?') - buf2[i] = '?'; - } - if (!TEST_str_eq(buf1, buf2)) - goto err; - } - if (!TEST_true(BIO_eof(file)) - || !TEST_true(BIO_eof(membio))) - goto err; - - ret = 1; - err: - OPENSSL_free(reffile); - BIO_free(file); - BIO_free(newfile); - return ret; -} - /* * Tests that the SSL_trace() msg_callback works as expected with a QUIC * connection. This also provides testing of the msg_callback at the same time. @@ -524,6 +439,7 @@ static int test_ssl_trace(void) QUIC_TSERVER *qtserv = NULL; int testresult = 0; BIO *bio = NULL; + char *reffile = NULL; if (!TEST_ptr(cctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method())) || !TEST_ptr(bio = BIO_new(BIO_s_mem())) @@ -547,7 +463,13 @@ static int test_ssl_trace(void) if (!TEST_int_gt(BIO_pending(bio), 0)) goto err; } else { - if (!TEST_true(compare_with_file(bio))) + +# ifdef OPENSSL_NO_ZLIB + reffile = test_mk_file_path(datadir, "ssltraceref.txt"); +# else + reffile = test_mk_file_path(datadir, "ssltraceref-zlib.txt"); +# endif + if (!TEST_true(compare_with_reference_file(bio, reffile))) goto err; } @@ -557,6 +479,7 @@ static int test_ssl_trace(void) SSL_free(clientquic); SSL_CTX_free(cctx); BIO_free(bio); + OPENSSL_free(reffile); return testresult; } diff --git a/crypto/openssl/test/radix/terp.c b/crypto/openssl/test/radix/terp.c index 3c83fd9b18b0..41d3bdeb9fd4 100644 --- a/crypto/openssl/test/radix/terp.c +++ b/crypto/openssl/test/radix/terp.c @@ -871,8 +871,10 @@ err: } GEN_SCRIPT_cleanup(&gen_script); - BIO_printf(debug_bio, "Stats:\n Ops executed: %16llu\n\n", - (unsigned long long)terp.ops_executed); + if (have_terp) { + BIO_printf(debug_bio, "Stats:\n Ops executed: %16llu\n\n", + (unsigned long long)terp.ops_executed); + } SCRIPT_INFO_print(script_info, debug_bio, /*error=*/!ok, ok ? "completed" : "failed, exiting"); return ok; diff --git a/crypto/openssl/test/recipes/03-test_fipsinstall.t b/crypto/openssl/test/recipes/03-test_fipsinstall.t index 1f9110ef600a..3dcbe67c6d55 100644 --- a/crypto/openssl/test/recipes/03-test_fipsinstall.t +++ b/crypto/openssl/test/recipes/03-test_fipsinstall.t @@ -63,7 +63,7 @@ my @commandline = ( 'x942kdf_key_check', 'x942kdf-key-check' ) ); -plan tests => 40 + (scalar @pedantic_okay) + (scalar @pedantic_fail) +plan tests => 41 + (scalar @pedantic_okay) + (scalar @pedantic_fail) + 4 * (scalar @commandline); my $infile = bldtop_file('providers', platform->dso('fips')); @@ -392,6 +392,16 @@ SKIP: { "fipsinstall fails when the ML-KEM decapsulate implicit failure result is corrupted"); } +# corrupt an Asymmetric cipher test +SKIP: { + skip "Skipping Asymmetric RSA corruption test because of no rsa in this build", 1 + if disabled("rsa") || disabled("fips-post"); + ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile, + '-corrupt_desc', 'RSA_Encrypt', + '-corrupt_type', 'KAT_AsymmetricCipher'])), + "fipsinstall fails when the asymmetric cipher result is corrupted"); +} + # 'local' ensures that this change is only done in this file. local $ENV{OPENSSL_CONF_INCLUDE} = abs2rel(curdir()); diff --git a/crypto/openssl/test/recipes/25-test_verify.t b/crypto/openssl/test/recipes/25-test_verify.t index 271f499690bf..673c3d5f1772 100644 --- a/crypto/openssl/test/recipes/25-test_verify.t +++ b/crypto/openssl/test/recipes/25-test_verify.t @@ -602,9 +602,10 @@ ok(vfy_root("-CAfile", $rootcert), "CAfile"); ok(vfy_root("-CAstore", $rootcert), "CAstore"); ok(vfy_root("-CAstore", $rootcert, "-CAfile", $rootcert), "CAfile and existing CAstore"); ok(!vfy_root("-CAstore", "non-existing", "-CAfile", $rootcert), "CAfile and non-existing CAstore"); + SKIP: { - skip "file names with colons aren't supported on Windows and VMS", 2 - if $^O =~ /^(MsWin32|VMS)$/; + skip "file names with colons aren't supported on Windows and VMS", 1 + if $^O =~ /^(MSWin32|VMS)$/; my $foo_file = "foo:cert.pem"; copy($rootcert, $foo_file); ok(vfy_root("-CAstore", $foo_file), "CAstore foo:file"); diff --git a/crypto/openssl/test/recipes/30-test_evp_data/evpkdf_krb5.txt b/crypto/openssl/test/recipes/30-test_evp_data/evpkdf_krb5.txt index d8f6aa72a175..e2de4754fa74 100644 --- a/crypto/openssl/test/recipes/30-test_evp_data/evpkdf_krb5.txt +++ b/crypto/openssl/test/recipes/30-test_evp_data/evpkdf_krb5.txt @@ -1,5 +1,5 @@ # -# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2001-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -129,3 +129,11 @@ Ctrl.cipher = cipher:DES-EDE3-CBC Ctrl.hexkey = hexkey:dce06b1f64c857a11c3db57c51899b2cc1791008ce973b92 Ctrl.hexconstant = hexconstant:0000000155 Output = 935079d14490a75c3093c4a6e8c3b049c71e6ee705 + +#Erroneous key size for the cipher as XTS has double key size +KDF = KRB5KDF +Ctrl.cipher = cipher:AES-256-XTS +Ctrl.hexkey = hexkey:FE697B52BC0D3CE14432BA036A92E65BBB52280990A2FA27883998D72AF30161 +Ctrl.hexconstant = hexconstant:0000000255 +Output = 97151B4C76945063E2EB0529DC067D97D7BBA90776D8126D91F34F3101AEA8BA +Result = KDF_DERIVE_ERROR diff --git a/crypto/openssl/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt b/crypto/openssl/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt index 5083cc2bde24..f258700670ab 100644 --- a/crypto/openssl/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt +++ b/crypto/openssl/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt @@ -1,5 +1,5 @@ # -# Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2001-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -186,4 +186,4 @@ Output = 6a7fc08e9999fc9d50cda476e973a01a06efeb52eece1c78cb1422950476cbff67408c6 Availablein = default Sign-Message = RSA-SM3:RSA-2048 Input = "Hello World" -Output = 92657e22036214c343d8e95d129c0c47430d5a1ae452371a7847a963f533f96e018aa6658958e6a584cf0d380aa9435175cf2de3dfa60100aca893b76aa6d8f0cc9154ee982cb5ea8f19153fe8a9c801aa2da8bb4451c7ec6fd836e81ecdacf022b68294db068efa47decf3a7c548ea7088a16433029b8733b9573053b7e7122ea10b662726fc97bd149c663617434a9707b672b024f95865d91077edfb79c8ed4c8528032204c46c984a6c82b17794cbf9c4dfe4c1af1d59535f7755540ff36d6a2b55accbf046896c4aae9287a33f38c2a269a02abdac46c17b1b55ee89cc9eb3011a84916596f982c5375dd2110633be6dc43532919466d83bd0f3e406978 +Output = b74e03c18050807541bde949aa0ac91d43fb9730f0b529d5100d5776f4f446d0ca0f0992359dc5f89386ed45bc3bf52cac1f75fbcc088fc2ea77624fd962569d2d317e90886dec424fb6757c4eba1e881ddf4f7942e8003b54e05cc974558dea171ce23a2fc158f71a5621c9a2c3ce45c9af4c706d3f60efe0c0f087a6ec504f771b08e2a1d78e0316c74706c678869bf121d5da00e2e8c8dc1cd273315b4ad8ab9962c62f81cebc5fb393b7f8860ee68545578413feada82b1c2bbfabfa157e298f0354bffc1cc6aa68f058a5d34b6b70ffacd3532c6b2c6a0de059bf605edf392ac8adbf1769555a0a50b2b13c63cae98a461498fae7f0d1729b710f05f39e diff --git a/crypto/openssl/test/recipes/90-test_sslapi.t b/crypto/openssl/test/recipes/90-test_sslapi.t index 650e0d1ffb16..70c2c24d8661 100644 --- a/crypto/openssl/test/recipes/90-test_sslapi.t +++ b/crypto/openssl/test/recipes/90-test_sslapi.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2025 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the Apache License 2.0 (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -45,7 +45,10 @@ ok(run(test(["sslapitest", srctop_dir("test", "certs"), srctop_file("test", "recipes", "90-test_sslapi_data", - "dhparams.pem")])), + "dhparams.pem"), + srctop_dir("test", + "recipes", + "90-test_sslapi_data")])), "running sslapitest"); SKIP: { @@ -62,7 +65,10 @@ SKIP: { srctop_file("test", "recipes", "90-test_sslapi_data", - "dhparams.pem")])), + "dhparams.pem"), + srctop_dir("test", + "recipes", + "90-test_sslapi_data")])), "running sslapitest with default fips config"); run(test(["fips_version_test", "-config", $provconf, ">=3.1.0"]), @@ -140,7 +146,10 @@ SKIP: { srctop_file("test", "recipes", "90-test_sslapi_data", - "dhparams.pem")])), + "dhparams.pem"), + srctop_dir("test", + "recipes", + "90-test_sslapi_data")])), "running sslapitest with modified fips config"); } diff --git a/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt b/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt new file mode 100644 index 000000000000..05aed8299b0e --- /dev/null +++ b/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt @@ -0,0 +1,255 @@ +Sent TLS Record +Header: + Version = TLS 1.0 (0x301) + Content Type = Handshake (22) + Length = ? + ClientHello, Length=? + client_version=0x303 (TLS 1.2) + Random: + gmt_unix_time=0x? + random_bytes (len=28): ? + session_id (len=? + cipher_suites (len=2) + {0x13, 0x01} TLS_AES_128_GCM_SHA256 + compression_methods (len=1) + No Compression (0x00) + extensions, length = ? + extension_type=ec_point_formats(11), length=4 + uncompressed (0) + ansiX962_compressed_prime (1) + ansiX962_compressed_char2 (2) + extension_type=supported_groups(10), length=20 + MLKEM512 (512) + MLKEM768 (513) + MLKEM1024 (514) + X25519MLKEM768 (4588) + SecP256r1MLKEM768 (4587) + SecP384r1MLKEM1024 (4589) + secp521r1 (P-521) (25) + secp384r1 (P-384) (24) + secp256r1 (P-256) (23) + extension_type=session_ticket(35), length=0 + extension_type=encrypt_then_mac(22), length=0 + extension_type=extended_master_secret(23), length=0 + extension_type=signature_algorithms(13), length=? + mldsa65 (0x0905) + mldsa87 (0x0906) + mldsa44 (0x0904) + ecdsa_secp256r1_sha256 (0x0403) + ecdsa_secp384r1_sha384 (0x0503) + ecdsa_secp521r1_sha512 (0x0603) + ed25519 (0x0807) + ed448 (0x0808) + ecdsa_brainpoolP256r1tls13_sha256 (0x081a) + ecdsa_brainpoolP384r1tls13_sha384 (0x081b) + ecdsa_brainpoolP512r1tls13_sha512 (0x081c) + rsa_pss_pss_sha256 (0x0809) + rsa_pss_pss_sha384 (0x080a) + rsa_pss_pss_sha512 (0x080b) + rsa_pss_rsae_sha256 (0x0804) + rsa_pss_rsae_sha384 (0x0805) + rsa_pss_rsae_sha512 (0x0806) + rsa_pkcs1_sha256 (0x0401) + rsa_pkcs1_sha384 (0x0501) + rsa_pkcs1_sha512 (0x0601) + extension_type=supported_versions(43), length=3 + TLS 1.3 (772) + extension_type=psk_key_exchange_modes(45), length=2 + psk_dhe_ke (1) + extension_type=key_share(51), length=806 + NamedGroup: MLKEM512 (512) + key_exchange: (len=800): ? + extension_type=compress_certificate(27), length=3 + zlib (1) + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = Handshake (22) + Length = 858 + ServerHello, Length=854 + server_version=0x303 (TLS 1.2) + Random: + gmt_unix_time=0x? + random_bytes (len=28): ? + session_id (len=? + cipher_suite {0x13, 0x01} TLS_AES_128_GCM_SHA256 + compression_method: No Compression (0x00) + extensions, length = ? + extension_type=supported_versions(43), length=2 + TLS 1.3 (772) + extension_type=key_share(51), length=772 + NamedGroup: MLKEM512 (512) + key_exchange: (len=768): ? + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ChangeCipherSpec (20) + Length = 1 + change_cipher_spec (1) + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 23 + Inner Content Type = Handshake (22) + EncryptedExtensions, Length=2 + No extensions + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 839 + Inner Content Type = Handshake (22) + Certificate, Length=818 + context (len=0): + certificate_list, length=814 + ASN.1Cert, length=809 +------details----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 2 (0x2) + Signature Algorithm: sha256WithRSAEncryption + Issuer: CN = Root CA + Validity + Not Before: Jan 14 22:29:46 2016 GMT + Not After : Jan 15 22:29:46 2116 GMT + Subject: CN = server.example + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:d5:5d:60:6a:df:fc:61:ee:48:aa:8c:11:48:43: + a5:6d:b6:52:5d:aa:98:49:b1:61:92:35:b1:fc:3a: + 04:25:0c:6d:79:ff:b4:d5:c9:e9:5c:1c:3b:e0:ab: + b3:b8:7d:a3:de:6d:bd:e0:dd:d7:5a:bf:14:47:11: + 42:5e:a6:82:d0:61:c1:7f:dd:13:46:e6:09:85:07: + 0e:f2:d4:fc:1a:64:d2:0a:ad:20:ab:20:6b:96:f0: + ad:cc:c4:19:53:55:dc:01:1d:a4:b3:ef:8a:b4:49: + 53:5d:8a:05:1c:f1:dc:e1:44:bf:c5:d7:e2:77:19: + 57:5c:97:0b:75:ee:88:43:71:0f:ca:6c:c1:b4:b2: + 50:a7:77:46:6c:58:0f:11:bf:f1:76:24:5a:ae:39: + 42:b7:51:67:29:e1:d0:55:30:6f:17:e4:91:ea:ad: + f8:28:c2:43:6f:a2:64:a9:fb:9d:98:92:62:48:3e: + eb:0d:4f:82:4a:8a:ff:3f:72:ee:96:b5:ae:a1:c1: + 98:ba:ef:7d:90:75:6d:ff:5a:52:9e:ab:f5:c0:7e: + d0:87:43:db:85:07:07:0f:7d:38:7a:fd:d1:d3:ee: + 65:1d:d3:ea:39:6a:87:37:ee:4a:d3:e0:0d:6e:f5: + 70:ac:c2:bd:f1:6e:f3:92:95:5e:a9:f0:a1:65:95: + 93:8d + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + C0:E7:84:BF:E8:59:27:33:10:B0:52:4F:51:52:2F:06:D6:C0:7A:CD + X509v3 Authority Key Identifier: + 70:7F:2E:AE:83:68:59:98:04:23:2A:CD:EB:3E:17:CD:24:DD:01:49 + X509v3 Basic Constraints: + CA:FALSE + X509v3 Extended Key Usage: + TLS Web Server Authentication + X509v3 Subject Alternative Name: + DNS:server.example + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 7b:d3:04:43:75:8a:0f:11:ae:c4:fb:d7:a1:a2:9e:fe:20:18: + d5:f4:2f:31:88:46:b6:75:8c:ee:e5:9b:97:a6:b9:a3:cd:60: + 9a:46:c3:48:97:e5:97:68:f7:5a:86:35:73:d9:69:9e:f9:5f: + 74:b9:e6:94:13:01:cb:6a:dc:e3:c4:04:e9:65:da:9c:a4:8b: + 28:f3:f9:9a:7f:bf:97:1f:45:92:e5:05:b1:56:e6:0b:f6:47: + de:1e:89:b6:2b:e1:4d:df:4a:7e:01:d3:23:dc:97:8c:47:fe: + 5f:c7:cc:98:46:0e:c4:83:5b:ca:8a:f1:52:09:be:6b:ec:3f: + 09:8b:d0:93:02:bf:e1:51:e7:d1:7e:34:56:19:74:d0:ff:28: + 25:de:b7:9f:56:52:91:7d:20:29:85:0a:80:44:5f:71:32:25: + 71:0f:c2:16:e2:5f:6b:1d:3f:32:5b:0a:3c:74:1c:b9:62:f1: + ed:07:50:a3:6d:b4:b4:31:0a:c0:53:44:6a:3a:88:84:8b:2d: + a9:b0:37:8e:e6:18:36:bd:9a:20:40:0f:01:92:8b:3d:aa:61: + e7:ae:2c:ed:36:cd:3a:07:86:74:3a:29:b3:d7:3a:b4:00:a9: + c2:f5:92:78:0e:e2:0f:a3:fe:bb:be:e0:06:53:84:59:1d:90: + 69:e5:b6:f9 +-----BEGIN CERTIFICATE----- +MIIDJTCCAg2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290 +IENBMCAXDTE2MDExNDIyMjk0NloYDzIxMTYwMTE1MjIyOTQ2WjAZMRcwFQYDVQQD +DA5zZXJ2ZXIuZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +ANVdYGrf/GHuSKqMEUhDpW22Ul2qmEmxYZI1sfw6BCUMbXn/tNXJ6VwcO+Crs7h9 +o95tveDd11q/FEcRQl6mgtBhwX/dE0bmCYUHDvLU/Bpk0gqtIKsga5bwrczEGVNV +3AEdpLPvirRJU12KBRzx3OFEv8XX4ncZV1yXC3XuiENxD8pswbSyUKd3RmxYDxG/ +8XYkWq45QrdRZynh0FUwbxfkkeqt+CjCQ2+iZKn7nZiSYkg+6w1PgkqK/z9y7pa1 +rqHBmLrvfZB1bf9aUp6r9cB+0IdD24UHBw99OHr90dPuZR3T6jlqhzfuStPgDW71 +cKzCvfFu85KVXqnwoWWVk40CAwEAAaN9MHswHQYDVR0OBBYEFMDnhL/oWSczELBS +T1FSLwbWwHrNMB8GA1UdIwQYMBaAFHB/Lq6DaFmYBCMqzes+F80k3QFJMAkGA1Ud +EwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwGQYDVR0RBBIwEIIOc2VydmVyLmV4 +YW1wbGUwDQYJKoZIhvcNAQELBQADggEBAHvTBEN1ig8RrsT716Ginv4gGNX0LzGI +RrZ1jO7lm5emuaPNYJpGw0iX5Zdo91qGNXPZaZ75X3S55pQTActq3OPEBOll2pyk +iyjz+Zp/v5cfRZLlBbFW5gv2R94eibYr4U3fSn4B0yPcl4xH/l/HzJhGDsSDW8qK +8VIJvmvsPwmL0JMCv+FR59F+NFYZdND/KCXet59WUpF9ICmFCoBEX3EyJXEPwhbi +X2sdPzJbCjx0HLli8e0HUKNttLQxCsBTRGo6iISLLamwN47mGDa9miBADwGSiz2q +YeeuLO02zToHhnQ6KbPXOrQAqcL1kngO4g+j/ru+4AZThFkdkGnltvk= +-----END CERTIFICATE----- +------------------ + No extensions + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 281 + Inner Content Type = Handshake (22) + CertificateVerify, Length=260 + Signature Algorithm: rsa_pss_rsae_sha256 (0x0804) + Signature (len=256): ? + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 53 + Inner Content Type = Handshake (22) + Finished, Length=32 + verify_data (len=32): ? + +Sent TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ChangeCipherSpec (20) + Length = 1 + change_cipher_spec (1) + +Sent TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 53 + Inner Content Type = Handshake (22) + Finished, Length=32 + verify_data (len=32): ? + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 234 + Inner Content Type = Handshake (22) + NewSessionTicket, Length=213 + ticket_lifetime_hint=7200 + ticket_age_add=? + ticket_nonce (len=8): ? + ticket (len=192): ? + No extensions + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 234 + Inner Content Type = Handshake (22) + NewSessionTicket, Length=213 + ticket_lifetime_hint=7200 + ticket_age_add=? + ticket_nonce (len=8): ? + ticket (len=192): ? + No extensions + diff --git a/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref.txt b/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref.txt new file mode 100644 index 000000000000..5d332da235fb --- /dev/null +++ b/crypto/openssl/test/recipes/90-test_sslapi_data/ssltraceref.txt @@ -0,0 +1,253 @@ +Sent TLS Record +Header: + Version = TLS 1.0 (0x301) + Content Type = Handshake (22) + Length = ? + ClientHello, Length=? + client_version=0x303 (TLS 1.2) + Random: + gmt_unix_time=0x? + random_bytes (len=28): ? + session_id (len=? + cipher_suites (len=2) + {0x13, 0x01} TLS_AES_128_GCM_SHA256 + compression_methods (len=1) + No Compression (0x00) + extensions, length = ? + extension_type=ec_point_formats(11), length=4 + uncompressed (0) + ansiX962_compressed_prime (1) + ansiX962_compressed_char2 (2) + extension_type=supported_groups(10), length=20 + MLKEM512 (512) + MLKEM768 (513) + MLKEM1024 (514) + X25519MLKEM768 (4588) + SecP256r1MLKEM768 (4587) + SecP384r1MLKEM1024 (4589) + secp521r1 (P-521) (25) + secp384r1 (P-384) (24) + secp256r1 (P-256) (23) + extension_type=session_ticket(35), length=0 + extension_type=encrypt_then_mac(22), length=0 + extension_type=extended_master_secret(23), length=0 + extension_type=signature_algorithms(13), length=? + mldsa65 (0x0905) + mldsa87 (0x0906) + mldsa44 (0x0904) + ecdsa_secp256r1_sha256 (0x0403) + ecdsa_secp384r1_sha384 (0x0503) + ecdsa_secp521r1_sha512 (0x0603) + ed25519 (0x0807) + ed448 (0x0808) + ecdsa_brainpoolP256r1tls13_sha256 (0x081a) + ecdsa_brainpoolP384r1tls13_sha384 (0x081b) + ecdsa_brainpoolP512r1tls13_sha512 (0x081c) + rsa_pss_pss_sha256 (0x0809) + rsa_pss_pss_sha384 (0x080a) + rsa_pss_pss_sha512 (0x080b) + rsa_pss_rsae_sha256 (0x0804) + rsa_pss_rsae_sha384 (0x0805) + rsa_pss_rsae_sha512 (0x0806) + rsa_pkcs1_sha256 (0x0401) + rsa_pkcs1_sha384 (0x0501) + rsa_pkcs1_sha512 (0x0601) + extension_type=supported_versions(43), length=3 + TLS 1.3 (772) + extension_type=psk_key_exchange_modes(45), length=2 + psk_dhe_ke (1) + extension_type=key_share(51), length=806 + NamedGroup: MLKEM512 (512) + key_exchange: (len=800): ? + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = Handshake (22) + Length = 858 + ServerHello, Length=854 + server_version=0x303 (TLS 1.2) + Random: + gmt_unix_time=0x? + random_bytes (len=28): ? + session_id (len=? + cipher_suite {0x13, 0x01} TLS_AES_128_GCM_SHA256 + compression_method: No Compression (0x00) + extensions, length = ? + extension_type=supported_versions(43), length=2 + TLS 1.3 (772) + extension_type=key_share(51), length=772 + NamedGroup: MLKEM512 (512) + key_exchange: (len=768): ? + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ChangeCipherSpec (20) + Length = 1 + change_cipher_spec (1) + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 23 + Inner Content Type = Handshake (22) + EncryptedExtensions, Length=2 + No extensions + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 839 + Inner Content Type = Handshake (22) + Certificate, Length=818 + context (len=0): + certificate_list, length=814 + ASN.1Cert, length=809 +------details----- +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 2 (0x2) + Signature Algorithm: sha256WithRSAEncryption + Issuer: CN = Root CA + Validity + Not Before: Jan 14 22:29:46 2016 GMT + Not After : Jan 15 22:29:46 2116 GMT + Subject: CN = server.example + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:d5:5d:60:6a:df:fc:61:ee:48:aa:8c:11:48:43: + a5:6d:b6:52:5d:aa:98:49:b1:61:92:35:b1:fc:3a: + 04:25:0c:6d:79:ff:b4:d5:c9:e9:5c:1c:3b:e0:ab: + b3:b8:7d:a3:de:6d:bd:e0:dd:d7:5a:bf:14:47:11: + 42:5e:a6:82:d0:61:c1:7f:dd:13:46:e6:09:85:07: + 0e:f2:d4:fc:1a:64:d2:0a:ad:20:ab:20:6b:96:f0: + ad:cc:c4:19:53:55:dc:01:1d:a4:b3:ef:8a:b4:49: + 53:5d:8a:05:1c:f1:dc:e1:44:bf:c5:d7:e2:77:19: + 57:5c:97:0b:75:ee:88:43:71:0f:ca:6c:c1:b4:b2: + 50:a7:77:46:6c:58:0f:11:bf:f1:76:24:5a:ae:39: + 42:b7:51:67:29:e1:d0:55:30:6f:17:e4:91:ea:ad: + f8:28:c2:43:6f:a2:64:a9:fb:9d:98:92:62:48:3e: + eb:0d:4f:82:4a:8a:ff:3f:72:ee:96:b5:ae:a1:c1: + 98:ba:ef:7d:90:75:6d:ff:5a:52:9e:ab:f5:c0:7e: + d0:87:43:db:85:07:07:0f:7d:38:7a:fd:d1:d3:ee: + 65:1d:d3:ea:39:6a:87:37:ee:4a:d3:e0:0d:6e:f5: + 70:ac:c2:bd:f1:6e:f3:92:95:5e:a9:f0:a1:65:95: + 93:8d + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + C0:E7:84:BF:E8:59:27:33:10:B0:52:4F:51:52:2F:06:D6:C0:7A:CD + X509v3 Authority Key Identifier: + 70:7F:2E:AE:83:68:59:98:04:23:2A:CD:EB:3E:17:CD:24:DD:01:49 + X509v3 Basic Constraints: + CA:FALSE + X509v3 Extended Key Usage: + TLS Web Server Authentication + X509v3 Subject Alternative Name: + DNS:server.example + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 7b:d3:04:43:75:8a:0f:11:ae:c4:fb:d7:a1:a2:9e:fe:20:18: + d5:f4:2f:31:88:46:b6:75:8c:ee:e5:9b:97:a6:b9:a3:cd:60: + 9a:46:c3:48:97:e5:97:68:f7:5a:86:35:73:d9:69:9e:f9:5f: + 74:b9:e6:94:13:01:cb:6a:dc:e3:c4:04:e9:65:da:9c:a4:8b: + 28:f3:f9:9a:7f:bf:97:1f:45:92:e5:05:b1:56:e6:0b:f6:47: + de:1e:89:b6:2b:e1:4d:df:4a:7e:01:d3:23:dc:97:8c:47:fe: + 5f:c7:cc:98:46:0e:c4:83:5b:ca:8a:f1:52:09:be:6b:ec:3f: + 09:8b:d0:93:02:bf:e1:51:e7:d1:7e:34:56:19:74:d0:ff:28: + 25:de:b7:9f:56:52:91:7d:20:29:85:0a:80:44:5f:71:32:25: + 71:0f:c2:16:e2:5f:6b:1d:3f:32:5b:0a:3c:74:1c:b9:62:f1: + ed:07:50:a3:6d:b4:b4:31:0a:c0:53:44:6a:3a:88:84:8b:2d: + a9:b0:37:8e:e6:18:36:bd:9a:20:40:0f:01:92:8b:3d:aa:61: + e7:ae:2c:ed:36:cd:3a:07:86:74:3a:29:b3:d7:3a:b4:00:a9: + c2:f5:92:78:0e:e2:0f:a3:fe:bb:be:e0:06:53:84:59:1d:90: + 69:e5:b6:f9 +-----BEGIN CERTIFICATE----- +MIIDJTCCAg2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290 +IENBMCAXDTE2MDExNDIyMjk0NloYDzIxMTYwMTE1MjIyOTQ2WjAZMRcwFQYDVQQD +DA5zZXJ2ZXIuZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +ANVdYGrf/GHuSKqMEUhDpW22Ul2qmEmxYZI1sfw6BCUMbXn/tNXJ6VwcO+Crs7h9 +o95tveDd11q/FEcRQl6mgtBhwX/dE0bmCYUHDvLU/Bpk0gqtIKsga5bwrczEGVNV +3AEdpLPvirRJU12KBRzx3OFEv8XX4ncZV1yXC3XuiENxD8pswbSyUKd3RmxYDxG/ +8XYkWq45QrdRZynh0FUwbxfkkeqt+CjCQ2+iZKn7nZiSYkg+6w1PgkqK/z9y7pa1 +rqHBmLrvfZB1bf9aUp6r9cB+0IdD24UHBw99OHr90dPuZR3T6jlqhzfuStPgDW71 +cKzCvfFu85KVXqnwoWWVk40CAwEAAaN9MHswHQYDVR0OBBYEFMDnhL/oWSczELBS +T1FSLwbWwHrNMB8GA1UdIwQYMBaAFHB/Lq6DaFmYBCMqzes+F80k3QFJMAkGA1Ud +EwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwGQYDVR0RBBIwEIIOc2VydmVyLmV4 +YW1wbGUwDQYJKoZIhvcNAQELBQADggEBAHvTBEN1ig8RrsT716Ginv4gGNX0LzGI +RrZ1jO7lm5emuaPNYJpGw0iX5Zdo91qGNXPZaZ75X3S55pQTActq3OPEBOll2pyk +iyjz+Zp/v5cfRZLlBbFW5gv2R94eibYr4U3fSn4B0yPcl4xH/l/HzJhGDsSDW8qK +8VIJvmvsPwmL0JMCv+FR59F+NFYZdND/KCXet59WUpF9ICmFCoBEX3EyJXEPwhbi +X2sdPzJbCjx0HLli8e0HUKNttLQxCsBTRGo6iISLLamwN47mGDa9miBADwGSiz2q +YeeuLO02zToHhnQ6KbPXOrQAqcL1kngO4g+j/ru+4AZThFkdkGnltvk= +-----END CERTIFICATE----- +------------------ + No extensions + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 281 + Inner Content Type = Handshake (22) + CertificateVerify, Length=260 + Signature Algorithm: rsa_pss_rsae_sha256 (0x0804) + Signature (len=256): ? + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 53 + Inner Content Type = Handshake (22) + Finished, Length=32 + verify_data (len=32): ? + +Sent TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ChangeCipherSpec (20) + Length = 1 + change_cipher_spec (1) + +Sent TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 53 + Inner Content Type = Handshake (22) + Finished, Length=32 + verify_data (len=32): ? + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 234 + Inner Content Type = Handshake (22) + NewSessionTicket, Length=213 + ticket_lifetime_hint=7200 + ticket_age_add=? + ticket_nonce (len=8): ? + ticket (len=192): ? + No extensions + +Received TLS Record +Header: + Version = TLS 1.2 (0x303) + Content Type = ApplicationData (23) + Length = 234 + Inner Content Type = Handshake (22) + NewSessionTicket, Length=213 + ticket_lifetime_hint=7200 + ticket_age_add=? + ticket_nonce (len=8): ? + ticket (len=192): ? + No extensions + diff --git a/crypto/openssl/test/sslapitest.c b/crypto/openssl/test/sslapitest.c index b83dd6c552de..fbe284b9ff1e 100644 --- a/crypto/openssl/test/sslapitest.c +++ b/crypto/openssl/test/sslapitest.c @@ -98,6 +98,7 @@ static char *privkey8192 = NULL; static char *srpvfile = NULL; static char *tmpfilename = NULL; static char *dhfile = NULL; +static char *datadir = NULL; static int is_fips = 0; static int fips_ems_check = 0; @@ -120,6 +121,15 @@ static X509 *ocspcert = NULL; #define CLIENT_VERSION_LEN 2 +/* The ssltrace test assumes some options are switched on/off */ +#if !defined(OPENSSL_NO_SSL_TRACE) \ + && defined(OPENSSL_NO_BROTLI) && defined(OPENSSL_NO_ZSTD) \ + && !defined(OPENSSL_NO_ECX) && !defined(OPENSSL_NO_DH) \ + && !defined(OPENSSL_NO_ML_DSA) && !defined(OPENSSL_NO_ML_KEM) \ + && !defined(OPENSSL_NO_TLS1_3) +# define DO_SSL_TRACE_TEST +#endif + /* * This structure is used to validate that the correct number of log messages * of various types are emitted when emitting secret logs. @@ -13269,6 +13279,77 @@ static int test_no_renegotiation(int idx) return testresult; } +#if defined(DO_SSL_TRACE_TEST) +/* + * Tests that the SSL_trace() msg_callback works as expected with a PQ Groups. + */ +static int test_ssl_trace(void) +{ + SSL_CTX *sctx = NULL, *cctx = NULL; + SSL *serverssl = NULL, *clientssl = NULL; + int testresult = 0; + BIO *bio = NULL; + char *reffile = NULL; + char *grouplist = "MLKEM512:MLKEM768:MLKEM1024:X25519MLKEM768:SecP256r1MLKEM768" + ":SecP384r1MLKEM1024:secp521r1:secp384r1:secp256r1"; + + if (!fips_provider_version_ge(libctx, 3, 5, 0)) + return TEST_skip("FIPS provider does not support MLKEM algorithms"); + + if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), + TLS_client_method(), + TLS1_3_VERSION, TLS1_3_VERSION, + &sctx, &cctx, cert, privkey)) + || !TEST_ptr(bio = BIO_new(BIO_s_mem())) + || !TEST_true(SSL_CTX_set1_groups_list(sctx, grouplist)) + || !TEST_true(SSL_CTX_set1_groups_list(cctx, grouplist)) + || !TEST_true(SSL_CTX_set_ciphersuites(cctx, + "TLS_AES_128_GCM_SHA256")) + || !TEST_true(SSL_CTX_set_ciphersuites(sctx, + "TLS_AES_128_GCM_SHA256")) +# ifdef SSL_OP_LEGACY_EC_POINT_FORMATS + || !TEST_true(SSL_CTX_set_options(cctx, SSL_OP_LEGACY_EC_POINT_FORMATS)) + || !TEST_true(SSL_CTX_set_options(sctx, SSL_OP_LEGACY_EC_POINT_FORMATS)) +# endif + || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, + NULL, NULL))) + goto err; + + SSL_set_msg_callback(clientssl, SSL_trace); + SSL_set_msg_callback_arg(clientssl, bio); + + if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))) + goto err; + + /* Skip the comparison of the trace when the fips provider is used. */ + if (is_fips) { + /* Check whether there was something written. */ + if (!TEST_int_gt(BIO_pending(bio), 0)) + goto err; + } else { + +# ifdef OPENSSL_NO_ZLIB + reffile = test_mk_file_path(datadir, "ssltraceref.txt"); +# else + reffile = test_mk_file_path(datadir, "ssltraceref-zlib.txt"); +# endif + if (!TEST_true(compare_with_reference_file(bio, reffile))) + goto err; + } + + testresult = 1; + err: + BIO_free(bio); + SSL_free(serverssl); + SSL_free(clientssl); + SSL_CTX_free(sctx); + SSL_CTX_free(cctx); + OPENSSL_free(reffile); + + return testresult; +} +#endif + OPT_TEST_DECLARE_USAGE("certfile privkeyfile srpvfile tmpfile provider config dhfile\n") int setup_tests(void) @@ -13303,6 +13384,8 @@ int setup_tests(void) || !TEST_ptr(dhfile = test_get_argument(5))) return 0; + datadir = test_get_argument(6); + if (!TEST_true(OSSL_LIB_CTX_load_config(libctx, configfile))) return 0; @@ -13598,6 +13681,10 @@ int setup_tests(void) ADD_TEST(test_quic_tls_early_data); #endif ADD_ALL_TESTS(test_no_renegotiation, 2); +#if defined(DO_SSL_TRACE_TEST) + if (datadir != NULL) + ADD_TEST(test_ssl_trace); +#endif return 1; err: diff --git a/crypto/openssl/test/testutil.h b/crypto/openssl/test/testutil.h index f02dcdfba6f9..a262d9371955 100644 --- a/crypto/openssl/test/testutil.h +++ b/crypto/openssl/test/testutil.h @@ -652,4 +652,6 @@ X509 *load_cert_der(const unsigned char *bytes, int len); STACK_OF(X509) *load_certs_pem(const char *file); X509_REQ *load_csr_der(const char *file, OSSL_LIB_CTX *libctx); time_t test_asn1_string_to_time_t(const char *asn1_string); + +int compare_with_reference_file(BIO *membio, const char *reffile); #endif /* OSSL_TESTUTIL_H */ diff --git a/crypto/openssl/test/testutil/compare.c b/crypto/openssl/test/testutil/compare.c new file mode 100644 index 000000000000..067fb878b58e --- /dev/null +++ b/crypto/openssl/test/testutil/compare.c @@ -0,0 +1,88 @@ +/* + * Copyright 2017-2025 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include "../testutil.h" + +static void strip_line_ends(char *str) +{ + size_t i; + + for (i = strlen(str); + i > 0 && (str[i - 1] == '\n' || str[i - 1] == '\r'); + i--); + + str[i] = '\0'; +} + +int compare_with_reference_file(BIO *membio, const char *reffile) +{ + BIO *file = NULL, *newfile = NULL; + char buf1[8192], buf2[8192]; + int ret = 0; + size_t i; + + if (!TEST_ptr(reffile)) + goto err; + + file = BIO_new_file(reffile, "rb"); + if (!TEST_ptr(file)) + goto err; + + newfile = BIO_new_file("ssltraceref-new.txt", "wb"); + if (!TEST_ptr(newfile)) + goto err; + + while (BIO_gets(membio, buf2, sizeof(buf2)) > 0) + if (BIO_puts(newfile, buf2) <= 0) { + TEST_error("Failed writing new file data"); + goto err; + } + + if (!TEST_int_ge(BIO_seek(membio, 0), 0)) + goto err; + + while (BIO_gets(file, buf1, sizeof(buf1)) > 0) { + size_t line_len; + + if (BIO_gets(membio, buf2, sizeof(buf2)) <= 0) { + TEST_error("Failed reading mem data"); + goto err; + } + strip_line_ends(buf1); + strip_line_ends(buf2); + line_len = strlen(buf1); + if (line_len > 0 && buf1[line_len - 1] == '?') { + /* Wildcard at the EOL means ignore anything after it */ + if (strlen(buf2) > line_len) + buf2[line_len] = '\0'; + } + if (line_len != strlen(buf2)) { + TEST_error("Actual and ref line data length mismatch"); + TEST_info("%s", buf1); + TEST_info("%s", buf2); + goto err; + } + for (i = 0; i < line_len; i++) { + /* '?' is a wild card character in the reference text */ + if (buf1[i] == '?') + buf2[i] = '?'; + } + if (!TEST_str_eq(buf1, buf2)) + goto err; + } + if (!TEST_true(BIO_eof(file)) + || !TEST_true(BIO_eof(membio))) + goto err; + + ret = 1; + err: + BIO_free(file); + BIO_free(newfile); + return ret; +} diff --git a/crypto/openssl/test/threadstest.c b/crypto/openssl/test/threadstest.c index 38401911d87f..d33ad46999c6 100644 --- a/crypto/openssl/test/threadstest.c +++ b/crypto/openssl/test/threadstest.c @@ -183,13 +183,16 @@ static void rwreader_fn(int *iterations) CRYPTO_atomic_add(&rwwriter2_done, 0, &lw2, atomiclock); count++; - if (rwwriter_ptr != NULL && old > *rwwriter_ptr) { - TEST_info("rwwriter pointer went backwards\n"); - rw_torture_result = 0; + if (rwwriter_ptr != NULL) { + if (old > *rwwriter_ptr) { + TEST_info("rwwriter pointer went backwards! %d : %d\n", + old, *rwwriter_ptr); + rw_torture_result = 0; + } + old = *rwwriter_ptr; } if (CRYPTO_THREAD_unlock(rwtorturelock) == 0) abort(); - *iterations = count; if (rw_torture_result == 0) { *iterations = count; return; diff --git a/crypto/openssl/test/wpackettest.c b/crypto/openssl/test/wpackettest.c index bd696e007407..c6d6faf5c485 100644 --- a/crypto/openssl/test/wpackettest.c +++ b/crypto/openssl/test/wpackettest.c @@ -588,7 +588,7 @@ static int test_WPACKET_quic_vlint_random(void) for (i = 0; i < 10000; ++i) { if (!TEST_int_gt(RAND_bytes(rand_data, sizeof(rand_data)), 0)) - return cleanup(&pkt); + return 0; memcpy(&expected, rand_data, sizeof(expected)); diff --git a/include/resolv.h b/include/resolv.h index f32f52bab431..6ef79601b5f8 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -188,7 +188,7 @@ struct __res_state { struct __res_state_ext *ext; /*%< extension for IPv6 */ } _ext; } _u; - u_char *_rnd; /*%< PRIVATE: random state */ + u_char *_rnd; /*%< PRIVATE: random state (unused) */ }; typedef struct __res_state *res_state; @@ -380,7 +380,6 @@ extern const struct res_sym __p_rcode_syms[]; #define res_nisourserver __res_nisourserver #define res_ownok __res_ownok #define res_queriesmatch __res_queriesmatch -#define res_rndinit __res_rndinit #define res_randomid __res_randomid #define res_nrandomid __res_nrandomid #define sym_ntop __sym_ntop @@ -445,7 +444,6 @@ int dn_count_labels(const char *); int dn_comp(const char *, u_char *, int, u_char **, u_char **); int dn_expand(const u_char *, const u_char *, const u_char *, char *, int); -void res_rndinit(res_state); u_int res_randomid(void); u_int res_nrandomid(res_state); int res_nameinquery(const char *, int, int, const u_char *, diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index bcc3f75206bc..14fa242bc9e5 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -1,7 +1,9 @@ +PACKAGE= kerberos-lib + LIB= hdb LDFLAGS+= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map -LIBADD= asn1 com_err krb5 roken sqlite3 +LIBADD= asn1 com_err krb5 roken sqlite3 heimbase LDADD= ${LDAPLDADD} DPADD= ${LDAPDPADD} @@ -74,6 +76,7 @@ GEN= asn1_Salt.x \ asn1_HDB_Ext_Lan_Manager_OWF.x \ asn1_HDB_Ext_Password.x \ asn1_HDB_Ext_Aliases.x \ + asn1_HDB_Ext_KeySet.x \ asn1_HDB_extension.x \ asn1_HDB_extensions.x \ asn1_hdb_entry.x \ diff --git a/lib/libc/Makefile b/lib/libc/Makefile index d0c254e33396..8705568f6d34 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -109,7 +109,6 @@ NOASM= .include "${LIBC_SRCTOP}/inet/Makefile.inc" .include "${LIBC_SRCTOP}/isc/Makefile.inc" .include "${LIBC_SRCTOP}/locale/Makefile.inc" -.include "${LIBC_SRCTOP}/md/Makefile.inc" .include "${LIBC_SRCTOP}/nameser/Makefile.inc" .include "${LIBC_SRCTOP}/net/Makefile.inc" .include "${LIBC_SRCTOP}/nls/Makefile.inc" diff --git a/lib/libc/gen/_rand48.c b/lib/libc/gen/_rand48.c index 990e2c86949b..114c1595b33d 100644 --- a/lib/libc/gen/_rand48.c +++ b/lib/libc/gen/_rand48.c @@ -13,34 +13,6 @@ #include "rand48.h" -unsigned short _rand48_seed[3] = { - RAND48_SEED_0, - RAND48_SEED_1, - RAND48_SEED_2 -}; -unsigned short _rand48_mult[3] = { - RAND48_MULT_0, - RAND48_MULT_1, - RAND48_MULT_2 -}; -unsigned short _rand48_add = RAND48_ADD; - -void -_dorand48(unsigned short xseed[3]) -{ - unsigned long accu; - unsigned short temp[2]; - - accu = (unsigned long) _rand48_mult[0] * (unsigned long) xseed[0] + - (unsigned long) _rand48_add; - temp[0] = (unsigned short) accu; /* lower 16 bits */ - accu >>= sizeof(unsigned short) * 8; - accu += (unsigned long) _rand48_mult[0] * (unsigned long) xseed[1] + - (unsigned long) _rand48_mult[1] * (unsigned long) xseed[0]; - temp[1] = (unsigned short) accu; /* middle 16 bits */ - accu >>= sizeof(unsigned short) * 8; - accu += _rand48_mult[0] * xseed[2] + _rand48_mult[1] * xseed[1] + _rand48_mult[2] * xseed[0]; - xseed[0] = temp[0]; - xseed[1] = temp[1]; - xseed[2] = (unsigned short) accu; -} +uint48 _rand48_seed = RAND48_SEED; +uint48 _rand48_mult = RAND48_MULT; +uint48 _rand48_add = RAND48_ADD; diff --git a/lib/libc/gen/drand48.c b/lib/libc/gen/drand48.c index cec04a6a2425..f7f43ff20468 100644 --- a/lib/libc/gen/drand48.c +++ b/lib/libc/gen/drand48.c @@ -13,10 +13,10 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; - double drand48(void) { - return erand48(_rand48_seed); + ERAND48_BEGIN; + _DORAND48(_rand48_seed); + ERAND48_END(_rand48_seed); } diff --git a/lib/libc/gen/erand48.c b/lib/libc/gen/erand48.c index 286904c27839..38d4774a9fe6 100644 --- a/lib/libc/gen/erand48.c +++ b/lib/libc/gen/erand48.c @@ -16,8 +16,9 @@ double erand48(unsigned short xseed[3]) { - _dorand48(xseed); - return ldexp((double) xseed[0], -48) + - ldexp((double) xseed[1], -32) + - ldexp((double) xseed[2], -16); + uint48 tmp; + + ERAND48_BEGIN; + DORAND48(tmp, xseed); + ERAND48_END(tmp); } diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3 index ee558b892c8c..da304e59ee72 100644 --- a/lib/libc/gen/fts.3 +++ b/lib/libc/gen/fts.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 30, 2025 +.Dd October 6, 2025 .Dt FTS 3 .Os .Sh NAME @@ -69,14 +69,15 @@ on a file hierarchy, which is then supplied to the other .Nm functions. -The function +The .Fn fts_read -returns a pointer to a structure describing one of the files in the file -hierarchy. -The function +function returns a pointer to a structure describing one of the files +in the file hierarchy. +The .Fn fts_children -returns a pointer to a linked list of structures, each of which describes -one of the files contained in a directory in the hierarchy. +function returns a pointer to a linked list of structures, each of +which describes one of the files contained in a directory in the +hierarchy. In general, directories are visited two distinguishable times; in pre-order (before any of their descendants are visited) and in post-order (after all of their descendants have been visited). @@ -376,7 +377,44 @@ The .Fa fts_name field is always .Dv NUL Ns -terminated . -.Sh FTS_OPEN +.Ss Thread Safety +The +.Nm +functions can safely be used in multi-threaded programs provided no +two threads access the same +.Vt FTS +or +.Vt FTSENT +structure simultaneously. +However, unless the +.Dv FTS_NOCHDIR +flag was passed to +.Fn fts_open +or +.Fn fts_open_b , +calls to +.Fn fts_read +and +.Fn fts_children +may change the current working directory, which will affect all +threads. +Conversely, changing the current working directory either during or +between calls to +.Fn fts_read +or +.Fn fts_children +(even in a single-thread program) may cause +.Nm +to malfunction unless the +.Dv FTS_NOCHDIR +flag was passed to +.Fn fts_open +or +.Fn fts_open_b +and all paths in +.Va path_argv +were absolute. +.Ss Fn fts_open The .Fn fts_open function takes a pointer to an array of character pointers naming one @@ -507,10 +545,10 @@ from descending into directories that have a different device number than the file from which the descent began. .El .Pp -The argument -.Fn compar -specifies a user-defined function which may be used to order the traversal -of the hierarchy. +The +.Fa compar +argument points to a user-defined function which may be used to order +the traversal of the hierarchy. It takes two pointers to pointers to .Vt FTSENT @@ -545,7 +583,7 @@ the directory traversal order is in the order listed in .Fa path_argv for the root paths, and in the order listed in the directory for everything else. -.Sh FTS_OPEN_B +.Ss Fn fts_open_b The .Fn fts_open_b function is identical to @@ -554,7 +592,7 @@ except that it takes a block pointer instead of a function pointer. The block is copied before .Fn fts_open_b returns, so the original can safely go out of scope or be released. -.Sh FTS_READ +.Ss Fn fts_read The .Fn fts_read function returns a pointer to an @@ -588,6 +626,15 @@ structure is returned, and .Va errno may or may not have been set (see .Fa fts_info ) . +Note that +.Fn fts_read +will not set +.Va errno +to 0 if called again with the same +.Fa ftsp +argument after the +.Dv FTS_STOP +flag has been set or the end of the stream has been reached. .Pp The .Vt FTSENT @@ -602,10 +649,10 @@ directory, in which case they will not be overwritten until after a call to .Fn fts_read after the .Vt FTSENT -structure has been returned by the function +structure has been returned by the .Fn fts_read -in post-order. -.Sh FTS_CHILDREN +function in post-order. +.Ss Fn fts_children The .Fn fts_children function returns a pointer to an @@ -679,11 +726,11 @@ and .Fa fts_namelen fields. .El -.Sh FTS_SET -The function +.Ss Fn fts_set +The .Fn fts_set -allows the user application to determine further processing for the -file +function allows the user application to determine further processing +for the file .Fa f of the stream .Fa ftsp . @@ -749,7 +796,40 @@ The file may be one of those most recently returned by either or .Fn fts_read . .El -.Sh FTS_CLOSE +.Ss Fn fts_set_clientptr , Fn fts_get_clientptr +The +.Fn fts_set_clientptr +function sets the client data pointer for the stream +.Fa ftsp +to +.Fa clientdata . +The +.Fn fts_get_clientptr +function returns the client data pointer associated with +.Fa ftsp . +This can be used to pass per-stream data to the comparison function. +.Pp +For performance reasons, +.Fn fts_get_clientptr +may be shadowed by a preprocessor macro. +.Ss Fn fts_get_stream +The +.Fn fts_get_stream +function returns the +.Nm +stream associated with the file entry +.Fa f . +A typical use for this would be for a comparison function to first call +.Fn fts_get_stream +on one of its arguments, then call +.Fn fts_get_clientptr +to obtain the client data pointer, which in turn points to information +necessary to correctly order the two entries. +.Pp +For performance reasons, +.Fn fts_get_stream +may be shadowed by a preprocessor macro. +.Ss Fn fts_close The .Fn fts_close function closes a file hierarchy stream @@ -760,6 +840,75 @@ or .Fn fts_open_b was called to open .Fa ftsp . +.Sh RETURN VALUES +The +.Fn fts_open +and +.Fn fts_open_b +functions return a pointer to the new +.Nm +stream on success and +.Dv NULL +on failure. +.Pp +The +.Fn fts_read +function returns a pointer to the next file entry on success, or if an +error occurs that relates specifically to that file entry. +On reaching the end of the file hierarchy, it returns +.Dv NULL +and sets the external variable +.Va errno +to 0. +On failure, it returns +.Dv NULL +and sets +.Va errno +to an appropriate non-zero value. +If called again after the +.Dv FTS_STOP +flag has been set or the end of the stream has been reached, +.Fn fts_read +returns +.Dv NULL +and leaves +.Va errno +untouched. +.Pp +The +.Fn fts_children +function returns a pointer to a linked list of file entries on +success. +On reaching the end of the file hierarchy, it returns +.Dv NULL +and sets the external variable +.Va errno +to 0. +On failure, it returns +.Dv NULL +and sets +.Va errno +to an appropriate non-zero value. +.Pp +The +.Fn fts_set +function returns 0 on success and \-1 if its +.Fa instr +argument is invalid. +.Pp +The +.Fn fts_get_clientptr +function returns the client data pointer associated with its argument, +or +.Dv NULL +if none has been set. +.Pp +The +.Fn fts_get_stream +function returns a pointer to the +.Nm +stream associated with its argument. +.Pp The .Fn fts_close function @@ -816,7 +965,7 @@ functions may fail and set as follows: .Bl -tag -width Er .It Bq Er EINVAL -The options were invalid, or the list were empty. +The options were invalid, or the list was empty. .El .Sh SEE ALSO .Xr find 1 , diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index cce959ba836a..4aa386d777cd 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -106,7 +106,6 @@ struct _fts_private { * This assumption only holds for UFS-like filesystems that implement * links and directories this way, so we must punt for others. */ - static const char *ufslike_filesystems[] = { "ufs", "zfs", @@ -679,7 +678,6 @@ fts_children(FTS *sp, int instr) void * (fts_get_clientptr)(FTS *sp) { - return (fts_get_clientptr(sp)); } @@ -696,7 +694,6 @@ FTS * void fts_set_clientptr(FTS *sp, void *clientptr) { - sp->fts_clientptr = clientptr; } diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c index 0a9f780a9e5c..93442439d49e 100644 --- a/lib/libc/gen/jrand48.c +++ b/lib/libc/gen/jrand48.c @@ -11,14 +11,13 @@ * to anyone/anything when using this software. */ -#include <stdint.h> - #include "rand48.h" long jrand48(unsigned short xseed[3]) { + uint48 tmp; - _dorand48(xseed); - return ((int32_t)(((uint32_t)xseed[2] << 16) | (uint32_t)xseed[1])); + DORAND48(tmp, xseed); + return ((int)((tmp >> 16) & 0xffffffff)); } diff --git a/lib/libc/gen/lcong48.c b/lib/libc/gen/lcong48.c index f13826b3d3f3..871b2110ed94 100644 --- a/lib/libc/gen/lcong48.c +++ b/lib/libc/gen/lcong48.c @@ -13,18 +13,10 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; -extern unsigned short _rand48_mult[3]; -extern unsigned short _rand48_add; - void lcong48(unsigned short p[7]) { - _rand48_seed[0] = p[0]; - _rand48_seed[1] = p[1]; - _rand48_seed[2] = p[2]; - _rand48_mult[0] = p[3]; - _rand48_mult[1] = p[4]; - _rand48_mult[2] = p[5]; + LOADRAND48(_rand48_seed, &p[0]); + LOADRAND48(_rand48_mult, &p[3]); _rand48_add = p[6]; } diff --git a/lib/libc/gen/lrand48.c b/lib/libc/gen/lrand48.c index a3d0111cf4d5..cc07044b8af9 100644 --- a/lib/libc/gen/lrand48.c +++ b/lib/libc/gen/lrand48.c @@ -13,11 +13,9 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; - long lrand48(void) { - _dorand48(_rand48_seed); - return ((long) _rand48_seed[2] << 15) + ((long) _rand48_seed[1] >> 1); + _DORAND48(_rand48_seed); + return (_rand48_seed >> 17) & 0x7fffffff; } diff --git a/lib/libc/gen/mrand48.c b/lib/libc/gen/mrand48.c index 15b0bfb1bd6e..f9128a6d4188 100644 --- a/lib/libc/gen/mrand48.c +++ b/lib/libc/gen/mrand48.c @@ -15,13 +15,9 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; - long mrand48(void) { - - _dorand48(_rand48_seed); - return ((int32_t)(((uint32_t)_rand48_seed[2] << 16) | - (uint32_t)_rand48_seed[1])); + _DORAND48(_rand48_seed); + return ((int)((_rand48_seed >> 16) & 0xffffffff)); } diff --git a/lib/libc/gen/nrand48.c b/lib/libc/gen/nrand48.c index 6c54065e7e0f..f6f4e231105c 100644 --- a/lib/libc/gen/nrand48.c +++ b/lib/libc/gen/nrand48.c @@ -16,6 +16,8 @@ long nrand48(unsigned short xseed[3]) { - _dorand48(xseed); - return ((long) xseed[2] << 15) + ((long) xseed[1] >> 1); + uint48 tmp; + + DORAND48(tmp, xseed); + return ((tmp >> 17) & 0x7fffffff); } diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3 index 1e47c843058e..3ea649354270 100644 --- a/lib/libc/gen/rand48.3 +++ b/lib/libc/gen/rand48.3 @@ -9,7 +9,7 @@ .\" of any kind. I shall in no event be liable for anything that happens .\" to anyone/anything when using this software. .\" -.Dd September 4, 2012 +.Dd September 11, 2025 .Dt RAND48 3 .Os .Sh NAME @@ -183,5 +183,8 @@ generator calls. .Xr arc4random 3 , .Xr rand 3 , .Xr random 3 +.Sh STANDARDS +The functions described in this page are expected to conform to +.St -p1003.1-2008 . .Sh AUTHORS .An Martin Birgmeier diff --git a/lib/libc/gen/rand48.h b/lib/libc/gen/rand48.h index 9861e99683cb..d3326e851491 100644 --- a/lib/libc/gen/rand48.h +++ b/lib/libc/gen/rand48.h @@ -14,10 +14,11 @@ #ifndef _RAND48_H_ #define _RAND48_H_ +#include <sys/types.h> #include <math.h> #include <stdlib.h> -void _dorand48(unsigned short[3]); +#include "fpmath.h" #define RAND48_SEED_0 (0x330e) #define RAND48_SEED_1 (0xabcd) @@ -27,4 +28,62 @@ void _dorand48(unsigned short[3]); #define RAND48_MULT_2 (0x0005) #define RAND48_ADD (0x000b) +typedef uint64_t uint48; + +extern uint48 _rand48_seed; +extern uint48 _rand48_mult; +extern uint48 _rand48_add; + +#define TOUINT48(x, y, z) \ + ((uint48)(x) + (((uint48)(y)) << 16) + (((uint48)(z)) << 32)) + +#define RAND48_SEED TOUINT48(RAND48_SEED_0, RAND48_SEED_1, RAND48_SEED_2) +#define RAND48_MULT TOUINT48(RAND48_MULT_0, RAND48_MULT_1, RAND48_MULT_2) + +#define LOADRAND48(l, x) do { \ + (l) = TOUINT48((x)[0], (x)[1], (x)[2]); \ +} while (0) + +#define STORERAND48(l, x) do { \ + (x)[0] = (unsigned short)(l); \ + (x)[1] = (unsigned short)((l) >> 16); \ + (x)[2] = (unsigned short)((l) >> 32); \ +} while (0) + +#define _DORAND48(l) do { \ + (l) = (l) * _rand48_mult + _rand48_add; \ +} while (0) + +#define DORAND48(l, x) do { \ + LOADRAND48(l, x); \ + _DORAND48(l); \ + STORERAND48(l, x); \ +} while (0) + +#define ERAND48_BEGIN \ + union { \ + union IEEEd2bits ieee; \ + uint64_t u64; \ + } u; \ + int s + +/* + * Optimization for speed: assume doubles are IEEE 754 and use bit fiddling + * rather than converting to double. Specifically, clamp the result to 48 bits + * and convert to a double in [0.0, 1.0) via division by 2^48. Normalize by + * shifting the most significant bit into the implicit one position and + * adjusting the exponent accordingly. The store to the exponent field + * overwrites the implicit one. + */ +#define ERAND48_END(x) do { \ + u.u64 = ((x) & 0xffffffffffffULL); \ + if (u.u64 == 0) \ + return (0.0); \ + u.u64 <<= 5; \ + for (s = 0; !(u.u64 & (1LL << 52)); s++, u.u64 <<= 1) \ + ; \ + u.ieee.bits.exp = 1022 - s; \ + return (u.ieee.d); \ +} while (0) + #endif /* _RAND48_H_ */ diff --git a/lib/libc/gen/seed48.c b/lib/libc/gen/seed48.c index 258c4bac3c9f..f57656ce1121 100644 --- a/lib/libc/gen/seed48.c +++ b/lib/libc/gen/seed48.c @@ -13,24 +13,14 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; -extern unsigned short _rand48_mult[3]; -extern unsigned short _rand48_add; - unsigned short * seed48(unsigned short xseed[3]) { static unsigned short sseed[3]; - sseed[0] = _rand48_seed[0]; - sseed[1] = _rand48_seed[1]; - sseed[2] = _rand48_seed[2]; - _rand48_seed[0] = xseed[0]; - _rand48_seed[1] = xseed[1]; - _rand48_seed[2] = xseed[2]; - _rand48_mult[0] = RAND48_MULT_0; - _rand48_mult[1] = RAND48_MULT_1; - _rand48_mult[2] = RAND48_MULT_2; + STORERAND48(_rand48_seed, sseed); + LOADRAND48(_rand48_seed, xseed); + _rand48_mult = RAND48_MULT; _rand48_add = RAND48_ADD; - return sseed; + return (sseed); } diff --git a/lib/libc/gen/srand48.c b/lib/libc/gen/srand48.c index fd369a094c51..4b82ece72db8 100644 --- a/lib/libc/gen/srand48.c +++ b/lib/libc/gen/srand48.c @@ -13,18 +13,11 @@ #include "rand48.h" -extern unsigned short _rand48_seed[3]; -extern unsigned short _rand48_mult[3]; -extern unsigned short _rand48_add; - void srand48(long seed) { - _rand48_seed[0] = RAND48_SEED_0; - _rand48_seed[1] = (unsigned short) seed; - _rand48_seed[2] = (unsigned short) (seed >> 16); - _rand48_mult[0] = RAND48_MULT_0; - _rand48_mult[1] = RAND48_MULT_1; - _rand48_mult[2] = RAND48_MULT_2; + _rand48_seed = TOUINT48(RAND48_SEED_0, (unsigned short)seed, + (unsigned short)(seed >> 16)); + _rand48_mult = RAND48_MULT; _rand48_add = RAND48_ADD; } diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h index cfc43c53f157..aa2cd394104a 100644 --- a/lib/libc/include/port_before.h +++ b/lib/libc/include/port_before.h @@ -5,7 +5,6 @@ #define _LIBC 1 #define DO_PTHREADS 1 #define USE_POLL 1 -#define HAVE_MD5 1 #define ISC_SOCKLEN_T socklen_t #define ISC_FORMAT_PRINTF(fmt, args) \ diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc deleted file mode 100644 index 82c5f0670485..000000000000 --- a/lib/libc/md/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -.PATH: ${SRCTOP}/sys/kern - -SRCS+= md5c.c diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc index f26e04c187a5..c211026aba72 100644 --- a/lib/libc/nls/Makefile.inc +++ b/lib/libc/nls/Makefile.inc @@ -12,6 +12,11 @@ MAN+= catclose.3 catgets.3 catopen.3 # for translators. NLSNAME= libc +# We don't want libc's NLS catalogues to be installed in the clibs package. +# Put them in locales instead, since anyone interested in NLS will have +# that installed. +NLSPACKAGE= locales + NLS+= be_BY.UTF-8 NLS+= ca_ES.ISO8859-1 NLS+= de_DE.ISO8859-1 diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map index 6b9c43298fb5..26daecbe2eff 100644 --- a/lib/libc/resolv/Symbol.map +++ b/lib/libc/resolv/Symbol.map @@ -103,6 +103,5 @@ FBSD_1.0 { }; FBSD_1.4 { - __res_rndinit; __res_nrandomid; }; diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c index 71ab2dcb7038..5a2fce013c8c 100644 --- a/lib/libc/resolv/res_init.c +++ b/lib/libc/resolv/res_init.c @@ -86,19 +86,6 @@ #include <unistd.h> #include <netdb.h> -#ifndef HAVE_MD5 -# include "../dst/md5.h" -#else -# ifdef SOLARIS2 -# include <sys/md5.h> -# elif _LIBC -# include <md5.h> -# endif -#endif -#ifndef _MD5_H_ -# define _MD5_H_ 1 /*%< make sure we do not include rsaref md5.h file */ -#endif - #include "un-namespace.h" #include "port_after.h" @@ -184,8 +171,6 @@ __res_vinit(res_state statp, int preinit) { statp->options = RES_DEFAULT; } - statp->_rnd = malloc(16); - res_rndinit(statp); statp->id = res_nrandomid(statp); memset(u, 0, sizeof(u)); @@ -733,48 +718,18 @@ net_mask(struct in_addr in) /*!< XXX - should really use system's version of th } #endif -static u_char srnd[16]; - void -res_rndinit(res_state statp) +freebsd15_res_rndinit(res_state statp) { - struct timeval now; - u_int32_t u32; - u_int16_t u16; - u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd; - - gettimeofday(&now, NULL); - u32 = now.tv_sec; - memcpy(rnd, &u32, 4); - u32 = now.tv_usec; - memcpy(rnd + 4, &u32, 4); - u32 += now.tv_sec; - memcpy(rnd + 8, &u32, 4); - u16 = getpid(); - memcpy(rnd + 12, &u16, 2); + (void)statp; } +__sym_compat(__res_rndinit, freebsd15_res_rndinit, FBSD_1.4); u_int res_nrandomid(res_state statp) { - struct timeval now; - u_int16_t u16; - MD5_CTX ctx; - u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd; - - gettimeofday(&now, NULL); - u16 = (u_int16_t) (now.tv_sec ^ now.tv_usec); - memcpy(rnd + 14, &u16, 2); -#ifndef HAVE_MD5 - MD5_Init(&ctx); - MD5_Update(&ctx, rnd, 16); - MD5_Final(rnd, &ctx); -#else - MD5Init(&ctx); - MD5Update(&ctx, rnd, 16); - MD5Final(rnd, &ctx); -#endif - memcpy(&u16, rnd + 14, 2); - return ((u_int) u16); + (void) statp; + + return ((u_int)(arc4random() & 0xffff)); } /*% @@ -808,10 +763,6 @@ res_ndestroy(res_state statp) { free(statp->_u._ext.ext); statp->_u._ext.ext = NULL; } - if (statp->_rnd != NULL) { - free(statp->_rnd); - statp->_rnd = NULL; - } statp->options &= ~RES_INIT; } diff --git a/lib/libunbound/config.h b/lib/libunbound/config.h index 51105977b20a..1cedf5b4de36 100644 --- a/lib/libunbound/config.h +++ b/lib/libunbound/config.h @@ -884,7 +884,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.23.1" +#define PACKAGE_STRING "unbound 1.24.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -893,7 +893,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.23.1" +#define PACKAGE_VERSION "1.24.0" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" diff --git a/lib/nss_tacplus/Makefile b/lib/nss_tacplus/Makefile index a969cd85778d..c85297a7dbaa 100644 --- a/lib/nss_tacplus/Makefile +++ b/lib/nss_tacplus/Makefile @@ -3,7 +3,7 @@ SRCS= ${LIB}.c SHLIB_MAJOR= 1 SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} LIBADD= tacplus -MK_INSTALLIB= no +MK_INSTALLLIB= no MAN= ${LIB}.8 .include <bsd.lib.mk> diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 0d1841f8c3bd..23de404710d0 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -16,11 +16,11 @@ FLUA_MODULES+= libjail .endif FLUA_MODULES+= libucl FLUA_MODULES+= liblyaml -FLUA_MODULES+= lposix .ifdef BOOTSTRAPPING -FLUA_MODULES+= libfreebsd/sys/linker -FLUA_MODULES+= libfreebsd/kenv +# libfreebsd is generally omitted from the bootstrap flua because its +# functionality largely assumes a FreeBSD kernel/system headers, so it doesn't +# really offer functionality that we can use in bootstrap. CFLAGS+= -I${.CURDIR} -DBOOTSTRAPPING SHAREDIR= ${WORLDTMP}/legacy/usr/share/flua @@ -54,6 +54,7 @@ SRCS+= lua.c # FreeBSD Extensions .PATH: ${.CURDIR}/modules SRCS+= linit_flua.c +SRCS+= lposix.c CFLAGS+= -I${SRCTOP}/lib/liblua -I${.CURDIR}/modules -I${LUASRC} CFLAGS+= -DLUA_PROGNAME="\"${PROG}\"" diff --git a/libexec/flua/bootstrap.h b/libexec/flua/bootstrap.h index 74356d8677b3..caf00518c1e0 100644 --- a/libexec/flua/bootstrap.h +++ b/libexec/flua/bootstrap.h @@ -12,10 +12,12 @@ #include <lauxlib.h> -SET_DECLARE(flua_module_set, const luaL_Reg); +#define FLUA_MODULE_SETNAME flua_modules + +SET_DECLARE(FLUA_MODULE_SETNAME, const luaL_Reg); #define FLUA_MODULE_DEF(ident, modname, openfn) \ static const luaL_Reg ident = { modname, openfn }; \ - DATA_SET(flua_module_set, ident) + DATA_SET(FLUA_MODULE_SETNAME, ident) #define FLUA_MODULE_NAMED(mod, name) \ FLUA_MODULE_DEF(module_ ## mod, name, luaopen_ ## mod) diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index 161f030923d3..65356c938671 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -33,6 +33,7 @@ #include "lualib.h" #include "lauxlib.h" +#include "lposix.h" #include "bootstrap.h" @@ -54,6 +55,8 @@ static const luaL_Reg loadedlibs[] = { #if defined(LUA_COMPAT_BITLIB) {LUA_BITLIBNAME, luaopen_bit32}, #endif + /* FreeBSD Extensions */ + {"posix", luaopen_posix}, {NULL, NULL} }; @@ -72,7 +75,7 @@ static void __attribute__((constructor)) flua_init_env(void) { static void flua_setup_mods (lua_State *L) { const luaL_Reg **flib; - SET_FOREACH(flib, flua_module_set) { + SET_FOREACH(flib, FLUA_MODULE_SETNAME) { luaL_requiref(L, (*flib)->name, (*flib)->func, 1); lua_pop(L, 1); /* remove lib */ } diff --git a/libexec/flua/lposix/Makefile b/libexec/flua/lposix/Makefile deleted file mode 100644 index 92321d51be9a..000000000000 --- a/libexec/flua/lposix/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -SHLIB_NAME= posix.so -WARNS?= 3 - -.include "Makefile.inc" -.include <bsd.lib.mk> diff --git a/libexec/flua/lposix/Makefile.inc b/libexec/flua/lposix/Makefile.inc deleted file mode 100644 index 499e6779e84d..000000000000 --- a/libexec/flua/lposix/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -.PATH: ${.PARSEDIR} -SRCS+= lposix.c diff --git a/libexec/flua/lposix/lposix.c b/libexec/flua/modules/lposix.c index 430bb6f28baf..75cdd345aeaa 100644 --- a/libexec/flua/lposix/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -21,8 +21,6 @@ #include "lauxlib.h" #include "lposix.h" -#include "bootstrap.h" - static void enforce_max_args(lua_State *L, int max) { @@ -699,6 +697,3 @@ luaopen_posix(lua_State *L) return (1); } - -/* Only this one needed in our bootstrap set, it will load the others. */ -FLUA_MODULE(posix); diff --git a/libexec/flua/lposix/lposix.h b/libexec/flua/modules/lposix.h index 1aa33f042571..1aa33f042571 100644 --- a/libexec/flua/lposix/lposix.h +++ b/libexec/flua/modules/lposix.h diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 29340a3d91ea..f29fa8ba1bac 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -6,6 +6,7 @@ -- Copyright(c) 2025 Jesús Daniel Colmenares Oviedo <dtxdf@FreeBSD.org> local nuage = require("nuage") +local lfs = require("lfs") local ucl = require("ucl") local yaml = require("lyaml") diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 2589e2614c35..c776a815003c 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -501,7 +501,8 @@ netwait_timeout="60" # Total number of seconds to perform pings. #netwait_if="" # Wait for active link on each intf in this list. netwait_if_timeout="30" # Total number of seconds to monitor link state. netwait_dad="NO" # Wait for DAD to complete -netwait_dad_timeout="10" # Total number of seconds to wait for DAD. +netwait_dad_timeout="" # Total number of seconds to wait for DAD, zero + # or unset to autodetect ### Miscellaneous network options: ### icmp_bmcastecho="NO" # respond to broadcast ping packets diff --git a/libexec/rc/rc.d/netwait b/libexec/rc/rc.d/netwait index b609440a2e4e..05874552cf1c 100755 --- a/libexec/rc/rc.d/netwait +++ b/libexec/rc/rc.d/netwait @@ -36,13 +36,15 @@ netwait_start() err 1 "Nothing to wait for" fi - if ! [ "${netwait_if_timeout}" -ge 1 ]; then + if ! [ "${netwait_if_timeout:=0}" -ge 1 ]; then err 1 "netwait_if_timeout must be >= 1" fi - if ! [ "${netwait_dad_timeout}" -ge 1 ]; then - err 1 "netwait_dad_timeout must be >= 1" + if ! check_kern_features inet6; then + netwait_dad="NO" + elif ! [ "${netwait_dad_timeout:=0}" -ge 1 ]; then + netwait_dad_timeout=$(($(sysctl -n net.inet6.ip6.dad_count)+1)) fi - if ! [ "${netwait_timeout}" -ge 1 ]; then + if ! [ "${netwait_timeout:=0}" -ge 1 ]; then err 1 "netwait_timeout must be >= 1" fi diff --git a/release/Makefile b/release/Makefile index 76a99ffdf3f3..12f5114f8b22 100644 --- a/release/Makefile +++ b/release/Makefile @@ -116,7 +116,10 @@ DISTRIBUTIONS+= ports.txz DISTRIBUTIONS+= src.txz .endif -RELEASE_TARGETS= ftp +RELEASE_TARGETS= +.if !defined(NODISTSETS) || empty(NODISTSETS) +RELEASE_TARGETS+= ftp +.endif IMAGES= .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh) RELEASE_TARGETS+= cdrom @@ -132,6 +135,9 @@ RELEASE_TARGETS+= mini-memstick.img IMAGES+= memstick.img IMAGES+= mini-memstick.img .endif +.if !defined(NOPKGBASE) || empty(NOPKGBASE) +RELEASE_TARGETS+= pkgbase-repo.tar +.endif CLEANFILES= packagesystem *.txz MANIFEST release ${IMAGES} .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) @@ -142,7 +148,7 @@ CLEANFILES+= ${I}.xz .if defined(WITH_DVD) && !empty(WITH_DVD) CLEANFILES+= pkg-stage .endif -CLEANDIRS= dist pkgdb-dvd pkgdb-disc1 pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd +CLEANDIRS= dist pkgdb-dvd pkgdb-disc1 pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd pkgbase-repo.tar beforeclean: chflags -R noschg . .include <bsd.obj.mk> @@ -196,7 +202,7 @@ packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST touch ${.TARGET} -.if !defined(NODISTSETS) +.if !defined(NODISTSETS) || empty(NODISTSETS) disc1: packagesystem bootonly: packagesystem dvd: packagesystem @@ -213,6 +219,9 @@ pkgbase-repo: ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \ INCLUDE_PKG_IN_PKGBASE_REPO=YES BOOTSTRAP_PKG_FROM_PORTS=YES ) +pkgbase-repo.tar: pkgbase-repo + tar -cf pkgbase-repo.tar -C pkgbase-repo . + pkgbase-repo-dir: pkgbase-repo mkdir -p pkgbase-repo-dir printf "FreeBSD-base: { url: "file://%s", enabled: yes }" \ @@ -242,7 +251,7 @@ disc1: mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif -.if !defined(NODISTSETS) +.if !defined(NODISTSETS) || empty(NODISTSETS) # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG @@ -295,7 +304,7 @@ bootonly: MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) -.if !defined(NODISTSETS) +.if !defined(NODISTSETS) || empty(NODISTSETS) # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist @@ -347,7 +356,7 @@ dvd: mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif -.if !defined(NODISTSETS) +.if !defined(NODISTSETS) || empty(NODISTSETS) # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG @@ -449,7 +458,9 @@ release-install: .if defined(DESTDIR) && !empty(DESTDIR) mkdir -p ${DESTDIR} .endif +.if !defined(NODISTSETS) || empty(NODISTSETS) cp -a ftp ${DESTDIR}/ +.endif .if !empty(IMAGES) .for I in ${IMAGES} cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I} @@ -460,6 +471,12 @@ release-install: ( cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512 ) ( cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256 ) .endif +.if !defined (NOPKGBASE) || empty(NOPKGBASE) + mkdir -p ${DESTDIR}/pkgbase + cp -p pkgbase-repo.tar ${DESTDIR}/pkgbase/ + ( cd ${DESTDIR}/pkgbase && sha256 pkgbase-repo.tar > CHECKSUM.SHA256 ) + ( cd ${DESTDIR}/pkgbase && sha512 pkgbase-repo.tar > CHECKSUM.SHA512 ) +.endif .include "${.CURDIR}/Makefile.inc1" .include "${.CURDIR}/Makefile.vm" diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 5e65bfbe8b3f..ed9420e926ce 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -63,6 +63,13 @@ STAGE_TARGETS+= oci-images-stage OCI_DIR= ${TLD}/OCI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH} .endif +.if !defined(EMBEDDED) || empty(EMBEDDED) +.if !defined(NOPKGBASE) || empty(NOPKGBASE) +STAGE_TARGETS+= pkgbase-repo-stage +PKGBASE_DIR= ${TLD}/PKGBASE-REPOS/${REVISION}-${BRANCH}/${TARGET_ARCH} +.endif +.endif + CLEANFILES+= ${STAGE_TARGETS} CHECKSUM_FILES?= SHA512 SHA256 SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' ' @@ -366,5 +373,48 @@ oci-images-stage: . endfor .endif +pkgbase-repo-stage: + mkdir -p ${PKGBASE_DIR} +.if defined(SNAPSHOT) && !empty(SNAPSHOT) +. if exists(${PKGBASE_DIR}/Latest) + rm -rf ${PKGBASE_DIR}/Latest +. endif + mkdir -p ${PKGBASE_DIR}/Latest + mkdir -p ${PKGBASE_DIR}/${BUILDDATE} + cd ${RELEASEDIR}/pkgbase && \ + mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar + cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \ + ${PKGBASE_DIR}/${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar + cd ${PKGBASE_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \ + ${OSRELEASE}-pkgbase-repo.tar + cd ${RELEASEDIR}/pkgbase && rm -f CHECKSUM.* +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/pkgbase && \ + ${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${PKGBASE_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + cd ${PKGBASE_DIR}/Latest && \ + ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + CHECKSUM.${CHECKSUM} +. endfor +.else # not snapshot +. if exists(${PKGBASE_DIR}/Latest) + rm -rf ${PKGBASE_DIR}/Latest +. endif + mkdir -p ${PKGBASE_DIR}/Latest + cd ${RELEASEDIR}/pkgbase && \ + mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo.tar + cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo.tar \ + ${PKGBASE_DIR}/Latest/${OSRELEASE}-pkgbase-repo.tar +. endfor +. for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/pkgbase && \ + ${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo.tar > CHECKSUM.${CHECKSUM} + cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM} \ + ${PKGBASE_DIR}/Latest/CHECKSUM.${CHECKSUM} +. endfor +.endif + ftp-stage: remove-old-bits ${STAGE_TARGETS} diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua index b1b70053b02a..3c8474bf8e68 100755 --- a/release/packages/generate-set-ucl.lua +++ b/release/packages/generate-set-ucl.lua @@ -1,7 +1,7 @@ #!/usr/libexec/flua --[[ usage: -generare-set-ucl.lua <template> [<variablename> <variablevalue>] +generate-set-ucl.lua <template> [<variablename> <variablevalue>] Generate the UCL for a set metapackage. The variables provided will be substituted as UCL variables. diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua index ea3743894740..c61cbb251d8b 100755 --- a/release/packages/generate-ucl.lua +++ b/release/packages/generate-ucl.lua @@ -1,7 +1,7 @@ #!/usr/libexec/flua --[[ usage: -generare-ucl.lua [<variablename> <variablevalue>]... <sourceucl> <destucl> +generate-ucl.lua [<variablename> <variablevalue>]... <sourceucl> <destucl> Build a package's UCL configuration by loading the template UCL file <sourceucl>, replacing any $VARIABLES in the UCL based on the provided diff --git a/release/packages/ucl/ctf-all.ucl b/release/packages/ucl/ctf-all.ucl index 941990908373..970ac3ffb4fa 100644 --- a/release/packages/ucl/ctf-all.ucl +++ b/release/packages/ucl/ctf-all.ucl @@ -30,7 +30,7 @@ CTF is intended specifically for runtime program analyzers such as DTrace. This package provides the ctfconvert(1), ctfdump(1) and ctfmerge(1) utilities which are used to work with CTF data, and the libctf library which allows -application to access CTF debugging information programatically. +applications to access CTF debugging information programmatically. EOD licenses = [ "CDDL-1.0" ] diff --git a/release/packages/ucl/fetch-all.ucl b/release/packages/ucl/fetch-all.ucl index d14f22cb74a5..5a3c0be826fa 100644 --- a/release/packages/ucl/fetch-all.ucl +++ b/release/packages/ucl/fetch-all.ucl @@ -19,13 +19,13 @@ comment = "Retrieve a file from a remote URL" desc = <<EOD -The fetch(1) utility retieves one or more files from a remote URL via +The fetch(1) utility retrieves one or more files from a remote URL via HTTP or FTP. fetch(1) includes support for TLS, HTTP proxies, .netrc files, and includes a "mirror" mode which only downloads files which are newer on the remote site. Also provided is fetch(3), a library which allows applications to use -this functionality programatically. +this functionality programmatically. EOD annotations { diff --git a/release/packages/ucl/openssl-all.ucl b/release/packages/ucl/openssl-all.ucl index 24a83ab6b9ba..4c393efe3b89 100644 --- a/release/packages/ucl/openssl-all.ucl +++ b/release/packages/ucl/openssl-all.ucl @@ -26,7 +26,7 @@ protocols such as HTTP, SMTP and DNS. OpenSSL provides openssl(1), a command-line utility used for testing TLS clients and servers, managing certificate used in TLS authentication, and -performing various miscallenous cryptographic operations. +performing various miscellaneous cryptographic operations. Also provided are two libraries, libcrypto and libssl, which can be used by applications to provide generic cryptographic functionality, and to implement diff --git a/release/packages/ucl/ufs-all.ucl b/release/packages/ucl/ufs-all.ucl index d9302bd0e3f9..b35e0f3d1dc7 100644 --- a/release/packages/ucl/ufs-all.ucl +++ b/release/packages/ucl/ufs-all.ucl @@ -32,7 +32,7 @@ utilities used to check the consistency of an existing filesystem after an unclean shutdown or panic. The libufs library is also provided, which allows applications to access -UFS filesystems programatically. +UFS filesystems programmatically. EOD annotations { diff --git a/release/packages/ucl/xz-all.ucl b/release/packages/ucl/xz-all.ucl index 16da8b76f0ac..8a7c33bcce46 100644 --- a/release/packages/ucl/xz-all.ucl +++ b/release/packages/ucl/xz-all.ucl @@ -21,7 +21,7 @@ comment = "LZMA2 data compression" desc = <<EOD xz compresses data using the LZMA2 data compression algorithm. This package provides the front-end xz(1) utility, and the liblzma library which allows -applications to use this functionality programatically. +applications to use this functionality programmatically. EOD annotations { diff --git a/release/packages/ucl/zfs-all.ucl b/release/packages/ucl/zfs-all.ucl index 70ebcdacdb57..9d166452188d 100644 --- a/release/packages/ucl/zfs-all.ucl +++ b/release/packages/ucl/zfs-all.ucl @@ -39,7 +39,7 @@ This package provides the zfs(8) and zpool(8) utilities used to manage ZFS filesystems, the zfsd(8) self-healing daemon, and several other utilities, as well as the runtime libraries used internally by ZFS itself, and the libzfs_core library providing a stable interface for -managing ZFS programatically. +managing ZFS programmatically. EOD licenses = [ "CDDL-1.0" ] diff --git a/release/scripts/make-pkg-package.sh b/release/scripts/make-pkg-package.sh index a1e006bd6964..3a1b163bd591 100755 --- a/release/scripts/make-pkg-package.sh +++ b/release/scripts/make-pkg-package.sh @@ -8,6 +8,13 @@ PKG_ABI=$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI) unset PKG_VERSION unset MAKEFLAGS unset PKGBASE +# Ports interprets CROSS_TOOLCHAIN differently from src, and having this set +# breaks the package-pkg build. For now, forcibly unset this and hope ports +# can find a working compiler. +if [ -n "$CROSS_TOOLCHAIN" ]; then + printf >&2 '%s: WARNING: CROSS_TOOLCHAIN will be ignored for the pkg build.\n' "$0" + unset CROSS_TOOLCHAIN +fi export WRKDIRPREFIX=/tmp/ports.${TARGET} export DISTDIR=/tmp/distfiles export WRKDIR=$(make -C ${PORTSDIR}/ports-mgmt/pkg I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=YES -V WRKDIR) diff --git a/release/tools/ec2-builder.conf b/release/tools/ec2-builder.conf index cf4276fc80ec..a55485fec0cd 100644 --- a/release/tools/ec2-builder.conf +++ b/release/tools/ec2-builder.conf @@ -7,17 +7,16 @@ export VMSIZE=8000m # Flags to installworld/kernel: We don't want debug symbols (kernel or -# userland), 32-bit libraries, tests, or the debugger. +# userland), 32-bit libraries, or tests. export INSTALLOPTS="WITHOUT_DEBUG_FILES=YES WITHOUT_KERNEL_SYMBOLS=YES \ - WITHOUT_LIB32=YES WITHOUT_TESTS=YES WITHOUT_LLDB=YES" + WITHOUT_LIB32=YES WITHOUT_TESTS=YES" # Equivalent to INSTALLOPTS for pkgbase vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' \ - -e '^FreeBSD-lldb.*' + -e '^FreeBSD-set-tests' } # Packages to install into the image we're creating. In addition to packages diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 32d02cbb79e4..acaffbbc0c42 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -10,17 +10,16 @@ export VMSIZE=5000m # Flags to installworld/kernel: We don't want debug symbols (kernel or -# userland), 32-bit libraries, tests, or the debugger. +# userland), 32-bit libraries, or tests. export INSTALLOPTS="WITHOUT_DEBUG_FILES=YES WITHOUT_KERNEL_SYMBOLS=YES \ - WITHOUT_LIB32=YES WITHOUT_TESTS=YES WITHOUT_LLDB=YES" + WITHOUT_LIB32=YES WITHOUT_TESTS=YES" # Equivalent to INSTALLOPTS for pkgbase vm_extra_filter_base_packages() { grep -v \ -e '.*-dbg$' \ -e '.*-lib32$' \ - -e '^FreeBSD-tests.*' \ - -e '^FreeBSD-lldb.*' + -e '^FreeBSD-set-tests' } # Packages to install into the image we're creating. In addition to packages diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 7ab0e1238693..5b0f38b740a6 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -14,14 +14,16 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} shells/bash \ export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs" vagrant_common () { - # The firstboot_pkgs rc.d script will download the repository - # catalogue and install or update pkg when the instance first - # launches, so these files would just be replaced anyway; removing - # them from the image allows it to boot faster. - env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a - env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg - rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports - rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods + if [ -z "${NO_ROOT}" ]; then + # The firstboot_pkgs rc.d script will download the repository + # catalogue and install or update pkg when the instance first + # launches, so these files would just be replaced anyway; + # removing them from the image allows it to boot faster. + pkg -c ${DESTDIR} clean -y -a + pkg -c ${DESTDIR} delete -f -y pkg + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods + fi # Vagrant instances use DHCP to get their network configuration. echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf @@ -40,8 +42,7 @@ vagrant_common () { # Create the vagrant user with a password of vagrant /usr/sbin/pw -R ${DESTDIR} \ groupadd vagrant -g 1001 - chroot ${DESTDIR} mkdir -p /home/vagrant - /usr/sbin/pw -R ${DESTDIR} \ + /usr/sbin/pw -R ${DESTDIR} -M ${DESTDIR}/METALOG \ useradd vagrant \ -m -M 0755 -w yes -n vagrant -u 1001 -g 1001 -G 0 \ -c 'Vagrant User' -d '/home/vagrant' -s '/bin/csh' @@ -58,11 +59,11 @@ vagrant_common () { echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" > ${DESTDIR}/home/vagrant/.ssh/authorized_keys echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1YdxBpNlzxDqfJyw/QKow1F+wvG9hXGoqiysfJOn5Y vagrant insecure public key" >> ${DESTDIR}/home/vagrant/.ssh/authorized_keys chmod 600 ${DESTDIR}/home/vagrant/.ssh/authorized_keys - metalog_add_data ./home/vagrant/.ssh/authorized_keys 0600 chmod 700 ${DESTDIR}/home/vagrant/.ssh chown -R 1001 ${DESTDIR}/home/vagrant/.ssh - echo "./home/vagrant/.ssh type=dir uid=1001 gid=1001 mode=0700" >> METALOG + echo "./home/vagrant/.ssh type=dir uid=1001 gid=1001 mode=0700" >> ${DESTDIR}/METALOG + echo "./home/vagrant/.ssh/authorized_keys type=file uid=1001 gid=1001 mode=0600" >> ${DESTDIR}/METALOG # Reboot quickly, Don't wait at the panic screen echo 'debug.trace_on_panic=1' >> ${DESTDIR}/etc/sysctl.conf diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 3b0519c21dbc..131ebe37db6c 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -70,15 +70,15 @@ vm_copy_base() { return 0 } -vm_filter_base_packages() { - # Reads a list of all base system packages from stdin. - # Writes a list of base system packages to install to stdout. - grep -v -e '^FreeBSD-src.*' -e '^FreeBSD-kernel.*' - # There are several kernel variants available in separate packages. - # For VMs it is sufficient to install only the generic kernel. - echo "FreeBSD-kernel-man" - echo "FreeBSD-kernel-generic" - echo "FreeBSD-kernel-generic-dbg" +vm_base_packages_list() { + # Output a list of package sets equivalent to what we get from + # "installworld installkernel distribution", aka. the full base + # system. + for S in base lib32 kernels; do + echo FreeBSD-set-$S + echo FreeBSD-set-$S-dbg + done + echo FreeBSD-set-tests } vm_extra_filter_base_packages() { @@ -99,8 +99,7 @@ vm_install_base() { pkg_cmd="$pkg_cmd -o METALOG=METALOG" fi $pkg_cmd update - selected=$($pkg_cmd rquery -U -r FreeBSD-base %n | \ - vm_filter_base_packages | vm_extra_filter_base_packages) + selected=$(vm_base_packages_list | vm_extra_filter_base_packages) $pkg_cmd install -U -r FreeBSD-base $selected else cd ${WORLDDIR} && \ @@ -256,6 +255,7 @@ vm_extra_pkg_rmcache() { if [ -n "${NO_ROOT}" ]; then ${PKG_CMD} \ -o ASSUME_ALWAYS_YES=yes \ + -o INSTALL_AS_USER=yes \ -r ${DESTDIR} \ clean -y -a else diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 21562fa03e0d..ed317495c2e0 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2183,6 +2183,7 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth) { u_int8_t rs_num = pf_get_ruleset_number(r->action); char *name; + uint32_t ticket; char anchor[PF_ANCHOR_NAME_SIZE]; int len = strlen(path); int error; @@ -2192,7 +2193,9 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth) if ((pf->opts & PF_OPT_NOACTION) == 0) { if (pf->trans == NULL) errx(1, "pfctl_load_rule: no transaction"); - pf->anchor->ruleset.tticket = pfctl_get_ticket(pf->trans, rs_num, path); + ticket = pfctl_get_ticket(pf->trans, rs_num, path); + if (rs_num == PF_RULESET_FILTER) + pf->anchor->ruleset.tticket = ticket; } if (strlcpy(anchor, path, sizeof(anchor)) >= sizeof(anchor)) errx(1, "pfctl_load_rule: strlcpy"); @@ -2225,7 +2228,7 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth) return (1); if (pfctl_add_pool(pf, &r->route, PF_RT)) return (1); - error = pfctl_add_rule_h(pf->h, r, anchor, name, pf->anchor->ruleset.tticket, + error = pfctl_add_rule_h(pf->h, r, anchor, name, ticket, pf->paddr.ticket); switch (error) { case 0: @@ -3582,6 +3585,12 @@ main(int argc, char *argv[]) } if (clearopt != NULL) { + int mnr; + + /* Check if anchor exists. */ + if ((pfctl_get_rulesets(pfh, anchorname, &mnr)) == ENOENT) + errx(1, "No such anchor %s", anchorname); + switch (*clearopt) { case 'e': pfctl_flush_eth_rules(dev, opts, anchorname); diff --git a/share/man/man3/snl.3 b/share/man/man3/snl.3 index f678d6cb2cea..04bae46691bf 100644 --- a/share/man/man3/snl.3 +++ b/share/man/man3/snl.3 @@ -288,7 +288,7 @@ main(int ac, char *argv[]) struct nl_parsed_link link = {}; if (!snl_parse_nlmsg(&ss, hdr, &link_parser, &link)) continue; - printf("Link#%u %s mtu %u\\n", link.ifi_index, link.ifla_ifname, link.ifla_mtu); + printf("Link#%u %s mtu %u\en", link.ifi_index, link.ifla_ifname, link.ifla_mtu); } return (0); diff --git a/share/man/man4/ice.4 b/share/man/man4/ice.4 index 3f7a9017756d..c7675e627726 100644 --- a/share/man/man4/ice.4 +++ b/share/man/man4/ice.4 @@ -1,4 +1,4 @@ -.\"- +.\" .\" SPDX-License-Identifier: BSD-3-Clause .\" .\" Copyright (c) 2019-2020, Intel Corporation @@ -32,25 +32,35 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd March 28, 2025 +.Dd October 3, 2025 .Dt ICE 4 .Os .Sh NAME .Nm ice -.Nd "Intel\(rg Ethernet 800 Series Driver" +.Nd Intel Ethernet 800 Series Driver .Sh SYNOPSIS -To compile this driver into the kernel, place the following lines in your -kernel configuration file: -.Bd -literal -offset indent .Cd device iflib .Cd device ice -.Ed .Pp -To load the driver as a module at boot time, place the following lines in +In .Xr loader.conf 5 : -.Bd -literal -offset indent -if_ice_load="YES" -.Ed +.Cd if_ice_load +.Cd hw.ice.enable_health_events +.Cd hw.ice.irdma +.Cd hw.ice.irdma_max_msix +.Cd hw.ice.debug.enable_tx_fc_filter +.Cd hw.ice.debug.enable_tx_lldp_filter +.Cd hw.ice.debug.ice_tx_balance_en +.Pp +In +.Xr sysctl.conf 5 +or +.Xr loader.conf 5 : +.Cd dev.ice.#.current_speed +.Cd dev.ice.#.fw_version +.Cd dev.ice.#.ddp_version +.Cd dev.ice.#.pba_number +.Cd dev.ice.#.hw.mac.* .Sh DESCRIPTION .Ss Features The @@ -86,7 +96,7 @@ Intel\(rg Ethernet Connection E830\-XXV .El .Pp For questions related to hardware requirements, refer to the documentation -supplied with your adapter. +supplied with the adapter. .Pp Support for Jumbo Frames is provided via the interface MTU setting. Selecting an MTU larger than 1500 bytes with the @@ -134,17 +144,16 @@ See the .Dq Intel\(rg Ethernet Adapters and Devices User Guide for more details on DDP and Safe Mode. .Pp -If you encounter issues with the DDP package file, you may need to download -an updated driver or +If issues are encountered with the DDP package file, an updated driver or .Sy ice_ddp -module. +module may need to be downloaded. See the log messages for more information. .Pp -You cannot update the DDP package if any PF drivers are already loaded. +The DDP package cannot be updated if any PF drivers are already loaded. To overwrite a package, unload all PFs and then reload the driver with the new package. .Pp -You can only use one DDP package per driver, even if you have more than one +Only one DDP package can be used per driver, even if more than one device installed that uses the driver. .Pp Only the first loaded PF per device can download a package for that device. @@ -164,9 +173,9 @@ each jumbo packet. This should help to avoid buffer starvation issues when allocating receive packets. .Pp -Packet loss may have a greater impact on throughput when you use jumbo -frames. -If you observe a drop in performance after enabling jumbo frames, enabling +Packet loss may have a greater impact on throughput when jumbo frames are in +use. +If a drop in performance is observed after enabling jumbo frames, enabling flow control may mitigate the issue. .Ss Remote Direct Memory Access Remote Direct Memory Access, or RDMA, allows a network device to transfer data @@ -184,14 +193,14 @@ operating in multiport mode with more than 4 ports. For detailed installation and configuration information for RDMA, see .Xr irdma 4 . .Ss RDMA Monitoring -For debugging/testing purposes, you can use sysctl to set up a mirroring +For debugging/testing purposes, a sysctl can be used to set up a mirroring interface on a port. The interface can receive mirrored RDMA traffic for packet analysis tools like .Xr tcpdump 1 . This mirroring may impact performance. .Pp -To use RDMA monitoring, you may need to reserve more MSI\-X interrupts. +To use RDMA monitoring, more MSI\-X interrupts may need to be reserved. Before the .Nm driver loads, configure the following tunable provided by @@ -200,7 +209,7 @@ driver loads, configure the following tunable provided by dev.ice.<interface #>.iflib.use_extra_msix_vectors=4 .Ed .Pp -You may need to adjust the number of extra MSI\-X interrupt vectors. +The number of extra MSI\-X interrupt vectors may need to be adjusted. .Pp To create/delete the interface: .Bd -literal -offset indent @@ -276,7 +285,7 @@ To enable/disable priority flow control in software\-based DCBX mode: sysctl dev.ice.<interface #>.pfc=1 (or 0 to disable) .Ed .Pp -Enhanced Transmission Selection (ETS) allows you to assign bandwidth to certain +Enhanced Transmission Selection (ETS) allows bandwidth to be assigned to certain TCs, to help ensure traffic reliability. To view the assigned ETS configuration, use the following: .Bd -literal -offset indent @@ -310,7 +319,7 @@ Use the following sysctl to enable or disable L3 QoS: sysctl dev.ice.<interface #>.pfc_mode=1 (or 0 to disable) .Ed .Pp -If you disable L3 QoS mode, it returns to L2 QoS mode. +If the L3 QoS mode is disabled, it returns to L2 QoS mode. .Pp To map a DSCP value to a traffic class, separate the values by commas. For example, to map DSCPs 0\-3 and DSCP 8 to DCB TCs 0\-3 and 4, respectively: @@ -329,7 +338,7 @@ sysctl dev.ice.<interface #>.dscp2tc_map .Pp L3 QoS mode is not available when FW\-LLDP is enabled. .Pp -You also cannot enable FW\-LLDP if L3 QoS mode is active. +FW\-LLDP cannot be enabled if L3 QoS mode is active. .Pp Disable FW\-LLDP before switching to L3 QoS mode. .Pp @@ -355,11 +364,11 @@ To check the current LLDP setting: sysctl dev.ice.<interface #>.fw_lldp_agent .Ed .Pp -You must enable the UEFI HII LLDP Agent attribute for this setting +The UEFI HII LLDP Agent attribute must be enabled for this setting to take effect. If the .Dq LLDP AGENT -attribute is set to disabled, you cannot enable the FW\-LLDP Agent from the +attribute is set to disabled, the FW\-LLDP Agent cannot be enabled from the driver. .Ss Link\-Level Flow Control (LFC) Ethernet Flow Control (IEEE 802.3x) can be configured with sysctl to enable @@ -416,11 +425,11 @@ provide a stable link without FEC. .Pp For devices to benefit from this feature, link partners must have FEC enabled. .Pp -If you enable the sysctl -.Em allow_no_fec_modules_in_auto -Auto FEC negotiation will include +If the +.Va allow_no_fec_modules_in_auto +sysctl is enabled Auto FEC negotiation will include .Dq No FEC -in case your link partner does not have FEC enabled or is not FEC capable: +in case the link partner does not have FEC enabled or is not FEC capable: .Bd -literal -offset indent sysctl dev.ice.<interface #>.allow_no_fec_modules_in_auto=1 .Ed @@ -443,16 +452,16 @@ To see the valid FEC modes for the link: sysctl \-d dev.ice.<interface #>.requested_fec .Ed .Ss Speed and Duplex Configuration -You cannot set duplex or autonegotiation settings. +The speed and duplex settings cannot be hard set. .Pp -To have your device change the speeds it will use in auto-negotiation or +To have the device change the speeds it will use in auto-negotiation or force link with: .Bd -literal -offset indent sysctl dev.ice.<interface #>.advertise_speed=<mask> .Ed .Pp Supported speeds will vary by device. -Depending on the speeds your device supports, valid bits used in a speed mask +Depending on the speeds the device supports, valid bits used in a speed mask could include: .Bd -literal -offset indent 0x0 \- Auto @@ -493,13 +502,13 @@ At a high level, to capture a firmware log: .It Set the configuration for the firmware log. .It -Perform the necessary steps to generate the issue you are trying to debug. +Perform the necessary steps to reproduce the issue. .It Capture the firmware log. .It Stop capturing the firmware log. .It -Reset your firmware log settings as needed. +Reset the firmware log settings as needed. .It Work with Customer Support to debug the issue. .El @@ -583,8 +592,8 @@ PF Registration (Bit 30) Module Version (Bit 31) .El .Pp -You can change the verbosity level of the firmware logs. -You can set only one log level per module, and each level includes the +The verbosity level of the firmware logs can be modified. +It is possible to set only one log level per module, and each level includes the verbosity levels lower than it. For instance, setting the level to .Dq normal @@ -640,8 +649,8 @@ dmesg > log_output NOTE: Logging a large number of modules or too high of a verbosity level will add extraneous messages to dmesg and could hinder debug efforts. .Ss Debug Dump -Intel\(rg Ethernet 800 Series devices support debug dump, which allows you to -obtain runtime register values from the firmware for +Intel\(rg Ethernet 800 Series devices support debug dump, which allows +gathering of runtime register values from the firmware for .Dq clusters of events and then write the results to a single dump file, for debugging complicated issues in the field. @@ -654,7 +663,7 @@ stateless snapshot of the whole device. .Pp NOTE: Like with firmware logs, the contents of the debug dump are not human\-readable. -You must work with Customer Support to decode the file. +Work with Customer Support to decode the file. .Pp Debug dump is per device, not per PF. .Pp @@ -717,20 +726,19 @@ sysctl dev.ice.0.debug.dump.clusters=0 .Pp NOTE: Using 0 will skip Manageability Transactions data. .Pp -If you don't specify a cluster, the driver will dump all clusters to a +If a single cluster is not specified, the driver will dump all clusters to a single file. Issue the debug dump command, using the following: .Bd -literal -offset indent sysctl \-b dev.ice.<interface #>.debug.dump.dump=1 > dump.bin .Ed .Pp -NOTE: The driver will not receive the command if you do not write -.Dq 1 -to the sysctl. +NOTE: The driver will not receive the command if the sysctl is not set to +.Dq 1 . .Pp Replace .Dq dump.bin -above with the file name you want to use. +above with the preferred file name. .Pp To clear the .Va clusters @@ -744,7 +752,7 @@ The ice driver supports the ability to obtain the values of the PHY registers from Intel(R) Ethernet 810 Series devices in order to debug link and connection issues during runtime. .Pp -The driver allows you to obtain information about: +The driver provides information about: .Bl -bullet .It Rx and Tx Equalization parameters @@ -758,12 +766,12 @@ sysctl dev.ice.<interface #>.debug.phy_statistics .Ed .Pp NOTE: The contents of the registers are not human\-readable. -Like with firmware logs and debug dump, you must work with Customer Support +Like with firmware logs and debug dump, work with Customer Support to decode the file. .Ss Transmit Balancing -Some Intel(R) Ethernet 800 Series devices allow you to enable a transmit +Some Intel(R) Ethernet 800 Series devices allow for enabling a transmit balancing feature to improve transmit performance under certain conditions. -When the feature is enabled, you should experience more consistent transmit +When enabled, the feature should provide more consistent transmit performance across queues and/or PFs and VFs. .Pp By default, transmit balancing is disabled in the NVM. @@ -784,7 +792,7 @@ configures the device accordingly. .Pp NOTE: The user selection for transmit balancing in EPCT or HII is persistent across reboots. -You must reboot the system for the selected setting to take effect. +The system must be rebooted for the selected setting to take effect. .Pp This setting is device wide. .Pp @@ -801,7 +809,7 @@ sysctl dev.ice.<interface #>.temp may have a low number of network memory buffers (mbufs) by default. If the number of mbufs available is too low, it may cause the driver to fail to initialize and/or cause the system to become unresponsive. -You can check to see if the system is mbuf\-starved by running +Check to see if the system is mbuf\-starved by running .Ic netstat Fl m . Increase the number of mbufs by editing the lines below in .Pa /etc/sysctl.conf : @@ -813,7 +821,7 @@ kern.ipc.nmbjumbo16 kern.ipc.nmbufs .Ed .Pp -The amount of memory that you allocate is system specific, and may require some +The amount of memory that should be allocated is system specific, and may require some trial and error. Also, increasing the following in .Pa /etc/sysctl.conf @@ -908,8 +916,8 @@ link partner's switch ports. Some PCIe x8 slots are actually configured as x4 slots. These slots have insufficient bandwidth for full line rate with dual port and quad port devices. -In addition, if you put a PCIe v4.0 or v3.0\-capable adapter into a PCIe v2.x -slot, you cannot get full bandwidth. +In addition, if a PCIe v4.0 or v3.0\-capable adapter is placed into a PCIe v2.x +slot, full bandwidth will not be possible. .Pp The driver detects this situation and writes the following message in the system log: @@ -920,7 +928,7 @@ Please move the device to a different PCI\-e link with more lanes and/or higher transfer rate. .Ed .Pp -If this error occurs, moving your adapter to a true PCIe x8 or x16 slot will +If this error occurs, moving the adapter to a true PCIe x8 or x16 slot will resolve the issue. For best performance, install devices in the following PCI slots: .Bl -bullet diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index da02f10aac01..41410d6bc0fa 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 28, 2025 +.Dd October 7, 2025 .Dt PF.CONF 5 .Os .Sh NAME @@ -2377,7 +2377,7 @@ packets matching the same connection. .It Ar route-to The .Ar route-to -option routes the packet to the specified interface with an optional address +option routes the packet to the specified interface with an address for the next hop. When a .Ar route-to @@ -3552,7 +3552,7 @@ hosts = "all" | ipspec = "any" | host | "{" host-list "}" host = [ "!" ] ( address [ "/" mask-bits ] | "<" string ">" ) redirhost = address [ "/" mask-bits ] -routehost = "(" interface-name [ address [ "/" mask-bits ] ] ")" +routehost = "(" interface-name address [ "/" mask-bits ] ")" address = ( interface-name | interface-group | "(" ( interface-name | interface-group ) ")" | hostname | ipv4-dotted-quad | ipv6-coloned-hex ) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index c0048f27c740..edbfa937f8df 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 2, 2025 +.Dd October 5, 2025 .Dt RC.CONF 5 .Os .Sh NAME @@ -4618,8 +4618,11 @@ Set to to enable waiting for DAD to complete. .It Va netwait_dad_timeout .Pq Vt int -Indicates the total number of seconds to wait for DAD to complete. -The default is 10. +Unset by default. +Indicates the maximum number of seconds to wait for DAD to complete. +If zero or unset, the timeout will be one more than the value of the +.Va net.inet6.ip6.dad_count +sysctl variable. .It Va rctl_enable .Pq Vt bool If set to diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk index bd13fe56679d..5a28e1cdd026 100644 --- a/share/mk/bsd.nls.mk +++ b/share/mk/bsd.nls.mk @@ -1,6 +1,8 @@ # -# This include file <bsd.nls.mk> handles building and installing Native -# Language Support (NLS) catalogs +# Handle building and installing Native Language Support (NLS) catalogs. +# This is implemented using a <bsd.files.mk> files group called "NLS", +# so any per-group options that bsd.files.mk supports can be used here +# with the prefix "NLS". # # +++ variables +++ # @@ -17,6 +19,9 @@ # NLSMODE National Language Support files mode. [${NOBINMODE}] # # NLSOWN National Language Support files owner. [${SHAREOWN}] +# +# NLSPACKAGE Package to install the NLS files in. +# [${PACKAGE}, or "utilities" if not set] .if !target(__<bsd.init.mk>__) .error bsd.nls.mk cannot be included directly. diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 95cd3b02d8e4..3e108591251a 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -425,7 +425,7 @@ _DP_kadm5clnt= com_err krb5 roken _DP_kadm5srv= com_err hdb krb5 roken _DP_heimntlm= crypto com_err krb5 roken _DP_hx509= asn1 com_err crypto roken wind -_DP_hdb= asn1 com_err krb5 roken sqlite3 +_DP_hdb= asn1 com_err krb5 roken sqlite3 heimbase _DP_asn1= com_err roken _DP_kdc= roken hdb hx509 krb5 heimntlm asn1 crypto _DP_wind= com_err roken diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 32cd198a9537..73b49a111f89 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -186,14 +186,17 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) */ SMBIOS_GET8(cp, 0x0a) != 0 && smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) { -#ifdef __ILP32__ +#if __SIZEOF_SIZE_T__ < 8 uint64_t end_addr; end_addr = SMBIOS_GET64(cp, 0x10) + /* Start address. */ SMBIOS_GET32(cp, 0x0c); /* Maximum size. */ - /* Is the table (or part of it) located above 4G? */ - if (end_addr >= (uint64_t)1 << 32) - /* Can't access it with 32-bit addressing. */ + /* + * Is the table (or part of it) located above what we + * can address? + */ + if ((size_t)end_addr != end_addr) + /* Yes, give it up. */ continue; #endif smbios.is_64bit_ep = 1; diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 99565fbb69ca..8cada2f4f911 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -74,7 +74,7 @@ extern int acpi_susp_bounce; extern struct susppcb **susppcbs; static cpuset_t suspcpus; -static void acpi_stop_beep(void *); +static void acpi_stop_beep(void *, enum power_stype); static int acpi_wakeup_ap(struct acpi_softc *, int); static void acpi_wakeup_cpus(struct acpi_softc *); @@ -88,7 +88,7 @@ static void acpi_wakeup_cpus(struct acpi_softc *); } while (0) static void -acpi_stop_beep(void *arg) +acpi_stop_beep(void *arg, enum power_stype stype) { if (acpi_resume_beep != 0) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index da051e8f7c8a..393d6d89da0c 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2180,6 +2180,7 @@ #define OSLAR_EL1_CRn 1 #define OSLAR_EL1_CRm 0 #define OSLAR_EL1_op2 4 +#define OSLAR_OSLK (0x1ul << 0) /* OSLSR_EL1 */ #define OSLSR_EL1_op0 2 @@ -2187,6 +2188,10 @@ #define OSLSR_EL1_CRn 1 #define OSLSR_EL1_CRm 1 #define OSLSR_EL1_op2 4 +#define OSLSR_OSLM_1 (0x1ul << 3) +#define OSLSR_nTT (0x1ul << 2) +#define OSLSR_OSLK (0x1ul << 1) +#define OSLSR_OSLM_0 (0x1ul << 0) /* PAR_EL1 - Physical Address Register */ #define PAR_F_SHIFT 0 diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h index 334b795832a3..f9b74aef7188 100644 --- a/sys/arm64/vmm/arm64.h +++ b/sys/arm64/vmm/arm64.h @@ -119,6 +119,7 @@ struct hypctx { struct vgic_v3_regs vgic_v3_regs; struct vgic_v3_cpu *vgic_cpu; bool has_exception; + bool dbg_oslock; }; struct hyp { diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 1dcefa1489e9..a551a2807183 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -651,6 +651,33 @@ vmm_reg_wi(struct vcpu *vcpu, uint64_t wval, void *arg) return (0); } +static int +vmm_write_oslar_el1(struct vcpu *vcpu, uint64_t wval, void *arg) +{ + struct hypctx *hypctx; + + hypctx = vcpu_get_cookie(vcpu); + /* All other fields are RES0 & we don't do anything with this */ + /* TODO: Disable access to other debug state when locked */ + hypctx->dbg_oslock = (wval & OSLAR_OSLK) == OSLAR_OSLK; + return (0); +} + +static int +vmm_read_oslsr_el1(struct vcpu *vcpu, uint64_t *rval, void *arg) +{ + struct hypctx *hypctx; + uint64_t val; + + hypctx = vcpu_get_cookie(vcpu); + val = OSLSR_OSLM_1; + if (hypctx->dbg_oslock) + val |= OSLSR_OSLK; + *rval = val; + + return (0); +} + static const struct vmm_special_reg vmm_special_regs[] = { #define SPECIAL_REG(_reg, _read, _write) \ { \ @@ -707,6 +734,13 @@ static const struct vmm_special_reg vmm_special_regs[] = { SPECIAL_REG(CNTP_TVAL_EL0, vtimer_phys_tval_read, vtimer_phys_tval_write), SPECIAL_REG(CNTPCT_EL0, vtimer_phys_cnt_read, vtimer_phys_cnt_write), + + /* Debug registers */ + SPECIAL_REG(DBGPRCR_EL1, vmm_reg_raz, vmm_reg_wi), + SPECIAL_REG(OSDLR_EL1, vmm_reg_raz, vmm_reg_wi), + /* TODO: Exceptions on invalid access */ + SPECIAL_REG(OSLAR_EL1, vmm_reg_raz, vmm_write_oslar_el1), + SPECIAL_REG(OSLSR_EL1, vmm_read_oslsr_el1, vmm_reg_wi), #undef SPECIAL_REG }; diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 1facab47473c..0d844a6fbf9e 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -44,6 +44,7 @@ #include <sys/malloc.h> #include <sys/endian.h> #include <sys/cons.h> +#include <sys/power.h> #include <sys/proc.h> #include <sys/reboot.h> #include <sys/sbuf.h> @@ -878,8 +879,8 @@ static int adaerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags); static callout_func_t adasendorderedtag; static void adashutdown(void *arg, int howto); -static void adasuspend(void *arg); -static void adaresume(void *arg); +static void adasuspend(void *arg, enum power_stype stype); +static void adaresume(void *arg, enum power_stype stype); #ifndef ADA_DEFAULT_TIMEOUT #define ADA_DEFAULT_TIMEOUT 30 /* Timeout in seconds */ @@ -3747,7 +3748,7 @@ adashutdown(void *arg, int howto) } static void -adasuspend(void *arg) +adasuspend(void *arg, enum power_stype stype) { adaflush(); @@ -3760,7 +3761,7 @@ adasuspend(void *arg) } static void -adaresume(void *arg) +adaresume(void *arg, enum power_stype stype) { struct cam_periph *periph; struct ada_softc *softc; diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 1c0d5e8381d8..9c4707da482c 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -43,6 +43,7 @@ #include <sys/eventhandler.h> #include <sys/malloc.h> #include <sys/cons.h> +#include <sys/power.h> #include <sys/proc.h> #include <sys/reboot.h> #include <sys/sbuf.h> @@ -159,7 +160,7 @@ static void ndadone(struct cam_periph *periph, static int ndaerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags); static void ndashutdown(void *arg, int howto); -static void ndasuspend(void *arg); +static void ndasuspend(void *arg, enum power_stype stype); #ifndef NDA_DEFAULT_SEND_ORDERED #define NDA_DEFAULT_SEND_ORDERED 1 @@ -1365,7 +1366,7 @@ ndashutdown(void *arg, int howto) } static void -ndasuspend(void *arg) +ndasuspend(void *arg, enum power_stype stype) { ndaflush(); diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index 43783bb8727b..c7d62c745c7e 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -33,6 +33,7 @@ #include <sys/bus.h> #include <sys/eventhandler.h> #include <sys/kernel.h> +#include <sys/power.h> #include <contrib/dev/acpica/include/acpi.h> #include <dev/acpica/acpivar.h> @@ -118,20 +119,32 @@ acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, } static void -linux_handle_power_suspend_event(void *arg __unused) +linux_handle_power_suspend_event(void *arg __unused, enum power_stype stype) { - /* - * Only support S3 for now. - * acpi_sleep_event isn't always called so we use power_suspend_early - * instead which means we don't know what state we're switching to. - * TODO: Make acpi_sleep_event consistent - */ - linux_acpi_target_sleep_state = ACPI_STATE_S3; - pm_suspend_target_state = PM_SUSPEND_MEM; + switch (stype) { + case POWER_STYPE_SUSPEND_TO_IDLE: + /* + * XXX: obiwac Not 100% sure this is correct, but + * acpi_target_sleep_state does seem to be set to + * ACPI_STATE_S3 during s2idle on Linux. + */ + linux_acpi_target_sleep_state = ACPI_STATE_S3; + pm_suspend_target_state = PM_SUSPEND_TO_IDLE; + break; + case POWER_STYPE_SUSPEND_TO_MEM: + linux_acpi_target_sleep_state = ACPI_STATE_S3; + pm_suspend_target_state = PM_SUSPEND_MEM; + break; + default: + printf("%s: sleep type %d not yet supported\n", + __func__, stype); + break; + } } static void -linux_handle_power_resume_event(void *arg __unused) +linux_handle_power_resume_event(void *arg __unused, + enum power_stype stype __unused) { linux_acpi_target_sleep_state = ACPI_STATE_S0; pm_suspend_target_state = PM_SUSPEND_ON; diff --git a/sys/contrib/openzfs/.github/ISSUE_TEMPLATE/feature_request.md b/sys/contrib/openzfs/.github/ISSUE_TEMPLATE/feature_request.md index 9b50a4a3d96e..f3d4316f6f67 100644 --- a/sys/contrib/openzfs/.github/ISSUE_TEMPLATE/feature_request.md +++ b/sys/contrib/openzfs/.github/ISSUE_TEMPLATE/feature_request.md @@ -14,7 +14,7 @@ Please check our issue tracker before opening a new feature request. Filling out the following template will help other contributors better understand your proposed feature. --> -### Describe the feature would like to see added to OpenZFS +### Describe the feature you would like to see added to OpenZFS <!-- Provide a clear and concise description of the feature. diff --git a/sys/contrib/openzfs/.github/PULL_REQUEST_TEMPLATE.md b/sys/contrib/openzfs/.github/PULL_REQUEST_TEMPLATE.md index 79809179cf13..47edc8174603 100644 --- a/sys/contrib/openzfs/.github/PULL_REQUEST_TEMPLATE.md +++ b/sys/contrib/openzfs/.github/PULL_REQUEST_TEMPLATE.md @@ -2,11 +2,6 @@ <!--- Provide a general summary of your changes in the Title above --> -<!--- -Documentation on ZFS Buildbot options can be found at -https://openzfs.github.io/openzfs-docs/Developer%20Resources/Buildbot%20Options.html ---> - ### Motivation and Context <!--- Why is this change required? What problem does it solve? --> <!--- If it fixes an open issue, please link to the issue here. --> diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh index 8439942c5a41..1c608348ffcd 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh @@ -121,7 +121,7 @@ case "$OS" in KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" ;; freebsd15-0c) - FreeBSD="15.0-ALPHA2" + FreeBSD="15.0-ALPHA3" OSNAME="FreeBSD $FreeBSD" OSv="freebsd14.0" URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh index ee058b488088..f67bb2f68e94 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-3-deps-vm.sh @@ -20,7 +20,7 @@ function archlinux() { sudo pacman -Sy --noconfirm base-devel bc cpio cryptsetup dhclient dkms \ fakeroot fio gdb inetutils jq less linux linux-headers lsscsi nfs-utils \ parted pax perf python-packaging python-setuptools qemu-guest-agent ksh \ - samba sysstat rng-tools rsync wget xxhash + samba strace sysstat rng-tools rsync wget xxhash echo "##[endgroup]" } @@ -43,7 +43,8 @@ function debian() { lsscsi nfs-kernel-server pamtester parted python3 python3-all-dev \ python3-cffi python3-dev python3-distlib python3-packaging libtirpc-dev \ python3-setuptools python3-sphinx qemu-guest-agent rng-tools rpm2cpio \ - rsync samba sysstat uuid-dev watchdog wget xfslibs-dev xxhash zlib1g-dev + rsync samba strace sysstat uuid-dev watchdog wget xfslibs-dev xxhash \ + zlib1g-dev echo "##[endgroup]" } @@ -87,8 +88,8 @@ function rhel() { libuuid-devel lsscsi mdadm nfs-utils openssl-devel pam-devel pamtester \ parted perf python3 python3-cffi python3-devel python3-packaging \ kernel-devel python3-setuptools qemu-guest-agent rng-tools rpcgen \ - rpm-build rsync samba sysstat systemd watchdog wget xfsprogs-devel xxhash \ - zlib-devel + rpm-build rsync samba strace sysstat systemd watchdog wget xfsprogs-devel \ + xxhash zlib-devel echo "##[endgroup]" } @@ -104,7 +105,7 @@ function install_fedora_experimental_kernel { our_version="$1" sudo dnf -y copr enable @kernel-vanilla/stable sudo dnf -y copr enable @kernel-vanilla/mainline - all="$(sudo dnf list --showduplicates kernel-*)" + all="$(sudo dnf list --showduplicates kernel-* python3-perf* perf* bpftool*)" echo "Available versions:" echo "$all" diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-5-setup.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-5-setup.sh index 0adcad2a99bc..4869c1003e48 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-5-setup.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-5-setup.sh @@ -108,19 +108,30 @@ echo '*/5 * * * * /root/cronjob.sh' > crontab.txt sudo crontab crontab.txt rm crontab.txt -# check if the machines are okay -echo "Waiting for vm's to come up... (${VMs}x CPU=$CPU RAM=$RAM)" -for ((i=1; i<=VMs; i++)); do - .github/workflows/scripts/qemu-wait-for-vm.sh vm$i -done -echo "All $VMs VMs are up now." - # Save the VM's serial output (ttyS0) to /var/tmp/console.txt # - ttyS0 on the VM corresponds to a local /dev/pty/N entry # - use 'virsh ttyconsole' to lookup the /dev/pty/N entry for ((i=1; i<=VMs; i++)); do mkdir -p $RESPATH/vm$i read "pty" <<< $(sudo virsh ttyconsole vm$i) + + # Create the file so we can tail it, even if there's no output. + touch $RESPATH/vm$i/console.txt + sudo nohup bash -c "cat $pty > $RESPATH/vm$i/console.txt" & + + # Write all VM boot lines to the console to aid in debugging failed boots. + # The boot lines from all the VMs will be munged together, so prepend each + # line with the vm hostname (like 'vm1:'). + (while IFS=$'\n' read -r line; do echo "vm$i: $line" ; done < <(sudo tail -f $RESPATH/vm$i/console.txt)) & + done echo "Console logging for ${VMs}x $OS started." + + +# check if the machines are okay +echo "Waiting for vm's to come up... (${VMs}x CPU=$CPU RAM=$RAM)" +for ((i=1; i<=VMs; i++)); do + .github/workflows/scripts/qemu-wait-for-vm.sh vm$i +done +echo "All $VMs VMs are up now." diff --git a/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh b/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh index 5ab822f4f076..ca6ac77f146d 100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/qemu-6-tests.sh @@ -111,7 +111,7 @@ fi sudo dmesg -c > dmesg-prerun.txt mount > mount.txt df -h > df-prerun.txt -$TDIR/zfs-tests.sh -vK -s 3GB -T $TAGS +$TDIR/zfs-tests.sh -vKO -s 3GB -T $TAGS RV=$? df -h > df-postrun.txt echo $RV > tests-exitcode.txt diff --git a/sys/contrib/openzfs/META b/sys/contrib/openzfs/META index 5704b5c6de8a..bdb7aee48041 100644 --- a/sys/contrib/openzfs/META +++ b/sys/contrib/openzfs/META @@ -6,5 +6,5 @@ Release: 1 Release-Tags: relext License: CDDL Author: OpenZFS -Linux-Maximum: 6.16 +Linux-Maximum: 6.17 Linux-Minimum: 4.18 diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c index d655fa715e15..70a4ed46f263 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -3301,6 +3301,7 @@ zdb_derive_key(dsl_dir_t *dd, uint8_t *key_out) uint64_t keyformat, salt, iters; int i; unsigned char c; + FILE *f; VERIFY0(zap_lookup(dd->dd_pool->dp_meta_objset, dd->dd_crypto_obj, zfs_prop_to_name(ZFS_PROP_KEYFORMAT), sizeof (uint64_t), @@ -3333,6 +3334,25 @@ zdb_derive_key(dsl_dir_t *dd, uint8_t *key_out) break; + case ZFS_KEYFORMAT_RAW: + if ((f = fopen(key_material, "r")) == NULL) + return (B_FALSE); + + if (fread(key_out, 1, WRAPPING_KEY_LEN, f) != + WRAPPING_KEY_LEN) { + (void) fclose(f); + return (B_FALSE); + } + + /* Check the key length */ + if (fgetc(f) != EOF) { + (void) fclose(f); + return (B_FALSE); + } + + (void) fclose(f); + break; + default: fatal("no support for key format %u\n", (unsigned int) keyformat); diff --git a/sys/contrib/openzfs/cmd/zfs/zfs_main.c b/sys/contrib/openzfs/cmd/zfs/zfs_main.c index 484986bde719..ccdd5ffef8e6 100644 --- a/sys/contrib/openzfs/cmd/zfs/zfs_main.c +++ b/sys/contrib/openzfs/cmd/zfs/zfs_main.c @@ -914,7 +914,11 @@ zfs_do_clone(int argc, char **argv) log_history = B_FALSE; } - ret = zfs_mount_and_share(g_zfs, argv[1], ZFS_TYPE_DATASET); + /* + * Dataset cloned successfully, mount/share failures are + * non-fatal. + */ + (void) zfs_mount_and_share(g_zfs, argv[1], ZFS_TYPE_DATASET); } zfs_close(zhp); @@ -930,19 +934,15 @@ usage: } /* - * Return a default volblocksize for the pool which always uses more than - * half of the data sectors. This primarily applies to dRAID which always - * writes full stripe widths. + * Calculate the minimum allocation size based on the top-level vdevs. */ static uint64_t -default_volblocksize(zpool_handle_t *zhp, nvlist_t *props) +calculate_volblocksize(nvlist_t *config) { - uint64_t volblocksize, asize = SPA_MINBLOCKSIZE; + uint64_t asize = SPA_MINBLOCKSIZE; nvlist_t *tree, **vdevs; uint_t nvdevs; - nvlist_t *config = zpool_get_config(zhp, NULL); - if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &tree) != 0 || nvlist_lookup_nvlist_array(tree, ZPOOL_CONFIG_CHILDREN, &vdevs, &nvdevs) != 0) { @@ -973,6 +973,24 @@ default_volblocksize(zpool_handle_t *zhp, nvlist_t *props) } } + return (asize); +} + +/* + * Return a default volblocksize for the pool which always uses more than + * half of the data sectors. This primarily applies to dRAID which always + * writes full stripe widths. + */ +static uint64_t +default_volblocksize(zpool_handle_t *zhp, nvlist_t *props) +{ + uint64_t volblocksize, asize = SPA_MINBLOCKSIZE; + + nvlist_t *config = zpool_get_config(zhp, NULL); + + if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_MAX_ALLOC, &asize) != 0) + asize = calculate_volblocksize(config); + /* * Calculate the target volblocksize such that more than half * of the asize is used. The following table is for 4k sectors. @@ -1319,7 +1337,9 @@ zfs_do_create(int argc, char **argv) goto error; } - ret = zfs_mount_and_share(g_zfs, argv[0], ZFS_TYPE_DATASET); + /* Dataset created successfully, mount/share failures are non-fatal */ + ret = 0; + (void) zfs_mount_and_share(g_zfs, argv[0], ZFS_TYPE_DATASET); error: nvlist_free(props); return (ret); diff --git a/sys/contrib/openzfs/cmd/zinject/zinject.c b/sys/contrib/openzfs/cmd/zinject/zinject.c index 113797c878b9..c2f646f2567d 100644 --- a/sys/contrib/openzfs/cmd/zinject/zinject.c +++ b/sys/contrib/openzfs/cmd/zinject/zinject.c @@ -107,6 +107,8 @@ * zinject * zinject <-a | -u pool> * zinject -c <id|all> + * zinject -E <delay> [-a] [-m] [-f freq] [-l level] [-r range] + * [-T iotype] [-t type object | -b bookmark pool] * zinject [-q] <-t type> [-f freq] [-u] [-a] [-m] [-e errno] [-l level] * [-r range] <object> * zinject [-f freq] [-a] [-m] [-u] -b objset:object:level:start:end pool @@ -132,14 +134,18 @@ * The '-f' flag controls the frequency of errors injected, expressed as a * real number percentage between 0.0001 and 100. The default is 100. * - * The this form is responsible for actually injecting the handler into the + * The <object> form is responsible for actually injecting the handler into the * framework. It takes the arguments described above, translates them to the * internal tuple using libzpool, and then issues an ioctl() to register the * handler. * - * The final form can target a specific bookmark, regardless of whether a + * The '-b' option can target a specific bookmark, regardless of whether a * human-readable interface has been designed. It allows developers to specify * a particular block by number. + * + * The '-E' option injects pipeline ready stage delays for the given object or + * bookmark. The delay is specified in milliseconds, and it supports I/O type + * and range filters. */ #include <errno.h> @@ -346,6 +352,13 @@ usage(void) "\t\tsuch that the operation takes a minimum of supplied seconds\n" "\t\tto complete.\n" "\n" + "\tzinject -E <delay> [-a] [-m] [-f freq] [-l level] [-r range]\n" + "\t\t[-T iotype] [-t type object | -b bookmark pool]\n" + "\n" + "\t\tInject pipeline ready stage delays for the given object path\n" + "\t\t(data or dnode) or raw bookmark. The delay is specified in\n" + "\t\tmilliseconds.\n" + "\n" "\tzinject -I [-s <seconds> | -g <txgs>] pool\n" "\t\tCause the pool to stop writing blocks yet not\n" "\t\treport errors for a duration. Simulates buggy hardware\n" @@ -724,12 +737,15 @@ register_handler(const char *pool, int flags, zinject_record_t *record, if (quiet) { (void) printf("%llu\n", (u_longlong_t)zc.zc_guid); } else { + boolean_t show_object = B_FALSE; + boolean_t show_iotype = B_FALSE; (void) printf("Added handler %llu with the following " "properties:\n", (u_longlong_t)zc.zc_guid); (void) printf(" pool: %s\n", pool); if (record->zi_guid) { (void) printf(" vdev: %llx\n", (u_longlong_t)record->zi_guid); + show_iotype = B_TRUE; } else if (record->zi_func[0] != '\0') { (void) printf(" panic function: %s\n", record->zi_func); @@ -742,7 +758,18 @@ register_handler(const char *pool, int flags, zinject_record_t *record, } else if (record->zi_timer > 0) { (void) printf(" timer: %lld ms\n", (u_longlong_t)NSEC2MSEC(record->zi_timer)); + if (record->zi_cmd == ZINJECT_DELAY_READY) { + show_object = B_TRUE; + show_iotype = B_TRUE; + } } else { + show_object = B_TRUE; + } + if (show_iotype) { + (void) printf("iotype: %s\n", + iotype_to_str(record->zi_iotype)); + } + if (show_object) { (void) printf("objset: %llu\n", (u_longlong_t)record->zi_objset); (void) printf("object: %llu\n", @@ -910,6 +937,7 @@ main(int argc, char **argv) int ret; int flags = 0; uint32_t dvas = 0; + hrtime_t ready_delay = -1; if ((g_zfs = libzfs_init()) == NULL) { (void) fprintf(stderr, "%s\n", libzfs_error_init(errno)); @@ -940,7 +968,7 @@ main(int argc, char **argv) } while ((c = getopt(argc, argv, - ":aA:b:C:d:D:f:Fg:qhIc:t:T:l:mr:s:e:uL:p:P:")) != -1) { + ":aA:b:C:d:D:E:f:Fg:qhIc:t:T:l:mr:s:e:uL:p:P:")) != -1) { switch (c) { case 'a': flags |= ZINJECT_FLUSH_ARC; @@ -1113,6 +1141,18 @@ main(int argc, char **argv) case 'u': flags |= ZINJECT_UNLOAD_SPA; break; + case 'E': + ready_delay = MSEC2NSEC(strtol(optarg, &end, 10)); + if (ready_delay <= 0 || *end != '\0') { + (void) fprintf(stderr, "invalid delay '%s': " + "must be a positive duration\n", optarg); + usage(); + libzfs_fini(g_zfs); + return (1); + } + record.zi_cmd = ZINJECT_DELAY_READY; + record.zi_timer = ready_delay; + break; case 'L': if ((label = name_to_type(optarg)) == TYPE_INVAL && !LABEL_TYPE(type)) { @@ -1150,7 +1190,7 @@ main(int argc, char **argv) */ if (raw != NULL || range != NULL || type != TYPE_INVAL || level != 0 || record.zi_cmd != ZINJECT_UNINITIALIZED || - record.zi_freq > 0 || dvas != 0) { + record.zi_freq > 0 || dvas != 0 || ready_delay >= 0) { (void) fprintf(stderr, "cancel (-c) incompatible with " "any other options\n"); usage(); @@ -1186,7 +1226,7 @@ main(int argc, char **argv) */ if (raw != NULL || range != NULL || type != TYPE_INVAL || level != 0 || record.zi_cmd != ZINJECT_UNINITIALIZED || - dvas != 0) { + dvas != 0 || ready_delay >= 0) { (void) fprintf(stderr, "device (-d) incompatible with " "data error injection\n"); usage(); @@ -1276,13 +1316,23 @@ main(int argc, char **argv) return (1); } - record.zi_cmd = ZINJECT_DATA_FAULT; + if (record.zi_cmd == ZINJECT_UNINITIALIZED) { + record.zi_cmd = ZINJECT_DATA_FAULT; + if (!error) + error = EIO; + } else if (error != 0) { + (void) fprintf(stderr, "error type -e incompatible " + "with delay injection\n"); + libzfs_fini(g_zfs); + return (1); + } else { + record.zi_iotype = io_type; + } + if (translate_raw(raw, &record) != 0) { libzfs_fini(g_zfs); return (1); } - if (!error) - error = EIO; } else if (record.zi_cmd == ZINJECT_PANIC) { if (raw != NULL || range != NULL || type != TYPE_INVAL || level != 0 || device != NULL || record.zi_freq > 0 || @@ -1410,6 +1460,13 @@ main(int argc, char **argv) record.zi_dvas = dvas; } + if (record.zi_cmd != ZINJECT_UNINITIALIZED && error != 0) { + (void) fprintf(stderr, "error type -e incompatible " + "with delay injection\n"); + libzfs_fini(g_zfs); + return (1); + } + if (error == EACCES) { if (type != TYPE_DATA) { (void) fprintf(stderr, "decryption errors " @@ -1425,8 +1482,12 @@ main(int argc, char **argv) * not found. */ error = ECKSUM; - } else { + } else if (record.zi_cmd == ZINJECT_UNINITIALIZED) { record.zi_cmd = ZINJECT_DATA_FAULT; + if (!error) + error = EIO; + } else { + record.zi_iotype = io_type; } if (translate_record(type, argv[0], range, level, &record, pool, @@ -1434,8 +1495,6 @@ main(int argc, char **argv) libzfs_fini(g_zfs); return (1); } - if (!error) - error = EIO; } /* diff --git a/sys/contrib/openzfs/cmd/zpool/zpool_iter.c b/sys/contrib/openzfs/cmd/zpool/zpool_iter.c index 2eec9a95e24c..fef602736705 100644 --- a/sys/contrib/openzfs/cmd/zpool/zpool_iter.c +++ b/sys/contrib/openzfs/cmd/zpool/zpool_iter.c @@ -26,6 +26,7 @@ /* * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>. + * Copyright (c) 2025, Klara, Inc. */ #include <libintl.h> @@ -52,7 +53,7 @@ typedef struct zpool_node { zpool_handle_t *zn_handle; uu_avl_node_t zn_avlnode; - int zn_mark; + hrtime_t zn_last_refresh; } zpool_node_t; struct zpool_list { @@ -62,6 +63,7 @@ struct zpool_list { uu_avl_pool_t *zl_pool; zprop_list_t **zl_proplist; zfs_type_t zl_type; + hrtime_t zl_last_refresh; }; static int @@ -81,26 +83,30 @@ zpool_compare(const void *larg, const void *rarg, void *unused) * of known pools. */ static int -add_pool(zpool_handle_t *zhp, void *data) +add_pool(zpool_handle_t *zhp, zpool_list_t *zlp) { - zpool_list_t *zlp = data; - zpool_node_t *node = safe_malloc(sizeof (zpool_node_t)); + zpool_node_t *node, *new = safe_malloc(sizeof (zpool_node_t)); uu_avl_index_t idx; - node->zn_handle = zhp; - uu_avl_node_init(node, &node->zn_avlnode, zlp->zl_pool); - if (uu_avl_find(zlp->zl_avl, node, NULL, &idx) == NULL) { + new->zn_handle = zhp; + uu_avl_node_init(new, &new->zn_avlnode, zlp->zl_pool); + + node = uu_avl_find(zlp->zl_avl, new, NULL, &idx); + if (node == NULL) { if (zlp->zl_proplist && zpool_expand_proplist(zhp, zlp->zl_proplist, zlp->zl_type, zlp->zl_literal) != 0) { zpool_close(zhp); - free(node); + free(new); return (-1); } - uu_avl_insert(zlp->zl_avl, node, idx); + new->zn_last_refresh = zlp->zl_last_refresh; + uu_avl_insert(zlp->zl_avl, new, idx); } else { + zpool_refresh_stats_from_handle(node->zn_handle, zhp); + node->zn_last_refresh = zlp->zl_last_refresh; zpool_close(zhp); - free(node); + free(new); return (-1); } @@ -108,6 +114,18 @@ add_pool(zpool_handle_t *zhp, void *data) } /* + * add_pool(), but always returns 0. This allows zpool_iter() to continue + * even if a pool exists in the tree, or we fail to get the properties for + * a new one. + */ +static int +add_pool_cb(zpool_handle_t *zhp, void *data) +{ + (void) add_pool(zhp, data); + return (0); +} + +/* * Create a list of pools based on the given arguments. If we're given no * arguments, then iterate over all pools in the system and add them to the AVL * tree. Otherwise, add only those pool explicitly specified on the command @@ -135,9 +153,10 @@ pool_list_get(int argc, char **argv, zprop_list_t **proplist, zfs_type_t type, zlp->zl_type = type; zlp->zl_literal = literal; + zlp->zl_last_refresh = gethrtime(); if (argc == 0) { - (void) zpool_iter(g_zfs, add_pool, zlp); + (void) zpool_iter(g_zfs, add_pool_cb, zlp); zlp->zl_findall = B_TRUE; } else { int i; @@ -159,15 +178,61 @@ pool_list_get(int argc, char **argv, zprop_list_t **proplist, zfs_type_t type, } /* - * Search for any new pools, adding them to the list. We only add pools when no - * options were given on the command line. Otherwise, we keep the list fixed as - * those that were explicitly specified. + * Refresh the state of all pools on the list. Additionally, if no options were + * given on the command line, add any new pools and remove any that are no + * longer available. */ -void -pool_list_update(zpool_list_t *zlp) +int +pool_list_refresh(zpool_list_t *zlp) { - if (zlp->zl_findall) - (void) zpool_iter(g_zfs, add_pool, zlp); + zlp->zl_last_refresh = gethrtime(); + + if (!zlp->zl_findall) { + /* + * This list is a fixed list of pools, so we must not add + * or remove any. Just walk over them and refresh their + * state. + */ + int navail = 0; + for (zpool_node_t *node = uu_avl_first(zlp->zl_avl); + node != NULL; node = uu_avl_next(zlp->zl_avl, node)) { + boolean_t missing; + zpool_refresh_stats(node->zn_handle, &missing); + navail += !missing; + node->zn_last_refresh = zlp->zl_last_refresh; + } + return (navail); + } + + /* Search for any new pools and add them to the list. */ + (void) zpool_iter(g_zfs, add_pool_cb, zlp); + + /* Walk the list of existing pools, and update or remove them. */ + zpool_node_t *node, *next; + for (node = uu_avl_first(zlp->zl_avl); node != NULL; node = next) { + next = uu_avl_next(zlp->zl_avl, node); + + /* + * Skip any that were refreshed and are online; they were added + * by zpool_iter() and are already up to date. + */ + if (node->zn_last_refresh == zlp->zl_last_refresh && + zpool_get_state(node->zn_handle) != POOL_STATE_UNAVAIL) + continue; + + /* Refresh and remove if necessary. */ + boolean_t missing; + zpool_refresh_stats(node->zn_handle, &missing); + if (missing) { + uu_avl_remove(zlp->zl_avl, node); + zpool_close(node->zn_handle); + free(node); + } else { + node->zn_last_refresh = zlp->zl_last_refresh; + } + } + + return (uu_avl_numnodes(zlp->zl_avl)); } /* @@ -191,23 +256,6 @@ pool_list_iter(zpool_list_t *zlp, int unavail, zpool_iter_f func, } /* - * Remove the given pool from the list. When running iostat, we want to remove - * those pools that no longer exist. - */ -void -pool_list_remove(zpool_list_t *zlp, zpool_handle_t *zhp) -{ - zpool_node_t search, *node; - - search.zn_handle = zhp; - if ((node = uu_avl_find(zlp->zl_avl, &search, NULL, NULL)) != NULL) { - uu_avl_remove(zlp->zl_avl, node); - zpool_close(node->zn_handle); - free(node); - } -} - -/* * Free all the handles associated with this list. */ void diff --git a/sys/contrib/openzfs/cmd/zpool/zpool_main.c b/sys/contrib/openzfs/cmd/zpool/zpool_main.c index 2c46ad0df895..1feec55c0e8b 100644 --- a/sys/contrib/openzfs/cmd/zpool/zpool_main.c +++ b/sys/contrib/openzfs/cmd/zpool/zpool_main.c @@ -33,7 +33,7 @@ * Copyright (c) 2017, Intel Corporation. * Copyright (c) 2019, loli10K <ezomori.nozomu@gmail.com> * Copyright (c) 2021, Colm Buckley <colm@tuatha.org> - * Copyright (c) 2021, 2023, Klara Inc. + * Copyright (c) 2021, 2023, 2025, Klara, Inc. * Copyright (c) 2021, 2025 Hewlett Packard Enterprise Development LP. */ @@ -5761,24 +5761,6 @@ children: return (ret); } -static int -refresh_iostat(zpool_handle_t *zhp, void *data) -{ - iostat_cbdata_t *cb = data; - boolean_t missing; - - /* - * If the pool has disappeared, remove it from the list and continue. - */ - if (zpool_refresh_stats(zhp, &missing) != 0) - return (-1); - - if (missing) - pool_list_remove(cb->cb_list, zhp); - - return (0); -} - /* * Callback to print out the iostats for the given pool. */ @@ -6359,15 +6341,14 @@ get_namewidth_iostat(zpool_handle_t *zhp, void *data) * This command can be tricky because we want to be able to deal with pool * creation/destruction as well as vdev configuration changes. The bulk of this * processing is handled by the pool_list_* routines in zpool_iter.c. We rely - * on pool_list_update() to detect the addition of new pools. Configuration - * changes are all handled within libzfs. + * on pool_list_refresh() to detect the addition and removal of pools. + * Configuration changes are all handled within libzfs. */ int zpool_do_iostat(int argc, char **argv) { int c; int ret; - int npools; float interval = 0; unsigned long count = 0; zpool_list_t *list; @@ -6618,10 +6599,24 @@ zpool_do_iostat(int argc, char **argv) return (1); } + int last_npools = 0; for (;;) { - if ((npools = pool_list_count(list)) == 0) + /* + * Refresh all pools in list, adding or removing pools as + * necessary. + */ + int npools = pool_list_refresh(list); + if (npools == 0) { (void) fprintf(stderr, gettext("no pools available\n")); - else { + } else { + /* + * If the list of pools has changed since last time + * around, reset the iteration count to force the + * header to be redisplayed. + */ + if (last_npools != npools) + cb.cb_iteration = 0; + /* * If this is the first iteration and -y was supplied * we skip any printing. @@ -6630,15 +6625,6 @@ zpool_do_iostat(int argc, char **argv) cb.cb_iteration == 0); /* - * Refresh all statistics. This is done as an - * explicit step before calculating the maximum name - * width, so that any * configuration changes are - * properly accounted for. - */ - (void) pool_list_iter(list, B_FALSE, refresh_iostat, - &cb); - - /* * Iterate over all pools to determine the maximum width * for the pool / device name column across all pools. */ @@ -6691,6 +6677,7 @@ zpool_do_iostat(int argc, char **argv) if (skip) { (void) fflush(stdout); (void) fsleep(interval); + last_npools = npools; continue; } @@ -6728,6 +6715,8 @@ zpool_do_iostat(int argc, char **argv) (void) fflush(stdout); (void) fsleep(interval); + + last_npools = npools; } pool_list_free(list); diff --git a/sys/contrib/openzfs/cmd/zpool/zpool_util.h b/sys/contrib/openzfs/cmd/zpool/zpool_util.h index 5ab7cb9750f1..3af23c52bd45 100644 --- a/sys/contrib/openzfs/cmd/zpool/zpool_util.h +++ b/sys/contrib/openzfs/cmd/zpool/zpool_util.h @@ -76,11 +76,10 @@ typedef struct zpool_list zpool_list_t; zpool_list_t *pool_list_get(int, char **, zprop_list_t **, zfs_type_t, boolean_t, int *); -void pool_list_update(zpool_list_t *); +int pool_list_refresh(zpool_list_t *); int pool_list_iter(zpool_list_t *, int unavail, zpool_iter_f, void *); void pool_list_free(zpool_list_t *); int pool_list_count(zpool_list_t *); -void pool_list_remove(zpool_list_t *, zpool_handle_t *); extern libzfs_handle_t *g_zfs; diff --git a/sys/contrib/openzfs/cmd/zpool/zpool_vdev.c b/sys/contrib/openzfs/cmd/zpool/zpool_vdev.c index 684b46a2d673..088c0108e911 100644 --- a/sys/contrib/openzfs/cmd/zpool/zpool_vdev.c +++ b/sys/contrib/openzfs/cmd/zpool/zpool_vdev.c @@ -609,22 +609,28 @@ get_replication(nvlist_t *nvroot, boolean_t fatal) ZPOOL_CONFIG_PATH, &path) == 0); /* + * Skip active spares they should never cause + * the pool to be evaluated as inconsistent. + */ + if (is_spare(NULL, path)) + continue; + + /* * If we have a raidz/mirror that combines disks - * with files, report it as an error. + * with files, only report it as an error when + * fatal is set to ensure all the replication + * checks aren't skipped in check_replication(). */ - if (!dontreport && type != NULL && + if (fatal && !dontreport && type != NULL && strcmp(type, childtype) != 0) { if (ret != NULL) free(ret); ret = NULL; - if (fatal) - vdev_error(gettext( - "mismatched replication " - "level: %s contains both " - "files and devices\n"), - rep.zprl_type); - else - return (NULL); + vdev_error(gettext( + "mismatched replication " + "level: %s contains both " + "files and devices\n"), + rep.zprl_type); dontreport = B_TRUE; } diff --git a/sys/contrib/openzfs/contrib/intel_qat/readme.md b/sys/contrib/openzfs/contrib/intel_qat/readme.md index 7e45d395bb80..04c299b6404c 100644 --- a/sys/contrib/openzfs/contrib/intel_qat/readme.md +++ b/sys/contrib/openzfs/contrib/intel_qat/readme.md @@ -8,7 +8,7 @@ This contrib contains community compatibility patches to get Intel QAT working o These patches are based on the following Intel QAT version: [1.7.l.4.10.0-00014](https://01.org/sites/default/files/downloads/qat1.7.l.4.10.0-00014.tar.gz) -When using QAT with above kernels versions, the following patches needs to be applied using: +When using QAT with the above kernel versions, the following patches need to be applied using: patch -p1 < _$PATCH_ _Where $PATCH refers to the path of the patch in question_ diff --git a/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py b/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py index 971aa1d0d493..bad1af2d1671 100644 --- a/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py +++ b/sys/contrib/openzfs/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py @@ -4223,7 +4223,7 @@ class _TempPool(object): self.getRoot().reset() return - # On the Buildbot builders this may fail with "pool is busy" + # On the CI builders this may fail with "pool is busy" # Retry 5 times before raising an error retry = 0 while True: diff --git a/sys/contrib/openzfs/etc/init.d/README.md b/sys/contrib/openzfs/etc/init.d/README.md index da780fdc1222..3852dd9a6b2e 100644 --- a/sys/contrib/openzfs/etc/init.d/README.md +++ b/sys/contrib/openzfs/etc/init.d/README.md @@ -1,5 +1,5 @@ DESCRIPTION - These script were written with the primary intention of being portable and + These scripts were written with the primary intention of being portable and usable on as many systems as possible. This is, in practice, usually not possible. But the intention is there. diff --git a/sys/contrib/openzfs/include/libzfs.h b/sys/contrib/openzfs/include/libzfs.h index 3fcdc176a621..14930fb90622 100644 --- a/sys/contrib/openzfs/include/libzfs.h +++ b/sys/contrib/openzfs/include/libzfs.h @@ -479,6 +479,8 @@ _LIBZFS_H zpool_status_t zpool_import_status(nvlist_t *, const char **, _LIBZFS_H nvlist_t *zpool_get_config(zpool_handle_t *, nvlist_t **); _LIBZFS_H nvlist_t *zpool_get_features(zpool_handle_t *); _LIBZFS_H int zpool_refresh_stats(zpool_handle_t *, boolean_t *); +_LIBZFS_H void zpool_refresh_stats_from_handle(zpool_handle_t *, + zpool_handle_t *); _LIBZFS_H int zpool_get_errlog(zpool_handle_t *, nvlist_t **); _LIBZFS_H void zpool_add_propname(zpool_handle_t *, const char *); diff --git a/sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h b/sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h index 076dab8ba6dc..214f3ea0e787 100644 --- a/sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h +++ b/sys/contrib/openzfs/include/os/linux/kernel/linux/blkdev_compat.h @@ -542,24 +542,6 @@ blk_generic_alloc_queue(make_request_fn make_request, int node_id) } #endif /* !HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ -/* - * All the io_*() helper functions below can operate on a bio, or a rq, but - * not both. The older submit_bio() codepath will pass a bio, and the - * newer blk-mq codepath will pass a rq. - */ -static inline int -io_data_dir(struct bio *bio, struct request *rq) -{ - if (rq != NULL) { - if (op_is_write(req_op(rq))) { - return (WRITE); - } else { - return (READ); - } - } - return (bio_data_dir(bio)); -} - static inline int io_is_flush(struct bio *bio, struct request *rq) { diff --git a/sys/contrib/openzfs/include/sys/fs/zfs.h b/sys/contrib/openzfs/include/sys/fs/zfs.h index 49ab9d3db795..662fd81c5ee1 100644 --- a/sys/contrib/openzfs/include/sys/fs/zfs.h +++ b/sys/contrib/openzfs/include/sys/fs/zfs.h @@ -748,6 +748,8 @@ typedef struct zpool_load_policy { #define ZPOOL_CONFIG_METASLAB_SHIFT "metaslab_shift" #define ZPOOL_CONFIG_ASHIFT "ashift" #define ZPOOL_CONFIG_ASIZE "asize" +#define ZPOOL_CONFIG_MIN_ALLOC "min_alloc" +#define ZPOOL_CONFIG_MAX_ALLOC "max_alloc" #define ZPOOL_CONFIG_DTL "DTL" #define ZPOOL_CONFIG_SCAN_STATS "scan_stats" /* not stored on disk */ #define ZPOOL_CONFIG_REMOVAL_STATS "removal_stats" /* not stored on disk */ diff --git a/sys/contrib/openzfs/include/sys/range_tree.h b/sys/contrib/openzfs/include/sys/range_tree.h index 0f6884682459..0f6def36f9f6 100644 --- a/sys/contrib/openzfs/include/sys/range_tree.h +++ b/sys/contrib/openzfs/include/sys/range_tree.h @@ -238,8 +238,7 @@ zfs_rs_set_end_raw(zfs_range_seg_t *rs, zfs_range_tree_t *rt, uint64_t end) } static inline void -zfs_zfs_rs_set_fill_raw(zfs_range_seg_t *rs, zfs_range_tree_t *rt, - uint64_t fill) +zfs_rs_set_fill_raw(zfs_range_seg_t *rs, zfs_range_tree_t *rt, uint64_t fill) { ASSERT3U(rt->rt_type, <=, ZFS_RANGE_SEG_NUM_TYPES); switch (rt->rt_type) { @@ -277,7 +276,7 @@ static inline void zfs_rs_set_fill(zfs_range_seg_t *rs, zfs_range_tree_t *rt, uint64_t fill) { ASSERT(IS_P2ALIGNED(fill, 1ULL << rt->rt_shift)); - zfs_zfs_rs_set_fill_raw(rs, rt, fill >> rt->rt_shift); + zfs_rs_set_fill_raw(rs, rt, fill >> rt->rt_shift); } typedef void zfs_range_tree_func_t(void *arg, uint64_t start, uint64_t size); diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h index 66db16b33c51..f172f2af6f07 100644 --- a/sys/contrib/openzfs/include/sys/spa.h +++ b/sys/contrib/openzfs/include/sys/spa.h @@ -1030,7 +1030,7 @@ extern void spa_import_progress_set_notes_nolog(spa_t *spa, extern int spa_config_tryenter(spa_t *spa, int locks, const void *tag, krw_t rw); extern void spa_config_enter(spa_t *spa, int locks, const void *tag, krw_t rw); -extern void spa_config_enter_mmp(spa_t *spa, int locks, const void *tag, +extern void spa_config_enter_priority(spa_t *spa, int locks, const void *tag, krw_t rw); extern void spa_config_exit(spa_t *spa, int locks, const void *tag); extern int spa_config_held(spa_t *spa, int locks, krw_t rw); @@ -1084,6 +1084,7 @@ extern pool_state_t spa_state(spa_t *spa); extern spa_load_state_t spa_load_state(spa_t *spa); extern uint64_t spa_freeze_txg(spa_t *spa); extern uint64_t spa_get_worst_case_asize(spa_t *spa, uint64_t lsize); +extern void spa_get_min_alloc_range(spa_t *spa, uint64_t *min, uint64_t *max); extern uint64_t spa_get_dspace(spa_t *spa); extern uint64_t spa_get_checkpoint_space(spa_t *spa); extern uint64_t spa_get_slop_space(spa_t *spa); diff --git a/sys/contrib/openzfs/include/sys/spa_impl.h b/sys/contrib/openzfs/include/sys/spa_impl.h index 07a959db3447..62b062984d36 100644 --- a/sys/contrib/openzfs/include/sys/spa_impl.h +++ b/sys/contrib/openzfs/include/sys/spa_impl.h @@ -265,6 +265,7 @@ struct spa { uint64_t spa_min_ashift; /* of vdevs in normal class */ uint64_t spa_max_ashift; /* of vdevs in normal class */ uint64_t spa_min_alloc; /* of vdevs in normal class */ + uint64_t spa_max_alloc; /* of vdevs in normal class */ uint64_t spa_gcd_alloc; /* of vdevs in normal class */ uint64_t spa_config_guid; /* config pool guid */ uint64_t spa_load_guid; /* spa_load initialized guid */ diff --git a/sys/contrib/openzfs/include/sys/zfs_ioctl.h b/sys/contrib/openzfs/include/sys/zfs_ioctl.h index 8174242abdac..cfe11f43bb8e 100644 --- a/sys/contrib/openzfs/include/sys/zfs_ioctl.h +++ b/sys/contrib/openzfs/include/sys/zfs_ioctl.h @@ -455,6 +455,7 @@ typedef enum zinject_type { ZINJECT_DECRYPT_FAULT, ZINJECT_DELAY_IMPORT, ZINJECT_DELAY_EXPORT, + ZINJECT_DELAY_READY, } zinject_type_t; typedef enum zinject_iotype { diff --git a/sys/contrib/openzfs/include/sys/zio.h b/sys/contrib/openzfs/include/sys/zio.h index a8acb83b4c2f..acb0a03a36b2 100644 --- a/sys/contrib/openzfs/include/sys/zio.h +++ b/sys/contrib/openzfs/include/sys/zio.h @@ -718,6 +718,7 @@ extern void zio_handle_ignored_writes(zio_t *zio); extern hrtime_t zio_handle_io_delay(zio_t *zio); extern void zio_handle_import_delay(spa_t *spa, hrtime_t elapsed); extern void zio_handle_export_delay(spa_t *spa, hrtime_t elapsed); +extern hrtime_t zio_handle_ready_delay(zio_t *zio); /* * Checksum ereport functions diff --git a/sys/contrib/openzfs/lib/libuutil/libuutil.abi b/sys/contrib/openzfs/lib/libuutil/libuutil.abi index 6c736c61e4a5..2a740afa07ca 100644 --- a/sys/contrib/openzfs/lib/libuutil/libuutil.abi +++ b/sys/contrib/openzfs/lib/libuutil/libuutil.abi @@ -616,6 +616,7 @@ <array-type-def dimensions='1' type-id='de572c22' size-in-bits='1472' id='6d3c2f42'> <subrange length='23' type-id='7359adad' id='fdd0f594'/> </array-type-def> + <type-decl name='long long int' size-in-bits='64' id='1eb56b1e'/> <array-type-def dimensions='1' type-id='3a47d82b' size-in-bits='256' id='a133ec23'> <subrange length='4' type-id='7359adad' id='16fe7105'/> </array-type-def> @@ -1020,13 +1021,6 @@ <array-type-def dimensions='1' type-id='03085adc' size-in-bits='192' id='083f8d58'> <subrange length='3' type-id='7359adad' id='56f209d2'/> </array-type-def> - <array-type-def dimensions='1' type-id='d315442e' size-in-bits='16' id='811205dc'> - <subrange length='1' type-id='7359adad' id='52f813b4'/> - </array-type-def> - <array-type-def dimensions='1' type-id='d3130597' size-in-bits='768' id='f63f23b9'> - <subrange length='12' type-id='7359adad' id='84827bdc'/> - </array-type-def> - <type-decl name='long long int' size-in-bits='64' id='1eb56b1e'/> <class-decl name='mnttab' size-in-bits='256' is-struct='yes' visibility='default' id='1b055409'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='mnt_special' type-id='26a90f95' visibility='default'/> @@ -1061,93 +1055,6 @@ <var-decl name='mnt_minor' type-id='3502e3ff' visibility='default'/> </data-member> </class-decl> - <typedef-decl name='__u16' type-id='8efea9e5' id='d315442e'/> - <typedef-decl name='__s32' type-id='95e97e5e' id='3158a266'/> - <typedef-decl name='__u32' type-id='f0981eeb' id='3f1a6b60'/> - <typedef-decl name='__s64' type-id='1eb56b1e' id='49659421'/> - <typedef-decl name='__u64' type-id='3a47d82b' id='d3130597'/> - <class-decl name='statx_timestamp' size-in-bits='128' is-struct='yes' visibility='default' id='94101016'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='tv_sec' type-id='49659421' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='tv_nsec' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='__reserved' type-id='3158a266' visibility='default'/> - </data-member> - </class-decl> - <class-decl name='statx' size-in-bits='2048' is-struct='yes' visibility='default' id='720b04c5'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='stx_mask' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='stx_blksize' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='stx_attributes' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='stx_nlink' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='stx_uid' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='stx_gid' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='stx_mode' type-id='d315442e' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='240'> - <var-decl name='__spare0' type-id='811205dc' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='stx_ino' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='stx_size' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='stx_blocks' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='stx_attributes_mask' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='stx_atime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='stx_btime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='stx_ctime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='stx_mtime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='stx_rdev_major' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1056'> - <var-decl name='stx_rdev_minor' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='stx_dev_major' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1120'> - <var-decl name='stx_dev_minor' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='stx_mnt_id' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='__spare2' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='__spare3' type-id='f63f23b9' visibility='default'/> - </data-member> - </class-decl> <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' id='56fe4a37'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='mnt_fsname' type-id='26a90f95' visibility='default'/> @@ -1237,8 +1144,6 @@ <pointer-type-def type-id='1b055409' size-in-bits='64' id='9d424d31'/> <pointer-type-def type-id='0bbec9cd' size-in-bits='64' id='62f7a03d'/> <qualified-type-def type-id='62f7a03d' restrict='yes' id='f1cadedf'/> - <pointer-type-def type-id='720b04c5' size-in-bits='64' id='936b8e35'/> - <qualified-type-def type-id='936b8e35' restrict='yes' id='31d265b7'/> <function-decl name='getmntent_r' visibility='default' binding='global' size-in-bits='64'> <parameter type-id='e75a27e9'/> <parameter type-id='3cad23cd'/> @@ -1254,14 +1159,6 @@ <parameter type-id='95e97e5e'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='statx' visibility='default' binding='global' size-in-bits='64'> - <parameter type-id='95e97e5e'/> - <parameter type-id='9d26089a'/> - <parameter type-id='95e97e5e'/> - <parameter type-id='f0981eeb'/> - <parameter type-id='31d265b7'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='__fprintf_chk' visibility='default' binding='global' size-in-bits='64'> <parameter type-id='e75a27e9'/> <parameter type-id='95e97e5e'/> diff --git a/sys/contrib/openzfs/lib/libzfs/libzfs.abi b/sys/contrib/openzfs/lib/libzfs/libzfs.abi index 184ea4a55b43..f988d27a286a 100644 --- a/sys/contrib/openzfs/lib/libzfs/libzfs.abi +++ b/sys/contrib/openzfs/lib/libzfs/libzfs.abi @@ -571,6 +571,7 @@ <elf-symbol name='zpool_props_refresh' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zpool_read_label' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zpool_refresh_stats' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> + <elf-symbol name='zpool_refresh_stats_from_handle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zpool_reguid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zpool_reopen_one' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zpool_scan' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> @@ -641,7 +642,7 @@ <elf-symbol name='sa_protocol_names' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='spa_feature_table' size='2632' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfeature_checks_disable' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> - <elf-symbol name='zfs_deleg_perm_tab' size='528' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> + <elf-symbol name='zfs_deleg_perm_tab' size='544' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_history_event_names' size='328' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_max_dataset_nesting' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_userquota_prop_prefixes' size='96' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> @@ -1458,103 +1459,8 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='lib/libspl/os/linux/getmntany.c' language='LANG_C99'> - <array-type-def dimensions='1' type-id='d315442e' size-in-bits='16' id='811205dc'> - <subrange length='1' type-id='7359adad' id='52f813b4'/> - </array-type-def> - <array-type-def dimensions='1' type-id='d3130597' size-in-bits='768' id='f63f23b9'> - <subrange length='12' type-id='7359adad' id='84827bdc'/> - </array-type-def> - <typedef-decl name='__u16' type-id='8efea9e5' id='d315442e'/> - <typedef-decl name='__s32' type-id='95e97e5e' id='3158a266'/> - <typedef-decl name='__u32' type-id='f0981eeb' id='3f1a6b60'/> - <typedef-decl name='__s64' type-id='1eb56b1e' id='49659421'/> - <typedef-decl name='__u64' type-id='3a47d82b' id='d3130597'/> - <class-decl name='statx_timestamp' size-in-bits='128' is-struct='yes' visibility='default' id='94101016'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='tv_sec' type-id='49659421' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='tv_nsec' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='__reserved' type-id='3158a266' visibility='default'/> - </data-member> - </class-decl> - <class-decl name='statx' size-in-bits='2048' is-struct='yes' visibility='default' id='720b04c5'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='stx_mask' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='stx_blksize' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='stx_attributes' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='stx_nlink' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='stx_uid' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='stx_gid' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='stx_mode' type-id='d315442e' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='240'> - <var-decl name='__spare0' type-id='811205dc' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='stx_ino' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='stx_size' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='stx_blocks' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='stx_attributes_mask' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='stx_atime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='stx_btime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='stx_ctime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='stx_mtime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='stx_rdev_major' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1056'> - <var-decl name='stx_rdev_minor' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='stx_dev_major' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1120'> - <var-decl name='stx_dev_minor' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='stx_mnt_id' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='__spare2' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='__spare3' type-id='f63f23b9' visibility='default'/> - </data-member> - </class-decl> <pointer-type-def type-id='56fe4a37' size-in-bits='64' id='b6b61d2f'/> <qualified-type-def type-id='b6b61d2f' restrict='yes' id='3cad23cd'/> - <pointer-type-def type-id='720b04c5' size-in-bits='64' id='936b8e35'/> - <qualified-type-def type-id='936b8e35' restrict='yes' id='31d265b7'/> <function-decl name='getmntent_r' visibility='default' binding='global' size-in-bits='64'> <parameter type-id='e75a27e9'/> <parameter type-id='3cad23cd'/> @@ -1566,14 +1472,6 @@ <parameter type-id='822cd80b'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='statx' visibility='default' binding='global' size-in-bits='64'> - <parameter type-id='95e97e5e'/> - <parameter type-id='9d26089a'/> - <parameter type-id='95e97e5e'/> - <parameter type-id='f0981eeb'/> - <parameter type-id='31d265b7'/> - <return type-id='95e97e5e'/> - </function-decl> </abi-instr> <abi-instr address-size='64' path='lib/libspl/timestamp.c' language='LANG_C99'> <typedef-decl name='nl_item' type-id='95e97e5e' id='03b79a94'/> @@ -3194,6 +3092,10 @@ <parameter type-id='dace003f'/> <return type-id='80f4b756'/> </function-decl> + <function-decl name='fnvlist_dup' visibility='default' binding='global' size-in-bits='64'> + <parameter type-id='22cce67b'/> + <return type-id='5ce45b60'/> + </function-decl> <function-decl name='fnvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64'> <parameter type-id='3fa542f0'/> <return type-id='5ce45b60'/> @@ -3238,6 +3140,11 @@ <parameter type-id='37e3bd22' name='missing'/> <return type-id='95e97e5e'/> </function-decl> + <function-decl name='zpool_refresh_stats_from_handle' mangled-name='zpool_refresh_stats_from_handle' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_refresh_stats_from_handle'> + <parameter type-id='4c81de99' name='dzhp'/> + <parameter type-id='4c81de99' name='szhp'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='zpool_skip_pool' mangled-name='zpool_skip_pool' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_skip_pool'> <parameter type-id='80f4b756' name='poolname'/> <return type-id='c19b74c3'/> @@ -9398,10 +9305,6 @@ <parameter type-id='5ce45b60'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='fnvlist_dup' visibility='default' binding='global' size-in-bits='64'> - <parameter type-id='22cce67b'/> - <return type-id='5ce45b60'/> - </function-decl> <function-decl name='spl_pagesize' mangled-name='spl_pagesize' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spl_pagesize'> <return type-id='b59d7dce'/> </function-decl> @@ -9774,8 +9677,8 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='module/zcommon/zfs_deleg.c' language='LANG_C99'> - <array-type-def dimensions='1' type-id='fa1870fd' size-in-bits='4224' id='55e705e7'> - <subrange length='33' type-id='7359adad' id='6a5934df'/> + <array-type-def dimensions='1' type-id='fa1870fd' size-in-bits='4352' id='55f84f08'> + <subrange length='34' type-id='7359adad' id='6a6a7e00'/> </array-type-def> <array-type-def dimensions='1' type-id='fa1870fd' size-in-bits='infinite' id='7c00e69d'> <subrange length='infinite' id='031f2035'/> @@ -9805,30 +9708,31 @@ <enumerator name='ZFS_DELEG_NOTE_PROMOTE' value='5'/> <enumerator name='ZFS_DELEG_NOTE_RENAME' value='6'/> <enumerator name='ZFS_DELEG_NOTE_SEND' value='7'/> - <enumerator name='ZFS_DELEG_NOTE_RECEIVE' value='8'/> - <enumerator name='ZFS_DELEG_NOTE_ALLOW' value='9'/> - <enumerator name='ZFS_DELEG_NOTE_USERPROP' value='10'/> - <enumerator name='ZFS_DELEG_NOTE_MOUNT' value='11'/> - <enumerator name='ZFS_DELEG_NOTE_SHARE' value='12'/> - <enumerator name='ZFS_DELEG_NOTE_USERQUOTA' value='13'/> - <enumerator name='ZFS_DELEG_NOTE_GROUPQUOTA' value='14'/> - <enumerator name='ZFS_DELEG_NOTE_USERUSED' value='15'/> - <enumerator name='ZFS_DELEG_NOTE_GROUPUSED' value='16'/> - <enumerator name='ZFS_DELEG_NOTE_USEROBJQUOTA' value='17'/> - <enumerator name='ZFS_DELEG_NOTE_GROUPOBJQUOTA' value='18'/> - <enumerator name='ZFS_DELEG_NOTE_USEROBJUSED' value='19'/> - <enumerator name='ZFS_DELEG_NOTE_GROUPOBJUSED' value='20'/> - <enumerator name='ZFS_DELEG_NOTE_HOLD' value='21'/> - <enumerator name='ZFS_DELEG_NOTE_RELEASE' value='22'/> - <enumerator name='ZFS_DELEG_NOTE_DIFF' value='23'/> - <enumerator name='ZFS_DELEG_NOTE_BOOKMARK' value='24'/> - <enumerator name='ZFS_DELEG_NOTE_LOAD_KEY' value='25'/> - <enumerator name='ZFS_DELEG_NOTE_CHANGE_KEY' value='26'/> - <enumerator name='ZFS_DELEG_NOTE_PROJECTUSED' value='27'/> - <enumerator name='ZFS_DELEG_NOTE_PROJECTQUOTA' value='28'/> - <enumerator name='ZFS_DELEG_NOTE_PROJECTOBJUSED' value='29'/> - <enumerator name='ZFS_DELEG_NOTE_PROJECTOBJQUOTA' value='30'/> - <enumerator name='ZFS_DELEG_NOTE_NONE' value='31'/> + <enumerator name='ZFS_DELEG_NOTE_SEND_RAW' value='8'/> + <enumerator name='ZFS_DELEG_NOTE_RECEIVE' value='9'/> + <enumerator name='ZFS_DELEG_NOTE_ALLOW' value='10'/> + <enumerator name='ZFS_DELEG_NOTE_USERPROP' value='11'/> + <enumerator name='ZFS_DELEG_NOTE_MOUNT' value='12'/> + <enumerator name='ZFS_DELEG_NOTE_SHARE' value='13'/> + <enumerator name='ZFS_DELEG_NOTE_USERQUOTA' value='14'/> + <enumerator name='ZFS_DELEG_NOTE_GROUPQUOTA' value='15'/> + <enumerator name='ZFS_DELEG_NOTE_USERUSED' value='16'/> + <enumerator name='ZFS_DELEG_NOTE_GROUPUSED' value='17'/> + <enumerator name='ZFS_DELEG_NOTE_USEROBJQUOTA' value='18'/> + <enumerator name='ZFS_DELEG_NOTE_GROUPOBJQUOTA' value='19'/> + <enumerator name='ZFS_DELEG_NOTE_USEROBJUSED' value='20'/> + <enumerator name='ZFS_DELEG_NOTE_GROUPOBJUSED' value='21'/> + <enumerator name='ZFS_DELEG_NOTE_HOLD' value='22'/> + <enumerator name='ZFS_DELEG_NOTE_RELEASE' value='23'/> + <enumerator name='ZFS_DELEG_NOTE_DIFF' value='24'/> + <enumerator name='ZFS_DELEG_NOTE_BOOKMARK' value='25'/> + <enumerator name='ZFS_DELEG_NOTE_LOAD_KEY' value='26'/> + <enumerator name='ZFS_DELEG_NOTE_CHANGE_KEY' value='27'/> + <enumerator name='ZFS_DELEG_NOTE_PROJECTUSED' value='28'/> + <enumerator name='ZFS_DELEG_NOTE_PROJECTQUOTA' value='29'/> + <enumerator name='ZFS_DELEG_NOTE_PROJECTOBJUSED' value='30'/> + <enumerator name='ZFS_DELEG_NOTE_PROJECTOBJQUOTA' value='31'/> + <enumerator name='ZFS_DELEG_NOTE_NONE' value='32'/> </enum-decl> <typedef-decl name='zfs_deleg_note_t' type-id='729d4547' id='4613c173'/> <class-decl name='zfs_deleg_perm_tab' size-in-bits='128' is-struct='yes' visibility='default' id='5aa05c1f'> diff --git a/sys/contrib/openzfs/lib/libzfs/libzfs_config.c b/sys/contrib/openzfs/lib/libzfs/libzfs_config.c index 0d2102191389..9d704e4303ff 100644 --- a/sys/contrib/openzfs/lib/libzfs/libzfs_config.c +++ b/sys/contrib/openzfs/lib/libzfs/libzfs_config.c @@ -308,6 +308,23 @@ zpool_refresh_stats(zpool_handle_t *zhp, boolean_t *missing) } /* + * Copies the pool config and state from szhp to dzhp. szhp and dzhp must + * represent the same pool. Used by pool_list_refresh() to avoid another + * round-trip into the kernel to get stats already collected earlier in the + * function. + */ +void +zpool_refresh_stats_from_handle(zpool_handle_t *dzhp, zpool_handle_t *szhp) +{ + VERIFY0(strcmp(dzhp->zpool_name, szhp->zpool_name)); + nvlist_free(dzhp->zpool_old_config); + dzhp->zpool_old_config = dzhp->zpool_config; + dzhp->zpool_config = fnvlist_dup(szhp->zpool_config); + dzhp->zpool_config_size = szhp->zpool_config_size; + dzhp->zpool_state = szhp->zpool_state; +} + +/* * The following environment variables are undocumented * and should be used for testing purposes only: * diff --git a/sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi b/sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi index 7464b3adb254..263cad045f7a 100644 --- a/sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi +++ b/sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi @@ -617,6 +617,7 @@ <array-type-def dimensions='1' type-id='de572c22' size-in-bits='1472' id='6d3c2f42'> <subrange length='23' type-id='7359adad' id='fdd0f594'/> </array-type-def> + <type-decl name='long long int' size-in-bits='64' id='1eb56b1e'/> <array-type-def dimensions='1' type-id='3a47d82b' size-in-bits='256' id='a133ec23'> <subrange length='4' type-id='7359adad' id='16fe7105'/> </array-type-def> @@ -988,13 +989,6 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='lib/libspl/os/linux/getmntany.c' language='LANG_C99'> - <array-type-def dimensions='1' type-id='d315442e' size-in-bits='16' id='811205dc'> - <subrange length='1' type-id='7359adad' id='52f813b4'/> - </array-type-def> - <array-type-def dimensions='1' type-id='d3130597' size-in-bits='768' id='f63f23b9'> - <subrange length='12' type-id='7359adad' id='84827bdc'/> - </array-type-def> - <type-decl name='long long int' size-in-bits='64' id='1eb56b1e'/> <class-decl name='mnttab' size-in-bits='256' is-struct='yes' visibility='default' id='1b055409'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='mnt_special' type-id='26a90f95' visibility='default'/> @@ -1029,93 +1023,6 @@ <var-decl name='mnt_minor' type-id='3502e3ff' visibility='default'/> </data-member> </class-decl> - <typedef-decl name='__u16' type-id='8efea9e5' id='d315442e'/> - <typedef-decl name='__s32' type-id='95e97e5e' id='3158a266'/> - <typedef-decl name='__u32' type-id='f0981eeb' id='3f1a6b60'/> - <typedef-decl name='__s64' type-id='1eb56b1e' id='49659421'/> - <typedef-decl name='__u64' type-id='3a47d82b' id='d3130597'/> - <class-decl name='statx_timestamp' size-in-bits='128' is-struct='yes' visibility='default' id='94101016'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='tv_sec' type-id='49659421' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='tv_nsec' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='__reserved' type-id='3158a266' visibility='default'/> - </data-member> - </class-decl> - <class-decl name='statx' size-in-bits='2048' is-struct='yes' visibility='default' id='720b04c5'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='stx_mask' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='stx_blksize' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='stx_attributes' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='stx_nlink' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='stx_uid' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='stx_gid' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='stx_mode' type-id='d315442e' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='240'> - <var-decl name='__spare0' type-id='811205dc' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='stx_ino' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='stx_size' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='stx_blocks' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='stx_attributes_mask' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='stx_atime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='stx_btime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='stx_ctime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='stx_mtime' type-id='94101016' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='stx_rdev_major' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1056'> - <var-decl name='stx_rdev_minor' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='stx_dev_major' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1120'> - <var-decl name='stx_dev_minor' type-id='3f1a6b60' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='stx_mnt_id' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='__spare2' type-id='d3130597' visibility='default'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='__spare3' type-id='f63f23b9' visibility='default'/> - </data-member> - </class-decl> <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' id='56fe4a37'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='mnt_fsname' type-id='26a90f95' visibility='default'/> @@ -1191,8 +1098,6 @@ <pointer-type-def type-id='1b055409' size-in-bits='64' id='9d424d31'/> <pointer-type-def type-id='0bbec9cd' size-in-bits='64' id='62f7a03d'/> <qualified-type-def type-id='62f7a03d' restrict='yes' id='f1cadedf'/> - <pointer-type-def type-id='720b04c5' size-in-bits='64' id='936b8e35'/> - <qualified-type-def type-id='936b8e35' restrict='yes' id='31d265b7'/> <function-decl name='getmntent_r' visibility='default' binding='global' size-in-bits='64'> <parameter type-id='e75a27e9'/> <parameter type-id='3cad23cd'/> @@ -1208,14 +1113,6 @@ <parameter type-id='95e97e5e'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='statx' visibility='default' binding='global' size-in-bits='64'> - <parameter type-id='95e97e5e'/> - <parameter type-id='9d26089a'/> - <parameter type-id='95e97e5e'/> - <parameter type-id='f0981eeb'/> - <parameter type-id='31d265b7'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='stat64' visibility='default' binding='global' size-in-bits='64'> <parameter type-id='9d26089a'/> <parameter type-id='f1cadedf'/> diff --git a/sys/contrib/openzfs/man/man8/zinject.8 b/sys/contrib/openzfs/man/man8/zinject.8 index 1d9e43aed5ec..704f6a7accd8 100644 --- a/sys/contrib/openzfs/man/man8/zinject.8 +++ b/sys/contrib/openzfs/man/man8/zinject.8 @@ -138,6 +138,20 @@ This injector is automatically cleared after the import is finished. . .It Xo .Nm zinject +.Fl E Ar delay +.Op Fl a +.Op Fl m +.Op Fl f Ar freq +.Op Fl l Ar level +.Op Fl r Ar range +.Op Fl T Ar iotype +.Op Fl t Ar type Ns | Ns Fl b Ar bookmark +.Xc +Inject pipeline ready stage delays for the given object or bookmark. +The delay is specified in milliseconds. +. +.It Xo +.Nm zinject .Fl I .Op Fl s Ar seconds Ns | Ns Fl g Ar txgs .Ar pool diff --git a/sys/contrib/openzfs/man/man8/zpool-upgrade.8 b/sys/contrib/openzfs/man/man8/zpool-upgrade.8 index cf69060da5ce..adae47f82eb1 100644 --- a/sys/contrib/openzfs/man/man8/zpool-upgrade.8 +++ b/sys/contrib/openzfs/man/man8/zpool-upgrade.8 @@ -65,10 +65,10 @@ property). .Cm upgrade .Fl v .Xc -Displays legacy ZFS versions supported by the this version of ZFS. +Displays legacy ZFS versions supported by this version of ZFS. See .Xr zpool-features 7 -for a description of feature flags features supported by this version of ZFS. +for a description of features supported by this version of ZFS. .It Xo .Nm zpool .Cm upgrade diff --git a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c index bac166fcd89e..967a018640e1 100644 --- a/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c +++ b/sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c @@ -484,7 +484,28 @@ zvol_request_impl(zvol_state_t *zv, struct bio *bio, struct request *rq, fstrans_cookie_t cookie = spl_fstrans_mark(); uint64_t offset = io_offset(bio, rq); uint64_t size = io_size(bio, rq); - int rw = io_data_dir(bio, rq); + int rw; + + if (rq != NULL) { + /* + * Flush & trim requests go down the zvol_write codepath. Or + * more specifically: + * + * If request is a write, or if it's op_is_sync() and not a + * read, or if it's a flush, or if it's a discard, then send the + * request down the write path. + */ + if (op_is_write(rq->cmd_flags) || + (op_is_sync(rq->cmd_flags) && req_op(rq) != REQ_OP_READ) || + req_op(rq) == REQ_OP_FLUSH || + op_is_discard(rq->cmd_flags)) { + rw = WRITE; + } else { + rw = READ; + } + } else { + rw = bio_data_dir(bio); + } if (unlikely(zv->zv_flags & ZVOL_REMOVING)) { zvol_end_io(bio, rq, SET_ERROR(ENXIO)); diff --git a/sys/contrib/openzfs/module/zcommon/zfs_prop.c b/sys/contrib/openzfs/module/zcommon/zfs_prop.c index 864e3898b365..9190ae0362ea 100644 --- a/sys/contrib/openzfs/module/zcommon/zfs_prop.c +++ b/sys/contrib/openzfs/module/zcommon/zfs_prop.c @@ -364,8 +364,8 @@ zfs_prop_init(void) static const zprop_index_t xattr_table[] = { { "off", ZFS_XATTR_OFF }, - { "on", ZFS_XATTR_SA }, { "sa", ZFS_XATTR_SA }, + { "on", ZFS_XATTR_SA }, { "dir", ZFS_XATTR_DIR }, { NULL } }; diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 6c150d31c669..e88d394b5229 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -2656,6 +2656,32 @@ dnode_next_offset_level(dnode_t *dn, int flags, uint64_t *offset, } /* + * Adjust *offset to the next (or previous) block byte offset at lvl. + * Returns FALSE if *offset would overflow or underflow. + */ +static boolean_t +dnode_next_block(dnode_t *dn, int flags, uint64_t *offset, int lvl) +{ + int epbs = dn->dn_indblkshift - SPA_BLKPTRSHIFT; + int span = lvl * epbs + dn->dn_datablkshift; + uint64_t blkid, maxblkid; + + if (span >= 8 * sizeof (uint64_t)) + return (B_FALSE); + + blkid = *offset >> span; + maxblkid = 1ULL << (8 * sizeof (*offset) - span); + if (!(flags & DNODE_FIND_BACKWARDS) && blkid + 1 < maxblkid) + *offset = (blkid + 1) << span; + else if ((flags & DNODE_FIND_BACKWARDS) && blkid > 0) + *offset = (blkid << span) - 1; + else + return (B_FALSE); + + return (B_TRUE); +} + +/* * Find the next hole, data, or sparse region at or after *offset. * The value 'blkfill' tells us how many items we expect to find * in an L0 data block; this value is 1 for normal objects, @@ -2682,7 +2708,7 @@ int dnode_next_offset(dnode_t *dn, int flags, uint64_t *offset, int minlvl, uint64_t blkfill, uint64_t txg) { - uint64_t initial_offset = *offset; + uint64_t matched = *offset; int lvl, maxlvl; int error = 0; @@ -2706,16 +2732,36 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t *offset, maxlvl = dn->dn_phys->dn_nlevels; - for (lvl = minlvl; lvl <= maxlvl; lvl++) { + for (lvl = minlvl; lvl <= maxlvl; ) { error = dnode_next_offset_level(dn, flags, offset, lvl, blkfill, txg); - if (error != ESRCH) + if (error == 0 && lvl > minlvl) { + --lvl; + matched = *offset; + } else if (error == ESRCH && lvl < maxlvl && + dnode_next_block(dn, flags, &matched, lvl)) { + /* + * Continue search at next/prev offset in lvl+1 block. + * + * Usually we only search upwards at the start of the + * search as higher level blocks point at a matching + * minlvl block in most cases, but we backtrack if not. + * + * This can happen for txg > 0 searches if the block + * contains only BPs/dnodes freed at that txg. It also + * happens if we are still syncing out the tree, and + * some BP's at higher levels are not updated yet. + * + * We must adjust offset to avoid coming back to the + * same offset and getting stuck looping forever. This + * also deals with the case where offset is already at + * the beginning or end of the object. + */ + ++lvl; + *offset = matched; + } else { break; - } - - while (error == 0 && --lvl >= minlvl) { - error = dnode_next_offset_level(dn, - flags, offset, lvl, blkfill, txg); + } } /* @@ -2727,9 +2773,6 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t *offset, error = 0; } - if (error == 0 && (flags & DNODE_FIND_BACKWARDS ? - initial_offset < *offset : initial_offset > *offset)) - error = SET_ERROR(ESRCH); out: if (!(flags & DNODE_FIND_HAVELOCK)) rw_exit(&dn->dn_struct_rwlock); diff --git a/sys/contrib/openzfs/module/zfs/mmp.c b/sys/contrib/openzfs/module/zfs/mmp.c index 7db72b9b04b0..fd46127b6068 100644 --- a/sys/contrib/openzfs/module/zfs/mmp.c +++ b/sys/contrib/openzfs/module/zfs/mmp.c @@ -446,7 +446,7 @@ mmp_write_uberblock(spa_t *spa) uint64_t offset; hrtime_t lock_acquire_time = gethrtime(); - spa_config_enter_mmp(spa, SCL_STATE, mmp_tag, RW_READER); + spa_config_enter_priority(spa, SCL_STATE, mmp_tag, RW_READER); lock_acquire_time = gethrtime() - lock_acquire_time; if (lock_acquire_time > (MSEC2NSEC(MMP_MIN_INTERVAL) / 10)) zfs_dbgmsg("MMP SCL_STATE acquisition pool '%s' took %llu ns " diff --git a/sys/contrib/openzfs/module/zfs/range_tree.c b/sys/contrib/openzfs/module/zfs/range_tree.c index ea2d2c7227c8..d73195f1a21f 100644 --- a/sys/contrib/openzfs/module/zfs/range_tree.c +++ b/sys/contrib/openzfs/module/zfs/range_tree.c @@ -585,7 +585,7 @@ zfs_range_tree_remove_impl(zfs_range_tree_t *rt, uint64_t start, uint64_t size, * the size, since we do not support removing partial segments * of range trees with gaps. */ - zfs_zfs_rs_set_fill_raw(rs, rt, zfs_rs_get_end_raw(rs, rt) - + zfs_rs_set_fill_raw(rs, rt, zfs_rs_get_end_raw(rs, rt) - zfs_rs_get_start_raw(rs, rt)); zfs_range_tree_stat_incr(rt, &rs_tmp); diff --git a/sys/contrib/openzfs/module/zfs/spa_config.c b/sys/contrib/openzfs/module/zfs/spa_config.c index cf28955b0c50..f615591e826b 100644 --- a/sys/contrib/openzfs/module/zfs/spa_config.c +++ b/sys/contrib/openzfs/module/zfs/spa_config.c @@ -372,6 +372,8 @@ spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats) fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_TXG, txg); fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_GUID, spa_guid(spa)); fnvlist_add_uint64(config, ZPOOL_CONFIG_ERRATA, spa->spa_errata); + fnvlist_add_uint64(config, ZPOOL_CONFIG_MIN_ALLOC, spa->spa_min_alloc); + fnvlist_add_uint64(config, ZPOOL_CONFIG_MAX_ALLOC, spa->spa_max_alloc); if (spa->spa_comment != NULL) fnvlist_add_string(config, ZPOOL_CONFIG_COMMENT, spa->spa_comment); diff --git a/sys/contrib/openzfs/module/zfs/spa_misc.c b/sys/contrib/openzfs/module/zfs/spa_misc.c index 6f7c060f97f8..0bead6d49666 100644 --- a/sys/contrib/openzfs/module/zfs/spa_misc.c +++ b/sys/contrib/openzfs/module/zfs/spa_misc.c @@ -510,7 +510,7 @@ spa_config_tryenter(spa_t *spa, int locks, const void *tag, krw_t rw) static void spa_config_enter_impl(spa_t *spa, int locks, const void *tag, krw_t rw, - int mmp_flag) + int priority_flag) { (void) tag; int wlocks_held = 0; @@ -526,7 +526,7 @@ spa_config_enter_impl(spa_t *spa, int locks, const void *tag, krw_t rw, mutex_enter(&scl->scl_lock); if (rw == RW_READER) { while (scl->scl_writer || - (!mmp_flag && scl->scl_write_wanted)) { + (!priority_flag && scl->scl_write_wanted)) { cv_wait(&scl->scl_cv, &scl->scl_lock); } } else { @@ -551,7 +551,7 @@ spa_config_enter(spa_t *spa, int locks, const void *tag, krw_t rw) } /* - * The spa_config_enter_mmp() allows the mmp thread to cut in front of + * The spa_config_enter_priority() allows the mmp thread to cut in front of * outstanding write lock requests. This is needed since the mmp updates are * time sensitive and failure to service them promptly will result in a * suspended pool. This pool suspension has been seen in practice when there is @@ -560,7 +560,7 @@ spa_config_enter(spa_t *spa, int locks, const void *tag, krw_t rw) */ void -spa_config_enter_mmp(spa_t *spa, int locks, const void *tag, krw_t rw) +spa_config_enter_priority(spa_t *spa, int locks, const void *tag, krw_t rw) { spa_config_enter_impl(spa, locks, tag, rw, 1); } @@ -806,6 +806,7 @@ spa_add(const char *name, nvlist_t *config, const char *altroot) spa->spa_min_ashift = INT_MAX; spa->spa_max_ashift = 0; spa->spa_min_alloc = INT_MAX; + spa->spa_max_alloc = 0; spa->spa_gcd_alloc = INT_MAX; /* Reset cached value */ @@ -1865,6 +1866,19 @@ spa_get_worst_case_asize(spa_t *spa, uint64_t lsize) } /* + * Return the range of minimum allocation sizes for the normal allocation + * class. This can be used by external consumers of the DMU to estimate + * potential wasted capacity when setting the recordsize for an object. + * This is mainly for dRAID pools which always pad to a full stripe width. + */ +void +spa_get_min_alloc_range(spa_t *spa, uint64_t *min_alloc, uint64_t *max_alloc) +{ + *min_alloc = spa->spa_min_alloc; + *max_alloc = spa->spa_max_alloc; +} + +/* * Return the amount of slop space in bytes. It is typically 1/32 of the pool * (3.2%), minus the embedded log space. On very small pools, it may be * slightly larger than this. On very large pools, it will be capped to @@ -3085,6 +3099,7 @@ EXPORT_SYMBOL(spa_version); EXPORT_SYMBOL(spa_state); EXPORT_SYMBOL(spa_load_state); EXPORT_SYMBOL(spa_freeze_txg); +EXPORT_SYMBOL(spa_get_min_alloc_range); /* for Lustre */ EXPORT_SYMBOL(spa_get_dspace); EXPORT_SYMBOL(spa_update_dspace); EXPORT_SYMBOL(spa_deflate); diff --git a/sys/contrib/openzfs/module/zfs/vdev.c b/sys/contrib/openzfs/module/zfs/vdev.c index fc6d445f9785..654e034de9e1 100644 --- a/sys/contrib/openzfs/module/zfs/vdev.c +++ b/sys/contrib/openzfs/module/zfs/vdev.c @@ -1497,12 +1497,14 @@ vdev_spa_set_alloc(spa_t *spa, uint64_t min_alloc) { if (min_alloc < spa->spa_min_alloc) spa->spa_min_alloc = min_alloc; - if (spa->spa_gcd_alloc == INT_MAX) { + + if (min_alloc > spa->spa_max_alloc) + spa->spa_max_alloc = min_alloc; + + if (spa->spa_gcd_alloc == INT_MAX) spa->spa_gcd_alloc = min_alloc; - } else { - spa->spa_gcd_alloc = vdev_gcd(min_alloc, - spa->spa_gcd_alloc); - } + else + spa->spa_gcd_alloc = vdev_gcd(min_alloc, spa->spa_gcd_alloc); } void @@ -1560,8 +1562,7 @@ vdev_metaslab_group_create(vdev_t *vd) if (vd->vdev_ashift < spa->spa_min_ashift) spa->spa_min_ashift = vd->vdev_ashift; - uint64_t min_alloc = vdev_get_min_alloc(vd); - vdev_spa_set_alloc(spa, min_alloc); + vdev_spa_set_alloc(spa, vdev_get_min_alloc(vd)); } } } diff --git a/sys/contrib/openzfs/module/zfs/vdev_label.c b/sys/contrib/openzfs/module/zfs/vdev_label.c index c44f654b0261..0d4fdaa77ba0 100644 --- a/sys/contrib/openzfs/module/zfs/vdev_label.c +++ b/sys/contrib/openzfs/module/zfs/vdev_label.c @@ -511,6 +511,8 @@ vdev_config_generate(spa_t *spa, vdev_t *vd, boolean_t getstats, fnvlist_add_uint64(nv, ZPOOL_CONFIG_ASHIFT, vd->vdev_ashift); fnvlist_add_uint64(nv, ZPOOL_CONFIG_ASIZE, vd->vdev_asize); + fnvlist_add_uint64(nv, ZPOOL_CONFIG_MIN_ALLOC, + vdev_get_min_alloc(vd)); fnvlist_add_uint64(nv, ZPOOL_CONFIG_IS_LOG, vd->vdev_islog); if (vd->vdev_noalloc) { fnvlist_add_uint64(nv, ZPOOL_CONFIG_NONALLOCATING, diff --git a/sys/contrib/openzfs/module/zfs/zio.c b/sys/contrib/openzfs/module/zfs/zio.c index 4cf8912d4269..aeea58bedfe4 100644 --- a/sys/contrib/openzfs/module/zfs/zio.c +++ b/sys/contrib/openzfs/module/zfs/zio.c @@ -4574,8 +4574,29 @@ zio_vdev_io_start(zio_t *zio) ASSERT0(zio->io_child_error[ZIO_CHILD_VDEV]); if (vd == NULL) { - if (!(zio->io_flags & ZIO_FLAG_CONFIG_WRITER)) - spa_config_enter(spa, SCL_ZIO, zio, RW_READER); + if (!(zio->io_flags & ZIO_FLAG_CONFIG_WRITER)) { + /* + * A deadlock workaround. The ddt_prune_unique_entries() + * -> prune_candidates_sync() code path takes the + * SCL_ZIO reader lock and may request it again here. + * If there is another thread who wants the SCL_ZIO + * writer lock, then scl_write_wanted will be set. + * Thus, the spa_config_enter_priority() is used to + * ignore pending writer requests. + * + * The locking should be revised to remove the need + * for this workaround. If that's not workable then + * it should only be applied to the zios involved in + * the pruning process. This impacts the read/write + * I/O balance while pruning. + */ + if (spa->spa_active_ddt_prune) + spa_config_enter_priority(spa, SCL_ZIO, zio, + RW_READER); + else + spa_config_enter(spa, SCL_ZIO, zio, + RW_READER); + } /* * The mirror_ops handle multiple DVAs in a single BP. @@ -5305,6 +5326,16 @@ zio_ready(zio_t *zio) return (NULL); } + if (zio_injection_enabled) { + hrtime_t target = zio_handle_ready_delay(zio); + if (target != 0 && zio->io_target_timestamp == 0) { + zio->io_stage >>= 1; + zio->io_target_timestamp = target; + zio_delay_interrupt(zio); + return (NULL); + } + } + if (zio->io_ready) { ASSERT(IO_IS_ALLOCATING(zio)); ASSERT(BP_GET_BIRTH(bp) == zio->io_txg || diff --git a/sys/contrib/openzfs/module/zfs/zio_inject.c b/sys/contrib/openzfs/module/zfs/zio_inject.c index 981a1be4847c..287577018ed1 100644 --- a/sys/contrib/openzfs/module/zfs/zio_inject.c +++ b/sys/contrib/openzfs/module/zfs/zio_inject.c @@ -827,6 +827,44 @@ zio_handle_export_delay(spa_t *spa, hrtime_t elapsed) zio_handle_pool_delay(spa, elapsed, ZINJECT_DELAY_EXPORT); } +/* + * For testing, inject a delay before ready state. + */ +hrtime_t +zio_handle_ready_delay(zio_t *zio) +{ + inject_handler_t *handler; + hrtime_t now = gethrtime(); + hrtime_t target = 0; + + /* + * Ignore I/O not associated with any logical data. + */ + if (zio->io_logical == NULL) + return (0); + + rw_enter(&inject_lock, RW_READER); + + for (handler = list_head(&inject_handlers); handler != NULL; + handler = list_next(&inject_handlers, handler)) { + if (zio->io_spa != handler->zi_spa || + handler->zi_record.zi_cmd != ZINJECT_DELAY_READY) + continue; + + /* If this handler matches, inject the delay */ + if (zio_match_iotype(zio, handler->zi_record.zi_iotype) && + zio_match_handler(&zio->io_logical->io_bookmark, + zio->io_bp ? BP_GET_TYPE(zio->io_bp) : DMU_OT_NONE, + zio_match_dva(zio), &handler->zi_record, zio->io_error)) { + target = now + (hrtime_t)handler->zi_record.zi_timer; + break; + } + } + + rw_exit(&inject_lock); + return (target); +} + static int zio_calculate_range(const char *pool, zinject_record_t *record) { diff --git a/sys/contrib/openzfs/scripts/zfs-tests.sh b/sys/contrib/openzfs/scripts/zfs-tests.sh index 04f3b6f32cb8..5a0a1a609448 100755 --- a/sys/contrib/openzfs/scripts/zfs-tests.sh +++ b/sys/contrib/openzfs/scripts/zfs-tests.sh @@ -38,6 +38,7 @@ DEBUG="" CLEANUP="yes" CLEANUPALL="no" KMSG="" +TIMEOUT_DEBUG="" LOOPBACK="yes" STACK_TRACER="no" FILESIZE="4G" @@ -364,6 +365,7 @@ OPTIONS: -k Disable cleanup after test failure -K Log test names to /dev/kmsg -f Use files only, disables block device tests + -O Dump debugging info to /dev/kmsg on test timeout -S Enable stack tracer (negative performance impact) -c Only create and populate constrained path -R Automatically rerun failing tests @@ -402,7 +404,7 @@ $0 -x EOF } -while getopts 'hvqxkKfScRmn:d:Ds:r:?t:T:u:I:' OPTION; do +while getopts 'hvqxkKfScRmOn:d:Ds:r:?t:T:u:I:' OPTION; do case $OPTION in h) usage @@ -445,6 +447,9 @@ while getopts 'hvqxkKfScRmn:d:Ds:r:?t:T:u:I:' OPTION; do export NFS=1 . "$nfsfile" ;; + O) + TIMEOUT_DEBUG="yes" + ;; d) FILEDIR="$OPTARG" ;; @@ -773,6 +778,7 @@ msg "${TEST_RUNNER}" \ "${DEBUG:+-D}" \ "${KMEMLEAK:+-m}" \ "${KMSG:+-K}" \ + "${TIMEOUT_DEBUG:+-O}" \ "-c \"${RUNFILES}\"" \ "-T \"${TAGS}\"" \ "-i \"${STF_SUITE}\"" \ @@ -783,6 +789,7 @@ msg "${TEST_RUNNER}" \ ${DEBUG:+-D} \ ${KMEMLEAK:+-m} \ ${KMSG:+-K} \ + ${TIMEOUT_DEBUG:+-O} \ -c "${RUNFILES}" \ -T "${TAGS}" \ -i "${STF_SUITE}" \ diff --git a/sys/contrib/openzfs/tests/runfiles/common.run b/sys/contrib/openzfs/tests/runfiles/common.run index 2b002830c82f..9f531411fbe1 100644 --- a/sys/contrib/openzfs/tests/runfiles/common.run +++ b/sys/contrib/openzfs/tests/runfiles/common.run @@ -168,10 +168,10 @@ tags = ['functional', 'cli_root', 'zinject'] tests = ['zdb_002_pos', 'zdb_003_pos', 'zdb_004_pos', 'zdb_005_pos', 'zdb_006_pos', 'zdb_args_neg', 'zdb_args_pos', 'zdb_block_size_histogram', 'zdb_checksum', 'zdb_decompress', - 'zdb_display_block', 'zdb_encrypted', 'zdb_label_checksum', - 'zdb_object_range_neg', 'zdb_object_range_pos', 'zdb_objset_id', - 'zdb_decompress_zstd', 'zdb_recover', 'zdb_recover_2', 'zdb_backup', - 'zdb_tunables'] + 'zdb_display_block', 'zdb_encrypted', 'zdb_encrypted_raw', + 'zdb_label_checksum', 'zdb_object_range_neg', 'zdb_object_range_pos', + 'zdb_objset_id', 'zdb_decompress_zstd', 'zdb_recover', 'zdb_recover_2', + 'zdb_backup', 'zdb_tunables'] pre = post = tags = ['functional', 'cli_root', 'zdb'] @@ -395,8 +395,9 @@ tags = ['functional', 'cli_root', 'zpool'] [tests/functional/cli_root/zpool_add] tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos', 'zpool_add_004_pos', 'zpool_add_006_pos', 'zpool_add_007_neg', - 'zpool_add_008_neg', 'zpool_add_009_neg', 'zpool_add_010_pos', - 'add-o_ashift', 'add_prop_ashift', 'zpool_add_dryrun_output'] + 'zpool_add_008_neg', 'zpool_add_009_neg', 'zpool_add_warn_create', + 'zpool_add_warn_degraded', 'zpool_add_warn_removal', 'add-o_ashift', + 'add_prop_ashift', 'zpool_add_dryrun_output'] tags = ['functional', 'cli_root', 'zpool_add'] [tests/functional/cli_root/zpool_attach] @@ -490,6 +491,10 @@ tests = ['zpool_import_001_pos', 'zpool_import_002_pos', tags = ['functional', 'cli_root', 'zpool_import'] timeout = 1200 +[tests/functional/cli_root/zpool_iostat] +tests = ['zpool_iostat_interval_all', 'zpool_iostat_interval_some'] +tags = ['functional', 'cli_root', 'zpool_iostat'] + [tests/functional/cli_root/zpool_labelclear] tests = ['zpool_labelclear_active', 'zpool_labelclear_exported', 'zpool_labelclear_removed', 'zpool_labelclear_valid'] @@ -1085,7 +1090,8 @@ tags = ['functional', 'write_dirs'] [tests/functional/xattr] tests = ['xattr_001_pos', 'xattr_002_neg', 'xattr_003_neg', 'xattr_004_pos', 'xattr_005_pos', 'xattr_006_pos', 'xattr_007_neg', - 'xattr_011_pos', 'xattr_012_pos', 'xattr_013_pos', 'xattr_compat'] + 'xattr_011_pos', 'xattr_012_pos', 'xattr_013_pos', 'xattr_014_pos', + 'xattr_compat'] tags = ['functional', 'xattr'] [tests/functional/zvol/zvol_ENOSPC] diff --git a/sys/contrib/openzfs/tests/runfiles/sanity.run b/sys/contrib/openzfs/tests/runfiles/sanity.run index b56ffc3a4a2d..249b415029c4 100644 --- a/sys/contrib/openzfs/tests/runfiles/sanity.run +++ b/sys/contrib/openzfs/tests/runfiles/sanity.run @@ -622,7 +622,7 @@ tags = ['functional', 'vdev_zaps'] [tests/functional/xattr] tests = ['xattr_001_pos', 'xattr_002_neg', 'xattr_003_neg', 'xattr_004_pos', 'xattr_005_pos', 'xattr_006_pos', 'xattr_007_neg', - 'xattr_011_pos', 'xattr_013_pos', 'xattr_compat'] + 'xattr_011_pos', 'xattr_013_pos', 'xattr_014_pos', 'xattr_compat'] tags = ['functional', 'xattr'] [tests/functional/zvol/zvol_ENOSPC] diff --git a/sys/contrib/openzfs/tests/test-runner/bin/test-runner.py.in b/sys/contrib/openzfs/tests/test-runner/bin/test-runner.py.in index 2158208be6e5..d2c1185e4a94 100755 --- a/sys/contrib/openzfs/tests/test-runner/bin/test-runner.py.in +++ b/sys/contrib/openzfs/tests/test-runner/bin/test-runner.py.in @@ -34,6 +34,7 @@ from select import select from subprocess import PIPE from subprocess import Popen from subprocess import check_output +from subprocess import run from threading import Timer from time import time, CLOCK_MONOTONIC from os.path import exists @@ -187,6 +188,63 @@ User: %s ''' % (self.pathname, self.identifier, self.outputdir, self.timeout, self.user) def kill_cmd(self, proc, options, kmemleak, keyboard_interrupt=False): + + """ + We're about to kill a command due to a timeout. + If we're running with the -O option, then dump debug info about the + process with the highest CPU usage to /dev/kmsg (Linux only). This can + help debug the timeout. + + Debug info includes: + - 30 lines from 'top' + - /proc/<PID>/stack output of process with highest CPU usage + - Last lines strace-ing process with highest CPU usage + """ + if exists("/dev/kmsg"): + c = """ +TOP_OUT="$(COLUMNS=160 top -b -n 1 | head -n 30)" +read -r PID CMD <<< $(echo "$TOP_OUT" | /usr/bin/awk \ +"/COMMAND/{ + print_next=1 + next +} +{ + if (print_next == 1) { + print \\$1\\" \\"\\$12 + exit + } +}") +echo "##### ZTS timeout debug #####" +echo "----- top -----" +echo "$TOP_OUT" +echo "----- /proc/$PID/stack ($CMD)) -----" +cat /proc/$PID/stack +echo "----- strace ($CMD) -----" +TMPFILE="$(mktemp --suffix=ZTS)" +/usr/bin/strace -k --stack-traces -p $PID &> "$TMPFILE" & +sleep 0.1 +killall strace +tail -n 30 $TMPFILE +rm "$TMPFILE" +echo "##### /proc/sysrq-trigger stack #####" +""" + c = "sudo bash -c '" + c + "'" + data = run(c, capture_output=True, shell=True, text=True) + out = data.stdout + try: + kp = Popen([SUDO, "sh", "-c", + "echo '" + out + "' > /dev/kmsg"]) + kp.wait() + + """ + Trigger kernel stack traces + """ + kp = Popen([SUDO, "sh", "-c", + "echo l > /proc/sysrq-trigger"]) + kp.wait() + except Exception: + pass + """ Kill a running command due to timeout, or ^C from the keyboard. If sudo is required, this user was verified previously. @@ -1129,6 +1187,9 @@ def parse_args(): parser.add_option('-o', action='callback', callback=options_cb, default=BASEDIR, dest='outputdir', type='string', metavar='outputdir', help='Specify an output directory.') + parser.add_option('-O', action='store_true', default=False, + dest='timeout_debug', + help='Dump debugging info to /dev/kmsg on test timeout') parser.add_option('-i', action='callback', callback=options_cb, default=TESTDIR, dest='testdir', type='string', metavar='testdir', help='Specify a test directory.') diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am b/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am index 1517f90e99a5..678c01b58f94 100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am @@ -197,6 +197,7 @@ nobase_dist_datadir_zfs_tests_tests_DATA += \ functional/cli_root/zpool_import/blockfiles/unclean_export.dat.bz2 \ functional/cli_root/zpool_import/zpool_import.cfg \ functional/cli_root/zpool_import/zpool_import.kshlib \ + functional/cli_root/zpool_iostat/zpool_iostat.kshlib \ functional/cli_root/zpool_initialize/zpool_initialize.kshlib \ functional/cli_root/zpool_labelclear/labelclear.cfg \ functional/cli_root/zpool_remove/zpool_remove.cfg \ @@ -640,6 +641,7 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/cli_root/zdb/zdb_decompress_zstd.ksh \ functional/cli_root/zdb/zdb_display_block.ksh \ functional/cli_root/zdb/zdb_encrypted.ksh \ + functional/cli_root/zdb/zdb_encrypted_raw.ksh \ functional/cli_root/zdb/zdb_label_checksum.ksh \ functional/cli_root/zdb/zdb_object_range_neg.ksh \ functional/cli_root/zdb/zdb_object_range_pos.ksh \ @@ -1027,7 +1029,9 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/cli_root/zpool_add/zpool_add_007_neg.ksh \ functional/cli_root/zpool_add/zpool_add_008_neg.ksh \ functional/cli_root/zpool_add/zpool_add_009_neg.ksh \ - functional/cli_root/zpool_add/zpool_add_010_pos.ksh \ + functional/cli_root/zpool_add/zpool_add_warn_create.ksh \ + functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh \ + functional/cli_root/zpool_add/zpool_add_warn_removal.ksh \ functional/cli_root/zpool_add/zpool_add_dryrun_output.ksh \ functional/cli_root/zpool_attach/attach-o_ashift.ksh \ functional/cli_root/zpool_attach/cleanup.ksh \ @@ -1178,6 +1182,10 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/cli_root/zpool_import/zpool_import_parallel_admin.ksh \ functional/cli_root/zpool_import/zpool_import_parallel_neg.ksh \ functional/cli_root/zpool_import/zpool_import_parallel_pos.ksh \ + functional/cli_root/zpool_iostat/setup.ksh \ + functional/cli_root/zpool_iostat/cleanup.ksh \ + functional/cli_root/zpool_iostat/zpool_iostat_interval_all.ksh \ + functional/cli_root/zpool_iostat/zpool_iostat_interval_some.ksh \ functional/cli_root/zpool_initialize/cleanup.ksh \ functional/cli_root/zpool_initialize/zpool_initialize_attach_detach_add_remove.ksh \ functional/cli_root/zpool_initialize/zpool_initialize_fault_export_import_online.ksh \ @@ -2226,6 +2234,7 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ functional/xattr/xattr_011_pos.ksh \ functional/xattr/xattr_012_pos.ksh \ functional/xattr/xattr_013_pos.ksh \ + functional/xattr/xattr_014_pos.ksh \ functional/xattr/xattr_compat.ksh \ functional/zap_shrink/cleanup.ksh \ functional/zap_shrink/zap_shrink_001_pos.ksh \ diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_encrypted_raw.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_encrypted_raw.ksh new file mode 100755 index 000000000000..85d267d5402f --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_encrypted_raw.ksh @@ -0,0 +1,75 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# CDDL HEADER END +# + +# +# Copyright (c) 2023, Klara Inc. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib + +# +# DESCRIPTION: +# 'zdb -K ...' should enable reading from a raw-encrypted dataset +# +# STRATEGY: +# 1. Create an encrypted dataset +# 2. Write some data to a file +# 3. Run zdb -dddd on the file, confirm it can't be read +# 4. Run zdb -K ... -ddddd on the file, confirm it can be read +# + +verify_runnable "both" + +dataset="$TESTPOOL/$TESTFS2" +file="$TESTDIR2/somefile" +keyfile="$TEST_BASE_DIR/keyfile" + +function cleanup +{ + datasetexists "$dataset" && destroy_dataset "$dataset" -f + rm -f "$keyfile" + default_cleanup_noexit +} + +log_onexit cleanup + +log_must default_setup_noexit $DISKS + +log_assert "'zdb -K' should enable reading from a raw-encrypted dataset" + +# The key must be 32 bytes long. +echo -n "$RAWKEY" > "$keyfile" + +log_must zfs create -o mountpoint="$TESTDIR2" \ + -o encryption=on -o keyformat=raw -o keylocation="file://$keyfile" \ + "$dataset" + +echo 'my great encrypted text' > "$file" + +typeset -i obj=$(ls -i "$file" | cut -d' ' -f1) +typeset -i size=$(wc -c < "$file") + +log_note "test file $file is objid $obj, size $size" + +sync_pool "$TESTPOOL" true + +log_must eval "zdb -dddd $dataset $obj | grep -q 'object encrypted'" + +log_must eval "zdb -K $keyfile -dddd $dataset $obj | grep -q 'size\s$size$'" + +log_pass "'zdb -K' enables reading from a raw-encrypted dataset" diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib index 091d65bb4f33..74780bb02141 100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib @@ -27,6 +27,7 @@ # # Copyright (c) 2012, 2016 by Delphix. All rights reserved. +# Copyright 2025 by Lawrence Livermore National Security, LLC. # . $STF_SUITE/include/libtest.shlib @@ -89,3 +90,44 @@ function save_dump_dev fi echo $dumpdev } + +function zpool_create_add_setup +{ + typeset -i i=0 + + while ((i < 10)); do + log_must truncate -s $MINVDEVSIZE $TEST_BASE_DIR/vdev$i + + eval vdev$i=$TEST_BASE_DIR/vdev$i + ((i += 1)) + done + + if is_linux; then + vdev_lo="$(losetup -f "$vdev4" --show)" + elif is_freebsd; then + vdev_lo=/dev/"$(mdconfig -a -t vnode -f "$vdev4")" + else + vdev_lo="$(lofiadm -a "$vdev4")" + fi +} + +function zpool_create_add_cleanup +{ + datasetexists $TESTPOOL1 && destroy_pool $TESTPOOL1 + + if [[ -e $vdev_lo ]]; then + if is_linux; then + log_must losetup -d "$vdev_lo" + elif is_freebsd; then + log_must mdconfig -d -u "$vdev_lo" + else + log_must lofiadm -d "$vdev_lo" + fi + fi + + typeset -i i=0 + while ((i < 10)); do + rm -f $TEST_BASE_DIR/vdev$i + ((i += 1)) + done +} diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_010_pos.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_create.ksh index df085a2ec746..661e55998d8d 100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_010_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_create.ksh @@ -23,67 +23,51 @@ # # Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Copyright (c) 2012, 2016 by Delphix. All rights reserved. +# Copyright 2012, 2016 by Delphix. All rights reserved. +# Copyright 2025 by Lawrence Livermore National Security, LLC. # . $STF_SUITE/include/libtest.shlib -. $STF_SUITE/tests/functional/cli_root/zpool_create/zpool_create.shlib +. $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib # # DESCRIPTION: -# Verify zpool add succeed when adding vdevs with matching redundancy. +# Verify zpool add succeeds when adding vdevs with matching redundancy +# and warns with differing redundancy for a healthy pool. # # STRATEGY: # 1. Create several files == $MINVDEVSIZE. # 2. Verify 'zpool add' succeeds with matching redundancy. # 3. Verify 'zpool add' warns with differing redundancy. -# 4. Verify 'zpool add' warns with differing redundancy after removal. # verify_runnable "global" -function cleanup -{ - datasetexists $TESTPOOL1 && destroy_pool $TESTPOOL1 - - typeset -i i=0 - while ((i < 10)); do - rm -f $TEST_BASE_DIR/vdev$i - ((i += 1)) - done -} - +log_assert "Verify 'zpool add' warns for differing redundancy." +log_onexit zpool_create_add_cleanup -log_assert "Verify 'zpool add' succeed with keywords combination." -log_onexit cleanup +zpool_create_add_setup -# 1. Create several files == $MINVDEVSIZE. typeset -i i=0 -while ((i < 10)); do - log_must truncate -s $MINVDEVSIZE $TEST_BASE_DIR/vdev$i - - eval vdev$i=$TEST_BASE_DIR/vdev$i - ((i += 1)) -done +typeset -i j=0 set -A redundancy0_create_args \ "$vdev0" set -A redundancy1_create_args \ "mirror $vdev0 $vdev1" \ - "raidz1 $vdev0 $vdev1" + "raidz1 $vdev0 $vdev1" \ + "draid1:1s $vdev0 $vdev1 $vdev9" set -A redundancy2_create_args \ "mirror $vdev0 $vdev1 $vdev2" \ - "raidz2 $vdev0 $vdev1 $vdev2" + "raidz2 $vdev0 $vdev1 $vdev2" \ + "draid2:1s $vdev0 $vdev1 $vdev2 $vdev9" set -A redundancy3_create_args \ "mirror $vdev0 $vdev1 $vdev2 $vdev3" \ - "raidz3 $vdev0 $vdev1 $vdev2 $vdev3" + "raidz3 $vdev0 $vdev1 $vdev2 $vdev3" \ + "draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9" set -A redundancy0_add_args \ "$vdev5" \ @@ -93,21 +77,19 @@ set -A redundancy1_add_args \ "mirror $vdev5 $vdev6" \ "raidz1 $vdev5 $vdev6" \ "raidz1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \ - "mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" + "mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" \ + "draid1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \ + "mirror $vdev5 $vdev6 draid1 $vdev7 $vdev8" set -A redundancy2_add_args \ "mirror $vdev5 $vdev6 $vdev7" \ - "raidz2 $vdev5 $vdev6 $vdev7" + "raidz2 $vdev5 $vdev6 $vdev7" \ + "draid2 $vdev5 $vdev6 $vdev7" set -A redundancy3_add_args \ "mirror $vdev5 $vdev6 $vdev7 $vdev8" \ - "raidz3 $vdev5 $vdev6 $vdev7 $vdev8" - -set -A log_args "log" "$vdev4" -set -A cache_args "cache" "$vdev4" -set -A spare_args "spare" "$vdev4" - -typeset -i j=0 + "raidz3 $vdev5 $vdev6 $vdev7 $vdev8" \ + "draid3 $vdev5 $vdev6 $vdev7 $vdev8" function zpool_create_add { @@ -148,30 +130,6 @@ function zpool_create_forced_add done } -function zpool_create_rm_add -{ - typeset -n create_args=$1 - typeset -n add_args=$2 - typeset -n rm_args=$3 - - i=0 - while ((i < ${#create_args[@]})); do - j=0 - while ((j < ${#add_args[@]})); do - log_must zpool create $TESTPOOL1 ${create_args[$i]} - log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]} - log_must zpool add $TESTPOOL1 ${add_args[$j]} - log_must zpool remove $TESTPOOL1 ${rm_args[1]} - log_mustnot zpool add $TESTPOOL1 ${rm_args[1]} - log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]} - log_must zpool destroy -f $TESTPOOL1 - - ((j += 1)) - done - ((i += 1)) - done -} - # 2. Verify 'zpool add' succeeds with matching redundancy. zpool_create_add redundancy0_create_args redundancy0_add_args zpool_create_add redundancy1_create_args redundancy1_add_args @@ -195,17 +153,4 @@ zpool_create_forced_add redundancy3_create_args redundancy0_add_args zpool_create_forced_add redundancy3_create_args redundancy1_add_args zpool_create_forced_add redundancy3_create_args redundancy2_add_args -# 4. Verify 'zpool add' warns with differing redundancy after removal. -zpool_create_rm_add redundancy1_create_args redundancy1_add_args log_args -zpool_create_rm_add redundancy2_create_args redundancy2_add_args log_args -zpool_create_rm_add redundancy3_create_args redundancy3_add_args log_args - -zpool_create_rm_add redundancy1_create_args redundancy1_add_args cache_args -zpool_create_rm_add redundancy2_create_args redundancy2_add_args cache_args -zpool_create_rm_add redundancy3_create_args redundancy3_add_args cache_args - -zpool_create_rm_add redundancy1_create_args redundancy1_add_args spare_args -zpool_create_rm_add redundancy2_create_args redundancy2_add_args spare_args -zpool_create_rm_add redundancy3_create_args redundancy3_add_args spare_args - -log_pass "'zpool add' succeed with keywords combination." +log_pass "Verify 'zpool add' warns for differing redundancy." diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh new file mode 100755 index 000000000000..313eb3666f27 --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_degraded.ksh @@ -0,0 +1,204 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2012, 2016 by Delphix. All rights reserved. +# Copyright 2025 by Lawrence Livermore National Security, LLC. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib + +# +# DESCRIPTION: +# Verify zpool add succeeds when adding vdevs with matching redundancy +# and warns with differing redundancy for a degraded pool. +# +# STRATEGY: +# 1. Create several files == $MINVDEVSIZE. +# 2. Verify 'zpool add' succeeds with matching redundancy +# 3. Verify 'zpool add' warns with differing redundancy when +# a. Degraded pool with replaced mismatch vdev (file vs disk) +# b. Degraded pool dRAID distributed spare active +# c. Degraded pool hot spare active +# + +verify_runnable "global" + +log_assert "Verify 'zpool add' warns for differing redundancy." +log_onexit zpool_create_add_cleanup + +zpool_create_add_setup + +set -A redundancy1_create_args \ + "mirror $vdev0 $vdev1" \ + "raidz1 $vdev0 $vdev1" \ + "draid1:1s $vdev0 $vdev1 $vdev9" + +set -A redundancy2_create_args \ + "mirror $vdev0 $vdev1 $vdev2" \ + "raidz2 $vdev0 $vdev1 $vdev2" \ + "draid2:1s $vdev0 $vdev1 $vdev2 $vdev9" + +set -A redundancy3_create_args \ + "mirror $vdev0 $vdev1 $vdev2 $vdev3" \ + "raidz3 $vdev0 $vdev1 $vdev2 $vdev3" \ + "draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9" + +set -A redundancy1_add_args \ + "mirror $vdev5 $vdev6" \ + "raidz1 $vdev5 $vdev6" \ + "raidz1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \ + "mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" \ + "draid1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \ + "mirror $vdev5 $vdev6 draid1 $vdev7 $vdev8" + +set -A redundancy2_add_args \ + "mirror $vdev5 $vdev6 $vdev7" \ + "raidz2 $vdev5 $vdev6 $vdev7" \ + "draid2 $vdev5 $vdev6 $vdev7" + +set -A redundancy3_add_args \ + "mirror $vdev5 $vdev6 $vdev7 $vdev8" \ + "raidz3 $vdev5 $vdev6 $vdev7 $vdev8" \ + "draid3 $vdev5 $vdev6 $vdev7 $vdev8" + +set -A redundancy1_create_draid_args \ + "draid1:1s $vdev0 $vdev1 $vdev2" + +set -A redundancy2_create_draid_args \ + "draid2:1s $vdev0 $vdev1 $vdev2 $vdev3" + +set -A redundancy3_create_draid_args \ + "draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9" + +set -A redundancy1_create_spare_args \ + "mirror $vdev0 $vdev1 spare $vdev_lo" \ + "raidz1 $vdev0 $vdev1 spare $vdev_lo" \ + "draid1 $vdev0 $vdev1 spare $vdev_lo" + +set -A redundancy2_create_spare_args \ + "mirror $vdev0 $vdev1 $vdev2 spare $vdev_lo" \ + "raidz2 $vdev0 $vdev1 $vdev2 spare $vdev_lo" \ + "draid2 $vdev0 $vdev1 $vdev2 spare $vdev_lo" + +set -A redundancy3_create_spare_args \ + "mirror $vdev0 $vdev1 $vdev2 $vdev3 spare $vdev_lo" \ + "raidz3 $vdev0 $vdev1 $vdev2 $vdev3 spare $vdev_lo" \ + "draid3 $vdev0 $vdev1 $vdev2 $vdev3 spare $vdev_lo" + +set -A replace_args "$vdev1" "$vdev_lo" +set -A draid1_args "$vdev1" "draid1-0-0" +set -A draid2_args "$vdev1" "draid2-0-0" +set -A draid3_args "$vdev1" "draid3-0-0" + +typeset -i i=0 +typeset -i j=0 + +function zpool_create_degraded_add +{ + typeset -n create_args=$1 + typeset -n add_args=$2 + typeset -n rm_args=$3 + + i=0 + while ((i < ${#create_args[@]})); do + j=0 + while ((j < ${#add_args[@]})); do + log_must zpool create $TESTPOOL1 ${create_args[$i]} + log_must zpool offline -f $TESTPOOL1 ${rm_args[0]} + log_must zpool replace -w $TESTPOOL1 ${rm_args[0]} ${rm_args[1]} + log_must zpool add $TESTPOOL1 ${add_args[$j]} + log_must zpool destroy -f $TESTPOOL1 + log_must zpool labelclear -f ${rm_args[0]} + + ((j += 1)) + done + ((i += 1)) + done +} + +function zpool_create_forced_degraded_add +{ + typeset -n create_args=$1 + typeset -n add_args=$2 + typeset -n rm_args=$3 + + i=0 + while ((i < ${#create_args[@]})); do + j=0 + while ((j < ${#add_args[@]})); do + log_must zpool create $TESTPOOL1 ${create_args[$i]} + log_must zpool offline -f $TESTPOOL1 ${rm_args[0]} + log_must zpool replace -w $TESTPOOL1 ${rm_args[0]} ${rm_args[1]} + log_mustnot zpool add $TESTPOOL1 ${add_args[$j]} + log_must zpool add --allow-replication-mismatch $TESTPOOL1 ${add_args[$j]} + log_must zpool destroy -f $TESTPOOL1 + log_must zpool labelclear -f ${rm_args[0]} + + ((j += 1)) + done + ((i += 1)) + done +} + +# 2. Verify 'zpool add' succeeds with matching redundancy and a degraded pool. +zpool_create_degraded_add redundancy1_create_args redundancy1_add_args replace_args +zpool_create_degraded_add redundancy2_create_args redundancy2_add_args replace_args +zpool_create_degraded_add redundancy3_create_args redundancy3_add_args replace_args + +# 3. Verify 'zpool add' warns with differing redundancy and a degraded pool. +# +# a. Degraded pool with replaced mismatch vdev (file vs disk) +zpool_create_forced_degraded_add redundancy1_create_args redundancy2_add_args replace_args +zpool_create_forced_degraded_add redundancy1_create_args redundancy3_add_args replace_args + +zpool_create_forced_degraded_add redundancy2_create_args redundancy1_add_args replace_args +zpool_create_forced_degraded_add redundancy2_create_args redundancy3_add_args replace_args + +zpool_create_forced_degraded_add redundancy3_create_args redundancy1_add_args replace_args +zpool_create_forced_degraded_add redundancy3_create_args redundancy2_add_args replace_args + +# b. Degraded pool dRAID distributed spare active + +zpool_create_forced_degraded_add redundancy1_create_draid_args redundancy2_add_args draid1_args +zpool_create_forced_degraded_add redundancy1_create_draid_args redundancy3_add_args draid1_args + +zpool_create_forced_degraded_add redundancy2_create_draid_args redundancy1_add_args draid2_args +zpool_create_forced_degraded_add redundancy2_create_draid_args redundancy3_add_args draid2_args + +zpool_create_forced_degraded_add redundancy3_create_draid_args redundancy1_add_args draid3_args +zpool_create_forced_degraded_add redundancy3_create_draid_args redundancy2_add_args draid3_args + +# c. Degraded pool hot spare active +zpool_create_forced_degraded_add redundancy1_create_spare_args redundancy2_add_args replace_args +zpool_create_forced_degraded_add redundancy1_create_spare_args redundancy3_add_args replace_args + +zpool_create_forced_degraded_add redundancy2_create_spare_args redundancy1_add_args replace_args +zpool_create_forced_degraded_add redundancy2_create_spare_args redundancy3_add_args replace_args + +zpool_create_forced_degraded_add redundancy3_create_spare_args redundancy1_add_args replace_args +zpool_create_forced_degraded_add redundancy3_create_spare_args redundancy2_add_args replace_args + +log_pass "Verify 'zpool add' warns for differing redundancy." diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh new file mode 100755 index 000000000000..782858e301ac --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_warn_removal.ksh @@ -0,0 +1,126 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2012, 2016 by Delphix. All rights reserved. +# Copyright 2025 by Lawrence Livermore National Security, LLC. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/cli_root/zpool_add/zpool_add.kshlib + +# +# DESCRIPTION: +# Verify zpool add succeeds when adding vdevs with matching redundancy +# and warns with differing redundancy after removal. +# +# STRATEGY: +# 1. Create several files == $MINVDEVSIZE. +# 2. Verify 'zpool add' warns with differing redundancy after removal. +# + +verify_runnable "global" + +log_assert "Verify 'zpool add' warns for differing redundancy." +log_onexit zpool_create_add_cleanup + +zpool_create_add_setup + +typeset -i i=0 +typeset -i j=0 + +set -A redundancy1_create_args \ + "mirror $vdev0 $vdev1" \ + "raidz1 $vdev0 $vdev1" \ + "draid1:1s $vdev0 $vdev1 $vdev9" + +set -A redundancy2_create_args \ + "mirror $vdev0 $vdev1 $vdev2" \ + "raidz2 $vdev0 $vdev1 $vdev2" \ + "draid2:1s $vdev0 $vdev1 $vdev2 $vdev9" + +set -A redundancy3_create_args \ + "mirror $vdev0 $vdev1 $vdev2 $vdev3" \ + "raidz3 $vdev0 $vdev1 $vdev2 $vdev3" \ + "draid3:1s $vdev0 $vdev1 $vdev2 $vdev3 $vdev9" + +set -A redundancy1_add_args \ + "mirror $vdev5 $vdev6" \ + "raidz1 $vdev5 $vdev6" \ + "raidz1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \ + "mirror $vdev5 $vdev6 raidz1 $vdev7 $vdev8" \ + "draid1 $vdev5 $vdev6 mirror $vdev7 $vdev8" \ + "mirror $vdev5 $vdev6 draid1 $vdev7 $vdev8" + +set -A redundancy2_add_args \ + "mirror $vdev5 $vdev6 $vdev7" \ + "raidz2 $vdev5 $vdev6 $vdev7" \ + "draid2 $vdev5 $vdev6 $vdev7" + +set -A redundancy3_add_args \ + "mirror $vdev5 $vdev6 $vdev7 $vdev8" \ + "raidz3 $vdev5 $vdev6 $vdev7 $vdev8" \ + "draid3 $vdev5 $vdev6 $vdev7 $vdev8" + +set -A log_args "log" "$vdev_lo" +set -A cache_args "cache" "$vdev_lo" +set -A spare_args "spare" "$vdev_lo" + + +function zpool_create_rm_add +{ + typeset -n create_args=$1 + typeset -n add_args=$2 + typeset -n rm_args=$3 + + i=0 + while ((i < ${#create_args[@]})); do + j=0 + while ((j < ${#add_args[@]})); do + log_must zpool create $TESTPOOL1 ${create_args[$i]} + log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]} + log_must zpool add $TESTPOOL1 ${add_args[$j]} + log_must zpool remove $TESTPOOL1 ${rm_args[1]} + log_mustnot zpool add $TESTPOOL1 ${rm_args[1]} + log_must zpool add $TESTPOOL1 ${rm_args[0]} ${rm_args[1]} + log_must zpool destroy -f $TESTPOOL1 + + ((j += 1)) + done + ((i += 1)) + done +} + +# 2. Verify 'zpool add' warns with differing redundancy after removal. +zpool_create_rm_add redundancy1_create_args redundancy1_add_args log_args +zpool_create_rm_add redundancy2_create_args redundancy2_add_args log_args +zpool_create_rm_add redundancy3_create_args redundancy3_add_args log_args + +zpool_create_rm_add redundancy1_create_args redundancy1_add_args cache_args +zpool_create_rm_add redundancy2_create_args redundancy2_add_args cache_args +zpool_create_rm_add redundancy3_create_args redundancy3_add_args cache_args + +zpool_create_rm_add redundancy1_create_args redundancy1_add_args spare_args +zpool_create_rm_add redundancy2_create_args redundancy2_add_args spare_args +zpool_create_rm_add redundancy3_create_args redundancy3_add_args spare_args diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/cleanup.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/cleanup.ksh new file mode 100755 index 000000000000..099b5426031d --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/cleanup.ksh @@ -0,0 +1,30 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2025, Klara, Inc. +# +# +. $STF_SUITE/include/libtest.shlib + +log_pass diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/setup.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/setup.ksh new file mode 100755 index 000000000000..3529a0ccc015 --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/setup.ksh @@ -0,0 +1,32 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2025, Klara, Inc. +# +# +. $STF_SUITE/include/libtest.shlib + +verify_runnable "global" + +log_pass diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat.kshlib b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat.kshlib new file mode 100644 index 000000000000..ea4b0bd2756d --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat.kshlib @@ -0,0 +1,235 @@ +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2025, Klara, Inc. +# + +# Since we want to make sure that iostat responds correctly as pools appear and +# disappear, we run it in the background and capture its output to a file. +# Once we're done, we parse the output and ensure it matches what we'd expect +# from the operations we performed. +# +# Because iostat is producing output every interval, it may produce the "same" +# output for each step of the change; in fact, we want that to make sure we +# don't miss anything. So, we describe what we expect as a series of "chunks". +# Each chunk is a particular kind of output, which may repeat. Current known +# chunk types are: +# +# NOPOOL: the text "no pools available" +# HEADER: three lines, starting with "capacity", "pool" and "----" respectively. +# (the rough shape of the normal iostat header). +# POOL1: a line starting with "pool1" (stats line for a pool of that name) +# POOL2: a line starting with "pool2" +# POOLBOTH: three lines, starting with "pool1", "pool2" (either order) and +# "-----" respectively. (the pool stat output for multiple pools) +# +# (the parser may produce other chunks in a failed parse to assist with +# debugging, but they should never be part of the "wanted" output See the +# parser commentary below). +# +# To help recognise the start of a new interval output, we run iostat with the +# -T u option, which will output a numeric timestamp before each header or +# second-or-later pool stat after the header. +# +# To keep the test run shorter, we use a subsecond interval, but to make sure +# nothing is missed, we sleep for three intervals after each change. + +typeset _iostat_out=$(mktemp) +typeset _iostat_pid="" + +function cleanup_iostat { + if [[ -n $_iostat_pid ]] ; then + kill -KILL $_iostat_pid || true + fi + rm -f $_iostat_out +} + +function start_iostat { + zpool iostat -T u $@ 0.1 > $_iostat_out 2>&1 & + _iostat_pid=$! +} + +function stop_iostat { + kill -TERM $_iostat_pid + wait $_iostat_pid + _iostat_pid="" +} + +function delay_iostat { + sleep 0.3 +} + +typeset -a _iostat_expect +function expect_iostat { + typeset chunk=$1 + _iostat_expect+=($chunk) +} + +# Parse the output The `state` var is used to track state across +# multiple lines. The `last` var and the `_got_iostat` function are used +# to record the completed chunks, and to collapse repetitions. +typeset -a _iostat_got +typeset _iostat_last="" +typeset _iostat_state="" + +function _got_iostat { + typeset chunk=$1 + if [[ -n $chunk && $_iostat_last != $chunk ]] ; then + _iostat_last=$chunk + _iostat_got+=($chunk) + fi + _iostat_state="" +} + +function verify_iostat { + + cat $_iostat_out | while read line ; do + + # The "no pools available" text has no timestamp or other + # header, and should never appear in the middle of multiline + # chunk, so we can close any in-flight state. + if [[ $line = "no pools available" ]] ; then + _got_iostat $_iostat_state + _got_iostat "NOPOOL" + continue + fi + + # A run of digits alone on the line is a timestamp (the `-T u` + # switch to `iostat`). It closes any in-flight state as a + # complete chunk, and indicates the start of a new chunk. + if [[ -z ${line/#+([0-9])/} ]] ; then + _got_iostat $_iostat_state + _iostat_state="TIMESTAMP" + continue + fi + + # For this test, the first word of each line should be unique, + # so we extract it and use it for simplicity. + typeset first=${line%% *} + + # Header is emitted whenever the pool list changes. It has + # three lines: + # + # capacity operations bandwidth + # pool alloc free read write read write + # ---------- ----- ----- ----- ----- ----- ----- + # + # Each line moves the state; when we get to a run of dashes, we + # commit. Note that we check for one-or-more dashes, because + # the width can vary depending on the length of pool name. + # + if [[ $_iostat_state = "TIMESTAMP" && + $first = "capacity" ]] ; then + _iostat_state="INHEADER1" + continue + fi + if [[ $_iostat_state = "INHEADER1" && + $first = "pool" ]] ; then + _iostat_state="INHEADER2" + continue + fi + if [[ $_iostat_state = "INHEADER2" && + -z ${first/#+(-)/} ]] ; then + # Headers never repeat, so if the last committed chunk + # was a header, we commit this one as EXTRAHEADER so we + # can see it in the error output. + if [[ $_iostat_last = "HEADER" ]] ; then + _got_iostat "EXTRAHEADER" + elif [[ $_iostat_last != "EXTRAHEADER" ]] ; then + _got_iostat "HEADER" + fi + _iostat_state="HEADER" + continue + fi + + # A pool stat line looks like: + # + # pool1 147K 240M 0 0 0 0 + # + # If there are multiple pools, iostat follows them with a + # separator of dashed lines: + # + # pool1 147K 240M 0 0 0 0 + # pool2 147K 240M 0 0 0 0 + # ---------- ----- ----- ----- ----- ----- ----- + # + # Stats rows always start after a timestamp or a header. If the + # header was emitted, we won't see a timestamp here (it goes + # before the header). + # + # Because our test exercises both pools on their own and + # together, we allow pools in either order. In practice they + # are sorted, but that's a side-effect of the implementation + # (see zpool_compare()), so we're not going to rely on it here. + if [[ $first = "pool1" ]] || [[ $first = "pool2" ]] ; then + + # First line, track which one we saw. If it's a + # standalone line, it will be committed by the next + # NOPOOL or TIMESTAMP above (or the `_got_iostat` after + # the loop if this is the last line). + if [[ $_iostat_state == "TIMESTAMP" || + $_iostat_state == "HEADER" ]] ; then + if [[ $first = "pool1" ]] ; then + _iostat_state="POOL1" + elif [[ $first = "pool2" ]] ; then + _iostat_state="POOL2" + fi + continue + fi + + # If this is the second pool, we're in a multi-pool + # block, and need to look for the separator to close it + # out. + if [[ $_iostat_state = "POOL1" && $first = "pool2" ]] || + [[ $_iostat_state = "POOL2" && $first = "pool1" ]] ; + then + _iostat_state="INPOOLBOTH" + continue + fi + fi + + # Separator after the stats block. + if [[ $_iostat_state = "INPOOLBOTH" && + -z ${first/#+(-)/} ]] ; then + _got_iostat "POOLBOTH" + continue + fi + + # Anything else will fall through to here. We commit any + # in-flight state, then "UNKNOWN", all to help with debugging.. + if [[ $_iostat_state != "UNKNOWN" ]] ; then + _got_iostat $_iostat_state + _got_iostat "UNKNOWN" + fi + done + + # Close out any remaining state. + _got_iostat $_iostat_state + + # Compare what we wanted with what we got, and pass/fail the test! + if [[ "${_iostat_expect[*]}" != "${_iostat_got[*]}" ]] ; then + log_note "expected: ${_iostat_expect[*]}" + log_note " got: ${_iostat_got[*]}" + log_fail "zpool iostat did not produce expected output" + fi +} diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat_interval_all.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat_interval_all.ksh new file mode 100755 index 000000000000..8e040058ec3e --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat_interval_all.ksh @@ -0,0 +1,90 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2025, Klara, Inc. +# + +# `zpool iostat <N>` should keep running and update the pools it displays as +# pools are created/destroyed/imported/export. + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/cli_root/zpool_iostat/zpool_iostat.kshlib + +typeset vdev1=$(mktemp) +typeset vdev2=$(mktemp) + +function cleanup { + cleanup_iostat + + poolexists pool1 && destroy_pool pool1 + poolexists pool2 && destroy_pool pool2 + rm -f $vdev1 $vdev2 +} + +log_must mkfile $MINVDEVSIZE $vdev1 $vdev2 + +expect_iostat "NOPOOL" + +start_iostat + +delay_iostat + +expect_iostat "HEADER" +expect_iostat "POOL1" +log_must zpool create pool1 $vdev1 +delay_iostat + +expect_iostat "HEADER" +expect_iostat "POOLBOTH" +log_must zpool create pool2 $vdev2 +delay_iostat + +expect_iostat "NOPOOL" +log_must zpool export -a +delay_iostat + +expect_iostat "HEADER" +expect_iostat "POOL2" +log_must zpool import -d $vdev2 pool2 +delay_iostat + +expect_iostat "HEADER" +expect_iostat "POOLBOTH" +log_must zpool import -d $vdev1 pool1 +delay_iostat + +expect_iostat "HEADER" +expect_iostat "POOL2" +log_must zpool destroy pool1 +delay_iostat + +expect_iostat "NOPOOL" +log_must zpool destroy pool2 +delay_iostat + +stop_iostat + +verify_iostat + +log_pass "zpool iostat in interval mode follows pool updates" diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat_interval_some.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat_interval_some.ksh new file mode 100755 index 000000000000..ab1f258aa1cd --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_iostat/zpool_iostat_interval_some.ksh @@ -0,0 +1,80 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2025, Klara, Inc. +# + +# `zpool iostat <pools> <N>` should keep running and only show the listed pools. + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/cli_root/zpool_iostat/zpool_iostat.kshlib + +typeset vdev1=$(mktemp) +typeset vdev2=$(mktemp) + +function cleanup { + cleanup_iostat + + poolexists pool1 && destroy_pool pool1 + poolexists pool2 && destroy_pool pool2 + rm -f $vdev1 $vdev2 +} + +log_must mkfile $MINVDEVSIZE $vdev1 $vdev2 + +log_must zpool create pool1 $vdev1 +delay_iostat + +expect_iostat "HEADER" +expect_iostat "POOL1" +start_iostat pool1 +delay_iostat + +log_must zpool create pool2 $vdev2 +delay_iostat + +expect_iostat "NOPOOL" +log_must zpool export -a +delay_iostat + +log_must zpool import -d $vdev2 pool2 +delay_iostat + +expect_iostat "HEADER" +expect_iostat "POOL1" +log_must zpool import -d $vdev1 pool1 +delay_iostat + +expect_iostat "NOPOOL" +log_must zpool destroy pool1 +delay_iostat + +log_must zpool destroy pool2 +delay_iostat + +stop_iostat + +verify_iostat + +log_pass "zpool iostat in interval mode with pools follows listed pool updates" diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib index 0a402e71ee68..345239b88680 100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib @@ -1234,10 +1234,10 @@ function verify_fs_aedsx typeset oldval set -A modes "on" "off" oldval=$(get_prop $perm $fs) - if [[ $oldval == "on" ]]; then - n=1 - elif [[ $oldval == "off" ]]; then + if [[ $oldval == "off" ]]; then n=0 + else + n=1 fi log_note "$user zfs set $perm=${modes[$n]} $fs" user_run $user zfs set $perm=${modes[$n]} $fs diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/setup.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/setup.ksh index 26153aafbc02..0e79e9b8b70c 100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/setup.ksh @@ -39,6 +39,6 @@ verify_runnable "global" # create a pool without any features -log_must mkfile 128m $TMPDEV +log_must truncate -s $MINVDEVSIZE $TMPDEV log_pass diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/upgrade_readonly_pool.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/upgrade_readonly_pool.ksh index d6bd69b7e134..e81d07794689 100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/upgrade_readonly_pool.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/upgrade/upgrade_readonly_pool.ksh @@ -35,17 +35,19 @@ verify_runnable "global" -TESTFILE="$TESTDIR/file.bin" - log_assert "User accounting upgrade should not be executed on readonly pool" log_onexit cleanup_upgrade # 1. Create a pool with the feature@userobj_accounting disabled to simulate # a legacy pool from a previous ZFS version. -log_must zpool create -d -m $TESTDIR $TESTPOOL $TMPDEV +log_must zpool create -d $TESTPOOL $TMPDEV +log_must zfs create $TESTPOOL/$TESTFS + +MNTPNT=$(get_prop mountpoint $TESTPOOL/$TESTFS) +TESTFILE="$MNTPNT/file.bin" # 2. Create a file on the "legecy" dataset -log_must touch $TESTDIR/file.bin +log_must touch $TESTFILE # 3. Enable feature@userobj_accounting on the pool and verify it is only # "enabled" and not "active": upgrading starts when the filesystem is mounted @@ -54,12 +56,12 @@ log_must test "enabled" == "$(get_pool_prop 'feature@userobj_accounting' $TESTPO # 4. Export the pool and re-import is readonly, without mounting any filesystem log_must zpool export $TESTPOOL -log_must zpool import -o readonly=on -N -d "$(dirname $TMPDEV)" $TESTPOOL +log_must zpool import -o readonly=on -N -d $TEST_BASE_DIR $TESTPOOL # 5. Try to mount the root dataset manually without the "ro" option, then verify # filesystem status and the pool feature status (not "active") to ensure the # pool "readonly" status is enforced. -log_must mount -t zfs -o zfsutil $TESTPOOL $TESTDIR +log_must zfs mount -R $TESTPOOL log_must stat "$TESTFILE" log_mustnot touch "$TESTFILE" log_must test "enabled" == "$(get_pool_prop 'feature@userobj_accounting' $TESTPOOL)" diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh new file mode 100755 index 000000000000..d4c9a0a41816 --- /dev/null +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh @@ -0,0 +1,53 @@ +#!/bin/ksh -p +# SPDX-License-Identifier: CDDL-1.0 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or https://opensource.org/licenses/CDDL-1.0. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2025 by Klara, Inc. +# + +. $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/xattr/xattr_common.kshlib + +# +# DESCRIPTION: +# The default xattr should be shown as 'sa', not 'on', for clarity. +# +# STRATEGY: +# 1. Create a filesystem. +# 2. Verify that the xattra is shown as 'sa'. +# 3. Manually set the value to 'dir', 'sa', 'on', and 'off'. +# 4. Verify that it is shown as 'dir', 'sa', 'sa', and 'off. +# + +log_assert "The default and specific xattr values are displayed correctly." + +set -A args "dir" "sa" "on" "off" +set -A display "dir" "sa" "sa" "off" + +log_must eval "[[ 'sa' == '$(zfs get -Hpo value xattr $TESTPOOL)' ]]" + +for i in `seq 0 3`; do + log_must zfs set xattr="${args[$i]}" $TESTPOOL + log_must eval "[[ '${display[$i]}' == '$(zfs get -Hpo value xattr $TESTPOOL)' ]]" +done +log_pass "The default and specific xattr values are displayed correctly." diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh index 571a698eb63a..502ebada22dc 100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh @@ -50,17 +50,53 @@ fi typeset datafile1="$(mktemp -t zvol_misc_fua1.XXXXXX)" typeset datafile2="$(mktemp -t zvol_misc_fua2.XXXXXX)" +typeset datafile3="$(mktemp -t zvol_misc_fua3_log.XXXXXX)" typeset zvolpath=${ZVOL_DEVDIR}/$TESTPOOL/$TESTVOL +typeset DISK1=${DISKS%% *} function cleanup { - rm "$datafile1" "$datafile2" + log_must zpool remove $TESTPOOL $datafile3 + rm "$datafile1" "$datafile2" "$datafile2" +} + +# Prints the total number of sync writes for a vdev +# $1: vdev +function get_sync +{ + zpool iostat -p -H -v -r $TESTPOOL $1 | \ + awk '/[0-9]+$/{s+=$4+$5} END{print s}' } function do_test { # Wait for udev to create symlinks to our zvol block_device_wait $zvolpath + # Write using sync (creates FLUSH calls after writes, but not FUA) + old_vdev_writes=$(get_sync $DISK1) + old_log_writes=$(get_sync $datafile3) + + log_must fio --name=write_iops --size=5M \ + --ioengine=libaio --verify=0 --bs=4K \ + --iodepth=1 --rw=randwrite --group_reporting=1 \ + --filename=$zvolpath --sync=1 + + vdev_writes=$(( $(get_sync $DISK1) - $old_vdev_writes)) + log_writes=$(( $(get_sync $datafile3) - $old_log_writes)) + + # When we're doing sync writes, we should see many more writes go to + # the log vs the first vdev. Experiments show anywhere from a 160-320x + # ratio of writes to the log vs the first vdev (due to some straggler + # writes to the first vdev). + # + # Check that we have a large ratio (100x) of sync writes going to the + # log device + ratio=$(($log_writes / $vdev_writes)) + log_note "Got $log_writes log writes, $vdev_writes vdev writes." + if [ $ratio -lt 100 ] ; then + log_fail "Expected > 100x more log writes than vdev writes. " + fi + # Create a data file log_must dd if=/dev/urandom of="$datafile1" bs=1M count=5 @@ -81,6 +117,8 @@ log_assert "Verify that a ZFS volume can do Force Unit Access (FUA)" log_onexit cleanup log_must zfs set compression=off $TESTPOOL/$TESTVOL +log_must truncate -s 100M $datafile3 +log_must zpool add $TESTPOOL log $datafile3 log_note "Testing without blk-mq" diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 7f9ca6e39df8..3f0a7b40245d 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -3468,10 +3468,10 @@ acpi_EnterSleepState(struct acpi_softc *sc, enum power_stype stype) return_ACPI_STATUS (AE_OK); } - EVENTHANDLER_INVOKE(power_suspend_early); + EVENTHANDLER_INVOKE(power_suspend_early, stype); stop_all_proc(); suspend_all_fs(); - EVENTHANDLER_INVOKE(power_suspend); + EVENTHANDLER_INVOKE(power_suspend, stype); #ifdef EARLY_AP_STARTUP MPASS(mp_ncpus == 1 || smp_started); @@ -3632,7 +3632,7 @@ backout: resume_all_fs(); resume_all_proc(); - EVENTHANDLER_INVOKE(power_resume); + EVENTHANDLER_INVOKE(power_resume, stype); /* Allow another sleep request after a while. */ callout_schedule(&acpi_sleep_timer, hz * ACPI_MINIMUM_AWAKETIME); diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c index 9cfd46c97430..624c81ad1b4f 100644 --- a/sys/dev/acpica/acpi_apei.c +++ b/sys/dev/acpica/acpi_apei.c @@ -754,7 +754,7 @@ apei_detach(device_t dev) apei_nmi = NULL; apei_nmi_nges = NULL; if (sc->nges.swi_ih != NULL) { - swi_remove(&sc->nges.swi_ih); + swi_remove(sc->nges.swi_ih); sc->nges.swi_ih = NULL; } if (acpi_get_handle(dev) != NULL) { diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c index 3d51a4211b80..b20912e2f5fb 100644 --- a/sys/dev/acpica/acpi_timer.c +++ b/sys/dev/acpica/acpi_timer.c @@ -34,6 +34,7 @@ #include <sys/module.h> #include <sys/sysctl.h> #include <sys/timetc.h> +#include <sys/power.h> #include <machine/bus.h> #include <machine/resource.h> @@ -69,8 +70,10 @@ bool acpi_timer_disabled = false; static void acpi_timer_identify(driver_t *driver, device_t parent); static int acpi_timer_probe(device_t dev); static int acpi_timer_attach(device_t dev); -static void acpi_timer_resume_handler(struct timecounter *); -static void acpi_timer_suspend_handler(struct timecounter *); +static void acpi_timer_resume_handler(struct timecounter *, + enum power_stype); +static void acpi_timer_suspend_handler(struct timecounter *, + enum power_stype); static u_int acpi_timer_get_timecount(struct timecounter *tc); static u_int acpi_timer_get_timecount_safe(struct timecounter *tc); static int acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS); @@ -235,7 +238,7 @@ acpi_timer_attach(device_t dev) } static void -acpi_timer_resume_handler(struct timecounter *newtc) +acpi_timer_resume_handler(struct timecounter *newtc, enum power_stype stype) { struct timecounter *tc; @@ -251,7 +254,7 @@ acpi_timer_resume_handler(struct timecounter *newtc) } static void -acpi_timer_suspend_handler(struct timecounter *newtc) +acpi_timer_suspend_handler(struct timecounter *newtc, enum power_stype stype) { struct timecounter *tc; diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 82f56fc0d19e..2b4cb37275a6 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -467,28 +467,6 @@ ahci_ata_probe(device_t dev) } static int -ahci_pci_read_msix_bars(device_t dev, uint8_t *table_bar, uint8_t *pba_bar) -{ - int cap_offset = 0, ret; - uint32_t val; - - if ((table_bar == NULL) || (pba_bar == NULL)) - return (EINVAL); - - ret = pci_find_cap(dev, PCIY_MSIX, &cap_offset); - if (ret != 0) - return (EINVAL); - - val = pci_read_config(dev, cap_offset + PCIR_MSIX_TABLE, 4); - *table_bar = PCIR_BAR(val & PCIM_MSIX_BIR_MASK); - - val = pci_read_config(dev, cap_offset + PCIR_MSIX_PBA, 4); - *pba_bar = PCIR_BAR(val & PCIM_MSIX_BIR_MASK); - - return (0); -} - -static int ahci_pci_attach(device_t dev) { struct ahci_controller *ctlr = device_get_softc(dev); @@ -496,7 +474,6 @@ ahci_pci_attach(device_t dev) uint32_t devid = pci_get_devid(dev); uint8_t revid = pci_get_revid(dev); int msi_count, msix_count; - uint8_t table_bar = 0, pba_bar = 0; uint32_t caps, pi; msi_count = pci_msi_count(dev); @@ -584,20 +561,11 @@ ahci_pci_attach(device_t dev) if (ctlr->quirks & AHCI_Q_NOMSIX) msix_count = 0; - /* Read MSI-x BAR IDs if supported */ - if (msix_count > 0) { - error = ahci_pci_read_msix_bars(dev, &table_bar, &pba_bar); - if (error == 0) { - ctlr->r_msix_tab_rid = table_bar; - ctlr->r_msix_pba_rid = pba_bar; - } else { - /* Failed to read BARs, disable MSI-x */ - msix_count = 0; - } - } - /* Allocate resources for MSI-x table and PBA */ if (msix_count > 0) { + ctlr->r_msix_tab_rid = pci_msix_table_bar(dev); + ctlr->r_msix_pba_rid = pci_msix_pba_bar(dev); + /* * Allocate new MSI-x table only if not * allocated before. @@ -608,8 +576,8 @@ ahci_pci_attach(device_t dev) ctlr->r_msix_table = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &ctlr->r_msix_tab_rid, RF_ACTIVE); if (ctlr->r_msix_table == NULL) { - ahci_free_mem(dev); - return (ENXIO); + msix_count = 0; + goto no_msix; } } @@ -624,12 +592,12 @@ ahci_pci_attach(device_t dev) ctlr->r_msix_pba = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &ctlr->r_msix_pba_rid, RF_ACTIVE); if (ctlr->r_msix_pba == NULL) { - ahci_free_mem(dev); - return (ENXIO); + msix_count = 0; } } } +no_msix: pci_enable_busmaster(dev); /* Reset controller */ if ((error = ahci_pci_ctlr_reset(dev)) != 0) { diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 8422fcb787c3..04ed09f04604 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -4805,6 +4805,8 @@ iwx_rx_tx_cmd(struct iwx_softc *sc, struct iwx_rx_packet *pkt, static void iwx_clear_oactive(struct iwx_softc *sc, struct iwx_tx_ring *ring) { + IWX_ASSERT_LOCKED(sc); + if (ring->queued < iwx_lomark) { sc->qfullmsk &= ~(1 << ring->qid); if (sc->qfullmsk == 0 /* && ifq_is_oactive(&ifp->if_snd) */) { @@ -4890,11 +4892,19 @@ iwx_rx_bmiss(struct iwx_softc *sc, struct iwx_rx_packet *pkt, bus_dmamap_sync(sc->rxq.data_dmat, data->map, BUS_DMASYNC_POSTREAD); + IWX_DPRINTF(sc, IWX_DEBUG_BEACON, + "%s: mac_id=%u, cmslrx=%u, cmb=%u, neb=%d, nrb=%u\n", + __func__, + le32toh(mbn->mac_id), + le32toh(mbn->consec_missed_beacons_since_last_rx), + le32toh(mbn->consec_missed_beacons), + le32toh(mbn->num_expected_beacons), + le32toh(mbn->num_recvd_beacons)); + missed = le32toh(mbn->consec_missed_beacons_since_last_rx); if (missed > vap->iv_bmissthreshold) { ieee80211_beacon_miss(ic); } - } static int @@ -5491,6 +5501,9 @@ iwx_tx_fill_cmd(struct iwx_softc *sc, struct iwx_node *in, /* for non-data, use the lowest supported rate */ ridx = min_ridx; *flags |= IWX_TX_FLAGS_CMD_RATE; + } else if (ni->ni_flags & IEEE80211_NODE_VHT) { + /* TODO: VHT - the ridx / rate array doesn't have VHT rates yet */ + ridx = iwx_min_basic_rate(ic); } else if (ni->ni_flags & IEEE80211_NODE_HT) { ridx = iwx_mcs2ridx[ieee80211_node_get_txrate_dot11rate(ni) & ~IEEE80211_RATE_MCS]; @@ -5622,6 +5635,8 @@ iwx_tx(struct iwx_softc *sc, struct mbuf *m, struct ieee80211_node *ni) struct mbuf *m1; size_t txcmd_size; + IWX_ASSERT_LOCKED(sc); + wh = mtod(m, struct ieee80211_frame *); type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; subtype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK; @@ -7308,97 +7323,107 @@ iwx_rs_init(struct iwx_softc *sc, struct iwx_node *in) return iwx_rs_init_v3(sc, in); } -static void -iwx_rs_update(struct iwx_softc *sc, struct iwx_tlc_update_notif *notif) + +/** + * @brief Turn the given TX rate control notification into an ieee80211_node_txrate + * + * This populates the given txrate node with the TX rate control notification. + * + * @param sc driver softc + * @param notif firmware notification + * @param ni ieee80211_node update + * @returns true if updated, false if not + */ +static bool +iwx_rs_update_node_txrate(struct iwx_softc *sc, + const struct iwx_tlc_update_notif *notif, struct ieee80211_node *ni) { struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - struct ieee80211_node *ni = (void *)vap->iv_bss; + /* XXX TODO: create an inline function in if_iwxreg.h? */ + static int cck_idx_to_rate[] = { 2, 4, 11, 22, 2, 2, 2, 2 }; + static int ofdm_idx_to_rate[] = { 12, 18, 24, 36, 48, 72, 96, 108 }; - struct ieee80211_rateset *rs = &ni->ni_rates; uint32_t rate_n_flags; - uint8_t plcp, rval; - int i, cmd_ver, rate_n_flags_ver2 = 0; - - if (notif->sta_id != IWX_STATION_ID || - (le32toh(notif->flags) & IWX_TLC_NOTIF_FLAG_RATE) == 0) - return; + uint32_t type; + /* Extract the rate and command version */ rate_n_flags = le32toh(notif->rate); + if (sc->sc_rate_n_flags_version != 2) { + net80211_ic_printf(ic, + "%s: unsupported rate_n_flags version (%d)\n", + __func__, + sc->sc_rate_n_flags_version); + return (false); + } + if (sc->sc_debug & IWX_DEBUG_TXRATE) print_ratenflags(__func__, __LINE__, rate_n_flags, sc->sc_rate_n_flags_version); - cmd_ver = iwx_lookup_notif_ver(sc, IWX_DATA_PATH_GROUP, - IWX_TLC_MNG_UPDATE_NOTIF); - if (cmd_ver != IWX_FW_CMD_VER_UNKNOWN && cmd_ver >= 3) - rate_n_flags_ver2 = 1; - - if (rate_n_flags_ver2) { - uint32_t mod_type = (rate_n_flags & IWX_RATE_MCS_MOD_TYPE_MSK); - if (mod_type == IWX_RATE_MCS_HT_MSK) { - - ieee80211_node_set_txrate_dot11rate(ni, - IWX_RATE_HT_MCS_INDEX(rate_n_flags) | - IEEE80211_RATE_MCS); - IWX_DPRINTF(sc, IWX_DEBUG_TXRATE, - "%s:%d new MCS: %d rate_n_flags: %x\n", - __func__, __LINE__, - ieee80211_node_get_txrate_dot11rate(ni) & ~IEEE80211_RATE_MCS, - rate_n_flags); - return; - } - } else { - if (rate_n_flags & IWX_RATE_MCS_HT_MSK_V1) { - ieee80211_node_set_txrate_dot11rate(ni, - rate_n_flags & (IWX_RATE_HT_MCS_RATE_CODE_MSK_V1 | - IWX_RATE_HT_MCS_NSS_MSK_V1)); - - IWX_DPRINTF(sc, IWX_DEBUG_TXRATE, - "%s:%d new MCS idx: %d rate_n_flags: %x\n", - __func__, __LINE__, - ieee80211_node_get_txrate_dot11rate(ni), rate_n_flags); - return; - } + type = (rate_n_flags & IWX_RATE_MCS_MOD_TYPE_MSK); + switch (type) { + case IWX_RATE_MCS_CCK_MSK: + ieee80211_node_set_txrate_dot11rate(ni, + cck_idx_to_rate[rate_n_flags & IWX_RATE_LEGACY_RATE_MSK]); + return (true); + case IWX_RATE_MCS_LEGACY_OFDM_MSK: + ieee80211_node_set_txrate_dot11rate(ni, + ofdm_idx_to_rate[rate_n_flags & IWX_RATE_LEGACY_RATE_MSK]); + return (true); + case IWX_RATE_MCS_HT_MSK: + /* + * TODO: the current API doesn't include channel width + * and other flags, so we can't accurately store them yet! + * + * channel width: (flags & IWX_RATE_MCS_CHAN_WIDTH_MSK) + * >> IWX_RATE_MCS_CHAN_WIDTH_POS) + * LDPC: (flags & (1 << 16)) + */ + ieee80211_node_set_txrate_ht_mcsrate(ni, + IWX_RATE_HT_MCS_INDEX(rate_n_flags)); + return (true); + case IWX_RATE_MCS_VHT_MSK: + /* TODO: same comment on channel width, etc above */ + ieee80211_node_set_txrate_vht_rate(ni, + IWX_RATE_VHT_MCS_CODE(rate_n_flags), + IWX_RATE_VHT_MCS_NSS(rate_n_flags)); + return (true); + default: + net80211_ic_printf(ic, + "%s: unsupported chosen rate type in " + "IWX_RATE_MCS_MOD_TYPE (%d)\n", __func__, + type >> IWX_RATE_MCS_MOD_TYPE_POS); + return (false); } - if (rate_n_flags_ver2) { - const struct ieee80211_rateset *rs; - uint32_t ridx = (rate_n_flags & IWX_RATE_LEGACY_RATE_MSK); - if (rate_n_flags & IWX_RATE_MCS_LEGACY_OFDM_MSK) - rs = &ieee80211_std_rateset_11a; - else - rs = &ieee80211_std_rateset_11b; - if (ridx < rs->rs_nrates) - rval = (rs->rs_rates[ridx] & IEEE80211_RATE_VAL); - else - rval = 0; - } else { - plcp = (rate_n_flags & IWX_RATE_LEGACY_RATE_MSK_V1); + /* Default: if we get here, we didn't successfully update anything */ + return (false); +} - rval = 0; - for (i = IWX_RATE_1M_INDEX; i < nitems(iwx_rates); i++) { - if (iwx_rates[i].plcp == plcp) { - rval = iwx_rates[i].rate; - break; - } - } - } +/** + * @brief Process a firmware rate control update and update net80211. + * + * Since firmware is doing rate control, this just needs to update + * the txrate in the ieee80211_node entry. + */ +static void +iwx_rs_update(struct iwx_softc *sc, struct iwx_tlc_update_notif *notif) +{ + struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + /* XXX TODO: get a node ref! */ + struct ieee80211_node *ni = (void *)vap->iv_bss; - if (rval) { - uint8_t rv; - for (i = 0; i < rs->rs_nrates; i++) { - rv = rs->rs_rates[i] & IEEE80211_RATE_VAL; - if (rv == rval) { - ieee80211_node_set_txrate_dot11rate(ni, i); - break; - } - } - IWX_DPRINTF(sc, IWX_DEBUG_TXRATE, - "%s:%d new rate %d\n", __func__, __LINE__, - ieee80211_node_get_txrate_dot11rate(ni)); - } + /* + * For now the iwx driver only supports a single vdev with a single + * node; it doesn't yet support ibss/hostap/multiple vdevs. + */ + if (notif->sta_id != IWX_STATION_ID || + (le32toh(notif->flags) & IWX_TLC_NOTIF_FLAG_RATE) == 0) + return; + + iwx_rs_update_node_txrate(sc, notif, ni); } static int @@ -8526,6 +8551,8 @@ iwx_start(struct iwx_softc *sc) struct ieee80211_node *ni; struct mbuf *m; + IWX_ASSERT_LOCKED(sc); + while (sc->qfullmsk == 0 && (m = mbufq_dequeue(&sc->sc_snd)) != NULL) { ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; if (iwx_tx(sc, m, ni) != 0) { @@ -8985,10 +9012,10 @@ iwx_rx_pkt(struct iwx_softc *sc, struct iwx_rx_data *data, struct mbuf *ml) break; case IWX_MISSED_BEACONS_NOTIFICATION: + IWX_DPRINTF(sc, IWX_DEBUG_BEACON, + "%s: IWX_MISSED_BEACONS_NOTIFICATION\n", + __func__); iwx_rx_bmiss(sc, pkt, data); - DPRINTF(("%s: IWX_MISSED_BEACONS_NOTIFICATION\n", - __func__)); - ieee80211_beacon_miss(ic); break; case IWX_MFUART_LOAD_NOTIFICATION: diff --git a/sys/dev/iwx/if_iwxreg.h b/sys/dev/iwx/if_iwxreg.h index 6755b93fa0ba..f3d1f078b48e 100644 --- a/sys/dev/iwx/if_iwxreg.h +++ b/sys/dev/iwx/if_iwxreg.h @@ -5176,6 +5176,10 @@ enum { #define IWX_RATE_HT_MCS_INDEX(r) ((((r) & IWX_RATE_MCS_NSS_MSK) >> 1) | \ ((r) & IWX_RATE_HT_MCS_CODE_MSK)) +#define IWX_RATE_VHT_MCS_CODE(r) ((r) & IWX_RATE_HT_MCS_CODE_MSK) +#define IWX_RATE_VHT_MCS_NSS(r) \ + ((((r) & IWX_RATE_MCS_NSS_MSK) == 0) >> IWX_RATE_MCS_NSS_POS) + /* Bits 7-5: reserved */ /* diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 9e43a4c1909f..cde98cb62cef 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -240,6 +240,7 @@ struct pci_quirk { #define PCI_QUIRK_DISABLE_MSIX 5 /* MSI-X doesn't work */ #define PCI_QUIRK_MSI_INTX_BUG 6 /* PCIM_CMD_INTxDIS disables MSI */ #define PCI_QUIRK_REALLOC_BAR 7 /* Can't allocate memory at the default address */ +#define PCI_QUIRK_DISABLE_FLR 8 /* Function-Level Reset (FLR) not working. */ int arg1; int arg2; }; @@ -319,6 +320,13 @@ static const struct pci_quirk pci_quirks[] = { * expected place. */ { 0x98741002, PCI_QUIRK_REALLOC_BAR, 0, 0 }, + + /* + * With some MediaTek mt76 WiFi FLR does not work despite advertised. + */ + { 0x061614c3, PCI_QUIRK_DISABLE_FLR, 0, 0 }, /* mt76 7922 */ + + /* end of table */ { 0 } }; @@ -6740,6 +6748,8 @@ pcie_flr(device_t dev, u_int max_delay, bool force) if (!(pci_read_config(dev, cap + PCIER_DEVICE_CAP, 4) & PCIEM_CAP_FLR)) return (false); + if (pci_has_quirk(pci_get_devid(dev), PCI_QUIRK_DISABLE_FLR)) + return (false); /* * Disable busmastering to prevent generation of new diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index 62b5f313a137..1a314ca6660e 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -2056,7 +2056,12 @@ vmxnet3_update_admin_status(if_ctx_t ctx) struct vmxnet3_softc *sc; sc = iflib_get_softc(ctx); - if (sc->vmx_ds->event != 0) + /* + * iflib may invoke this routine before vmxnet3_attach_post() has + * run, which is before the top level shared data area is + * initialized and the device made aware of it. + */ + if (sc->vmx_ds != NULL && sc->vmx_ds->event != 0) vmxnet3_evintr(sc); vmxnet3_refresh_host_stats(sc); diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index b51ef6766de4..bcf67ddc9689 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -195,8 +195,8 @@ static void vt_update_static(void *); #ifndef SC_NO_CUTPASTE static void vt_mouse_paste(void); #endif -static void vt_suspend_handler(void *priv); -static void vt_resume_handler(void *priv); +static void vt_suspend_handler(void *priv, enum power_stype stype); +static void vt_resume_handler(void *priv, enum power_stype stype); SET_DECLARE(vt_drv_set, struct vt_driver); @@ -3330,7 +3330,7 @@ vt_replace_backend(const struct vt_driver *drv, void *softc) } static void -vt_suspend_handler(void *priv) +vt_suspend_handler(void *priv, enum power_stype stype) { struct vt_device *vd; @@ -3341,7 +3341,7 @@ vt_suspend_handler(void *priv) } static void -vt_resume_handler(void *priv) +vt_resume_handler(void *priv, enum power_stype stype) { struct vt_device *vd; diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index 123df4992894..2c61b48c0451 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -91,6 +91,7 @@ #include <sys/smp.h> #include <sys/eventhandler.h> #include <sys/timetc.h> +#include <sys/power.h> #include <geom/geom.h> @@ -175,12 +176,12 @@ xctrl_suspend(void) cpuset_t cpu_suspend_map; #endif - EVENTHANDLER_INVOKE(power_suspend_early); + EVENTHANDLER_INVOKE(power_suspend_early, POWER_STYPE_SUSPEND_TO_MEM); xs_lock(); stop_all_proc(); xs_unlock(); suspend_all_fs(); - EVENTHANDLER_INVOKE(power_suspend); + EVENTHANDLER_INVOKE(power_suspend, POWER_STYPE_SUSPEND_TO_MEM); #ifdef EARLY_AP_STARTUP MPASS(mp_ncpus == 1 || smp_started); @@ -297,7 +298,7 @@ xctrl_suspend(void) resume_all_fs(); resume_all_proc(); - EVENTHANDLER_INVOKE(power_resume); + EVENTHANDLER_INVOKE(power_resume, POWER_STYPE_SUSPEND_TO_MEM); if (bootverbose) printf("System resumed after suspension\n"); diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h index aa7a689bec34..ad3f7779e108 100644 --- a/sys/fs/nullfs/null.h +++ b/sys/fs/nullfs/null.h @@ -53,7 +53,7 @@ struct null_mount { * A cache of vnode references */ struct null_node { - CK_LIST_ENTRY(null_node) null_hash; /* Hash list */ + CK_SLIST_ENTRY(null_node) null_hash; /* Hash list */ struct vnode *null_lowervp; /* VREFed once */ struct vnode *null_vnode; /* Back pointer */ u_int null_flags; diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 146d3bbdaedd..d7f847d449d0 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -36,12 +36,12 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/lock.h> -#include <sys/rwlock.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/vnode.h> +#include <sys/rwlock.h> #include <sys/smr.h> +#include <sys/vnode.h> #include <fs/nullfs/null.h> @@ -59,7 +59,7 @@ VFS_SMR_DECLARE; #define NULL_NHASH(vp) (&null_node_hashtbl[vfs_hash_index(vp) & null_hash_mask]) -static CK_LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; +static CK_SLIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; static struct rwlock null_hash_lock; static u_long null_hash_mask; @@ -116,7 +116,7 @@ null_hashget_locked(struct mount *mp, struct vnode *lowervp) * reference count (but NOT the lower vnode's VREF counter). */ hd = NULL_NHASH(lowervp); - CK_LIST_FOREACH(a, hd, null_hash) { + CK_SLIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp != lowervp) continue; /* @@ -143,12 +143,12 @@ null_hashget(struct mount *mp, struct vnode *lowervp) struct vnode *vp; enum vgetstate vs; - ASSERT_VOP_LOCKED(lowervp, "null_hashget"); + ASSERT_VOP_LOCKED(lowervp, __func__); rw_assert(&null_hash_lock, RA_UNLOCKED); vfs_smr_enter(); hd = NULL_NHASH(lowervp); - CK_LIST_FOREACH(a, hd, null_hash) { + CK_SLIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp != lowervp) continue; /* @@ -181,7 +181,7 @@ null_hashins(struct mount *mp, struct null_node *xp) hd = NULL_NHASH(xp->null_lowervp); #ifdef INVARIANTS - CK_LIST_FOREACH(oxp, hd, null_hash) { + CK_SLIST_FOREACH(oxp, hd, null_hash) { if (oxp->null_lowervp == xp->null_lowervp && NULLTOV(oxp)->v_mount == mp) { VNASSERT(0, NULLTOV(oxp), @@ -189,7 +189,7 @@ null_hashins(struct mount *mp, struct null_node *xp) } } #endif - CK_LIST_INSERT_HEAD(hd, xp, null_hash); + CK_SLIST_INSERT_HEAD(hd, xp, null_hash); } static void @@ -305,9 +305,11 @@ null_nodeget(struct mount *mp, struct vnode *lowervp, struct vnode **vpp) void null_hashrem(struct null_node *xp) { + struct null_node_hashhead *hd; + hd = NULL_NHASH(xp->null_lowervp); rw_wlock(&null_hash_lock); - CK_LIST_REMOVE(xp, null_hash); + CK_SLIST_REMOVE(hd, xp, null_node, null_hash); rw_wunlock(&null_hash_lock); } diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 375b6aa27531..ec8a6b10b13f 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -788,10 +788,10 @@ null_lock_prep_with_smr(struct vop_lock1_args *ap) struct null_node *nn; struct vnode *lvp; - vfs_smr_enter(); - lvp = NULL; + vfs_smr_enter(); + nn = VTONULL_SMR(ap->a_vp); if (__predict_true(nn != NULL)) { lvp = nn->null_lowervp; @@ -855,6 +855,8 @@ null_lock(struct vop_lock1_args *ap) * case by reacquiring correct lock in requested mode. */ if (VTONULL(ap->a_vp) == NULL && error == 0) { + VOP_UNLOCK(lvp); + flags = ap->a_flags; ap->a_flags &= ~LK_TYPE_MASK; switch (flags & LK_TYPE_MASK) { @@ -869,7 +871,6 @@ null_lock(struct vop_lock1_args *ap) panic("Unsupported lock request %d\n", flags); } - VOP_UNLOCK(lvp); error = vop_stdlock(ap); } vdrop(lvp); diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index 2d60d5e037a0..96be64de017b 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -84,7 +84,7 @@ static cpuset_t suspcpus; static struct susppcb **susppcbs; #endif -static void acpi_stop_beep(void *); +static void acpi_stop_beep(void *, enum power_stype); #ifdef SMP static int acpi_wakeup_ap(struct acpi_softc *, int); @@ -100,7 +100,7 @@ static void acpi_wakeup_cpus(struct acpi_softc *); } while (0) static void -acpi_stop_beep(void *arg) +acpi_stop_beep(void *arg, enum power_stype stype) { if (acpi_resume_beep != 0) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index a32b5a1b3354..ab8ed32ad189 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -127,6 +127,27 @@ proc_realparent(struct proc *child) return (parent); } +static void +reaper_clear(struct proc *p, struct proc *rp) +{ + struct proc *p1; + bool clear; + + sx_assert(&proctree_lock, SX_XLOCKED); + LIST_REMOVE(p, p_reapsibling); + if (p->p_reapsubtree == 1) + return; + clear = true; + LIST_FOREACH(p1, &rp->p_reaplist, p_reapsibling) { + if (p1->p_reapsubtree == p->p_reapsubtree) { + clear = false; + break; + } + } + if (clear) + proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); +} + void reaper_abandon_children(struct proc *p, bool exiting) { @@ -138,7 +159,7 @@ reaper_abandon_children(struct proc *p, bool exiting) return; p1 = p->p_reaper; LIST_FOREACH_SAFE(p2, &p->p_reaplist, p_reapsibling, ptmp) { - LIST_REMOVE(p2, p_reapsibling); + reaper_clear(p2, p); p2->p_reaper = p1; p2->p_reapsubtree = p->p_reapsubtree; LIST_INSERT_HEAD(&p1->p_reaplist, p2, p_reapsibling); @@ -152,27 +173,6 @@ reaper_abandon_children(struct proc *p, bool exiting) p->p_treeflag &= ~P_TREE_REAPER; } -static void -reaper_clear(struct proc *p) -{ - struct proc *p1; - bool clear; - - sx_assert(&proctree_lock, SX_LOCKED); - LIST_REMOVE(p, p_reapsibling); - if (p->p_reapsubtree == 1) - return; - clear = true; - LIST_FOREACH(p1, &p->p_reaper->p_reaplist, p_reapsibling) { - if (p1->p_reapsubtree == p->p_reapsubtree) { - clear = false; - break; - } - } - if (clear) - proc_id_clear(PROC_ID_REAP, p->p_reapsubtree); -} - void proc_clear_orphan(struct proc *p) { @@ -972,7 +972,7 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options) sx_xunlock(PIDHASHLOCK(p->p_pid)); LIST_REMOVE(p, p_sibling); reaper_abandon_children(p, true); - reaper_clear(p); + reaper_clear(p, p->p_reaper); PROC_LOCK(p); proc_clear_orphan(p); PROC_UNLOCK(p); diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 8b5908f5219a..d67c70984528 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -503,8 +503,8 @@ _mtx_trylock_flags_(volatile uintptr_t *c, int opts, const char *file, int line) /* * __mtx_lock_sleep: the tougher part of acquiring an MTX_DEF lock. * - * We call this if the lock is either contested (i.e. we need to go to - * sleep waiting for it), or if we need to recurse on it. + * We get here if lock profiling is enabled, the lock is already held by + * someone else or we are recursing on it. */ #if LOCK_DEBUG > 0 void @@ -660,13 +660,8 @@ retry_turnstile: } #endif - /* - * If the mutex isn't already contested and a failure occurs - * setting the contested bit, the mutex was either released - * or the state of the MTX_RECURSED bit changed. - */ - if ((v & MTX_CONTESTED) == 0 && - !atomic_fcmpset_ptr(&m->mtx_lock, &v, v | MTX_CONTESTED)) { + if ((v & MTX_WAITERS) == 0 && + !atomic_fcmpset_ptr(&m->mtx_lock, &v, v | MTX_WAITERS)) { goto retry_turnstile; } @@ -869,7 +864,7 @@ _thread_lock(struct thread *td) WITNESS_LOCK(&m->lock_object, LOP_EXCLUSIVE, file, line); return; } - _mtx_release_lock_quick(m); + atomic_store_rel_ptr(&m->mtx_lock, MTX_UNOWNED); slowpath_unlocked: spinlock_exit(); slowpath_noirq: @@ -959,7 +954,7 @@ retry: } if (m == td->td_lock) break; - _mtx_release_lock_quick(m); + atomic_store_rel_ptr(&m->mtx_lock, MTX_UNOWNED); } LOCK_LOG_LOCK("LOCK", &m->lock_object, opts, m->mtx_recurse, file, line); @@ -1029,8 +1024,8 @@ thread_lock_set(struct thread *td, struct mtx *new) /* * __mtx_unlock_sleep: the tougher part of releasing an MTX_DEF lock. * - * We are only called here if the lock is recursed, contested (i.e. we - * need to wake up a blocked thread) or lockstat probe is active. + * We get here if lock profiling is enabled, the lock is already held by + * someone else or we are recursing on it. */ #if LOCK_DEBUG > 0 void @@ -1071,7 +1066,7 @@ __mtx_unlock_sleep(volatile uintptr_t *c, uintptr_t v) * can be removed from the hash list if it is empty. */ turnstile_chain_lock(&m->lock_object); - _mtx_release_lock_quick(m); + atomic_store_rel_ptr(&m->mtx_lock, MTX_UNOWNED); ts = turnstile_lookup(&m->lock_object); MPASS(ts != NULL); if (LOCK_LOG_TEST(&m->lock_object, opts)) @@ -1207,7 +1202,7 @@ _mtx_destroy(volatile uintptr_t *c) if (!mtx_owned(m)) MPASS(mtx_unowned(m)); else { - MPASS((m->mtx_lock & (MTX_RECURSED|MTX_CONTESTED)) == 0); + MPASS((m->mtx_lock & (MTX_RECURSED|MTX_WAITERS)) == 0); /* Perform the non-mtx related part of mtx_unlock_spin(). */ if (LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin) { @@ -1359,8 +1354,8 @@ db_show_mtx(const struct lock_object *lock) db_printf("DESTROYED"); else { db_printf("OWNED"); - if (m->mtx_lock & MTX_CONTESTED) - db_printf(", CONTESTED"); + if (m->mtx_lock & MTX_WAITERS) + db_printf(", WAITERS"); if (m->mtx_lock & MTX_RECURSED) db_printf(", RECURSED"); } diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 30527fdd4fd0..57ebe8dc85f0 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -567,7 +567,7 @@ pipespace_new(struct pipe *cpipe, int size) static int curfail = 0; static struct timeval lastfail; - KASSERT(!mtx_owned(PIPE_MTX(cpipe)), ("pipespace: pipe mutex locked")); + PIPE_LOCK_ASSERT(cpipe, MA_NOTOWNED); KASSERT(!(cpipe->pipe_state & PIPE_DIRECTW), ("pipespace: resize of direct writes not allowed")); retry: @@ -1679,8 +1679,7 @@ static void pipe_free_kmem(struct pipe *cpipe) { - KASSERT(!mtx_owned(PIPE_MTX(cpipe)), - ("pipe_free_kmem: pipe mutex locked")); + PIPE_LOCK_ASSERT(cpipe, MA_NOTOWNED); if (cpipe->pipe_buffer.buffer != NULL) { atomic_subtract_long(&amountpipekva, cpipe->pipe_buffer.size); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 3d4567b6ab1e..a53df50c06bd 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -806,9 +806,12 @@ file_v_lock(struct file *fp, short lock_bit, short lock_wait_bit) flagsp = &fp->f_vflags; state = atomic_load_16(flagsp); - if ((state & lock_bit) == 0 && - atomic_cmpset_acq_16(flagsp, state, state | lock_bit)) - return; + for (;;) { + if ((state & lock_bit) != 0) + break; + if (atomic_fcmpset_acq_16(flagsp, &state, state | lock_bit)) + return; + } sleepq_lock(flagsp); state = atomic_load_16(flagsp); @@ -842,9 +845,12 @@ file_v_unlock(struct file *fp, short lock_bit, short lock_wait_bit) flagsp = &fp->f_vflags; state = atomic_load_16(flagsp); - if ((state & lock_wait_bit) == 0 && - atomic_cmpset_rel_16(flagsp, state, state & ~lock_bit)) - return; + for (;;) { + if ((state & lock_wait_bit) != 0) + break; + if (atomic_fcmpset_rel_16(flagsp, &state, state & ~lock_bit)) + return; + } sleepq_lock(flagsp); MPASS((*flagsp & lock_bit) != 0); @@ -864,10 +870,6 @@ foffset_lock(struct file *fp, int flags) FILE_V_FOFFSET_LOCK_WAITING); } - /* - * According to McKusick the vn lock was protecting f_offset here. - * It is now protected by the FOFFSET_LOCKED flag. - */ return (atomic_load_long(&fp->f_offset)); } diff --git a/sys/modules/zfs/zfs_config.h b/sys/modules/zfs/zfs_config.h index c595030ed4a0..db1b6f33a8ef 100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@ -843,7 +843,7 @@ /* #undef ZFS_DEVICE_MINOR */ /* Define the project alias string. */ -#define ZFS_META_ALIAS "zfs-2.4.99-72-FreeBSD_gb2196fbed" +#define ZFS_META_ALIAS "zfs-2.4.99-95-FreeBSD_g5605a6d79" /* Define the project author. */ #define ZFS_META_AUTHOR "OpenZFS" @@ -852,7 +852,7 @@ /* #undef ZFS_META_DATA */ /* Define the maximum compatible kernel version. */ -#define ZFS_META_KVER_MAX "6.16" +#define ZFS_META_KVER_MAX "6.17" /* Define the minimum compatible kernel version. */ #define ZFS_META_KVER_MIN "4.18" @@ -873,7 +873,7 @@ #define ZFS_META_NAME "zfs" /* Define the project release. */ -#define ZFS_META_RELEASE "72-FreeBSD_gb2196fbed" +#define ZFS_META_RELEASE "95-FreeBSD_g5605a6d79" /* Define the project version. */ #define ZFS_META_VERSION "2.4.99" diff --git a/sys/modules/zfs/zfs_gitrev.h b/sys/modules/zfs/zfs_gitrev.h index 9eae1e8573c0..8a1802f5480b 100644 --- a/sys/modules/zfs/zfs_gitrev.h +++ b/sys/modules/zfs/zfs_gitrev.h @@ -1 +1 @@ -#define ZFS_META_GITREV "zfs-2.4.99-72-gb2196fbed" +#define ZFS_META_GITREV "zfs-2.4.99-95-g5605a6d79" diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c index 978d6fd0b54d..05c6062463be 100644 --- a/sys/netgraph/netflow/netflow.c +++ b/sys/netgraph/netflow/netflow.c @@ -960,7 +960,7 @@ struct ngnf_show_header *resp) list_id = 0; TAILQ_FOREACH(fle, &hsh->head, fle_hash) { - if (hsh->mtx.mtx_lock & MTX_CONTESTED) { + if (hsh->mtx.mtx_lock & MTX_WAITERS) { resp->hash_id = i; resp->list_id = list_id; mtx_unlock(&hsh->mtx); @@ -1111,7 +1111,7 @@ ng_netflow_expire(void *arg) * Interrupt thread wants this entry! * Quick! Quick! Bail out! */ - if (hsh->mtx.mtx_lock & MTX_CONTESTED) + if (hsh->mtx.mtx_lock & MTX_WAITERS) break; /* @@ -1150,7 +1150,7 @@ ng_netflow_expire(void *arg) * Interrupt thread wants this entry! * Quick! Quick! Bail out! */ - if (hsh->mtx.mtx_lock & MTX_CONTESTED) + if (hsh->mtx.mtx_lock & MTX_WAITERS) break; /* diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h index ec66be0cf371..a60983cb30e3 100644 --- a/sys/netinet/sctp_lock_bsd.h +++ b/sys/netinet/sctp_lock_bsd.h @@ -263,10 +263,10 @@ } while (0) #define SCTP_INP_LOCK_CONTENDED(_inp) \ - ((_inp)->inp_mtx.mtx_lock & MTX_CONTESTED) + ((_inp)->inp_mtx.mtx_lock & MTX_WAITERS) #define SCTP_INP_READ_CONTENDED(_inp) \ - ((_inp)->inp_rdata_mtx.mtx_lock & MTX_CONTESTED) + ((_inp)->inp_rdata_mtx.mtx_lock & MTX_WAITERS) #ifdef SCTP_LOCK_LOGGING #define SCTP_INP_RLOCK(_inp) do { \ @@ -337,7 +337,7 @@ } while (0) #define SCTP_ASOC_CREATE_LOCK_CONTENDED(_inp) \ - ((_inp)->inp_create_mtx.mtx_lock & MTX_CONTESTED) + ((_inp)->inp_create_mtx.mtx_lock & MTX_WAITERS) /* * For the majority of things (once we have found the association) we will diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index def6bc886617..f842a5678fa1 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1272,7 +1272,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, syncache_send_challenge_ack(sc, m); SCH_UNLOCK(sch); free(s, M_TCPLOG); - return (-1); /* Do not send RST */; + return (-1); /* Do not send RST */ } /* @@ -1285,7 +1285,8 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, "segment rejected\n", s, __func__, th->th_ack, sc->sc_iss + 1); SCH_UNLOCK(sch); - goto failed; + free(s, M_TCPLOG); + return (0); /* Do send RST, do not free sc. */ } TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash); diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 4f756a75fac7..b98703bdfbfe 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1295,8 +1295,8 @@ in6_addifaddr(struct ifnet *ifp, struct in6_aliasreq *ifra, struct in6_ifaddr *i */ bzero(&pr0, sizeof(pr0)); pr0.ndpr_ifp = ifp; - pr0.ndpr_plen = in6_mask2len(&ifra->ifra_prefixmask.sin6_addr, - NULL); + pr0.ndpr_plen = ia->ia_plen = + in6_mask2len(&ifra->ifra_prefixmask.sin6_addr, NULL); if (pr0.ndpr_plen == 128) { /* we don't need to install a host route. */ goto aifaddr_out; @@ -1490,16 +1490,16 @@ in6_unlink_ifa(struct in6_ifaddr *ia, struct ifnet *ifp) * positive reference. */ remove_lle = 0; - if (ia->ia6_ndpr == NULL) { - nd6log((LOG_NOTICE, - "in6_unlink_ifa: autoconf'ed address " - "%s has no prefix\n", ip6_sprintf(ip6buf, IA6_IN6(ia)))); - } else { + if (ia->ia6_ndpr != NULL) { ia->ia6_ndpr->ndpr_addrcnt--; /* Do not delete lles within prefix if refcont != 0 */ if (ia->ia6_ndpr->ndpr_addrcnt == 0) remove_lle = 1; ia->ia6_ndpr = NULL; + } else if (ia->ia_plen < 128) { + nd6log((LOG_NOTICE, + "in6_unlink_ifa: autoconf'ed address " + "%s has no prefix\n", ip6_sprintf(ip6buf, IA6_IN6(ia)))); } nd6_rem_ifa_lle(ia, remove_lle); diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 6dd8a9cbdb35..57f7e1e29d08 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -1068,14 +1068,14 @@ snl_init_writer(struct snl_state *ss, struct snl_writer *nw) { nw->size = SNL_WRITER_BUFFER_SIZE; nw->base = (char *)snl_allocz(ss, nw->size); - if (nw->base == NULL) { + if (__predict_false(nw->base == NULL)) { nw->error = true; nw->size = 0; - } + } else + nw->error = false; nw->offset = 0; nw->hdr = NULL; - nw->error = false; nw->ss = ss; } diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index c0d9811dd1b9..29a16b393b52 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -33,6 +33,7 @@ #include <sys/lock.h> #include <sys/ktr.h> #include <sys/mutex.h> +#include <sys/power.h> #include <sys/queue.h> #ifdef VIMAGE @@ -201,7 +202,7 @@ EVENTHANDLER_DECLARE(shutdown_post_sync, shutdown_fn); /* after fs sync */ EVENTHANDLER_DECLARE(shutdown_final, shutdown_fn); /* Power state change events */ -typedef void (*power_change_fn)(void *); +typedef void (*power_change_fn)(void *, enum power_stype stype); EVENTHANDLER_DECLARE(power_resume, power_change_fn); EVENTHANDLER_DECLARE(power_suspend, power_change_fn); EVENTHANDLER_DECLARE(power_suspend_early, power_change_fn); diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 08d4e2d28b33..4f6b45d78a88 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -68,9 +68,9 @@ */ #define MTX_UNOWNED 0x00000000 /* Cookie for free mutex */ #define MTX_RECURSED 0x00000001 /* lock recursed (for MTX_DEF only) */ -#define MTX_CONTESTED 0x00000002 /* lock contested (for MTX_DEF only) */ +#define MTX_WAITERS 0x00000002 /* lock has waiters (for MTX_DEF only) */ #define MTX_DESTROYED 0x00000004 /* lock destroyed */ -#define MTX_FLAGMASK (MTX_RECURSED | MTX_CONTESTED | MTX_DESTROYED) +#define MTX_FLAGMASK (MTX_RECURSED | MTX_WAITERS | MTX_DESTROYED) /* * Prototypes @@ -217,14 +217,10 @@ void _thread_lock(struct thread *); #define _mtx_obtain_lock_fetch(mp, vp, tid) \ atomic_fcmpset_acq_ptr(&(mp)->mtx_lock, vp, (tid)) -/* Try to release mtx_lock if it is unrecursed and uncontested. */ +/* Try to release mtx_lock if it is unrecursed and without waiters. */ #define _mtx_release_lock(mp, tid) \ atomic_cmpset_rel_ptr(&(mp)->mtx_lock, (tid), MTX_UNOWNED) -/* Release mtx_lock quickly, assuming we own it. */ -#define _mtx_release_lock_quick(mp) \ - atomic_store_rel_ptr(&(mp)->mtx_lock, MTX_UNOWNED) - #define _mtx_release_lock_fetch(mp, vp) \ atomic_fcmpset_rel_ptr(&(mp)->mtx_lock, (vp), MTX_UNOWNED) @@ -246,10 +242,10 @@ void _thread_lock(struct thread *); }) /* - * Lock a spin mutex. For spinlocks, we handle recursion inline (it - * turns out that function calls can be significantly expensive on - * some architectures). Since spin locks are not _too_ common, - * inlining this code is not too big a deal. + * Lock a spin mutex. + * + * FIXME: spinlock_enter is a function call, defeating the point of inlining in + * this. */ #ifdef SMP #define __mtx_lock_spin(mp, tid, opts, file, line) __extension__ ({ \ @@ -317,10 +313,10 @@ void _thread_lock(struct thread *); }) /* - * Unlock a spin mutex. For spinlocks, we can handle everything - * inline, as it's pretty simple and a function call would be too - * expensive (at least on some architectures). Since spin locks are - * not _too_ common, inlining this code is not too big a deal. + * Unlock a spin mutex. + * + * FIXME: spinlock_exit is a function call, defeating the point of inlining in + * this. * * Since we always perform a spinlock_enter() when attempting to acquire a * spin lock, we need to always perform a matching spinlock_exit() when @@ -332,7 +328,7 @@ void _thread_lock(struct thread *); (mp)->mtx_recurse--; \ else { \ LOCKSTAT_PROFILE_RELEASE_SPIN_LOCK(spin__release, mp); \ - _mtx_release_lock_quick((mp)); \ + atomic_store_rel_ptr(&(mp)->mtx_lock, MTX_UNOWNED); \ } \ spinlock_exit(); \ }) diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c index 1851df8d00a0..4b40f343ac90 100644 --- a/sys/x86/x86/mca.c +++ b/sys/x86/x86/mca.c @@ -124,6 +124,17 @@ SYSCTL_INT(_hw_mca, OID_AUTO, erratum383, CTLFLAG_RDTUN, &workaround_erratum383, 0, "Is the workaround for Erratum 383 on AMD Family 10h processors enabled?"); +#ifdef DIAGNOSTIC +static uint64_t fake_status; +SYSCTL_U64(_hw_mca, OID_AUTO, fake_status, CTLFLAG_RW, + &fake_status, 0, + "Insert artificial MCA with given status (testing purpose only)"); +static int fake_bank; +SYSCTL_INT(_hw_mca, OID_AUTO, fake_bank, CTLFLAG_RW, + &fake_bank, 0, + "Bank to use for artificial MCAs (testing purpose only)"); +#endif + static STAILQ_HEAD(, mca_internal) mca_freelist; static int mca_freecount; static STAILQ_HEAD(, mca_internal) mca_records; @@ -131,8 +142,10 @@ static STAILQ_HEAD(, mca_internal) mca_pending; static int mca_ticks = 300; static struct taskqueue *mca_tq; static struct task mca_resize_task; +static struct task mca_postscan_task; static struct timeout_task mca_scan_task; static struct mtx mca_lock; +static bool mca_startup_done = false; /* Statistics on number of MCA events by type, updated atomically. */ static uint64_t mca_stats[MCA_T_COUNT]; @@ -699,8 +712,24 @@ mca_check_status(enum scan_mode mode, uint64_t mcg_cap, int bank, bool mce, recover; status = rdmsr(mca_msr_ops.status(bank)); - if (!(status & MC_STATUS_VAL)) + if (!(status & MC_STATUS_VAL)) { +#ifdef DIAGNOSTIC + /* + * Check if we have a pending artificial event to generate. + * Note that this is potentially racy with the sysctl. The + * tradeoff is deemed acceptable given the test nature + * of the code. + */ + if (fake_status && bank == fake_bank) { + status = fake_status; + fake_status = 0; + } + if (!(status & MC_STATUS_VAL)) + return (0); +#else return (0); +#endif + } recover = *recoverablep; mce = mca_is_mce(mcg_cap, status, &recover); @@ -794,9 +823,9 @@ mca_record_entry(enum scan_mode mode, const struct mca_record *record) mtx_lock_spin(&mca_lock); rec = STAILQ_FIRST(&mca_freelist); if (rec == NULL) { + mtx_unlock_spin(&mca_lock); printf("MCA: Unable to allocate space for an event.\n"); mca_log(record); - mtx_unlock_spin(&mca_lock); return; } STAILQ_REMOVE_HEAD(&mca_freelist, link); @@ -1015,18 +1044,49 @@ static void mca_process_records(enum scan_mode mode) { struct mca_internal *mca; + STAILQ_HEAD(, mca_internal) tmplist; + /* + * If in an interrupt context, defer the post-scan activities to a + * task queue. + */ + if (mode != POLLED) { + if (mca_startup_done) + taskqueue_enqueue(mca_tq, &mca_postscan_task); + return; + } + + /* + * Copy the pending list to the stack so we can drop the spin lock + * while we are emitting logs. + */ + STAILQ_INIT(&tmplist); mtx_lock_spin(&mca_lock); - while ((mca = STAILQ_FIRST(&mca_pending)) != NULL) { - STAILQ_REMOVE_HEAD(&mca_pending, link); + STAILQ_SWAP(&mca_pending, &tmplist, mca_internal); + mtx_unlock_spin(&mca_lock); + + STAILQ_FOREACH(mca, &tmplist, link) mca_log(&mca->rec); + + mtx_lock_spin(&mca_lock); + while ((mca = STAILQ_FIRST(&tmplist)) != NULL) { + STAILQ_REMOVE_HEAD(&tmplist, link); mca_store_record(mca); } mtx_unlock_spin(&mca_lock); - if (mode == POLLED) - mca_resize_freelist(); - else if (!cold) - taskqueue_enqueue(mca_tq, &mca_resize_task); + mca_resize_freelist(); +} + +/* + * Emit log entries and resize the free list. This is intended to be called + * from a task queue to handle work which does not need to be done (or cannot + * be done) in an interrupt context. + */ +static void +mca_postscan(void *context __unused, int pending __unused) +{ + + mca_process_records(POLLED); } /* @@ -1097,7 +1157,7 @@ sysctl_mca_maxcount(SYSCTL_HANDLER_ARGS) doresize = true; } mtx_unlock_spin(&mca_lock); - if (doresize && !cold) + if (doresize && mca_startup_done) taskqueue_enqueue(mca_tq, &mca_resize_task); return (error); } @@ -1109,12 +1169,16 @@ mca_startup(void *dummy) if (mca_banks <= 0) return; - /* CMCIs during boot may have claimed items from the freelist. */ - mca_resize_freelist(); - taskqueue_start_threads(&mca_tq, 1, PI_SWI(SWI_TQ), "mca taskq"); taskqueue_enqueue_timeout_sbt(mca_tq, &mca_scan_task, mca_ticks * SBT_1S, 0, C_PREL(1)); + mca_startup_done = true; + + /* + * CMCIs during boot may have recorded entries. Conduct the post-scan + * activities now. + */ + mca_postscan(NULL, 0); } SYSINIT(mca_startup, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, mca_startup, NULL); @@ -1174,6 +1238,7 @@ mca_setup(uint64_t mcg_cap) TIMEOUT_TASK_INIT(mca_tq, &mca_scan_task, 0, mca_scan_cpus, NULL); STAILQ_INIT(&mca_freelist); TASK_INIT(&mca_resize_task, 0, mca_resize, NULL); + TASK_INIT(&mca_postscan_task, 0, mca_postscan, NULL); mca_resize_freelist(); SYSCTL_ADD_INT(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca), OID_AUTO, "count", CTLFLAG_RD, (int *)(uintptr_t)&mca_count, 0, @@ -1577,6 +1642,9 @@ mca_intr(void) panic("Unrecoverable machine check exception"); } + if (count) + mca_process_records(MCE); + /* Clear MCIP. */ wrmsr(MSR_MCG_STATUS, mcg_status & ~MCG_STATUS_MCIP); } diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 20baadfea5c5..d4de71271985 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -67,9 +67,9 @@ tarfs_basic_body() { mktar "${tarball}" atf_check mount -rt tarfs "${tarball}" "${mnt}" atf_check -o match:"^${tarball} on ${mnt} \(tarfs," mount - atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -f%d,%i "${mnt}"/hard_link)" - atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -L -f%d,%i "${mnt}"/short_link)" - atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -L -f%d,%i "${mnt}"/long_link)" + atf_check test "${mnt}"/sparse_file -ef "${mnt}"/hard_link + atf_check test "${mnt}"/sparse_file -ef "${mnt}"/short_link + atf_check test "${mnt}"/sparse_file -ef "${mnt}"/long_link atf_check -o inline:"${sum}\n" sha256 -q "${mnt}"/sparse_file atf_check -o inline:"2,40755\n" stat -f%l,%p "${mnt}"/directory atf_check -o inline:"1,100644\n" stat -f%l,%p "${mnt}"/file diff --git a/tools/test/stress2/misc/all.exclude b/tools/test/stress2/misc/all.exclude index f9b32db95799..0658bfdc0c1b 100644 --- a/tools/test/stress2/misc/all.exclude +++ b/tools/test/stress2/misc/all.exclude @@ -25,6 +25,7 @@ gnop13.sh https://people.freebsd.org/~pho/stress/log/log0386.txt 20221113 gnop7.sh Waiting for patch commit 20190820 gnop8.sh Waiting for patch commit 20201214 gnop9.sh Waiting for patch commit 20201214 +graid1_3.sh Hang seen 20250915 graid1_8.sh Known issue 20170909 graid1_9.sh panic: Bad effnlink 20180212 lockf5.sh Spinning threads seen 20160718 @@ -74,10 +75,13 @@ syzkaller67.sh panic: ASan: Invalid access, 8-byte read at ... 20230621 syzkaller80.sh panic 20250711 syzkaller81.sh panic 20250711 syzkaller82.sh panic: m_apply, length > size of mbuf chain 20250724 +syzkaller84.sh panic: Assertion !(sb->sb_state & SBS_CANTRCVMORE) 20250810 +syzkaller85.sh panic: Assertion uio->uio_resid < 0 failed 20250928 +syzkaller86.sh Fatal trap 12: page fault while in kernel mode 20251001 +write2.sh panic: sndbuf_acquire: count 255 > free 0 20251003 quota3.sh https://people.freebsd.org/~pho/stress/log/log0604.txt 20250728 quota6.sh https://people.freebsd.org/~pho/stress/log/log0456.txt 20240707 truss3.sh WiP 20200915 -zfs18.sh https://people.freebsd.org/~pho/stress/log/log0560.txt 20241118 zfs9.sh panic: sacked_bytes < 0 20250711 # Test not to run for other reasons: diff --git a/tools/test/stress2/misc/fuzz.sh b/tools/test/stress2/misc/fuzz.sh index 189cdbfebd01..add3d0d19a21 100755 --- a/tools/test/stress2/misc/fuzz.sh +++ b/tools/test/stress2/misc/fuzz.sh @@ -49,6 +49,7 @@ . ../default.cfg D=$diskimage +backup=/tmp/fuzz.sh.diskimage.`date +%Y%m%dT%H%M%S`.gz tst() { rm -f $D @@ -62,6 +63,7 @@ tst() { for i in `jot 50`; do ./fuzz -n 50 $D + gzip < $D > $backup if fsck -f -y /dev/md$mdstart 2>&1 | egrep "^[A-Z]" > /dev/null; then if fsck -f -y /dev/md$mdstart 2>&1 | egrep "^[A-Z]" > /dev/null; then if fsck -f -y /dev/md$mdstart 2>&1 | egrep "^[A-Z]" > /dev/null; then @@ -73,7 +75,7 @@ tst() { sync;sync;sync if mount /dev/md$mdstart $mntpoint; then ls -l $mntpoint > /dev/null - find $mntpoint -exec dd if={} of=/dev/null bs=1m count=3 \; > /dev/null 2>&1 + find $mntpoint -type f -exec dd if={} of=/dev/null bs=1m count=3 \; > /dev/null 2>&1 umount $mntpoint else echo "Giving up at loop $i" @@ -96,7 +98,7 @@ for j in `jot 10`; do date '+%T' tst done -rm -f fuzz +rm -f fuzz $backup exit diff --git a/tools/test/stress2/misc/syzkaller84.sh b/tools/test/stress2/misc/syzkaller84.sh new file mode 100755 index 000000000000..a7976be2eeb6 --- /dev/null +++ b/tools/test/stress2/misc/syzkaller84.sh @@ -0,0 +1,402 @@ +#!/bin/sh + +# panic: Assertion !(sb->sb_state & SBS_CANTRCVMORE) failed at ../../../kern/uipc_usrreq.c:1549 +# cpuid = 6 +# time = 1754809105 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe0176ef6a80 +# vpanic() at vpanic+0x136/frame 0xfffffe0176ef6bb0 +# panic() at panic+0x43/frame 0xfffffe0176ef6c10 +# uipc_soreceive_stream_or_seqpacket() at uipc_soreceive_stream_or_seqpacket+0x968/frame 0xfffffe0176ef6cd0 +# soreceive() at soreceive+0x45/frame 0xfffffe0176ef6cf0 +# kern_recvit() at kern_recvit+0x181/frame 0xfffffe0176ef6da0 +# sys_recvmsg() at sys_recvmsg+0x67/frame 0xfffffe0176ef6e00 +# amd64_syscall() at amd64_syscall+0x169/frame 0xfffffe0176ef6f30 +# fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe0176ef6f30 +# --- syscall (0, FreeBSD ELF64, syscall), rip = 0x821d3da8a, rsp = 0x824440f68, rbp = 0x824440f90 --- +# KDB: enter: panic +# [ thread pid 17448 tid 292963 ] +# Stopped at kdb_enter+0x33: movq $0,0x12304a2(%rip) +# db> x/s version +# version: FreeBSD 15.0-PRERELEASE #0 main-n279510-db7c0e32a05d-dirty: Sat Aug 9 17:21:54 CEST 2025 +# pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO +# db> + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c <<EOF +// https://syzkaller.appspot.com/bug?id=79d6de939eb5c7de69e8e4993b6239aa0ae67335 +// autogenerated by syzkaller (https://github.com/google/syzkaller) +// syzbot+ffcc3612ea266e36604e@syzkaller.appspotmail.com + +#define _GNU_SOURCE + +#include <sys/types.h> + +#include <errno.h> +#include <pthread.h> +#include <pwd.h> +#include <signal.h> +#include <stdarg.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/endian.h> +#include <sys/resource.h> +#include <sys/syscall.h> +#include <sys/wait.h> +#include <time.h> +#include <unistd.h> + +static unsigned long long procid; + +static void kill_and_wait(int pid, int* status) +{ + kill(pid, SIGKILL); + while (waitpid(-1, status, 0) != pid) { + } +} + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void thread_start(void* (*fn)(void*), void* arg) +{ + pthread_t th; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 128 << 10); + int i = 0; + for (; i < 100; i++) { + if (pthread_create(&th, &attr, fn, arg) == 0) { + pthread_attr_destroy(&attr); + return; + } + if (errno == EAGAIN) { + usleep(50); + continue; + } + break; + } + exit(1); +} + +typedef struct { + pthread_mutex_t mu; + pthread_cond_t cv; + int state; +} event_t; + +static void event_init(event_t* ev) +{ + if (pthread_mutex_init(&ev->mu, 0)) + exit(1); + if (pthread_cond_init(&ev->cv, 0)) + exit(1); + ev->state = 0; +} + +static void event_reset(event_t* ev) +{ + ev->state = 0; +} + +static void event_set(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + if (ev->state) + exit(1); + ev->state = 1; + pthread_mutex_unlock(&ev->mu); + pthread_cond_broadcast(&ev->cv); +} + +static void event_wait(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + while (!ev->state) + pthread_cond_wait(&ev->cv, &ev->mu); + pthread_mutex_unlock(&ev->mu); +} + +static int event_isset(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static int event_timedwait(event_t* ev, uint64_t timeout) +{ + uint64_t start = current_time_ms(); + uint64_t now = start; + pthread_mutex_lock(&ev->mu); + for (;;) { + if (ev->state) + break; + uint64_t remain = timeout - (now - start); + struct timespec ts; + ts.tv_sec = remain / 1000; + ts.tv_nsec = (remain % 1000) * 1000 * 1000; + pthread_cond_timedwait(&ev->cv, &ev->mu, &ts); + now = current_time_ms(); + if (now - start > timeout) + break; + } + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static void sandbox_common() +{ + struct rlimit rlim; + rlim.rlim_cur = rlim.rlim_max = 128 << 20; + setrlimit(RLIMIT_AS, &rlim); + rlim.rlim_cur = rlim.rlim_max = 8 << 20; + setrlimit(RLIMIT_MEMLOCK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_FSIZE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_STACK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 0; + setrlimit(RLIMIT_CORE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 256; + setrlimit(RLIMIT_NOFILE, &rlim); +} + +static void loop(); + +static int do_sandbox_none(void) +{ + sandbox_common(); + loop(); + return 0; +} + +struct thread_t { + int created, call; + event_t ready, done; +}; + +static struct thread_t threads[16]; +static void execute_call(int call); +static int running; + +static void* thr(void* arg) +{ + struct thread_t* th = (struct thread_t*)arg; + for (;;) { + event_wait(&th->ready); + event_reset(&th->ready); + execute_call(th->call); + __atomic_fetch_sub(&running, 1, __ATOMIC_RELAXED); + event_set(&th->done); + } + return 0; +} + +static void execute_one(void) +{ + if (write(1, "executing program\n", sizeof("executing program\n") - 1)) { + } + int i, call, thread; + for (call = 0; call < 4; call++) { + for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); + thread++) { + struct thread_t* th = &threads[thread]; + if (!th->created) { + th->created = 1; + event_init(&th->ready); + event_init(&th->done); + event_set(&th->done); + thread_start(thr, th); + } + if (!event_isset(&th->done)) + continue; + event_reset(&th->done); + th->call = call; + __atomic_fetch_add(&running, 1, __ATOMIC_RELAXED); + event_set(&th->ready); + event_timedwait(&th->done, 50); + break; + } + } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); +} + +static void execute_one(void); + +#define WAIT_FLAGS 0 + +static void loop(void) +{ +// int iter = 0; + for (;; /*iter++*/) { + int pid = fork(); + if (pid < 0) + exit(1); + if (pid == 0) { + execute_one(); + exit(0); + } + int status = 0; + uint64_t start = current_time_ms(); + for (;;) { + sleep_ms(10); + if (waitpid(-1, &status, WNOHANG | WAIT_FLAGS) == pid) + break; + if (current_time_ms() - start < 5000) + continue; + kill_and_wait(pid, &status); + break; + } + } +} + +uint64_t r[2] = {0xffffffffffffffff, 0xffffffffffffffff}; + +void execute_call(int call) +{ + intptr_t res = 0; + switch (call) { + case 0: + // socketpair\$unix arguments: [ + // domain: const = 0x1 (8 bytes) + // type: unix_socket_type = 0x5 (8 bytes) + // proto: const = 0x0 (1 bytes) + // fds: ptr[out, unix_pair] { + // unix_pair { + // fd0: sock_unix (resource) + // fd1: sock_unix (resource) + // } + // } + // ] + res = syscall(SYS_socketpair, /*domain=*/1ul, /*type=SOCK_SEQPACKET*/ 5ul, + /*proto=*/0, /*fds=*/0x200000000440ul); + if (res != -1) { + r[0] = *(uint32_t*)0x200000000440; + r[1] = *(uint32_t*)0x200000000444; + } + break; + case 1: + // sendmsg arguments: [ + // fd: sock (resource) + // msg: ptr[in, send_msghdr] { + // send_msghdr { + // msg_name: nil + // msg_namelen: len = 0x0 (4 bytes) + // pad = 0x0 (4 bytes) + // msg_iov: nil + // msg_iovlen: len = 0x0 (8 bytes) + // msg_control: ptr[inout, array[ANYUNION]] { + // array[ANYUNION] { + // union ANYUNION { + // ANYBLOB: buffer: {04 01 00 00 ff ff 00 00 01} (length 0x9) + // } + // } + // } + // msg_controllen: bytesize = 0x104 (8 bytes) + // msg_flags: const = 0x0 (4 bytes) + // pad = 0x0 (4 bytes) + // } + // } + // f: send_flags = 0x0 (8 bytes) + // ] + *(uint64_t*)0x200000000000 = 0; + *(uint32_t*)0x200000000008 = 0; + *(uint64_t*)0x200000000010 = 0; + *(uint64_t*)0x200000000018 = 0; + *(uint64_t*)0x200000000020 = 0x2000000007c0; + memcpy((void*)0x2000000007c0, "\x04\x01\x00\x00\xff\xff\x00\x00\x01", 9); + *(uint64_t*)0x200000000028 = 0x104; + *(uint32_t*)0x200000000030 = 0; + syscall(SYS_sendmsg, /*fd=*/r[1], /*msg=*/0x200000000000ul, /*f=*/0ul); + for (int i = 0; i < 32; i++) { + syscall(SYS_sendmsg, /*fd=*/r[1], /*msg=*/0x200000000000ul, /*f=*/0ul); + } + break; + case 2: + // close arguments: [ + // fd: fd (resource) + // ] + syscall(SYS_close, /*fd=*/r[1]); + break; + case 3: + // recvmsg arguments: [ + // fd: sock (resource) + // msg: ptr[inout, recv_msghdr] { + // recv_msghdr { + // msg_name: nil + // msg_namelen: len = 0x0 (4 bytes) + // pad = 0x0 (4 bytes) + // msg_iov: nil + // msg_iovlen: len = 0x0 (8 bytes) + // msg_control: ptr[out, buffer] { + // buffer: (DirOut) + // } + // msg_controllen: len = 0x19 (8 bytes) + // msg_flags: const = 0x0 (4 bytes) + // pad = 0x0 (4 bytes) + // } + // } + // f: recv_flags = 0x80 (8 bytes) + // ] + *(uint64_t*)0x2000000005c0 = 0; + *(uint32_t*)0x2000000005c8 = 0; + *(uint64_t*)0x2000000005d0 = 0; + *(uint64_t*)0x2000000005d8 = 0; + *(uint64_t*)0x2000000005e0 = 0x200000000580; + *(uint64_t*)0x2000000005e8 = 0x19; + *(uint32_t*)0x2000000005f0 = 0; + syscall(SYS_recvmsg, /*fd=*/r[0], /*msg=*/0x2000000005c0ul, + /*f=MSG_DONTWAIT*/ 0x80ul); + break; + } +} +int main(void) +{ + syscall(SYS_mmap, /*addr=*/0x200000000000ul, /*len=*/0x1000000ul, + /*prot=PROT_WRITE|PROT_READ|PROT_EXEC*/ 7ul, + /*flags=MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE*/ 0x1012ul, + /*fd=*/(intptr_t)-1, /*offset=*/0ul); + const char* reason; + (void)reason; + for (procid = 0; procid < 4; procid++) { + if (fork() == 0) { + do_sandbox_none(); + } + } + sleep(1000000); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -pthread || exit 1 + +work=/tmp/$prog.dir +rm -rf $work +mkdir $work +cd /tmp/$prog.dir +kldstat | grep -q sctp || { kldload sctp.ko && loaded=1; } +timeout 3m /tmp/$prog > /dev/null 2>&1 + +rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core $work +[ $loaded ] && kldunload sctp.ko +exit 0 diff --git a/tools/test/stress2/misc/syzkaller85.sh b/tools/test/stress2/misc/syzkaller85.sh new file mode 100755 index 000000000000..1772c0dc58b8 --- /dev/null +++ b/tools/test/stress2/misc/syzkaller85.sh @@ -0,0 +1,499 @@ +#!/bin/sh + +# panic: Assertion uio->uio_resid < 0 failed at ../../../netlink/netlink_domain.c:808 +# cpuid = 8 +# time = 1759044376 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe0184d17a70 +# vpanic() at vpanic+0x136/frame 0xfffffe0184d17ba0 +# panic() at panic+0x43/frame 0xfffffe0184d17c00 +# nl_soreceive() at nl_soreceive+0x433/frame 0xfffffe0184d17ca0 +# soreceive() at soreceive+0x45/frame 0xfffffe0184d17cc0 +# kern_recvit() at kern_recvit+0x181/frame 0xfffffe0184d17d70 +# sys_recvfrom() at sys_recvfrom+0xa2/frame 0xfffffe0184d17e00 +# amd64_syscall() at amd64_syscall+0x169/frame 0xfffffe0184d17f30 +# fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe0184d17f30 +# --- syscall (0, FreeBSD ELF64, syscall), rip = 0x822882cca, rsp = 0x823572e88, rbp = 0x823572f90 --- +# KDB: enter: panic +# [ thread pid 11012 tid 138112 ] +# Stopped at $0,0x121a722(%rip) +# db> x/s version +# version: FreeBSD 16.0-CURRENT #0 main-n280667-52eb7e394a7e-dirty: Sun Sep 28 08:56:14 CEST 2025 +# pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO +# db> + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c <<EOF +// https://syzkaller.appspot.com/bug?id=e33cdff88b17af77553159c4b372cac4e4bcd652 +// autogenerated by syzkaller (https://github.com/google/syzkaller) +// syzbot+194f95f2c5fdffef1ef5@syzkaller.appspotmail.com + +#define _GNU_SOURCE + +#include <sys/types.h> + +#include <dirent.h> +#include <errno.h> +#include <pthread.h> +#include <pwd.h> +#include <setjmp.h> +#include <signal.h> +#include <stdarg.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/endian.h> +#include <sys/resource.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <sys/wait.h> +#include <time.h> +#include <unistd.h> + +static unsigned long long procid; + +static __thread int clone_ongoing; +static __thread int skip_segv; +static __thread jmp_buf segv_env; + +static void segv_handler(int sig, siginfo_t* info, void* ctx __unused) +{ + if (__atomic_load_n(&clone_ongoing, __ATOMIC_RELAXED) != 0) { + exit(sig); + } + uintptr_t addr = (uintptr_t)info->si_addr; + const uintptr_t prog_start = 1 << 20; + const uintptr_t prog_end = 100 << 20; + int skip = __atomic_load_n(&skip_segv, __ATOMIC_RELAXED) != 0; + int valid = addr < prog_start || addr > prog_end; + if (sig == SIGBUS) + valid = 1; + if (skip && valid) { + _longjmp(segv_env, 1); + } + exit(sig); +} + +static void install_segv_handler(void) +{ + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = segv_handler; + sa.sa_flags = SA_NODEFER | SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + sigaction(SIGBUS, &sa, NULL); +} + +#define NONFAILING(...) \ + ({ \ + int ok = 1; \ + __atomic_fetch_add(&skip_segv, 1, __ATOMIC_SEQ_CST); \ + if (_setjmp(segv_env) == 0) { \ + __VA_ARGS__; \ + } else \ + ok = 0; \ + __atomic_fetch_sub(&skip_segv, 1, __ATOMIC_SEQ_CST); \ + ok; \ + }) + +static void kill_and_wait(int pid, int* status) +{ + kill(pid, SIGKILL); + while (waitpid(-1, status, 0) != pid) { + } +} + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void use_temporary_dir(void) +{ + char tmpdir_template[] = "./syzkaller.XXXXXX"; + char* tmpdir = mkdtemp(tmpdir_template); + if (!tmpdir) + exit(1); + if (chmod(tmpdir, 0777)) + exit(1); + if (chdir(tmpdir)) + exit(1); +} + +static void reset_flags(const char* filename) +{ + struct stat st; + if (lstat(filename, &st)) + exit(1); + st.st_flags &= ~(SF_NOUNLINK | UF_NOUNLINK | SF_IMMUTABLE | UF_IMMUTABLE | + SF_APPEND | UF_APPEND); + if (lchflags(filename, st.st_flags)) + exit(1); +} +static void __attribute__((noinline)) remove_dir(const char* dir) +{ + DIR* dp = opendir(dir); + if (dp == NULL) { + if (errno == EACCES) { + if (rmdir(dir)) + exit(1); + return; + } + exit(1); + } + struct dirent* ep = 0; + while ((ep = readdir(dp))) { + if (strcmp(ep->d_name, ".") == 0 || strcmp(ep->d_name, "..") == 0) + continue; + char filename[FILENAME_MAX]; + snprintf(filename, sizeof(filename), "%s/%s", dir, ep->d_name); + struct stat st; + if (lstat(filename, &st)) + exit(1); + if (S_ISDIR(st.st_mode)) { + remove_dir(filename); + continue; + } + if (unlink(filename)) { + if (errno == EPERM) { + reset_flags(filename); + reset_flags(dir); + if (unlink(filename) == 0) + continue; + } + exit(1); + } + } + closedir(dp); + while (rmdir(dir)) { + if (errno == EPERM) { + reset_flags(dir); + if (rmdir(dir) == 0) + break; + } + exit(1); + } +} + +static void thread_start(void* (*fn)(void*), void* arg) +{ + pthread_t th; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 128 << 10); + int i = 0; + for (; i < 100; i++) { + if (pthread_create(&th, &attr, fn, arg) == 0) { + pthread_attr_destroy(&attr); + return; + } + if (errno == EAGAIN) { + usleep(50); + continue; + } + break; + } + exit(1); +} + +typedef struct { + pthread_mutex_t mu; + pthread_cond_t cv; + int state; +} event_t; + +static void event_init(event_t* ev) +{ + if (pthread_mutex_init(&ev->mu, 0)) + exit(1); + if (pthread_cond_init(&ev->cv, 0)) + exit(1); + ev->state = 0; +} + +static void event_reset(event_t* ev) +{ + ev->state = 0; +} + +static void event_set(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + if (ev->state) + exit(1); + ev->state = 1; + pthread_mutex_unlock(&ev->mu); + pthread_cond_broadcast(&ev->cv); +} + +static void event_wait(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + while (!ev->state) + pthread_cond_wait(&ev->cv, &ev->mu); + pthread_mutex_unlock(&ev->mu); +} + +static int event_isset(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static int event_timedwait(event_t* ev, uint64_t timeout) +{ + uint64_t start = current_time_ms(); + uint64_t now = start; + pthread_mutex_lock(&ev->mu); + for (;;) { + if (ev->state) + break; + uint64_t remain = timeout - (now - start); + struct timespec ts; + ts.tv_sec = remain / 1000; + ts.tv_nsec = (remain % 1000) * 1000 * 1000; + pthread_cond_timedwait(&ev->cv, &ev->mu, &ts); + now = current_time_ms(); + if (now - start > timeout) + break; + } + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static void sandbox_common() +{ + struct rlimit rlim; + rlim.rlim_cur = rlim.rlim_max = 128 << 20; + setrlimit(RLIMIT_AS, &rlim); + rlim.rlim_cur = rlim.rlim_max = 8 << 20; + setrlimit(RLIMIT_MEMLOCK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_FSIZE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_STACK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 0; + setrlimit(RLIMIT_CORE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 256; + setrlimit(RLIMIT_NOFILE, &rlim); +} + +static void loop(); + +static int do_sandbox_none(void) +{ + sandbox_common(); + loop(); + return 0; +} + +struct thread_t { + int created, call; + event_t ready, done; +}; + +static struct thread_t threads[16]; +static void execute_call(int call); +static int running; + +static void* thr(void* arg) +{ + struct thread_t* th = (struct thread_t*)arg; + for (;;) { + event_wait(&th->ready); + event_reset(&th->ready); + execute_call(th->call); + __atomic_fetch_sub(&running, 1, __ATOMIC_RELAXED); + event_set(&th->done); + } + return 0; +} + +static void execute_one(void) +{ + if (write(1, "executing program\n", sizeof("executing program\n") - 1)) { + } + int i, call, thread; + for (call = 0; call < 3; call++) { + for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); + thread++) { + struct thread_t* th = &threads[thread]; + if (!th->created) { + th->created = 1; + event_init(&th->ready); + event_init(&th->done); + event_set(&th->done); + thread_start(thr, th); + } + if (!event_isset(&th->done)) + continue; + event_reset(&th->done); + th->call = call; + __atomic_fetch_add(&running, 1, __ATOMIC_RELAXED); + event_set(&th->ready); + event_timedwait(&th->done, 50); + break; + } + } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); +} + +static void execute_one(void); + +#define WAIT_FLAGS 0 + +static void loop(void) +{ + int iter = 0; + for (;; iter++) { + char cwdbuf[32]; + sprintf(cwdbuf, "./%d", iter); + if (mkdir(cwdbuf, 0777)) + exit(1); + int pid = fork(); + if (pid < 0) + exit(1); + if (pid == 0) { + if (chdir(cwdbuf)) + exit(1); + execute_one(); + exit(0); + } + int status = 0; + uint64_t start = current_time_ms(); + for (;;) { + sleep_ms(10); + if (waitpid(-1, &status, WNOHANG | WAIT_FLAGS) == pid) + break; + if (current_time_ms() - start < 5000) + continue; + kill_and_wait(pid, &status); + break; + } + remove_dir(cwdbuf); + } +} + +uint64_t r[1] = {0xffffffffffffffff}; + +void execute_call(int call) +{ + intptr_t res = 0; + switch (call) { + case 0: + // socket arguments: [ + // domain: socket_domain = 0x26 (8 bytes) + // type: socket_type = 0x2 (8 bytes) + // proto: int8 = 0x0 (1 bytes) + // ] + // returns sock + res = syscall(SYS_socket, /*domain=AF_INET|0x24*/ 0x26ul, + /*type=SOCK_DGRAM*/ 2ul, /*proto=*/0); + if (res != -1) + r[0] = res; + break; + case 1: + // bind arguments: [ + // fd: sock (resource) + // addr: ptr[in, sockaddr_storage] { + // union sockaddr_storage { + // in6: sockaddr_in6 { + // len: len = 0x22 (1 bytes) + // family: const = 0x1c (1 bytes) + // port: proc = 0x3 (2 bytes) + // flow: int32 = 0x0 (4 bytes) + // addr: union ipv6_addr { + // mcast1: ipv6_addr_multicast1 { + // a0: const = 0xff (1 bytes) + // a1: const = 0x1 (1 bytes) + // a2: buffer: {00 00 00 00 00 00 00 00 00 00 00 00 00} (length + // 0xd) a3: const = 0x1 (1 bytes) + // } + // } + // scope: int32 = 0x0 (4 bytes) + // } + // } + // } + // addrlen: len = 0xc (8 bytes) + // ] + NONFAILING(*(uint8_t*)0x200000000040 = 0x22); + NONFAILING(*(uint8_t*)0x200000000041 = 0x1c); + NONFAILING(*(uint16_t*)0x200000000042 = htobe16(0x4e23 + procid * 4)); + NONFAILING(*(uint32_t*)0x200000000044 = 0); + NONFAILING(*(uint8_t*)0x200000000048 = -1); + NONFAILING(*(uint8_t*)0x200000000049 = 1); + NONFAILING(memset((void*)0x20000000004a, 0, 13)); + NONFAILING(*(uint8_t*)0x200000000057 = 1); + NONFAILING(*(uint32_t*)0x200000000058 = 0); + syscall(SYS_bind, /*fd=*/r[0], /*addr=*/0x200000000040ul, + /*addrlen=*/0xcul); + break; + case 2: + // recvfrom\$inet arguments: [ + // fd: sock_in (resource) + // buf: nil + // len: len = 0x51 (8 bytes) + // f: recv_flags = 0x401313ab1a02f21f (8 bytes) + // addr: nil + // addrlen: len = 0x0 (8 bytes) + // ] + syscall(SYS_recvfrom, /*fd=*/r[0], /*buf=*/0ul, /*len=*/0x51ul, + /*f=MSG_PEEK|MSG_OOB|0x401313ab1a02f21c*/ 0x401313ab1a02f21ful, + /*addr=*/0ul, /*addrlen=*/0ul); + break; + } +} +int main(void) +{ + syscall(SYS_mmap, /*addr=*/0x200000000000ul, /*len=*/0x1000000ul, + /*prot=PROT_WRITE|PROT_READ|PROT_EXEC*/ 7ul, + /*flags=MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE*/ 0x1012ul, + /*fd=*/(intptr_t)-1, /*offset=*/0ul); + const char* reason; + (void)reason; + install_segv_handler(); + for (procid = 0; procid < 4; procid++) { + if (fork() == 0) { + use_temporary_dir(); + do_sandbox_none(); + } + } + sleep(1000000); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -pthread || exit 1 + +(cd ../testcases/swap; ./swap -t 5m -i 20 -l 100 > /dev/null 2>&1) & +sleep 5 + +work=/tmp/$prog.dir +rm -rf $work +mkdir $work +cd /tmp/$prog.dir + +timeout 5m /tmp/$prog > /dev/null 2>&1 + +while pkill swap; do :; done +wait + +rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core /tmp/syzkaller.?????? $work +exit 0 diff --git a/tools/test/stress2/misc/syzkaller86.sh b/tools/test/stress2/misc/syzkaller86.sh new file mode 100755 index 000000000000..12922a2d05fa --- /dev/null +++ b/tools/test/stress2/misc/syzkaller86.sh @@ -0,0 +1,555 @@ +#!/bin/sh + +# Fatal trap 12: page fault while in kernel mode +# cpuid = 1; apic id = 01 +# fault virtual address = 0x18 +# fault code = supervisor read data, page not present +# instruction pointer = 0x20:0xffffffff80b69835 +# stack pointer = 0x28:0xfffffe00ff8e7d90 +# frame pointer = 0x28:0xfffffe00ff8e7d90 +# code segment = base 0x0, limit 0xfffff, type 0x1b +# = DPL 0, pres 1, long 1, def32 0, gran 1 +# processor eflags = interrupt enabled, resume, IOPL = 0 +# current process = 0 (thread taskq) +# rdi: 0000000000000018 rsi: 0000000000000004 rdx: ffffffff812b3f65 +# rcx: 00000000000008ba r8: fffff800044b8780 r9: fffff80003397000 +# rax: 0000000000000001 rbx: fffff8004221fa00 rbp: fffffe00ff8e7d90 +# r10: 0000000000000001 r11: fffffe00dc47b000 r12: fffffe0177ed0000 +# r13: fffff800044b8780 r14: fffff8004221f800 r15: fffff8004221f800 +# trap number = 12 +# panic: page fault +# cpuid = 1 +# time = 1759322830 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe00ff8e7ac0 +# vpanic() at vpanic+0x136/frame 0xfffffe00ff8e7bf0 +# panic() at panic+0x43/frame 0xfffffe00ff8e7c50 +# trap_pfault() at trap_pfault+0x47c/frame 0xfffffe00ff8e7cc0 +# calltrap() at calltrap+0x8/frame 0xfffffe00ff8e7cc0 +# --- trap 0xc, rip = 0xffffffff80b69835, rsp = 0xfffffe00ff8e7d90, rbp = 0xfffffe00ff8e7d90 --- +# __mtx_assert() at __mtx_assert+0x35/frame 0xfffffe00ff8e7d90 +# ktls_check_rx() at ktls_check_rx+0x2f/frame 0xfffffe00ff8e7dd0 +# socantrcvmore() at socantrcvmore+0x5e/frame 0xfffffe00ff8e7df0 +# unp_gc() at unp_gc+0x5df/frame 0xfffffe00ff8e7e40 +# taskqueue_run_locked() at taskqueue_run_locked+0x1c2/frame 0xfffffe00ff8e7ec0 +# taskqueue_thread_loop() at taskqueue_thread_loop+0xd3/frame 0xfffffe00ff8e7ef0 +# fork_exit() at fork_exit+0x82/frame 0xfffffe00ff8e7f30 +# fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe00ff8e7f30 +# --- trap 0, rip = 0, rsp = 0, rbp = 0 --- +# KDB: enter: panic +# [ thread pid 0 tid 100045 ] +# Stopped at kdb_enter+0x33: movq $0,0x121a9e2(%rip) +# db> x/s version +# version: FreeBSD 16.0-CURRENT #0 vmfqe-n280784-b7f165e45d6d: Wed Oct 1 13:48:43 CEST 2025 +# pho@mercat1.netperf.freebsd.org:/var/tmp/deviant3/sys/amd64/compile/PHO +# db> + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c <<EOF +// https://syzkaller.appspot.com/bug?id=ec40fe3e3e2b41218d1d417bc10d0be2517bf751 +// autogenerated by syzkaller (https://github.com/google/syzkaller) +// syzbot+a62883292a5c257703be@syzkaller.appspotmail.com + +#define _GNU_SOURCE + +#include <sys/types.h> + +#include <dirent.h> +#include <errno.h> +#include <pthread.h> +#include <pwd.h> +#include <signal.h> +#include <stdarg.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/endian.h> +#include <sys/resource.h> +#include <sys/stat.h> +#include <sys/syscall.h> +#include <sys/wait.h> +#include <time.h> +#include <unistd.h> + +static unsigned long long procid; + +static void kill_and_wait(int pid, int* status) +{ + kill(pid, SIGKILL); + while (waitpid(-1, status, 0) != pid) { + } +} + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void use_temporary_dir(void) +{ + char tmpdir_template[] = "./syzkaller.XXXXXX"; + char* tmpdir = mkdtemp(tmpdir_template); + if (!tmpdir) + exit(1); + if (chmod(tmpdir, 0777)) + exit(1); + if (chdir(tmpdir)) + exit(1); +} + +static void reset_flags(const char* filename) +{ + struct stat st; + if (lstat(filename, &st)) + exit(1); + st.st_flags &= ~(SF_NOUNLINK | UF_NOUNLINK | SF_IMMUTABLE | UF_IMMUTABLE | + SF_APPEND | UF_APPEND); + if (lchflags(filename, st.st_flags)) + exit(1); +} +static void __attribute__((noinline)) remove_dir(const char* dir) +{ + DIR* dp = opendir(dir); + if (dp == NULL) { + if (errno == EACCES) { + if (rmdir(dir)) + exit(1); + return; + } + exit(1); + } + struct dirent* ep = 0; + while ((ep = readdir(dp))) { + if (strcmp(ep->d_name, ".") == 0 || strcmp(ep->d_name, "..") == 0) + continue; + char filename[FILENAME_MAX]; + snprintf(filename, sizeof(filename), "%s/%s", dir, ep->d_name); + struct stat st; + if (lstat(filename, &st)) + exit(1); + if (S_ISDIR(st.st_mode)) { + remove_dir(filename); + continue; + } + if (unlink(filename)) { + if (errno == EPERM) { + reset_flags(filename); + reset_flags(dir); + if (unlink(filename) == 0) + continue; + } + exit(1); + } + } + closedir(dp); + while (rmdir(dir)) { + if (errno == EPERM) { + reset_flags(dir); + if (rmdir(dir) == 0) + break; + } + exit(1); + } +} + +static void thread_start(void* (*fn)(void*), void* arg) +{ + pthread_t th; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 128 << 10); + int i = 0; + for (; i < 100; i++) { + if (pthread_create(&th, &attr, fn, arg) == 0) { + pthread_attr_destroy(&attr); + return; + } + if (errno == EAGAIN) { + usleep(50); + continue; + } + break; + } + exit(1); +} + +typedef struct { + pthread_mutex_t mu; + pthread_cond_t cv; + int state; +} event_t; + +static void event_init(event_t* ev) +{ + if (pthread_mutex_init(&ev->mu, 0)) + exit(1); + if (pthread_cond_init(&ev->cv, 0)) + exit(1); + ev->state = 0; +} + +static void event_reset(event_t* ev) +{ + ev->state = 0; +} + +static void event_set(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + if (ev->state) + exit(1); + ev->state = 1; + pthread_mutex_unlock(&ev->mu); + pthread_cond_broadcast(&ev->cv); +} + +static void event_wait(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + while (!ev->state) + pthread_cond_wait(&ev->cv, &ev->mu); + pthread_mutex_unlock(&ev->mu); +} + +static int event_isset(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static int event_timedwait(event_t* ev, uint64_t timeout) +{ + uint64_t start = current_time_ms(); + uint64_t now = start; + pthread_mutex_lock(&ev->mu); + for (;;) { + if (ev->state) + break; + uint64_t remain = timeout - (now - start); + struct timespec ts; + ts.tv_sec = remain / 1000; + ts.tv_nsec = (remain % 1000) * 1000 * 1000; + pthread_cond_timedwait(&ev->cv, &ev->mu, &ts); + now = current_time_ms(); + if (now - start > timeout) + break; + } + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static void sandbox_common() +{ + struct rlimit rlim; + rlim.rlim_cur = rlim.rlim_max = 128 << 20; + setrlimit(RLIMIT_AS, &rlim); + rlim.rlim_cur = rlim.rlim_max = 8 << 20; + setrlimit(RLIMIT_MEMLOCK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_FSIZE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_STACK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 0; + setrlimit(RLIMIT_CORE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 256; + setrlimit(RLIMIT_NOFILE, &rlim); +} + +static void loop(); + +static int do_sandbox_none(void) +{ + sandbox_common(); + loop(); + return 0; +} + +struct thread_t { + int created, call; + event_t ready, done; +}; + +static struct thread_t threads[16]; +static void execute_call(int call); +static int running; + +static void* thr(void* arg) +{ + struct thread_t* th = (struct thread_t*)arg; + for (;;) { + event_wait(&th->ready); + event_reset(&th->ready); + execute_call(th->call); + __atomic_fetch_sub(&running, 1, __ATOMIC_RELAXED); + event_set(&th->done); + } + return 0; +} + +static void execute_one(void) +{ + if (write(1, "executing program\n", sizeof("executing program\n") - 1)) { + } + int i, call, thread; + for (call = 0; call < 8; call++) { + for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); + thread++) { + struct thread_t* th = &threads[thread]; + if (!th->created) { + th->created = 1; + event_init(&th->ready); + event_init(&th->done); + event_set(&th->done); + thread_start(thr, th); + } + if (!event_isset(&th->done)) + continue; + event_reset(&th->done); + th->call = call; + __atomic_fetch_add(&running, 1, __ATOMIC_RELAXED); + event_set(&th->ready); + event_timedwait(&th->done, 50); + break; + } + } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); +} + +static void execute_one(void); + +#define WAIT_FLAGS 0 + +static void loop(void) +{ + int iter = 0; + for (;; iter++) { + char cwdbuf[32]; + sprintf(cwdbuf, "./%d", iter); + if (mkdir(cwdbuf, 0777)) + exit(1); + int pid = fork(); + if (pid < 0) + exit(1); + if (pid == 0) { + if (chdir(cwdbuf)) + exit(1); + execute_one(); + exit(0); + } + int status = 0; + uint64_t start = current_time_ms(); + for (;;) { + sleep_ms(10); + if (waitpid(-1, &status, WNOHANG | WAIT_FLAGS) == pid) + break; + if (current_time_ms() - start < 5000) + continue; + kill_and_wait(pid, &status); + break; + } + remove_dir(cwdbuf); + } +} + +uint64_t r[3] = {0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff}; + +void execute_call(int call) +{ + intptr_t res = 0; + switch (call) { + case 0: + // freebsd10_pipe arguments: [ + // pipefd: ptr[out, pipefd] { + // pipefd { + // rfd: fd (resource) + // wfd: fd (resource) + // } + // } + // ] + res = syscall(SYS_freebsd10_pipe, /*pipefd=*/0x2000000001c0ul); + if (res != -1) + r[0] = *(uint32_t*)0x2000000001c4; + break; + case 1: + // close arguments: [ + // fd: fd (resource) + // ] + syscall(SYS_close, /*fd=*/r[0]); + break; + case 2: + // socket\$unix arguments: [ + // domain: const = 0x1 (8 bytes) + // type: unix_socket_type = 0x5 (8 bytes) + // proto: const = 0x0 (1 bytes) + // ] + // returns sock_unix + res = syscall(SYS_socket, /*domain=*/1ul, /*type=SOCK_SEQPACKET*/ 5ul, + /*proto=*/0); + if (res != -1) + r[1] = res; + break; + case 3: + // bind\$unix arguments: [ + // fd: sock_unix (resource) + // addr: ptr[in, sockaddr_un] { + // union sockaddr_un { + // file: sockaddr_un_file { + // len: len = 0xa (1 bytes) + // family: unix_socket_family = 0x1 (1 bytes) + // path: buffer: {2e 2f 66 69 6c 65 31 00} (length 0x8) + // } + // } + // } + // addrlen: len = 0xa (8 bytes) + // ] + *(uint8_t*)0x2000000002c0 = 0xa; + *(uint8_t*)0x2000000002c1 = 1; + memcpy((void*)0x2000000002c2, "./file1\000", 8); + syscall(SYS_bind, /*fd=*/r[1], /*addr=*/0x2000000002c0ul, + /*addrlen=*/0xaul); + break; + case 4: + // listen arguments: [ + // fd: sock (resource) + // backlog: int32 = 0xfffffffe (4 bytes) + // ] + syscall(SYS_listen, /*fd=*/r[1], /*backlog=*/0xfffffffe); + break; + case 5: + // sendmsg\$unix arguments: [ + // fd: sock_unix (resource) + // msg: ptr[in, msghdr_un] { + // msghdr_un { + // addr: nil + // addrlen: len = 0x0 (4 bytes) + // pad = 0x0 (4 bytes) + // vec: nil + // vlen: len = 0x0 (8 bytes) + // ctrl: ptr[inout, array[ANYUNION]] { + // array[ANYUNION] { + // union ANYUNION { + // ANYBLOB: buffer: {89 00 00 00 ff ff 00 00 01} (length 0x9) + // } + // } + // } + // ctrllen: bytesize = 0x9 (8 bytes) + // f: send_flags = 0x0 (4 bytes) + // pad = 0x0 (4 bytes) + // } + // } + // f: send_flags = 0x0 (8 bytes) + // ] + *(uint64_t*)0x200000000080 = 0; + *(uint32_t*)0x200000000088 = 0; + *(uint64_t*)0x200000000090 = 0; + *(uint64_t*)0x200000000098 = 0; + *(uint64_t*)0x2000000000a0 = 0x200000000000; + memcpy((void*)0x200000000000, "\x89\x00\x00\x00\xff\xff\x00\x00\x01", 9); + *(uint64_t*)0x2000000000a8 = 9; + *(uint32_t*)0x2000000000b0 = 0; + syscall(SYS_sendmsg, /*fd=*/(intptr_t)-1, /*msg=*/0x200000000080ul, + /*f=*/0ul); + break; + case 6: + // socketpair\$unix arguments: [ + // domain: const = 0x1 (8 bytes) + // type: unix_socket_type = 0x2 (8 bytes) + // proto: const = 0x0 (1 bytes) + // fds: ptr[out, unix_pair] { + // unix_pair { + // fd0: sock_unix (resource) + // fd1: sock_unix (resource) + // } + // } + // ] + res = syscall(SYS_socketpair, /*domain=*/1ul, /*type=SOCK_DGRAM*/ 2ul, + /*proto=*/0, /*fds=*/0x200000000040ul); + if (res != -1) + r[2] = *(uint32_t*)0x200000000040; + break; + case 7: + // sendmsg arguments: [ + // fd: sock (resource) + // msg: ptr[in, send_msghdr] { + // send_msghdr { + // msg_name: nil + // msg_namelen: len = 0x32c (4 bytes) + // pad = 0x0 (4 bytes) + // msg_iov: nil + // msg_iovlen: len = 0x0 (8 bytes) + // msg_control: ptr[in, array[cmsghdr]] { + // array[cmsghdr] { + // } + // } + // msg_controllen: bytesize = 0x90 (8 bytes) + // msg_flags: const = 0x0 (4 bytes) + // pad = 0x0 (4 bytes) + // } + // } + // f: send_flags = 0x0 (8 bytes) + // ] + *(uint64_t*)0x200000000380 = 0; + *(uint32_t*)0x200000000388 = 0x32c; + *(uint64_t*)0x200000000390 = 0; + *(uint64_t*)0x200000000398 = 0; + *(uint64_t*)0x2000000003a0 = 0x200000000000; + *(uint64_t*)0x2000000003a8 = 0x90; + *(uint32_t*)0x2000000003b0 = 0; + syscall(SYS_sendmsg, /*fd=*/r[2], /*msg=*/0x200000000380ul, /*f=*/0ul); + break; + } +} +int main(void) +{ + syscall(SYS_mmap, /*addr=*/0x200000000000ul, /*len=*/0x1000000ul, + /*prot=PROT_WRITE|PROT_READ|PROT_EXEC*/ 7ul, + /*flags=MAP_FIXED|MAP_ANONYMOUS|MAP_PRIVATE*/ 0x1012ul, + /*fd=*/(intptr_t)-1, /*offset=*/0ul); + const char* reason; + (void)reason; + for (procid = 0; procid < 4; procid++) { + if (fork() == 0) { + use_temporary_dir(); + do_sandbox_none(); + } + } + sleep(1000000); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -pthread || exit 1 + +work=/tmp/$prog.dir +rm -rf $work +mkdir $work +cd /tmp/$prog.dir +for i in `jot 30`; do + ( + mkdir d$i + cd d$i + timeout 3m /tmp/$prog > /dev/null 2>&1 & + ) +done +while pgrep -q $prog; do sleep 2; done +wait + +rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core $work +exit 0 diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c index 5477d96434ac..8925b8988cd3 100644 --- a/usr.bin/lsvfs/lsvfs.c +++ b/usr.bin/lsvfs/lsvfs.c @@ -5,10 +5,12 @@ * */ +#include <sys/capsicum.h> #include <sys/param.h> #include <sys/mount.h> #include <sys/sysctl.h> +#include <capsicum_helpers.h> #include <err.h> #include <stdio.h> #include <stdlib.h> @@ -38,41 +40,42 @@ static const char *fmt_flags(int); int main(int argc, char **argv) { - struct xvfsconf vfc, *xvfsp; + struct xvfsconf *xvfsp; size_t cnt, buflen; int rv = 0; argc--, argv++; + if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) + err(EXIT_FAILURE, "sysctl(vfs.conflist)"); + if ((xvfsp = malloc(buflen)) == NULL) + errx(EXIT_FAILURE, "malloc failed"); + if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) + err(EXIT_FAILURE, "sysctl(vfs.conflist)"); + cnt = buflen / sizeof(struct xvfsconf); + + caph_cache_catpages(); + if (caph_enter() != 0) + err(EXIT_FAILURE, "failed to enter capability mode"); + printf(HDRFMT, "Filesystem", "Num", "Refs", "Flags"); fputs(DASHES, stdout); - if (argc > 0) { - for (; argc > 0; argc--, argv++) { - if (getvfsbyname(*argv, &vfc) == 0) { - printf(FMT, vfc.vfc_name, vfc.vfc_typenum, - vfc.vfc_refcount, fmt_flags(vfc.vfc_flags)); - } else { - warnx("VFS %s unknown or not loaded", *argv); - rv++; + for (size_t i = 0; i < cnt; i++) { + if (argc > 0) { + int j; + for (j = 0; j < argc; j++) { + if (strcmp(argv[j], xvfsp[i].vfc_name) == 0) + break; } + if (j == argc) + continue; } - } else { - if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) - err(EXIT_FAILURE, "sysctl(vfs.conflist)"); - if ((xvfsp = malloc(buflen)) == NULL) - errx(EXIT_FAILURE, "malloc failed"); - if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) - err(EXIT_FAILURE, "sysctl(vfs.conflist)"); - cnt = buflen / sizeof(struct xvfsconf); - - for (size_t i = 0; i < cnt; i++) { - printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum, - xvfsp[i].vfc_refcount, - fmt_flags(xvfsp[i].vfc_flags)); - } - free(xvfsp); + + printf(FMT, xvfsp[i].vfc_name, xvfsp[i].vfc_typenum, + xvfsp[i].vfc_refcount, fmt_flags(xvfsp[i].vfc_flags)); } + free(xvfsp); return (rv); } diff --git a/usr.bin/sockstat/main.c b/usr.bin/sockstat/main.c index 2e75e4966d80..3b989c4283e4 100644 --- a/usr.bin/sockstat/main.c +++ b/usr.bin/sockstat/main.c @@ -51,6 +51,7 @@ #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> #include <netinet/tcp_var.h> +#include <netinet/tcp_log_buf.h> #include <arpa/inet.h> #include <capsicum_helpers.h> @@ -84,6 +85,7 @@ static bool opt_4; /* Show IPv4 sockets */ static bool opt_6; /* Show IPv6 sockets */ static bool opt_A; /* Show kernel address of pcb */ +static bool opt_b; /* Show BBLog state */ static bool opt_C; /* Show congestion control */ static bool opt_c; /* Show connected sockets */ static bool opt_f; /* Show FIB numbers */ @@ -141,6 +143,7 @@ struct sock { int proto; int state; int fibnum; + int bblog_state; const char *protoname; char stack[TCP_FUNCTION_NAME_LEN_MAX]; char cc[TCP_CA_NAME_MAX]; @@ -738,6 +741,7 @@ gather_inet(int proto) sock->vflag = xip->inp_vflag; if (proto == IPPROTO_TCP) { sock->state = xtp->t_state; + sock->bblog_state = xtp->t_logstate; memcpy(sock->stack, xtp->xt_stack, TCP_FUNCTION_NAME_LEN_MAX); memcpy(sock->cc, xtp->xt_cc, TCP_CA_NAME_MAX); @@ -1056,6 +1060,37 @@ sctp_path_state(int state) } } +static const char * +bblog_state(int state) +{ + switch (state) { + case TCP_LOG_STATE_OFF: + return "OFF"; + break; + case TCP_LOG_STATE_TAIL: + return "TAIL"; + break; + case TCP_LOG_STATE_HEAD: + return "HEAD"; + break; + case TCP_LOG_STATE_HEAD_AUTO: + return "HEAD_AUTO"; + break; + case TCP_LOG_STATE_CONTINUAL: + return "CONTINUAL"; + break; + case TCP_LOG_STATE_TAIL_AUTO: + return "TAIL_AUTO"; + break; + case TCP_LOG_VIA_BBPOINTS: + return "BBPOINTS"; + break; + default: + return "UNKNOWN"; + break; + } +} + static int format_unix_faddr(struct addr *faddr, char *buf, size_t bufsize) { #define SAFEBUF (buf == NULL ? NULL : buf + pos) @@ -1143,6 +1178,7 @@ struct col_widths { int encaps; int path_state; int conn_state; + int bblog_state; int stack; int cc; }; @@ -1485,6 +1521,15 @@ display_sock(struct sock *s, struct col_widths *cw, char *buf, size_t bufsize) xo_emit(" {:conn-state/%-*s}", cw->conn_state, "??"); } + if (opt_b) { + if (s->proto == IPPROTO_TCP) + xo_emit(" {:bblog-state/%-*s}", + cw->bblog_state, + bblog_state(s->bblog_state)); + else if (!is_xo_style_encoding) + xo_emit(" {:bblog-state/%-*s}", + cw->bblog_state, "??"); + } if (opt_S) { if (s->proto == IPPROTO_TCP) xo_emit(" {:stack/%-*s}", @@ -1544,6 +1589,7 @@ display(void) .encaps = strlen("ENCAPS"), .path_state = strlen("PATH STATE"), .conn_state = strlen("CONN STATE"), + .bblog_state = strlen("BBLOG STATE"), .stack = strlen("STACK"), .cc = strlen("CC"), }; @@ -1576,6 +1622,8 @@ display(void) xo_emit(" {T:/%-*s}", cw.path_state, "PATH STATE"); xo_emit(" {T:/%-*s}", cw.conn_state, "CONN STATE"); } + if (opt_b) + xo_emit(" {T:/%-*s}", cw.bblog_state, "BBLOG STATE"); if (opt_S) xo_emit(" {T:/%-*s}", cw.stack, "STACK"); if (opt_C) @@ -1706,7 +1754,7 @@ static void usage(void) { xo_error( -"usage: sockstat [--libxo ...] [-46ACcfIiLlnqSsUuvw] [-j jid] [-p ports]\n" +"usage: sockstat [--libxo ...] [-46AbCcfIiLlnqSsUuvw] [-j jid] [-p ports]\n" " [-P protocols]\n"); exit(1); } @@ -1728,7 +1776,7 @@ main(int argc, char *argv[]) xo_get_style(NULL) != XO_STYLE_HTML) is_xo_style_encoding = true; opt_j = -1; - while ((o = getopt(argc, argv, "46ACcfIij:Llnp:P:qSsUuvw")) != -1) + while ((o = getopt(argc, argv, "46AbCcfIij:Llnp:P:qSsUuvw")) != -1) switch (o) { case '4': opt_4 = true; @@ -1739,6 +1787,9 @@ main(int argc, char *argv[]) case 'A': opt_A = true; break; + case 'b': + opt_b = true; + break; case 'C': opt_C = true; break; diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index 091911cd0879..dabb3042bfd4 100644 --- a/usr.bin/sockstat/sockstat.1 +++ b/usr.bin/sockstat/sockstat.1 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 17, 2025 +.Dd October 7, 2025 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Nm .Op Fl -libxo -.Op Fl 46ACcfIiLlnqSsUuvw +.Op Fl 46AbCcfIiLlnqSsUuvw .Op Fl j Ar jail .Op Fl p Ar ports .Op Fl P Ar protocols @@ -65,6 +65,9 @@ Show .It Fl A Show the address of a protocol control block (PCB) associated with a socket; used for debugging. +.It Fl b +Show the BBLog state of the socket. +This is currently only implemented for TCP. .It Fl C Display the congestion control module, if applicable. This is currently only implemented for TCP. @@ -206,6 +209,10 @@ is specified (only for SCTP). The connection state if .Fl s is specified (only for SCTP or TCP). +.It Li BBLOG STATE +The BBLog state if +.Fl b +is specified (only for TCP). .It Li STACK The protocol stack if .Fl S diff --git a/usr.bin/tail/tests/tail_test.sh b/usr.bin/tail/tests/tail_test.sh index 74d6908f7568..82c74a0d4da4 100755 --- a/usr.bin/tail/tests/tail_test.sh +++ b/usr.bin/tail/tests/tail_test.sh @@ -341,6 +341,7 @@ follow_create_body() rm -f infile tail -F infile > outfile & pid=$! + sleep 0.1 seq 1 5 >infile sleep 2 atf_check cmp infile outfile @@ -360,6 +361,7 @@ follow_rename_body() seq 1 3 > infile tail -F infile > outfile & pid=$! + sleep 0.1 seq 4 5 > infile_new atf_check mv infile infile_old atf_check mv infile_new infile diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index a8a3c953d72d..63613d5a4707 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -1764,7 +1764,7 @@ acpi_handle_ivrs_ivhd_devs(ACPI_IVRS_DE_HEADER *d, char *de) d8b = (ACPI_IVRS_DEVICE8B *)db; len = sizeof(*d8b); printf("\t\tDev Type=%#x Id=%#06x", - d8a->Header.Type, d8a->Header.Id); + d8b->Header.Type, d8b->Header.Id); acpi_handle_ivrs_ivhd_dte(d8b->Header.DataSetting); printf("\t\t"); acpi_handle_ivrs_ivhd_edte(d8b->ExtendedData); @@ -1774,7 +1774,7 @@ acpi_handle_ivrs_ivhd_devs(ACPI_IVRS_DE_HEADER *d, char *de) d4 = (ACPI_IVRS_DEVICE4 *)(db + sizeof(*d8b)); len = sizeof(*d8b) + sizeof(*d4); printf("\t\tDev Type=%#x Id=%#06x-%#06x", - d8a->Header.Type, d8a->Header.Id, d4->Header.Id); + d8b->Header.Type, d8b->Header.Id, d4->Header.Id); acpi_handle_ivrs_ivhd_dte(d8b->Header.DataSetting); acpi_handle_ivrs_ivhd_edte(d8b->ExtendedData); } else if (d->Type == ACPI_IVRS_TYPE_SPECIAL) { diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index 527250d380d1..6175d26b4fd3 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -1,4 +1,6 @@ -.\"- +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2011-2013 Nathan Whitehorn <nwhitehorn@FreeBSD.org> All rights reserved. .\" Copyright (c) 2018 Roberto Fernandez Cueto <roberfern@gmail.com> .\" Copyright (c) 2024 The FreeBSD Foundation @@ -27,7 +29,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 4, 2024 +.Dd October 3, 2025 .Dt BSDINSTALL 8 .Os .Sh NAME @@ -40,9 +42,10 @@ .Op Ar ... .Sh DESCRIPTION .Nm -is used for installation of new systems, both for system setup from -installation media, e.g., CD-ROMs, and for use on live systems to prepare -VM images and jails. +is used for installation of new systems, +both for system setup from installation media, +such as discs, USBs, or network boot environments, +and for use on live systems to prepare jails and virtual machine images. .Pp Much like .Xr make 1 , Nm @@ -56,7 +59,7 @@ these subtargets can be invoked separately by an installation script. .Sh OPTIONS .Nm supports the following options, global to all targets: -.Bl -tag -width indent+ +.Bl -tag -width "-D file" .It Fl D Ar file Provide a path for the installation log file .Pq overrides Ev BSDINSTALL_LOG . @@ -73,7 +76,7 @@ For interactive use, most users will be interested only in the and .Cm script targets. -.Bl -tag -width "jail destination" +.Bl -tag -width "-D file" .It Cm auto Run the standard interactive installation, including disk partitioning. .It Cm jail Ar destination @@ -295,7 +298,7 @@ Many are used internally during installation and have reasonable default values for most installation scenarios. Others are set by various interactive user prompts, and can be usefully overridden when making scripted or customized installers. -.Bl -tag -width "BSDINSTALL_DISTSITE" +.Bl -tag -width "-D file" .It Ev TMPDIR The directory to use for temporary files. Default: diff --git a/usr.sbin/iovctl/iovctl.8 b/usr.sbin/iovctl/iovctl.8 index 5c7b01c249a0..2574503e5ae7 100644 --- a/usr.sbin/iovctl/iovctl.8 +++ b/usr.sbin/iovctl/iovctl.8 @@ -95,7 +95,7 @@ and options, this file will only be used to specify the name of the PF device. .Pp See -.Xr iovctl.conf +.Xr iovctl.conf 5 for a description of the config file format and documentation of the configuration parameters that apply to all PF drivers. See the PF driver manual page for configuration parameters specific to |