modify tdir to ignore localzone tests

Merge branch 'master' into review-rfc8914-ede
remove debug line
2026-08-17 21:25:50 +02:00 · 2022-01-13 14:50:43 +01:00 · 2022-01-11 09:26:49 +01:00 · 2022-01-10 16:28:54 +01:00 · 2021-12-22 15:47:50 +01:00 · 2021-12-22 14:39:06 +01:00
663 changed files with 29802 additions and 52975 deletions
@@ -32,12 +32,12 @@ jobs:
          - name: OS X
            os: macos-latest
            install_expat: "yes"
-            config: "--enable-debug --disable-flto --with-ssl=/opt/homebrew/opt/openssl --with-libexpat=/opt/homebrew/opt/expat"
+            config: "--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat"
            make_test: "yes"
          - name: Clang on OS X
            os: macos-latest
            install_expat: "yes"
-            config: "CC=clang --enable-debug --disable-flto --with-ssl=/opt/homebrew/opt/openssl --with-libexpat=/opt/homebrew/opt/expat --disable-static"
+            config: "CC=clang --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat --disable-static"
            make_test: "yes"
            clang_analysis: "yes"
          - name: ubsan (gcc undefined behaviour sanitizer)
@@ -163,7 +163,7 @@ jobs:
            make: "no"
 
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
        with:
          submodules: false
      - name: test_windows
@@ -175,26 +175,21 @@ jobs:
          cd ..
          export prepath=`pwd`
          echo prepath=${prepath}
-          echo "choco install winflexbison3"
-          choco install winflexbison3
-          echo 'LEX="win_flex"'
-          export LEX="win_flex"
-          echo 'YACC="win_bison -y"'
-          export YACC="win_bison -y"
+          #echo "curl cpanm"
+          #curl -L -k -s -S -o cpanm https://cpanmin.us/
+          #echo "perl cpanm Pod::Usage"
+          #perl cpanm Pod::Usage
          mkdir openssl
          echo "curl openssl"
-          curl -L -k -s -S -o openssl-3.2.0.tar.gz https://www.openssl.org/source/openssl-3.2.0.tar.gz
-          tar xzf openssl-3.2.0.tar.gz
-          cd openssl-3.2.0
+          curl -L -k -s -S -o openssl-1.1.1j.tar.gz https://www.openssl.org/source/openssl-1.1.1j.tar.gz
+          tar xzf openssl-1.1.1j.tar.gz
+          cd openssl-1.1.1j
          # remove pod::Usage because we do not need -help or -man output
-          # from the Configure script, this fixes it for openssl 1.1.1
-          #echo "Fixup ./Configure by removing use Pod::Usage require"
-          #sed -e 's/use Pod::Usage//' < Configure > Configure.fix
-          # ./Configure.fix no-shared no-asm -DOPENSSL_NO_CAPIENG mingw64 --prefix="$prepath/openssl"
-          # pacman is used to install for msys2, with
-          # C:/msys64/usr/bin/pacman -S perl
-          echo "C:/msys64/usr/bin/perl ./Configure no-shared no-asm -DOPENSSL_NO_CAPIENG mingw64 --prefix=\""$prepath/openssl"\" PERL=\"C:/msys64/usr/bin/perl\""
-          C:/msys64/usr/bin/perl ./Configure no-shared no-asm -DOPENSSL_NO_CAPIENG mingw64 --prefix="$prepath/openssl" PERL="C:/msys64/usr/bin/perl"
+          # from the Configure script
+          echo "Fixup ./Configure by removing use Pod::Usage require"
+          sed -e 's/use Pod::Usage//' < Configure > Configure.fix
+          echo "./Configure.fix no-shared no-asm -DOPENSSL_NO_CAPIENG mingw64 --prefix=\""$prepath/openssl\"""
+          ./Configure.fix no-shared no-asm -DOPENSSL_NO_CAPIENG mingw64 --prefix="$prepath/openssl"
          # make the libs only, build faster
          echo "make build_libs"
          #make
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: configure
      run: ./configure --enable-debug
    - name: make
@@ -10,7 +10,6 @@
 /config.status
 /dnstap/dnstap_config.h
 /dnscrypt/dnscrypt_config.h
-/clubsyms.def
 /doc/example.conf
 /doc/libunbound.3
 /doc/unbound-anchor.8
@@ -57,7 +57,7 @@ LEX=@LEX@
 STRIP=@STRIP@
 CC=@CC@
 CPPFLAGS=-I. @CPPFLAGS@
-PYTHON_CPPFLAGS=-I. -I$(srcdir) @PYTHON_CPPFLAGS@
+PYTHON_CPPFLAGS=-I. @PYTHON_CPPFLAGS@
 CFLAGS=-DSRCDIR=$(srcdir) @CFLAGS@
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
@@ -122,15 +122,15 @@ iterator/iter_delegpt.c iterator/iter_donotq.c iterator/iter_fwd.c \
 iterator/iter_hints.c iterator/iter_priv.c iterator/iter_resptype.c \
 iterator/iter_scrub.c iterator/iter_utils.c services/listen_dnsport.c \
 services/localzone.c services/mesh.c services/modstack.c services/view.c \
-services/rpz.c util/rfc_1982.c \
+services/rpz.c \
 services/outbound_list.c services/outside_network.c util/alloc.c \
 util/config_file.c util/configlexer.c util/configparser.c \
 util/shm_side/shm_main.c services/authzone.c \
 util/fptr_wlist.c util/locks.c util/log.c util/mini_event.c util/module.c \
 util/netevent.c util/net_help.c util/random.c util/rbtree.c util/regional.c \
-util/rtt.c util/siphash.c util/edns.c util/storage/dnstree.c util/storage/lookup3.c \
+util/rtt.c util/edns.c util/storage/dnstree.c util/storage/lookup3.c \
 util/storage/lruhash.c util/storage/slabhash.c util/tcp_conn_limit.c \
-util/timehist.c util/tube.c util/proxy_protocol.c util/timeval_func.c \
+util/timehist.c util/tube.c \
 util/ub_event.c util/ub_event_pluggable.c util/winsock_event.c \
 validator/autotrust.c validator/val_anchor.c validator/validator.c \
 validator/val_kcache.c validator/val_kentry.c validator/val_neg.c \
@@ -145,14 +145,14 @@ as112.lo msgparse.lo msgreply.lo packed_rrset.lo iterator.lo iter_delegpt.lo \
 iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \
 iter_scrub.lo iter_utils.lo localzone.lo mesh.lo modstack.lo view.lo \
 outbound_list.lo alloc.lo config_file.lo configlexer.lo configparser.lo \
-fptr_wlist.lo siphash.lo edns.lo locks.lo log.lo mini_event.lo module.lo net_help.lo \
+fptr_wlist.lo edns.lo locks.lo log.lo mini_event.lo module.lo net_help.lo \
 random.lo rbtree.lo regional.lo rtt.lo dnstree.lo lookup3.lo lruhash.lo \
 slabhash.lo tcp_conn_limit.lo timehist.lo tube.lo winsock_event.lo \
-autotrust.lo val_anchor.lo rpz.lo rfc_1982.lo proxy_protocol.lo \
+autotrust.lo val_anchor.lo rpz.lo \
 validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \
 val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo $(CACHEDB_OBJ) authzone.lo \
 $(SUBNET_OBJ) $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) $(DNSCRYPT_OBJ) \
-$(IPSECMOD_OBJ) $(IPSET_OBJ) $(DYNLIBMOD_OBJ) respip.lo timeval_func.lo
+$(IPSECMOD_OBJ) $(IPSET_OBJ) $(DYNLIBMOD_OBJ) respip.lo
 COMMON_OBJ_WITHOUT_UB_EVENT=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \
 outside_network.lo
 COMMON_OBJ=$(COMMON_OBJ_WITHOUT_UB_EVENT) ub_event.lo
@@ -198,7 +198,7 @@ CHECKCONF_OBJ=unbound-checkconf.lo worker_cb.lo
 CHECKCONF_OBJ_LINK=$(CHECKCONF_OBJ) $(COMMON_OBJ_ALL_SYMBOLS) $(SLDNS_OBJ) \
 $(COMPAT_OBJ) @WIN_CHECKCONF_OBJ_LINK@
 CONTROL_SRC=smallapp/unbound-control.c
-CONTROL_OBJ=unbound-control.lo
+CONTROL_OBJ=unbound-control.lo 
 CONTROL_OBJ_LINK=$(CONTROL_OBJ) worker_cb.lo $(COMMON_OBJ_ALL_SYMBOLS) \
 $(SLDNS_OBJ) $(COMPAT_OBJ) @WIN_CONTROL_OBJ_LINK@
 HOST_SRC=smallapp/unbound-host.c
@@ -344,16 +344,7 @@ longcheck: longtest
 test:	unittest$(EXEEXT) testbound$(EXEEXT)
 	./unittest$(EXEEXT)
 	./testbound$(EXEEXT) -s
-	for x in $(srcdir)/testdata/*.rpl; do \
-		output=`./testbound$(EXEEXT) -p $$x -o -vvvvv 2>&1`; \
-		if test $$? -eq 0; then \
-			printf "%s OK\n" "$$x "; \
-		else \
-			printf "%s\n" "$$output "; \
-			printf "%s failed\n" "$$x "; \
-			exit 1; \
-		fi; \
-	done
+	for x in $(srcdir)/testdata/*.rpl; do printf "%s" "$$x "; if ./testbound$(EXEEXT) -p $$x >/dev/null 2>&1; then echo OK; else echo failed; exit 1; fi done
 	@echo test OK

 longtest:	tests
@@ -455,7 +446,6 @@ unbound-dnstap-socket.lo unbound-dnstap-socket.o: $(srcdir)/dnstap/unbound-dnsta
 dynlibmod.lo dynlibdmod.o: $(srcdir)/dynlibmod/dynlibmod.c config.h $(srcdir)/dynlibmod/dynlibmod.h
 cachedb.lo cachedb.o: $(srcdir)/cachedb/cachedb.c config.h $(srcdir)/cachedb/cachedb.h
 redis.lo redis.o: $(srcdir)/cachedb/redis.c config.h $(srcdir)/cachedb/redis.h
-timeval_func.lo timeval_func.o: $(srcdir)/util/timeval_func.c $(srcdir)/util/timeval_func.h

 # dnscrypt
 dnscrypt.lo dnscrypt.o: $(srcdir)/dnscrypt/dnscrypt.c config.h \
@@ -499,7 +489,6 @@ util/configlexer.c:  $(srcdir)/util/configlexer.lex util/configparser.h
 		echo "#include \"util/configyyrename.h\"" >> $@ ;\
 		$(LEX) -t $(srcdir)/util/configlexer.lex >> $@ ;\
 	fi
-	@if test ! -f $@; then echo "No $@ : need flex and bison to compile from source repository"; exit 1; fi

 util/configparser.c util/configparser.h:  $(srcdir)/util/configparser.y
 	@-if test ! -d util; then $(INSTALL) -d util; fi
@@ -518,7 +507,7 @@ distclean: clean
 	rm -f doc/example.conf doc/libunbound.3 doc/unbound-anchor.8 doc/unbound-checkconf.8 doc/unbound-control.8 doc/unbound.8 doc/unbound.conf.5 doc/unbound-host.1
 	rm -f smallapp/unbound-control-setup.sh dnstap/dnstap_config.h dnscrypt/dnscrypt_config.h contrib/libunbound.pc contrib/unbound.socket contrib/unbound.service
 	rm -f $(TEST_BIN)
-	rm -f Makefile
+	rm -f Makefile 

 maintainer-clean: distclean
 	rm -f util/configlexer.c util/configparser.c util/configparser.h
@@ -567,7 +556,7 @@ pythonmod-install:

 pyunbound-install:
 	$(INSTALL) -m 755 -d $(DESTDIR)$(PYTHON_SITE_PKG)
-	$(INSTALL) -c -m 644 libunbound/python/unbound.py $(DESTDIR)$(PYTHON_SITE_PKG)/unbound.py
+	$(INSTALL) -c -m 644 $(srcdir)/libunbound/python/unbound.py $(DESTDIR)$(PYTHON_SITE_PKG)/unbound.py
 	$(LIBTOOL) --mode=install cp _unbound.la $(DESTDIR)$(PYTHON_SITE_PKG)
 	$(LIBTOOL) --mode=finish $(DESTDIR)$(PYTHON_SITE_PKG)

@@ -594,8 +583,6 @@ install-lib:	lib $(UNBOUND_EVENT_INSTALL)
 		echo ".so man3/libunbound.3" > $(DESTDIR)$(mandir)/man3/$$mpage.3 ; \
 	done
 	$(LIBTOOL) --mode=install cp unbound.h $(DESTDIR)$(includedir)/unbound.h
-	$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)/pkgconfig
-	$(INSTALL) -m 644 contrib/libunbound.pc $(DESTDIR)$(libdir)/pkgconfig
 	$(LIBTOOL) --mode=install cp libunbound.la $(DESTDIR)$(libdir)
 	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)

@@ -605,6 +592,8 @@ install-all:	all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL) $(UNBOUND_EVENT_INSTA
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man5
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL) -m 644 contrib/libunbound.pc $(DESTDIR)$(libdir)/pkgconfig
 	$(LIBTOOL) --mode=install cp -f unbound$(EXEEXT) $(DESTDIR)$(sbindir)/unbound$(EXEEXT)
 	$(LIBTOOL) --mode=install cp -f unbound-checkconf$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-checkconf$(EXEEXT)
 	$(LIBTOOL) --mode=install cp -f unbound-control$(EXEEXT) $(DESTDIR)$(sbindir)/unbound-control$(EXEEXT)
@@ -618,7 +607,7 @@ install-all:	all $(PYTHONMOD_INSTALL) $(PYUNBOUND_INSTALL) $(UNBOUND_EVENT_INSTA
 	$(INSTALL) -c -m 644 doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
 	$(INSTALL) -c -m 644 doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -c -m 755 unbound-control-setup $(DESTDIR)$(sbindir)/unbound-control-setup
-	if test ! -e "$(DESTDIR)$(configfile)"; then $(INSTALL) -d `dirname "$(DESTDIR)$(configfile)"`; $(INSTALL) -c -m 644 doc/example.conf "$(DESTDIR)$(configfile)"; fi
+	if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 doc/example.conf $(DESTDIR)$(configfile); fi

 pythonmod-uninstall:
 	rm -f -- $(DESTDIR)$(PYTHON_SITE_PKG)/unboundmodule.py
@@ -647,11 +636,11 @@ uninstall:	$(PYTHONMOD_UNINSTALL) $(PYUNBOUND_UNINSTALL) $(UNBOUND_EVENT_UNINSTA
 	rm -f -- $(DESTDIR)$(includedir)/unbound.h
 	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libunbound.la
 	@echo
-	@echo "You still need to remove "`dirname "$(DESTDIR)$(configfile)"`" , $(DESTDIR)$(configfile) by hand"
+	@echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand"

 iana_update:
 	curl -o port-numbers.tmp https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml --compressed
-	if file port-numbers.tmp | grep 'gzip' >/dev/null; then zcat port-numbers.tmp; else cat port-numbers.tmp; fi | awk '/<record>/ {p=0;} /<protocol>udp/ {p=1;} /<protocol>[^u]/ {p=0;} /Decomissioned|Decommissioned|Removed|De-registered|unassigned|Unassigned|Reserved/ {u=1;} /<number>/ { if(u==1) {u=0;} else { if(p==1) { match($$0,/[0-9]+/); print substr($$0, RSTART, RLENGTH) ","}}}' | sort -nu > util/iana_ports.inc
+	if file port-numbers.tmp | grep 'gzip' >/dev/null; then zcat port-numbers.tmp; else cat port-numbers.tmp; fi | awk '/<record>/ {p=0;} /<protocol>udp/ {p=1;} /<protocol>[^u]/ {p=0;} /Decomissioned|Decommissioned|Removed|De-registered|unassigned|Unassigned|Reserved/ {u=1;} /<number>/ { if(u==1) {u=0;} else { if(p==1) { match($$0,/[0-9]+/); print substr($$0, RSTART, RLENGTH) ","}}}' | sort -nu > util/iana_ports.inc  
 	rm -f port-numbers.tmp

 # dependency generation
@@ -738,7 +727,7 @@ msgencode.lo msgencode.o: $(srcdir)/util/data/msgencode.c config.h $(srcdir)/uti
 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)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.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 \
@@ -793,7 +782,7 @@ iter_priv.lo iter_priv.o: $(srcdir)/iterator/iter_priv.c config.h $(srcdir)/iter
 $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/net_help.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)/iterator/iter_resptype.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/net_help.h \
 $(srcdir)/util/data/dname.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h
@@ -879,7 +868,7 @@ rpz.lo rpz.o: $(srcdir)/services/rpz.c config.h $(srcdir)/services/rpz.h $(srcdi
 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  \
-
+ 
 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   \
@@ -917,8 +906,7 @@ config_file.lo config_file.o: $(srcdir)/util/config_file.c config.h $(srcdir)/ut
 configlexer.lo configlexer.o: util/configlexer.c config.h $(srcdir)/util/configyyrename.h \
 $(srcdir)/util/config_file.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)/util/net_help.h $(srcdir)/util/log.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  \
@@ -931,7 +919,7 @@ shm_main.lo shm_main.o: $(srcdir)/util/shm_side/shm_main.c config.h $(srcdir)/ut
 $(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/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 \
@@ -986,9 +974,7 @@ netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/neteve
 $(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)/dnstap/dnstap.h  $(srcdir)/services/listen_dnsport.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 \
@@ -1009,8 +995,6 @@ rtt.lo rtt.o: $(srcdir)/util/rtt.c config.h $(srcdir)/util/rtt.h $(srcdir)/itera
 $(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
 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 \
@@ -1191,7 +1175,7 @@ unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h $(srcdir)/sldns/r
 $(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
+ $(srcdir)/services/outside_network.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 \
@@ -1264,7 +1248,7 @@ cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h $(srcdir)/daemon
 $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.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
+ $(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 \
@@ -1278,8 +1262,7 @@ daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.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)/util/random.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h
 remote.lo remote.o: $(srcdir)/daemon/remote.c config.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 \
@@ -1327,7 +1310,7 @@ unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.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/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/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
@@ -1349,21 +1332,21 @@ testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/test
 $(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/alloc.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)/respip/respip.h $(srcdir)/util/net_help.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
 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/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/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
@@ -1415,7 +1398,7 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s
 $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_neg.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/testpkts.h $(srcdir)/util/rbtree.h \
 $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.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  \
@@ -1423,13 +1406,13 @@ fake_event.lo fake_event.o: $(srcdir)/testcode/fake_event.c config.h $(srcdir)/t
 $(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/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)/services/listen_dnsport.h $(srcdir)/services/outside_network.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)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/daemon/remote.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 \
@@ -1485,8 +1468,7 @@ context.lo context.o: $(srcdir)/libunbound/context.c config.h $(srcdir)/libunbou
 $(srcdir)/util/storage/slabhash.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/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)/util/edns.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 \
@@ -1498,8 +1480,7 @@ libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbou
 $(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)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h
+ $(srcdir)/services/rpz.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/respip/respip.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 \
@@ -1513,7 +1494,8 @@ libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/li
 $(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
+ $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
+ $(srcdir)/sldns/str2wire.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
 asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libunbound/unbound.h \
@@ -1521,7 +1503,7 @@ asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libu
 $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/data/packed_rrset.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/net_help.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
@@ -1,10 +1,9 @@
 # Unbound

-[![Github Build Status](https://github.com/NLnetLabs/unbound/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/NLnetLabs/unbound/actions)
+[![Travis Build Status](https://travis-ci.org/NLnetLabs/unbound.svg?branch=master)](https://travis-ci.org/NLnetLabs/unbound)
 [![Packaging status](https://repology.org/badge/tiny-repos/unbound.svg)](https://repology.org/project/unbound/versions)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/unbound.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:unbound)
 [![Documentation Status](https://readthedocs.org/projects/unbound/badge/?version=latest)](https://unbound.readthedocs.io/en/latest/?badge=latest)
-[![Mastodon Follow](https://img.shields.io/mastodon/follow/109262826617293067?domain=https%3A%2F%2Ffosstodon.org&style=social)](https://fosstodon.org/@nlnetlabs)

 Unbound is a validating, recursive, caching DNS resolver. It is designed to be
 fast and lean and incorporates modern features based on open standards. If you
@@ -17,9 +16,7 @@ You can learn more about Unbound by reading our
 ## Compiling

 Make sure you have the C toolchain, OpenSSL and its include files, and libexpat
-installed.
-If building from the repository source you also need flex and bison installed.
-Unbound can be compiled and installed using:
+installed. Unbound can be compiled and installed using:

 ```
 ./configure && make && make install
@@ -29,7 +26,7 @@ You can use libevent if you want. libevent is useful when using many (10000)
 outgoing ports. By default max 256 ports are opened at the same time and the
 builtin alternative is equally capable and a little faster.

-Use the `--with-libevent` configure option to compile Unbound with libevent
+Use the `--with-libevent=dir` configure option to compile Unbound with libevent
 support.

 ## Unbound configuration
@@ -1,31 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-NLnet Labs adheres to the straightforward, semantic versioning scheme that is
-commonly used in the software industry.
-
-Support is provided in respect of the latest release, i.e. releases with the
-highest minor and patch version level. We do not backport security fixes to
-older (minor) versions. In the event a new major version is released (e.g.  from
-3.2.18 to 4.0.0), support will also be provided on the latest minor  version of
-the previous major version (3.2.18) for a period of one year from the release of
-the new major version (4.0.0).
-
-In the event that, during this period, a new patch or minor version of the
-previous major version is released, then support on these versions will only be
-provided for the remainder of the one-year-period.
-
-You can find detailed information on our software support policy here:
-
-https://www.nlnetlabs.nl/support/software-support-policy/
-
-## Reporting a Vulnerability
-
-We take security very seriously. If you have discovered a security vulnerability
-in one of our projects and you would like to report it to us, you can send an
-encrypted message to our Security Entry Point.
-
-Details are described here:
-
-https://www.nlnetlabs.nl/security-report/
@@ -1,43 +1,39 @@
 # ===========================================================================
-#       https://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html
+#              http://autoconf-archive.cryp.to/ac_pkg_swig.html
 # ===========================================================================
 #
 # SYNOPSIS
 #
-#   AX_PKG_SWIG([major.minor.micro], [action-if-found], [action-if-not-found])
+#   AC_PROG_SWIG([major.minor.micro])
 #
 # DESCRIPTION
 #
-#   This macro searches for a SWIG installation on your system. If found,
-#   then SWIG is AC_SUBST'd; if not found, then $SWIG is empty.  If SWIG is
-#   found, then SWIG_LIB is set to the SWIG library path, and AC_SUBST'd.
+#   This macro searches for a SWIG installation on your system. If found you
+#   should call SWIG via $(SWIG). You can use the optional first argument to
+#   check if the version of the available SWIG is greater than or equal to
+#   the value of the argument. It should have the format: N[.N[.N]] (N is a
+#   number between 0 and 999. Only the first N is mandatory.)
 #
-#   You can use the optional first argument to check if the version of the
-#   available SWIG is greater than or equal to the value of the argument. It
-#   should have the format: N[.N[.N]] (N is a number between 0 and 999. Only
-#   the first N is mandatory.) If the version argument is given (e.g.
-#   1.3.17), AX_PKG_SWIG checks that the swig package is this version number
-#   or higher.
-#
-#   As usual, action-if-found is executed if SWIG is found, otherwise
-#   action-if-not-found is executed.
+#   If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that
+#   the swig package is this version number or higher.
 #
 #   In configure.in, use as:
 #
-#     AX_PKG_SWIG(1.3.17, [], [ AC_MSG_ERROR([SWIG is required to build..]) ])
-#     AX_SWIG_ENABLE_CXX
-#     AX_SWIG_MULTI_MODULE_SUPPORT
-#     AX_SWIG_PYTHON
+#     AC_PROG_SWIG(1.3.17)
+#     SWIG_ENABLE_CXX
+#     SWIG_MULTI_MODULE_SUPPORT
+#     SWIG_PYTHON
 #
-# LICENSE
+# LAST MODIFICATION
+#
+#   2008-04-12
+#
+# COPYLEFT
 #
 #   Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2008 Alan W. Irwin
+#   Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
 #   Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2008 Andrew Collier
-#   Copyright (c) 2011 Murray Cumming <murrayc@openismus.com>
-#   Copyright (c) 2018 Reini Urban <rurban@cpan.org>
-#   Copyright (c) 2021 Vincent Danjean <Vincent.Danjean@ens-lyon.org>
+#   Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -50,7 +46,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -61,21 +57,17 @@
 #   all other use of the material that constitutes the Autoconf Macro.
 #
 #   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
+#   Macro released by the Autoconf Macro Archive. When you make and
+#   distribute a modified version of the Autoconf Macro, you may extend this
+#   special exception to the GPL to apply to your modified version as well.

-#serial 15
-
-AC_DEFUN([AX_PKG_SWIG],[
-        # Find path to the "swig" executable.
-        AC_PATH_PROGS([SWIG],[swig swig3.0 swig2.0])
+AC_DEFUN([AC_PROG_SWIG],[
+        AC_PATH_PROG([SWIG],[swig])
        if test -z "$SWIG" ; then
-                m4_ifval([$3],[$3],[:])
-        elif test -z "$1" ; then
-                m4_ifval([$2],[$2],[:])
-	else
-                AC_MSG_CHECKING([SWIG version])
+                AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+                SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
+        elif test -n "$1" ; then
+                AC_MSG_CHECKING([for SWIG version])
                [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
                AC_MSG_RESULT([$swig_version])
                if test -n "$swig_version" ; then
@@ -85,12 +77,12 @@ AC_DEFUN([AX_PKG_SWIG],[
                        if test -z "$required_major" ; then
                                [required_major=0]
                        fi
-                        [required=`echo $required. | sed 's/[0-9]*[^0-9]//'`]
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
                        [required_minor=`echo $required | sed 's/[^0-9].*//'`]
                        if test -z "$required_minor" ; then
                                [required_minor=0]
                        fi
-                        [required=`echo $required. | sed 's/[0-9]*[^0-9]//'`]
+                        [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
                        [required_patch=`echo $required | sed 's/[^0-9].*//'`]
                        if test -z "$required_patch" ; then
                                [required_patch=0]
@@ -111,28 +103,30 @@ AC_DEFUN([AX_PKG_SWIG],[
                        if test -z "$available_patch" ; then
                                [available_patch=0]
                        fi
-                        # Convert the version tuple into a single number for easier comparison.
-                        # Using base 100 should be safe since SWIG internally uses BCD values
-                        # to encode its version number.
-                        required_swig_vernum=`expr $required_major \* 10000 \
-                            \+ $required_minor \* 100 \+ $required_patch`
-                        available_swig_vernum=`expr $available_major \* 10000 \
-                            \+ $available_minor \* 100 \+ $available_patch`
-
-                        if test $available_swig_vernum -lt $required_swig_vernum; then
-                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.])
-                                SWIG=''
-                                m4_ifval([$3],[$3],[])
+			[badversion=0]
+			if test $available_major -lt $required_major ; then
+				[badversion=1]
+			fi
+                        if test $available_major -eq $required_major \
+                                -a $available_minor -lt $required_minor ; then
+				[badversion=1]
+			fi
+                        if test $available_major -eq $required_major \
+                                -a $available_minor -eq $required_minor \
+                                -a $available_patch -lt $required_patch ; then
+				[badversion=1]
+			fi
+			if test $badversion -eq 1 ; then
+                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
                        else
-                                AC_MSG_CHECKING([for SWIG library])
-                                SWIG_LIB=`$SWIG -swiglib | tr '\r\n' '  '`
-                                AC_MSG_RESULT([$SWIG_LIB])
-                                m4_ifval([$2],[$2],[])
+                                AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+                                SWIG_LIB=`$SWIG -swiglib`
+                                AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
                        fi
                else
                        AC_MSG_WARN([cannot determine SWIG version])
-                        SWIG=''
-                        m4_ifval([$3],[$3],[])
+                        SWIG='echo "Error: Cannot determine SWIG version.  You should look at http://www.swig.org" ; false'
                fi
        fi
        AC_SUBST([SWIG_LIB])
@@ -2,13 +2,7 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 48
-# 2024-01-16 fix to add -l:libssp.a to -lcrypto link check.
-#	     and check for getaddrinfo with only header.
-# 2024-01-15 fix to add crypt32 to -lcrypto link check when checking for gdi32.
-# 2023-05-04 fix to remove unused whitespace.
-# 2023-01-26 fix -Wstrict-prototypes.
-# 2022-09-01 fix checking if nonblocking sockets work on OpenBSD.
+# Version 43
 # 2021-08-17 fix sed script in ssldir split handling.
 # 2021-08-17 fix for openssl to detect split version, with ssldir_include
 # 	     and ssldir_lib output directories.
@@ -192,7 +186,7 @@ dnl cache=`echo $1 | sed 'y%.=/+- %___p__%'`
 AC_CACHE_VAL(cv_prog_cc_flag_needed_$cache,
 [
 echo '$2' > conftest.c
-echo 'void f(void){}' >>conftest.c
+echo 'void f(){}' >>conftest.c
 if test -z "`$CC $CPPFLAGS $CFLAGS $ERRFLAG -c conftest.c 2>&1`"; then
 eval "cv_prog_cc_flag_needed_$cache=no"
 else
@@ -238,7 +232,7 @@ dnl DEPFLAG: set to flag that generates dependencies.
 AC_DEFUN([ACX_DEPFLAG],
 [
 AC_MSG_CHECKING([$CC dependency flag])
-echo 'void f(void){}' >conftest.c
+echo 'void f(){}' >conftest.c
 if test "`$CC -MM conftest.c 2>&1`" = "conftest.o: conftest.c"; then
 	DEPFLAG="-MM"
 else 
@@ -277,7 +271,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_DEFAUL
 #include <getopt.h>
 #endif

-int test(void) {
+int test() {
 	int a;
 	char **opts = NULL;
 	struct timeval tv;
@@ -314,7 +308,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_DEFAUL
 #include <getopt.h>
 #endif

-int test(void) {
+int test() {
 	int a;
 	char **opts = NULL;
 	struct timeval tv;
@@ -340,7 +334,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG,
 [
 #include <stdbool.h>
 #include <ctype.h>
-int test(void) {
+int test() {
        int a = 0;
        return a;
 }
@@ -350,7 +344,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_BSD_SOURCE -D_DEFAULT_SOURCE,
 [
 #include <ctype.h>

-int test(void) {
+int test() {
        int a;
        a = isascii(32);
        return a;
@@ -361,7 +355,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_GNU_SOURCE,
 [
 #include <netinet/in.h>

-int test(void) {
+int test() {
        struct in6_pktinfo inf;
 	int a = (int)sizeof(inf);
        return a;
@@ -375,7 +369,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_GNU_SOURCE -D_FRSRESGID,
 [
 #include <unistd.h>

-int test(void) {
+int test() {
 	int a = setresgid(0,0,0);
 	a = setresuid(0,0,0);
        return a;
@@ -390,7 +384,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D_POSIX_C_SOURCE=200112,
 #endif
 #include <netdb.h>

-int test(void) {
+int test() {
        int a = 0;
        char *t;
        time_t time = 0;
@@ -418,7 +412,7 @@ ACX_CHECK_COMPILER_FLAG_NEEDED(-D__EXTENSIONS__,
 #include <getopt.h>
 #endif

-int test(void) {
+int test() {
        int a;
        char **opts = NULL;
        struct timeval tv;
@@ -480,7 +474,7 @@ fi
 dnl Setup ATTR_FORMAT config.h parts.
 dnl make sure you call ACX_CHECK_FORMAT_ATTRIBUTE also.
 AC_DEFUN([AHX_CONFIG_FORMAT_ATTRIBUTE],
-[
+[ 
 #ifdef HAVE_ATTR_FORMAT
 #  define ATTR_FORMAT(archetype, string_index, first_to_check) \
    __attribute__ ((format (archetype, string_index, first_to_check)))
@@ -710,7 +704,7 @@ AC_DEFUN([ACX_SSL_CHECKS], [
 		    LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir_lib"
 	    	    ACX_RUNTIME_PATH_ADD([$ssldir_lib])
 	    fi
-
+        
            AC_MSG_CHECKING([for EVP_sha256 in -lcrypto])
            LIBS="$LIBS -lcrypto"
            LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto"
@@ -735,73 +729,40 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                  ]])],[
                    AC_DEFINE([HAVE_EVP_SHA256], 1,
                        [If you have EVP_sha256])
-                    AC_MSG_RESULT(yes)
+                    AC_MSG_RESULT(yes) 
                  ],[
                    AC_MSG_RESULT(no)
                    LIBS="$BAKLIBS"
                    LIBSSL_LIBS="$BAKSSLLIBS"
-
-		    LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32"
-		    LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32"
-                    AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32])
-		    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-			int EVP_sha256(void);
-			(void)EVP_sha256();
-		      ]])],[
-			AC_DEFINE([HAVE_EVP_SHA256], 1,
-			    [If you have EVP_sha256])
-			AC_MSG_RESULT(yes)
-		      ],[
-			AC_MSG_RESULT(no)
-			LIBS="$BAKLIBS"
-			LIBSSL_LIBS="$BAKSSLLIBS"
-
-			LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a"
-			LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a"
-			AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a])
-			AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-			    int EVP_sha256(void);
-			    (void)EVP_sha256();
-			  ]])],[
-			    AC_DEFINE([HAVE_EVP_SHA256], 1,
-				[If you have EVP_sha256])
-			    AC_MSG_RESULT(yes)
-			  ],[
-			    AC_MSG_RESULT(no)
-			    LIBS="$BAKLIBS"
-			    LIBSSL_LIBS="$BAKSSLLIBS"
-
-			    LIBS="$LIBS -ldl"
-			    LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
-			    AC_MSG_CHECKING([if -lcrypto needs -ldl])
-			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-				int EVP_sha256(void);
-				(void)EVP_sha256();
-			      ]])],[
-				AC_DEFINE([HAVE_EVP_SHA256], 1,
-				    [If you have EVP_sha256])
-				AC_MSG_RESULT(yes)
-			      ],[
-				AC_MSG_RESULT(no)
-				LIBS="$BAKLIBS"
-				LIBSSL_LIBS="$BAKSSLLIBS"
-				LIBS="$LIBS -ldl -pthread"
-				LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread"
-				AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread])
-				AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
-				    int EVP_sha256(void);
-				    (void)EVP_sha256();
-				  ]])],[
-				    AC_DEFINE([HAVE_EVP_SHA256], 1,
-					[If you have EVP_sha256])
-				    AC_MSG_RESULT(yes)
-				  ],[
-				    AC_MSG_RESULT(no)
-				    AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
-				])
-			    ])
+                    LIBS="$LIBS -ldl"
+                    LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
+                    AC_MSG_CHECKING([if -lcrypto needs -ldl])
+                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
+                        int EVP_sha256(void);
+                        (void)EVP_sha256();
+                      ]])],[
+                        AC_DEFINE([HAVE_EVP_SHA256], 1,
+                            [If you have EVP_sha256])
+                        AC_MSG_RESULT(yes) 
+                      ],[
+                        AC_MSG_RESULT(no)
+                        LIBS="$BAKLIBS"
+                        LIBSSL_LIBS="$BAKSSLLIBS"
+                        LIBS="$LIBS -ldl -pthread"
+                        LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread"
+                        AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread])
+                        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
+                            int EVP_sha256(void);
+                            (void)EVP_sha256();
+                          ]])],[
+                            AC_DEFINE([HAVE_EVP_SHA256], 1,
+                                [If you have EVP_sha256])
+                            AC_MSG_RESULT(yes) 
+                          ],[
+                            AC_MSG_RESULT(no)
+                            AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
 			])
-		    ])
+                    ])
                ])
            ])
        fi
@@ -815,7 +776,7 @@ AC_CHECK_HEADERS([openssl/rand.h],,, [AC_INCLUDES_DEFAULT])

 dnl Check for SSL, where SSL is mandatory
 dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found
-dnl Setup of CPPFLAGS, CFLAGS.  Adds -lcrypto to LIBS.
+dnl Setup of CPPFLAGS, CFLAGS.  Adds -lcrypto to LIBS. 
 dnl Checks main header files of SSL.
 dnl
 AC_DEFUN([ACX_WITH_SSL],
@@ -872,7 +833,7 @@ dnl try to see if an additional _LARGEFILE_SOURCE 1 is needed to get fseeko
 ACX_CHECK_COMPILER_FLAG_NEEDED(-D_LARGEFILE_SOURCE=1,
 [
 #include <stdio.h>
-int test(void) {
+int test() {
        int a = fseeko(stdin, 0, 0);
        return a;
 }
@@ -897,7 +858,7 @@ char* (*f) () = getaddrinfo;
 #ifdef __cplusplus
 }
 #endif
-int main(void) {
+int main() {
        ;
        return 0;
 }
@@ -908,7 +869,7 @@ dnl see if on windows
 if test "$ac_cv_header_windows_h" = "yes"; then
 	AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used])
 	USE_WINSOCK="1"
-	if echo "$LIBS" | grep 'lws2_32' >/dev/null; then
+	if echo $LIBS | grep 'lws2_32' >/dev/null; then
 		:
 	else
 		LIBS="$LIBS -lws2_32"
@@ -916,24 +877,6 @@ if test "$ac_cv_header_windows_h" = "yes"; then
 fi
 ],
 dnl no quick getaddrinfo, try mingw32 and winsock2 library.
-dnl perhaps getaddrinfo needs only the include
-AC_LINK_IFELSE(
-[AC_LANG_PROGRAM(
-[
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-],
-[
-        (void)getaddrinfo(NULL, NULL, NULL, NULL);
-]
-)],
-[
-ac_cv_func_getaddrinfo="yes"
-AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used])
-USE_WINSOCK="1"
-],
-
 ORIGLIBS="$LIBS"
 LIBS="$LIBS -lws2_32"
 AC_LINK_IFELSE(
@@ -958,7 +901,6 @@ ac_cv_func_getaddrinfo="no"
 LIBS="$ORIGLIBS"
 ])
 )
-)

 AC_MSG_RESULT($ac_cv_func_getaddrinfo)
 if test $ac_cv_func_getaddrinfo = yes; then
@@ -980,7 +922,7 @@ cache=`echo $1 | sed 'y%.=/+-%___p_%'`
 AC_CACHE_VAL(cv_cc_deprecated_$cache,
 [
 echo '$3' >conftest.c
-echo 'void f(void){ $2 }' >>conftest.c
+echo 'void f(){ $2 }' >>conftest.c
 if test -z "`$CC $CPPFLAGS $CFLAGS -c conftest.c 2>&1 | grep -e deprecated -e unavailable`"; then
 eval "cv_cc_deprecated_$cache=no"
 else
@@ -1021,9 +963,6 @@ AC_LANG_SOURCE([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -1374,7 +1313,7 @@ AC_DEFUN([AHX_CONFIG_W32_FD_SET_T],
 #ifdef HAVE_WINSOCK2_H
 #define FD_SET_T (u_int)
 #else
-#define FD_SET_T
+#define FD_SET_T 
 #endif
 ])

@@ -1412,7 +1351,7 @@ dnl $3: define value, 1
 AC_DEFUN([AHX_CONFIG_FLAG_OMITTED],
 [#if defined($1) && !defined($2)
 #define $2 $3
-[#]endif])
+[#]endif ])

 dnl Wrapper for AHX_CONFIG_FLAG_OMITTED for -D style flags
 dnl $1: the -DNAME or -DNAME=value string.
@@ -17,75 +17,28 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
 		PYTHON_VERSION=`$PYTHON -c "import sys; \
 			print(sys.version.split()[[0]])"`
 	fi
-	# calculate the version number components.
-	[
-	v="$PYTHON_VERSION"
-	PYTHON_VERSION_MAJOR=`echo $v | sed 's/[^0-9].*//'`
-	if test -z "$PYTHON_VERSION_MAJOR"; then PYTHON_VERSION_MAJOR="0"; fi
-	v=`echo $v | sed -e 's/^[0-9]*$//' -e 's/[0-9]*[^0-9]//'`
-	PYTHON_VERSION_MINOR=`echo $v | sed 's/[^0-9].*//'`
-	if test -z "$PYTHON_VERSION_MINOR"; then PYTHON_VERSION_MINOR="0"; fi
-	v=`echo $v | sed -e 's/^[0-9]*$//' -e 's/[0-9]*[^0-9]//'`
-	PYTHON_VERSION_PATCH=`echo $v | sed 's/[^0-9].*//'`
-	if test -z "$PYTHON_VERSION_PATCH"; then PYTHON_VERSION_PATCH="0"; fi
-	]

-	# For some systems, sysconfig exists, but has the wrong paths,
-	# on Debian 10, for python 2.7 and 3.7. So, we check the version,
-	# and for older versions try distutils.sysconfig first. For newer
-	# versions>=3.10, where distutils.sysconfig is deprecated, use
-	# sysconfig first and then attempt the other one.
-	py_distutils_first="no"
-	if test $PYTHON_VERSION_MAJOR -lt 3; then
-		py_distutils_first="yes"
-	fi
-	if test $PYTHON_VERSION_MAJOR -eq 3 -a $PYTHON_VERSION_MINOR -lt 10; then
-		py_distutils_first="yes"
-	fi
-
-	# Check if you have the first module
-	if test "$py_distutils_first" = "yes"; then m="distutils"; else m="sysconfig"; fi
-	sysconfig_module=""
-	AC_MSG_CHECKING([for the $m Python module])
-        if ac_modulecheck_result1=`$PYTHON -c "import $m" 2>&1`; then
+        #
+        # Check if you have distutils, else fail
+        #
+        AC_MSG_CHECKING([for the distutils Python package])
+        if ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`; then
                AC_MSG_RESULT([yes])
-		sysconfig_module="$m"
-	else
+        else
                AC_MSG_RESULT([no])
-	fi
-
-	# if not found, try the other one.
-	if test -z "$sysconfig_module"; then
-		if test "$py_distutils_first" = "yes"; then m2="sysconfig"; else m2="distutils"; fi
-		AC_MSG_CHECKING([for the $m2 Python module])
-		if ac_modulecheck_result2=`$PYTHON -c "import $m2" 2>&1`; then
-			AC_MSG_RESULT([yes])
-			sysconfig_module="$m2"
-		else
-			AC_MSG_RESULT([no])
-			AC_MSG_ERROR([cannot import Python module "$m", or "$m2".
-	Please check your Python installation. The errors are:
-	$m
-	$ac_modulecheck_result1
-	$m2
-	$ac_modulecheck_result2])
-			PYTHON_VERSION=""
-		fi
-	fi
-	if test "$sysconfig_module" = "distutils"; then sysconfig_module="distutils.sysconfig"; fi
+                AC_MSG_ERROR([cannot import Python module "distutils".
+Please check your Python installation. The error was:
+$ac_distutils_result])
+                PYTHON_VERSION=""
+        fi

        #
        # Check for Python include path
        #
        AC_MSG_CHECKING([for Python include path])
        if test -z "$PYTHON_CPPFLAGS"; then
-		if test "$sysconfig_module" = "sysconfig"; then
-			python_path=`$PYTHON -c 'import sysconfig; \
-				print(sysconfig.get_path("include"));'`
-		else
-			python_path=`$PYTHON -c "import distutils.sysconfig; \
-				print(distutils.sysconfig.get_python_inc());"`
-		fi
+                python_path=`$PYTHON -c "import distutils.sysconfig; \
+                        print(distutils.sysconfig.get_python_inc());"`
                if test -n "${python_path}"; then
                        python_path="-I$python_path"
                fi
@@ -99,14 +52,14 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
        #
        AC_MSG_CHECKING([for Python library path])
        if test -z "$PYTHON_LDFLAGS"; then
-                PYTHON_LDFLAGS=`$PYTHON -c "from $sysconfig_module import *; \
+                PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
                        print('-L'+get_config_var('LIBDIR')+' -L'+get_config_var('LIBDEST')+' '+get_config_var('BLDLIBRARY'));"`
        fi
        AC_MSG_RESULT([$PYTHON_LDFLAGS])
        AC_SUBST([PYTHON_LDFLAGS])

        if test -z "$PYTHON_LIBDIR"; then
-                PYTHON_LIBDIR=`$PYTHON -c "from $sysconfig_module import *; \
+                PYTHON_LIBDIR=`$PYTHON -c "from distutils.sysconfig import *; \
                        print(get_config_var('LIBDIR'));"`
        fi

@@ -115,13 +68,8 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
        #
        AC_MSG_CHECKING([for Python site-packages path])
        if test -z "$PYTHON_SITE_PKG"; then
-		if test "$sysconfig_module" = "sysconfig"; then
-			PYTHON_SITE_PKG=`$PYTHON -c 'import sysconfig; \
-				print(sysconfig.get_path("platlib"));'`
-		else
-			PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-				print(distutils.sysconfig.get_python_lib(1,0));"`
-		fi
+                PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+                        print(distutils.sysconfig.get_python_lib(1,0));"`
        fi
        AC_MSG_RESULT([$PYTHON_SITE_PKG])
        AC_SUBST([PYTHON_SITE_PKG])
@@ -1,5 +1,5 @@
 # ===========================================================================
-#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -14,28 +14,24 @@
 #   flags that are needed. (The user can also force certain compiler
 #   flags/libs to be tested by setting these environment variables.)
 #
-#   Also sets PTHREAD_CC and PTHREAD_CXX to any special C compiler that is
-#   needed for multi-threaded programs (defaults to the value of CC
-#   respectively CXX otherwise). (This is necessary on e.g. AIX to use the
-#   special cc_r/CC_r compiler alias.)
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
 #
 #   NOTE: You are assumed to not only compile your program with these flags,
-#   but also to link with them as well. For example, you might link with
+#   but also link it with them as well. e.g. you should link with
 #   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#   $PTHREAD_CXX $CXXFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
 #
-#   If you are only building threaded programs, you may wish to use these
+#   If you are only building threads programs, you may wish to use these
 #   variables in your default LIBS, CFLAGS, and CC:
 #
 #     LIBS="$PTHREAD_LIBS $LIBS"
 #     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
 #     CC="$PTHREAD_CC"
-#     CXX="$PTHREAD_CXX"
 #
 #   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
 #
 #   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
 #   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
@@ -59,7 +55,6 @@
 #
 #   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
 #   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
 #
 #   This program is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by the
@@ -72,7 +67,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -87,41 +82,35 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.

-#serial 31
+#serial 21

 AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
 AC_DEFUN([AX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_SED])
 AC_LANG_PUSH([C])
 ax_pthread_ok=no

 # We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
+# requires special compiler flags (e.g. on True64 or Sequent).
 # It gets checked for in the link test anyway.

 # First of all, check if the user has set any of the PTHREAD_LIBS,
 # etcetera environment variables, and if threads linking works using
 # them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-        AS_IF([test "x$PTHREAD_CXX" != "x"], [CXX="$PTHREAD_CXX"])
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = "xno"; then
+        if test x"$ax_pthread_ok" = xno; then
                PTHREAD_LIBS=""
                PTHREAD_CFLAGS=""
        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
 fi

 # We must check for the threads library under a number of different
@@ -129,14 +118,12 @@ fi
 # (e.g. DEC) have both -lpthread and -lpthreads, where one of the
 # libraries is broken (non-POSIX).

-# Create a list of thread flags to try. Items with a "," contain both
-# C compiler flags (before ",") and linker flags (after ","). Other items
-# starting with a "-" are C compiler flags, and remaining items are
-# library names, except for "none" which indicates that we try without
-# any flags at all, and "pthread-config" which is a program returning
-# the flags for the Pth emulation library.
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.

-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"

 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
@@ -145,163 +132,82 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
 # none: in case threads are in libc; should be tried before -Kthread and
 #       other compiler flags to prevent continual compiler warnings
 # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
 # -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
 # pthread: Linux, etcetera
 # --thread-safe: KAI C++
 # pthread-config: use pthread-config program (for GNU Pth library)

-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-            [
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-            ],
-            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-        ;;
-
+case ${host_os} in
        solaris*)

        # On Solaris (at least, for some versions), libc contains stubbed
        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:

-        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
        ;;
 esac

-# Are we compiling with Clang?
+# Clang doesn't consider unrecognized options an error unless we specify
+# -Werror. We throw in some extra Clang-specific options to ensure that
+# this doesn't happen for GCC, which also accepts -Werror.

-AC_CACHE_CHECK([whether $CC is Clang],
-    [ax_cv_PTHREAD_CLANG],
-    [ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ],
-            [ax_cv_PTHREAD_CLANG=yes])
-     fi
-    ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
+save_CFLAGS="$CFLAGS"
+ax_pthread_extra_flags="-Werror"
+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
+                  [AC_MSG_RESULT([yes])],
+                  [ax_pthread_extra_flags=
+                   AC_MSG_RESULT([no])])
+CFLAGS="$save_CFLAGS"

+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do

-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-# Note that for GCC and Clang -pthread generally implies -lpthread,
-# except when -nostdlib is passed.
-# This is problematic using libtool to build C++ shared libraries with pthread:
-# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
-# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
-# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
-# To solve this, first try -pthread together with -lpthread for GCC
-
-AS_IF([test "x$GCC" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
-
-# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
-
-AS_IF([test "x$ax_pthread_clang" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread"])
-
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-      [ax_pthread_check_cond=0],
-      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
+        case $flag in
                none)
                AC_MSG_CHECKING([whether pthreads work without any flags])
                ;;

-                *,*)
-                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
-                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
-                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
-                ;;
-
                -*)
-                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
                ;;

                pthread-config)
                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                if test x"$ax_pthread_config" = xno; then continue; fi
                PTHREAD_CFLAGS="`pthread-config --cflags`"
                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
                ;;

                *)
-                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
                ;;
        esac

-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"

        # Check for various functions.  We must include pthread.h,
        # since some functions may be macros.  (On the Sequent, we
@@ -312,18 +218,8 @@ for ax_pthread_try_flag in $ax_pthread_flags; do
        # pthread_cleanup_push because it is one of the few pthread
        # functions on Solaris that doesn't have a non-functional libc stub.
        # We try pthread_create on general principles.
-
        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void *some_global = NULL;
-                        static void routine(void *a)
-                          {
-                             /* To avoid any unused-parameter or
-                                unused-but-set-parameter warning.  */
-                             some_global = a;
-                          }
+                        static void routine(void *a) { *((int*)a) = 0; }
                        static void *start_routine(void *a) { return a; }],
                       [pthread_t th; pthread_attr_t attr;
                        pthread_create(&th, 0, start_routine, 0);
@@ -331,187 +227,101 @@ for ax_pthread_try_flag in $ax_pthread_flags; do
                        pthread_attr_init(&attr);
                        pthread_cleanup_push(routine, 0);
                        pthread_cleanup_pop(0) /* ; */])],
-            [ax_pthread_ok=yes],
-            [])
+                [ax_pthread_ok=yes],
+                [])

-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"

        AC_MSG_RESULT([$ax_pthread_ok])
-        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi

        PTHREAD_LIBS=""
        PTHREAD_CFLAGS=""
 done
 fi

-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`AS_ECHO(["$ac_link"]) | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                    [ac_link="$ax_pthread_2step_ac_link"
-                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                         [break])
-                    ])
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-            ])
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-
-
 # Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_CACHE_CHECK([for joinable pthread attribute],
-            [ax_cv_PTHREAD_JOINABLE_ATTR],
-            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-                                [])
-             done
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-                                  [Define to necessary symbol if this constant
-                                   uses a non-standard name on your system.])
-               ax_pthread_joinable_attr_defined=yes
-              ])
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT([$attr_name])
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi

-        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"],
-              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes])
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                # TODO: What about Clang on Solaris?
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT([$flag])
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi

        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT],
-            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                             [[int i = PTHREAD_PRIO_INHERIT;
-                                               return i;]])],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            [ax_cv_PTHREAD_PRIO_INHERIT], [
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-               ax_pthread_prio_inherit_defined=yes
-              ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])

-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"

        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
+        if test "x$GCC" != xyes; then
            case $host_os in
                aix*)
                AS_CASE(["x/$CC"],
-                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                    [#handle absolute path differently from PATH based program lookup
-                     AS_CASE(["x$CC"],
-                         [x/*],
-                         [
-			   AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])
-			   AS_IF([test "x${CXX}" != "x"], [AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])])
-			 ],
-                         [
-			   AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])
-			   AS_IF([test "x${CXX}" != "x"], [AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])])
-			 ]
-                     )
-                    ])
+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                  [#handle absolute path differently from PATH based program lookup
+                   AS_CASE(["x$CC"],
+                     [x/*],
+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
                ;;
            esac
        fi
 fi

 test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX"

 AC_SUBST([PTHREAD_LIBS])
 AC_SUBST([PTHREAD_CFLAGS])
 AC_SUBST([PTHREAD_CC])
-AC_SUBST([PTHREAD_CXX])

 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
+if test x"$ax_pthread_ok" = xyes; then
        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
        :
 else
@@ -50,8 +50,6 @@
 #include "util/data/msgreply.h"
 #include "util/data/msgencode.h"
 #include "services/cache/dns.h"
-#include "services/mesh.h"
-#include "services/modstack.h"
 #include "validator/val_neg.h"
 #include "validator/val_secalgo.h"
 #include "iterator/iter_utils.h"
@@ -104,6 +102,7 @@ static int
 testframe_init(struct module_env* env, struct cachedb_env* cachedb_env)
 {
 	struct testframe_moddata* d;
+	(void)env;
 	verbose(VERB_ALGO, "testframe_init");
 	d = (struct testframe_moddata*)calloc(1,
 		sizeof(struct testframe_moddata));
@@ -112,15 +111,6 @@ testframe_init(struct module_env* env, struct cachedb_env* cachedb_env)
 		log_err("out of memory");
 		return 0;
 	}
-	/* Register an EDNS option (65534) to bypass the worker cache lookup
-	 * for testing */
-	if(!edns_register_option(LDNS_EDNS_UNBOUND_CACHEDB_TESTFRAME_TEST,
-		1 /* bypass cache */,
-		0 /* no aggregation */, env)) {
-		log_err("testframe_init, could not register test opcode");
-		free(d);
-		return 0;
-	}
 	lock_basic_init(&d->lock);
 	lock_protect(&d->lock, d, sizeof(*d));
 	return 1;
@@ -228,8 +218,6 @@ static int
 cachedb_apply_cfg(struct cachedb_env* cachedb_env, struct config_file* cfg)
 {
 	const char* backend_str = cfg->cachedb_backend;
-	if(!backend_str || *backend_str==0)
-		return 1;
 	cachedb_env->backend = cachedb_find_backend(backend_str);
 	if(!cachedb_env->backend) {
 		log_err("cachedb: cannot find backend name '%s'", backend_str);
@@ -240,7 +228,7 @@ cachedb_apply_cfg(struct cachedb_env* cachedb_env, struct config_file* cfg)
 	return 1;
 }

-int
+int 
 cachedb_init(struct module_env* env, int id)
 {
 	struct cachedb_env* cachedb_env = (struct cachedb_env*)calloc(1,
@@ -267,19 +255,31 @@ cachedb_init(struct module_env* env, int id)
 		return 0;
 	}
 	cachedb_env->enabled = 1;
+	if(env->cfg->serve_expired_reply_ttl)
+		log_warn(
+			"cachedb: serve-expired-reply-ttl is set but not working for data "
+			"originating from the external cache; 0 TLL is used for those.");
+	if(env->cfg->serve_expired_client_timeout)
+		log_warn(
+			"cachedb: serve-expired-client-timeout is set but not working for "
+			"data originating from the external cache; expired data are used "
+			"in the reply without first trying to refresh the data.");
 	return 1;
 }

-void
+void 
 cachedb_deinit(struct module_env* env, int id)
 {
 	struct cachedb_env* cachedb_env;
 	if(!env || !env->modinfo[id])
 		return;
 	cachedb_env = (struct cachedb_env*)env->modinfo[id];
+	/* free contents */
+	/* TODO */
 	if(cachedb_env->enabled) {
 		(*cachedb_env->backend->deinit)(env, cachedb_env);
 	}
+
 	free(cachedb_env);
 	env->modinfo[id] = NULL;
 }
@@ -322,30 +322,30 @@ error_response(struct module_qstate* qstate, int id, int rcode)

 /**
 * Hash the query name, type, class and dbacess-secret into lookup buffer.
- * @param qinfo: query info
- * @param env: with env->cfg with secret.
+ * @param qstate: query state with query info
+ * 	and env->cfg with secret.
 * @param buf: returned buffer with hash to lookup
 * @param len: length of the buffer.
 */
 static void
-calc_hash(struct query_info* qinfo, struct module_env* env, char* buf,
-	size_t len)
+calc_hash(struct module_qstate* qstate, char* buf, size_t len)
 {
 	uint8_t clear[1024];
 	size_t clen = 0;
 	uint8_t hash[CACHEDB_HASHSIZE/8];
 	const char* hex = "0123456789ABCDEF";
-	const char* secret = env->cfg->cachedb_secret;
+	const char* secret = qstate->env->cfg->cachedb_secret;
 	size_t i;

 	/* copy the hash info into the clear buffer */
-	if(clen + qinfo->qname_len < sizeof(clear)) {
-		memmove(clear+clen, qinfo->qname, qinfo->qname_len);
-		clen += qinfo->qname_len;
+	if(clen + qstate->qinfo.qname_len < sizeof(clear)) {
+		memmove(clear+clen, qstate->qinfo.qname,
+			qstate->qinfo.qname_len);
+		clen += qstate->qinfo.qname_len;
 	}
 	if(clen + 4 < sizeof(clear)) {
-		uint16_t t = htons(qinfo->qtype);
-		uint16_t c = htons(qinfo->qclass);
+		uint16_t t = htons(qstate->qinfo.qtype);
+		uint16_t c = htons(qstate->qinfo.qclass);
 		memmove(clear+clen, &t, 2);
 		memmove(clear+clen+2, &c, 2);
 		clen += 4;
@@ -390,15 +390,6 @@ prep_data(struct module_qstate* qstate, struct sldns_buffer* buf)

 	if(!qstate->return_msg || !qstate->return_msg->rep)
 		return 0;
-	/* do not store failures like SERVFAIL in the cachedb, this avoids
-	 * overwriting expired, valid, content with broken content. */
-	if(FLAGS_GET_RCODE(qstate->return_msg->rep->flags) !=
-		LDNS_RCODE_NOERROR &&
-	   FLAGS_GET_RCODE(qstate->return_msg->rep->flags) !=
-		LDNS_RCODE_NXDOMAIN &&
-	   FLAGS_GET_RCODE(qstate->return_msg->rep->flags) !=
-		LDNS_RCODE_YXDOMAIN)
-		return 0;
 	/* We don't store the reply if its TTL is 0 unless serve-expired is
 	 * enabled.  Such a reply won't be reusable and simply be a waste for
 	 * the backend.  It's also compatible with the default behavior of
@@ -406,14 +397,6 @@ prep_data(struct module_qstate* qstate, struct sldns_buffer* buf)
 	if(qstate->return_msg->rep->ttl == 0 &&
 		!qstate->env->cfg->serve_expired)
 		return 0;
-
-	/* The EDE is added to the out-list so it is encoded in the cached message */
-	if (qstate->env->cfg->ede && qstate->return_msg->rep->reason_bogus != LDNS_EDE_NONE) {
-		edns_opt_list_append_ede(&edns.opt_list_out, qstate->env->scratch,
-					qstate->return_msg->rep->reason_bogus,
-					qstate->return_msg->rep->reason_bogus_str);
-	}
-
 	if(verbosity >= VERB_ALGO)
 		log_dns_msg("cachedb encoding", &qstate->return_msg->qinfo,
 	                qstate->return_msg->rep);
@@ -504,42 +487,12 @@ adjust_msg_ttl(struct dns_msg* msg, time_t adjust)
 	}
 }

-/* Set the TTL of the given RRset to fixed value. */
-static void
-packed_rrset_ttl_set(struct packed_rrset_data* data, time_t ttl)
-{
-	size_t i;
-	size_t total = data->count + data->rrsig_count;
-	data->ttl = ttl;
-	for(i=0; i<total; i++) {
-		data->rr_ttl[i] = ttl;
-	}
-	data->ttl_add = 0;
-}
-
-/* Set the TTL of a DNS message and its RRs by to a fixed value. */
-static void
-set_msg_ttl(struct dns_msg* msg, time_t ttl)
-{
-	size_t i;
-	msg->rep->ttl = ttl;
-	msg->rep->prefetch_ttl = PREFETCH_TTL_CALC(msg->rep->ttl);
-	msg->rep->serve_expired_ttl = msg->rep->ttl + SERVE_EXPIRED_TTL;
-
-	for(i=0; i<msg->rep->rrset_count; i++) {
-		packed_rrset_ttl_set((struct packed_rrset_data*)msg->
-			rep->rrsets[i]->entry.data, ttl);
-	}
-}
-
 /** convert dns message in buffer to return_msg */
 static int
-parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
-	int* msg_expired)
+parse_data(struct module_qstate* qstate, struct sldns_buffer* buf)
 {
 	struct msg_parse* prs;
 	struct edns_data edns;
-	struct edns_option* ede;
 	uint64_t timestamp, expiry;
 	time_t adjust;
 	size_t lim = sldns_buffer_limit(buf);
@@ -577,24 +530,6 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
 	if(!qstate->return_msg)
 		return 0;
 	
-	/* We find the EDE in the in-list after parsing */
-	if(qstate->env->cfg->ede &&
-		(ede = edns_opt_list_find(edns.opt_list_in, LDNS_EDNS_EDE))) {
-		if(ede->opt_len >= 2) {
-			qstate->return_msg->rep->reason_bogus =
-				sldns_read_uint16(ede->opt_data);
-		}
-		/* allocate space and store the error string and it's size */
-		if(ede->opt_len > 2) {
-			size_t ede_len = ede->opt_len - 2;
-			qstate->return_msg->rep->reason_bogus_str = regional_alloc(
-				qstate->region, sizeof(char) * (ede_len+1));
-			memcpy(qstate->return_msg->rep->reason_bogus_str,
-				ede->opt_data+2, ede_len);
-			qstate->return_msg->rep->reason_bogus_str[ede_len] = 0;
-		}
-	}
-
 	qstate->return_rcode = LDNS_RCODE_NOERROR;

 	/* see how much of the TTL expired, and remove it */
@@ -605,19 +540,12 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
 	adjust = *qstate->env->now - (time_t)timestamp;
 	if(qstate->return_msg->rep->ttl < adjust) {
 		verbose(VERB_ALGO, "cachedb msg expired");
-		*msg_expired = 1;
 		/* If serve-expired is enabled, we still use an expired message
 		 * setting the TTL to 0. */
-		if(!qstate->env->cfg->serve_expired ||
-			(FLAGS_GET_RCODE(qstate->return_msg->rep->flags)
-			!= LDNS_RCODE_NOERROR &&
-			FLAGS_GET_RCODE(qstate->return_msg->rep->flags)
-			!= LDNS_RCODE_NXDOMAIN &&
-			FLAGS_GET_RCODE(qstate->return_msg->rep->flags)
-			!= LDNS_RCODE_YXDOMAIN))
-			return 0; /* message expired */
-		else
+		if(qstate->env->cfg->serve_expired)
 			adjust = -1;
+		else
+			return 0; /* message expired */
 	}
 	verbose(VERB_ALGO, "cachedb msg adjusted down by %d", (int)adjust);
 	adjust_msg_ttl(qstate->return_msg, adjust);
@@ -628,7 +556,6 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
 	 * 'now' should be redundant given how these values were calculated,
 	 * but we check it just in case as does good_expiry_and_qinfo(). */
 	if(qstate->env->cfg->serve_expired &&
-		!qstate->env->cfg->serve_expired_client_timeout &&
 		(adjust == -1 || (time_t)expiry < *qstate->env->now)) {
 		qstate->need_refetch = 1;
 	}
@@ -641,11 +568,10 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf,
 * return true if lookup was successful.
 */
 static int
-cachedb_extcache_lookup(struct module_qstate* qstate, struct cachedb_env* ie,
-	int* msg_expired)
+cachedb_extcache_lookup(struct module_qstate* qstate, struct cachedb_env* ie)
 {
 	char key[(CACHEDB_HASHSIZE/8)*2+1];
-	calc_hash(&qstate->qinfo, qstate->env, key, sizeof(key));
+	calc_hash(qstate, key, sizeof(key));

 	/* call backend to fetch data for key into scratch buffer */
 	if( !(*ie->backend->lookup)(qstate->env, ie, key,
@@ -659,7 +585,7 @@ cachedb_extcache_lookup(struct module_qstate* qstate, struct cachedb_env* ie,
 	}

 	/* parse dns message into return_msg */
-	if( !parse_data(qstate, qstate->env->scratch_buffer, msg_expired) ) {
+	if( !parse_data(qstate, qstate->env->scratch_buffer) ) {
 		return 0;
 	}
 	return 1;
@@ -672,7 +598,7 @@ static void
 cachedb_extcache_store(struct module_qstate* qstate, struct cachedb_env* ie)
 {
 	char key[(CACHEDB_HASHSIZE/8)*2+1];
-	calc_hash(&qstate->qinfo, qstate->env, key, sizeof(key));
+	calc_hash(qstate, key, sizeof(key));

 	/* prepare data in scratch buffer */
 	if(!prep_data(qstate, qstate->env->scratch_buffer))
@@ -689,18 +615,13 @@ cachedb_extcache_store(struct module_qstate* qstate, struct cachedb_env* ie)
 * See if unbound's internal cache can answer the query
 */
 static int
-cachedb_intcache_lookup(struct module_qstate* qstate, struct cachedb_env* cde)
+cachedb_intcache_lookup(struct module_qstate* qstate)
 {
-	uint8_t dpname_storage[LDNS_MAX_DOMAINLEN+1];
 	uint8_t* dpname=NULL;
 	size_t dpnamelen=0;
 	struct dns_msg* msg;
-	/* for testframe bypass this lookup */
-	if(cde->backend == &testframe_backend) {
-		return 0;
-	}
 	if(iter_stub_fwd_no_cache(qstate, &qstate->qinfo,
-		&dpname, &dpnamelen, dpname_storage, sizeof(dpname_storage)))
+		&dpname, &dpnamelen))
 		return 0; /* no cache for these queries */
 	msg = dns_cache_lookup(qstate->env, qstate->qinfo.qname,
 		qstate->qinfo.qname_len, qstate->qinfo.qtype,
@@ -731,43 +652,17 @@ cachedb_intcache_lookup(struct module_qstate* qstate, struct cachedb_env* cde)
 * Store query into the internal cache of unbound.
 */
 static void
-cachedb_intcache_store(struct module_qstate* qstate, int msg_expired)
+cachedb_intcache_store(struct module_qstate* qstate)
 {
 	uint32_t store_flags = qstate->query_flags;
-	int serve_expired = qstate->env->cfg->serve_expired;

 	if(qstate->env->cfg->serve_expired)
 		store_flags |= DNSCACHE_STORE_ZEROTTL;
 	if(!qstate->return_msg)
 		return;
-	if(serve_expired && msg_expired) {
-		/* Set TTLs to a value such that value + *env->now is
-		 * going to be now-3 seconds. Making it expired
-		 * in the cache. */
-		set_msg_ttl(qstate->return_msg, (time_t)-3);
-		/* The expired entry does not get checked by the validator
-		 * and we need a validation value for it. */
-		if(qstate->env->cfg->cachedb_check_when_serve_expired)
-			qstate->return_msg->rep->security = sec_status_insecure;
-	}
 	(void)dns_cache_store(qstate->env, &qstate->qinfo,
 		qstate->return_msg->rep, 0, qstate->prefetch_leeway, 0,
-		qstate->region, store_flags, qstate->qstarttime);
-	if(serve_expired && msg_expired) {
-		if(qstate->env->cfg->serve_expired_client_timeout) {
-			/* No expired response from the query state, the
-			 * query resolution needs to continue and it can
-			 * pick up the expired result after the timer out
-			 * of cache. */
-			return;
-		}
-		/* set TTLs to zero again */
-		adjust_msg_ttl(qstate->return_msg, -1);
-		/* Send serve expired responses based on the cachedb
-		 * returned message, that was just stored in the cache.
-		 * It can then continue to work on this query. */
-		mesh_respond_serve_expired(qstate->mesh_info);
-	}
+		qstate->region, store_flags);
 }

 /**
@@ -783,8 +678,6 @@ cachedb_handle_query(struct module_qstate* qstate,
 	struct cachedb_qstate* ATTR_UNUSED(iq),
 	struct cachedb_env* ie, int id)
 {
-	int msg_expired = 0;
-	qstate->is_cachedb_answer = 0;
 	/* check if we are enabled, and skip if so */
 	if(!ie->enabled) {
 		/* pass request to next module */
@@ -801,7 +694,7 @@ cachedb_handle_query(struct module_qstate* qstate,

 	/* lookup inside unbound's internal cache.
 	 * This does not look for expired entries. */
-	if(cachedb_intcache_lookup(qstate, ie)) {
+	if(cachedb_intcache_lookup(qstate)) {
 		if(verbosity >= VERB_ALGO) {
 			if(qstate->return_msg->rep)
 				log_dns_msg("cachedb internal cache lookup",
@@ -818,48 +711,31 @@ cachedb_handle_query(struct module_qstate* qstate,
 	}

 	/* ask backend cache to see if we have data */
-	if(cachedb_extcache_lookup(qstate, ie, &msg_expired)) {
+	if(cachedb_extcache_lookup(qstate, ie)) {
 		if(verbosity >= VERB_ALGO)
 			log_dns_msg(ie->backend->name,
 				&qstate->return_msg->qinfo,
 				qstate->return_msg->rep);
 		/* store this result in internal cache */
-		cachedb_intcache_store(qstate, msg_expired);
+		cachedb_intcache_store(qstate);
 		/* In case we have expired data but there is a client timer for expired
 		 * answers, pass execution to next module in order to try updating the
 		 * data first.
 		 * TODO: this needs revisit. The expired data stored from cachedb has
 		 * 0 TTL which is picked up by iterator later when looking in the cache.
-		 */
-		if(qstate->env->cfg->serve_expired && msg_expired) {
-			qstate->return_msg = NULL;
-			qstate->ext_state[id] = module_wait_module;
-			/* The expired reply is sent with
-			 * mesh_respond_serve_expired, and so
-			 * the need_refetch is not used. */
-			qstate->need_refetch = 0;
-			return;
-		}
+		 * Document that ext cachedb does not work properly with
+		 * serve_stale_reply_ttl yet. */
 		if(qstate->need_refetch && qstate->serve_expired_data &&
 			qstate->serve_expired_data->timer) {
 				qstate->return_msg = NULL;
 				qstate->ext_state[id] = module_wait_module;
 				return;
 		}
-		qstate->is_cachedb_answer = 1;
 		/* we are done with the query */
 		qstate->ext_state[id] = module_finished;
 		return;
 	}

-	if(qstate->serve_expired_data &&
-		qstate->env->cfg->cachedb_check_when_serve_expired &&
-		!qstate->env->cfg->serve_expired_client_timeout) {
-		/* Reply with expired data if any to client, because cachedb
-		 * also has no useful, current data */
-		mesh_respond_serve_expired(qstate->mesh_info);
-	}
-
 	/* no cache fetches */
 	/* pass request to next module */
 	qstate->ext_state[id] = module_wait_module;
@@ -877,18 +753,12 @@ static void
 cachedb_handle_response(struct module_qstate* qstate,
 	struct cachedb_qstate* ATTR_UNUSED(iq), struct cachedb_env* ie, int id)
 {
-	qstate->is_cachedb_answer = 0;
 	/* check if we are not enabled or instructed to not cache, and skip */
 	if(!ie->enabled || qstate->no_cache_store) {
 		/* we are done with the query */
 		qstate->ext_state[id] = module_finished;
 		return;
 	}
-	if(qstate->env->cfg->cachedb_no_store) {
-		/* do not store the item in the external cache */
-		qstate->ext_state[id] = module_finished;
-		return;
-	}

 	/* store the item into the backend cache */
 	cachedb_extcache_store(qstate, ie);
@@ -992,41 +862,4 @@ cachedb_get_funcblock(void)
 {
 	return &cachedb_block;
 }
-
-int
-cachedb_is_enabled(struct module_stack* mods, struct module_env* env)
-{
-	struct cachedb_env* ie;
-	int id = modstack_find(mods, "cachedb");
-	if(id == -1)
-		return 0;
-	ie = (struct cachedb_env*)env->modinfo[id];
-	if(ie && ie->enabled)
-		return 1;
-	return 0;
-}
-
-void cachedb_msg_remove(struct module_qstate* qstate)
-{
-	cachedb_msg_remove_qinfo(qstate->env, &qstate->qinfo);
-}
-
-void cachedb_msg_remove_qinfo(struct module_env* env, struct query_info* qinfo)
-{
-	char key[(CACHEDB_HASHSIZE/8)*2+1];
-	int id = modstack_find(env->modstack, "cachedb");
-	struct cachedb_env* ie = (struct cachedb_env*)env->modinfo[id];
-
-	log_query_info(VERB_ALGO, "cachedb msg remove", qinfo);
-	calc_hash(qinfo, env, key, sizeof(key));
-	sldns_buffer_clear(env->scratch_buffer);
-	sldns_buffer_write_u32(env->scratch_buffer, 0);
-	sldns_buffer_flip(env->scratch_buffer);
-
-	/* call backend */
-	(*ie->backend->store)(env, ie, key,
-		sldns_buffer_begin(env->scratch_buffer),
-		sldns_buffer_limit(env->scratch_buffer),
-		0);
-}
 #endif /* USE_CACHEDB */
@@ -41,7 +41,6 @@
 */
 #include "util/module.h"
 struct cachedb_backend;
-struct module_stack;

 /**
 * The global variable environment contents for the cachedb
@@ -111,26 +110,3 @@ size_t cachedb_get_mem(struct module_env* env, int id);
 */
 struct module_func_block* cachedb_get_funcblock(void);

-/**
- * See if the cachedb is enabled.
- * @param mods: module stack. It finds the cachedb module environment.
- * @param env: module environment.
- * @return true if exists and enabled.
- */
-int cachedb_is_enabled(struct module_stack* mods, struct module_env* env);
-
-/**
- * Remove a message from the global cache. Because edns subnet has a more
- * specific entry, and if not removed when everything expires, the global
- * entry is used, instead of a fresh lookup of the edns subnet entry.
- * @param qstate: query state.
- */
-void cachedb_msg_remove(struct module_qstate* qstate);
-
-/**
- * Remove message from the cachedb cache, by query info.
- * @param env: module environment to look up cachedb state.
- * @param qinfo: the message to remove.
- */
-void cachedb_msg_remove_qinfo(struct module_env* env,
-	struct query_info* qinfo);
@@ -56,43 +56,19 @@ struct redis_moddata {
 	int numctxs;		/* number of ctx entries */
 	const char* server_host; /* server's IP address or host name */
 	int server_port;	 /* server's TCP port */
-	const char* server_path; /* server's unix path, or "", NULL if unused */
-	const char* server_password; /* server's AUTH password, or "", NULL if unused */
 	struct timeval timeout;	 /* timeout for connection setup and commands */
-	int logical_db;		/* the redis logical database to use */
 };

 static redisReply* redis_command(struct module_env*, struct cachedb_env*,
 	const char*, const uint8_t*, size_t);

-static void
-moddata_clean(struct redis_moddata** moddata) {
-	if(!moddata || !*moddata)
-		return;
-	if((*moddata)->ctxs) {
-		int i;
-		for(i = 0; i < (*moddata)->numctxs; i++) {
-			if((*moddata)->ctxs[i])
-				redisFree((*moddata)->ctxs[i]);
-		}
-		free((*moddata)->ctxs);
-	}
-	free(*moddata);
-	*moddata = NULL;
-}
-
 static redisContext*
 redis_connect(const struct redis_moddata* moddata)
 {
 	redisContext* ctx;

-	if(moddata->server_path && moddata->server_path[0]!=0) {
-		ctx = redisConnectUnixWithTimeout(moddata->server_path,
-			moddata->timeout);
-	} else {
-		ctx = redisConnectWithTimeout(moddata->server_host,
-			moddata->server_port, moddata->timeout);
-	}
+	ctx = redisConnectWithTimeout(moddata->server_host,
+		moddata->server_port, moddata->timeout);
 	if(!ctx || ctx->err) {
 		const char *errstr = "out of memory";
 		if(ctx)
@@ -104,31 +80,9 @@ redis_connect(const struct redis_moddata* moddata)
 		log_err("failed to set redis timeout");
 		goto fail;
 	}
-	if(moddata->server_password && moddata->server_password[0]!=0) {
-		redisReply* rep;
-		rep = redisCommand(ctx, "AUTH %s", moddata->server_password);
-		if(!rep || rep->type == REDIS_REPLY_ERROR) {
-			log_err("failed to authenticate with password");
-			freeReplyObject(rep);
-			goto fail;
-		}
-		freeReplyObject(rep);
-	}
-	if(moddata->logical_db > 0) {
-		redisReply* rep;
-		rep = redisCommand(ctx, "SELECT %d", moddata->logical_db);
-		if(!rep || rep->type == REDIS_REPLY_ERROR) {
-			log_err("failed to set logical database (%d)",
-				moddata->logical_db);
-			freeReplyObject(rep);
-			goto fail;
-		}
-		freeReplyObject(rep);
-	}
-	verbose(VERB_OPS, "Connection to Redis established");
 	return ctx;

-fail:
+  fail:
 	if(ctx)
 		redisFree(ctx);
 	return NULL;
@@ -140,36 +94,28 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env)
 	int i;
 	struct redis_moddata* moddata = NULL;

-	verbose(VERB_OPS, "Redis initialization");
+	verbose(VERB_ALGO, "redis_init");

 	moddata = calloc(1, sizeof(struct redis_moddata));
 	if(!moddata) {
 		log_err("out of memory");
-		goto fail;
+		return 0;
 	}
 	moddata->numctxs = env->cfg->num_threads;
 	moddata->ctxs = calloc(env->cfg->num_threads, sizeof(redisContext*));
 	if(!moddata->ctxs) {
 		log_err("out of memory");
-		goto fail;
+		free(moddata);
+		return 0;
 	}
 	/* note: server_host is a shallow reference to configured string.
 	 * we don't have to free it in this module. */
 	moddata->server_host = env->cfg->redis_server_host;
 	moddata->server_port = env->cfg->redis_server_port;
-	moddata->server_path = env->cfg->redis_server_path;
-	moddata->server_password = env->cfg->redis_server_password;
 	moddata->timeout.tv_sec = env->cfg->redis_timeout / 1000;
 	moddata->timeout.tv_usec = (env->cfg->redis_timeout % 1000) * 1000;
-	moddata->logical_db = env->cfg->redis_logical_db;
-	for(i = 0; i < moddata->numctxs; i++) {
-		redisContext* ctx = redis_connect(moddata);
-		if(!ctx) {
-			log_err("redis_init: failed to init redis");
-			goto fail;
-		}
-		moddata->ctxs[i] = ctx;
-	}
+	for(i = 0; i < moddata->numctxs; i++)
+		moddata->ctxs[i] = redis_connect(moddata);
 	cachedb_env->backend_data = moddata;
 	if(env->cfg->redis_expire_records) {
 		redisReply* rep = NULL;
@@ -182,7 +128,7 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env)
 			log_err("redis_init: failed to init redis, the "
 				"redis-expire-records option requires the SETEX command "
 				"(redis >= 2.0.0)");
-			goto fail;
+			return 0;
 		}
 		redis_reply_type = rep->type;
 		freeReplyObject(rep);
@@ -194,14 +140,11 @@ redis_init(struct module_env* env, struct cachedb_env* cachedb_env)
 			log_err("redis_init: failed to init redis, the "
 				"redis-expire-records option requires the SETEX command "
 				"(redis >= 2.0.0)");
-			goto fail;
+			return 0;
 		}
 	}
-	return 1;

-fail:
-	moddata_clean(&moddata);
-	return 0;
+	return 1;
 }

 static void
@@ -211,8 +154,19 @@ redis_deinit(struct module_env* env, struct cachedb_env* cachedb_env)
 		cachedb_env->backend_data;
 	(void)env;

-	verbose(VERB_OPS, "Redis deinitialization");
-	moddata_clean(&moddata);
+	verbose(VERB_ALGO, "redis_deinit");
+
+	if(!moddata)
+		return;
+	if(moddata->ctxs) {
+		int i;
+		for(i = 0; i < moddata->numctxs; i++) {
+			if(moddata->ctxs[i])
+				redisFree(moddata->ctxs[i]);
+		}
+		free(moddata->ctxs);
+	}
+	free(moddata);
 }

 /*
@@ -57,8 +57,6 @@
 #define BLOCKSZ	64
 #define RSBUFSZ	(16*BLOCKSZ)

-#define REKEY_BASE	(1024*1024) /* NB. should be a power of 2 */
-
 /* Marked MAP_INHERIT_ZERO, so zero'd out in fork children. */
 static struct {
 	size_t		rs_have;	/* valid bytes at end of rs_buf */
@@ -181,7 +179,6 @@ static void
 _rs_stir(void)
 {
 	u_char rnd[KEYSZ + IVSZ];
-	uint32_t rekey_fuzz = 0;

 	if (getentropy(rnd, sizeof rnd) == -1) {
 		if(errno != ENOSYS ||
@@ -204,10 +201,7 @@ _rs_stir(void)
 	rs->rs_have = 0;
 	memset(rsx->rs_buf, 0, sizeof(rsx->rs_buf));

-	/* rekey interval should not be predictable */
-	chacha_encrypt_bytes(&rsx->rs_chacha, (uint8_t *)&rekey_fuzz,
-	    (uint8_t *)&rekey_fuzz, sizeof(rekey_fuzz));
-	rs->rs_count = REKEY_BASE + (rekey_fuzz % REKEY_BASE);
+	rs->rs_count = 1600000;
 }

 static inline void
@@ -47,7 +47,7 @@
 #define SHA512_Update SHA512Update
 #define SHA512_Final SHA512Final
 #else
-#include <openssl/sha.h>
+#include "openssl/sha.h"
 #endif

 #include <sys/vfs.h>
@@ -222,10 +222,6 @@
 /* Define to 1 if you have the `EVP_cleanup' function. */
 #undef HAVE_EVP_CLEANUP

-/* Define to 1 if you have the `EVP_default_properties_is_fips_enabled'
-   function. */
-#undef HAVE_EVP_DEFAULT_PROPERTIES_IS_FIPS_ENABLED
-
 /* Define to 1 if you have the `EVP_DigestVerify' function. */
 #undef HAVE_EVP_DIGESTVERIFY

@@ -298,9 +294,6 @@
 /* Define to 1 if you have the `getrlimit' function. */
 #undef HAVE_GETRLIMIT

-/* Define to 1 if you have the `gettid' function. */
-#undef HAVE_GETTID
-
 /* Define to 1 if you have the `glob' function. */
 #undef HAVE_GLOB

@@ -364,9 +357,6 @@
 /* Define if we have LibreSSL */
 #undef HAVE_LIBRESSL

-/* Define to 1 if you have the <linux/net_tstamp.h> header file. */
-#undef HAVE_LINUX_NET_TSTAMP_H
-
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R

@@ -379,8 +369,8 @@
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE

-/* Define to 1 if you have the <minix/config.h> header file. */
-#undef HAVE_MINIX_CONFIG_H
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H

 /* Define to 1 if you have the <netdb.h> header file. */
 #undef HAVE_NETDB_H
@@ -463,12 +453,6 @@
 /* Define to 1 if you have the `OSSL_PARAM_BLD_new' function. */
 #undef HAVE_OSSL_PARAM_BLD_NEW

-/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
-
-/* Define to 1 if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD

@@ -587,9 +571,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H

-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H

@@ -692,9 +673,6 @@
 /* Define to 1 if you have the <vfork.h> header file. */
 #undef HAVE_VFORK_H

-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
-
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H

@@ -818,27 +796,19 @@
 /* Shared data */
 #undef SHARE_DIR

-/* The size of `pthread_t', as computed by sizeof. */
-#undef SIZEOF_PTHREAD_T
-
 /* The size of `size_t', as computed by sizeof. */
 #undef SIZEOF_SIZE_T

 /* The size of `time_t', as computed by sizeof. */
 #undef SIZEOF_TIME_T

-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
 /* define if (v)snprintf does not return length needed, (but length used) */
 #undef SNPRINTF_RET_BROKEN

 /* Define to 1 if libsodium supports sodium_set_misuse_handler */
 #undef SODIUM_MISUSE_HANDLER

-/* Define to 1 if all of the C90 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS

 /* use default strptime. */
@@ -934,87 +904,21 @@
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on macOS.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable X/Open compliant socket functions that do not require linking
-   with -lxnet on HP-UX 11.11.  */
-#ifndef _HPUX_ALT_XOPEN_SOCKET_API
-# undef _HPUX_ALT_XOPEN_SOCKET_API
-#endif
-/* Identify the host operating system as Minix.
-   This macro does not affect the system headers' behavior.
-   A future release of Autoconf may stop defining this macro.  */
-#ifndef _MINIX
-# undef _MINIX
-#endif
-/* Enable general extensions on NetBSD.
-   Enable NetBSD compatibility extensions on Minix.  */
-#ifndef _NETBSD_SOURCE
-# undef _NETBSD_SOURCE
-#endif
-/* Enable OpenBSD compatibility extensions on NetBSD.
-   Oddly enough, this does nothing on OpenBSD.  */
-#ifndef _OPENBSD_SOURCE
-# undef _OPENBSD_SOURCE
-#endif
-/* Define to 1 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_SOURCE
-# undef _POSIX_SOURCE
-#endif
-/* Define to 2 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_1_SOURCE
-# undef _POSIX_1_SOURCE
-#endif
-/* Enable POSIX-compatible threading on Solaris.  */
+/* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
-#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
-#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
-# undef __STDC_WANT_IEC_60559_BFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
-#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
-# undef __STDC_WANT_IEC_60559_DFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
-#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
-# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
-#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
-# undef __STDC_WANT_IEC_60559_TYPES_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
-#ifndef __STDC_WANT_LIB_EXT2__
-# undef __STDC_WANT_LIB_EXT2__
-#endif
-/* Enable extensions specified by ISO/IEC 24747:2009.  */
-#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
-# undef __STDC_WANT_MATH_SPEC_FUNCS__
-#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable X/Open extensions.  Define to 500 only if necessary
-   to make mbstate_t available.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
 #endif


@@ -1040,6 +944,11 @@
   `char[]'. */
 #undef YYTEXT_POINTER

+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS

@@ -1049,12 +958,18 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES

+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
 /* Enable for compile on Minix */
 #undef _NETBSD_SOURCE

-/* defined to use gcc ansi snprintf and sscanf that understands %lld when
-   compiled for windows. */
-#undef __USE_MINGW_ANSI_STDIO
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE

 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
@@ -1092,7 +1007,7 @@
 /* Define to `long int' if <sys/types.h> does not define. */
 #undef off_t

-/* Define as a signed integer type capable of holding a process identifier. */
+/* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t

 /* Define to 'int' if not defined */
@@ -1130,39 +1045,39 @@

 #if defined(OMITTED__D_GNU_SOURCE) && !defined(_GNU_SOURCE)
 #define _GNU_SOURCE 1
-#endif
+#endif 

 #if defined(OMITTED__D_BSD_SOURCE) && !defined(_BSD_SOURCE)
 #define _BSD_SOURCE 1
-#endif
+#endif 

 #if defined(OMITTED__D_DEFAULT_SOURCE) && !defined(_DEFAULT_SOURCE)
 #define _DEFAULT_SOURCE 1
-#endif
+#endif 

 #if defined(OMITTED__D__EXTENSIONS__) && !defined(__EXTENSIONS__)
 #define __EXTENSIONS__ 1
-#endif
+#endif 

 #if defined(OMITTED__D_POSIX_C_SOURCE_200112) && !defined(_POSIX_C_SOURCE)
 #define _POSIX_C_SOURCE 200112
-#endif
+#endif 

 #if defined(OMITTED__D_XOPEN_SOURCE_600) && !defined(_XOPEN_SOURCE)
 #define _XOPEN_SOURCE 600
-#endif
+#endif 

 #if defined(OMITTED__D_XOPEN_SOURCE_EXTENDED_1) && !defined(_XOPEN_SOURCE_EXTENDED)
 #define _XOPEN_SOURCE_EXTENDED 1
-#endif
+#endif 

 #if defined(OMITTED__D_ALL_SOURCE) && !defined(_ALL_SOURCE)
 #define _ALL_SOURCE 1
-#endif
+#endif 

 #if defined(OMITTED__D_LARGEFILE_SOURCE_1) && !defined(_LARGEFILE_SOURCE)
 #define _LARGEFILE_SOURCE 1
-#endif
+#endif 



@@ -1235,7 +1150,7 @@
 #include <ws2tcpip.h>
 #endif

-#if !defined(USE_WINSOCK) || !defined(HAVE_SNPRINTF) || defined(SNPRINTF_RET_BROKEN) || defined(__USE_MINGW_ANSI_STDIO)
+#ifndef USE_WINSOCK
 #define ARG_LL "%ll"
 #else
 #define ARG_LL "%I64"
@@ -1246,7 +1161,7 @@
 #endif


-
+ 
 #ifdef HAVE_ATTR_FORMAT
 #  define ATTR_FORMAT(archetype, string_index, first_to_check) \
    __attribute__ ((format (archetype, string_index, first_to_check)))
@@ -1356,7 +1271,7 @@ void* reallocarray(void *ptr, size_t nmemb, size_t size);
 #ifdef HAVE_WINSOCK2_H
 #define FD_SET_T (u_int)
 #else
-#define FD_SET_T
+#define FD_SET_T 
 #endif


@@ -4,13 +4,13 @@ AC_PREREQ([2.56])
 sinclude(acx_nlnetlabs.m4)
 sinclude(ax_pthread.m4)
 sinclude(acx_python.m4)
-sinclude(ax_pkg_swig.m4)
+sinclude(ac_pkg_swig.m4)
 sinclude(dnstap/dnstap.m4)
 sinclude(dnscrypt/dnscrypt.m4)

 # must be numbers. ac_defun because of later processing
 m4_define([VERSION_MAJOR],[1])
-m4_define([VERSION_MINOR],[20])
+m4_define([VERSION_MINOR],[14])
 m4_define([VERSION_MICRO],[1])
 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])
@@ -18,7 +18,7 @@ AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
 AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO])

 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=28
+LIBUNBOUND_REVISION=15
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -100,20 +100,7 @@ LIBUNBOUND_AGE=1
 # 1.13.1 had 9:12:1
 # 1.13.2 had 9:13:1
 # 1.14.0 had 9:14:1
-# 1.15.0 had 9:15:1
-# 1.16.0 had 9:16:1
-# 1.16.1 had 9:17:1
-# 1.16.2 had 9:18:1
-# 1.16.3 had 9:19:1
-# 1.17.0 had 9:20:1
-# 1.17.1 had 9:21:1
-# 1.18.0 had 9:22:1
-# 1.19.0 had 9:23:1
-# 1.19.1 had 9:24:1
-# 1.19.2 had 9:25:1
-# 1.19.3 had 9:26:1
-# 1.20.0 had 9:27:1
-# 1.20.1 had 9:28:1
+# 1.14.1 had 9:15:1

 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -163,7 +150,7 @@ esac

 # are we on MinGW?
 if uname -s 2>&1 | grep MINGW >/dev/null; then on_mingw="yes"
-else
+else 
 	if echo $host | grep mingw >/dev/null; then on_mingw="yes"
 	else on_mingw="no"; fi
 fi
@@ -192,9 +179,9 @@ ub_conf_dir=`AS_DIRNAME(["$ub_conf_file"])`
 AC_SUBST(ub_conf_dir)

 # Determine run, chroot directory and pidfile locations
-AC_ARG_WITH(run-dir,
-    AS_HELP_STRING([--with-run-dir=path],[set default directory to chdir to (by default dir part of cfg file)]),
-    UNBOUND_RUN_DIR="$withval",
+AC_ARG_WITH(run-dir, 
+    AS_HELP_STRING([--with-run-dir=path],[set default directory to chdir to (by default dir part of cfg file)]), 
+    UNBOUND_RUN_DIR="$withval", 
 if test $on_mingw = no; then
    UNBOUND_RUN_DIR=`dirname "$ub_conf_file"`
 else
@@ -205,9 +192,9 @@ AC_SUBST(UNBOUND_RUN_DIR)
 ACX_ESCAPE_BACKSLASH($UNBOUND_RUN_DIR, hdr_run)
 AC_DEFINE_UNQUOTED(RUN_DIR, ["$hdr_run"], [Directory to chdir to])

-AC_ARG_WITH(chroot-dir,
-    AS_HELP_STRING([--with-chroot-dir=path],[set default directory to chroot to (by default same as run-dir)]),
-    UNBOUND_CHROOT_DIR="$withval",
+AC_ARG_WITH(chroot-dir, 
+    AS_HELP_STRING([--with-chroot-dir=path],[set default directory to chroot to (by default same as run-dir)]), 
+    UNBOUND_CHROOT_DIR="$withval", 
 if test $on_mingw = no; then
    UNBOUND_CHROOT_DIR="$UNBOUND_RUN_DIR"
 else
@@ -225,9 +212,9 @@ AC_ARG_WITH(share-dir,
 AC_SUBST(UNBOUND_SHARE_DIR)
 AC_DEFINE_UNQUOTED(SHARE_DIR, ["$UNBOUND_SHARE_DIR"], [Shared data])

-AC_ARG_WITH(pidfile,
-    AS_HELP_STRING([--with-pidfile=filename],[set default pathname to unbound pidfile (default run-dir/unbound.pid)]),
-    UNBOUND_PIDFILE="$withval",
+AC_ARG_WITH(pidfile, 
+    AS_HELP_STRING([--with-pidfile=filename],[set default pathname to unbound pidfile (default run-dir/unbound.pid)]), 
+    UNBOUND_PIDFILE="$withval", 
 if test $on_mingw = no; then
    UNBOUND_PIDFILE="$UNBOUND_RUN_DIR/unbound.pid"
 else
@@ -238,9 +225,9 @@ AC_SUBST(UNBOUND_PIDFILE)
 ACX_ESCAPE_BACKSLASH($UNBOUND_PIDFILE, hdr_pid)
 AC_DEFINE_UNQUOTED(PIDFILE, ["$hdr_pid"], [default pidfile location])

-AC_ARG_WITH(rootkey-file,
-    AS_HELP_STRING([--with-rootkey-file=filename],[set default pathname to root key file (default run-dir/root.key). This file is read and written.]),
-    UNBOUND_ROOTKEY_FILE="$withval",
+AC_ARG_WITH(rootkey-file, 
+    AS_HELP_STRING([--with-rootkey-file=filename],[set default pathname to root key file (default run-dir/root.key). This file is read and written.]), 
+    UNBOUND_ROOTKEY_FILE="$withval", 
 if test $on_mingw = no; then
    UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
 else
@@ -251,9 +238,9 @@ AC_SUBST(UNBOUND_ROOTKEY_FILE)
 ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTKEY_FILE, hdr_rkey)
 AC_DEFINE_UNQUOTED(ROOT_ANCHOR_FILE, ["$hdr_rkey"], [default rootkey location])

-AC_ARG_WITH(rootcert-file,
-    AS_HELP_STRING([--with-rootcert-file=filename],[set default pathname to root update certificate file (default run-dir/icannbundle.pem).  This file need not exist if you are content with the builtin.]),
-    UNBOUND_ROOTCERT_FILE="$withval",
+AC_ARG_WITH(rootcert-file, 
+    AS_HELP_STRING([--with-rootcert-file=filename],[set default pathname to root update certificate file (default run-dir/icannbundle.pem).  This file need not exist if you are content with the builtin.]), 
+    UNBOUND_ROOTCERT_FILE="$withval", 
 if test $on_mingw = no; then
    UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
 else
@@ -264,9 +251,9 @@ AC_SUBST(UNBOUND_ROOTCERT_FILE)
 ACX_ESCAPE_BACKSLASH($UNBOUND_ROOTCERT_FILE, hdr_rpem)
 AC_DEFINE_UNQUOTED(ROOT_CERT_FILE, ["$hdr_rpem"], [default rootcert location])

-AC_ARG_WITH(username,
-    AS_HELP_STRING([--with-username=user],[set default user that unbound changes to (default user is unbound)]),
-    UNBOUND_USERNAME="$withval",
+AC_ARG_WITH(username, 
+    AS_HELP_STRING([--with-username=user],[set default user that unbound changes to (default user is unbound)]), 
+    UNBOUND_USERNAME="$withval", 
    UNBOUND_USERNAME="unbound")
 AC_SUBST(UNBOUND_USERNAME)
 AC_DEFINE_UNQUOTED(UB_USERNAME, ["$UNBOUND_USERNAME"], [default username])
@@ -275,9 +262,6 @@ AC_DEFINE(WINVER, 0x0502, [the version of the windows API enabled])
 ACX_RSRC_VERSION(wnvs)
 AC_DEFINE_UNQUOTED(RSRC_PACKAGE_VERSION, [$wnvs], [version number for resource files])

-# Check for 'grep -e' program, here, since ACX_CHECK_FLTO needs that.
-AC_PROG_GREP
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_LANG([C])
@@ -288,14 +272,14 @@ ACX_CHECK_COMPILER_FLAG(g, [CFLAGS="$CFLAGS -g"])
 ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="$CFLAGS -O2"])
 default_cflags=yes
 fi
-m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_STDC])
+AC_PROG_CC
 ACX_DEPFLAG
 ACX_DETERMINE_EXT_FLAGS_UNBOUND

 # debug mode flags warnings
 AC_ARG_ENABLE(checking, AS_HELP_STRING([--enable-checking],[Enable warnings, asserts, makefile-dependencies]))
 AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[same as enable-checking]))
-if test "$enable_debug" = "yes"; then debug_enabled="$enable_debug";
+if test "$enable_debug" = "yes"; then debug_enabled="$enable_debug"; 
 else debug_enabled="$enable_checking"; fi
 AC_SUBST(debug_enabled)
 case "$debug_enabled" in
@@ -398,28 +382,18 @@ fi
 if test "$LEX" != "" -a "$LEX" != ":"; then
 ACX_YYLEX_OPTION
 fi
-if test "$LEX" = "" -o "$LEX" = ":"; then
-	if test ! -f util/configlexer.c; then
-		AC_MSG_ERROR([no lex and no util/configlexer.c: need flex and bison to compile from source repository.])
-	fi
-fi
 AC_PROG_YACC
-if test "$YACC" = "" -o "$YACC" = ":"; then
-	if test ! -f util/configparser.c; then
-		AC_MSG_ERROR([no yacc and no util/configparser.c: need flex and bison to compile from source repository.])
-	fi
-fi
 AC_CHECK_PROG(doxygen, doxygen, doxygen)
 AC_CHECK_TOOL(STRIP, strip)
 ACX_LIBTOOL_C_ONLY

 # pkg-config is only needed for these options, do not require it otherwise
-if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then
+if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then
 PKG_PROG_PKG_CONFIG
 fi

 # Checks for header files.
-AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h poll.h],,, [AC_INCLUDES_DEFAULT])
+AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h],,, [AC_INCLUDES_DEFAULT])
 # net/if.h portability for Darwin see:
 # https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Header-Portability.html
 AC_CHECK_HEADERS([net/if.h],,, [
@@ -473,9 +447,6 @@ AC_CHECK_HEADERS([netioapi.h],,, [AC_INCLUDES_DEFAULT
 #endif
 ])

-# Check for Linux timestamping headers
-AC_CHECK_HEADERS([linux/net_tstamp.h],,, [AC_INCLUDES_DEFAULT])
-
 # check for types.  
 # Using own tests for int64* because autoconf builtin only give 32bit.
 AC_CHECK_TYPE(int8_t, signed char)
@@ -534,8 +505,7 @@ res = strptime("2010-07-15T00:00:00+00:00", "%t%Y%t-%t%m%t-%t%d%tT%t%H%t:%t%M%t:
 if (!res) return 2;
 res = strptime("20070207111842", "%Y%m%d%H%M%S", &tm);
 if (!res) return 1; return 0; }
-]])] , [eval "ac_cv_c_strptime_works=yes"], [eval "ac_cv_c_strptime_works=no"],
-[eval "ac_cv_c_strptime_works=maybe"])
+]])] , [eval "ac_cv_c_strptime_works=yes"], [eval "ac_cv_c_strptime_works=no"])
 else
 eval "ac_cv_c_strptime_works=maybe"
 fi
@@ -572,11 +542,11 @@ sinclude(systemd.m4)
 # Include systemd.m4 - end

 # set memory allocation checking if requested
-AC_ARG_ENABLE(alloc-checks, AS_HELP_STRING([--enable-alloc-checks],[ enable to memory allocation statistics, for debug purposes ]),
+AC_ARG_ENABLE(alloc-checks, AS_HELP_STRING([--enable-alloc-checks],[ enable to memory allocation statistics, for debug purposes ]), 
 	, )
-AC_ARG_ENABLE(alloc-lite, AS_HELP_STRING([--enable-alloc-lite],[ enable for lightweight alloc assertions, for debug purposes ]),
+AC_ARG_ENABLE(alloc-lite, AS_HELP_STRING([--enable-alloc-lite],[ enable for lightweight alloc assertions, for debug purposes ]), 
 	, )
-AC_ARG_ENABLE(alloc-nonregional, AS_HELP_STRING([--enable-alloc-nonregional],[ enable nonregional allocs, slow but exposes regional allocations to other memory purifiers, for debug purposes ]),
+AC_ARG_ENABLE(alloc-nonregional, AS_HELP_STRING([--enable-alloc-nonregional],[ enable nonregional allocs, slow but exposes regional allocations to other memory purifiers, for debug purposes ]), 
 	, )
 if test x_$enable_alloc_nonregional = x_yes; then
 	AC_DEFINE(UNBOUND_ALLOC_NONREGIONAL, 1, [use malloc not regions, for debug use])
@@ -609,7 +579,7 @@ if test "$on_mingw" = "yes"; then
 ])],
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_WINDOWS_THREADS, 1, [Using Windows threads])
-,
+,	
 	AC_MSG_RESULT(no)
 )

@@ -620,7 +590,7 @@ else
 # check this first, so that the pthread lib does not get linked in via
 # libssl or libpython, and thus distorts the tests, and we end up using
 # the non-threadsafe C libraries.
-AC_ARG_WITH(pthreads, AS_HELP_STRING([--with-pthreads],[use pthreads library, or --without-pthreads to disable threading support.]),
+AC_ARG_WITH(pthreads, AS_HELP_STRING([--with-pthreads],[use pthreads library, or --without-pthreads to disable threading support.]), 
 [ ],[ withval="yes" ])
 ub_have_pthreads=no
 if test x_$withval != x_no; then
@@ -633,8 +603,6 @@ if test x_$withval != x_no; then
 		CC="$PTHREAD_CC"
 		ub_have_pthreads=yes
 		AC_CHECK_TYPES([pthread_spinlock_t, pthread_rwlock_t],,,[#include <pthread.h>])
-		AC_CHECK_SIZEOF([unsigned long])
-		AC_CHECK_SIZEOF(pthread_t)

 		if echo "$CFLAGS" | $GREP -e "-pthread" >/dev/null; then
 		AC_MSG_CHECKING([if -pthread unused during linking])
@@ -647,7 +615,7 @@ int main(void) {return 0;}
 		# first compile
 		echo "$CC $CFLAGS -c conftest.c -o conftest.o" >&AS_MESSAGE_LOG_FD
 		$CC $CFLAGS -c conftest.c -o conftest.o 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
-		if test $? = 0; then
+		if test $? = 0; then 
 			# then link
 			echo "$CC $CFLAGS -Werror $LDFLAGS $LIBS -o conftest contest.o" >&AS_MESSAGE_LOG_FD
 			$CC $CFLAGS -Werror $LDFLAGS $LIBS -o conftest conftest.o 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
@@ -668,7 +636,7 @@ int main(void) {return 0;}
 		])
 fi

-# check solaris thread library
+# check solaris thread library 
 AC_ARG_WITH(solaris-threads, AS_HELP_STRING([--with-solaris-threads],[use solaris native thread library.]), [ ],[ withval="no" ])
 ub_have_sol_threads=no
 if test x_$withval != x_no; then
@@ -682,8 +650,8 @@ if test x_$withval != x_no; then
 		ACX_CHECK_COMPILER_FLAG(mt, [CFLAGS="$CFLAGS -mt"],
 			[CFLAGS="$CFLAGS -D_REENTRANT"])
 		ub_have_sol_threads=yes
-	] , [
-		AC_MSG_ERROR([no solaris threads found.])
+	] , [ 
+		AC_MSG_ERROR([no solaris threads found.]) 
 	])
 	fi
 fi
@@ -758,14 +726,7 @@ if test x_$ub_test_python != x_no; then
   ac_save_LIBS="$LIBS" dnl otherwise AC_PYTHON_DEVEL thrashes $LIBS
   AC_PYTHON_DEVEL
   if test ! -z "$PYTHON_VERSION"; then
-	badversion="no"
-	if test "$PYTHON_VERSION_MAJOR" -lt 2; then
-		badversion="yes"
-	fi
-	if test "$PYTHON_VERSION_MAJOR" -eq 2 -a "$PYTHON_VERSION_MINOR" -lt 4; then
-		badversion="yes"
-	fi
-	if test "$badversion" = "yes"; then
+	if test `$PYTHON -c "print('$PYTHON_VERSION' >= '2.4.0')"` = "False"; then
 		AC_MSG_ERROR([Python version >= 2.4.0 is required])
 	fi

@@ -800,9 +761,9 @@ if test x_$ub_test_python != x_no; then
      ub_have_swig=no
      AC_ARG_ENABLE(swig-version-check, AS_HELP_STRING([--disable-swig-version-check],[Disable swig version check to build python modules with older swig even though that is unreliable]))
      if test "$enable_swig_version_check" = "yes"; then
-      	AX_PKG_SWIG(2.0.1)
+      	AC_PROG_SWIG(2.0.1)
      else
-      	AX_PKG_SWIG
+      	AC_PROG_SWIG
      fi
      AC_MSG_CHECKING(SWIG)
      if test ! -x "$SWIG"; then
@@ -855,7 +816,7 @@ if test "`uname`" = "NetBSD"; then
 	AC_SUBST(NETBSD_LINTFLAGS)
 fi

-if test "`uname`" = "Linux"; then
+if test "`uname -o`" = "GNU/Linux"; then
 	# splint cannot parse modern c99 header files
 	GCC_DOCKER_LINTFLAGS='-syntax'
 	AC_SUBST(GCC_DOCKER_LINTFLAGS)
@@ -944,7 +905,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])
+AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode 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"
@@ -1116,7 +1077,7 @@ int load_gost_id(void)
 	EVP_PKEY_asn1_get0_info(&gost_id, NULL, NULL, NULL, NULL, meth);
 	return gost_id;
 }
-int main(void) {
+int main(void) { 
 	EVP_MD_CTX* ctx;
 	const EVP_MD* md;
 	unsigned char digest[64]; /* its a 256-bit digest, so uses 32 bytes */
@@ -1147,8 +1108,7 @@ int main(void) {
 		return 6;
 	return 0;
 }
-]])] , [eval "ac_cv_c_gost_works=yes"], [eval "ac_cv_c_gost_works=no"],
-[eval "ac_cv_c_gost_works=maybe"])
+]])] , [eval "ac_cv_c_gost_works=yes"], [eval "ac_cv_c_gost_works=no"])
 CFLAGS="$BAKCFLAGS"
 else
 eval "ac_cv_c_gost_works=maybe"
@@ -1533,17 +1493,13 @@ if test x_$enable_static_exe = x_yes; then
 	if test "$on_mingw" = yes; then
 		staticexe="-all-static"
 		# for static compile, include gdi32 and zlib here.
-		if echo "$LIBS" | grep 'lgdi32' >/dev/null; then
+		if echo $LIBS | grep 'lgdi32' >/dev/null; then
 			:
 		else
 			LIBS="$LIBS -lgdi32"
 		fi
-		AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
-		if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
-			:
-		else
-			LIBS="$LIBS -l:libssp.a"
-		fi
+		LIBS="$LIBS -lz"
+		LIBS="$LIBS -l:libssp.a"
 	fi
 fi

@@ -1559,17 +1515,13 @@ if test x_$enable_fully_static = x_yes; then
 		else
 			LIBS="$LIBS -lgdi32"
 		fi
-		AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
-		if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then
-			:
-		else
-			LIBS="$LIBS -l:libssp.a"
-		fi
+		LIBS="$LIBS -lz"
+		LIBS="$LIBS -l:libssp.a"
 	fi
 fi

 # set lock checking if requested
-AC_ARG_ENABLE(lock_checks, AS_HELP_STRING([--enable-lock-checks],[ enable to check lock and unlock calls, for debug purposes ]),
+AC_ARG_ENABLE(lock_checks, AS_HELP_STRING([--enable-lock-checks],[ enable to check lock and unlock calls, for debug purposes ]), 
 	, )
 if test x_$enable_lock_checks = x_yes; then
 	AC_DEFINE(ENABLE_LOCK_CHECKS, 1, [Define if you want to use debug lock checking (slow).])
@@ -1584,11 +1536,7 @@ if test "$USE_WINSOCK" = 1; then
 #include <windows.h>
 	])
 	AC_CHECK_TOOL(WINDRES, windres)
-	if echo "$LIBS" | grep crypt32 >/dev/null; then
-		LIBS="$LIBS -liphlpapi"
-	else
-		LIBS="$LIBS -liphlpapi -lcrypt32"
-	fi
+	LIBS="$LIBS -liphlpapi -lcrypt32"
 	WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe"
 	AC_SUBST(WINAPPS)
 	WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c"
@@ -1605,7 +1553,6 @@ if test "$USE_WINSOCK" = 1; then
 	AC_SUBST(WIN_CONTROL_OBJ_LINK)
 	WIN_CHECKCONF_OBJ_LINK="rsrc_unbound_checkconf.o"
 	AC_SUBST(WIN_CHECKCONF_OBJ_LINK)
-	AC_DEFINE(__USE_MINGW_ANSI_STDIO, 1, [defined to use gcc ansi snprintf and sscanf that understands %lld when compiled for windows.])
 fi
 if test $ac_cv_func_getaddrinfo = no; then
 	AC_LIBOBJ([fake-rfc2553])
@@ -1692,7 +1639,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([
  AC_MSG_RESULT(no))

 AC_SEARCH_LIBS([setusercontext], [util])
-AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4 getifaddrs if_nametoindex poll gettid])
+AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget accept4 getifaddrs if_nametoindex])
 AC_CHECK_FUNCS([setresuid],,[AC_CHECK_FUNCS([setreuid])])
 AC_CHECK_FUNCS([setresgid],,[AC_CHECK_FUNCS([setregid])])

@@ -1737,7 +1684,7 @@ int main(void) { return !(snprintf(NULL, 0, "test") == 4); }
 		AC_MSG_RESULT(no)
 		AC_DEFINE([SNPRINTF_RET_BROKEN], [], [define if (v)snprintf does not return length needed, (but length used)])
 		AC_LIBOBJ(snprintf)
-	  ], [AC_MSG_RESULT(maybe)])
+	  ])
    fi
 fi
 AC_REPLACE_FUNCS(strlcat)
@@ -1931,17 +1878,11 @@ case "$enable_ipset" in
 			withval="/usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr"
 		fi
 		for dir in $withval ; do
-			if test -f "$dir/include/libmnl/libmnl.h" -o -f "$dir/include/libmnl/libmnl/libmnl.h"; then
+			if test -f "$dir/include/libmnl/libmnl.h"; then
 				found_libmnl="yes"
 				dnl assume /usr is in default path.
-				extralibmnl=""
-				if test -f "$dir/include/libmnl/libmnl/libmnl.h"; then
-					extralibmnl="/libmnl"
-				fi
-				if test "$dir" != "/usr" -o -n "$extralibmnl"; then
-					CPPFLAGS="$CPPFLAGS -I$dir/include$extralibmnl"
-				fi
 				if test "$dir" != "/usr"; then
+					CPPFLAGS="$CPPFLAGS -I$dir/include"
 					LDFLAGS="$LDFLAGS -L$dir/lib"
 				fi
 				AC_MSG_RESULT(found in $dir)
@@ -1967,7 +1908,7 @@ case "$enable_explicit_port_randomisation" in
 esac

 if echo "$host" | $GREP -i -e linux >/dev/null; then
-	AC_ARG_ENABLE(linux-ip-local-port-range, AS_HELP_STRING([--enable-linux-ip-local-port-range], [Define this to enable use of /proc/sys/net/ipv4/ip_local_port_range as a default outgoing port range. This is only for the libunbound on Linux and does not affect unbound resolving daemon itself. This may severely limit the number of available outgoing ports and thus decrease randomness. Define this only when the target system restricts (e.g. some of SELinux enabled distributions) the use of non-ephemeral ports.]))
+	AC_ARG_ENABLE(linux-ip-local-port-range, AC_HELP_STRING([--enable-linux-ip-local-port-range], [Define this to enable use of /proc/sys/net/ipv4/ip_local_port_range as a default outgoing port range. This is only for the libunbound on Linux and does not affect unbound resolving daemon itself. This may severely limit the number of available outgoing ports and thus decrease randomness. Define this only when the target system restricts (e.g. some of SELinux enabled distributions) the use of non-ephemeral ports.]))
 	case "$enable_linux_ip_local_port_range" in
 		yes)
 			AC_DEFINE([USE_LINUX_IP_LOCAL_PORT_RANGE], [1], [Define this to enable use of /proc/sys/net/ipv4/ip_local_port_range as a default outgoing port range. This is only for the libunbound on Linux and does not affect unbound resolving daemon itself. This may severely limit the number of available outgoing ports and thus decrease randomness. Define this only when the target system restricts (e.g. some of SELinux enabled distributions) the use of non-ephemeral ports.])
@@ -2024,11 +1965,11 @@ AC_ARG_WITH(libunbound-only, AS_HELP_STRING([--with-libunbound-only],[do not bui
 	fi
 ])
 if test $ALLTARGET = "alltargets"; then
-	if test $USE_NSS = "yes"; then
-		AC_MSG_ERROR([--with-nss can only be used in combination with --with-libunbound-only.])
+	if test $USE_NSS = "yes"; then 
+		AC_MSG_ERROR([--with-nss can only be used in combination with --with-libunbound-only.])	
 	fi
 	if test $USE_NETTLE = "yes"; then
-		AC_MSG_ERROR([--with-nettle can only be used in combination with --with-libunbound-only.])
+		AC_MSG_ERROR([--with-nettle can only be used in combination with --with-libunbound-only.])	
 	fi
 fi

@@ -2039,7 +1980,7 @@ ACX_STRIP_EXT_FLAGS
 if test -n "$LATE_LDFLAGS"; then
  LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
 fi
-# remove start spaces
+# remove start spaces 
 LDFLAGS=`echo "$LDFLAGS"|sed -e 's/^ *//'`
 LIBS=`echo "$LIBS"|sed -e 's/^ *//'`

@@ -2119,7 +2060,7 @@ dnl includes
 #include <ws2tcpip.h>
 #endif

-#if !defined(USE_WINSOCK) || !defined(HAVE_SNPRINTF) || defined(SNPRINTF_RET_BROKEN) || defined(__USE_MINGW_ANSI_STDIO)
+#ifndef USE_WINSOCK
 #define ARG_LL "%ll"
 #else
 #define ARG_LL "%I64"
@@ -1,8 +1,10 @@
 FROM gcc:latest
 WORKDIR /usr/src/unbound
+RUN apt-get update
 # install semantic parser & lexical analyzer
+RUN apt-get install -y bison flex
 # install packages used in tests
-RUN apt-get update && apt-get install -y bison flex ldnsutils dnsutils xxd splint doxygen netcat-openbsd
+RUN apt-get install -y ldnsutils dnsutils xxd splint doxygen netcat
 # accept short rsa keys, which are used in tests
 RUN sed -i 's/SECLEVEL=2/SECLEVEL=1/g' /usr/lib/ssl/openssl.cnf

@@ -55,6 +55,3 @@ distribution but may be helpful.
  contributed by Andreas Schulze.
 * metrics.awk: awk script that can convert unbound-control stats to
  Prometheus metrics format output.
-* unbound.init_yocto: An init script to start and stop the server. Put it
-  in /etc/init.d/unbound to use it. It is for the Yocto Project, in
-  embedded systems, contributed by beni-sandu.
@@ -1,5 +1,5 @@
 diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
-index 5a75e319..c6c6dbe2 100644
+index 50f9224..09456f5 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
@@ -17,14 +17,13 @@ index 5a75e319..c6c6dbe2 100644
 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 f093c1b..e55a224 100644
 --- a/iterator/iter_scrub.c
 +++ b/iterator/iter_scrub.c
-@@ -679,6 +679,32 @@ static int sanitize_nsec_is_overreach(sldns_buffer* pkt,
- 	return 0;
+@@ -680,6 +680,32 @@ static int sanitize_nsec_is_overreach(sldns_buffer* pkt,
 }
 
-+/**
+ /**
 + * ASN: Lookup A records from rrset cache.
 + * @param qinfo: the question originally asked.
 + * @param env: module environment with config and cache.
@@ -50,9 +49,10 @@ index f093c1bf..e55a2246 100644
 +	return 0;
 +}
 +
- /**
+/**
  * Given a response event, remove suspect RRsets from the response.
  * "Suspect" rrsets are potentially poison. Note that this routine expects
+  * the response to be in a "normalized" state -- that is, all "irrelevant"
@@ -698,6 +724,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)
@@ -101,22 +101,22 @@ 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 2482a1f..bd5ba24 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)
+ 	iter_env->supports_ipv6 = cfg->do_ip6;
+ 	iter_env->supports_ipv4 = cfg->do_ip4;
 	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;
 +	iter_env->aaaa_filter = cfg->aaaa_filter;
 	return 1;
 }
 
 diff --git a/iterator/iterator.c b/iterator/iterator.c
-index 54006940..768fe202 100644
+index 48238a2..34ba249 100644
 --- a/iterator/iterator.c
 +++ b/iterator/iterator.c
-@@ -2155,6 +2155,53 @@ processDSNSFind(struct module_qstate* qstate, struct iter_qstate* iq, int id)
+@@ -2184,6 +2184,53 @@ processDSNSFind(struct module_qstate* qstate, struct iter_qstate* iq, int id)
 
 	return 0;
 }
@@ -170,7 +170,7 @@ 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,
+@@ -2243,6 +2290,13 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 		return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
 	}
 	
@@ -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,
+@@ -3688,6 +3742,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,
+@@ -3707,6 +3816,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,
+@@ -3744,6 +3856,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)
+@@ -4080,6 +4195,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)
+@@ -4104,6 +4221,7 @@ iter_state_is_responsestate(enum iter_state s)
 		case INIT_REQUEST_STATE :
 		case INIT_REQUEST_2_STATE :
 		case INIT_REQUEST_3_STATE :
@@ -284,7 +284,7 @@ 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 a9e5856..ace68c6 100644
 --- a/iterator/iterator.h
 +++ b/iterator/iterator.h
@@ -133,6 +133,9 @@ struct iter_env {
@@ -297,11 +297,10 @@ 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 {
- 	 */
+@@ -188,6 +191,14 @@ enum iter_state {
 	INIT_REQUEST_3_STATE,
 
-+	/**
+ 	/**
 +	 * This state is responsible for intercepting AAAA queries,
 +	 * and launch a A subquery on the same target, to populate the
 +	 * cache with A records, so the AAAA filter scrubbing logic can
@@ -309,9 +308,10 @@ index 8b840528..a61c4195 100644
 +	 */
 +	ASN_FETCH_A_FOR_AAAA_STATE,
 +
- 	/**
+	/**
 	 * Each time a delegation point changes for a given query or a 
 	 * query times out and/or wakes up, this state is (re)visited. 
+ 	 * This state is responsible for iterating through a list of 
@@ -376,6 +387,13 @@ struct iter_qstate {
 	 */
 	int refetch_glue;
@@ -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 03483ab..a8c30b5 100644
 --- a/pythonmod/interface.i
 +++ b/pythonmod/interface.i
-@@ -995,6 +995,7 @@ struct config_file {
+@@ -994,6 +994,7 @@ struct config_file {
    int harden_dnssec_stripped;
    int harden_referral_path;
    int use_caps_bits_for_id;
@@ -339,7 +339,7 @@ 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 39050f5..326b0b9 100644
 --- a/util/config_file.c
 +++ b/util/config_file.c
@@ -231,6 +231,7 @@ config_create(void)
@@ -351,7 +351,7 @@ index 969d664b..8d94b008 100644
 	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 18910be..bd59144 100644
 --- a/util/config_file.h
 +++ b/util/config_file.h
@@ -285,6 +285,8 @@ struct config_file {
@@ -364,7 +364,7 @@ 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 71da924..b58b4b6 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) }
@@ -376,7 +376,7 @@ 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 1daf853..cd39618 100644
 --- a/util/configparser.y
 +++ b/util/configparser.y
@@ -97,6 +97,7 @@ extern struct config_parser_state* cfg_parser;
@@ -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 |
+@@ -245,6 +246,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
+@@ -1742,6 +1744,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG
 			yyerror("out of memory");
 	}
 	;
@@ -28,7 +28,6 @@ END {
 	print "unbound_hits_queries{type=\"total.num.prefetch\"} " val["total.num.prefetch"];
 	print "unbound_hits_queries{type=\"num.query.tcp\"} " val["num.query.tcp"];
 	print "unbound_hits_queries{type=\"num.query.tcpout\"} " val["num.query.tcpout"];
-	print "unbound_hits_queries{type=\"num.query.udpout\"} " val["num.query.udpout"];
 	print "unbound_hits_queries{type=\"num.query.tls\"} " val["num.query.tls"];
 	print "unbound_hits_queries{type=\"num.query.tls.resume\"} " val["num.query.tls.resume"];
 	print "unbound_hits_queries{type=\"num.query.ipv6\"} " val["num.query.ipv6"];
@@ -22,13 +22,4 @@ pidfile=${unbound_pidfile:-"/usr/local/etc/unbound/unbound.pid"}
 command_args=${unbound_flags:-"-c /usr/local/etc/unbound/unbound.conf"}
 extra_commands="reload"

-if test "$1" = "stop" ; then
-	run_rc_command "$1"
-	ret=$?
-	if test $ret -eq 0; then
-		rm -f "$pidfile"
-	fi
-	exit $ret
-fi
-
 run_rc_command "$1"
@@ -75,7 +75,6 @@ stop() {
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
-    [ $retval -eq 0 ] && rm -f $pidfile
    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
 	umount ${rootdir}/dev/log >/dev/null 2>&1
    fi;
@@ -58,7 +58,6 @@ stop() {
    killproc -p $pidfile unbound
    retval=$?
    [ $retval -eq 0 ] && rm -f $lockfile
-    [ $retval -eq 0 ] && rm -f $pidfile
    for mountfile in /dev/log /dev/urandom /etc/localtime /etc/resolv.conf /var/run/unbound
    do
    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}''${mountfile}'' /proc/mounts; then
@@ -1,140 +0,0 @@
-#!/bin/sh
-#
-# unbound	This shell script takes care of starting and stopping
-#		unbound (DNS server).
-#
-# chkconfig:   - 14 86
-# description:	unbound is a Domain Name Server (DNS) \
-#		that is used to resolve host names to IP addresses.
-
-### BEGIN INIT INFO
-# Provides: $named unbound
-# Required-Start: $network $local_fs
-# Required-Stop: $network $local_fs
-# Should-Start: $syslog
-# Should-Stop: $syslog
-# Short-Description: unbound recursive Domain Name Server.
-# Description:  unbound is a Domain Name Server (DNS) 
-#		that is used to resolve host names to IP addresses.
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-exec="/usr/sbin/unbound"
-prog="unbound"
-config="/etc/unbound/unbound.conf"
-pidfile="/var/unbound/unbound.pid"
-rootdir="/var/unbound"
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-lockfile=/var/lock/subsys/$prog
-
-start() {
-    [ -x $exec ] || exit 5
-    [ -f $config ] || exit 6
-    echo -n $"Starting $prog: "
-
-    # setup root jail
-    if [ -s /etc/localtime ]; then 
-	[ -d ${rootdir}/etc ] || mkdir -p ${rootdir}/etc ;
-	if [ ! -e ${rootdir}/etc/localtime ] || ! /usr/bin/cmp -s /etc/localtime ${rootdir}/etc/localtime; then
-	    cp -fp /etc/localtime ${rootdir}/etc/localtime
-	fi;
-    fi;
-    if [ -s /etc/resolv.conf ]; then
-	[ -d ${rootdir}/etc ] || mkdir -p ${rootdir}/etc ;
-	if [ ! -e ${rootdir}/etc/resolv.conf ] || ! /usr/bin/cmp -s /etc/resolv.conf ${rootdir}/etc/resolv.conf; then
-	    cp -fp /etc/resolv.conf ${rootdir}/etc/resolv.conf
-	fi;
-    fi;
-    if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
-	[ -d ${rootdir}/dev ] || mkdir -p ${rootdir}/dev ;
-	[ -e ${rootdir}/dev/log ] || touch ${rootdir}/dev/log
-	mount --bind -n /dev/log ${rootdir}/dev/log >/dev/null 2>&1;
-    fi;
-    if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then
-	[ -d ${rootdir}/dev ] || mkdir -p ${rootdir}/dev ;
-	[ -e ${rootdir}/dev/random ] || touch ${rootdir}/dev/random
-	mount --bind -n /dev/random ${rootdir}/dev/random >/dev/null 2>&1;
-    fi;
-
-    # if not running, start it up here
-    daemonize $exec
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && touch $lockfile
-    return $retval
-}
-
-stop() {
-    echo -n $"Stopping $prog: "
-    # stop it here, often "killproc $prog"
-    killproc $prog
-    retval=$?
-    echo
-    [ $retval -eq 0 ] && rm -f $lockfile
-    [ $retval -eq 0 ] && rm -f $pidfile
-    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
-	umount ${rootdir}/dev/log >/dev/null 2>&1
-    fi;
-    if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/random' /proc/mounts; then
-	umount ${rootdir}/dev/random >/dev/null 2>&1
-    fi;
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    kill -HUP `cat $pidfile`
-}
-
-force_reload() {
-    restart
-}
-
-rh_status() {
-    # run checks to determine if the service is running or use generic status
-    status $prog
-}
-
-rh_status_q() {
-    rh_status -p $pidfile >/dev/null 2>&1
-}
-
-case "$1" in
-    start)
-        rh_status_q && exit 0
-        $1
-        ;;
-    stop)
-        rh_status_q || exit 0
-        $1
-        ;;
-    restart)
-        $1
-        ;;
-    reload)
-        rh_status_q || exit 7
-        $1
-        ;;
-    force-reload)
-        force_reload
-        ;;
-    status)
-        rh_status
-        ;;
-    condrestart|try-restart)
-        rh_status_q || exit 0
-        restart
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-        exit 2
-esac
-exit $?
@@ -42,8 +42,9 @@
 [Unit]
 Description=Validating, recursive, and caching DNS resolver
 Documentation=man:unbound(8)
-After=network.target
-Before=network-online.target nss-lookup.target
+After=network-online.target
+Before=nss-lookup.target
+Wants=network-online.target nss-lookup.target

 [Install]
 WantedBy=multi-user.target
@@ -253,7 +253,6 @@ if test "$1" = "config" ; then
 		p_config "total.num.prefetch" "cache prefetch" "ABSOLUTE"
 		p_config "num.query.tcp" "TCP queries" "ABSOLUTE"
 		p_config "num.query.tcpout" "TCP out queries" "ABSOLUTE"
-		p_config "num.query.udpout" "UDP out queries" "ABSOLUTE"
 		p_config "num.query.tls" "TLS queries" "ABSOLUTE"
 		p_config "num.query.tls.resume" "TLS resumes" "ABSOLUTE"
 		p_config "num.query.ipv6" "IPv6 queries" "ABSOLUTE"
@@ -453,7 +452,7 @@ hits)
 	for x in `grep "^thread[0-9][0-9]*\.num\.queries=" $state |
 		sed -e 's/=.*//'` total.num.queries \
 		total.num.cachehits total.num.prefetch num.query.tcp \
-		num.query.tcpout num.query.udpout num.query.tls num.query.tls.resume \
+		num.query.tcpout num.query.tls num.query.tls.resume \
 		num.query.ipv6 unwanted.queries \
 		unwanted.replies; do
 		if grep "^"$x"=" $state >/dev/null 2>&1; then
@@ -46,10 +46,9 @@
 #include "util/config_file.h"
 #include "util/net_help.h"
 #include "services/localzone.h"
-#include "services/listen_dnsport.h"
 #include "sldns/str2wire.h"

-struct acl_list*
+struct acl_list* 
 acl_list_create(void)
 {
 	struct acl_list* acl = (struct acl_list*)calloc(1,
@@ -64,10 +63,10 @@ acl_list_create(void)
 	return acl;
 }

-void
+void 
 acl_list_delete(struct acl_list* acl)
 {
-	if(!acl)
+	if(!acl) 
 		return;
 	regional_destroy(acl->region);
 	free(acl);
@@ -75,8 +74,8 @@ acl_list_delete(struct acl_list* acl)

 /** insert new address into acl_list structure */
 static struct acl_addr*
-acl_list_insert(struct acl_list* acl, struct sockaddr_storage* addr,
-	socklen_t addrlen, int net, enum acl_access control,
+acl_list_insert(struct acl_list* acl, struct sockaddr_storage* addr, 
+	socklen_t addrlen, int net, enum acl_access control, 
 	int complain_duplicates)
 {
 	struct acl_addr* node = regional_alloc_zero(acl->region,
@@ -91,33 +90,6 @@ acl_list_insert(struct acl_list* acl, struct sockaddr_storage* addr,
 	return node;
 }

-/** parse str to acl_access enum */
-static int
-parse_acl_access(const char* str, enum acl_access* control)
-{
-	if(strcmp(str, "allow") == 0)
-		*control = acl_allow;
-	else if(strcmp(str, "deny") == 0)
-		*control = acl_deny;
-	else if(strcmp(str, "refuse") == 0)
-		*control = acl_refuse;
-	else if(strcmp(str, "deny_non_local") == 0)
-		*control = acl_deny_non_local;
-	else if(strcmp(str, "refuse_non_local") == 0)
-		*control = acl_refuse_non_local;
-	else if(strcmp(str, "allow_snoop") == 0)
-		*control = acl_allow_snoop;
-	else if(strcmp(str, "allow_setrd") == 0)
-		*control = acl_allow_setrd;
-	else if (strcmp(str, "allow_cookie") == 0)
-		*control = acl_allow_cookie;
-	else {
-		log_err("access control type %s unknown", str);
-		return 0;
-	}
-	return 1;
-}
-
 /** apply acl_list string */
 static int
 acl_list_str_cfg(struct acl_list* acl, const char* str, const char* s2,
@@ -127,14 +99,29 @@ acl_list_str_cfg(struct acl_list* acl, const char* str, const char* s2,
 	int net;
 	socklen_t addrlen;
 	enum acl_access control;
-	if(!parse_acl_access(s2, &control)) {
+	if(strcmp(s2, "allow") == 0)
+		control = acl_allow;
+	else if(strcmp(s2, "deny") == 0)
+		control = acl_deny;
+	else if(strcmp(s2, "refuse") == 0)
+		control = acl_refuse;
+	else if(strcmp(s2, "deny_non_local") == 0)
+		control = acl_deny_non_local;
+	else if(strcmp(s2, "refuse_non_local") == 0)
+		control = acl_refuse_non_local;
+	else if(strcmp(s2, "allow_snoop") == 0)
+		control = acl_allow_snoop;
+	else if(strcmp(s2, "allow_setrd") == 0)
+		control = acl_allow_setrd;
+	else {
+		log_err("access control type %s unknown", str);
 		return 0;
 	}
 	if(!netblockstrtoaddr(str, UNBOUND_DNS_PORT, &addr, &addrlen, &net)) {
 		log_err("cannot parse access control: %s %s", str, s2);
 		return 0;
 	}
-	if(!acl_list_insert(acl, &addr, addrlen, net, control,
+	if(!acl_list_insert(acl, &addr, addrlen, net, control, 
 		complain_duplicates)) {
 		log_err("out of memory");
 		return 0;
@@ -144,27 +131,19 @@ acl_list_str_cfg(struct acl_list* acl, const char* str, const char* s2,

 /** find or create node (NULL on parse or error) */
 static struct acl_addr*
-acl_find_or_create_str2addr(struct acl_list* acl, const char* str,
-	int is_interface, int port)
+acl_find_or_create(struct acl_list* acl, const char* str)
 {
 	struct acl_addr* node;
 	struct sockaddr_storage addr;
+	int net;
 	socklen_t addrlen;
-	int net = (str_is_ip6(str)?128:32);
-	if(is_interface) {
-		if(!extstrtoaddr(str, &addr, &addrlen, port)) {
-			log_err("cannot parse interface: %s", str);
-			return NULL;
-		}
-	} else {
-		if(!netblockstrtoaddr(str, UNBOUND_DNS_PORT, &addr, &addrlen, &net)) {
-			log_err("cannot parse netblock: %s", str);
-			return NULL;
-		}
+	if(!netblockstrtoaddr(str, UNBOUND_DNS_PORT, &addr, &addrlen, &net)) {
+		log_err("cannot parse netblock: %s", str);
+		return NULL;
 	}
 	/* find or create node */
 	if(!(node=(struct acl_addr*)addr_tree_find(&acl->tree, &addr,
-		addrlen, net)) && !is_interface) {
+		addrlen, net))) {
 		/* create node, type 'allow' since otherwise tags are
 		 * pointless, can override with specific access-control: cfg */
 		if(!(node=(struct acl_addr*)acl_list_insert(acl, &addr,
@@ -176,65 +155,14 @@ acl_find_or_create_str2addr(struct acl_list* acl, const char* str,
 	return node;
 }

-/** find or create node (NULL on error) */
-static struct acl_addr*
-acl_find_or_create(struct acl_list* acl, struct sockaddr_storage* addr,
-	socklen_t addrlen, enum acl_access control)
-{
-	struct acl_addr* node;
-	int net = (addr_is_ip6(addr, addrlen)?128:32);
-	/* find or create node */
-	if(!(node=(struct acl_addr*)addr_tree_find(&acl->tree, addr,
-		addrlen, net))) {
-		/* create node;
-		 * can override with specific access-control: cfg */
-		if(!(node=(struct acl_addr*)acl_list_insert(acl, addr,
-			addrlen, net, control, 1))) {
-			log_err("out of memory");
-			return NULL;
-		}
-	}
-	return node;
-}
-
-/** apply acl_interface string */
-static int
-acl_interface_str_cfg(struct acl_list* acl_interface, const char* iface,
-	const char* s2, int port)
-{
-	struct acl_addr* node;
-	enum acl_access control;
-	if(!parse_acl_access(s2, &control)) {
-		return 0;
-	}
-	if(!(node=acl_find_or_create_str2addr(acl_interface, iface, 1, port))) {
-		log_err("cannot update ACL on non-configured interface: %s %d",
-			iface, port);
-		return 0;
-	}
-	node->control = control;
-	return 1;
-}
-
-struct acl_addr*
-acl_interface_insert(struct acl_list* acl_interface,
-	struct sockaddr_storage* addr, socklen_t addrlen,
-	enum acl_access control)
-{
-	return acl_find_or_create(acl_interface, addr, addrlen, control);
-}
-
 /** apply acl_tag string */
 static int
 acl_list_tags_cfg(struct acl_list* acl, const char* str, uint8_t* bitmap,
-	size_t bitmaplen, int is_interface, int port)
+	size_t bitmaplen)
 {
 	struct acl_addr* node;
-	if(!(node=acl_find_or_create_str2addr(acl, str, is_interface, port))) {
-		if(is_interface)
-			log_err("non-configured interface: %s", str);
+	if(!(node=acl_find_or_create(acl, str)))
 		return 0;
-	}
 	node->taglen = bitmaplen;
 	node->taglist = regional_alloc_init(acl->region, bitmap, bitmaplen);
 	if(!node->taglist) {
@@ -247,14 +175,11 @@ acl_list_tags_cfg(struct acl_list* acl, const char* str, uint8_t* bitmap,
 /** apply acl_view string */
 static int
 acl_list_view_cfg(struct acl_list* acl, const char* str, const char* str2,
-	struct views* vs, int is_interface, int port)
+	struct views* vs)
 {
 	struct acl_addr* node;
-	if(!(node=acl_find_or_create_str2addr(acl, str, is_interface, port))) {
-		if(is_interface)
-			log_err("non-configured interface: %s", str);
+	if(!(node=acl_find_or_create(acl, str)))
 		return 0;
-	}
 	node->view = views_find_view(vs, str2, 0 /* get read lock*/);
 	if(!node->view) {
 		log_err("no view with name: %s", str2);
@@ -267,17 +192,13 @@ acl_list_view_cfg(struct acl_list* acl, const char* str, const char* str2,
 /** apply acl_tag_action string */
 static int
 acl_list_tag_action_cfg(struct acl_list* acl, struct config_file* cfg,
-	const char* str, const char* tag, const char* action,
-	int is_interface, int port)
+	const char* str, const char* tag, const char* action)
 {
 	struct acl_addr* node;
 	int tagid;
 	enum localzone_type t;
-	if(!(node=acl_find_or_create_str2addr(acl, str, is_interface, port))) {
-		if(is_interface)
-			log_err("non-configured interface: %s", str);
+	if(!(node=acl_find_or_create(acl, str)))
 		return 0;
-	}
 	/* allocate array if not yet */
 	if(!node->tag_actions) {
 		node->tag_actions = (uint8_t*)regional_alloc_zero(acl->region,
@@ -360,17 +281,13 @@ check_data(const char* data, const struct config_strlist* head)
 /** apply acl_tag_data string */
 static int
 acl_list_tag_data_cfg(struct acl_list* acl, struct config_file* cfg,
-	const char* str, const char* tag, const char* data,
-	int is_interface, int port)
+	const char* str, const char* tag, const char* data)
 {
 	struct acl_addr* node;
 	int tagid;
 	char* dupdata;
-	if(!(node=acl_find_or_create_str2addr(acl, str, is_interface, port))) {
-		if(is_interface)
-			log_err("non-configured interface: %s", str);
+	if(!(node=acl_find_or_create(acl, str)))
 		return 0;
-	}
 	/* allocate array if not yet */
 	if(!node->tag_datas) {
 		node->tag_datas = (struct config_strlist**)regional_alloc_zero(
@@ -412,11 +329,11 @@ acl_list_tag_data_cfg(struct acl_list* acl, struct config_file* cfg,
 }

 /** read acl_list config */
-static int
-read_acl_list(struct acl_list* acl, struct config_str2list* acls)
+static int 
+read_acl_list(struct acl_list* acl, struct config_file* cfg)
 {
 	struct config_str2list* p;
-	for(p = acls; p; p = p->next) {
+	for(p = cfg->acls; p; p = p->next) {
 		log_assert(p->str && p->str2);
 		if(!acl_list_str_cfg(acl, p->str, p->str2, 1))
 			return 0;
@@ -424,38 +341,15 @@ read_acl_list(struct acl_list* acl, struct config_str2list* acls)
 	return 1;
 }

-/** read acl view config */
-static int
-read_acl_view(struct acl_list* acl, struct config_str2list** acl_view,
-	struct views* v)
-{
-	struct config_str2list* np, *p = *acl_view;
-	*acl_view = NULL;
-	while(p) {
-		log_assert(p->str && p->str2);
-		if(!acl_list_view_cfg(acl, p->str, p->str2, v, 0, 0)) {
-			config_deldblstrlist(p);
-			return 0;
-		}
-		/* free the items as we go to free up memory */
-		np = p->next;
-		free(p->str);
-		free(p->str2);
-		free(p);
-		p = np;
-	}
-	return 1;
-}
-
 /** read acl tags config */
-static int
-read_acl_tags(struct acl_list* acl, struct config_strbytelist** acl_tags)
+static int 
+read_acl_tags(struct acl_list* acl, struct config_file* cfg)
 {
-	struct config_strbytelist* np, *p = *acl_tags;
-	*acl_tags = NULL;
+	struct config_strbytelist* np, *p = cfg->acl_tags;
+	cfg->acl_tags = NULL;
 	while(p) {
 		log_assert(p->str && p->str2);
-		if(!acl_list_tags_cfg(acl, p->str, p->str2, p->str2len, 0, 0)) {
+		if(!acl_list_tags_cfg(acl, p->str, p->str2, p->str2len)) {
 			config_del_strbytelist(p);
 			return 0;
 		}
@@ -469,18 +363,38 @@ read_acl_tags(struct acl_list* acl, struct config_strbytelist** acl_tags)
 	return 1;
 }

+/** read acl view config */
+static int 
+read_acl_view(struct acl_list* acl, struct config_file* cfg, struct views* v)
+{
+	struct config_str2list* np, *p = cfg->acl_view;
+	cfg->acl_view = NULL;
+	while(p) {
+		log_assert(p->str && p->str2);
+		if(!acl_list_view_cfg(acl, p->str, p->str2, v)) {
+			return 0;
+		}
+		/* free the items as we go to free up memory */
+		np = p->next;
+		free(p->str);
+		free(p->str2);
+		free(p);
+		p = np;
+	}
+	return 1;
+}
+
 /** read acl tag actions config */
-static int
-read_acl_tag_actions(struct acl_list* acl, struct config_file* cfg,
-	struct config_str3list** acl_tag_actions)
+static int 
+read_acl_tag_actions(struct acl_list* acl, struct config_file* cfg)
 {
 	struct config_str3list* p, *np;
-	p = *acl_tag_actions;
-	*acl_tag_actions = NULL;
+	p = cfg->acl_tag_actions;
+	cfg->acl_tag_actions = NULL;
 	while(p) {
 		log_assert(p->str && p->str2 && p->str3);
 		if(!acl_list_tag_action_cfg(acl, cfg, p->str, p->str2,
-			p->str3, 0, 0)) {
+			p->str3)) {
 			config_deltrplstrlist(p);
 			return 0;
 		}
@@ -496,17 +410,15 @@ read_acl_tag_actions(struct acl_list* acl, struct config_file* cfg,
 }

 /** read acl tag datas config */
-static int
-read_acl_tag_datas(struct acl_list* acl, struct config_file* cfg,
-	struct config_str3list** acl_tag_datas)
+static int 
+read_acl_tag_datas(struct acl_list* acl, struct config_file* cfg)
 {
 	struct config_str3list* p, *np;
-	p = *acl_tag_datas;
-	*acl_tag_datas = NULL;
+	p = cfg->acl_tag_datas;
+	cfg->acl_tag_datas = NULL;
 	while(p) {
 		log_assert(p->str && p->str2 && p->str3);
-		if(!acl_list_tag_data_cfg(acl, cfg, p->str, p->str2, p->str3,
-			0, 0)) {
+		if(!acl_list_tag_data_cfg(acl, cfg, p->str, p->str2, p->str3)) {
 			config_deltrplstrlist(p);
 			return 0;
 		}
@@ -521,27 +433,30 @@ read_acl_tag_datas(struct acl_list* acl, struct config_file* cfg,
 	return 1;
 }

-int
+int 
 acl_list_apply_cfg(struct acl_list* acl, struct config_file* cfg,
 	struct views* v)
 {
 	regional_free_all(acl->region);
 	addr_tree_init(&acl->tree);
-	if(!read_acl_list(acl, cfg->acls))
+	if(!read_acl_list(acl, cfg))
 		return 0;
-	if(!read_acl_view(acl, &cfg->acl_view, v))
+	if(!read_acl_view(acl, cfg, v))
 		return 0;
-	if(!read_acl_tags(acl, &cfg->acl_tags))
+	if(!read_acl_tags(acl, cfg))
 		return 0;
-	if(!read_acl_tag_actions(acl, cfg, &cfg->acl_tag_actions))
+	if(!read_acl_tag_actions(acl, cfg))
 		return 0;
-	if(!read_acl_tag_datas(acl, cfg, &cfg->acl_tag_datas))
+	if(!read_acl_tag_datas(acl, cfg))
 		return 0;
 	/* insert defaults, with '0' to ignore them if they are duplicates */
-	/* the 'refuse' defaults for /0 are now done per interface instead */
+	if(!acl_list_str_cfg(acl, "0.0.0.0/0", "refuse", 0))
+		return 0;
 	if(!acl_list_str_cfg(acl, "127.0.0.0/8", "allow", 0))
 		return 0;
 	if(cfg->do_ip6) {
+		if(!acl_list_str_cfg(acl, "::0/0", "refuse", 0))
+			return 0;
 		if(!acl_list_str_cfg(acl, "::1", "allow", 0))
 			return 0;
 		if(!acl_list_str_cfg(acl, "::ffff:127.0.0.1", "allow", 0))
@@ -551,223 +466,7 @@ acl_list_apply_cfg(struct acl_list* acl, struct config_file* cfg,
 	return 1;
 }

-int
-acl_interface_compare(const void* k1, const void* k2)
-{
-	struct addr_tree_node* n1 = (struct addr_tree_node*)k1;
-	struct addr_tree_node* n2 = (struct addr_tree_node*)k2;
-	return sockaddr_cmp(&n1->addr, n1->addrlen, &n2->addr,
-		n2->addrlen);
-	/* We don't care about comparing node->net. All addresses in the
-	 * acl_interface tree have either 32 (ipv4) or 128 (ipv6). */
-}
-
-void
-acl_interface_init(struct acl_list* acl_interface)
-{
-	regional_free_all(acl_interface->region);
-	/* We want comparison in the tree to include only address and port.
-	 * We don't care about comparing node->net. All addresses in the
-	 * acl_interface->tree should have either 32 (ipv4) or 128 (ipv6).
-	 * Initialise with the appropriate compare function but keep treating
-	 * it as an addr_tree. */
-	addr_tree_addrport_init(&acl_interface->tree);
-}
-
-static int
-read_acl_interface_action(struct acl_list* acl_interface,
-	struct config_str2list* acls, int port)
-{
-	struct config_str2list* p;
-	for(p = acls; p; p = p->next) {
-		char** resif = NULL;
-		int num_resif = 0;
-		int i;
-		log_assert(p->str && p->str2);
-		if(!resolve_interface_names(&p->str, 1, NULL, &resif, &num_resif))
-			return 0;
-		for(i = 0; i<num_resif; i++) {
-			if(!acl_interface_str_cfg(acl_interface, resif[i], p->str2, port)){
-				config_del_strarray(resif, num_resif);
-				return 0;
-			}
-		}
-		config_del_strarray(resif, num_resif);
-	}
-	return 1;
-}
-
-/** read acl view config for interface */
-static int
-read_acl_interface_view(struct acl_list* acl_interface,
-	struct config_str2list** acl_view,
-	struct views* v, int port)
-{
-	struct config_str2list* np, *p = *acl_view;
-	*acl_view = NULL;
-	while(p) {
-		char** resif = NULL;
-		int num_resif = 0;
-		int i;
-		log_assert(p->str && p->str2);
-		if(!resolve_interface_names(&p->str, 1, NULL, &resif, &num_resif)) {
-			config_deldblstrlist(p);
-			return 0;
-		}
-		for(i = 0; i<num_resif; i++) {
-			if(!acl_list_view_cfg(acl_interface, resif[i], p->str2,
-				v, 1, port)) {
-				config_del_strarray(resif, num_resif);
-				config_deldblstrlist(p);
-				return 0;
-			}
-		}
-		config_del_strarray(resif, num_resif);
-		/* free the items as we go to free up memory */
-		np = p->next;
-		free(p->str);
-		free(p->str2);
-		free(p);
-		p = np;
-	}
-	return 1;
-}
-
-/** read acl tags config for interface */
-static int
-read_acl_interface_tags(struct acl_list* acl_interface,
-	struct config_strbytelist** acl_tags, int port)
-{
-	struct config_strbytelist* np, *p = *acl_tags;
-	*acl_tags = NULL;
-	while(p) {
-		char** resif = NULL;
-		int num_resif = 0;
-		int i;
-		log_assert(p->str && p->str2);
-		if(!resolve_interface_names(&p->str, 1, NULL, &resif, &num_resif)) {
-			config_del_strbytelist(p);
-			return 0;
-		}
-		for(i = 0; i<num_resif; i++) {
-			if(!acl_list_tags_cfg(acl_interface, resif[i], p->str2,
-				p->str2len, 1, port)) {
-				config_del_strbytelist(p);
-				config_del_strarray(resif, num_resif);
-				return 0;
-			}
-		}
-		config_del_strarray(resif, num_resif);
-		/* free the items as we go to free up memory */
-		np = p->next;
-		free(p->str);
-		free(p->str2);
-		free(p);
-		p = np;
-	}
-	return 1;
-}
-
-/** read acl tag actions config for interface*/
-static int
-read_acl_interface_tag_actions(struct acl_list* acl_interface,
-	struct config_file* cfg,
-	struct config_str3list** acl_tag_actions, int port)
-{
-	struct config_str3list* p, *np;
-	p = *acl_tag_actions;
-	*acl_tag_actions = NULL;
-	while(p) {
-		char** resif = NULL;
-		int num_resif = 0;
-		int i;
-		log_assert(p->str && p->str2 && p->str3);
-		if(!resolve_interface_names(&p->str, 1, NULL, &resif, &num_resif)) {
-			config_deltrplstrlist(p);
-			return 0;
-		}
-		for(i = 0; i<num_resif; i++) {
-			if(!acl_list_tag_action_cfg(acl_interface, cfg,
-				resif[i], p->str2, p->str3, 1, port)) {
-				config_deltrplstrlist(p);
-				config_del_strarray(resif, num_resif);
-				return 0;
-			}
-		}
-		config_del_strarray(resif, num_resif);
-		/* free the items as we go to free up memory */
-		np = p->next;
-		free(p->str);
-		free(p->str2);
-		free(p->str3);
-		free(p);
-		p = np;
-	}
-	return 1;
-}
-
-/** read acl tag datas config for interface */
-static int
-read_acl_interface_tag_datas(struct acl_list* acl_interface,
-	struct config_file* cfg,
-	struct config_str3list** acl_tag_datas, int port)
-{
-	struct config_str3list* p, *np;
-	p = *acl_tag_datas;
-	*acl_tag_datas = NULL;
-	while(p) {
-		char** resif = NULL;
-		int num_resif = 0;
-		int i;
-		log_assert(p->str && p->str2 && p->str3);
-		if(!resolve_interface_names(&p->str, 1, NULL, &resif, &num_resif)) {
-			config_deltrplstrlist(p);
-			return 0;
-		}
-		for(i = 0; i<num_resif; i++) {
-			if(!acl_list_tag_data_cfg(acl_interface, cfg,
-				resif[i], p->str2, p->str3, 1, port)) {
-				config_deltrplstrlist(p);
-				config_del_strarray(resif, num_resif);
-				return 0;
-			}
-		}
-		config_del_strarray(resif, num_resif);
-		/* free the items as we go to free up memory */
-		np = p->next;
-		free(p->str);
-		free(p->str2);
-		free(p->str3);
-		free(p);
-		p = np;
-	}
-	return 1;
-}
-
-int
-acl_interface_apply_cfg(struct acl_list* acl_interface, struct config_file* cfg,
-	struct views* v)
-{
-	if(!read_acl_interface_action(acl_interface, cfg->interface_actions,
-		cfg->port))
-		return 0;
-	if(!read_acl_interface_view(acl_interface, &cfg->interface_view, v,
-		cfg->port))
-		return 0;
-	if(!read_acl_interface_tags(acl_interface, &cfg->interface_tags,
-		cfg->port))
-		return 0;
-	if(!read_acl_interface_tag_actions(acl_interface, cfg,
-		&cfg->interface_tag_actions, cfg->port))
-		return 0;
-	if(!read_acl_interface_tag_datas(acl_interface, cfg,
-		&cfg->interface_tag_datas, cfg->port))
-		return 0;
-	addr_tree_init_parents(&acl_interface->tree);
-	return 1;
-}
-
-enum acl_access
+enum acl_access 
 acl_get_control(struct acl_addr* acl)
 {
 	if(acl) return acl->control;
@@ -782,44 +481,9 @@ acl_addr_lookup(struct acl_list* acl, struct sockaddr_storage* addr,
 		addr, addrlen);
 }

-size_t
+size_t 
 acl_list_get_mem(struct acl_list* acl)
 {
 	if(!acl) return 0;
 	return sizeof(*acl) + regional_get_mem(acl->region);
 }
-
-const char* acl_access_to_str(enum acl_access acl)
-{
-	switch(acl) {
-	case acl_deny: return "deny";
-	case acl_refuse: return "refuse";
-	case acl_deny_non_local: return "deny_non_local";
-	case acl_refuse_non_local: return "refuse_non_local";
-	case acl_allow: return "allow";
-	case acl_allow_snoop: return "allow_snoop";
-	case acl_allow_setrd: return "allow_setrd";
-	default: break;
-	}
-	return "unknown";
-}
-
-void
-log_acl_action(const char* action, struct sockaddr_storage* addr,
-	socklen_t addrlen, enum acl_access acl, struct acl_addr* acladdr)
-{
-	char a[128], n[128];
-	uint16_t port;
-	addr_to_str(addr, addrlen, a, sizeof(a));
-	port = ntohs(((struct sockaddr_in*)addr)->sin_port);
-	if(acladdr) {
-		addr_to_str(&acladdr->node.addr, acladdr->node.addrlen,
-			n, sizeof(n));
-		verbose(VERB_ALGO, "%s query from %s port %d because of "
-			"%s/%d %s", action, a, (int)port, n, acladdr->node.net,
-			acl_access_to_str(acl));
-	} else {
-		verbose(VERB_ALGO, "%s query from %s port %d", action, a,
-			(int)port);
-	}
-}
@@ -36,7 +36,7 @@
 /**
 * \file
 *
- * This file keeps track of the list of clients that are allowed to
+ * This file keeps track of the list of clients that are allowed to 
 * access the server.
 */

@@ -64,12 +64,8 @@ enum acl_access {
 	acl_allow,
 	/** allow full access for all queries, recursion and cache snooping */
 	acl_allow_snoop,
-	/** allow full access for recursion queries and set RD flag regardless
-	 *  of request */
-	acl_allow_setrd,
-	/** allow full access for recursion (+RD) queries if valid cookie
-	 *  present or stateful transport */
-	acl_allow_cookie
+	/** allow full access for recursion queries and set RD flag regardless of request */
+	acl_allow_setrd
 };

 /**
@@ -78,7 +74,7 @@ enum acl_access {
 struct acl_list {
 	/** regional for allocation */
 	struct regional* region;
-	/**
+	/** 
 	 * Tree of the addresses that are allowed/blocked.
 	 * contents of type acl_addr.
 	 */
@@ -112,7 +108,7 @@ struct acl_addr {
 };

 /**
- * Create acl structure
+ * Create acl structure 
 * @return new structure or NULL on error.
 */
 struct acl_list* acl_list_create(void);
@@ -123,20 +119,6 @@ struct acl_list* acl_list_create(void);
 */
 void acl_list_delete(struct acl_list* acl);

-/**
- * Insert interface in the acl_list. This should happen when the listening
- * interface is setup.
- * @param acl_interface: acl_list to insert to.
- * @param addr: interface IP.
- * @param addrlen: length of the interface IP.
- * @param control: acl_access.
- * @return new structure or NULL on error.
- */
-struct acl_addr*
-acl_interface_insert(struct acl_list* acl_interface,
-	struct sockaddr_storage* addr, socklen_t addrlen,
-	enum acl_access control);
-
 /**
 * Process access control config.
 * @param acl: where to store.
@@ -147,25 +129,6 @@ acl_interface_insert(struct acl_list* acl_interface,
 int acl_list_apply_cfg(struct acl_list* acl, struct config_file* cfg,
 	struct views* v);

-/** compare ACL interface "addr_tree" nodes (+port) */
-int acl_interface_compare(const void* k1, const void* k2);
-
-/**
- * Initialise (also clean) the acl_interface struct.
- * @param acl_interface: where to store.
- */
-void acl_interface_init(struct acl_list* acl_interface);
-
-/**
- * Process interface control config.
- * @param acl_interface: where to store.
- * @param cfg: config options.
- * @param v: views structure
- * @return 0 on error.
- */
-int acl_interface_apply_cfg(struct acl_list* acl_interface, struct config_file* cfg,
-	struct views* v);
-
 /**
 * Lookup access control status for acl structure.
 * @param acl: structure for acl storage.
@@ -191,15 +154,4 @@ acl_addr_lookup(struct acl_list* acl, struct sockaddr_storage* addr,
 */
 size_t acl_list_get_mem(struct acl_list* acl);

-/*
- * Get string for acl access specification
- * @param acl: access type value
- * @return string
- */
-const char* acl_access_to_str(enum acl_access acl);
-
-/* log acl and addr for action */
-void log_acl_action(const char* action, struct sockaddr_storage* addr,
-	socklen_t addrlen, enum acl_access acl, struct acl_addr* acladdr);
-
 #endif /* DAEMON_ACL_LIST_H */
@@ -47,12 +47,10 @@
 #include "services/cache/rrset.h"
 #include "services/cache/dns.h"
 #include "services/cache/infra.h"
-#include "services/outside_network.h"
 #include "util/data/msgreply.h"
 #include "util/regional.h"
 #include "util/net_help.h"
 #include "util/data/dname.h"
-#include "util/config_file.h"
 #include "iterator/iterator.h"
 #include "iterator/iter_delegpt.h"
 #include "iterator/iter_utils.h"
@@ -166,7 +164,8 @@ dump_msg_ref(RES* ssl, struct ub_packed_rrset_key* k)

 /** dump message entry */
 static int
-dump_msg(RES* ssl, struct query_info* k, struct reply_info* d, time_t now)
+dump_msg(RES* ssl, struct query_info* k, struct reply_info* d, 
+	time_t now)
 {
 	size_t i;
 	char* nm, *tp, *cl;
@@ -191,15 +190,13 @@ dump_msg(RES* ssl, struct query_info* k, struct reply_info* d, time_t now)
 	}
 	
 	/* meta line */
-	if(!ssl_printf(ssl, "msg %s %s %s %d %d " ARG_LL "d %d %u %u %u %d %s\n",
+	if(!ssl_printf(ssl, "msg %s %s %s %d %d " ARG_LL "d %d %u %u %u\n",
 			nm, cl, tp,
 			(int)d->flags, (int)d->qdcount, 
 			(long long)(d->ttl-now), (int)d->security,
-			(unsigned)d->an_numrrsets,
+			(unsigned)d->an_numrrsets, 
 			(unsigned)d->ns_numrrsets,
-			(unsigned)d->ar_numrrsets,
-			(int)d->reason_bogus,
-			d->reason_bogus_str?d->reason_bogus_str:"")) {
+			(unsigned)d->ar_numrrsets)) {
 		free(nm);
 		free(tp);
 		free(cl);
@@ -388,7 +385,7 @@ move_into_cache(struct ub_packed_rrset_key* k,
 	struct rrset_ref ref;
 	uint8_t* p;

-	ak = alloc_special_obtain(worker->alloc);
+	ak = alloc_special_obtain(&worker->alloc);
 	if(!ak) {
 		log_warn("error out of memory");
 		return 0;
@@ -399,7 +396,7 @@ move_into_cache(struct ub_packed_rrset_key* k,
 	ak->rk.dname = (uint8_t*)memdup(k->rk.dname, k->rk.dname_len);
 	if(!ak->rk.dname) {
 		log_warn("error out of memory");
-		ub_packed_rrset_parsedelete(ak, worker->alloc);
+		ub_packed_rrset_parsedelete(ak, &worker->alloc);
 		return 0;
 	}
 	s = sizeof(*ad) + (sizeof(size_t) + sizeof(uint8_t*) + 
@@ -409,7 +406,7 @@ move_into_cache(struct ub_packed_rrset_key* k,
 	ad = (struct packed_rrset_data*)malloc(s);
 	if(!ad) {
 		log_warn("error out of memory");
-		ub_packed_rrset_parsedelete(ak, worker->alloc);
+		ub_packed_rrset_parsedelete(ak, &worker->alloc);
 		return 0;
 	}
 	p = (uint8_t*)ad;
@@ -432,8 +429,7 @@ move_into_cache(struct ub_packed_rrset_key* k,
 	ref.key = ak;
 	ref.id = ak->id;
 	(void)rrset_cache_update(worker->env.rrset_cache, &ref,
-		worker->alloc, *worker->env.now);
-
+		&worker->alloc, *worker->env.now);
 	return 1;
 }

@@ -634,9 +630,6 @@ load_msg(RES* ssl, sldns_buffer* buf, struct worker* worker)
 	long long ttl;
 	size_t i;
 	int go_on = 1;
-	int ede;
-	int consumed = 0;
-	char* ede_str = NULL;

 	regional_free_all(region);

@@ -651,16 +644,11 @@ load_msg(RES* ssl, sldns_buffer* buf, struct worker* worker)
 	}

 	/* read remainder of line */
-	/* note the last space before any possible EDE text */
-	if(sscanf(s, " %u %u " ARG_LL "d %u %u %u %u %d %n", &flags, &qdcount, &ttl,
-		&security, &an, &ns, &ar, &ede, &consumed) != 8) {
+	if(sscanf(s, " %u %u " ARG_LL "d %u %u %u %u", &flags, &qdcount, &ttl, 
+		&security, &an, &ns, &ar) != 7) {
 		log_warn("error cannot parse numbers: %s", s);
 		return 0;
 	}
-	/* there may be EDE text after the numbers */
-	if(consumed > 0 && (size_t)consumed < strlen(s))
-		ede_str = s + consumed;
-	memset(&rep, 0, sizeof(rep));
 	rep.flags = (uint16_t)flags;
 	rep.qdcount = (uint16_t)qdcount;
 	rep.ttl = (time_t)ttl;
@@ -675,8 +663,6 @@ load_msg(RES* ssl, sldns_buffer* buf, struct worker* worker)
 	rep.ns_numrrsets = (size_t)ns;
 	rep.ar_numrrsets = (size_t)ar;
 	rep.rrset_count = (size_t)an+(size_t)ns+(size_t)ar;
-	rep.reason_bogus = (sldns_ede_code)ede;
-	rep.reason_bogus_str = ede_str?(char*)regional_strdup(region, ede_str):NULL;
 	rep.rrsets = (struct ub_packed_rrset_key**)regional_alloc_zero(
 		region, sizeof(struct ub_packed_rrset_key*)*rep.rrset_count);

@@ -691,8 +677,7 @@ load_msg(RES* ssl, sldns_buffer* buf, struct worker* worker)
 	if(!go_on) 
 		return 1; /* skip this one, not all references satisfied */

-	if(!dns_cache_store(&worker->env, &qinf, &rep, 0, 0, 0, NULL, flags,
-		*worker->env.now)) {
+	if(!dns_cache_store(&worker->env, &qinf, &rep, 0, 0, 0, NULL, flags)) {
 		log_warn("error out of memory");
 		return 0;
 	}
@@ -839,7 +824,6 @@ int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm,
 	char b[260];
 	struct query_info qinfo;
 	struct iter_hints_stub* stub;
-	int nolock = 0;
 	regional_free_all(region);
 	qinfo.qname = nm;
 	qinfo.qname_len = nmlen;
@@ -851,32 +835,26 @@ int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm,
 	if(!ssl_printf(ssl, "The following name servers are used for lookup "
 		"of %s\n", b)) 
 		return 0;
-
-	dp = forwards_lookup(worker->env.fwds, nm, qinfo.qclass, nolock);
+	
+	dp = forwards_lookup(worker->env.fwds, nm, qinfo.qclass);
 	if(dp) {
-		if(!ssl_printf(ssl, "forwarding request:\n")) {
-			lock_rw_unlock(&worker->env.fwds->lock);
+		if(!ssl_printf(ssl, "forwarding request:\n"))
 			return 0;
-		}
 		print_dp_main(ssl, dp, NULL);
 		print_dp_details(ssl, worker, dp);
-		lock_rw_unlock(&worker->env.fwds->lock);
 		return 1;
 	}
 	
 	while(1) {
 		dp = dns_cache_find_delegation(&worker->env, nm, nmlen, 
 			qinfo.qtype, qinfo.qclass, region, &msg, 
-			*worker->env.now, 0, NULL, 0);
+			*worker->env.now);
 		if(!dp) {
 			return ssl_printf(ssl, "no delegation from "
 				"cache; goes to configured roots\n");
 		}
 		/* go up? */
-		if(iter_dp_is_useless(&qinfo, BIT_RD, dp,
-			(worker->env.cfg->do_ip4 && worker->back->num_ip4 != 0),
-			(worker->env.cfg->do_ip6 && worker->back->num_ip6 != 0),
-			worker->env.cfg->do_nat64)) {
+		if(iter_dp_is_useless(&qinfo, BIT_RD, dp)) {
 			print_dp_main(ssl, dp, msg);
 			print_dp_details(ssl, worker, dp);
 			if(!ssl_printf(ssl, "cache delegation was "
@@ -896,26 +874,21 @@ int print_deleg_lookup(RES* ssl, struct worker* worker, uint8_t* nm,
 					return 0;
 				continue;
 			}
-		}
+		} 
 		stub = hints_lookup_stub(worker->env.hints, nm, qinfo.qclass,
-			dp, nolock);
+			dp);
 		if(stub) {
 			if(stub->noprime) {
 				if(!ssl_printf(ssl, "The noprime stub servers "
-					"are used:\n")) {
-					lock_rw_unlock(&worker->env.hints->lock);
+					"are used:\n"))
 					return 0;
-				}
 			} else {
 				if(!ssl_printf(ssl, "The stub is primed "
-						"with servers:\n")) {
-					lock_rw_unlock(&worker->env.hints->lock);
+						"with servers:\n"))
 					return 0;
-				}
 			}
 			print_dp_main(ssl, stub->dp, NULL);
 			print_dp_details(ssl, worker, stub->dp);
-			lock_rw_unlock(&worker->env.hints->lock);
 		} else {
 			print_dp_main(ssl, dp, msg);
 			print_dp_details(ssl, worker, dp);
@@ -91,19 +91,11 @@
 #include "util/net_help.h"
 #include "sldns/keyraw.h"
 #include "respip/respip.h"
-#include "iterator/iter_fwd.h"
-#include "iterator/iter_hints.h"
 #include <signal.h>

 #ifdef HAVE_SYSTEMD
 #include <systemd/sd-daemon.h>
 #endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef USE_CACHEDB
-#include "cachedb/cachedb.h"
-#endif

 /** How many quit requests happened. */
 static int sig_record_quit = 0;
@@ -265,7 +257,6 @@ daemon_init(void)
 		free(daemon);
 		return NULL;
 	}
-	daemon->env->modstack = &daemon->mods;
 	/* init edns_known_options */
 	if(!edns_known_options_init(daemon->env)) {
 		free(daemon->env);
@@ -280,17 +271,8 @@ daemon_init(void)
 		free(daemon);
 		return NULL;
 	}
-	daemon->acl_interface = acl_list_create();
-	if(!daemon->acl_interface) {
-		acl_list_delete(daemon->acl);
-		edns_known_options_delete(daemon->env);
-		free(daemon->env);
-		free(daemon);
-		return NULL;
-	}
 	daemon->tcl = tcl_list_create();
 	if(!daemon->tcl) {
-		acl_list_delete(daemon->acl_interface);
 		acl_list_delete(daemon->acl);
 		edns_known_options_delete(daemon->env);
 		free(daemon->env);
@@ -302,7 +284,6 @@ daemon_init(void)
 		log_err("gettimeofday: %s", strerror(errno));
 	daemon->time_last_stat = daemon->time_boot;
 	if((daemon->env->auth_zones = auth_zones_create()) == 0) {
-		acl_list_delete(daemon->acl_interface);
 		acl_list_delete(daemon->acl);
 		tcl_list_delete(daemon->tcl);
 		edns_known_options_delete(daemon->env);
@@ -312,7 +293,6 @@ daemon_init(void)
 	}
 	if(!(daemon->env->edns_strings = edns_strings_create())) {
 		auth_zones_delete(daemon->env->auth_zones);
-		acl_list_delete(daemon->acl_interface);
 		acl_list_delete(daemon->acl);
 		tcl_list_delete(daemon->tcl);
 		edns_known_options_delete(daemon->env);
@@ -323,27 +303,6 @@ daemon_init(void)
 	return daemon;	
 }

-static int setup_acl_for_ports(struct acl_list* list,
-	struct listen_port* port_list)
-{
-	struct acl_addr* acl_node;
-	for(; port_list; port_list=port_list->next) {
-		if(!port_list->socket) {
-			/* This is mainly for testbound where port_list is
-			 * empty. */
-			continue;
-		}
-		if(!(acl_node = acl_interface_insert(list,
-			(struct sockaddr_storage*)port_list->socket->addr,
-			port_list->socket->addrlen,
-			acl_refuse))) {
-			return 0;
-		}
-		port_list->socket->acl = acl_node;
-	}
-	return 1;
-}
-
 int 
 daemon_open_shared_ports(struct daemon* daemon)
 {
@@ -361,8 +320,6 @@ daemon_open_shared_ports(struct daemon* daemon)
 			free(daemon->ports);
 			daemon->ports = NULL;
 		}
-		/* clean acl_interface */
-		acl_interface_init(daemon->acl_interface);
 		if(!resolve_interface_names(daemon->cfg->ifs,
 			daemon->cfg->num_ifs, NULL, &resif, &num_resif))
 			return 0;
@@ -372,8 +329,7 @@ daemon_open_shared_ports(struct daemon* daemon)
 			daemon->reuseport = 1;
 #endif
 		/* try to use reuseport */
-		p0 = listening_ports_open(daemon->cfg, resif, num_resif,
-			&daemon->reuseport);
+		p0 = listening_ports_open(daemon->cfg, resif, num_resif, &daemon->reuseport);
 		if(!p0) {
 			listening_ports_free(p0);
 			config_del_strarray(resif, num_resif);
@@ -394,12 +350,6 @@ daemon_open_shared_ports(struct daemon* daemon)
 			return 0;
 		}
 		daemon->ports[0] = p0;
-		if(!setup_acl_for_ports(daemon->acl_interface,
-		    daemon->ports[0])) {
-			listening_ports_free(p0);
-			config_del_strarray(resif, num_resif);
-			return 0;
-		}
 		if(daemon->reuseport) {
 			/* continue to use reuseport */
 			for(i=1; i<daemon->num_ports; i++) {
@@ -415,15 +365,6 @@ daemon_open_shared_ports(struct daemon* daemon)
 					config_del_strarray(resif, num_resif);
 					return 0;
 				}
-				if(!setup_acl_for_ports(daemon->acl_interface,
-					daemon->ports[i])) {
-					for(i=0; i<daemon->num_ports; i++)
-						listening_ports_free(daemon->ports[i]);
-					free(daemon->ports);
-					daemon->ports = NULL;
-					config_del_strarray(resif, num_resif);
-					return 0;
-				}
 			}
 		}
 		config_del_strarray(resif, num_resif);
@@ -492,27 +433,6 @@ static int daemon_get_shufport(struct daemon* daemon, int* shufport)
 	return avail;
 }

-/**
- * Clear and delete per-worker alloc caches, and free memory maintained in
- * superalloc.
- * The rrset and message caches must be empty at the time of call.
- * @param daemon: the daemon that maintains the alloc caches to be cleared.
- */
-static void
-daemon_clear_allocs(struct daemon* daemon)
-{
-	int i;
-
-	for(i=0; i<daemon->num; i++) {
-		alloc_clear(daemon->worker_allocs[i]);
-		free(daemon->worker_allocs[i]);
-	}
-	free(daemon->worker_allocs);
-	daemon->worker_allocs = NULL;
-
-	alloc_clear_special(&daemon->superalloc);
-}
-
 /**
 * Allocate empty worker structures. With backptr and thread-number,
 * from 0..numthread initialised. Used as user arguments to new threads.
@@ -565,21 +485,6 @@ daemon_create_workers(struct daemon* daemon)
 			/* the above is not ports/numthr, due to rounding */
 			fatal_exit("could not create worker");
 	}
-	/* create per-worker alloc caches if not reusing existing ones. */
-	if(!daemon->worker_allocs) {
-		daemon->worker_allocs = (struct alloc_cache**)calloc(
-			(size_t)daemon->num, sizeof(struct alloc_cache*));
-		if(!daemon->worker_allocs)
-			fatal_exit("could not allocate worker allocs");
-		for(i=0; i<daemon->num; i++) {
-			struct alloc_cache* alloc = calloc(1,
-				sizeof(struct alloc_cache));
-			if (!alloc)
-				fatal_exit("could not allocate worker alloc");
-			alloc_init(alloc, &daemon->superalloc, i);
-			daemon->worker_allocs[i] = alloc;
-		}
-	}
 	free(shufport);
 }

@@ -699,9 +604,6 @@ daemon_fork(struct daemon* daemon)

 	if(!acl_list_apply_cfg(daemon->acl, daemon->cfg, daemon->views))
 		fatal_exit("Could not setup access control list");
-	if(!acl_interface_apply_cfg(daemon->acl_interface, daemon->cfg,
-		daemon->views))
-		fatal_exit("Could not setup interface control list");
 	if(!tcl_list_apply_cfg(daemon->tcl, daemon->cfg))
 		fatal_exit("Could not setup TCP connection limits");
 	if(daemon->cfg->dnscrypt) {
@@ -720,12 +622,6 @@ daemon_fork(struct daemon* daemon)
 		fatal_exit("Could not create local zones: out of memory");
 	if(!local_zones_apply_cfg(daemon->local_zones, daemon->cfg))
 		fatal_exit("Could not set up local zones");
-	if(!(daemon->env->fwds = forwards_create()) ||
-		!forwards_apply_cfg(daemon->env->fwds, daemon->cfg))
-		fatal_exit("Could not set forward zones");
-	if(!(daemon->env->hints = hints_create()) ||
-		!hints_apply_cfg(daemon->env->hints, daemon->cfg))
-		fatal_exit("Could not set root or stub hints");

 	/* process raw response-ip configuration data */
 	if(!(daemon->respip_set = respip_set_create()))
@@ -750,10 +646,6 @@ daemon_fork(struct daemon* daemon)
 	if(!edns_strings_apply_cfg(daemon->env->edns_strings, daemon->cfg))
 		fatal_exit("Could not set up EDNS strings");

-#ifdef USE_CACHEDB
-	daemon->env->cachedb_enabled = cachedb_is_enabled(&daemon->mods,
-		daemon->env);
-#endif
 	/* response-ip-xxx options don't work as expected without the respip
 	 * module.  To avoid run-time operational surprise we reject such
 	 * configuration. */
@@ -821,7 +713,6 @@ daemon_fork(struct daemon* daemon)
 	/* Shutdown SHM */
 	shm_main_shutdown(daemon);

-	daemon->reuse_cache = daemon->workers[0]->reuse_cache;
 	daemon->need_to_exit = daemon->workers[0]->need_to_exit;
 }

@@ -836,20 +727,9 @@ daemon_cleanup(struct daemon* daemon)
 	log_thread_set(NULL);
 	/* clean up caches because
 	 * a) RRset IDs will be recycled after a reload, causing collisions
-	 * b) validation config can change, thus rrset, msg, keycache clear
-	 *
-	 * If we are trying to keep the cache as long as possible, we should
-	 * defer the cleanup until we know whether the new configuration allows
-	 * the reuse.  (If we're exiting, cleanup should be done here). */
-	if(!daemon->reuse_cache || daemon->need_to_exit) {
-		slabhash_clear(&daemon->env->rrset_cache->table);
-		slabhash_clear(daemon->env->msg_cache);
-	}
-	daemon->old_num = daemon->num; /* save the current num */
-	forwards_delete(daemon->env->fwds);
-	daemon->env->fwds = NULL;
-	hints_delete(daemon->env->hints);
-	daemon->env->hints = NULL;
+	 * b) validation config can change, thus rrset, msg, keycache clear */
+	slabhash_clear(&daemon->env->rrset_cache->table);
+	slabhash_clear(daemon->env->msg_cache);
 	local_zones_delete(daemon->local_zones);
 	daemon->local_zones = NULL;
 	respip_set_delete(daemon->respip_set);
@@ -864,13 +744,8 @@ daemon_cleanup(struct daemon* daemon)
 		worker_delete(daemon->workers[i]);
 	free(daemon->workers);
 	daemon->workers = NULL;
-	/* Unless we're trying to keep the cache, worker alloc_caches should be
-	 * cleared and freed here. We do this after deleting workers to
-	 * guarantee that the alloc caches are valid throughout the lifetime
-	 * of workers. */
-	if(!daemon->reuse_cache || daemon->need_to_exit)
-		daemon_clear_allocs(daemon);
 	daemon->num = 0;
+	alloc_clear_special(&daemon->superalloc);
 #ifdef USE_DNSTAP
 	dt_delete(daemon->dtenv);
 	daemon->dtenv = NULL;
@@ -905,7 +780,6 @@ daemon_delete(struct daemon* daemon)
 	ub_randfree(daemon->rand);
 	alloc_clear(&daemon->superalloc);
 	acl_list_delete(daemon->acl);
-	acl_list_delete(daemon->acl_interface);
 	tcl_list_delete(daemon->tcl);
 	listen_desetup_locks();
 	free(daemon->chroot);
@@ -921,7 +795,7 @@ daemon_delete(struct daemon* daemon)
 	ub_c_lex_destroy();
 	/* libcrypto cleanup */
 #ifdef HAVE_SSL
-#  if defined(USE_GOST)
+#  if defined(USE_GOST) && defined(HAVE_LDNS_KEY_EVP_UNLOAD_GOST)
 	sldns_key_EVP_unload_gost();
 #  endif
 #  if HAVE_DECL_SSL_COMP_GET_COMPRESSION_METHODS && HAVE_DECL_SK_SSL_COMP_POP_FREE
@@ -967,42 +841,8 @@ daemon_delete(struct daemon* daemon)

 void daemon_apply_cfg(struct daemon* daemon, struct config_file* cfg)
 {
-	int new_num = cfg->num_threads?cfg->num_threads:1;
-
        daemon->cfg = cfg;
 	config_apply(cfg);
-
-	/* If this is a reload and we deferred the decision on whether to
-	 * reuse the alloc, RRset, and message caches, then check to see if
-	 * it's safe to keep the caches:
-	 * - changing the number of threads is obviously incompatible with
-	 *   keeping the per-thread alloc caches. It also means we have to
-	 *   clear RRset and message caches. (note that 'new_num' may be
-	 *   adjusted in daemon_create_workers, but for our purpose we can
-	 *   simply compare it with 'old_num'; if they are equal here,
-	 *   'new_num' won't be adjusted to a different value than 'old_num').
-	 * - changing RRset cache size effectively clears any remaining cache
-	 *   entries. We could keep their keys in alloc caches, but it would
-	 *   be more consistent with the sense of the change to clear allocs
-	 *   and free memory. To do so we also have to clear message cache.
-	 * - only changing message cache size does not necessarily affect
-	 *   RRset or alloc cache. But almost all new subsequent queries will
-	 *   require recursive resolution anyway, so it doesn't help much to
-	 *   just keep RRset and alloc caches. For simplicity we clear/free
-	 *   the other two, too. */
-	if(daemon->worker_allocs &&
-		(new_num != daemon->old_num ||
-		 !slabhash_is_size(daemon->env->msg_cache, cfg->msg_cache_size,
-			cfg->msg_cache_slabs) ||
-		 !slabhash_is_size(&daemon->env->rrset_cache->table,
-			cfg->rrset_cache_size, cfg->rrset_cache_slabs)))
-	{
-		log_warn("cannot reuse caches due to critical config change");
-		slabhash_clear(&daemon->env->rrset_cache->table);
-		slabhash_clear(daemon->env->msg_cache);
-		daemon_clear_allocs(daemon);
-	}
-
 	if(!slabhash_is_size(daemon->env->msg_cache, cfg->msg_cache_size,
 	   	cfg->msg_cache_slabs)) {
 		slabhash_delete(daemon->env->msg_cache);
@@ -99,12 +99,8 @@ struct daemon {
 	void* listen_sslctx, *connect_sslctx;
 	/** num threads allocated */
 	int num;
-	/** num threads allocated in the previous config or 0 at first */
-	int old_num;
 	/** the worker entries */
 	struct worker** workers;
-	/** per-worker allocation cache */
-	struct alloc_cache **worker_allocs;
 	/** do we need to exit unbound (or is it only a reload?) */
 	int need_to_exit;
 	/** master random table ; used for port div between threads on reload*/
@@ -117,8 +113,6 @@ struct daemon {
 	struct module_stack mods;
 	/** access control, which client IPs are allowed to connect */
 	struct acl_list* acl;
-	/** access control, which interfaces are allowed to connect */
-	struct acl_list* acl_interface;
 	/** TCP connection limit, limit connections from client IPs */
 	struct tcl_list* tcl;
 	/** local authority zones */
@@ -144,8 +138,6 @@ struct daemon {
 	/** the dnscrypt environment */
 	struct dnsc_env* dnscenv;
 #endif
-	/** reuse existing cache on reload if other conditions allow it. */
-	int reuse_cache;
 };

 /**
@@ -46,7 +46,7 @@
 #ifndef DAEMON_REMOTE_H
 #define DAEMON_REMOTE_H
 #ifdef HAVE_OPENSSL_SSL_H
-#include <openssl/ssl.h>
+#include "openssl/ssl.h"
 #endif
 struct config_file;
 struct listen_list;
@@ -4,22 +4,22 @@
 * Copyright (c) 2007, NLnet Labs. All rights reserved.
 *
 * This software is open source.
- *
+ * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
- *
+ * 
 * Redistributions of source code must retain the above copyright notice,
 * this list of conditions and the following disclaimer.
- *
+ * 
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
- *
+ * 
 * Neither the name of the NLNET LABS nor the names of its contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
- *
+ * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -70,9 +70,6 @@
 #include <openssl/ssl.h>
 #endif

-/** How long to wait for threads to transmit statistics, in msec. */
-#define STATS_THREAD_WAIT 60000
-
 /** add timers and the values do not overflow or become negative */
 static void
 stats_timeval_add(long long* d_sec, long long* d_usec, long long add_sec, long long add_usec)
@@ -116,8 +113,8 @@ void server_stats_log(struct ub_server_stats* stats, struct worker* worker,
 	log_info("server stats for thread %d: %u queries, "
 		"%u answers from cache, %u recursions, %u prefetch, %u rejected by "
 		"ip ratelimiting",
-		threadnum, (unsigned)stats->num_queries,
-		(unsigned)(stats->num_queries -
+		threadnum, (unsigned)stats->num_queries, 
+		(unsigned)(stats->num_queries - 
 			stats->num_queries_missed_cache),
 		(unsigned)stats->num_queries_missed_cache,
 		(unsigned)stats->num_queries_prefetch,
@@ -279,12 +276,11 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 		s->svr.ans_rcode[i] += (long long)worker->env.mesh->ans_rcode[i];
 	for(i=0; i<UB_STATS_RPZ_ACTION_NUM; i++)
 		s->svr.rpz_action[i] += (long long)worker->env.mesh->rpz_action[i];
-	timehist_export(worker->env.mesh->histogram, s->svr.hist,
+	timehist_export(worker->env.mesh->histogram, s->svr.hist, 
 		NUM_BUCKETS_HIST);
 	/* values from outside network */
 	s->svr.unwanted_replies = (long long)worker->back->unwanted_replies;
 	s->svr.qtcp_outgoing = (long long)worker->back->num_tcp_outgoing;
-	s->svr.qudp_outgoing = (long long)worker->back->num_udp_outgoing;

 	/* get and reset validator rrset bogus number */
 	s->svr.rrset_bogus = (long long)get_rrset_bogus(worker, reset);
@@ -293,10 +289,8 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 	s->svr.queries_ratelimited = (long long)get_queries_ratelimit(worker, reset);

 	/* get cache sizes */
-	get_slabhash_stats(worker->env.msg_cache,
-		&s->svr.msg_cache_count, &s->svr.msg_cache_max_collisions);
-	get_slabhash_stats(&worker->env.rrset_cache->table,
-		&s->svr.rrset_cache_count, &s->svr.rrset_cache_max_collisions);
+	s->svr.msg_cache_count = (long long)count_slabhash_entries(worker->env.msg_cache);
+	s->svr.rrset_cache_count = (long long)count_slabhash_entries(&worker->env.rrset_cache->table);
 	s->svr.infra_cache_count = (long long)count_slabhash_entries(worker->env.infra_cache->hosts);
 	if(worker->env.key_cache)
 		s->svr.key_cache_count = (long long)count_slabhash_entries(worker->env.key_cache->slab);
@@ -356,11 +350,6 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
 	s->svr.num_query_subnet = 0;
 	s->svr.num_query_subnet_cache = 0;
 #endif
-#ifdef USE_CACHEDB
-	s->svr.num_query_cachedb = (long long)worker->env.mesh->ans_cachedb;
-#else
-	s->svr.num_query_cachedb = 0;
-#endif

 	/* get tcp accept usage */
 	s->svr.tcp_accept_usage = 0;
@@ -390,28 +379,6 @@ void server_stats_obtain(struct worker* worker, struct worker* who,
 		worker_send_cmd(who, worker_cmd_stats);
 	else 	worker_send_cmd(who, worker_cmd_stats_noreset);
 	verbose(VERB_ALGO, "wait for stats reply");
-	if(tube_wait_timeout(worker->cmd, STATS_THREAD_WAIT) == 0) {
-		verbose(VERB_OPS, "no response from thread %d"
-#ifdef HAVE_GETTID
-			" LWP %u"
-#endif
-#if defined(HAVE_PTHREAD) && defined(SIZEOF_PTHREAD_T) && defined(SIZEOF_UNSIGNED_LONG)
-#  if SIZEOF_PTHREAD_T == SIZEOF_UNSIGNED_LONG
-			" pthread 0x%lx"
-#  endif
-#endif
-			,
-			who->thread_num
-#ifdef HAVE_GETTID
-			, (unsigned)who->thread_tid
-#endif
-#if defined(HAVE_PTHREAD) && defined(SIZEOF_PTHREAD_T) && defined(SIZEOF_UNSIGNED_LONG)
-#  if SIZEOF_PTHREAD_T == SIZEOF_UNSIGNED_LONG
-			, (unsigned long)*((unsigned long*)&who->thr_id)
-#  endif
-#endif
-			);
-	}
 	if(!tube_read_msg(worker->cmd, &reply, &len, 0))
 		fatal_exit("failed to read stats over cmd channel");
 	if(len != (uint32_t)sizeof(*s))
@@ -426,7 +393,7 @@ void server_stats_reply(struct worker* worker, int reset)
 	struct ub_stats_info s;
 	server_stats_compile(worker, &s, reset);
 	verbose(VERB_ALGO, "write stats replymsg");
-	if(!tube_write_msg(worker->daemon->workers[0]->cmd,
+	if(!tube_write_msg(worker->daemon->workers[0]->cmd, 
 		(uint8_t*)&s, sizeof(s), 0))
 		fatal_exit("could not write stat values over cmd channel");
 }
@@ -435,14 +402,8 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a)
 {
 	total->svr.num_queries += a->svr.num_queries;
 	total->svr.num_queries_ip_ratelimited += a->svr.num_queries_ip_ratelimited;
-	total->svr.num_queries_cookie_valid += a->svr.num_queries_cookie_valid;
-	total->svr.num_queries_cookie_client += a->svr.num_queries_cookie_client;
-	total->svr.num_queries_cookie_invalid += a->svr.num_queries_cookie_invalid;
 	total->svr.num_queries_missed_cache += a->svr.num_queries_missed_cache;
 	total->svr.num_queries_prefetch += a->svr.num_queries_prefetch;
-	total->svr.num_queries_timed_out += a->svr.num_queries_timed_out;
-	if (total->svr.max_query_time_us < a->svr.max_query_time_us)
-		total->svr.max_query_time_us = a->svr.max_query_time_us;
 	total->svr.sum_query_list_size += a->svr.sum_query_list_size;
 	total->svr.ans_expired += a->svr.ans_expired;
 #ifdef USE_DNSCRYPT
@@ -463,7 +424,6 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a)
 		total->svr.qclass_big += a->svr.qclass_big;
 		total->svr.qtcp += a->svr.qtcp;
 		total->svr.qtcp_outgoing += a->svr.qtcp_outgoing;
-		total->svr.qudp_outgoing += a->svr.qudp_outgoing;
 		total->svr.qtls += a->svr.qtls;
 		total->svr.qtls_resume += a->svr.qtls_resume;
 		total->svr.qhttps += a->svr.qhttps;
@@ -484,9 +444,6 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a)
 		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;
-#ifdef USE_CACHEDB
-		total->svr.num_query_cachedb += a->svr.num_query_cachedb;
-#endif
 		for(i=0; i<UB_STATS_QTYPE_NUM; i++)
 			total->svr.qtype[i] += a->svr.qtype[i];
 		for(i=0; i<UB_STATS_QCLASS_NUM; i++)
@@ -530,14 +487,14 @@ void server_stats_insquery(struct ub_server_stats* stats, struct comm_point* c,
 		if(c->ssl != NULL) {
 			stats->qtls++;
 #ifdef HAVE_SSL
-			if(SSL_session_reused(c->ssl))
+			if(SSL_session_reused(c->ssl)) 
 				stats->qtls_resume++;
 #endif
 			if(c->type == comm_http)
 				stats->qhttps++;
 		}
 	}
-	if(repinfo && addr_is_ip6(&repinfo->remote_addr, repinfo->remote_addrlen))
+	if(repinfo && addr_is_ip6(&repinfo->addr, repinfo->addrlen))
 		stats->qipv6++;
 	if( (flags&BIT_QR) )
 		stats->qbit_QR++;
@@ -571,16 +528,3 @@ void server_stats_insrcode(struct ub_server_stats* stats, sldns_buffer* buf)
 			stats->ans_rcode_nodata ++;
 	}
 }
-
-void server_stats_downstream_cookie(struct ub_server_stats* stats,
-	struct edns_data* edns)
-{
-	if(!(edns->edns_present && edns->cookie_present)) return;
-	if(edns->cookie_valid) {
-		stats->num_queries_cookie_valid++;
-	} else if(edns->cookie_client) {
-		stats->num_queries_cookie_client++;
-	} else {
-		stats->num_queries_cookie_invalid++;
-	}
-}
@@ -126,11 +126,4 @@ void server_stats_insquery(struct ub_server_stats* stats, struct comm_point* c,
 */
 void server_stats_insrcode(struct ub_server_stats* stats, struct sldns_buffer* buf);

-/**
- * Add DNS Cookie stats for this query
- * @param stats: the stats
- * @param edns: edns record
- */
-void server_stats_downstream_cookie(struct ub_server_stats* stats,
-	struct edns_data* edns);
 #endif /* DAEMON_STATS_H */
@@ -366,8 +366,9 @@ readpid (const char* file)
 /** write pid to file. 
 * @param pidfile: file name of pid file.
 * @param pid: pid to write to file.
+ * @return false on failure
 */
-static void
+static int
 writepid (const char* pidfile, pid_t pid)
 {
 	int fd;
@@ -382,7 +383,7 @@ writepid (const char* pidfile, pid_t pid)
 		, 0644)) == -1) {
 		log_err("cannot open pidfile %s: %s", 
 			pidfile, strerror(errno));
-		return;
+		return 0;
 	}
 	while(count < strlen(pidbuf)) {
 		ssize_t r = write(fd, pidbuf+count, strlen(pidbuf)-count);
@@ -392,16 +393,17 @@ writepid (const char* pidfile, pid_t pid)
 			log_err("cannot write to pidfile %s: %s",
 				pidfile, strerror(errno));
 			close(fd);
-			return;
+			return 0;
 		} else if(r == 0) {
 			log_err("cannot write any bytes to pidfile %s: "
 				"write returns 0 bytes written", pidfile);
 			close(fd);
-			return;
+			return 0;
 		}
 		count += r;
 	}
 	close(fd);
+	return 1;
 }

 /**
@@ -543,15 +545,7 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 				cfg, 1);
 		if(!daemon->pidfile)
 			fatal_exit("pidfile alloc: out of memory");
-		/* Check old pid if there is no username configured.
-		 * With a username, the assumption is that the privilege
-		 * drop makes a pidfile not removed when the server stopped
-		 * last time. The server does not chown the pidfile for it,
-		 * because that creates privilege escape problems, with the
-		 * pidfile writable by unprivileged users, but used by
-		 * privileged users. */
-		if(!(cfg->username && cfg->username[0]))
-			checkoldpid(daemon->pidfile, pidinchroot);
+		checkoldpid(daemon->pidfile, pidinchroot);
 	}
 #endif

@@ -563,7 +557,18 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode,
 	/* write new pidfile (while still root, so can be outside chroot) */
 #ifdef HAVE_KILL
 	if(cfg->pidfile && cfg->pidfile[0] && need_pidfile) {
-		writepid(daemon->pidfile, getpid());
+		if(writepid(daemon->pidfile, getpid())) {
+			if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 &&
+				pidinchroot) {
+#  ifdef HAVE_CHOWN
+				if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) {
+					verbose(VERB_QUERY, "cannot chown %u.%u %s: %s",
+						(unsigned)cfg_uid, (unsigned)cfg_gid,
+						daemon->pidfile, strerror(errno));
+				}
+#  endif /* HAVE_CHOWN */
+			}
+		}
 	}
 #else
 	(void)daemon;
@@ -741,11 +746,7 @@ run_daemon(const char* cfgfile, int cmdline_verbose, int debug_mode, int need_pi
 	if(daemon->pidfile) {
 		int fd;
 		/* truncate pidfile */
-		fd = open(daemon->pidfile, O_WRONLY | O_TRUNC
-#ifdef O_NOFOLLOW
-			| O_NOFOLLOW
-#endif
-			, 0644);
+		fd = open(daemon->pidfile, O_WRONLY | O_TRUNC, 0644);
 		if(fd != -1)
 			close(fd);
 		/* delete pidfile */
@@ -86,10 +86,6 @@ struct worker {
 	struct daemon* daemon;
 	/** thread id */
 	ub_thread_type thr_id;
-#ifdef HAVE_GETTID
-	/** thread tid, the LWP id. */
-	pid_t thread_tid;
-#endif
 	/** pipe, for commands for this worker */
 	struct tube* cmd;
 	/** the event base this worker works with */
@@ -118,7 +114,7 @@ struct worker {
 	/** do we need to restart or quit (on signal) */
 	int need_to_exit;
 	/** allocation cache for this thread */
-	struct alloc_cache *alloc;
+	struct alloc_cache alloc;
 	/** per thread statistics */
 	struct ub_server_stats stats;
 	/** thread scratch regional */
@@ -131,8 +127,6 @@ struct worker {
 	/** dnstap environment, changed for this thread */
 	struct dt_env dtenv;
 #endif
-	/** reuse existing cache on reload if other conditions allow it. */
-	int reuse_cache;
 };

 /**
@@ -59,7 +59,7 @@
 ******************************************************************************/

 /**
- * This is the default DNS64 prefix that is used when the dns64 module is listed
+ * This is the default DNS64 prefix that is used whent he dns64 module is listed
 * in module-config but when the dns64-prefix variable is not present.
 */
 static const char DEFAULT_DNS64_PREFIX[] = "64:ff9b::/96";
@@ -573,29 +573,28 @@ static enum module_ext_state
 handle_event_pass(struct module_qstate* qstate, int id)
 {
 	struct dns64_qstate* iq = (struct dns64_qstate*)qstate->minfo[id];
-	int synth_all_cfg = qstate->env->cfg->dns64_synthall;
-	int synth_qname = 0;
+	if (iq && iq->state == DNS64_NEW_QUERY
+            && qstate->qinfo.qtype == LDNS_RR_TYPE_PTR
+            && qstate->qinfo.qname_len == 74
+            && !strcmp((char*)&qstate->qinfo.qname[64], "\03ip6\04arpa"))
+        /* Handle PTR queries for IPv6 addresses. */
+        return handle_ipv6_ptr(qstate, id);

-	if(iq && iq->state == DNS64_NEW_QUERY
-		&& qstate->qinfo.qtype == LDNS_RR_TYPE_PTR
-		&& qstate->qinfo.qname_len == 74
-		&& !strcmp((char*)&qstate->qinfo.qname[64], "\03ip6\04arpa")) {
-		/* Handle PTR queries for IPv6 addresses. */
-		return handle_ipv6_ptr(qstate, id);
-	}
+	if (qstate->env->cfg->dns64_synthall &&
+	    iq && iq->state == DNS64_NEW_QUERY
+	    && qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA)
+		return generate_type_A_query(qstate, id);

-	if(iq && iq->state == DNS64_NEW_QUERY &&
-		qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA &&
-		(synth_all_cfg ||
-		(synth_qname=(dns64_always_synth_for_qname(qstate, id)
-			&& !(qstate->query_flags & BIT_CD))))) {
-		if(synth_qname)
-			verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway");
+	if(dns64_always_synth_for_qname(qstate, id) &&
+	    iq && iq->state == DNS64_NEW_QUERY
+	    && !(qstate->query_flags & BIT_CD)
+	    && qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA) {
+		verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway");
 		return generate_type_A_query(qstate, id);
 	}

 	/* We are finished when our sub-query is finished. */
-	if(iq && iq->state == DNS64_SUBQUERY_FINISHED)
+	if (iq && iq->state == DNS64_SUBQUERY_FINISHED)
 		return module_finished;

 	/* Otherwise, pass request to next module. */
@@ -628,37 +627,32 @@ handle_event_moddone(struct module_qstate* qstate, int id)
     *        synthesize in (sec 5.1.2 of RFC6147).
     *   - A successful AAAA query with an answer.
     */
+	if((!iq || iq->state != DNS64_INTERNAL_QUERY)
+            && qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA
+	    && !(qstate->query_flags & BIT_CD)
+	    && !(qstate->return_msg &&
+		    qstate->return_msg->rep &&
+		    reply_find_answer_rrset(&qstate->qinfo,
+			    qstate->return_msg->rep)))
+		/* not internal, type AAAA, not CD, and no answer RRset,
+		 * So, this is a AAAA noerror/nodata answer */
+		return generate_type_A_query(qstate, 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
-	 * synth. */
-	int could_synth =
-		qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA &&
-		(!iq || iq->state != DNS64_INTERNAL_QUERY) &&
-		!(qstate->query_flags & BIT_CD);
-	int has_data = /* whether query returned non-empty rrset */
-		qstate->return_msg &&
-		qstate->return_msg->rep &&
-		reply_find_answer_rrset(&qstate->qinfo, qstate->return_msg->rep);
-	int synth_qname = 0;
-
-	if(could_synth &&
-		(!has_data ||
-		(synth_qname=dns64_always_synth_for_qname(qstate, id)))) {
-		if(synth_qname)
-			verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway");
+	if((!iq || iq->state != DNS64_INTERNAL_QUERY)
+	    && qstate->qinfo.qtype == LDNS_RR_TYPE_AAAA
+	    && !(qstate->query_flags & BIT_CD)
+	    && dns64_always_synth_for_qname(qstate, id)) {
+		/* if it is not internal, AAAA, not CD and listed domain,
+		 * generate from A record and ignore AAAA */
+		verbose(VERB_ALGO, "dns64: ignore-aaaa and synthesize anyway");
 		return generate_type_A_query(qstate, id);
 	}

 	/* Store the response in cache. */
-	if( (!iq || !iq->started_no_cache_store) &&
-		qstate->return_msg &&
-		qstate->return_msg->rep &&
-		!dns_cache_store(
-			qstate->env, &qstate->qinfo, qstate->return_msg->rep,
-			0, 0, 0, NULL,
-			qstate->query_flags, qstate->qstarttime))
+	if ( (!iq || !iq->started_no_cache_store) &&
+		qstate->return_msg && qstate->return_msg->rep &&
+		!dns_cache_store(qstate->env, &qstate->qinfo, qstate->return_msg->rep,
+		0, 0, 0, NULL, qstate->query_flags))
 		log_err("out of memory");

 	/* do nothing */
@@ -847,7 +841,7 @@ dns64_adjust_a(int id, struct module_qstate* super, struct module_qstate* qstate
 	cp = construct_reply_info_base(super->region, rep->flags, rep->qdcount,
 		rep->ttl, rep->prefetch_ttl, rep->serve_expired_ttl,
 		rep->an_numrrsets, rep->ns_numrrsets, rep->ar_numrrsets,
-		rep->rrset_count, rep->security, LDNS_EDE_NONE);
+		rep->rrset_count, rep->security);
 	if(!cp)
 		return;

@@ -975,19 +969,10 @@ dns64_inform_super(struct module_qstate* qstate, int id,
 	}
 	super_dq->state = DNS64_SUBQUERY_FINISHED;

-	/* If there is no successful answer, we're done.
-	 * Guarantee that we have at least a NOERROR reply further on. */
-	if(qstate->return_rcode != LDNS_RCODE_NOERROR
-		|| !qstate->return_msg
-		|| !qstate->return_msg->rep) {
-		return;
-	}
-
-	/* When no A record is found for synthesis fall back to AAAA again. */
-	if(qstate->qinfo.qtype == LDNS_RR_TYPE_A &&
-		!reply_find_answer_rrset(&qstate->qinfo,
-			qstate->return_msg->rep)) {
-		super_dq->state = DNS64_INTERNAL_QUERY;
+	/* If there is no successful answer, we're done. */
+	if (qstate->return_rcode != LDNS_RCODE_NOERROR
+	    || !qstate->return_msg
+	    || !qstate->return_msg->rep) {
 		return;
 	}

@@ -1006,7 +991,7 @@ dns64_inform_super(struct module_qstate* qstate, int id,
 	/* Store the generated response in cache. */
 	if ( (!super_dq || !super_dq->started_no_cache_store) &&
 		!dns_cache_store(super->env, &super->qinfo, super->return_msg->rep,
-		0, 0, 0, NULL, super->query_flags, qstate->qstarttime))
+		0, 0, 0, NULL, super->query_flags))
 		log_err("out of memory");
 }

@@ -305,7 +305,6 @@ dt_msg_fill_net(struct dt_msg *dm,
 		struct sockaddr_storage *qs,
 		struct sockaddr_storage *rs,
 		enum comm_point_type cptype,
-		void *cpssl,
 		ProtobufCBinaryData *qaddr, protobuf_c_boolean *has_qaddr,
 		uint32_t *qport, protobuf_c_boolean *has_qport,
 		ProtobufCBinaryData *raddr, protobuf_c_boolean *has_raddr,
@@ -372,26 +371,13 @@ dt_msg_fill_net(struct dt_msg *dm,
                *has_rport = 1;
        }

+	log_assert(cptype == comm_udp || cptype == comm_tcp);
 	if (cptype == comm_udp) {
 		/* socket_protocol */
 		dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__UDP;
 		dm->m.has_socket_protocol = 1;
 	} else if (cptype == comm_tcp) {
-		if (cpssl == NULL) {
-			/* socket_protocol */
-			dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__TCP;
-			dm->m.has_socket_protocol = 1;
-		} else {
-			/* socket_protocol */
-			dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__DOT;
-			dm->m.has_socket_protocol = 1;
-		}
-	} else if (cptype == comm_http) {
 		/* socket_protocol */
-		dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__DOH;
-		dm->m.has_socket_protocol = 1;
-	} else {
-		/* other socket protocol */
 		dm->m.socket_protocol = DNSTAP__SOCKET_PROTOCOL__TCP;
 		dm->m.has_socket_protocol = 1;
 	}
@@ -402,16 +388,12 @@ dt_msg_send_client_query(struct dt_env *env,
 			 struct sockaddr_storage *qsock,
 			 struct sockaddr_storage *rsock,
 			 enum comm_point_type cptype,
-			 void *cpssl,
-			 sldns_buffer *qmsg,
-			 struct timeval* tstamp)
+			 sldns_buffer *qmsg)
 {
 	struct dt_msg dm;
 	struct timeval qtime;

-	if(tstamp)
-		memcpy(&qtime, tstamp, sizeof(qtime));
-	else 	gettimeofday(&qtime, NULL);
+	gettimeofday(&qtime, NULL);

 	/* type */
 	dt_msg_init(env, &dm, DNSTAP__MESSAGE__TYPE__CLIENT_QUERY);
@@ -425,7 +407,8 @@ dt_msg_send_client_query(struct dt_env *env,
 	dt_fill_buffer(qmsg, &dm.m.query_message, &dm.m.has_query_message);

 	/* socket_family, socket_protocol, query_address, query_port, response_address, response_port */
-	dt_msg_fill_net(&dm, qsock, rsock, cptype, cpssl,
+	log_assert(cptype == comm_udp || cptype == comm_tcp);
+	dt_msg_fill_net(&dm, qsock, rsock, cptype,
 			&dm.m.query_address, &dm.m.has_query_address,
 			&dm.m.query_port, &dm.m.has_query_port,
 			&dm.m.response_address, &dm.m.has_response_address,
@@ -441,7 +424,6 @@ dt_msg_send_client_response(struct dt_env *env,
 			    struct sockaddr_storage *qsock,
 			    struct sockaddr_storage *rsock,
 			    enum comm_point_type cptype,
-			    void *cpssl,
 			    sldns_buffer *rmsg)
 {
 	struct dt_msg dm;
@@ -461,7 +443,8 @@ dt_msg_send_client_response(struct dt_env *env,
 	dt_fill_buffer(rmsg, &dm.m.response_message, &dm.m.has_response_message);

 	/* socket_family, socket_protocol, query_address, query_port, response_address, response_port */
-	dt_msg_fill_net(&dm, qsock, rsock, cptype, cpssl,
+	log_assert(cptype == comm_udp || cptype == comm_tcp);
+	dt_msg_fill_net(&dm, qsock, rsock, cptype,
 			&dm.m.query_address, &dm.m.has_query_address,
 			&dm.m.query_port, &dm.m.has_query_port,
                        &dm.m.response_address, &dm.m.has_response_address,
@@ -476,7 +459,6 @@ dt_msg_send_outside_query(struct dt_env *env,
 			  struct sockaddr_storage *rsock,
 			  struct sockaddr_storage *qsock,
 			  enum comm_point_type cptype,
-			  void *cpssl,
 			  uint8_t *zone, size_t zone_len,
 			  sldns_buffer *qmsg)
 {
@@ -512,7 +494,8 @@ dt_msg_send_outside_query(struct dt_env *env,
 	dt_fill_buffer(qmsg, &dm.m.query_message, &dm.m.has_query_message);

 	/* socket_family, socket_protocol, response_address, response_port, query_address, query_port */
-	dt_msg_fill_net(&dm, rsock, qsock, cptype, cpssl,
+	log_assert(cptype == comm_udp || cptype == comm_tcp);
+	dt_msg_fill_net(&dm, rsock, qsock, cptype,
 			&dm.m.response_address, &dm.m.has_response_address,
 			&dm.m.response_port, &dm.m.has_response_port,
 			&dm.m.query_address, &dm.m.has_query_address,
@@ -527,7 +510,6 @@ dt_msg_send_outside_response(struct dt_env *env,
 	struct sockaddr_storage *rsock,
 	struct sockaddr_storage *qsock,
 	enum comm_point_type cptype,
-	void *cpssl,
 	uint8_t *zone, size_t zone_len,
 	uint8_t *qbuf, size_t qbuf_len,
 	const struct timeval *qtime,
@@ -571,7 +553,8 @@ dt_msg_send_outside_response(struct dt_env *env,
 	dt_fill_buffer(rmsg, &dm.m.response_message, &dm.m.has_response_message);

 	/* socket_family, socket_protocol, response_address, response_port, query_address, query_port */
-	dt_msg_fill_net(&dm, rsock, qsock, cptype, cpssl,
+	log_assert(cptype == comm_udp || cptype == comm_tcp);
+	dt_msg_fill_net(&dm, rsock, qsock, cptype,
 			&dm.m.response_address, &dm.m.has_response_address,
 			&dm.m.response_port, &dm.m.has_response_port,
 			&dm.m.query_address, &dm.m.has_query_address,
@@ -126,16 +126,13 @@ dt_delete(struct dt_env *env);
 * @param rsock: local (service) address/port.
 * @param cptype: comm_udp or comm_tcp.
 * @param qmsg: query message.
- * @param tstamp: timestamp or NULL if none provided.
 */
 void
 dt_msg_send_client_query(struct dt_env *env,
 			 struct sockaddr_storage *qsock,
 			 struct sockaddr_storage *rsock,
 			 enum comm_point_type cptype,
-			 void *cpssl,
-			 struct sldns_buffer *qmsg,
-			 struct timeval* tstamp);
+			 struct sldns_buffer *qmsg);

 /**
 * Create and send a new dnstap "Message" event of type CLIENT_RESPONSE.
@@ -150,7 +147,6 @@ dt_msg_send_client_response(struct dt_env *env,
 			    struct sockaddr_storage *qsock,
 			    struct sockaddr_storage *rsock,
 			    enum comm_point_type cptype,
-			    void *cpssl,
 			    struct sldns_buffer *rmsg);

 /**
@@ -170,7 +166,6 @@ dt_msg_send_outside_query(struct dt_env *env,
 			  struct sockaddr_storage *rsock,
 			  struct sockaddr_storage *qsock,
 			  enum comm_point_type cptype,
-			  void *cpssl,
 			  uint8_t *zone, size_t zone_len,
 			  struct sldns_buffer *qmsg);

@@ -195,7 +190,6 @@ dt_msg_send_outside_response(struct dt_env *env,
 			     struct sockaddr_storage *rsock,
 			     struct sockaddr_storage *qsock,
 			     enum comm_point_type cptype,
-			     void *cpssl,
 			     uint8_t *zone, size_t zone_len,
 			     uint8_t *qbuf, size_t qbuf_len,
 			     const struct timeval *qtime,
@@ -5,76 +5,45 @@
 # Check for required dnstap libraries and add dnstap configure args.
 AC_DEFUN([dt_DNSTAP],
 [
-    AC_ARG_ENABLE([dnstap],
-        AS_HELP_STRING([--enable-dnstap],
-            [Enable dnstap support (requires protobuf-c)]),
-        [opt_dnstap=$enableval],
-        [opt_dnstap=no])
+  AC_ARG_ENABLE([dnstap],
+    AS_HELP_STRING([--enable-dnstap],
+                   [Enable dnstap support (requires protobuf-c)]),
+    [opt_dnstap=$enableval], [opt_dnstap=no])

-    AC_ARG_WITH([dnstap-socket-path],
-        AS_HELP_STRING([--with-dnstap-socket-path=pathname],
-            [set default dnstap socket path]),
-        [opt_dnstap_socket_path=$withval],
-        [opt_dnstap_socket_path="$1"])
+  AC_ARG_WITH([dnstap-socket-path],
+    AS_HELP_STRING([--with-dnstap-socket-path=pathname],
+                   [set default dnstap socket path]),
+    [opt_dnstap_socket_path=$withval], [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_ARG_WITH([protobuf-c],
-            AS_HELP_STRING([--with-protobuf-c=path], [Path where protobuf-c is installed, for dnstap]),
-            [
-                # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
-                if test -f $withval/include/google/protobuf-c/protobuf-c.h; then
-                    CFLAGS="$CFLAGS -I$withval/include/google"
-                else
-                    CFLAGS="$CFLAGS -I$withval/include"
-                fi
-                LDFLAGS="$LDFLAGS -L$withval/lib"
-            ],
-            [
-                ifdef([PKG_CHECK_MODULES],
-                    [
-                        PKG_CHECK_MODULES([PROTOBUFC], [libprotobuf-c],
-                            [
-                                CFLAGS="$CFLAGS $PROTOBUFC_CFLAGS"
-                                LIBS="$LIBS $PROTOBUFC_LIBS"
-                            ],
-                            [
-                                # pkg-config failed; try falling back to known values
-                                # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
-                                if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
-                                    CFLAGS="$CFLAGS -I/usr/include/google"
-                                else
-                                    if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
-                                        CFLAGS="$CFLAGS -I/usr/local/include/google"
-                                        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-                                    else
-                                        AC_MSG_ERROR([The protobuf-c package was not found with pkg-config. Please install protobuf-c!])
-                                    fi
-                                fi
-                            ]
-                        )
-                    ],
-                    [
-                        # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
-                        if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
-                            CFLAGS="$CFLAGS -I/usr/include/google"
-                        else
-                            if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
-                                CFLAGS="$CFLAGS -I/usr/local/include/google"
-                                LDFLAGS="$LDFLAGS -L/usr/local/lib"
-                            fi
-                        fi
-                    ]
-                )
-            ]
-        )
-        AC_SEARCH_LIBS([protobuf_c_message_pack], [protobuf-c], [],
-            AC_MSG_ERROR([The protobuf-c library was not found. Please install the development libraries for protobuf-c!]))
-        $2
-    else
-        $3
+  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_ARG_WITH([protobuf-c], AS_HELP_STRING([--with-protobuf-c=path],
+    	[Path where protobuf-c is installed, for dnstap]), [
+	  # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
+	  if test -f $withval/include/google/protobuf-c/protobuf-c.h; then
+	    CFLAGS="$CFLAGS -I$withval/include/google"
+	  else
+	    CFLAGS="$CFLAGS -I$withval/include"
+	  fi
+	  LDFLAGS="$LDFLAGS -L$withval/lib"
+	], [
+	  # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0
+	  if test -f /usr/include/google/protobuf-c/protobuf-c.h; then
+	    CFLAGS="$CFLAGS -I/usr/include/google"
+	  else
+	    if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then
+	      CFLAGS="$CFLAGS -I/usr/local/include/google"
+	      LDFLAGS="$LDFLAGS -L/usr/local/lib"
+	    fi
+	  fi
+    ])
+    AC_SEARCH_LIBS([protobuf_c_message_pack], [protobuf-c], [],
+      AC_MSG_ERROR([The protobuf-c library was not found. Please install protobuf-c!]))
+    $2
+  else
+    $3
+  fi
 ])
@@ -13,8 +13,8 @@
 // with this file. If not, see:
 //
 // <http://creativecommons.org/publicdomain/zero/1.0/>.
-
 syntax = "proto2";
+
 package dnstap;

 // "Dnstap": this is the top-level dnstap type, which is a "union" type that
@@ -56,60 +56,11 @@ enum SocketFamily {
    INET6 = 2;  // IPv6 (RFC 2460)
 }

-// SocketProtocol: the protocol used to transport a DNS message.
+// SocketProtocol: the transport protocol of a socket. This specifies how to
+// interpret "transport port" fields.
 enum SocketProtocol {
-    UDP = 1;         // DNS over UDP transport (RFC 1035 section 4.2.1)
-    TCP = 2;         // DNS over TCP transport (RFC 1035 section 4.2.2)
-    DOT = 3;         // DNS over TLS (RFC 7858)
-    DOH = 4;         // DNS over HTTPS (RFC 8484)
-    DNSCryptUDP = 5; // DNSCrypt over UDP (https://dnscrypt.info/protocol)
-    DNSCryptTCP = 6; // DNSCrypt over TCP (https://dnscrypt.info/protocol)
-    DOQ = 7;         // DNS over QUIC (RFC 9250)
-}
-
-// Policy: information about any name server operator policy
-// applied to the processing of a DNS message.
-message Policy {
-
-    // Match: what aspect of the message or message exchange
-    // triggered the application of the Policy.
-    enum Match {
-        QNAME = 1;       // Name in question section of query
-        CLIENT_IP = 2;   // Client IP address
-        RESPONSE_IP = 3; // Address in A/AAAA RRSet
-        NS_NAME = 4;     // Authoritative name server, by name
-        NS_IP = 5;       // Authoritative name server, by IP address
-    }
-
-    // The Action taken to implement the Policy.
-    enum Action {
-        NXDOMAIN = 1;   // Respond with NXDOMAIN
-        NODATA = 2;     // Respond with empty answer section
-        PASS = 3;       // Do not alter the response (passthrough)
-        DROP = 4;       // Do not respond.
-        TRUNCATE = 5;   // Truncate UDP response, forcing TCP retry
-        LOCAL_DATA = 6; // Respond with local data from policy
-    }
-
-    // type: the type of policy applied, e.g. "RPZ" for a
-    // policy from a Response Policy Zone.
-    optional string type = 1;
-
-    // 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.
-    optional bytes rule = 2;
-
-    // action: the policy action taken in response to the
-    // rule match.
-    optional Action action = 3;
-
-    // match: the feature of the message exchange which matched the rule.
-    optional Match match = 4;
-
-    // The matched value. Format depends on the matched feature .
-    optional bytes value = 5;
+    UDP = 1;    // User Datagram Protocol (RFC 768)
+    TCP = 2;    // Transmission Control Protocol (RFC 793)
 }

 // Message: a wire-format (RFC 1035 section 4) DNS message and associated
@@ -207,24 +158,6 @@ message Message {
        // STUB_RESPONSE is a DNS response message sent from a DNS server to a
        // stub resolver, from the perspective of the stub resolver.
        STUB_RESPONSE = 10;
-
-        // TOOL_QUERY is a DNS query message sent from a DNS software tool to a
-        // DNS server, from the perspective of the tool.
-        TOOL_QUERY = 11;
-
-        // TOOL_RESPONSE is a DNS response message received by a DNS software
-        // tool from a DNS server, from the perspective of the tool.
-        TOOL_RESPONSE = 12;
-
-        // UPDATE_QUERY is a Dynamic DNS Update request (RFC 2136) received
-        // by an authoritative name server, from the perspective of the
-        // authoritative name server.
-        UPDATE_QUERY = 13;
-
-        // UPDATE_RESPONSE is a Dynamic DNS Update response (RFC 2136) sent
-        // from an authoritative name server, from the perspective of the
-        // authoritative name server.
-        UPDATE_RESPONSE = 14;
    }

    // One of the Type values described above.
@@ -282,9 +215,6 @@ message Message {

    // The responder's original wire-format DNS response message, verbatim.
    optional bytes              response_message = 14;
-
-    // Operator policy applied to the processing of this message, if any.
-    optional Policy             policy = 15;
 }

 // All fields except for 'type' in the Message schema are optional.
@@ -306,6 +236,7 @@ message Message {

 // RESOLVER_QUERY:
 //      socket_family, socket_protocol
+//      query_name, query_type, query_class
 //      query_message
 //      query_time_sec, query_time_nsec
 //      query_zone
@@ -313,6 +244,7 @@ message Message {

 // RESOLVER_RESPONSE:
 //      socket_family, socket_protocol
+//      query_name, query_type, query_class
 //      query_time_sec, query_time_nsec
 //      query_zone
 //      response_address, response_port
@@ -188,9 +188,9 @@ mq_wakeup_cb(void* arg)

 /** start timer to wakeup dtio because there is content in the queue */
 static void
-dt_msg_queue_start_timer(struct dt_msg_queue* mq, int wakeupnow)
+dt_msg_queue_start_timer(struct dt_msg_queue* mq)
 {
-	struct timeval tv = {0};
+	struct timeval tv;
 	/* Start a timer to process messages to be logged.
 	 * If we woke up the dtio thread for every message, the wakeup
 	 * messages take up too much processing power.  If the queue
@@ -204,26 +204,19 @@ dt_msg_queue_start_timer(struct dt_msg_queue* mq, int wakeupnow)

 	/* do not start the timer if a timer already exists, perhaps
 	 * in another worker.  So this variable is protected by a lock in
-	 * dtio. */
-
-	/* If we need to wakeupnow, 0 the timer to force the callback. */
+	 * dtio */
 	lock_basic_lock(&mq->dtio->wakeup_timer_lock);
 	if(mq->dtio->wakeup_timer_enabled) {
-		if(wakeupnow) {
-			comm_timer_set(mq->wakeup_timer, &tv);
-		}
 		lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
 		return;
 	}
 	mq->dtio->wakeup_timer_enabled = 1; /* we are going to start one */
+	lock_basic_unlock(&mq->dtio->wakeup_timer_lock);

 	/* start the timer, in mq, in the event base of our worker */
-	if(!wakeupnow) {
-		tv.tv_sec = 1;
-		tv.tv_usec = 0;
-	}
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
 	comm_timer_set(mq->wakeup_timer, &tv);
-	lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
 }

 void
@@ -290,8 +283,10 @@ dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)
 	/* release lock */
 	lock_basic_unlock(&mq->lock);

-	if(wakeupnow || wakeupstarttimer) {
-		dt_msg_queue_start_timer(mq, wakeupnow);
+	if(wakeupnow) {
+		dtio_wakeup(mq->dtio);
+	} else if(wakeupstarttimer) {
+		dt_msg_queue_start_timer(mq);
 	}
 }

@@ -788,7 +783,7 @@ static int dtio_write_ssl(struct dt_io_thread* dtio, uint8_t* buf,
 			}
 			return -1;
 		}
-		log_crypto_err_io("dnstap io, could not SSL_write", want);
+		log_crypto_err("dnstap io, could not SSL_write");
 		return -1;
 	}
 	return r;
@@ -954,7 +949,7 @@ static int dtio_write_more(struct dt_io_thread* dtio)
 * -1: continue, >0: number of bytes read into buffer */
 static ssize_t receive_bytes(struct dt_io_thread* dtio, void* buf, size_t len) {
 	ssize_t r;
-	r = recv(dtio->fd, (void*)buf, len, MSG_DONTWAIT);
+	r = recv(dtio->fd, (void*)buf, len, 0);
 	if(r == -1) {
 		char* to = dtio->socket_path;
 		if(!to) to = dtio->ip_str;
@@ -1029,7 +1024,7 @@ static int ssl_read_bytes(struct dt_io_thread* dtio, void* buf, size_t len)
 				"other side");
 			return 0;
 		}
-		log_crypto_err_io("could not SSL_read", want);
+		log_crypto_err("could not SSL_read");
 		verbose(VERB_DETAIL, "dnstap io: output closed by the "
 				"other side");
 		return 0;
@@ -1431,8 +1426,8 @@ static int dtio_ssl_handshake(struct dt_io_thread* dtio,
 		} else {
 			unsigned long err = ERR_get_error();
 			if(!squelch_err_ssl_handshake(err)) {
-				log_crypto_err_io_code("dnstap io, ssl handshake failed",
-					want, err);
+				log_crypto_err_code("dnstap io, ssl handshake failed",
+					err);
 				verbose(VERB_OPS, "dnstap io, ssl handshake failed "
 					"from %s", dtio->ip_str);
 			}
@@ -1960,7 +1955,7 @@ static int dtio_open_output_tcp(struct dt_io_thread* dtio)
 	memset(&addr, 0, sizeof(addr));
 	addrlen = (socklen_t)sizeof(addr);

-	if(!extstrtoaddr(dtio->ip_str, &addr, &addrlen, UNBOUND_DNS_PORT)) {
+	if(!extstrtoaddr(dtio->ip_str, &addr, &addrlen)) {
 		log_err("could not parse IP '%s'", dtio->ip_str);
 		return 0;
 	}
@@ -61,7 +61,6 @@
 #include "services/listen_dnsport.h"
 #include "sldns/sbuffer.h"
 #include "sldns/wire2str.h"
-#include "sldns/pkthdr.h"
 #ifdef USE_DNSTAP
 #include <protobuf-c/protobuf-c.h>
 #include "dnstap/dnstap.pb-c.h"
@@ -273,7 +272,7 @@ static int make_tcp_accept(char* ip)

 	memset(&addr, 0, sizeof(addr));
 	len = (socklen_t)sizeof(addr);
-	if(!extstrtoaddr(ip, &addr, &len, UNBOUND_DNS_PORT)) {
+	if(!extstrtoaddr(ip, &addr, &len)) {
 		log_err("could not parse IP '%s'", ip);
 		return -1;
 	}
@@ -449,7 +448,6 @@ static char* q_of_msg(ProtobufCBinaryData message)
 	char buf[300];
 	/* header, name, type, class minimum to get the query tuple */
 	if(message.len < 12 + 1 + 4 + 4) return NULL;
-	if(LDNS_QDCOUNT(message.data) < 1) return NULL;
 	if(sldns_wire2str_rrquestion_buf(message.data+12, message.len-12,
 		buf, sizeof(buf)) != 0) {
 		/* remove trailing newline, tabs to spaces */
@@ -504,7 +502,7 @@ static char* tv_to_str(protobuf_c_boolean has_time_sec, uint64_t time_sec,
 	time_t time_t_sec;
 	memset(&tv, 0, sizeof(tv));
 	if(has_time_sec) tv.tv_sec = time_sec;
-	if(has_time_nsec) tv.tv_usec = time_nsec/1000;
+	if(has_time_nsec) tv.tv_usec = time_nsec;

 	buf[0]=0;
 	time_t_sec = tv.tv_sec;
@@ -619,7 +617,7 @@ static void log_data_frame(uint8_t* pkt, size_t len)
 static ssize_t receive_bytes(struct tap_data* data, int fd, void* buf,
 	size_t len)
 {
-	ssize_t ret = recv(fd, buf, len, MSG_DONTWAIT);
+	ssize_t ret = recv(fd, buf, len, 0);
 	if(ret == 0) {
 		/* closed */
 		if(verbosity) log_info("dnstap client stream closed from %s",
@@ -708,7 +706,7 @@ static ssize_t ssl_read_bytes(struct tap_data* data, void* buf, size_t len)
 				(data->id?data->id:""));
 			return 0;
 		}
-		log_crypto_err_io("could not SSL_read", want);
+		log_crypto_err("could not SSL_read");
 		if(verbosity) log_info("dnstap client stream closed from %s",
 			(data->id?data->id:""));
 		return 0;
@@ -760,11 +758,10 @@ static int reply_with_accept(struct tap_data* data)
 	fd_set_block(data->fd);
 	if(data->ssl) {
 		if((r=SSL_write(data->ssl, acceptframe, len)) <= 0) {
-			int r2;
-			if((r2=SSL_get_error(data->ssl, r)) == SSL_ERROR_ZERO_RETURN)
+			if(SSL_get_error(data->ssl, r) == SSL_ERROR_ZERO_RETURN)
 				log_err("SSL_write, peer closed connection");
 			else
-				log_crypto_err_io("could not SSL_write", r2);
+				log_err("could not SSL_write");
 			fd_set_nonblock(data->fd);
 			free(acceptframe);
 			return 0;
@@ -792,7 +789,7 @@ static int reply_with_accept(struct tap_data* data)

 /** reply with FINISH control frame to bidirectional client,
 * returns 0 on error */
-static int reply_with_finish(struct tap_data* data)
+static int reply_with_finish(int fd)
 {
 #ifdef USE_DNSTAP
 	size_t len = 0;
@@ -802,35 +799,21 @@ static int reply_with_finish(struct tap_data* data)
 		return 0;
 	}

-	fd_set_block(data->fd);
-	if(data->ssl) {
-		int r;
-		if((r=SSL_write(data->ssl, finishframe, len)) <= 0) {
-			int r2;
-			if((r2=SSL_get_error(data->ssl, r)) == SSL_ERROR_ZERO_RETURN)
-				log_err("SSL_write, peer closed connection");
-			else
-				log_crypto_err_io("could not SSL_write", r2);
-			fd_set_nonblock(data->fd);
-			free(finishframe);
-			return 0;
-		}
-	} else {
-		if(send(data->fd, finishframe, len, 0) == -1) {
-			log_err("send failed: %s", sock_strerror(errno));
-			fd_set_nonblock(data->fd);
-			free(finishframe);
-			return 0;
-		}
+	fd_set_block(fd);
+	if(send(fd, finishframe, len, 0) == -1) {
+		log_err("send failed: %s", sock_strerror(errno));
+		fd_set_nonblock(fd);
+		free(finishframe);
+		return 0;
 	}
 	if(verbosity) log_info("sent control frame(finish)");

-	fd_set_nonblock(data->fd);
+	fd_set_nonblock(fd);
 	free(finishframe);
 	return 1;
 #else
 	log_err("no dnstap compiled, no reply");
-	(void)data;
+	(void)fd;
 	return 0;
 #endif
 }
@@ -950,7 +933,7 @@ static int tap_handshake(struct tap_data* data)
 #endif /* HAVE_SSL */

 /** callback for dnstap listener */
-void dtio_tap_callback(int ATTR_UNUSED(fd), short ATTR_UNUSED(bits), void* arg)
+void dtio_tap_callback(int fd, short ATTR_UNUSED(bits), void* arg)
 {
 	struct tap_data* data = (struct tap_data*)arg;
 	if(verbosity>=3) log_info("tap callback");
@@ -1033,7 +1016,7 @@ void dtio_tap_callback(int ATTR_UNUSED(fd), short ATTR_UNUSED(bits), void* arg)
 		}
 	} else if(data->len >= 4 && sldns_read_uint32(data->frame) ==
 		FSTRM_CONTROL_FRAME_STOP && data->is_bidirectional) {
-		if(!reply_with_finish(data)) {
+		if(!reply_with_finish(fd)) {
 			tap_data_free(data);
 			return;
 		}
@@ -1430,12 +1413,11 @@ void worker_sighandler(int ATTR_UNUSED(sig), void* ATTR_UNUSED(arg))
 struct outbound_entry* worker_send_query(
 	struct query_info* ATTR_UNUSED(qinfo), uint16_t ATTR_UNUSED(flags),
 	int ATTR_UNUSED(dnssec), int ATTR_UNUSED(want_dnssec),
-	int ATTR_UNUSED(nocaps), int ATTR_UNUSED(check_ratelimit),
-	struct sockaddr_storage* ATTR_UNUSED(addr),
+	int ATTR_UNUSED(nocaps), struct sockaddr_storage* ATTR_UNUSED(addr),
 	socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone),
 	size_t ATTR_UNUSED(zonelen), int ATTR_UNUSED(tcp_upstream),
 	int ATTR_UNUSED(ssl_upstream), char* ATTR_UNUSED(tls_auth_name),
-	struct module_qstate* ATTR_UNUSED(q), int* ATTR_UNUSED(was_ratelimited))
+	struct module_qstate* ATTR_UNUSED(q))
 {
 	log_assert(0);
 	return 0;
@@ -1464,12 +1446,11 @@ worker_alloc_cleanup(void* ATTR_UNUSED(arg))
 struct outbound_entry* libworker_send_query(
 	struct query_info* ATTR_UNUSED(qinfo), uint16_t ATTR_UNUSED(flags),
 	int ATTR_UNUSED(dnssec), int ATTR_UNUSED(want_dnssec),
-	int ATTR_UNUSED(nocaps), int ATTR_UNUSED(check_ratelimit),
-	struct sockaddr_storage* ATTR_UNUSED(addr),
+	int ATTR_UNUSED(nocaps), struct sockaddr_storage* ATTR_UNUSED(addr),
 	socklen_t ATTR_UNUSED(addrlen), uint8_t* ATTR_UNUSED(zone),
 	size_t ATTR_UNUSED(zonelen), int ATTR_UNUSED(tcp_upstream),
 	int ATTR_UNUSED(ssl_upstream), char* ATTR_UNUSED(tls_auth_name),
-	struct module_qstate* ATTR_UNUSED(q), int* ATTR_UNUSED(was_ratelimited))
+	struct module_qstate* ATTR_UNUSED(q))
 {
 	log_assert(0);
 	return 0;
@@ -19,10 +19,11 @@ The DNSTAP code has BSD license in dnstap/dnstap.c.
 * Make and install: ./configure; make; make install
  * --with-libevent=/path/to/libevent
  	Can be set to either the system install or the build directory.
-	--with-libevent=no gives a builtin alternative implementation.
-	Libevent is enabled by default, it is useful when having many
-	(thousands) of outgoing ports. This improves randomization and spoof
-	resistance. It also allows a higher number of outgoing queries.
+	--with-libevent=no (default) gives a builtin alternative 
+	implementation. libevent is useful when having many (thousands) 
+	of outgoing ports. This improves randomization and spoof 
+	resistance. For the default of 16 ports the builtin alternative 
+	works well and is a little faster.
  * --with-libexpat=/path/to/libexpat
  	Can be set to the install directory of libexpat.
  * --without-pthreads 
@@ -28,23 +28,3 @@ prefix. For example:
    ;; ANSWER SECTION:
    jazz-v4.viagenie.ca.        86400   IN      AAAA    64:ff9b::ce7b:1f02

-
-NAT64 support was added by David Lamparter in 2022; license(s) of the
-surrounding code apply.  Note that NAT64 is closely related but functionally
-orthogonal to DNS64;  it allows Unbound to send outgoing queries to IPv4-only
-servers over IPv6 through the configured NAT64 prefix.  This allows running
-an Unbound instance on an IPv6-only host without breaking every single domain
-that only has IPv4 servers.  Whether that Unbound instance also does DNS64 is
-an independent choice.
-
-To enable NAT64 in Unbound, add to unbound.conf's "server" section:
-
-    do-nat64: yes
-
-The NAT64 prefix defaults to the DNS64 prefix, which in turn defaults to the
-standard 64:FF9B::/96 prefix.  You can reconfigure it with:
-
-    nat64-prefix: 64:FF9B::/96
-
-To test NAT64 operation, pick a domain that only has IPv4 reachability for its
-nameservers and try resolving any names in that domain.
@@ -17,7 +17,7 @@ server:
 	# whitespace is not necessary, but looks cleaner.

 	# verbosity number, 0 is least verbose. 1 is default.
-	# verbosity: 1
+	verbosity: 1

 	# print statistics to the log (for every thread) every N seconds.
 	# Set to "" or 0 to disable. Default is disabled.
@@ -35,14 +35,9 @@ server:
 	# statistics-cumulative: no

 	# enable extended statistics (query types, answer codes, status)
-	# printed from unbound-control. Default off, because of speed.
+	# printed from unbound-control. default off, because of speed.
 	# extended-statistics: no

-	# Inhibits selected extended statistics (qtype, qclass, qopcode, rcode,
-	# rpz-actions) from printing if their value is 0.
-	# Default on.
-	# statistics-inhibit-zero: yes
-
 	# number of threads to create. 1 disables threading.
 	# num-threads: 1

@@ -55,16 +50,11 @@ server:
 	# interface: 192.0.2.154
 	# interface: 192.0.2.154@5003
 	# interface: 2001:DB8::5
-	# interface: eth0@5003

 	# enable this feature to copy the source address of queries to reply.
 	# Socket options are not supported on all platforms. experimental.
 	# interface-automatic: no

-	# instead of the default port, open additional ports separated by
-	# spaces when interface-automatic is enabled, by listing them here.
-	# interface-automatic-ports: ""
-
 	# port to answer queries from
 	# port: 53

@@ -143,8 +133,8 @@ server:
 	# edns-buffer-size: 1232

 	# Maximum UDP response size (not applied to TCP response).
-	# Suggested values are 512 to 4096. Default is 1232. 65536 disables it.
-	# max-udp-size: 1232
+	# Suggested values are 512 to 4096. Default is 4096. 65536 disables it.
+	# max-udp-size: 4096

 	# max memory to use for stream(tcp and tls) waiting result buffers.
 	# stream-wait-size: 4m
@@ -174,38 +164,13 @@ server:
 	# perform connect for UDP sockets to mitigate ICMP side channel.
 	# udp-connect: yes

-	# The number of retries, per upstream nameserver in a delegation, when
-	# a throwaway response (also timeouts) is received.
+	# The number of retries when a non-positive response is received.
 	# outbound-msg-retry: 5

-	# Hard limit on the number of outgoing queries Unbound will make while
-	# resolving a name, making sure large NS sets do not loop.
-	# It resets on query restarts (e.g., CNAME) and referrals.
-	# max-sent-count: 32
-
-	# Hard limit on the number of times Unbound is allowed to restart a
-	# query upon encountering a CNAME record.
-	# max-query-restarts: 11
-
 	# msec for waiting for an unknown server to reply.  Increase if you
 	# are behind a slow satellite link, to eg. 1128.
 	# unknown-server-time-limit: 376

-	# msec before recursion replies are dropped. The work item continues.
-	# discard-timeout: 1900
-
-	# Max number of replies waiting for recursion per IP address.
-	# wait-limit: 1000
-
-	# Max replies waiting for recursion for IP address with cookie.
-	# wait-limit-cookie: 10000
-
-	# Apart from the default, the wait limit can be set for a netblock.
-	# wait-limit-netblock: 192.0.2.0/24 50000
-
-	# Apart from the default, the wait limit with cookie can be adjusted.
-	# wait-limit-cookie-netblock: 192.0.2.0/24 50000
-
 	# the amount of memory to use for the RRset cache.
 	# plain value in bytes or you can append k, m or G. default is "4Mb".
 	# rrset-cache-size: 4m
@@ -226,11 +191,6 @@ server:
 	# the time to live (TTL) value cap for negative responses in the cache
 	# cache-max-negative-ttl: 3600

-	# the time to live (TTL) value lower bound, in seconds. Default 0.
-	# For negative responses in the cache. If disabled, default,
-	# cache-min-tll applies if configured.
-	# cache-min-negative-ttl: 0
-
 	# the time to live (TTL) value for cached roundtrip times, lameness and
 	# EDNS version information for hosts. In seconds.
 	# infra-host-ttl: 900
@@ -238,9 +198,6 @@ server:
 	# minimum wait time for responses, increase if uplink is long. In msec.
 	# infra-cache-min-rtt: 50

-	# maximum wait time for responses. In msec.
-	# infra-cache-max-rtt: 120000
-
 	# enable to make server probe down hosts more frequently.
 	# infra-keep-probing: no

@@ -252,8 +209,7 @@ server:
 	# the maximum number of hosts that are cached (roundtrip, EDNS, lame).
 	# infra-cache-numhosts: 10000

-	# define a number of tags here, use with local-zone, access-control,
-	# interface-*.
+	# define a number of tags here, use with local-zone, access-control.
 	# repeat the define-tag statement to add additional tags.
 	# define-tag: "tag1 tag2 tag3"

@@ -263,18 +219,6 @@ server:
 	# Enable IPv6, "yes" or "no".
 	# 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
-	# 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.
-	# Consider also enabling prefer-ip6 to prefer native IPv6 connections
-	# to nameservers.
-	# do-nat64: no
-
-	# NAT64 prefix.  Defaults to using dns64-prefix value.
-	# nat64-prefix: 64:ff9b::0/96
-
 	# Enable UDP, "yes" or "no".
 	# do-udp: yes

@@ -303,14 +247,9 @@ server:
 	# Enable EDNS TCP keepalive option.
 	# edns-tcp-keepalive: no

-	# Timeout for EDNS TCP keepalive, in msec. Overrides tcp-idle-timeout
-	# if edns-tcp-keepalive is set.
+	# Timeout for EDNS TCP keepalive, in msec.
 	# edns-tcp-keepalive-timeout: 120000

-	# UDP queries that have waited in the socket buffer for a long time
-	# can be dropped. Default is 0, disabled. In seconds, such as 3.
-	# sock-queue-timeout: 0
-
 	# Use systemd socket activation for UDP, TCP, and control sockets.
 	# use-systemd: no

@@ -324,10 +263,11 @@ server:
 	# Choose deny (drop message), refuse (polite error reply),
 	# allow (recursive ok), allow_setrd (recursive ok, rd bit is forced on),
 	# allow_snoop (recursive and nonrecursive ok)
-	# allow_cookie (allow UDP with valid cookie or stateful transport)
 	# deny_non_local (drop queries unless can be answered from local-data)
 	# refuse_non_local (like deny_non_local but polite error reply).
+	# access-control: 0.0.0.0/0 refuse
 	# access-control: 127.0.0.0/8 allow
+	# access-control: ::0/0 refuse
 	# access-control: ::1 allow
 	# access-control: ::ffff:127.0.0.1 allow

@@ -336,7 +276,7 @@ server:
 	# are tagged with one of these tags.
 	# access-control-tag: 192.0.2.0/24 "tag2 tag3"

-	# set action for particular tag for given access control element.
+	# 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.
@@ -348,58 +288,6 @@ server:
 	# Set view for access control element
 	# access-control-view: 192.0.2.0/24 viewname

-	# Similar to 'access-control:' but for interfaces.
-	# Control which listening interfaces are allowed to accept (recursive)
-	# queries for this server.
-	# The specified interfaces should be the same as the ones specified in
-	# 'interface:' followed by the action.
-	# The actions are the same as 'access-control:' above.
-	# By default all the interfaces configured are refused.
-	# Note: any 'access-control*:' setting overrides all 'interface-*:'
-	# settings for targeted clients.
-	# interface-action: 192.0.2.153 allow
-	# interface-action: 192.0.2.154 allow
-	# interface-action: 192.0.2.154@5003 allow
-	# interface-action: 2001:DB8::5 allow
-	# interface-action: eth0@5003 allow
-
-	# Similar to 'access-control-tag:' but for interfaces.
-	# Tag interfaces with a list of tags (in "" with spaces between).
-	# Interfaces using these tags use localzones that are tagged with one
-	# of these tags.
-	# The specified interfaces should be the same as the ones specified in
-	# 'interface:' followed by the list of tags.
-	# Note: any 'access-control*:' setting overrides all 'interface-*:'
-	# settings for targeted clients.
-	# interface-tag: eth0@5003 "tag2 tag3"
-
-	# Similar to 'access-control-tag-action:' but for interfaces.
-	# Set action for particular tag for a given interface element.
-	# If you have multiple tag values, the tag used to lookup the action
-	# is the first tag match between interface-tag and local-zone-tag
-	# where "first" comes from the order of the define-tag values.
-	# The specified interfaces should be the same as the ones specified in
-	# 'interface:' followed by the tag and action.
-	# Note: any 'access-control*:' setting overrides all 'interface-*:'
-	# settings for targeted clients.
-	# interface-tag-action: eth0@5003 tag3 refuse
-
-	# Similar to 'access-control-tag-data:' but for interfaces.
-	# Set redirect data for a particular tag for an interface element.
-	# The specified interfaces should be the same as the ones specified in
-	# 'interface:' followed by the tag and the redirect data.
-	# Note: any 'access-control*:' setting overrides all 'interface-*:'
-	# settings for targeted clients.
-	# interface-tag-data: eth0@5003 tag2 "A 127.0.0.1"
-
-	# Similar to 'access-control-view:' but for interfaces.
-	# Set view for an interface element.
-	# The specified interfaces should be the same as the ones specified in
-	# 'interface:' followed by the view name.
-	# Note: any 'access-control*:' setting overrides all 'interface-*:'
-	# settings for targeted clients.
-	# interface-view: eth0@5003 viewname
-
 	# if given, a chroot(2) is done to the given directory.
 	# i.e. you can chroot to the working directory, for example,
 	# for extra security, but make sure all files are in that directory.
@@ -463,9 +351,6 @@ server:
 	# filtering log-queries and log-replies from the log.
 	# log-tag-queryreply: no

-	# log with destination address, port and type for log-replies.
-	# log-destaddr: no
-
 	# log the local-zone actions, like local-zone type inform is enabled
 	# also for the other local zone types.
 	# log-local-actions: no
@@ -544,10 +429,6 @@ server:
 	# to validate the zone.
 	# harden-algo-downgrade: no

-	# Harden against unknown records in the authority section and the
-	# additional section.
-	# harden-unknown-additional: no
-
 	# Sent minimum amount of information to upstream servers to enhance
 	# privacy. Only sent minimum required labels of the QNAME and set QTYPE
 	# to A when possible.
@@ -561,7 +442,7 @@ server:

 	# Aggressive NSEC uses the DNSSEC NSEC chain to synthesize NXDOMAIN
 	# and other denials, using information from previous NXDOMAINs answers.
-	# aggressive-nsec: yes
+	# aggressive-nsec: no

 	# Use 0x20-encoded random bits in the query to foil spoof attempts.
 	# This feature is an experimental implementation of draft dns-0x20.
@@ -708,11 +589,6 @@ server:
 	# that set CD but cannot validate themselves.
 	# ignore-cd-flag: no

-	# Disable the DO flag in outgoing requests. It is helpful for upstream
-	# devices that cannot handle DNSSEC information. But do not enable it
-	# otherwise, because it would stop DNSSEC validation.
-	# disable-edns-do: no
-
 	# Serve expired responses from cache, with serve-expired-reply-ttl in
 	# the response, and then attempt to fetch the data afresh.
 	# serve-expired: no
@@ -860,8 +736,6 @@ server:
 	# o always_transparent, always_refuse, always_nxdomain, always_nodata,
 	#   always_deny resolve in that way but ignore local data for
 	#   that name
-	# o block_a resolves all records normally but returns
-	#   NODATA for A queries and ignores local data for that name
 	# o always_null returns 0.0.0.0 or ::0 for any name in the zone.
 	# o noview breaks out of that view towards global local-zones.
 	#
@@ -937,8 +811,6 @@ server:

 	# Add system certs to the cert bundle, from the Windows Cert Store
 	# tls-win-cert: no
-	# and on other systems, the default openssl certificates
-	# tls-system-cert: no

 	# Pad queries over TLS upstreams
 	# pad-queries: yes
@@ -968,10 +840,6 @@ server:
 	# Disable TLS for DNS-over-HTTP downstream service.
 	# http-notls-downstream: no

-	# The interfaces that use these listed port numbers will support and
-	# expect PROXYv2. For UDP and TCP/TLS interfaces.
-	# proxy-protocol-port: portno for each of the port numbers.
-
 	# DNS64 prefix. Must be specified when DNS64 is use.
 	# Enable dns64 in module-config.  Used to synthesize IPv6 from IPv4.
 	# dns64-prefix: 64:ff9b::0/96
@@ -992,10 +860,6 @@ server:
 	# 0 blocks when ratelimited, otherwise let 1/xth traffic through
 	# ratelimit-factor: 10

-	# Aggressive rate limit when the limit is reached and until demand has
-	# decreased in a 2 second rate window.
-	# ratelimit-backoff: no
-
 	# override the ratelimit for a specific domain name.
 	# give this setting multiple times to have multiple overrides.
 	# ratelimit-for-domain: example.com 1000
@@ -1008,13 +872,6 @@ server:
 	# if 0(default) it is disabled, otherwise states qps allowed per ip address
 	# ip-ratelimit: 0

-	# global query ratelimit for all ip addresses with a valid DNS Cookie.
-	# feature is experimental.
-	# if 0(default) it is disabled, otherwise states qps allowed per ip address
-	# useful in combination with 'allow_cookie'.
-	# If used, suggested to be higher than ip-ratelimit, tenfold.
-	# ip-ratelimit-cookie: 0
-
 	# ip ratelimits are tracked in a cache, size in bytes of cache (or k,m).
 	# ip-ratelimit-size: 4m
 	# ip ratelimit cache slabs, reduces lock contention if equal to cpucount.
@@ -1023,10 +880,6 @@ server:
 	# 0 blocks when ip is ratelimited, otherwise let 1/xth traffic through
 	# ip-ratelimit-factor: 10

-	# Aggressive rate limit when the limit is reached and until demand has
-	# decreased in a 2 second rate window.
-	# ip-ratelimit-backoff: no
-
 	# Limit the number of connections simultaneous from a netblock
 	# tcp-connection-limit: 192.0.2.0/24 12

@@ -1036,22 +889,6 @@ server:
 	# the number of servers that will be used in the fast server selection.
 	# fast-server-num: 3

-	# reply to requests containing DNS Cookies as specified in RFC 7873 and RFC 9018.
-	# answer-cookie: no
-
-	# secret for DNS Cookie generation.
-	# useful for anycast deployments.
-	# example value "000102030405060708090a0b0c0d0e0f".
-	# cookie-secret: <128 bit random hex string>
-
-	# Enable to attach Extended DNS Error codes (RFC8914) to responses.
-	# ede: no
-
-	# Enable to attach an Extended DNS Error (RFC8914) Code 3 - Stale
-	# Answer as EDNS0 option to expired responses.
-	# Note that the ede option above needs to be enabled for this to work.
-	# ede-serve-expired: no
-
 	# Specific options for ipsecmod. Unbound needs to be configured with
 	# --enable-ipsecmod for these to take effect.
 	#
@@ -1186,11 +1023,11 @@ remote-control:
 # has a copy of the root for local usage.  The second serves example.org
 # authoritatively.  zonefile: reads from file (and writes to it if you also
 # download it), primary: fetches with AXFR and IXFR, or url to zonefile.
-# With allow-notify: you can give additional (apart from primaries and urls)
-# sources of notifies.
+# With allow-notify: you can give additional (apart from primaries) sources of
+# notifies.
 # auth-zone:
 #	name: "."
-#	primary: 170.247.170.2        # b.root-servers.net
+#	primary: 199.9.14.201         # b.root-servers.net
 #	primary: 192.33.4.12          # c.root-servers.net
 #	primary: 199.7.91.13          # d.root-servers.net
 #	primary: 192.5.5.241          # f.root-servers.net
@@ -1198,7 +1035,7 @@ remote-control:
 #	primary: 193.0.14.129         # k.root-servers.net
 #	primary: 192.0.47.132         # xfr.cjr.dns.icann.org
 #	primary: 192.0.32.132         # xfr.lax.dns.icann.org
-#	primary: 2801:1b8:10::b       # b.root-servers.net
+#	primary: 2001:500:200::b      # b.root-servers.net
 #	primary: 2001:500:2::c        # c.root-servers.net
 #	primary: 2001:500:2d::d       # d.root-servers.net
 #	primary: 2001:500:2f::f       # f.root-servers.net
@@ -1266,11 +1103,6 @@ remote-control:
 #     backend: "testframe"
 #     # secret seed string to calculate hashed keys
 #     secret-seed: "default"
-#     # if the backend should be read from, but not written to.
-#     cachedb-no-store: no
-#     # if the cachedb should be checked before a serve-expired response is
-#     # given, when serve-expired is enabled.
-#     cachedb-check-when-serve-expired: yes
 #
 #     # For "redis" backend:
 #     # (to enable, use --with-libhiredis to configure before compiling)
@@ -1278,16 +1110,10 @@ remote-control:
 #     redis-server-host: 127.0.0.1
 #     # redis server's TCP port
 #     redis-server-port: 6379
-#     # if the server uses a unix socket, set its path, or "" when not used.
-#     # redis-server-path: "/var/lib/redis/redis-server.sock"
-#     # if the server uses an AUTH password, specify here, or "" when not used.
-#     # redis-server-password: ""
 #     # timeout (in ms) for communication with the redis server
 #     redis-timeout: 100
 #     # set timeout on redis records based on DNS response TTL
 #     redis-expire-records: no
-#     # redis logical database to use, 0 is the default database.
-#     redis-logical-db: 0

 # IPSet
 # Add specify domain into set via ipset.
@@ -1354,5 +1180,4 @@ remote-control:
 #     rpz-log: yes
 #     rpz-log-name: "example policy"
 #     rpz-signal-nxdomain-ra: no
-#     for-downstream: no
 #     tags: "example"
@@ -14,7 +14,6 @@ unbound\-checkconf
 .B unbound\-checkconf
 .RB [ \-h ]
 .RB [ \-f ]
-.RB [ \-q ]
 .RB [ \-o
 .IR option ]
 .RI [ cfgfile ]
@@ -38,9 +37,6 @@ Print full pathname, with chroot applied to it.  Use with the \-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.
 .TP
-.B \-q
-Make the operation quiet, suppress output on success.
-.TP
 .I cfgfile
 The config file to read with settings for Unbound. It is checked.
 If omitted, the config file at the default location is checked.
@@ -54,12 +54,6 @@ Stop the server. The server daemon exits.
 .B reload
 Reload the server. This flushes the cache and reads the config file fresh.
 .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.
-.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
@@ -121,38 +115,31 @@ 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.
-You can redirect it to a file to store the cache in a file.
-Not supported in remote Unbounds in multi-process operation.
+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.
 .TP
 .B load_cache
-The content 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.
+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.
 .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
+.B flush \fIname
 Remove the name from the cache. Removes the types
-A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV, NAPTR, SVCB and HTTPS.
+A, AAAA, NS, SOA, CNAME, DNAME, MX, PTR, SRV and NAPTR.
 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
+.B flush_type \fIname\fR \fItype
 Remove the name, type information from the cache.
 .TP
-.B flush_zone \fR[\fI+c\fR] \fIname
+.B flush_zone \fIname
 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.
@@ -160,10 +147,10 @@ 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).
 .TP
-.B flush_bogus \fR[\fI+c\fR]
+.B flush_bogus
 Remove all bogus data from the cache.
 .TP
-.B flush_negative \fR[\fI+c\fR]
+.B flush_negative
 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
@@ -246,24 +233,22 @@ still be bogus, use \fBflush_zone\fR to remove it), does not affect the config f
 .B insecure_remove \fIzone
 Removes domain\-insecure for the given zone.
 .TP
-.B forward_add \fR[\fI+it\fR] \fIzone addr ...
+.B forward_add \fR[\fI+i\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 ...
+.B stub_add \fR[\fI+ip\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
@@ -304,22 +289,20 @@ 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.
+List the auth zones that are configured.  Printed one per line with a
+status, indicating if the zone is expired and current serial number.
 .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.
+Reload the auth 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.
+Transfer the auth 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
 Enable the RPZ zone if it had previously been disabled.
@@ -378,15 +361,6 @@ number of queries received by thread
 .I threadX.num.queries_ip_ratelimited
 number of queries rate limited by thread
 .TP
-.I threadX.num.queries_cookie_valid
-number of queries with a valid DNS Cookie by thread
-.TP
-.I threadX.num.queries_cookie_client
-number of queries with a client part only DNS Cookie by thread
-.TP
-.I threadX.num.queries_cookie_invalid
-number of queries with an invalid DNS Cookie by thread
-.TP
 .I threadX.num.cachehits
 number of queries that were successfully answered using a cache lookup
 .TP
@@ -416,14 +390,6 @@ as a cache response was sent.
 .I 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
@@ -464,18 +430,6 @@ buffers are full.
 .I total.num.queries
 summed over threads.
 .TP
-.I total.num.queries_ip_ratelimited
-summed over threads.
-.TP
-.I total.num.queries_cookie_valid
-summed over threads.
-.TP
-.I total.num.queries_cookie_client
-summed over threads.
-.TP
-.I total.num.queries_cookie_invalid
-summed over threads.
-.TP
 .I total.num.cachehits
 summed over threads.
 .TP
@@ -500,12 +454,6 @@ summed over threads.
 .I total.num.expired
 summed over threads.
 .TP
-.I total.num.queries_timed_out
-summed over threads.
-.TP
-.I total.query.queue_time_us.max
-the maximum of the thread values.
-.TP
 .I total.num.recursivereplies
 summed over threads.
 .TP
@@ -602,10 +550,6 @@ Number of queries that were made using TCP towards the Unbound server.
 Number of queries that the Unbound server made using TCP outgoing towards
 other servers.
 .TP
-.I num.query.udpout
-Number of queries that the Unbound server made using UDP outgoing towards
-other servers.
-.TP
 .I 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.
@@ -641,7 +585,7 @@ 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.
+The can be use 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
@@ -697,18 +641,6 @@ timing and protocol support information.
 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
@@ -748,12 +680,7 @@ Number of queries that got an answer that contained EDNS client subnet data.
 .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
-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.
+specific cache, after getting processed by the edns client subnet module.
 .TP
 .I num.rpz.action.<rpz_action>
 Number of queries answered using configured RPZ policy, per RPZ action type.
@@ -75,7 +75,7 @@ concurrently.
 .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.
+This is in addition to the verbosity (if any) from the config file.
 .TP
 .B \-V
 Show the version number and build options, and exit.
@@ -30,7 +30,7 @@ can be used to check unbound.conf prior to usage.
 An example config file is shown below. Copy this to /etc/unbound/unbound.conf
 and start the server with:
 .P
-.nf
+.nfvalidator:val_inform_super
 	$ unbound \-c /etc/unbound/unbound.conf
 .fi
 .P
@@ -112,21 +112,13 @@ 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).
-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>
 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]>
+.B interface: \fI<ip address[@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
@@ -137,7 +129,7 @@ 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]>
+.B ip\-address: \fI<ip address[@port]>
 Same as interface: (for ease of compatibility with nsd.conf).
 .TP
 .B interface\-automatic: \fI<yes or no>
@@ -148,15 +140,6 @@ 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
-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
@@ -233,8 +216,7 @@ number).
 .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.
+Suggested values are 512 to 4096. Default is 4096.
 .TP
 .B stream\-wait\-size: \fI<number>
 Number of bytes size maximum to use for waiting stream buffers.  Default is
@@ -302,36 +284,6 @@ 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>
-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.
-.TP
-.B wait\-limit\-cookie: \fI<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, 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.
-.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.
-.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
@@ -388,7 +340,7 @@ ip\-transparent option is also available.
 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.
+IPV6 traffic class field.
 .TP
 .B rrset\-cache\-size: \fI<number>
 Number of bytes size of the RRset cache. Default is 4 megabytes.
@@ -418,15 +370,6 @@ 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.
 .TP
-.B cache\-min\-negative\-ttl: \fI<seconds>
-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.
@@ -443,10 +386,6 @@ 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>
-Upper limit for dynamic retransmit timeout calculation in infrastructure
-cache. Default is 2 minutes.
-.TP
 .B infra\-keep\-probing: \fI<yes or no>
 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
@@ -464,7 +403,7 @@ Enable or disable whether ip4 queries are answered or issued. Default is yes.
 Enable or disable whether ip6 queries are answered or issued. Default is yes.
 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
+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>
@@ -511,8 +450,6 @@ 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
@@ -531,19 +468,20 @@ This option defaults to 3000 milliseconds.
 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.
-If the client supports the EDNS TCP Keepalive option,
+The period Unbound will wait for a query on a TCP connection when
+EDNS TCP Keepalive is active. If this timeout expires Unbound closes
+the connection. 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
-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.
+When the number of free incoming TCP buffers falls below 50% of
+the total number configured, the advertised timeout is progressively
+reduced 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 actual timeout of 200 milliseconds is observed regardless of the
+advertised timeout.
 .TP
 .B tcp\-upstream: \fI<yes or no>
 Enable or disable whether the upstream queries use TCP only for transport.
@@ -561,11 +499,10 @@ 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 you enable this, also configure a tls\-cert\-bundle or use tls\-win\-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.
 .TP
 .B ssl\-upstream: \fI<yes or no>
 Alternate syntax for \fBtls\-upstream\fR.  If both are present in the config
@@ -614,12 +551,7 @@ Alternate syntax for \fBtls\-cert\-bundle\fR.
 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.
-Because it is not windows specific.
+the tls\-cert\-bundle option on other systems.
 .TP
 .B tls\-additional\-port: \fI<portnr>
 List portnumbers as tls\-additional\-port, and when interfaces are defined,
@@ -705,17 +637,6 @@ Ignored if the option is not available. Default is yes.
 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.
-PROXYv2 is supported for UDP and TCP/TLS listening interfaces.
-There is no support for PROXYv2 on a DoH or DNSCrypt listening interface.
-Can list multiple, each on a new statement.
-.TP
 .B use\-systemd: \fI<yes or no>
 Enable or disable systemd socket activation.
 Default is no.
@@ -731,25 +652,19 @@ When at the limit, further connections are accepted but closed immediately.
 This option is experimental at this time.
 .TP
 .B access\-control: \fI<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.
-.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.
+\fIallow\fR, \fIallow_setrd\fR, \fIallow_snoop\fR, \fIdeny_non_local\fR or
+\fIrefuse_non_local\fR.
+The most specific netblock match is used, if none match \fIdeny\fR 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.
+The action \fIdeny\fR stops queries from hosts from that netblock.
 .IP
-The \fIrefuse\fR action stops queries too, but sends a DNS rcode REFUSED
+The action \fIrefuse\fR stops queries too, but sends a DNS rcode REFUSED
 error message back.
 .IP
-The \fIallow\fR action gives access to clients from that netblock.
+The action \fIallow\fR 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
@@ -769,25 +684,13 @@ 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
+The action \fIallow_snoop\fR 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
 By default only localhost is \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
@@ -819,46 +722,6 @@ Set redirect data for particular tag for given access control element.
 .B access\-control\-view: \fI<IP netblock> <view name>
 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.
-By default only localhost (the IP netblock, not the loopback interface) is
-\fIallow\fRed through the default \fBaccess\-control:\fR behavior.
-.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
@@ -949,11 +812,6 @@ 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
-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
@@ -1083,12 +941,6 @@ validate the zone.  Default is no.  Zone signers must produce zones
 that allow this feature to work, but sometimes they do not, and turning
 this option off avoids that validation failure.
 .TP
-.B harden\-unknown\-additional: \fI<yes or no>
-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>
 Use 0x20\-encoded random bits in the query to foil spoof attempts.
 This perturbs the lowercase and uppercase of query names sent to
@@ -1121,7 +973,7 @@ This option only has effect when qname-minimisation is enabled. Default is no.
 .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
+Default is no.  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>
@@ -1326,6 +1178,8 @@ 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.
+Enabling this influences the Extended DNS Errors (RFC 8914) messages, as
+the reason is added in the EDE message.
 .TP
 .B val\-permissive\-mode: \fI<yes or no>
 Instruct the validator to mark bogus messages as indeterminate. The security
@@ -1343,20 +1197,6 @@ 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>
-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 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 without waiting for the
@@ -1475,24 +1315,14 @@ address space are not validated.  This is usually required whenever
 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.
+inform_redirect, always_transparent, 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.
+it as detailed in the stub zone section below.
 .TP 10
 \h'5'\fIdeny\fR
 Do not send an answer, drop the query.
@@ -1553,12 +1383,6 @@ Ie. answer queries with fixed data and also log the machines that ask.
 \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
@@ -1740,6 +1564,60 @@ 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 ede\-local\-zones: \fI<yes or no>
+If enabled, all local zones will respond with Extended DNS Errors (RFC8914).
+This is the global setting for the configuration, but it can be overwritten by
+specifing setting 'local\-zone\-do\-ede' to "yes". By default this option
+is disabled.
+Note that the val\-log\-level influences the the reason for the error included
+in the EDE message.
+.TP 5
+.B local\-zone\-do\-ede: \fI<zone> <yes or no>
+If enabled, the responses from this local zone will include an Extended DNS
+Error (RFC8914). The type of error is dependent on the query. For example a
+query for a local-zone type "refuse" will result in EDE code 15 \- Blocked.
+By default this option is disabled.
+Note that the val\-log\-level influences the the reason for the error included
+in the EDE message.
+.TP 5
+.B local\-zone\-default\-ede: \fI<zone> <EDE code string or integer>
+If enabled, this zone will respond to requests resulting in an Extended DNS
+Error with the EDE code specified as input. This input can either be an integer
+corresponding to the EDE code number (e.g. 15 would be EDE Blocked), or a
+keyword from the following list corresponding to an EDE specified in RFC 8914.
+.TP 5
+EDE keywords:
+.nf
+\h'5'\fIother\fR
+\h'5'\fIunsupported-dnskey-algorithm\fR
+\h'5'\fIunsupported-ds-digest-type\fR
+\h'5'\fIstale-answer\fR
+\h'5'\fIforged\fR
+\h'5'\fIdnssec-indeterminate\fR
+\h'5'\fIdnssec-bogus\fR
+\h'5'\fIsignature-expired\fR
+\h'5'\fIsignature-not-yet-valid\fR
+\h'5'\fIdnskey-missing\fR
+\h'5'\fIrrsigs-missing\fR
+\h'5'\fIno-zone-key-bit-set\fR
+\h'5'\fInsec-missing\fR
+\h'5'\fIcached-error\fR
+\h'5'\fInot-ready\fR
+\h'5'\fIblocked\fR
+\h'5'\fIcensored\fR
+\h'5'\fIfiltered\fR
+\h'5'\fIprohibited\fR
+\h'5'\fIstale-nxdomain-answer\fR
+\h'5'\fInot-authoritative\fR
+\h'5'\fInot-supported\fR
+\h'5'\fIno-reachable-authority\fR
+\h'5'\fInetwork-error\fR
+\h'5'\fIinvalid-data\fR
+.fi
+.TP 5
+Note that the val\-log\-level influences the the reason for the error included
+in the EDE message.
+.TP 5
 .B response\-ip: \fI<IP-netblock> <action>
 This requires use of the "respip" module.
 .IP
@@ -1769,7 +1647,7 @@ 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,
 but it must be of either AAAA, A or CNAME types.
-If the IP-netblock is an IPv6/IPv4 prefix, the record
+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.
@@ -1826,8 +1704,7 @@ 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.
 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.
+nameservers for those zones.
 .TP 5
 .B ratelimit\-size: \fI<memory size>
 Give the size of the data structure in which the current ongoing rates are
@@ -1849,15 +1726,6 @@ 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
@@ -1874,31 +1742,12 @@ 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.
-This option is experimental at this time.
+Enable global ratelimiting of queries accepted per ip address.
+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
 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
-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.
-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 \fIallow_cookie\fR 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>
 Give the size of the data structure in which the current ongoing rates are
@@ -1920,37 +1769,10 @@ 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.
-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.
-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.
-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.
+The number of retries Unbound will do in case of a non positive response is
+received. If a forward nameserver is used, this is the number of retries per
+forward nameserver in case of throwaway response.
 .TP 5
 .B fast\-server\-permil: \fI<number>
 Specify how many times out of 1000 to pick from the set of fastest servers.
@@ -1967,18 +1789,6 @@ 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>
-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.
-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.
-.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
@@ -1988,21 +1798,6 @@ option can be used multiple times. The most specific match will be used.
 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 attach informative error messages to a response for various
-errors. Default is "no".
-
-When the \fBval-log-level\fR option is also set to \fB2\fR, responses with
-Extended DNS Errors concerning DNSSEC failures that are not served from cache,
-will also contain a descriptive text message about the reason for the failure.
-.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. Note that this will not attach
-the EDE code without setting the global \fBede\fR option to "yes" as well.
-Default is "no".
 .SS "Remote Control Options"
 In the
 .B remote\-control:
@@ -2018,17 +1813,15 @@ section for options.  To setup the correct self\-signed certificates use the
 The option is used to enable remote control, default is "no".
 If turned off, the server does not listen for control commands.
 .TP 5
-.B control\-interface: \fI<ip address or interface name or path>
+.B control\-interface: \fI<ip address 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
+If you set it to an absolute path, a local socket is used.  The local 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
@@ -2105,19 +1898,13 @@ 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.
+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.
 .TP
 .B stub\-prime: \fI<yes or no>
 This option is by default no.  If enabled it performs NS set priming,
@@ -2168,19 +1955,13 @@ 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.
+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.
 .IP
 At high verbosity it logs the TLS certificate, with TLS enabled.
 If you leave out the '#' and auth name from the forward\-addr, any
@@ -2212,32 +1993,13 @@ useful when you want immediate changes to be visible.
 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.
 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.
-.LP
-With \fBfor\-downstream:\fR \fIyes\fR (default), authority zones are processed
-after \fBlocal\-zones\fR 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.
-When used in this manner they provide a local copy of an authority server
-that speeds up lookups for that data during resolving.
-.LP
-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.
-In this case, the aforementioned CNAME example will result in a thoroughly
-resolved answer.
+Authority zones are processed after \fBlocal\-zones\fR and before
+cache (\fBfor\-downstream:\fR \fIyes\fR), and when used in this manner
+make Unbound respond like an authority server.  Authority zones are also
+processed after cache, just before going to the network to fetch
+information for recursion (\fBfor\-upstream:\fR \fIyes\fR), and when used
+in this manner provide a local copy of an authority server that speeds up
+lookups of that data.
 .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
@@ -2290,8 +2052,8 @@ With 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.  The primaries from primary: and url:
-statements are allowed notify by default.
+file is downloaded when notified.  The primaries from primary: 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
@@ -2431,21 +2193,6 @@ 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
@@ -2536,9 +2283,6 @@ 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
-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
@@ -2670,7 +2414,11 @@ 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.
+with expired data if Unbound is configured for that.  Currently the use
+of \fBserve\-expired\-client\-timeout:\fR and
+\fBserve\-expired\-reply\-ttl:\fR is not consistent for data originating from
+the external cache as these will result in a reply with 0 TTL without trying to
+update the data first, ignoring the configured values.
 .P
 If Unbound was built with
 \fB\-\-with\-libhiredis\fR
@@ -2721,21 +2469,6 @@ 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
-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
@@ -2752,16 +2485,6 @@ This option defaults to "127.0.0.1".
 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
-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
@@ -2776,17 +2499,6 @@ 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>
-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.
-This option defaults to 0.
 .SS DNSTAP Logging Options
 DNSTAP support, when compiled in by using \fB\-\-enable\-dnstap\fR, is enabled
 in the \fBdnstap:\fR section.
@@ -2955,8 +2667,8 @@ With 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.  The primaries from primary: and url:
-statements are allowed notify by default.
+file is downloaded when notified.  The primaries from primary: 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.
@@ -2977,17 +2689,14 @@ Log all applied RPZ actions for this RPZ zone. Default is no.
 .B rpz\-log\-name: \fI<name>
 Specify a string to be part of the log line, for easy referencing.
 .TP
+.B rpz\-do\-ede: \fI<yes or no>
+Specify if this zone RPZ responds with Extended DNS Errors (RFC 8914). The
+default is no.
 .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.
 This allows certain clients, like dnsmasq, to infer that the domain is
 externally blocked. Default is no.
 .TP
-.B for\-downstream: \fI<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 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
@@ -75,7 +75,6 @@ int dynlibmod_init(struct module_env* env, int id) {
    struct config_strlist* cfg_item = env->cfg->dynlib_file;
    struct dynlibmod_env* de = (struct dynlibmod_env*)calloc(1, sizeof(struct dynlibmod_env));
    __DYNMOD dynamic_library;
-    int i;
    if (!de)
    {
        log_err("dynlibmod[%d]: malloc failure", dynlib_mod_idx);
@@ -85,7 +84,7 @@ int dynlibmod_init(struct module_env* env, int id) {
    env->modinfo[id] = (void*) de;

    de->fname = NULL;
-    for(i = dynlib_mod_idx;
+    for(int i = dynlib_mod_idx;
        i != 0 && cfg_item != NULL;
        i--, cfg_item = cfg_item->next) {}

@@ -97,7 +97,6 @@ node_create(struct addrtree *tree, void *elem, addrlen_t scope,
 	tree->node_count++;
 	node->scope = scope;
 	node->ttl = ttl;
-	node->only_match_scope_zero = 0;
 	node->edge[0] = NULL;
 	node->edge[1] = NULL;
 	node->parent_edge = NULL;
@@ -156,7 +155,6 @@ clean_node(struct addrtree *tree, struct addrnode *node)
 	if (!node->elem) return;
 	tree->size_bytes -= tree->sizefunc(node->elem);
 	tree->delfunc(tree->env, node->elem);
-	node->only_match_scope_zero = 0;
 	node->elem = NULL;
 }

@@ -360,7 +358,7 @@ issub(const addrkey_t *s1, addrlen_t l1,
 void
 addrtree_insert(struct addrtree *tree, const addrkey_t *addr, 
 	addrlen_t sourcemask, addrlen_t scope, void *elem, time_t ttl, 
-	time_t now, int only_match_scope_zero)
+	time_t now)
 {
 	struct addrnode *newnode, *node;
 	struct addredge *edge;
@@ -383,7 +381,6 @@ addrtree_insert(struct addrtree *tree, const addrkey_t *addr,
 			/* update this node's scope and data */
 			clean_node(tree, node);
 			node->ttl = ttl;
-			node->only_match_scope_zero = only_match_scope_zero;
 			node->elem = elem;
 			node->scope = scope;
 			tree->size_bytes += tree->sizefunc(elem);
@@ -450,7 +447,6 @@ addrtree_insert(struct addrtree *tree, const addrkey_t *addr,
 			newnode->elem = elem;
 			newnode->scope = scope;
 			newnode->ttl = ttl;
-			newnode->only_match_scope_zero = only_match_scope_zero;
 		} 
 		
 		tree->size_bytes += node_size(tree, newnode);
@@ -487,8 +483,7 @@ addrtree_find(struct addrtree *tree, const addrkey_t *addr,
 		/* Current node more specific then question. */
 		log_assert(depth <= sourcemask);
 		/* does this node have data? if yes, see if we have a match */
-		if (node->elem && node->ttl >= now &&
-			!(sourcemask != 0 && node->only_match_scope_zero)) {
+		if (node->elem && node->ttl >= now) {
 			/* saved at wrong depth */;
 			log_assert(node->scope >= depth);
 			if (depth == node->scope ||
@@ -95,10 +95,6 @@ struct addrnode {
 	time_t ttl;
 	/** Number of significant bits in address. */
 	addrlen_t scope;
-	/** Only use the element for queries for subnet/0. Set if the query
-	 * for /0 was answered with scope 0. For query /x answer scope 0,
-	 * they can match anything and this is false. */
-	int only_match_scope_zero;
 	/** A node can have 0-2 edges, set to NULL for unused */
 	struct addredge *edge[2];
 	/** edge between this node and parent */
@@ -161,12 +157,11 @@ void addrtree_delete(struct addrtree *tree);
 * @param scope: Number of significant bits in addr.
 * @param elem: data to store in the tree.
 * @param ttl: elem is valid up to this time, seconds.
- * @param only_match_scope_zero: set for when query /0 has scope /0 answer.
 * @param now: Current time in seconds.
 */
 void addrtree_insert(struct addrtree *tree, const addrkey_t *addr, 
 	addrlen_t sourcemask, addrlen_t scope, void *elem, time_t ttl, 
-	time_t now, int only_match_scope_zero);
+	time_t now);

 /**
 * Find a node containing an element in the tree.
@@ -55,11 +55,7 @@
 #include "util/config_file.h"
 #include "util/data/msgreply.h"
 #include "sldns/sbuffer.h"
-#include "sldns/wire2str.h"
 #include "iterator/iter_utils.h"
-#ifdef USE_CACHEDB
-#include "cachedb/cachedb.h"
-#endif

 /** externally called */
 void 
@@ -97,14 +93,13 @@ subnet_new_qstate(struct module_qstate *qstate, int id)
 	qstate->minfo[id] = sq;
 	memset(sq, 0, sizeof(*sq));
 	sq->started_no_cache_store = qstate->no_cache_store;
-	sq->started_no_cache_lookup = qstate->no_cache_lookup;
 	return 1;
 }

 /** Add ecs struct to edns list, after parsing it to wire format. */
-void
-subnet_ecs_opt_list_append(struct ecs_data* ecs, struct edns_option** list,
-	struct module_qstate *qstate, struct regional *region)
+static void
+ecs_opt_list_append(struct ecs_data* ecs, struct edns_option** list,
+	struct module_qstate *qstate)
 {
 	size_t sn_octs, sn_octs_remainder;
 	sldns_buffer* buf = qstate->env->scratch_buffer;
@@ -136,7 +131,7 @@ subnet_ecs_opt_list_append(struct ecs_data* ecs, struct edns_option** list,
 		edns_opt_list_append(list,
 				qstate->env->cfg->client_subnet_opcode,
 				sn_octs + sn_octs_remainder + 4,
-				sldns_buffer_begin(buf), region);
+				sldns_buffer_begin(buf), qstate->region);
 	}
 }

@@ -144,7 +139,7 @@ int ecs_whitelist_check(struct query_info* qinfo,
 	uint16_t ATTR_UNUSED(flags), struct module_qstate* qstate,
 	struct sockaddr_storage* addr, socklen_t addrlen,
 	uint8_t* ATTR_UNUSED(zone), size_t ATTR_UNUSED(zonelen),
-	struct regional *region, int id, void* ATTR_UNUSED(cbargs))
+	struct regional* ATTR_UNUSED(region), int id, void* ATTR_UNUSED(cbargs))
 {
 	struct subnet_qstate *sq;
 	struct subnet_env *sn_env;
@@ -155,11 +150,10 @@ int ecs_whitelist_check(struct query_info* qinfo,

 	/* 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)) {
+	if(!iter_stub_fwd_no_cache(qstate, &qstate->qinfo, NULL, NULL)) {
 		qstate->no_cache_store = 0;
 	}

-	sq->subnet_sent_no_subnet = 0;
 	if(sq->ecs_server_out.subnet_validdata && ((sq->subnet_downstream &&
 		qstate->env->cfg->client_subnet_always_forward) ||
 		ecs_is_whitelisted(sn_env->whitelist, 
@@ -168,29 +162,17 @@ int ecs_whitelist_check(struct query_info* qinfo,
 		/* Address on whitelist or client query contains ECS option, we
 		 * want to sent out ECS. Only add option if it is not already
 		 * set. */
-		if(!edns_opt_list_find(qstate->edns_opts_back_out,
-			qstate->env->cfg->client_subnet_opcode)) {
-			/* if the client is not wanting an EDNS subnet option,
-			 * omit it and store that we omitted it but actually
-			 * are doing EDNS subnet to the server. */
-			if(sq->ecs_server_out.subnet_source_mask == 0) {
-				sq->subnet_sent_no_subnet = 1;
-				sq->subnet_sent = 0;
-				return 1;
-			}
-			subnet_ecs_opt_list_append(&sq->ecs_server_out,
-				&qstate->edns_opts_back_out, qstate, region);
+		if(!(sq->subnet_sent)) {
+			ecs_opt_list_append(&sq->ecs_server_out,
+				&qstate->edns_opts_back_out, qstate);
+			sq->subnet_sent = 1;
 		}
-		sq->subnet_sent = 1;
 	}
-	else {
+	else if(sq->subnet_sent) {
 		/* Outgoing ECS option is set, but we don't want to sent it to
 		 * this address, remove option. */
-		if(edns_opt_list_find(qstate->edns_opts_back_out,
-			qstate->env->cfg->client_subnet_opcode)) {
-			edns_opt_list_remove(&qstate->edns_opts_back_out,
-				qstate->env->cfg->client_subnet_opcode);
-		}
+		edns_opt_list_remove(&qstate->edns_opts_back_out,
+			qstate->env->cfg->client_subnet_opcode);
 		sq->subnet_sent = 0;
 	}
 	return 1;
@@ -216,17 +198,6 @@ subnetmod_init(struct module_env *env, int id)
 	}
 	alloc_init(&sn_env->alloc, NULL, 0);
 	env->modinfo[id] = (void*)sn_env;
-
-	/* Warn that serve-expired and prefetch do not work with the subnet
-	 * module cache. */
-	if(env->cfg->serve_expired)
-		log_warn(
-			"subnetcache: serve-expired is set but not working "
-			"for data originating from the subnet module cache.");
-	if(env->cfg->prefetch)
-		log_warn(
-			"subnetcache: prefetch is set but not working "
-			"for data originating from the subnet module cache.");
 	/* Copy msg_cache settings */
 	sn_env->subnet_msg_cache = slabhash_create(env->cfg->msg_cache_slabs,
 		HASH_DEFAULT_STARTARRAY, env->cfg->msg_cache_size,
@@ -256,7 +227,7 @@ subnetmod_init(struct module_env *env, int id)
 	env->unique_mesh = 1;
 	if(!edns_register_option(env->cfg->client_subnet_opcode,
 		env->cfg->client_subnet_always_forward /* bypass cache */,
-		1 /* no aggregation */, env)) {
+		0 /* no aggregation */, env)) {
 		log_err("subnetcache: could not register opcode");
 		ecs_whitelist_delete(sn_env->whitelist);
 		slabhash_delete(sn_env->subnet_msg_cache);
@@ -313,18 +284,9 @@ delfunc(void *envptr, void *elemptr) {
 static size_t
 sizefunc(void *elemptr) {
 	struct reply_info *elem  = (struct reply_info *)elemptr;
-	size_t s = sizeof (struct reply_info) - sizeof (struct rrset_ref)
+	return sizeof (struct reply_info) - sizeof (struct rrset_ref)
 		+ elem->rrset_count * sizeof (struct rrset_ref)
 		+ elem->rrset_count * sizeof (struct ub_packed_rrset_key *);
-	size_t i;
-	for (i = 0; i < elem->rrset_count; i++) {
-		struct ub_packed_rrset_key *key = elem->rrsets[i];
-		struct packed_rrset_data *data = key->entry.data;
-		s += ub_rrset_sizefunc(key, data);
-	}
-	if(elem->reason_bogus_str)
-		s += strlen(elem->reason_bogus_str)+1;
-	return s;
 }

 /**
@@ -364,16 +326,13 @@ update_cache(struct module_qstate *qstate, int id)
 	struct slabhash *subnet_msg_cache = sne->subnet_msg_cache;
 	struct ecs_data *edns = &sq->ecs_client_in;
 	size_t i;
-	int only_match_scope_zero, diff_size;

-	/* We already calculated hash upon lookup (lookup_and_reply) if we were
-	 * allowed to look in the ECS cache */
-	hashvalue_type h = qstate->minfo[id] &&
-		((struct subnet_qstate*)qstate->minfo[id])->qinfo_hash_calculated?
-		((struct subnet_qstate*)qstate->minfo[id])->qinfo_hash :
+	/* We already calculated hash upon lookup */
+	hashvalue_type h = qstate->minfo[id] ? 
+		((struct subnet_qstate*)qstate->minfo[id])->qinfo_hash : 
 		query_info_hash(&qstate->qinfo, qstate->query_flags);
 	/* Step 1, general qinfo lookup */
-	struct lruhash_entry* lru_entry = slabhash_lookup(subnet_msg_cache, h,
+	struct lruhash_entry *lru_entry = slabhash_lookup(subnet_msg_cache, h,
 		&qstate->qinfo, 1);
 	int need_to_insert = (lru_entry == NULL);
 	if (!lru_entry) {
@@ -417,38 +376,29 @@ update_cache(struct module_qstate *qstate, int id)
 		log_err("subnetcache: cache insertion failed");
 		return;
 	}
-
+	
 	/* store RRsets */
 	for(i=0; i<rep->rrset_count; i++) {
 		rep->ref[i].key = rep->rrsets[i];
 		rep->ref[i].id = rep->rrsets[i]->id;
 	}
 	reply_info_set_ttls(rep, *qstate->env->now);
-	reply_info_sortref(rep);
 	rep->flags |= (BIT_RA | BIT_QR); /* fix flags to be sensible for */
 	rep->flags &= ~(BIT_AA | BIT_CD);/* a reply based on the cache   */
-	if(edns->subnet_source_mask == 0 && edns->subnet_scope_mask == 0)
-		only_match_scope_zero = 1;
-	else only_match_scope_zero = 0;
-	diff_size = (int)tree->size_bytes;
 	addrtree_insert(tree, (addrkey_t*)edns->subnet_addr, 
 		edns->subnet_source_mask, sq->max_scope, rep,
-		rep->ttl, *qstate->env->now, only_match_scope_zero);
-	diff_size = (int)tree->size_bytes - diff_size;
+		rep->ttl, *qstate->env->now);

 	lock_rw_unlock(&lru_entry->lock);
 	if (need_to_insert) {
 		slabhash_insert(subnet_msg_cache, h, lru_entry, lru_entry->data,
 			NULL);
-	} else {
-		slabhash_update_space_used(subnet_msg_cache, h, NULL,
-			diff_size);
 	}
 }

 /** Lookup in cache and reply true iff reply is sent. */
 static int
-lookup_and_reply(struct module_qstate *qstate, int id, struct subnet_qstate *sq, int prefetch)
+lookup_and_reply(struct module_qstate *qstate, int id, struct subnet_qstate *sq)
 {
 	struct lruhash_entry *e;
 	struct module_env *env = qstate->env;
@@ -462,10 +412,7 @@ lookup_and_reply(struct module_qstate *qstate, int id, struct subnet_qstate *sq,

 	memset(&sq->ecs_client_out, 0, sizeof(sq->ecs_client_out));

-	if (sq) {
-		sq->qinfo_hash = h; /* Might be useful on cache miss */
-		sq->qinfo_hash_calculated = 1;
-	}
+	if (sq) sq->qinfo_hash = h; /* Might be useful on cache miss */
 	e = slabhash_lookup(sne->subnet_msg_cache, h, &qstate->qinfo, 1);
 	if (!e) return 0; /* qinfo not in cache */
 	data = e->data;
@@ -500,10 +447,6 @@ lookup_and_reply(struct module_qstate *qstate, int id, struct subnet_qstate *sq,
 			INET6_SIZE);
 		sq->ecs_client_out.subnet_validdata = 1;
 	}
-
-	if (prefetch && *qstate->env->now >= ((struct reply_info *)node->elem)->prefetch_ttl) {
-		qstate->need_refetch = 1;
-	}
 	return 1;
 }

@@ -540,18 +483,18 @@ eval_response(struct module_qstate *qstate, int id, struct subnet_qstate *sq)
 		 * module_finished */
 		return module_finished;
 	}
-
+	
 	/* We have not asked for subnet data */
-	if (!sq->subnet_sent && !sq->subnet_sent_no_subnet) {
+	if (!sq->subnet_sent) {
 		if (s_in->subnet_validdata)
 			verbose(VERB_QUERY, "subnetcache: received spurious data");
 		if (sq->subnet_downstream) /* Copy back to client */
 			cp_edns_bad_response(c_out, c_in);
 		return module_finished;
 	}
-
+	
 	/* subnet sent but nothing came back */
-	if (!s_in->subnet_validdata && !sq->subnet_sent_no_subnet) {
+	if (!s_in->subnet_validdata) {
 		/* The authority indicated no support for edns subnet. As a
 		 * consequence the answer ended up in the regular cache. It
 		 * is still useful to put it in the edns subnet cache for
@@ -566,23 +509,11 @@ eval_response(struct module_qstate *qstate, int id, struct subnet_qstate *sq)
 			cp_edns_bad_response(c_out, c_in);
 		return module_finished;
 	}
-
-	/* Purposefully there was no sent subnet, and there is consequently
-	 * no subnet in the answer. If there was, use the subnet in the answer
-	 * anyway. But if there is not, treat it as a prefix 0 answer. */
-	if(sq->subnet_sent_no_subnet && !s_in->subnet_validdata) {
-		/* Fill in 0.0.0.0/0 scope 0, or ::0/0 scope 0, for caching. */
-		s_in->subnet_addr_fam = s_out->subnet_addr_fam;
-		s_in->subnet_source_mask = 0;
-		s_in->subnet_scope_mask = 0;
-		memset(s_in->subnet_addr, 0, INET6_SIZE);
-		s_in->subnet_validdata = 1;
-	}
-
+	
 	/* Being here means we have asked for and got a subnet specific 
 	 * answer. Also, the answer from the authority is not yet cached 
 	 * anywhere. */
-
+	
 	/* can we accept response? */
 	if(s_out->subnet_addr_fam != s_in->subnet_addr_fam ||
 		s_out->subnet_source_mask != s_in->subnet_source_mask ||
@@ -595,7 +526,6 @@ eval_response(struct module_qstate *qstate, int id, struct subnet_qstate *sq)
 		(void)edns_opt_list_remove(&qstate->edns_opts_back_out,
 			qstate->env->cfg->client_subnet_opcode);
 		sq->subnet_sent = 0;
-		sq->subnet_sent_no_subnet = 0;
 		return module_restart_next;
 	}

@@ -605,21 +535,7 @@ eval_response(struct module_qstate *qstate, int id, struct subnet_qstate *sq)
 	}
 	sne->num_msg_nocache++;
 	lock_rw_unlock(&sne->biglock);
-
-	/* If there is an expired answer in the global cache, remove that,
-	 * because expired answers would otherwise resurface once the ecs data
-	 * expires, giving once in a while global data responses for ecs
-	 * domains, with serve expired enabled. */
-	if(qstate->env->cfg->serve_expired) {
-		msg_cache_remove(qstate->env, qstate->qinfo.qname,
-			qstate->qinfo.qname_len, qstate->qinfo.qtype,
-			qstate->qinfo.qclass, 0);
-#ifdef USE_CACHEDB
-		if(qstate->env->cachedb_enabled)
-			cachedb_msg_remove(qstate);
-#endif
-	}
-
+	
 	if (sq->subnet_downstream) {
 		/* Client wants to see the answer, echo option back
 		 * and adjust the scope. */
@@ -682,7 +598,7 @@ parse_subnet_option(struct edns_option* ecs_option, struct ecs_data* ecs)
 	return 1;
 }

-void
+static void
 subnet_option_from_ss(struct sockaddr_storage *ss, struct ecs_data* ecs,
 	struct config_file* cfg)
 {
@@ -730,7 +646,6 @@ ecs_query_response(struct module_qstate* qstate, struct dns_msg* response,
 		edns_opt_list_remove(&qstate->edns_opts_back_out,
 			qstate->env->cfg->client_subnet_opcode);
 		sq->subnet_sent = 0;
-		sq->subnet_sent_no_subnet = 0;
 		memset(&sq->ecs_server_out, 0, sizeof(sq->ecs_server_out));
 	} else if (!sq->track_max_scope &&
 		FLAGS_GET_RCODE(response->rep->flags) == LDNS_RCODE_NOERROR &&
@@ -749,24 +664,6 @@ ecs_query_response(struct module_qstate* qstate, struct dns_msg* response,
 	return 1;
 }

-/** verbose print edns subnet option in pretty print */
-static void
-subnet_log_print(const char* s, struct edns_option* ecs_opt)
-{
-	if(verbosity >= VERB_ALGO) {
-		char buf[256];
-		char* str = buf;
-		size_t str_len = sizeof(buf);
-		if(!ecs_opt) {
-			verbose(VERB_ALGO, "%s (null)", s);
-			return;
-		}
-		(void)sldns_wire2str_edns_subnet_print(&str, &str_len,
-			ecs_opt->opt_data, ecs_opt->opt_len);
-		verbose(VERB_ALGO, "%s %s", s, buf);
-	}
-}
-
 int
 ecs_edns_back_parsed(struct module_qstate* qstate, int id,
 	void* ATTR_UNUSED(cbargs))
@@ -781,7 +678,6 @@ ecs_edns_back_parsed(struct module_qstate* qstate, int id,
 		qstate->env->cfg->client_subnet_opcode)) &&
 		parse_subnet_option(ecs_opt, &sq->ecs_server_in) &&
 		sq->subnet_sent && sq->ecs_server_in.subnet_validdata) {
-			subnet_log_print("answer has edns subnet", ecs_opt);
 			/* Only skip global cache store if we sent an ECS option
 			 * and received one back. Answers from non-whitelisted
 			 * servers will end up in global cache. Answers for
@@ -792,9 +688,6 @@ ecs_edns_back_parsed(struct module_qstate* qstate, int id,
 				sq->ecs_server_in.subnet_scope_mask >
 				sq->max_scope))
 				sq->max_scope = sq->ecs_server_in.subnet_scope_mask;
-	} else if(sq->subnet_sent_no_subnet) {
-		/* The answer can be stored as scope 0, not in global cache. */
-		qstate->no_cache_store = 1;
 	}

 	return 1;
@@ -833,17 +726,11 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 				qstate->ext_state[id] = module_finished;
 				return;
 			}
-			subnet_log_print("query has edns subnet", ecs_opt);
 			sq->subnet_downstream = 1;
 		}
 		else if(qstate->mesh_info->reply_list) {
 			subnet_option_from_ss(
-				&qstate->mesh_info->reply_list->query_reply.client_addr,
-				&sq->ecs_client_in, qstate->env->cfg);
-		}
-		else if(qstate->client_addr.ss_family != AF_UNSPEC) {
-			subnet_option_from_ss(
-				&qstate->client_addr,
+				&qstate->mesh_info->reply_list->query_reply.addr,
 				&sq->ecs_client_in, qstate->env->cfg);
 		}
 		
@@ -867,30 +754,18 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 				return;
 		}

-		if(!sq->started_no_cache_lookup && !qstate->blacklist) {
-			lock_rw_wrlock(&sne->biglock);
-			if(qstate->mesh_info->reply_list &&
-				lookup_and_reply(qstate, id, sq,
-				qstate->env->cfg->prefetch)) {
-				sne->num_msg_cache++;
-				lock_rw_unlock(&sne->biglock);
-				verbose(VERB_QUERY, "subnetcache: answered from cache");
-				qstate->ext_state[id] = module_finished;
-
-				subnet_ecs_opt_list_append(&sq->ecs_client_out,
-					&qstate->edns_opts_front_out, qstate,
-					qstate->region);
-				if(verbosity >= VERB_ALGO) {
-					subnet_log_print("reply has edns subnet",
-						edns_opt_list_find(
-						qstate->edns_opts_front_out,
-						qstate->env->cfg->
-						client_subnet_opcode));
-				}
-				return;
-			}
+		lock_rw_wrlock(&sne->biglock);
+		if (lookup_and_reply(qstate, id, sq)) {
+			sne->num_msg_cache++;
 			lock_rw_unlock(&sne->biglock);
+			verbose(VERB_QUERY, "subnetcache: answered from cache");
+			qstate->ext_state[id] = module_finished;
+
+			ecs_opt_list_append(&sq->ecs_client_out,
+				&qstate->edns_opts_front_out, qstate);
+			return;
 		}
+		lock_rw_unlock(&sne->biglock);
 		
 		sq->ecs_server_out.subnet_addr_fam =
 			sq->ecs_client_in.subnet_addr_fam;
@@ -908,7 +783,7 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 			sq->ecs_server_out.subnet_source_mask =
 				qstate->env->cfg->max_client_subnet_ipv6;
 		/* Safe to copy completely, even if the source is limited by the
-		 * configuration. subnet_ecs_opt_list_append() will limit the address.
+		 * configuration. ecs_opt_list_append() will limit the address.
 		 * */
 		memcpy(&sq->ecs_server_out.subnet_addr,
 			sq->ecs_client_in.subnet_addr, INET6_SIZE);
@@ -932,19 +807,10 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 		qstate->ext_state[id] = eval_response(qstate, id, sq);
 		if(qstate->ext_state[id] == module_finished &&
 			qstate->return_msg) {
-			subnet_ecs_opt_list_append(&sq->ecs_client_out,
-				&qstate->edns_opts_front_out, qstate,
-				qstate->region);
-			if(verbosity >= VERB_ALGO) {
-				subnet_log_print("reply has edns subnet",
-					edns_opt_list_find(
-					qstate->edns_opts_front_out,
-					qstate->env->cfg->
-					client_subnet_opcode));
-			}
+			ecs_opt_list_append(&sq->ecs_client_out,
+				&qstate->edns_opts_front_out, qstate);
 		}
 		qstate->no_cache_store = sq->started_no_cache_store;
-		qstate->no_cache_lookup = sq->started_no_cache_lookup;
 		return;
 	}
 	if(sq && outbound) {
@@ -76,7 +76,6 @@ struct subnet_msg_cache_data {
 struct subnet_qstate {
 	/** We need the hash for both cache lookup and insert */
 	hashvalue_type qinfo_hash;
-	int qinfo_hash_calculated;
 	/** ecs_data for client communication */
 	struct ecs_data	ecs_client_in;
 	struct ecs_data	ecs_client_out;
@@ -85,13 +84,6 @@ struct subnet_qstate {
 	struct ecs_data	ecs_server_out;
 	int subnet_downstream;
 	int subnet_sent;
-	/**
-	 * If there was no subnet sent because the client used source prefix
-	 * length 0 for omitting the information. Then the answer is cached
-	 * like subnet was a /0 scope. Like the subnet_sent flag, but when
-	 * the EDNS subnet option is omitted because the client asked.
-	 */
-	int subnet_sent_no_subnet;
 	/** keep track of longest received scope, set after receiving CNAME for
 	 * incoming QNAME. */
 	int track_max_scope;
@@ -100,8 +92,6 @@ struct subnet_qstate {
 	uint8_t max_scope;
 	/** has the subnet module been started with no_cache_store? */
 	int started_no_cache_store;
-	/** has the subnet module been started with no_cache_lookup? */
-	int started_no_cache_lookup;
 };

 void subnet_data_delete(void* d, void* ATTR_UNUSED(arg));
@@ -153,11 +143,4 @@ int ecs_query_response(struct module_qstate* qstate, struct dns_msg* response,
 /** mark subnet msg to be deleted */
 void subnet_markdel(void* key);

-/** Add ecs struct to edns list, after parsing it to wire format. */
-void subnet_ecs_opt_list_append(struct ecs_data* ecs, struct edns_option** list,
-	struct module_qstate *qstate, struct regional *region);
-
-/** Create ecs_data from the sockaddr_storage information. */
-void subnet_option_from_ss(struct sockaddr_storage *ss, struct ecs_data* ecs,
-	struct config_file* cfg);
 #endif /* SUBNETMOD_H */
@@ -456,7 +456,7 @@ ipsecmod_handle_query(struct module_qstate* qstate,
 	/* Store A/AAAA in cache. */
 	if(!dns_cache_store(qstate->env, &qstate->qinfo,
 		qstate->return_msg->rep, 0, qstate->prefetch_leeway,
-		0, qstate->region, qstate->query_flags, qstate->qstarttime)) {
+		0, qstate->region, qstate->query_flags)) {
 		log_err("ipsecmod: out of memory caching record");
 	}
 	qstate->ext_state[id] = module_finished;
@@ -138,10 +138,10 @@ ipset_add_rrset_data(struct ipset_env *ie, struct mnl_socket *mnl,
 static int
 ipset_check_zones_for_rrset(struct module_env *env, struct ipset_env *ie,
 	struct mnl_socket *mnl, struct ub_packed_rrset_key *rrset,
-	const char *qname, const int qlen, const char *setname, int af)
+	const char *setname, int af)
 {
 	static char dname[BUFF_LEN];
-	const char *ds, *qs;
+	const char *s;
 	int dlen, plen;

 	struct config_strlist *p;
@@ -152,73 +152,70 @@ ipset_check_zones_for_rrset(struct module_env *env, struct ipset_env *ie,
 		log_err("bad domain name");
 		return -1;
 	}
+	if (dname[dlen - 1] == '.') {
+		dlen--;
+	}

 	for (p = env->cfg->local_zones_ipset; p; p = p->next) {
-		ds = NULL;
-		qs = NULL;
 		plen = strlen(p->str);

-		if (dlen == plen || (dlen > plen && dname[dlen - plen - 1] == '.' )) {
-			ds = dname + (dlen - plen);
-		}
-		if (qlen == plen || (qlen > plen && qname[qlen - plen - 1] == '.' )) {
-			qs = qname + (qlen - plen);
-		}
-		if ((ds && strncasecmp(p->str, ds, plen) == 0)
-			|| (qs && strncasecmp(p->str, qs, plen) == 0)) {
-			d = (struct packed_rrset_data*)rrset->entry.data;
-			ipset_add_rrset_data(ie, mnl, d, setname,
-				af, dname);
-			break;
+		if (dlen >= plen) {
+			s = dname + (dlen - plen);
+
+			if (strncasecmp(p->str, s, plen) == 0) {
+				d = (struct packed_rrset_data*)rrset->entry.data;
+				ipset_add_rrset_data(ie, mnl, d, setname,
+					af, dname);
+				break;
+			}
 		}
 	}
 	return 0;
 }

-static int ipset_update(struct module_env *env, struct dns_msg *return_msg,
-	struct query_info qinfo, struct ipset_env *ie)
-{
+static int ipset_update(struct module_env *env, struct dns_msg *return_msg, struct ipset_env *ie) {
 	struct mnl_socket *mnl;
+
 	size_t i;
+
 	const char *setname;
+
 	struct ub_packed_rrset_key *rrset;
+
 	int af;
-	static char qname[BUFF_LEN];
-	int qlen;
+

 	mnl = (struct mnl_socket *)ie->mnl;
 	if (!mnl) {
-		/* retry to create mnl socket */
+		// retry to create mnl socket
 		mnl = open_mnl_socket();
 		if (!mnl) {
 			return -1;
 		}
+
 		ie->mnl = mnl;
 	}

-	qlen = sldns_wire2str_dname_buf(qinfo.qname, qinfo.qname_len,
-		qname, BUFF_LEN);
-	if(qlen == 0) {
-		log_err("bad domain name");
-		return -1;
-	}
-
-	for(i = 0; i < return_msg->rep->rrset_count; i++) {
+	for (i = 0; i < return_msg->rep->rrset_count; ++i) {
 		setname = NULL;
+
 		rrset = return_msg->rep->rrsets[i];
-		if(ntohs(rrset->rk.type) == LDNS_RR_TYPE_A &&
-			ie->v4_enabled == 1) {
+
+		if (rrset->rk.type == htons(LDNS_RR_TYPE_A)) {
 			af = AF_INET;
-			setname = ie->name_v4;
-		} else if(ntohs(rrset->rk.type) == LDNS_RR_TYPE_AAAA &&
-			ie->v6_enabled == 1) {
+			if ((ie->v4_enabled == 1)) {
+				setname = ie->name_v4;
+			}
+		} else {
 			af = AF_INET6;
-			setname = ie->name_v6;
+			if ((ie->v6_enabled == 1)) {
+				setname = ie->name_v6;
+			}
 		}

 		if (setname) {
 			if(ipset_check_zones_for_rrset(env, ie, mnl, rrset,
-				qname, qlen, setname, af) == -1)
+				setname, af) == -1)
 				return -1;
 		}
 	}
@@ -314,7 +311,7 @@ void ipset_operate(struct module_qstate *qstate, enum module_ev event, int id,

 	if (iq && (event == module_event_moddone)) {
 		if (qstate->return_msg && qstate->return_msg->rep) {
-			ipset_update(qstate->env, qstate->return_msg, qstate->qinfo, ie);
+			ipset_update(qstate->env, qstate->return_msg, ie);
 		}
 		qstate->ext_state[id] = module_finished;
 		return;
@@ -75,10 +75,8 @@ struct delegpt* delegpt_copy(struct delegpt* dp, struct regional* region)
 	copy->ssl_upstream = dp->ssl_upstream;
 	copy->tcp_upstream = dp->tcp_upstream;
 	for(ns = dp->nslist; ns; ns = ns->next) {
-		if(!delegpt_add_ns(copy, region, ns->name, ns->lame,
-			ns->tls_auth_name, ns->port))
+		if(!delegpt_add_ns(copy, region, ns->name, ns->lame))
 			return NULL;
-		copy->nslist->cache_lookup_count = ns->cache_lookup_count;
 		copy->nslist->resolved = ns->resolved;
 		copy->nslist->got4 = ns->got4;
 		copy->nslist->got6 = ns->got6;
@@ -86,8 +84,8 @@ struct delegpt* delegpt_copy(struct delegpt* dp, struct regional* region)
 		copy->nslist->done_pside6 = ns->done_pside6;
 	}
 	for(a = dp->target_list; a; a = a->next_target) {
-		if(!delegpt_add_addr(copy, region, &a->addr, a->addrlen,
-			a->bogus, a->lame, a->tls_auth_name, -1, NULL))
+		if(!delegpt_add_addr(copy, region, &a->addr, a->addrlen, 
+			a->bogus, a->lame, a->tls_auth_name, NULL))
 			return NULL;
 	}
 	return copy;
@@ -104,7 +102,7 @@ delegpt_set_name(struct delegpt* dp, struct regional* region, uint8_t* name)

 int 
 delegpt_add_ns(struct delegpt* dp, struct regional* region, uint8_t* name,
-	uint8_t lame, char* tls_auth_name, int port)
+	uint8_t lame)
 {
 	struct delegpt_ns* ns;
 	size_t len;
@@ -122,21 +120,12 @@ delegpt_add_ns(struct delegpt* dp, struct regional* region, uint8_t* name,
 	ns->namelen = len;
 	dp->nslist = ns;
 	ns->name = regional_alloc_init(region, name, ns->namelen);
-	ns->cache_lookup_count = 0;
 	ns->resolved = 0;
 	ns->got4 = 0;
 	ns->got6 = 0;
 	ns->lame = lame;
 	ns->done_pside4 = 0;
 	ns->done_pside6 = 0;
-	ns->port = port;
-	if(tls_auth_name) {
-		ns->tls_auth_name = regional_strdup(region, tls_auth_name);
-		if(!ns->tls_auth_name)
-			return 0;
-	} else {
-		ns->tls_auth_name = NULL;
-	}
 	return ns->name != 0;
 }

@@ -170,9 +159,9 @@ delegpt_find_addr(struct delegpt* dp, struct sockaddr_storage* addr,
 	return NULL;
 }

-int
-delegpt_add_target(struct delegpt* dp, struct regional* region,
-	uint8_t* name, size_t namelen, struct sockaddr_storage* addr,
+int 
+delegpt_add_target(struct delegpt* dp, struct regional* region, 
+	uint8_t* name, size_t namelen, struct sockaddr_storage* addr, 
 	socklen_t addrlen, uint8_t bogus, uint8_t lame, int* additions)
 {
 	struct delegpt_ns* ns = delegpt_find_ns(dp, name, namelen);
@@ -187,27 +176,18 @@ delegpt_add_target(struct delegpt* dp, struct regional* region,
 		else	ns->got4 = 1;
 		if(ns->got4 && ns->got6)
 			ns->resolved = 1;
-	} else {
-		if(addr_is_ip6(addr, addrlen))
-			ns->done_pside6 = 1;
-		else	ns->done_pside4 = 1;
 	}
-	log_assert(ns->port>0);
-	return delegpt_add_addr(dp, region, addr, addrlen, bogus, lame,
-		ns->tls_auth_name, ns->port, additions);
+	return delegpt_add_addr(dp, region, addr, addrlen, bogus, lame, NULL,
+		additions);
 }

-int
-delegpt_add_addr(struct delegpt* dp, struct regional* region,
-	struct sockaddr_storage* addr, socklen_t addrlen, uint8_t bogus,
-	uint8_t lame, char* tls_auth_name, int port, int* additions)
+int 
+delegpt_add_addr(struct delegpt* dp, struct regional* region, 
+	struct sockaddr_storage* addr, socklen_t addrlen, uint8_t bogus, 
+	uint8_t lame, char* tls_auth_name, int* additions)
 {
 	struct delegpt_addr* a;
 	log_assert(!dp->dp_type_mlc);
-	if(port != -1) {
-		log_assert(port>0);
-		sockaddr_store_port(addr, addrlen, port);
-	}
 	/* check for duplicates */
 	if((a = delegpt_find_addr(dp, addr, addrlen))) {
 		if(bogus)
@@ -321,45 +301,6 @@ void delegpt_log(enum verbosity_value v, struct delegpt* dp)
 	}
 }

-int
-delegpt_addr_on_result_list(struct delegpt* dp, struct delegpt_addr* find)
-{
-	struct delegpt_addr* a = dp->result_list;
-	while(a) {
-		if(a == find)
-			return 1;
-		a = a->next_result;
-	}
-	return 0;
-}
-
-void
-delegpt_usable_list_remove_addr(struct delegpt* dp, struct delegpt_addr* del)
-{
-	struct delegpt_addr* usa = dp->usable_list, *prev = NULL;
-	while(usa) {
-		if(usa == del) {
-			/* snip off the usable list */
-			if(prev)
-				prev->next_usable = usa->next_usable;
-			else	dp->usable_list = usa->next_usable;
-			return;
-		}
-		prev = usa;
-		usa = usa->next_usable;
-	}
-}
-
-void
-delegpt_add_to_result_list(struct delegpt* dp, struct delegpt_addr* a)
-{
-	if(delegpt_addr_on_result_list(dp, a))
-		return;
-	delegpt_usable_list_remove_addr(dp, a);
-	a->next_result = dp->result_list;
-	dp->result_list = a;
-}
-
 void 
 delegpt_add_unused_targets(struct delegpt* dp)
 {
@@ -383,16 +324,13 @@ delegpt_count_targets(struct delegpt* dp)
 }

 size_t 
-delegpt_count_missing_targets(struct delegpt* dp, int* alllame)
+delegpt_count_missing_targets(struct delegpt* dp)
 {
 	struct delegpt_ns* ns;
-	size_t n = 0, nlame = 0;
-	for(ns = dp->nslist; ns; ns = ns->next) {
-		if(ns->resolved) continue;
-		n++;
-		if(ns->lame) nlame++;
-	}
-	if(alllame && n == nlame) *alllame = 1;
+	size_t n = 0;
+	for(ns = dp->nslist; ns; ns = ns->next)
+		if(!ns->resolved)
+			n++;
 	return n;
 }

@@ -408,34 +346,6 @@ find_NS(struct reply_info* rep, size_t from, size_t to)
 	return NULL;
 }

-struct delegpt* delegpt_from_deleg(struct dns_msg*, struct regional* region, uint8_t* ipv4, uint8_t* ipv6, uint8_t* ns_name, size_t ns_name_len) {
-	struct delegpt* dp;
-	dp = delegpt_create(region);
-	delegpt_set_name(dp, region, ns_name);
-    delegpt_add_ns(dp, region,  ns_name, 0, NULL, 53);
-	// delegpt_rrset_add_ns(dp, region, ns_rrset, 0);
-    if (ipv4 != NULL) {
-        struct sockaddr_in sa4;
-        socklen_t lenv4 = (socklen_t)sizeof(sa4);
-        memset(&sa4, 0, lenv4);
-        sa4.sin_family = AF_INET;
-        memmove(&sa4.sin_addr, ipv4, INET_SIZE);
-        delegpt_add_target(dp, region, ns_name, ns_name_len, (struct sockaddr_storage*)&sa4, lenv4, 0, 0, NULL);
-        }
-    if (ipv6 != NULL) {
-        struct sockaddr_in6 sa6;
-        socklen_t lenv6 = (socklen_t)sizeof(sa6);
-        memset(&sa6, 0, lenv6);
-        sa6.sin6_family = AF_INET6;
-        memmove(&sa6.sin6_addr, ipv6, INET6_SIZE);
-        delegpt_add_target(dp, region, ns_name, ns_name_len, (struct sockaddr_storage*)&sa6, lenv6, 0, 0, NULL);
-    }
-    return dp;
-// delegpt_add_addr(struct delegpt* dp, struct regional* region,
-// 	struct sockaddr_storage* addr, socklen_t addrlen, uint8_t bogus,
-// 	uint8_t lame, char* tls_auth_name, int port, int* additions)
-}
-
 struct delegpt* 
 delegpt_from_message(struct dns_msg* msg, struct regional* region)
 {
@@ -502,8 +412,7 @@ delegpt_rrset_add_ns(struct delegpt* dp, struct regional* region,
 			(size_t)sldns_read_uint16(nsdata->rr_data[i]))
 			continue; /* bad format */
 		/* add rdata of NS (= wirefmt dname), skip rdatalen bytes */
-		if(!delegpt_add_ns(dp, region, nsdata->rr_data[i]+2, lame,
-			NULL, UNBOUND_DNS_PORT))
+		if(!delegpt_add_ns(dp, region, nsdata->rr_data[i]+2, lame))
 			return 0;
 	}
 	return 1;
@@ -520,6 +429,7 @@ delegpt_add_rrset_A(struct delegpt* dp, struct regional* region,
 	log_assert(!dp->dp_type_mlc);
        memset(&sa, 0, len);
        sa.sin_family = AF_INET;
+        sa.sin_port = (in_port_t)htons(UNBOUND_DNS_PORT);
        for(i=0; i<d->count; i++) {
                if(d->rr_len[i] != 2 + INET_SIZE)
                        continue;
@@ -543,6 +453,7 @@ delegpt_add_rrset_AAAA(struct delegpt* dp, struct regional* region,
 	log_assert(!dp->dp_type_mlc);
        memset(&sa, 0, len);
        sa.sin6_family = AF_INET6;
+        sa.sin6_port = (in_port_t)htons(UNBOUND_DNS_PORT);
        for(i=0; i<d->count; i++) {
                if(d->rr_len[i] != 2 + INET6_SIZE) /* rdatalen + len of IP6 */
                        continue;
@@ -644,7 +555,6 @@ void delegpt_free_mlc(struct delegpt* dp)
 	while(n) {
 		nn = n->next;
 		free(n->name);
-		free(n->tls_auth_name);
 		free(n);
 		n = nn;
 	}
@@ -667,8 +577,7 @@ int delegpt_set_name_mlc(struct delegpt* dp, uint8_t* name)
 	return (dp->name != NULL);
 }

-int delegpt_add_ns_mlc(struct delegpt* dp, uint8_t* name, uint8_t lame,
-	char* tls_auth_name, int port)
+int delegpt_add_ns_mlc(struct delegpt* dp, uint8_t* name, uint8_t lame)
 {
 	struct delegpt_ns* ns;
 	size_t len;
@@ -689,37 +598,20 @@ int delegpt_add_ns_mlc(struct delegpt* dp, uint8_t* name, uint8_t lame,
 	}
 	ns->next = dp->nslist;
 	dp->nslist = ns;
-	ns->cache_lookup_count = 0;
 	ns->resolved = 0;
 	ns->got4 = 0;
 	ns->got6 = 0;
 	ns->lame = (uint8_t)lame;
 	ns->done_pside4 = 0;
 	ns->done_pside6 = 0;
-	ns->port = port;
-	if(tls_auth_name) {
-		ns->tls_auth_name = strdup(tls_auth_name);
-		if(!ns->tls_auth_name) {
-			free(ns->name);
-			free(ns);
-			return 0;
-		}
-	} else {
-		ns->tls_auth_name = NULL;
-	}
 	return 1;
 }

 int delegpt_add_addr_mlc(struct delegpt* dp, struct sockaddr_storage* addr,
-	socklen_t addrlen, uint8_t bogus, uint8_t lame, char* tls_auth_name,
-	int port)
+	socklen_t addrlen, uint8_t bogus, uint8_t lame, char* tls_auth_name)
 {
 	struct delegpt_addr* a;
 	log_assert(dp->dp_type_mlc);
-	if(port != -1) {
-		log_assert(port>0);
-		sockaddr_store_port(addr, addrlen, port);
-	}
 	/* check for duplicates */
 	if((a = delegpt_find_addr(dp, addr, addrlen))) {
 		if(bogus)
@@ -771,14 +663,8 @@ int delegpt_add_target_mlc(struct delegpt* dp, uint8_t* name, size_t namelen,
 		else	ns->got4 = 1;
 		if(ns->got4 && ns->got6)
 			ns->resolved = 1;
-	} else {
-		if(addr_is_ip6(addr, addrlen))
-			ns->done_pside6 = 1;
-		else	ns->done_pside4 = 1;
 	}
-	log_assert(ns->port>0);
-	return delegpt_add_addr_mlc(dp, addr, addrlen, bogus, lame,
-		ns->tls_auth_name, ns->port);
+	return delegpt_add_addr_mlc(dp, addr, addrlen, bogus, lame, NULL);
 }

 size_t delegpt_get_mem(struct delegpt* dp)
@@ -101,8 +101,6 @@ struct delegpt_ns {
 	uint8_t* name;
 	/** length of name */
 	size_t namelen;
-	/** number of cache lookups for the name */
-	int cache_lookup_count;
 	/** 
 	 * If the name has been resolved. false if not queried for yet.
 	 * true if the A, AAAA queries have been generated.
@@ -128,11 +126,6 @@ struct delegpt_ns {
 	 * Also enabled if a parent-side cache entry exists, or a parent-side
 	 * negative-cache entry exists. */
 	uint8_t done_pside6;
-	/** the TLS authentication name, (if not NULL) to use. */
-	char* tls_auth_name;
-	/** the port to use; it should mostly be the default 53 but configured
-	 *  upstreams can provide nondefault ports. */
-	int port;
 };

 /**
@@ -198,12 +191,10 @@ int delegpt_set_name(struct delegpt* dp, struct regional* regional,
 * @param regional: where to allocate the info.
 * @param name: domain name in wire format.
 * @param lame: name is lame, disprefer it.
- * @param tls_auth_name: TLS authentication name (or NULL).
- * @param port: port to use for resolved addresses.
 * @return false on error.
 */
-int delegpt_add_ns(struct delegpt* dp, struct regional* regional,
-	uint8_t* name, uint8_t lame, char* tls_auth_name, int port);
+int delegpt_add_ns(struct delegpt* dp, struct regional* regional, 
+	uint8_t* name, uint8_t lame);

 /**
 * Add NS rrset; calls add_ns repeatedly.
@@ -280,14 +271,12 @@ int delegpt_add_rrset(struct delegpt* dp, struct regional* regional,
 * @param bogus: if address is bogus.
 * @param lame: if address is lame.
 * @param tls_auth_name: TLS authentication name (or NULL).
- * @param port: the port to use; if -1 the port is taken from addr.
 * @param additions: will be set to 1 if a new address is added
 * @return false on error.
 */
-int delegpt_add_addr(struct delegpt* dp, struct regional* regional,
+int delegpt_add_addr(struct delegpt* dp, struct regional* regional, 
 	struct sockaddr_storage* addr, socklen_t addrlen,
-	uint8_t bogus, uint8_t lame, char* tls_auth_name, int port,
-	int* additions);
+	uint8_t bogus, uint8_t lame, char* tls_auth_name, int* additions);

 /** 
 * Find NS record in name list of delegation point.
@@ -332,10 +321,9 @@ void delegpt_add_unused_targets(struct delegpt* dp);
 /**
 * Count number of missing targets. These are ns names with no resolved flag.
 * @param dp: delegation point.
- * @param alllame: if set, check if all the missing targets are lame.
 * @return number of missing targets (or 0).
 */
-size_t delegpt_count_missing_targets(struct delegpt* dp, int* alllame);
+size_t delegpt_count_missing_targets(struct delegpt* dp);

 /** count total number of targets in dp */
 size_t delegpt_count_targets(struct delegpt* dp);
@@ -361,7 +349,6 @@ size_t delegpt_count_targets(struct delegpt* dp);
 struct delegpt* delegpt_from_message(struct dns_msg* msg, 
 	struct regional* regional);

-struct delegpt* delegpt_from_deleg(struct dns_msg*, struct regional* region, uint8_t* ipv4, uint8_t* pv6, uint8_t* ns_name, size_t ns_name_len);
 /**
 * Mark negative return in delegation point for specific nameserver.
 * sets the got4 or got6 to negative, updates the ns->resolved.
@@ -417,27 +404,22 @@ int delegpt_set_name_mlc(struct delegpt* dp, uint8_t* name);
 * @param dp: must have been created with delegpt_create_mlc. 
 * @param name: the name to add.
 * @param lame: the name is lame, disprefer.
- * @param tls_auth_name: TLS authentication name (or NULL).
- * @param port: port to use for resolved addresses.
 * @return false on error.
 */
-int delegpt_add_ns_mlc(struct delegpt* dp, uint8_t* name, uint8_t lame,
-	char* tls_auth_name, int port);
+int delegpt_add_ns_mlc(struct delegpt* dp, uint8_t* name, uint8_t lame);

 /**
 * add an address to a malloced delegation point.
- * @param dp: must have been created with delegpt_create_mlc.
+ * @param dp: must have been created with delegpt_create_mlc. 
 * @param addr: the address.
 * @param addrlen: the length of addr.
 * @param bogus: if address is bogus.
 * @param lame: if address is lame.
 * @param tls_auth_name: TLS authentication name (or NULL).
- * @param port: the port to use; if -1 the port is taken from addr.
 * @return false on error.
 */
 int delegpt_add_addr_mlc(struct delegpt* dp, struct sockaddr_storage* addr,
-	socklen_t addrlen, uint8_t bogus, uint8_t lame, char* tls_auth_name,
-	int port);
+	socklen_t addrlen, uint8_t bogus, uint8_t lame, char* tls_auth_name);

 /**
 * Add target address to the delegation point.
@@ -458,29 +440,4 @@ int delegpt_add_target_mlc(struct delegpt* dp, uint8_t* name, size_t namelen,
 /** get memory in use by dp */
 size_t delegpt_get_mem(struct delegpt* dp);

-/**
- * See if the addr is on the result list.
- * @param dp: delegation point.
- * @param find: the pointer is searched for on the result list.
- * @return 1 if found, 0 if not found.
- */
-int delegpt_addr_on_result_list(struct delegpt* dp, struct delegpt_addr* find);
-
-/**
- * Remove the addr from the usable list.
- * @param dp: the delegation point.
- * @param del: the addr to remove from the list, the pointer is searched for.
- */
-void delegpt_usable_list_remove_addr(struct delegpt* dp,
-	struct delegpt_addr* del);
-
-/**
- * Add the delegpt_addr back to the result list, if it is not already on
- * the result list. Also removes it from the usable list.
- * @param dp: delegation point.
- * @param a: addr to add, nothing happens if it is already on the result list.
- *	It is removed from the usable list.
- */
-void delegpt_add_to_result_list(struct delegpt* dp, struct delegpt_addr* a);
-
 #endif /* ITERATOR_ITER_DELEGPT_H */
@@ -71,7 +71,6 @@ forwards_create(void)
 		sizeof(struct iter_forwards));
 	if(!fwd)
 		return NULL;
-	lock_rw_init(&fwd->lock);
 	return fwd;
 }

@@ -101,7 +100,6 @@ forwards_delete(struct iter_forwards* fwd)
 {
 	if(!fwd) 
 		return;
-	lock_rw_destroy(&fwd->lock);
 	fwd_del_tree(fwd);
 	free(fwd);
 }
@@ -202,27 +200,21 @@ read_fwds_name(struct config_stub* s)
 }

 /** set fwd host names */
-static int
+static int 
 read_fwds_host(struct config_stub* s, struct delegpt* dp)
 {
 	struct config_strlist* p;
 	uint8_t* dname;
-	char* tls_auth_name;
-	int port;
+	size_t dname_len;
 	for(p = s->hosts; p; p = p->next) {
 		log_assert(p->str);
-		dname = authextstrtodname(p->str, &port, &tls_auth_name);
+		dname = sldns_str2wire_dname(p->str, &dname_len);
 		if(!dname) {
 			log_err("cannot parse forward %s server name: '%s'", 
 				s->name, p->str);
 			return 0;
 		}
-#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST)
-		if(tls_auth_name)
-			log_err("no name verification functionality in "
-				"ssl library, ignored name for %s", p->str);
-#endif
-		if(!delegpt_add_ns_mlc(dp, dname, 0, tls_auth_name, port)) {
+		if(!delegpt_add_ns_mlc(dp, dname, 0)) {
 			free(dname);
 			log_err("out of memory");
 			return 0;
@@ -253,7 +245,7 @@ read_fwds_addr(struct config_stub* s, struct delegpt* dp)
 				"ssl library, ignored name for %s", p->str);
 #endif
 		if(!delegpt_add_addr_mlc(dp, &addr, addrlen, 0, 0,
-			tls_auth_name, -1)) {
+			tls_auth_name)) {
 			log_err("out of memory");
 			return 0;
 		}
@@ -334,64 +326,45 @@ make_stub_holes(struct iter_forwards* fwd, struct config_file* cfg)
 int 
 forwards_apply_cfg(struct iter_forwards* fwd, struct config_file* cfg)
 {
-	if(fwd->tree) {
-		lock_unprotect(&fwd->lock, fwd->tree);
-	}
 	fwd_del_tree(fwd);
 	fwd->tree = rbtree_create(fwd_cmp);
 	if(!fwd->tree)
 		return 0;
-	lock_protect(&fwd->lock, fwd->tree, sizeof(*fwd->tree));

-	lock_rw_wrlock(&fwd->lock);
 	/* read forward zones */
-	if(!read_forwards(fwd, cfg)) {
-		lock_rw_unlock(&fwd->lock);
+	if(!read_forwards(fwd, cfg))
 		return 0;
-	}
-	if(!make_stub_holes(fwd, cfg)) {
-		lock_rw_unlock(&fwd->lock);
+	if(!make_stub_holes(fwd, cfg))
 		return 0;
-	}
 	fwd_init_parents(fwd);
-	lock_rw_unlock(&fwd->lock);
 	return 1;
 }

 struct delegpt* 
-forwards_find(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
-	int nolock)
+forwards_find(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass)
 {
-	struct iter_forward_zone* res;
+	rbnode_type* res = NULL;
 	struct iter_forward_zone key;
-	int has_dp;
 	key.node.key = &key;
 	key.dclass = qclass;
 	key.name = qname;
 	key.namelabs = dname_count_size_labels(qname, &key.namelen);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&fwd->lock); }
-	res = (struct iter_forward_zone*)rbtree_search(fwd->tree, &key);
-	has_dp = res && res->dp;
-	if(!has_dp && !nolock) { lock_rw_unlock(&fwd->lock); }
-	return has_dp?res->dp:NULL;
+	res = rbtree_search(fwd->tree, &key);
+	if(res) return ((struct iter_forward_zone*)res)->dp;
+	return NULL;
 }

 struct delegpt* 
-forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
-	int nolock)
+forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass)
 {
 	/* lookup the forward zone in the tree */
 	rbnode_type* res = NULL;
 	struct iter_forward_zone *result;
 	struct iter_forward_zone key;
-	int has_dp;
 	key.node.key = &key;
 	key.dclass = qclass;
 	key.name = qname;
 	key.namelabs = dname_count_size_labels(qname, &key.namelen);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&fwd->lock); }
 	if(rbtree_find_less_equal(fwd->tree, &key, &res)) {
 		/* exact */
 		result = (struct iter_forward_zone*)res;
@@ -399,10 +372,8 @@ forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
 		/* smaller element (or no element) */
 		int m;
 		result = (struct iter_forward_zone*)res;
-		if(!result || result->dclass != qclass) {
-			if(!nolock) { lock_rw_unlock(&fwd->lock); }
+		if(!result || result->dclass != qclass)
 			return NULL;
-		}
 		/* count number of labels matched */
 		(void)dname_lab_cmp(result->name, result->namelabs, key.name,
 			key.namelabs, &m);
@@ -412,22 +383,20 @@ forwards_lookup(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass,
 			result = result->parent;
 		}
 	}
-	has_dp = result && result->dp;
-	if(!has_dp && !nolock) { lock_rw_unlock(&fwd->lock); }
-	return has_dp?result->dp:NULL;
+	if(result)
+		return result->dp;
+	return NULL;
 }

 struct delegpt* 
-forwards_lookup_root(struct iter_forwards* fwd, uint16_t qclass, int nolock)
+forwards_lookup_root(struct iter_forwards* fwd, uint16_t qclass)
 {
 	uint8_t root = 0;
-	return forwards_lookup(fwd, &root, qclass, nolock);
+	return forwards_lookup(fwd, &root, qclass);
 }

-/* Finds next root item in forwards lookup tree.
- * Caller needs to handle locking of the forwards structure. */
-static int
-next_root_locked(struct iter_forwards* fwd, uint16_t* dclass)
+int
+forwards_next_root(struct iter_forwards* fwd, uint16_t* dclass)
 {
 	struct iter_forward_zone key;
 	rbnode_type* n;
@@ -444,7 +413,7 @@ next_root_locked(struct iter_forwards* fwd, uint16_t* dclass)
 		}
 		/* root not first item? search for higher items */
 		*dclass = p->dclass + 1;
-		return next_root_locked(fwd, dclass);
+		return forwards_next_root(fwd, dclass);
 	}
 	/* find class n in tree, we may get a direct hit, or if we don't
 	 * this is the last item of the previous class so rbtree_next() takes
@@ -472,21 +441,10 @@ next_root_locked(struct iter_forwards* fwd, uint16_t* dclass)
 		}
 		/* not a root node, return next higher item */
 		*dclass = p->dclass+1;
-		return next_root_locked(fwd, dclass);
+		return forwards_next_root(fwd, dclass);
 	}
 }

-int
-forwards_next_root(struct iter_forwards* fwd, uint16_t* dclass, int nolock)
-{
-	int ret;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&fwd->lock); }
-	ret = next_root_locked(fwd, dclass);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
-	return ret;
-}
-
 size_t 
 forwards_get_mem(struct iter_forwards* fwd)
 {
@@ -494,12 +452,10 @@ forwards_get_mem(struct iter_forwards* fwd)
 	size_t s;
 	if(!fwd)
 		return 0;
-	lock_rw_rdlock(&fwd->lock);
 	s = sizeof(*fwd) + sizeof(*fwd->tree);
 	RBTREE_FOR(p, struct iter_forward_zone*, fwd->tree) {
 		s += sizeof(*p) + p->namelen + delegpt_get_mem(p->dp);
 	}
-	lock_rw_unlock(&fwd->lock);
 	return s;
 }

@@ -515,78 +471,50 @@ fwd_zone_find(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 }

 int 
-forwards_add_zone(struct iter_forwards* fwd, uint16_t c, struct delegpt* dp,
-	int nolock)
+forwards_add_zone(struct iter_forwards* fwd, uint16_t c, struct delegpt* dp)
 {
 	struct iter_forward_zone *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
 	if((z=fwd_zone_find(fwd, c, dp->name)) != NULL) {
 		(void)rbtree_delete(fwd->tree, &z->node);
 		fwd_zone_free(z);
 	}
-	if(!forwards_insert(fwd, c, dp)) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(!forwards_insert(fwd, c, dp))
 		return 0;
-	}
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 	return 1;
 }

 void 
-forwards_delete_zone(struct iter_forwards* fwd, uint16_t c, uint8_t* nm,
-	int nolock)
+forwards_delete_zone(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 {
 	struct iter_forward_zone *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
-	if(!(z=fwd_zone_find(fwd, c, nm))) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(!(z=fwd_zone_find(fwd, c, nm)))
 		return; /* nothing to do */
-	}
 	(void)rbtree_delete(fwd->tree, &z->node);
 	fwd_zone_free(z);
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 }

 int
-forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm,
-	int nolock)
+forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 {
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
-	if(fwd_zone_find(fwd, c, nm) != NULL) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
-		return 1; /* already a stub zone there */
-	}
 	if(!fwd_add_stub_hole(fwd, c, nm)) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
 		return 0;
 	}
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 	return 1;
 }

 void
-forwards_delete_stub_hole(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock)
+forwards_delete_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm)
 {
 	struct iter_forward_zone *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&fwd->lock); }
-	if(!(z=fwd_zone_find(fwd, c, nm))) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(!(z=fwd_zone_find(fwd, c, nm)))
 		return; /* nothing to do */
-	}
-	if(z->dp != NULL) {
-		if(!nolock) { lock_rw_unlock(&fwd->lock); }
+	if(z->dp != NULL)
 		return; /* not a stub hole */
-	}
 	(void)rbtree_delete(fwd->tree, &z->node);
 	fwd_zone_free(z);
 	fwd_init_parents(fwd);
-	if(!nolock) { lock_rw_unlock(&fwd->lock); }
 }
+
@@ -43,7 +43,6 @@
 #ifndef ITERATOR_ITER_FWD_H
 #define ITERATOR_ITER_FWD_H
 #include "util/rbtree.h"
-#include "util/locks.h"
 struct config_file;
 struct delegpt;

@@ -51,11 +50,6 @@ struct delegpt;
 * Iterator forward zones structure
 */
 struct iter_forwards {
-	/** lock on the forwards tree.
-	 * When grabbing both this lock and the anchors.lock, this lock
-	 * is grabbed first. When grabbing both this lock and the hints.lock
-	 * this lock is grabbed first. */
-	lock_rw_type lock;
 	/** 
 	 * Zones are stored in this tree. Sort order is specially chosen.
 	 * first sorted on qclass. Then on dname in nsec-like order, so that
@@ -112,65 +106,47 @@ int forwards_apply_cfg(struct iter_forwards* fwd, struct config_file* cfg);

 /**
 * Find forward zone exactly by name
- * The return value is contents of the forwards structure.
- * Caller should lock and unlock a readlock on the forwards structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the forwards structure if a
- * value was returned.
 * @param fwd: forward storage.
 * @param qname: The qname of the query.
 * @param qclass: The qclass of the query.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A delegation point or null.
 */
 struct delegpt* forwards_find(struct iter_forwards* fwd, uint8_t* qname,
-	uint16_t qclass, int nolock);
+	uint16_t qclass);

 /**
 * Find forward zone information
 * For this qname/qclass find forward zone information, returns delegation
 * point with server names and addresses, or NULL if no forwarding is needed.
- * The return value is contents of the forwards structure.
- * Caller should lock and unlock a readlock on the forwards structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the forwards structure if a
- * value was returned.
 *
 * @param fwd: forward storage.
 * @param qname: The qname of the query.
 * @param qclass: The qclass of the query.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A delegation point if the query has to be forwarded to that list,
 *         otherwise null.
 */
-struct delegpt* forwards_lookup(struct iter_forwards* fwd,
-	uint8_t* qname, uint16_t qclass, int nolock);
+struct delegpt* forwards_lookup(struct iter_forwards* fwd, 
+	uint8_t* qname, uint16_t qclass);

 /**
 * Same as forwards_lookup, but for the root only
 * @param fwd: forward storage.
 * @param qclass: The qclass of the query.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A delegation point if root forward exists, otherwise null.
 */
-struct delegpt* forwards_lookup_root(struct iter_forwards* fwd,
-	uint16_t qclass, int nolock);
+struct delegpt* forwards_lookup_root(struct iter_forwards* fwd, 
+	uint16_t qclass);

 /**
 * Find next root item in forwards lookup tree.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a readlock on the forwards structure.
 * @param fwd: the forward storage
 * @param qclass: class to look at next, or higher.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false if none found, or if true stored in qclass.
 */
-int forwards_next_root(struct iter_forwards* fwd, uint16_t* qclass,
-	int nolock);
+int forwards_next_root(struct iter_forwards* fwd, uint16_t* qclass);

 /**
 * Get memory in use by forward storage
- * Locks and unlocks the structure.
 * @param fwd: forward storage.
 * @return bytes in use
 */
@@ -182,56 +158,42 @@ int fwd_cmp(const void* k1, const void* k2);
 /**
 * Add zone to forward structure. For external use since it recalcs 
 * the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param dp: delegation point with name and target nameservers for new
 *	forward zone. malloced.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false on failure (out of memory);
 */
-int forwards_add_zone(struct iter_forwards* fwd, uint16_t c,
-	struct delegpt* dp, int nolock);
+int forwards_add_zone(struct iter_forwards* fwd, uint16_t c, 
+	struct delegpt* dp);

 /**
 * Remove zone from forward structure. For external use since it 
 * recalcs the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param nm: name of zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 */
-void forwards_delete_zone(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock);
+void forwards_delete_zone(struct iter_forwards* fwd, uint16_t c, uint8_t* nm);

 /**
 * Add stub hole (empty entry in forward table, that makes resolution skip
 * a forward-zone because the stub zone should override the forward zone).
 * Does not add one if not necessary.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param nm: name of zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false on failure (out of memory);
 */
-int forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock);
+int forwards_add_stub_hole(struct iter_forwards* fwd, uint16_t c, uint8_t* nm);

 /**
 * Remove stub hole, if one exists.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the forwards structure.
 * @param fwd: the forward data structure
 * @param c: class of zone
 * @param nm: name of zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 */
 void forwards_delete_stub_hole(struct iter_forwards* fwd, uint16_t c,
-	uint8_t* nm, int nolock);
+	uint8_t* nm);

 #endif /* ITERATOR_ITER_FWD_H */
@@ -57,8 +57,6 @@ hints_create(void)
 		sizeof(struct iter_hints));
 	if(!hints)
 		return NULL;
-	lock_rw_init(&hints->lock);
-	lock_protect(&hints->lock, &hints->tree, sizeof(hints->tree));
 	return hints;
 }

@@ -85,7 +83,6 @@ hints_delete(struct iter_hints* hints)
 {
 	if(!hints) 
 		return;
-	lock_rw_destroy(&hints->lock);
 	hints_del_tree(hints);
 	free(hints);
 }
@@ -102,8 +99,8 @@ ah(struct delegpt* dp, const char* sv, const char* ip)
 		log_err("could not parse %s", sv);
 		return 0;
 	}
-	if(!delegpt_add_ns_mlc(dp, dname, 0, NULL, UNBOUND_DNS_PORT) ||
-	   !extstrtoaddr(ip, &addr, &addrlen, UNBOUND_DNS_PORT) ||
+	if(!delegpt_add_ns_mlc(dp, dname, 0) ||
+	   !extstrtoaddr(ip, &addr, &addrlen) ||
 	   !delegpt_add_target_mlc(dp, dname, dname_len,
 		&addr, addrlen, 0, 0)) {
 		free(dname);
@@ -132,7 +129,7 @@ compile_time_root_prime(int do_ip4, int do_ip6)
 	dp->has_parent_side_NS = 1;
      if(do_ip4) {
 	if(!ah(dp, "A.ROOT-SERVERS.NET.", "198.41.0.4"))	goto failed;
-	if(!ah(dp, "B.ROOT-SERVERS.NET.", "170.247.170.2"))	goto failed;
+	if(!ah(dp, "B.ROOT-SERVERS.NET.", "199.9.14.201")) goto failed;
 	if(!ah(dp, "C.ROOT-SERVERS.NET.", "192.33.4.12"))	goto failed;
 	if(!ah(dp, "D.ROOT-SERVERS.NET.", "199.7.91.13"))	goto failed;
 	if(!ah(dp, "E.ROOT-SERVERS.NET.", "192.203.230.10")) goto failed;
@@ -147,7 +144,7 @@ compile_time_root_prime(int do_ip4, int do_ip6)
      }
      if(do_ip6) {
 	if(!ah(dp, "A.ROOT-SERVERS.NET.", "2001:503:ba3e::2:30")) goto failed;
-	if(!ah(dp, "B.ROOT-SERVERS.NET.", "2801:1b8:10::b")) goto failed;
+	if(!ah(dp, "B.ROOT-SERVERS.NET.", "2001:500:200::b")) goto failed;
 	if(!ah(dp, "C.ROOT-SERVERS.NET.", "2001:500:2::c")) goto failed;
 	if(!ah(dp, "D.ROOT-SERVERS.NET.", "2001:500:2d::d")) goto failed;
 	if(!ah(dp, "E.ROOT-SERVERS.NET.", "2001:500:a8::e")) goto failed;
@@ -216,27 +213,21 @@ read_stubs_name(struct config_stub* s)
 }

 /** set stub host names */
-static int
+static int 
 read_stubs_host(struct config_stub* s, struct delegpt* dp)
 {
 	struct config_strlist* p;
+	size_t dname_len;
 	uint8_t* dname;
-	char* tls_auth_name;
-	int port;
 	for(p = s->hosts; p; p = p->next) {
 		log_assert(p->str);
-		dname = authextstrtodname(p->str, &port, &tls_auth_name);
+		dname = sldns_str2wire_dname(p->str, &dname_len);
 		if(!dname) {
 			log_err("cannot parse stub %s nameserver name: '%s'", 
 				s->name, p->str);
 			return 0;
 		}
-#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST)
-		if(tls_auth_name)
-			log_err("no name verification functionality in "
-				"ssl library, ignored name for %s", p->str);
-#endif
-		if(!delegpt_add_ns_mlc(dp, dname, 0, tls_auth_name, port)) {
+		if(!delegpt_add_ns_mlc(dp, dname, 0)) {
 			free(dname);
 			log_err("out of memory");
 			return 0;
@@ -267,7 +258,7 @@ read_stubs_addr(struct config_stub* s, struct delegpt* dp)
 				"ssl library, ignored name for %s", p->str);
 #endif
 		if(!delegpt_add_addr_mlc(dp, &addr, addrlen, 0, 0,
-			auth_name, -1)) {
+			auth_name)) {
 			log_err("out of memory");
 			return 0;
 		}
@@ -347,7 +338,7 @@ read_root_hints(struct iter_hints* hints, char* fname)
 		if(sldns_wirerr_get_type(rr, rr_len, dname_len)
 			== LDNS_RR_TYPE_NS) {
 			if(!delegpt_add_ns_mlc(dp, sldns_wirerr_get_rdata(rr,
-				rr_len, dname_len), 0, NULL, UNBOUND_DNS_PORT)) {
+				rr_len, dname_len), 0)) {
 				log_err("out of memory reading root hints");
 				goto stop_read;
 			}
@@ -441,70 +432,47 @@ read_root_hints_list(struct iter_hints* hints, struct config_file* cfg)
 int 
 hints_apply_cfg(struct iter_hints* hints, struct config_file* cfg)
 {
-	int nolock = 1;
-	lock_rw_wrlock(&hints->lock);
 	hints_del_tree(hints);
 	name_tree_init(&hints->tree);
-
+	
 	/* read root hints */
-	if(!read_root_hints_list(hints, cfg)) {
-		lock_rw_unlock(&hints->lock);
+	if(!read_root_hints_list(hints, cfg))
 		return 0;
-	}

 	/* read stub hints */
-	if(!read_stubs(hints, cfg)) {
-		lock_rw_unlock(&hints->lock);
+	if(!read_stubs(hints, cfg))
 		return 0;
-	}

 	/* use fallback compiletime root hints */
-	if(!hints_find_root(hints, LDNS_RR_CLASS_IN, nolock)) {
+	if(!hints_lookup_root(hints, LDNS_RR_CLASS_IN)) {
 		struct delegpt* dp = compile_time_root_prime(cfg->do_ip4,
 			cfg->do_ip6);
 		verbose(VERB_ALGO, "no config, using builtin root hints.");
-		if(!dp) {
-			lock_rw_unlock(&hints->lock);
+		if(!dp) 
 			return 0;
-		}
-		if(!hints_insert(hints, LDNS_RR_CLASS_IN, dp, 0)) {
-			lock_rw_unlock(&hints->lock);
+		if(!hints_insert(hints, LDNS_RR_CLASS_IN, dp, 0))
 			return 0;
-		}
 	}

 	name_tree_init_parents(&hints->tree);
-	lock_rw_unlock(&hints->lock);
 	return 1;
 }

-struct delegpt*
-hints_find(struct iter_hints* hints, uint8_t* qname, uint16_t qclass,
-	int nolock)
-{
-	struct iter_hints_stub *stub;
-	size_t len;
-	int has_dp;
-	int labs = dname_count_size_labels(qname, &len);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&hints->lock); }
-	stub = (struct iter_hints_stub*)name_tree_find(&hints->tree,
-		qname, len, labs, qclass);
-	has_dp = stub && stub->dp;
-	if(!has_dp && !nolock) { lock_rw_unlock(&hints->lock); }
-	return has_dp?stub->dp:NULL;
-}
-
-struct delegpt*
-hints_find_root(struct iter_hints* hints, uint16_t qclass, int nolock)
+struct delegpt* 
+hints_lookup_root(struct iter_hints* hints, uint16_t qclass)
 {
 	uint8_t rootlab = 0;
-	return hints_find(hints, &rootlab, qclass, nolock);
+	struct iter_hints_stub *stub;
+	stub = (struct iter_hints_stub*)name_tree_find(&hints->tree,
+		&rootlab, 1, 1, qclass);
+	if(!stub)
+		return NULL;
+	return stub->dp;
 }

 struct iter_hints_stub* 
-hints_lookup_stub(struct iter_hints* hints, uint8_t* qname,
-	uint16_t qclass, struct delegpt* cache_dp, int nolock)
+hints_lookup_stub(struct iter_hints* hints, uint8_t* qname, 
+	uint16_t qclass, struct delegpt* cache_dp)
 {
 	size_t len;
 	int labs;
@@ -512,20 +480,14 @@ hints_lookup_stub(struct iter_hints* hints, uint8_t* qname,

 	/* first lookup the stub */
 	labs = dname_count_size_labels(qname, &len);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&hints->lock); }
 	r = (struct iter_hints_stub*)name_tree_lookup(&hints->tree, qname,
 		len, labs, qclass);
-	if(!r) {
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
-		return NULL;
-	}
+	if(!r) return NULL;

 	/* If there is no cache (root prime situation) */
 	if(cache_dp == NULL) {
 		if(r->dp->namelabs != 1)
 			return r; /* no cache dp, use any non-root stub */
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
 		return NULL;
 	}

@@ -542,18 +504,12 @@ hints_lookup_stub(struct iter_hints* hints, uint8_t* qname,
 	if(dname_strict_subdomain(r->dp->name, r->dp->namelabs,
 		cache_dp->name, cache_dp->namelabs))
 		return r; /* need to prime this stub */
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
 	return NULL;
 }

-int hints_next_root(struct iter_hints* hints, uint16_t* qclass, int nolock)
+int hints_next_root(struct iter_hints* hints, uint16_t* qclass)
 {
-	int ret;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_rdlock(&hints->lock); }
-	ret = name_tree_next_root(&hints->tree, qclass);
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
-	return ret;
+	return name_tree_next_root(&hints->tree, qclass);
 }

 size_t 
@@ -562,52 +518,40 @@ hints_get_mem(struct iter_hints* hints)
 	size_t s;
 	struct iter_hints_stub* p;
 	if(!hints) return 0;
-	lock_rw_rdlock(&hints->lock);
 	s = sizeof(*hints);
 	RBTREE_FOR(p, struct iter_hints_stub*, &hints->tree) {
 		s += sizeof(*p) + delegpt_get_mem(p->dp);
 	}
-	lock_rw_unlock(&hints->lock);
 	return s;
 }

 int 
 hints_add_stub(struct iter_hints* hints, uint16_t c, struct delegpt* dp,
-	int noprime, int nolock)
+	int noprime)
 {
 	struct iter_hints_stub *z;
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&hints->lock); }
 	if((z=(struct iter_hints_stub*)name_tree_find(&hints->tree,
 		dp->name, dp->namelen, dp->namelabs, c)) != NULL) {
 		(void)rbtree_delete(&hints->tree, &z->node);
 		hints_stub_free(z);
 	}
-	if(!hints_insert(hints, c, dp, noprime)) {
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
+	if(!hints_insert(hints, c, dp, noprime))
 		return 0;
-	}
 	name_tree_init_parents(&hints->tree);
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
 	return 1;
 }

 void 
-hints_delete_stub(struct iter_hints* hints, uint16_t c, uint8_t* nm,
-	int nolock)
+hints_delete_stub(struct iter_hints* hints, uint16_t c, uint8_t* nm)
 {
 	struct iter_hints_stub *z;
 	size_t len;
 	int labs = dname_count_size_labels(nm, &len);
-	/* lock_() calls are macros that could be nothing, surround in {} */
-	if(!nolock) { lock_rw_wrlock(&hints->lock); }
 	if(!(z=(struct iter_hints_stub*)name_tree_find(&hints->tree,
-		nm, len, labs, c))) {
-		if(!nolock) { lock_rw_unlock(&hints->lock); }
+		nm, len, labs, c)))
 		return; /* nothing to do */
-	}
 	(void)rbtree_delete(&hints->tree, &z->node);
 	hints_stub_free(z);
 	name_tree_init_parents(&hints->tree);
-	if(!nolock) { lock_rw_unlock(&hints->lock); }
 }
+
@@ -43,7 +43,6 @@
 #ifndef ITERATOR_ITER_HINTS_H
 #define ITERATOR_ITER_HINTS_H
 #include "util/storage/dnstree.h"
-#include "util/locks.h"
 struct iter_env;
 struct config_file;
 struct delegpt;
@@ -52,10 +51,6 @@ struct delegpt;
 * Iterator hints structure
 */
 struct iter_hints {
-	/** lock on the forwards tree.
-	 * When grabbing both this lock and the anchors.lock, this lock
-	 * is grabbed first. */
-	lock_rw_type lock;
 	/** 
 	 * Hints are stored in this tree. Sort order is specially chosen.
 	 * first sorted on qclass. Then on dname in nsec-like order, so that
@@ -100,70 +95,42 @@ void hints_delete(struct iter_hints* hints);
 int hints_apply_cfg(struct iter_hints* hints, struct config_file* cfg);

 /**
- * Find hints for the given class.
- * The return value is contents of the hints structure.
- * Caller should lock and unlock a readlock on the hints structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the hints structure if a
- * value was returned.
- * @param hints: hint storage.
- * @param qname: the qname that generated the delegation point.
- * @param qclass: class for which root hints are requested. host order.
- * @param nolock: Skip locking, locking is handled by the caller.
- * @return: NULL if no hints, or a ptr to stored hints.
- */
-struct delegpt* hints_find(struct iter_hints* hints, uint8_t* qname,
-	uint16_t qclass, int nolock);
-
-/**
- * Same as hints_lookup, but for the root only.
+ * Find root hints for the given class.
 * @param hints: hint storage.
 * @param qclass: class for which root hints are requested. host order.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: NULL if no hints, or a ptr to stored hints.
 */
-struct delegpt* hints_find_root(struct iter_hints* hints,
-	uint16_t qclass, int nolock);
+struct delegpt* hints_lookup_root(struct iter_hints* hints, uint16_t qclass);

 /**
 * Find next root hints (to cycle through all root hints).
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a readlock on the hints structure.
 * @param hints: hint storage
 * @param qclass: class for which root hints are sought.
 * 	0 means give the first available root hints class.
 * 	x means, give class x or a higher class if any.
 * 	returns the found class in this variable.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return true if a root hint class is found.
 * 	false if not root hint class is found (qclass may have been changed).
 */
-int hints_next_root(struct iter_hints* hints, uint16_t* qclass, int nolock);
+int hints_next_root(struct iter_hints* hints, uint16_t* qclass);

 /**
 * Given a qname/qclass combination, and the delegation point from the cache
 * for this qname/qclass, determine if this combination indicates that a
 * stub hint exists and must be primed.
- * The return value is contents of the hints structure.
- * Caller should lock and unlock a readlock on the hints structure if nolock
- * is set.
- * Otherwise caller should unlock the readlock on the hints structure if a
- * value was returned.
 *
 * @param hints: hint storage.
 * @param qname: The qname that generated the delegation point.
 * @param qclass: The qclass that generated the delegation point.
 * @param dp: The cache generated delegation point.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return: A priming delegation point if there is a stub hint that must
 *         be primed, otherwise null.
 */
-struct iter_hints_stub* hints_lookup_stub(struct iter_hints* hints,
-	uint8_t* qname, uint16_t qclass, struct delegpt* dp, int nolock);
+struct iter_hints_stub* hints_lookup_stub(struct iter_hints* hints, 
+	uint8_t* qname, uint16_t qclass, struct delegpt* dp);

 /**
 * Get memory in use by hints
- * Locks and unlocks the structure.
 * @param hints: hint storage.
 * @return bytes in use
 */
@@ -172,30 +139,23 @@ size_t hints_get_mem(struct iter_hints* hints);
 /**
 * Add stub to hints structure. For external use since it recalcs 
 * the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the hints structure.
 * @param hints: the hints data structure
 * @param c: class of zone
 * @param dp: delegation point with name and target nameservers for new
 *	hints stub. malloced.
 * @param noprime: set noprime option to true or false on new hint stub.
- * @param nolock: Skip locking, locking is handled by the caller.
 * @return false on failure (out of memory);
 */
 int hints_add_stub(struct iter_hints* hints, uint16_t c, struct delegpt* dp,
-	int noprime, int nolock);
+	int noprime);

 /**
 * Remove stub from hints structure. For external use since it 
 * recalcs the tree parents.
- * Handles its own locking unless nolock is set. In that case the caller
- * should lock and unlock a writelock on the hints structure.
 * @param hints: the hints data structure
 * @param c: class of stub zone
 * @param nm: name of stub zone (in uncompressed wireformat).
- * @param nolock: Skip locking, locking is handled by the caller.
 */
-void hints_delete_stub(struct iter_hints* hints, uint16_t c,
-	uint8_t* nm, int nolock);
+void hints_delete_stub(struct iter_hints* hints, uint16_t c, uint8_t* nm);

 #endif /* ITERATOR_ITER_HINTS_H */
@@ -207,6 +207,28 @@ size_t priv_get_mem(struct iter_priv* priv)
 	return sizeof(*priv) + regional_get_mem(priv->region);
 }

+/** remove RR from msgparse RRset, return true if rrset is entirely bad */
+static int
+remove_rr(const char* str, sldns_buffer* pkt, struct rrset_parse* rrset,
+	struct rr_parse* prev, struct rr_parse** rr, struct sockaddr_storage* addr, socklen_t addrlen)
+{
+	if(verbosity >= VERB_QUERY && rrset->dname_len <= LDNS_MAX_DOMAINLEN && str) {
+		uint8_t buf[LDNS_MAX_DOMAINLEN+1];
+		dname_pkt_copy(pkt, buf, rrset->dname);
+		log_name_addr(VERB_QUERY, str, buf, addr, addrlen);
+	}
+	if(prev)
+		prev->next = (*rr)->next;
+	else	rrset->rr_first = (*rr)->next;
+	if(rrset->rr_last == *rr)
+		rrset->rr_last = prev;
+	rrset->rr_count --;
+	rrset->size -= (*rr)->size;
+	/* rr struct still exists, but is unlinked, so that in the for loop
+	 * the rr->next works fine to continue. */
+	return rrset->rr_count == 0;
+}
+
 int priv_rrset_bad(struct iter_priv* priv, sldns_buffer* pkt,
 	struct rrset_parse* rrset)
 {
@@ -239,7 +261,7 @@ int priv_rrset_bad(struct iter_priv* priv, sldns_buffer* pkt,
 					INET_SIZE);
 				memmove(&addr, &sa, len);
 				if(priv_lookup_addr(priv, &addr, len)) {
-					if(msgparse_rrset_remove_rr("sanitize: removing public name with private address", pkt, rrset, prev, rr, &addr, len))
+					if(remove_rr("sanitize: removing public name with private address", pkt, rrset, prev, &rr, &addr, len))
 						return 1;
 					continue;
 				}
@@ -262,7 +284,7 @@ int priv_rrset_bad(struct iter_priv* priv, sldns_buffer* pkt,
 					INET6_SIZE);
 				memmove(&addr, &sa, len);
 				if(priv_lookup_addr(priv, &addr, len)) {
-					if(msgparse_rrset_remove_rr("sanitize: removing public name with private address", pkt, rrset, prev, rr, &addr, len))
+					if(remove_rr("sanitize: removing public name with private address", pkt, rrset, prev, &rr, &addr, len))
 						return 1;
 					continue;
 				}
@@ -42,7 +42,6 @@
 #include "config.h"
 #include "iterator/iter_resptype.h"
 #include "iterator/iter_delegpt.h"
-#include "iterator/iterator.h"
 #include "services/cache/dns.h"
 #include "util/net_help.h"
 #include "util/data/dname.h"
@@ -106,8 +105,7 @@ response_type_from_cache(struct dns_msg* msg,

 enum response_type 
 response_type_from_server(int rdset,
-	struct dns_msg* msg, struct query_info* request, struct delegpt* dp,
-	int* empty_nodata_found)
+	struct dns_msg* msg, struct query_info* request, struct delegpt* dp)
 {
 	uint8_t* origzone = (uint8_t*)"\000"; /* the default */
 	struct ub_packed_rrset_key* s;
@@ -115,11 +113,7 @@ response_type_from_server(int rdset,

 	if(!msg || !request)
 		return RESPONSE_TYPE_THROWAWAY;
-	/* If the TC flag is set, the response is incomplete. Too large to
-	 * fit even in TCP or so. Discard it, it cannot be retrieved here. */
-	if((msg->rep->flags & BIT_TC))
-		return RESPONSE_TYPE_THROWAWAY;
-
+	
 	/* If the message is NXDOMAIN, then it answers the question. */
 	if(FLAGS_GET_RCODE(msg->rep->flags) == LDNS_RCODE_NXDOMAIN) {
 		/* make sure its not recursive when we don't want it to */
@@ -286,22 +280,6 @@ response_type_from_server(int rdset,

 	/* If we've gotten this far, this is NOERROR/NODATA (which could 
 	 * be an entirely empty message) */
-	/* For entirely empty messages, try again, at first, then accept
-	 * it it happens more. A regular noerror/nodata response has a soa
-	 * negative ttl value in the authority section. This makes it try
-	 * again at another authority. And decides between storing a 5 second
-	 * empty message or a 5 second servfail response. */
-	if(msg->rep->an_numrrsets == 0 && msg->rep->ns_numrrsets == 0 &&
-		msg->rep->ar_numrrsets == 0) {
-		if(empty_nodata_found) {
-			/* detect as throwaway at first, but accept later. */
-			(*empty_nodata_found)++;
-			if(*empty_nodata_found < EMPTY_NODATA_RETRY_COUNT)
-				return RESPONSE_TYPE_THROWAWAY;
-			return RESPONSE_TYPE_ANSWER;
-		}
-		return RESPONSE_TYPE_ANSWER;
-	}
 	/* check if recursive answer; saying it has empty cache */
 	if( (msg->rep->flags&BIT_RA) && !(msg->rep->flags&BIT_AA) && !rdset)
 		return RESPONSE_TYPE_REC_LAME;
@@ -119,11 +119,9 @@ enum response_type response_type_from_cache(struct dns_msg* msg,
 * @param request: the request that generated the response.
 * @param dp: The delegation point that was being queried
 *          when the response was returned.
- * @param empty_nodata_found: flag to keep track of empty nodata detection.
 * @return the response type (CNAME or ANSWER).
 */
 enum response_type response_type_from_server(int rdset, 
-	struct dns_msg* msg, struct query_info* request, struct delegpt* dp,
-	int* empty_nodata_found);
+	struct dns_msg* msg, struct query_info* request, struct delegpt* dp);

 #endif /* ITERATOR_ITER_RESPTYPE_H */
@@ -283,8 +283,7 @@ synth_cname_rrset(uint8_t** sname, size_t* snamelen, uint8_t* alias,
 		sizeof(uint32_t)+sizeof(uint16_t)+aliaslen);
 	if(!cn->rr_first->ttl_data)
 		return NULL;
-	memmove(cn->rr_first->ttl_data, rrset->rr_first->ttl_data,
-		sizeof(uint32_t)); /* RFC6672: synth CNAME TTL == DNAME TTL */
+	sldns_write_uint32(cn->rr_first->ttl_data, 0); /* TTL = 0 */
 	sldns_write_uint16(cn->rr_first->ttl_data+4, aliaslen);
 	memmove(cn->rr_first->ttl_data+6, alias, aliaslen);
 	cn->rr_first->size = sizeof(uint16_t)+aliaslen;
@@ -347,26 +346,6 @@ soa_in_auth(struct msg_parse* msg)
 	return 0;
 }

-/** Check if type is allowed in the authority section */
-static int
-type_allowed_in_authority_section(uint16_t tp)
-{
-	if(tp == LDNS_RR_TYPE_SOA || tp == LDNS_RR_TYPE_NS ||
-		tp == LDNS_RR_TYPE_DS || tp == LDNS_RR_TYPE_NSEC ||
-		tp == LDNS_RR_TYPE_NSEC3)
-		return 1;
-	return 0;
-}
-
-/** Check if type is allowed in the additional section */
-static int
-type_allowed_in_additional_section(uint16_t tp)
-{
-	if(tp == LDNS_RR_TYPE_A || tp == LDNS_RR_TYPE_AAAA)
-		return 1;
-	return 0;
-}
-
 /**
 * This routine normalizes a response. This includes removing "irrelevant"
 * records from the answer and additional sections and (re)synthesizing
@@ -376,13 +355,11 @@ type_allowed_in_additional_section(uint16_t tp)
 * @param msg: msg to normalize.
 * @param qinfo: original query.
 * @param region: where to allocate synthesized CNAMEs.
- * @param env: module env with config options.
 * @return 0 on error.
 */
 static int
 scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg, 
-	struct query_info* qinfo, struct regional* region,
-	struct module_env* env)
+	struct query_info* qinfo, struct regional* region)
 {
 	uint8_t* sname = qinfo->qname;
 	size_t snamelen = qinfo->qname_len;
@@ -534,7 +511,6 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,

 	/* Mark additional names from AUTHORITY */
 	while(rrset && rrset->section == LDNS_SECTION_AUTHORITY) {
-		/* protect internals of recursor by making sure to del these */
 		if(rrset->type==LDNS_RR_TYPE_DNAME ||
 			rrset->type==LDNS_RR_TYPE_CNAME ||
 			rrset->type==LDNS_RR_TYPE_A ||
@@ -543,13 +519,6 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
 				"RRset:", pkt, msg, prev, &rrset);
 			continue;
 		}
-		/* Allowed list of types in the authority section */
-		if(env->cfg->harden_unknown_additional &&
-			!type_allowed_in_authority_section(rrset->type)) {
-			remove_rrset("normalize: removing irrelevant "
-				"RRset:", pkt, msg, prev, &rrset);
-			continue;
-		}
 		/* only one NS set allowed in authority section */
 		if(rrset->type==LDNS_RR_TYPE_NS) {
 			/* NS set must be pertinent to the query */
@@ -607,6 +576,7 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
 	 * found in ANSWER and AUTHORITY. */
 	/* These records have not been marked OK previously */
 	while(rrset && rrset->section == LDNS_SECTION_ADDITIONAL) {
+		/* FIXME: what about other types? */
 		if(rrset->type==LDNS_RR_TYPE_A || 
 			rrset->type==LDNS_RR_TYPE_AAAA) 
 		{
@@ -619,7 +589,6 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
 				continue;
 			}
 		}
-		/* protect internals of recursor by making sure to del these */
 		if(rrset->type==LDNS_RR_TYPE_DNAME || 
 			rrset->type==LDNS_RR_TYPE_CNAME ||
 			rrset->type==LDNS_RR_TYPE_NS) {
@@ -627,13 +596,6 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
 				"RRset:", pkt, msg, prev, &rrset);
 			continue;
 		}
-		/* Allowed list of types in the additional section */
-		if(env->cfg->harden_unknown_additional &&
-			!type_allowed_in_additional_section(rrset->type)) {
-			remove_rrset("normalize: removing irrelevant "
-				"RRset:", pkt, msg, prev, &rrset);
-			continue;
-		}
 		prev = rrset;
 		rrset = rrset->rrset_all_next;
 	}
@@ -717,56 +679,6 @@ static int sanitize_nsec_is_overreach(sldns_buffer* pkt,
 	return 0;
 }

-/** Remove individual RRs, if the length is wrong. Returns true if the RRset
- * has been removed. */
-static int
-scrub_sanitize_rr_length(sldns_buffer* pkt, struct msg_parse* msg,
-	struct rrset_parse* prev, struct rrset_parse** rrset, int* added_ede,
-	struct module_qstate* qstate)
-{
-	struct rr_parse* rr, *rr_prev = NULL;
-	for(rr = (*rrset)->rr_first; rr; rr = rr->next) {
-
-		/* Sanity check for length of records
-		 * An A record should be 6 bytes only
-		 * (2 bytes for length and 4 for IPv4 addr)*/
-		if((*rrset)->type == LDNS_RR_TYPE_A && rr->size != 6 ) {
-			if(!*added_ede) {
-				*added_ede = 1;
-				errinf_ede(qstate, "sanitize: records of inappropriate length have been removed.",
-					LDNS_EDE_OTHER);
-			}
-			if(msgparse_rrset_remove_rr("sanitize: removing type A RR of inappropriate length:",
-				pkt, *rrset, rr_prev, rr, NULL, 0)) {
-				remove_rrset("sanitize: removing type A RRset of inappropriate length:",
-					pkt, msg, prev, rrset);
-				return 1;
-			}
-			continue;
-		}
-
-		/* Sanity check for length of records
-		 * An AAAA record should be 18 bytes only
-		 * (2 bytes for length and 16 for IPv6 addr)*/
-		if((*rrset)->type == LDNS_RR_TYPE_AAAA && rr->size != 18 ) {
-			if(!*added_ede) {
-				*added_ede = 1;
-				errinf_ede(qstate, "sanitize: records of inappropriate length have been removed.",
-					LDNS_EDE_OTHER);
-			}
-			if(msgparse_rrset_remove_rr("sanitize: removing type AAAA RR of inappropriate length:",
-				pkt, *rrset, rr_prev, rr, NULL, 0)) {
-				remove_rrset("sanitize: removing type AAAA RRset of inappropriate length:",
-					pkt, msg, prev, rrset);
-				return 1;
-			}
-			continue;
-		}
-		rr_prev = rr;
-	}
-	return 0;
-}
-
 /**
 * Given a response event, remove suspect RRsets from the response.
 * "Suspect" rrsets are potentially poison. Note that this routine expects
@@ -779,17 +691,15 @@ scrub_sanitize_rr_length(sldns_buffer* pkt, struct msg_parse* msg,
 * @param zonename: name of server zone.
 * @param env: module environment with config and cache.
 * @param ie: iterator environment with private address data.
- * @param qstate: for setting errinf for EDE error messages.
 * @return 0 on error.
 */
 static int
 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 module_qstate* qstate)
+	struct iter_env* ie)
 {
 	int del_addi = 0; /* if additional-holding rrsets are deleted, we
 		do not trust the normalized additional-A-AAAA any more */
-	int added_rrlen_ede = 0;
 	struct rrset_parse* rrset, *prev;
 	prev = NULL;
 	rrset = msg->rrset_first;
@@ -834,14 +744,6 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg,
 	rrset = msg->rrset_first;
 	while(rrset) {

-		/* Sanity check for length of records */
-		if(rrset->type == LDNS_RR_TYPE_A ||
-			rrset->type == LDNS_RR_TYPE_AAAA) {
-			if(scrub_sanitize_rr_length(pkt, msg, prev, &rrset,
-				&added_rrlen_ede, qstate))
-				continue;
-		}
-
 		/* remove private addresses */
 		if( (rrset->type == LDNS_RR_TYPE_A || 
 			rrset->type == LDNS_RR_TYPE_AAAA)) {
@@ -915,8 +817,7 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg,
 int 
 scrub_message(sldns_buffer* pkt, struct msg_parse* msg, 
 	struct query_info* qinfo, uint8_t* zonename, struct regional* region,
-	struct module_env* env, struct module_qstate* qstate,
-	struct iter_env* ie)
+	struct module_env* env, struct iter_env* ie)
 {
 	/* basic sanity checks */
 	log_nametypeclass(VERB_ALGO, "scrub for", zonename, LDNS_RR_TYPE_NS, 
@@ -945,10 +846,10 @@ scrub_message(sldns_buffer* pkt, struct msg_parse* msg,
 	}

 	/* normalize the response, this cleans up the additional.  */
-	if(!scrub_normalize(pkt, msg, qinfo, region, env))
+	if(!scrub_normalize(pkt, msg, qinfo, region))
 		return 0;
 	/* delete all out-of-zone information */
-	if(!scrub_sanitize(pkt, msg, qinfo, zonename, env, ie, qstate))
+	if(!scrub_sanitize(pkt, msg, qinfo, zonename, env, ie))
 		return 0;
 	return 1;
 }
@@ -48,7 +48,6 @@ struct query_info;
 struct regional;
 struct module_env;
 struct iter_env;
-struct module_qstate;

 /**
 * Cleanup the passed dns message.
@@ -60,13 +59,11 @@ struct module_qstate;
 *	Used to determine out of bailiwick information.
 * @param regional: where to allocate (new) parts of the message.
 * @param env: module environment with config settings and cache. 
- * @param qstate: for setting errinf for EDE error messages.
 * @param ie: iterator module environment data.
 * @return: false if the message is total waste. true if scrubbed with success.
 */
 int scrub_message(struct sldns_buffer* pkt, struct msg_parse* msg, 
 	struct query_info* qinfo, uint8_t* zonename, struct regional* regional,
-	struct module_env* env, struct module_qstate* qstate,
-	struct iter_env* ie);
+	struct module_env* env, struct iter_env* ie);

 #endif /* ITERATOR_ITER_SCRUB_H */
@@ -70,11 +70,8 @@

 /** time when nameserver glue is said to be 'recent' */
 #define SUSPICION_RECENT_EXPIRY 86400
-
-/** if NAT64 is enabled and no NAT64 prefix is configured, first fall back to
- * DNS64 prefix.  If that is not configured, fall back to this default value.
- */
-static const char DEFAULT_NAT64_PREFIX[] = "64:ff9b::/96";
+/** penalty to validation failed blacklisted IPs */
+#define BLACKLIST_PENALTY (USEFUL_SERVER_TOP_TIMEOUT*4)

 /** fillup fetch policy array */
 static void
@@ -147,7 +144,6 @@ caps_white_apply_cfg(rbtree_type* ntree, struct config_file* cfg)
 int
 iter_apply_cfg(struct iter_env* iter_env, struct config_file* cfg)
 {
-	const char *nat64_prefix;
 	int i;
 	/* target fetch policy */
 	if(!read_fetch_policy(iter_env, cfg->target_fetch_policy))
@@ -178,35 +174,9 @@ iter_apply_cfg(struct iter_env* iter_env, struct config_file* cfg)
 		}

 	}
-
-	nat64_prefix = cfg->nat64_prefix;
-	if(!nat64_prefix)
-		nat64_prefix = cfg->dns64_prefix;
-	if(!nat64_prefix)
-		nat64_prefix = DEFAULT_NAT64_PREFIX;
-	if(!netblockstrtoaddr(nat64_prefix, 0, &iter_env->nat64_prefix_addr,
-		&iter_env->nat64_prefix_addrlen,
-		&iter_env->nat64_prefix_net)) {
-		log_err("cannot parse nat64-prefix netblock: %s", nat64_prefix);
-		return 0;
-	}
-	if(!addr_is_ip6(&iter_env->nat64_prefix_addr,
-		iter_env->nat64_prefix_addrlen)) {
-		log_err("nat64-prefix is not IPv6: %s", cfg->nat64_prefix);
-		return 0;
-	}
-	if(!prefixnet_is_nat64(iter_env->nat64_prefix_net)) {
-		log_err("nat64-prefix length it not 32, 40, 48, 56, 64 or 96: %s",
-			nat64_prefix);
-		return 0;
-	}
-
 	iter_env->supports_ipv6 = cfg->do_ip6;
 	iter_env->supports_ipv4 = cfg->do_ip4;
-	iter_env->use_nat64 = cfg->do_nat64;
 	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;
 	return 1;
 }

@@ -270,8 +240,7 @@ iter_filter_unsuitable(struct iter_env* iter_env, struct module_env* env,
 	if(!iter_env->supports_ipv6 && addr_is_ip6(&a->addr, a->addrlen)) {
 		return -1; /* there is no ip6 available */
 	}
-	if(!iter_env->supports_ipv4 && !iter_env->use_nat64 &&
-	   !addr_is_ip6(&a->addr, a->addrlen)) {
+	if(!iter_env->supports_ipv4 && !addr_is_ip6(&a->addr, a->addrlen)) {
 		return -1; /* there is no ip4 available */
 	}
 	/* check lameness - need zone , class info */
@@ -279,10 +248,9 @@ iter_filter_unsuitable(struct iter_env* iter_env, struct module_env* env,
 		name, namelen, qtype, &lame, &dnsseclame, &reclame,
 		&rtt, now)) {
 		log_addr(VERB_ALGO, "servselect", &a->addr, a->addrlen);
-		verbose(VERB_ALGO, "   rtt=%d%s%s%s%s%s", rtt,
+		verbose(VERB_ALGO, "   rtt=%d%s%s%s%s", rtt,
 			lame?" LAME":"",
 			dnsseclame?" DNSSEC_LAME":"",
-			a->dnsseclame?" ADDR_DNSSEC_LAME":"",
 			reclame?" REC_LAME":"",
 			a->lame?" ADDR_LAME":"");
 		if(lame)
@@ -399,7 +367,6 @@ iter_filter_order(struct iter_env* iter_env, struct module_env* env,
 	struct sock_list* blacklist, time_t prefetch)
 {
 	int got_num = 0, low_rtt = 0, swap_to_front, rtt_band = RTT_BAND, nth;
-	int alllame = 0;
 	size_t num_results;
 	struct delegpt_addr* a, *n, *prev=NULL;

@@ -409,10 +376,7 @@ iter_filter_order(struct iter_env* iter_env, struct module_env* env,
 	if(got_num == 0)
 		return 0;
 	if(low_rtt >= USEFUL_SERVER_TOP_TIMEOUT &&
-		/* If all missing (or not fully resolved) targets are lame,
-		 * then use the remaining lame address. */
-		((delegpt_count_missing_targets(dp, &alllame) > 0 && !alllame) ||
-		open_target > 0)) {
+		(delegpt_count_missing_targets(dp) > 0 || open_target > 0)) {
 		verbose(VERB_ALGO, "Bad choices, trying to get more choice");
 		return 0; /* we want more choice. The best choice is a bad one.
 			     return 0 to force the caller to fetch more */
@@ -693,10 +657,10 @@ dns_copy_msg(struct dns_msg* from, struct regional* region)
 void
 iter_dns_store(struct module_env* env, struct query_info* msgqinf,
 	struct reply_info* msgrep, int is_referral, time_t leeway, int pside,
-	struct regional* region, uint16_t flags, time_t qstarttime)
+	struct regional* region, uint16_t flags)
 {
 	if(!dns_cache_store(env, msgqinf, msgrep, is_referral, leeway,
-		pside, region, flags, qstarttime))
+		pside, region, flags))
 		log_err("out of memory: cannot store data in cache");
 }

@@ -779,15 +743,9 @@ iter_mark_pside_cycle_targets(struct module_qstate* qstate, struct delegpt* dp)

 int
 iter_dp_is_useless(struct query_info* qinfo, uint16_t qflags,
-	struct delegpt* dp, int supports_ipv4, int supports_ipv6,
-	int use_nat64)
+	struct delegpt* dp)
 {
 	struct delegpt_ns* ns;
-	struct delegpt_addr* a;
-
-	if(supports_ipv6 && use_nat64)
-		supports_ipv4 = 1;
-
 	/* check:
 	 *      o RD qflag is on.
 	 *      o no addresses are provided.
@@ -800,24 +758,13 @@ iter_dp_is_useless(struct query_info* qinfo, uint16_t qflags,
 	 */
 	if(!(qflags&BIT_RD))
 		return 0;
-	/* either available or unused targets,
-	 * if they exist, the dp is not useless. */
-	for(a = dp->usable_list; a; a = a->next_usable) {
-		if(!addr_is_ip6(&a->addr, a->addrlen) && supports_ipv4)
-			return 0;
-		else if(addr_is_ip6(&a->addr, a->addrlen) && supports_ipv6)
-			return 0;
-	}
-	for(a = dp->result_list; a; a = a->next_result) {
-		if(!addr_is_ip6(&a->addr, a->addrlen) && supports_ipv4)
-			return 0;
-		else if(addr_is_ip6(&a->addr, a->addrlen) && supports_ipv6)
-			return 0;
-	}
+	/* either available or unused targets */
+	if(dp->usable_list || dp->result_list)
+		return 0;

 	/* see if query is for one of the nameservers, which is glue */
-	if( ((qinfo->qtype == LDNS_RR_TYPE_A && supports_ipv4) ||
-		(qinfo->qtype == LDNS_RR_TYPE_AAAA && supports_ipv6)) &&
+	if( (qinfo->qtype == LDNS_RR_TYPE_A ||
+		qinfo->qtype == LDNS_RR_TYPE_AAAA) &&
 		dname_subdomain_c(qinfo->qname, dp->name) &&
 		delegpt_find_ns(dp, qinfo->qname, qinfo->qname_len))
 		return 1;
@@ -1248,9 +1195,6 @@ int iter_lookup_parent_glue_from_cache(struct module_env* env,
 	struct delegpt_ns* ns;
 	size_t num = delegpt_count_targets(dp);
 	for(ns = dp->nslist; ns; ns = ns->next) {
-		if(ns->cache_lookup_count > ITERATOR_NAME_CACHELOOKUP_MAX_PSIDE)
-			continue;
-		ns->cache_lookup_count++;
 		/* get cached parentside A */
 		akey = rrset_cache_lookup(env->rrset_cache, ns->name,
 			ns->namelen, LDNS_RR_TYPE_A, qinfo->qclass,
@@ -1285,17 +1229,8 @@ iter_get_next_root(struct iter_hints* hints, struct iter_forwards* fwd,
 	uint16_t* c)
 {
 	uint16_t c1 = *c, c2 = *c;
-	int r1, r2;
-	int nolock = 1;
-
-	/* prelock both forwards and hints for atomic read. */
-	lock_rw_rdlock(&fwd->lock);
-	lock_rw_rdlock(&hints->lock);
-	r1 = hints_next_root(hints, &c1, nolock);
-	r2 = forwards_next_root(fwd, &c2, nolock);
-	lock_rw_unlock(&fwd->lock);
-	lock_rw_unlock(&hints->lock);
-
+	int r1 = hints_next_root(hints, &c1);
+	int r2 = forwards_next_root(fwd, &c2);
 	if(!r1 && !r2) /* got none, end of list */
 		return 0;
 	else if(!r1) /* got one, return that */
@@ -1356,7 +1291,8 @@ void iter_dec_attempts(struct delegpt* dp, int d, int outbound_msg_retry)
 	for(a=dp->target_list; a; a = a->next_target) {
 		if(a->attempts >= outbound_msg_retry) {
 			/* add back to result list */
-			delegpt_add_to_result_list(dp, a);
+			a->next_result = dp->result_list;
+			dp->result_list = a;
 		}
 		if(a->attempts > d)
 			a->attempts -= d;
@@ -1460,21 +1396,15 @@ int iter_dp_cangodown(struct query_info* qinfo, struct delegpt* dp)

 int
 iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,
-	uint8_t** retdpname, size_t* retdpnamelen, uint8_t* dpname_storage,
-	size_t dpname_storage_len)
+	uint8_t** retdpname, size_t* retdpnamelen)
 {
 	struct iter_hints_stub *stub;
 	struct delegpt *dp;
-	int nolock = 1;

 	/* Check for stub. */
-	/* Lock both forwards and hints for atomic read. */
-	lock_rw_rdlock(&qstate->env->fwds->lock);
-	lock_rw_rdlock(&qstate->env->hints->lock);
 	stub = hints_lookup_stub(qstate->env->hints, qinf->qname,
-	    qinf->qclass, NULL, nolock);
-	dp = forwards_lookup(qstate->env->fwds, qinf->qname, qinf->qclass,
-		nolock);
+	    qinf->qclass, NULL);
+	dp = forwards_lookup(qstate->env->fwds, qinf->qname, qinf->qclass);

 	/* see if forward or stub is more pertinent */
 	if(stub && stub->dp && dp) {
@@ -1488,9 +1418,7 @@ iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,

 	/* check stub */
 	if (stub != NULL && stub->dp != NULL) {
-		int stub_no_cache = stub->dp->no_cache;
-		lock_rw_unlock(&qstate->env->fwds->lock);
-		if(stub_no_cache) {
+		if(stub->dp->no_cache) {
 			char qname[255+1];
 			char dpname[255+1];
 			dname_str(qinf->qname, qname);
@@ -1498,27 +1426,15 @@ iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,
 			verbose(VERB_ALGO, "stub for %s %s has no_cache", qname, dpname);
 		}
 		if(retdpname) {
-			if(stub->dp->namelen > dpname_storage_len) {
-				verbose(VERB_ALGO, "no cache stub dpname too long");
-				lock_rw_unlock(&qstate->env->hints->lock);
-				*retdpname = NULL;
-				*retdpnamelen = 0;
-				return stub_no_cache;
-			}
-			memmove(dpname_storage, stub->dp->name,
-				stub->dp->namelen);
-			*retdpname = dpname_storage;
+			*retdpname = stub->dp->name;
 			*retdpnamelen = stub->dp->namelen;
 		}
-		lock_rw_unlock(&qstate->env->hints->lock);
-		return stub_no_cache;
+		return (stub->dp->no_cache);
 	}

 	/* Check for forward. */
 	if (dp) {
-		int dp_no_cache = dp->no_cache;
-		lock_rw_unlock(&qstate->env->hints->lock);
-		if(dp_no_cache) {
+		if(dp->no_cache) {
 			char qname[255+1];
 			char dpname[255+1];
 			dname_str(qinf->qname, qname);
@@ -1526,22 +1442,11 @@ iter_stub_fwd_no_cache(struct module_qstate *qstate, struct query_info *qinf,
 			verbose(VERB_ALGO, "forward for %s %s has no_cache", qname, dpname);
 		}
 		if(retdpname) {
-			if(dp->namelen > dpname_storage_len) {
-				verbose(VERB_ALGO, "no cache dpname too long");
-				lock_rw_unlock(&qstate->env->fwds->lock);
-				*retdpname = NULL;
-				*retdpnamelen = 0;
-				return dp_no_cache;
-			}
-			memmove(dpname_storage, dp->name, dp->namelen);
-			*retdpname = dpname_storage;
+			*retdpname = dp->name;
 			*retdpnamelen = dp->namelen;
 		}
-		lock_rw_unlock(&qstate->env->fwds->lock);
-		return dp_no_cache;
+		return (dp->no_cache);
 	}
-	lock_rw_unlock(&qstate->env->fwds->lock);
-	lock_rw_unlock(&qstate->env->hints->lock);
 	if(retdpname) {
 		*retdpname = NULL;
 		*retdpnamelen = 0;
@@ -62,15 +62,6 @@ struct ub_packed_rrset_key;
 struct module_stack;
 struct outside_network;

-/* max number of lookups in the cache for target nameserver names.
- * This stops, for large delegations, N*N lookups in the cache. */
-#define ITERATOR_NAME_CACHELOOKUP_MAX	3
-/* max number of lookups in the cache for parentside glue for nameserver names
- * This stops, for larger delegations, N*N lookups in the cache.
- * It is a little larger than the nonpside max, so it allows a couple extra
- * lookups of parent side glue. */
-#define ITERATOR_NAME_CACHELOOKUP_MAX_PSIDE	5
-
 /**
 * Process config options and set iterator module state.
 * Sets default values if no config is found.
@@ -141,7 +132,6 @@ struct dns_msg* dns_copy_msg(struct dns_msg* from, struct regional* regional);
 * 	can be prefetch-updates.
 * @param region: to copy modified (cache is better) rrs back to.
 * @param flags: with BIT_CD for dns64 AAAA translated queries.
- * @param qstarttime: time of query start.
 * return void, because we are not interested in alloc errors,
 * 	the iterator and validator can operate on the results in their
 * 	scratch space (the qstate.region) and are not dependent on the cache.
@@ -150,7 +140,7 @@ struct dns_msg* dns_copy_msg(struct dns_msg* from, struct regional* regional);
 */
 void iter_dns_store(struct module_env* env, struct query_info* qinf,
 	struct reply_info* rep, int is_referral, time_t leeway, int pside,
-	struct regional* region, uint16_t flags, time_t qstarttime);
+	struct regional* region, uint16_t flags);

 /**
 * Select randomly with n/m probability.
@@ -185,17 +175,10 @@ void iter_mark_pside_cycle_targets(struct module_qstate* qstate,
 * @param qinfo: query name and type
 * @param qflags: query flags with RD flag
 * @param dp: delegpt to check.
- * @param supports_ipv4: if we support ipv4 for lookups to the target.
- * 	if not, then the IPv4 addresses are useless.
- * @param supports_ipv6: if we support ipv6 for lookups to the target.
- * 	if not, then the IPv6 addresses are useless.
- * @param use_nat64: if we support NAT64 for lookups to the target.
- *	if yes, IPv4 addresses are useful even if we don't support IPv4.
 * @return true if dp is useless.
 */
-int iter_dp_is_useless(struct query_info* qinfo, uint16_t qflags,
-	struct delegpt* dp, int supports_ipv4, int supports_ipv6,
-	int use_nat64);
+int iter_dp_is_useless(struct query_info* qinfo, uint16_t qflags, 
+	struct delegpt* dp);

 /**
 * See if qname has DNSSEC needs.  This is true if there is a trust anchor above
@@ -407,14 +390,10 @@ int iter_dp_cangodown(struct query_info* qinfo, struct delegpt* dp);
 * 	Used for NXDOMAIN checks, above that it is an nxdomain from a
 * 	different server and zone. You can pass NULL to not get it.
 * @param retdpnamelen: returns the length of the dpname.
- * @param dpname_storage: this is where the dpname buf is stored, if any.
- * 	So that caller can manage the buffer.
- * @param dpname_storage_len: size of dpname_storage buffer.
 * @return true if no_cache is set in stub or fwd.
 */
 int iter_stub_fwd_no_cache(struct module_qstate *qstate,
-	struct query_info *qinf, uint8_t** retdpname, size_t* retdpnamelen,
-	uint8_t* dpname_storage, size_t dpname_storage_len);
+	struct query_info *qinf, uint8_t** retdpname, size_t* retdpnamelen);

 /**
 * Set support for IP4 and IP6 depending on outgoing interfaces
@@ -60,11 +60,12 @@ struct rbtree_type;
 /** max number of nxdomains allowed for target lookups for a query and
 * its subqueries */
 #define MAX_TARGET_NX		5
-/** max number of nxdomains allowed for target lookups for a query and
- * its subqueries when fallback has kicked in */
-#define MAX_TARGET_NX_FALLBACK	(MAX_TARGET_NX*2)
+/** max number of query restarts. Determines max number of CNAME chain. */
+#define MAX_RESTART_COUNT	11
 /** max number of referrals. Makes sure resolver does not run away */
 #define MAX_REFERRAL_COUNT	130
+/** max number of queries-sent-out.  Make sure large NS set does not loop */
+#define MAX_SENT_COUNT		32
 /** max number of queries for which to perform dnsseclameness detection,
 * (rrsigs missing detection) after that, just pick up that response */
 #define DNSSEC_LAME_DETECT_COUNT 4
@@ -79,7 +80,7 @@ struct rbtree_type;
 /**
 * number of labels from QNAME that are always send individually when using
 * QNAME minimisation, even when the number of labels of the QNAME is bigger
- * than MAX_MINIMISE_COUNT */
+ * tham MAX_MINIMISE_COUNT */
 #define MINIMISE_ONE_LAB	4
 #define MINIMISE_MULTIPLE_LABS	(MAX_MINIMISE_COUNT - MINIMISE_ONE_LAB)
 /** at what query-sent-count to stop target fetch policy */
@@ -90,22 +91,18 @@ struct rbtree_type;
 extern int UNKNOWN_SERVER_NICENESS;
 /** maximum timeout before a host is deemed unsuitable, in msec. 
 * After host_ttl this will be timed out and the host will be tried again. 
- * Equals RTT_MAX_TIMEOUT, and thus when RTT_MAX_TIMEOUT is overwritten by
- * config infra_cache_max_rtt, it will be overwritten as well. */
-extern int USEFUL_SERVER_TOP_TIMEOUT;
-/** penalty to validation failed blacklisted IPs
- * Equals USEFUL_SERVER_TOP_TIMEOUT*4, and thus when RTT_MAX_TIMEOUT is
- * overwritten by config infra_cache_max_rtt, it will be overwritten as well. */
-extern int BLACKLIST_PENALTY;
+ * Equals RTT_MAX_TIMEOUT
+ */
+#define USEFUL_SERVER_TOP_TIMEOUT	120000
 /** RTT band, within this amount from the best, servers are chosen randomly.
 * Chosen so that the UNKNOWN_SERVER_NICENESS falls within the band of a 
 * fast server, this causes server exploration as a side benefit. msec. */
 #define RTT_BAND 400
-/** Number of retries for empty nodata packets before it is accepted. */
-#define EMPTY_NODATA_RETRY_COUNT 2
+/** Start value for blacklisting a host, 2*USEFUL_SERVER_TOP_TIMEOUT in sec */
+#define INFRA_BACKOFF_INITIAL 240

 /**
- * Global state for the iterator.
+ * Global state for the iterator. 
 */
 struct iter_env {
 	/** A flag to indicate whether or not we have an IPv6 route */
@@ -114,18 +111,6 @@ struct iter_env {
 	/** A flag to indicate whether or not we have an IPv4 route */
 	int supports_ipv4;

-	/** A flag to locally apply NAT64 to make IPv4 addrs into IPv6 */
-	int use_nat64;
-
-	/** NAT64 prefix address, cf. dns64_env->prefix_addr */
-	struct sockaddr_storage nat64_prefix_addr;
-
-	/** sizeof(sockaddr_in6) */
-	socklen_t nat64_prefix_addrlen;
-
-	/** CIDR mask length of NAT64 prefix */
-	int nat64_prefix_net;
-
 	/** A set of inetaddrs that should never be queried. */
 	struct iter_donotq* donotq;

@@ -155,12 +140,6 @@ struct iter_env {

 	/** number of retries on outgoing queries */
 	int outbound_msg_retry;
-
-	/** number of queries_sent */
-	int max_sent_count;
-
-	/** max number of query restarts to limit length of CNAME chain */
-	int max_query_restarts;
 };

 /**
@@ -238,21 +217,6 @@ enum iter_state {
 	FINISHED_STATE
 };

-/**
- * Shared counters for queries.
- */
-enum target_count_variables {
-	/** Reference count for the shared iter_qstate->target_count. */
-	TARGET_COUNT_REF = 0,
-	/** Number of target queries spawned for the query and subqueries. */
-	TARGET_COUNT_QUERIES,
-	/** Number of nxdomain responses encountered. */
-	TARGET_COUNT_NX,
-
-	/** This should stay last here, it is used for the allocation */
-	TARGET_COUNT_MAX,
-};
-
 /**
 * Per query state for the iterator module.
 */
@@ -340,26 +304,21 @@ struct iter_qstate {
 	/** the number of times this query has been restarted. */
 	int query_restart_count;

-	/** the number of times this query has followed a referral. */
+	/** the number of times this query as followed a referral. */
 	int referral_count;

 	/** number of queries fired off */
 	int sent_count;
 	
-	/** malloced-array shared with this query and its subqueries. It keeps
-	 * track of the defined enum target_count_variables counters. */
+	/** number of target queries spawned in [1], for this query and its
+	 * subqueries, the malloced-array is shared, [0] refcount.
+	 * in [2] the number of nxdomains is counted. */
 	int* target_count;

 	/** number of target lookups per delegation point. Reset to 0 after
 	 * receiving referral answer. Not shared with subqueries. */
 	int dp_target_count;

-	/** Delegation point that triggered the NXNS fallback; shared with
-	 * this query and its subqueries, count-referenced by the reference
-	 * counter in target_count.
-	 * This also marks the fallback activation. */
-	uint8_t** nxns_dp;
-
 	/** if true, already tested for ratelimiting and passed the test */
 	int ratelimit_ok;

@@ -417,26 +376,15 @@ struct iter_qstate {
 	 */
 	int refetch_glue;

-	/**
-	 * This flag detects that a completely empty nodata was received,
-	 * already so that it is accepted later. */
-	int empty_nodata_found;
-
 	/** list of pending queries to authoritative servers. */
 	struct outbound_list outlist;

-	/** QNAME minimisation state, RFC9156 */
+	/** QNAME minimisation state, RFC7816 */
 	enum minimisation_state minimisation_state;

 	/** State for capsfail: QNAME minimisation state for comparisons. */
 	enum minimisation_state caps_minimisation_state;

-    //DELEG added code
-    int deleg_state;
-    uint8_t* deleg_original_qname;
-    size_t deleg_original_qname_len;
-    uint16_t original_query;
-
 	/**
 	 * The query info that is sent upstream. Will be a subset of qchase
 	 * when qname minimisation is enabled.
@@ -464,14 +412,7 @@ struct iter_qstate {
 	/** true if there have been parse failures of reply packets */
 	int parse_failures;
 	/** a failure printout address for last received answer */
-	union {
-		struct in_addr in;
-#ifdef AF_INET6
-		struct in6_addr in6;
-#endif
-	} fail_addr;
-	/** which fail_addr, 0 is nothing, 4 or 6 */
-	int fail_addr_type;
+	struct comm_reply* fail_reply;
 };

 /**
@@ -53,8 +53,6 @@
 #include "util/storage/slabhash.h"
 #include "util/edns.h"
 #include "sldns/sbuffer.h"
-#include "iterator/iter_fwd.h"
-#include "iterator/iter_hints.h"

 int 
 context_finalize(struct ub_ctx* ctx)
@@ -72,7 +70,6 @@ context_finalize(struct ub_ctx* ctx)
 	} else {
 		log_init(cfg->logfile, cfg->use_syslog, NULL);
 	}
-	ctx->pipe_pid = getpid();
 	cfg_apply_local_port_policy(cfg, 65536);
 	config_apply(cfg);
 	if(!modstack_setup(&ctx->mods, cfg->module_conf, ctx->env))
@@ -87,12 +84,6 @@ context_finalize(struct ub_ctx* ctx)
 	if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1, &is_rpz,
 		ctx->env, &ctx->mods))
 		return UB_INITFAIL;
-	if(!(ctx->env->fwds = forwards_create()) ||
-		!forwards_apply_cfg(ctx->env->fwds, cfg))
-		return UB_INITFAIL;
-	if(!(ctx->env->hints = hints_create()) ||
-		!hints_apply_cfg(ctx->env->hints, cfg))
-		return UB_INITFAIL;
 	if(!edns_strings_apply_cfg(ctx->env->edns_strings, cfg))
 		return UB_INITFAIL;
 	if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size,
@@ -89,12 +89,6 @@ struct ub_ctx {
 	pid_t bg_pid;
 	/** tid of bg worker thread */
 	ub_thread_type bg_tid;
-	/** pid when pipes are created. This was the process when the
-	 * setup was called. Helps with clean up, so we can tell after a fork
-	 * which side of the fork the delete is on. */
-	pid_t pipe_pid;
-	/** when threaded, the worker that exists in the created thread. */
-	struct libworker* thread_worker;

 	/** do threading (instead of forking) for async resolution */
 	int dothread;
@@ -66,8 +66,6 @@
 #include "services/authzone.h"
 #include "services/listen_dnsport.h"
 #include "sldns/sbuffer.h"
-#include "iterator/iter_fwd.h"
-#include "iterator/iter_hints.h"
 #ifdef HAVE_PTHREAD
 #include <signal.h>
 #endif
@@ -173,7 +171,6 @@ static struct ub_ctx* ub_ctx_create_nopipe(void)
 	ctx->env->worker = NULL;
 	ctx->env->need_to_validate = 0;
 	modstack_init(&ctx->mods);
-	ctx->env->modstack = &ctx->mods;
 	rbtree_init(&ctx->queries, &context_query_cmp);
 	return ctx;
 }
@@ -308,31 +305,11 @@ ub_ctx_delete(struct ub_ctx* ctx)
 	int do_stop = 1;
 	if(!ctx) return;

-	/* if the delete is called but it has forked, and before the fork
-	 * the context was finalized, then the bg worker is not stopped
-	 * from here. There is one worker, but two contexts that refer to
-	 * it and only one should clean up, the one with getpid == pipe_pid.*/
-	if(ctx->created_bg && ctx->pipe_pid != getpid()) {
-		do_stop = 0;
-#ifndef USE_WINSOCK
-		/* Stop events from getting deregistered, if the backend is
-		 * epoll, the epoll fd is the same as the other process.
-		 * That process should deregister them. */
-		if(ctx->qq_pipe->listen_com)
-			ctx->qq_pipe->listen_com->event_added = 0;
-		if(ctx->qq_pipe->res_com)
-			ctx->qq_pipe->res_com->event_added = 0;
-		if(ctx->rr_pipe->listen_com)
-			ctx->rr_pipe->listen_com->event_added = 0;
-		if(ctx->rr_pipe->res_com)
-			ctx->rr_pipe->res_com->event_added = 0;
-#endif
-	}
 	/* see if bg thread is created and if threads have been killed */
 	/* no locks, because those may be held by terminated threads */
 	/* for processes the read pipe is closed and we see that on read */
 #ifdef HAVE_PTHREAD
-	if(ctx->created_bg && ctx->dothread && do_stop) {
+	if(ctx->created_bg && ctx->dothread) {
 		if(pthread_kill(ctx->bg_tid, 0) == ESRCH) {
 			/* thread has been killed */
 			do_stop = 0;
@@ -341,23 +318,6 @@ ub_ctx_delete(struct ub_ctx* ctx)
 #endif /* HAVE_PTHREAD */
 	if(do_stop)
 		ub_stop_bg(ctx);
-	if(ctx->created_bg && ctx->pipe_pid != getpid() && ctx->thread_worker) {
-		/* This delete is happening from a different process. Delete
-		 * the thread worker from this process memory space. The
-		 * thread is not there to do so, so it is freed here. */
-		struct ub_event_base* evbase = comm_base_internal(
-			ctx->thread_worker->base);
-		libworker_delete_event(ctx->thread_worker);
-		ctx->thread_worker = NULL;
-#ifdef USE_MINI_EVENT
-		ub_event_base_free(evbase);
-#else
-		/* cannot event_base_free, because the epoll_fd cleanup
-		 * in libevent could stop the original event_base in the
-		 * other process from working. */
-		free(evbase);
-#endif
-	}
 	libworker_delete_event(ctx->event_worker);

 	modstack_desetup(&ctx->mods, ctx->env);
@@ -382,8 +342,6 @@ ub_ctx_delete(struct ub_ctx* ctx)
 		config_delete(ctx->env->cfg);
 		edns_known_options_delete(ctx->env);
 		edns_strings_delete(ctx->env->edns_strings);
-		forwards_delete(ctx->env->fwds);
-		hints_delete(ctx->env->hints);
 		auth_zones_delete(ctx->env->auth_zones);
 		free(ctx->env);
 	}
@@ -981,8 +939,7 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr)
 	if(!addr) {
 		/* disable fwd mode - the root stub should be first. */
 		if(ctx->env->cfg->forwards &&
-			(ctx->env->cfg->forwards->name &&
-			strcmp(ctx->env->cfg->forwards->name, ".") == 0)) {
+			strcmp(ctx->env->cfg->forwards->name, ".") == 0) {
 			s = ctx->env->cfg->forwards;
 			ctx->env->cfg->forwards = s->next;
 			s->next = NULL;
@@ -994,7 +951,7 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr)
 	lock_basic_unlock(&ctx->cfglock);

 	/* check syntax for addr */
-	if(!extstrtoaddr(addr, &storage, &stlen, UNBOUND_DNS_PORT)) {
+	if(!extstrtoaddr(addr, &storage, &stlen)) {
 		errno=EINVAL;
 		return UB_SYNTAX;
 	}
@@ -1002,8 +959,7 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr)
 	/* it parses, add root stub in front of list */
 	lock_basic_lock(&ctx->cfglock);
 	if(!ctx->env->cfg->forwards ||
-		(ctx->env->cfg->forwards->name &&
-		strcmp(ctx->env->cfg->forwards->name, ".") != 0)) {
+		strcmp(ctx->env->cfg->forwards->name, ".") != 0) {
 		s = calloc(1, sizeof(*s));
 		if(!s) {
 			lock_basic_unlock(&ctx->cfglock);
@@ -1021,7 +977,6 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr)
 		ctx->env->cfg->forwards = s;
 	} else {
 		log_assert(ctx->env->cfg->forwards);
-		log_assert(ctx->env->cfg->forwards->name);
 		s = ctx->env->cfg->forwards;
 	}
 	dupl = strdup(addr);
@@ -1076,7 +1031,7 @@ int ub_ctx_set_stub(struct ub_ctx* ctx, const char* zone, const char* addr,
 	if(addr) {
 		struct sockaddr_storage storage;
 		socklen_t stlen;
-		if(!extstrtoaddr(addr, &storage, &stlen, UNBOUND_DNS_PORT)) {
+		if(!extstrtoaddr(addr, &storage, &stlen)) {
 			errno=EINVAL;
 			return UB_SYNTAX;
 		}
@@ -62,7 +62,6 @@
 #include "util/random.h"
 #include "util/config_file.h"
 #include "util/netevent.h"
-#include "util/proxy_protocol.h"
 #include "util/storage/lookup3.h"
 #include "util/storage/slabhash.h"
 #include "util/net_help.h"
@@ -70,6 +69,8 @@
 #include "util/data/msgreply.h"
 #include "util/data/msgencode.h"
 #include "util/tube.h"
+#include "iterator/iter_fwd.h"
+#include "iterator/iter_hints.h"
 #include "sldns/sbuffer.h"
 #include "sldns/str2wire.h"
 #ifdef USE_DNSTAP
@@ -98,6 +99,8 @@ libworker_delete_env(struct libworker* w)
 			!w->is_bg || w->is_bg_thread);
 		sldns_buffer_free(w->env->scratch_buffer);
 		regional_destroy(w->env->scratch);
+		forwards_delete(w->env->fwds);
+		hints_delete(w->env->hints);
 		ub_randfree(w->env->rnd);
 		free(w->env);
 	}
@@ -155,19 +158,30 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 	}
 	w->env->scratch = regional_create_custom(cfg->msg_buffer_size);
 	w->env->scratch_buffer = sldns_buffer_new(cfg->msg_buffer_size);
-#ifdef HAVE_SSL
-	w->sslctx = connect_sslctx_create(NULL, NULL,
-		cfg->tls_cert_bundle, cfg->tls_win_cert);
-	if(!w->sslctx) {
-		/* to make the setup fail after unlock */
-		sldns_buffer_free(w->env->scratch_buffer);
-		w->env->scratch_buffer = NULL;
+	w->env->fwds = forwards_create();
+	if(w->env->fwds && !forwards_apply_cfg(w->env->fwds, cfg)) { 
+		forwards_delete(w->env->fwds);
+		w->env->fwds = NULL;
+	}
+	w->env->hints = hints_create();
+	if(w->env->hints && !hints_apply_cfg(w->env->hints, cfg)) { 
+		hints_delete(w->env->hints);
+		w->env->hints = NULL;
+	}
+	if(cfg->ssl_upstream || (cfg->tls_cert_bundle && cfg->tls_cert_bundle[0]) || cfg->tls_win_cert) {
+		w->sslctx = connect_sslctx_create(NULL, NULL,
+			cfg->tls_cert_bundle, cfg->tls_win_cert);
+		if(!w->sslctx) {
+			/* to make the setup fail after unlock */
+			hints_delete(w->env->hints);
+			w->env->hints = NULL;
+		}
 	}
-#endif
 	if(!w->is_bg || w->is_bg_thread) {
 		lock_basic_unlock(&ctx->cfglock);
 	}
-	if(!w->env->scratch || !w->env->scratch_buffer) {
+	if(!w->env->scratch || !w->env->scratch_buffer || !w->env->fwds ||
+		!w->env->hints) {
 		libworker_delete(w);
 		return NULL;
 	}
@@ -251,7 +265,6 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb)
 	w->env->kill_sub = &mesh_state_delete;
 	w->env->detect_cycle = &mesh_detect_cycle;
 	comm_base_timept(w->base, &w->env->now, &w->env->now_tv);
-	pp_init(&sldns_write_uint16, &sldns_write_uint32);
 	return w;
 }

@@ -382,7 +395,6 @@ int libworker_bg(struct ub_ctx* ctx)
 		w = libworker_setup(ctx, 1, NULL);
 		if(!w) return UB_NOMEM;
 		w->is_bg_thread = 1;
-		ctx->thread_worker = w;
 #ifdef ENABLE_LOCK_CHECKS
 		w->thread_num = 1; /* for nicer DEBUG checklocks */
 #endif
@@ -592,8 +604,6 @@ setup_qinfo_edns(struct libworker* w, struct ctx_query* q,
 	edns->opt_list_out = NULL;
 	edns->opt_list_inplace_cb_out = NULL;
 	edns->padding_block_size = 0;
-	edns->cookie_present = 0;
-	edns->cookie_valid = 0;
 	if(sldns_buffer_capacity(w->back->udp_buff) < 65535)
 		edns->udp_size = (uint16_t)sldns_buffer_capacity(
 			w->back->udp_buff);
@@ -640,7 +650,7 @@ int libworker_fg(struct ub_ctx* ctx, struct ctx_query* q)
 	}
 	/* process new query */
 	if(!mesh_new_callback(w->env->mesh, &qinfo, qflags, &edns, 
-		w->back->udp_buff, qid, libworker_fg_done_cb, q, 0)) {
+		w->back->udp_buff, qid, libworker_fg_done_cb, q)) {
 		free(qinfo.qname);
 		return UB_NOMEM;
 	}
@@ -720,7 +730,7 @@ int libworker_attach_mesh(struct ub_ctx* ctx, struct ctx_query* q,
 	if(async_id)
 		*async_id = q->querynum;
 	if(!mesh_new_callback(w->env->mesh, &qinfo, qflags, &edns, 
-		w->back->udp_buff, qid, libworker_event_done_cb, q, 0)) {
+		w->back->udp_buff, qid, libworker_event_done_cb, q)) {
 		free(qinfo.qname);
 		return UB_NOMEM;
 	}
@@ -857,7 +867,7 @@ handle_newq(struct libworker* w, uint8_t* buf, uint32_t len)
 	q->w = w;
 	/* process new query */
 	if(!mesh_new_callback(w->env->mesh, &qinfo, qflags, &edns, 
-		w->back->udp_buff, qid, libworker_bg_done_cb, q, 0)) {
+		w->back->udp_buff, qid, libworker_bg_done_cb, q)) {
 		add_bg_result(w, q, NULL, UB_NOMEM, NULL, 0);
 	}
 	free(qinfo.qname);
@@ -872,10 +882,9 @@ void libworker_alloc_cleanup(void* arg)

 struct outbound_entry* libworker_send_query(struct query_info* qinfo,
 	uint16_t flags, int dnssec, int want_dnssec, int nocaps,
-	int check_ratelimit,
 	struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone,
 	size_t zonelen, int tcp_upstream, int ssl_upstream, char* tls_auth_name,
-	struct module_qstate* q, int* was_ratelimited)
+	struct module_qstate* q)
 {
 	struct libworker* w = (struct libworker*)q->env->worker;
 	struct outbound_entry* e = (struct outbound_entry*)regional_alloc(
@@ -884,10 +893,9 @@ struct outbound_entry* libworker_send_query(struct query_info* qinfo,
 		return NULL;
 	e->qstate = q;
 	e->qsent = outnet_serviced_query(w->back, qinfo, flags, dnssec,
-		want_dnssec, nocaps, check_ratelimit, tcp_upstream, ssl_upstream,
+		want_dnssec, nocaps, tcp_upstream, ssl_upstream,
 		tls_auth_name, addr, addrlen, zone, zonelen, q,
-		libworker_handle_service_reply, e, w->back->udp_buff, q->env,
-		was_ratelimited);
+		libworker_handle_service_reply, e, w->back->udp_buff, q->env);
 	if(!e->qsent) {
 		return NULL;
 	}
@@ -968,11 +976,10 @@ void worker_sighandler(int ATTR_UNUSED(sig), void* ATTR_UNUSED(arg))
 struct outbound_entry* worker_send_query(struct query_info* ATTR_UNUSED(qinfo),
 	uint16_t ATTR_UNUSED(flags), int ATTR_UNUSED(dnssec),
 	int ATTR_UNUSED(want_dnssec), int ATTR_UNUSED(nocaps),
-	int ATTR_UNUSED(check_ratelimit),
 	struct sockaddr_storage* ATTR_UNUSED(addr), socklen_t ATTR_UNUSED(addrlen),
 	uint8_t* ATTR_UNUSED(zone), size_t ATTR_UNUSED(zonelen), int ATTR_UNUSED(tcp_upstream),
 	int ATTR_UNUSED(ssl_upstream), char* ATTR_UNUSED(tls_auth_name),
-	struct module_qstate* ATTR_UNUSED(q), int* ATTR_UNUSED(was_ratelimited))
+	struct module_qstate* ATTR_UNUSED(q))
 {
 	log_assert(0);
 	return 0;
@@ -36,9 +36,6 @@
 %begin %{
 /* store state of warning output, restored at later pop */
 #pragma GCC diagnostic push
-/* ignore warnings for pragma below, where for older GCC it can produce a
-   warning if the cast-function-type warning is absent. */
-#pragma GCC diagnostic ignored "-Wpragmas"
 /* ignore gcc8 METH_NOARGS function cast warnings for swig function pointers */
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 %}
@@ -863,9 +860,6 @@ Result: ['74.125.43.147', '74.125.43.99', '74.125.43.103', '74.125.43.104']
 %inline %{
  //SWIG will see the ub_ctx as a class
  struct ub_ctx {
-          /* Dummy member, so the struct is not empty, MSVC complains about
-           * that. */
-          int dummy;
  };
 %}

@@ -52,8 +52,8 @@
 * unbound was compiled with, otherwise it wouldn't work, the event and
 * event_base structures would be different.
 */
-#ifndef UB_UNBOUND_EVENT_H
-#define UB_UNBOUND_EVENT_H
+#ifndef _UB_UNBOUND_EVENT_H
+#define _UB_UNBOUND_EVENT_H

 #ifdef __cplusplus
 extern "C" {
@@ -230,7 +230,7 @@ int ub_ctx_set_event(struct ub_ctx* ctx, struct event_base* base);
 * @param callback: this is called on completion of the resolution.
 * 	It is called as:
 * 	void callback(void* mydata, int rcode, void* packet, int packet_len,
- * 		int sec, char* why_bogus, int was_ratelimited)
+ * 		int sec, char* why_bogus)
 * 	with mydata: the same as passed here, you may pass NULL,
 * 	with rcode: 0 on no error, nonzero for mostly SERVFAIL situations,
 *		this is a DNS rcode.
@@ -241,7 +241,6 @@ int ub_ctx_set_event(struct ub_ctx* ctx, struct event_base* base);
 *	with packet_len: length in bytes of the packet buffer.
 *	with sec: 0 if insecure, 1 if bogus, 2 if DNSSEC secure.
 *	with why_bogus: text string explaining why it is bogus (or NULL).
- *	with was_ratelimited: if the query was ratelimited.
 *	These point to buffers inside unbound; do not deallocate the packet or
 *	error string.
 *
@@ -262,4 +261,4 @@ int ub_resolve_event(struct ub_ctx* ctx, const char* name, int rrtype,
 }
 #endif

-#endif /* UB_UNBOUND_EVENT_H */
+#endif /* _UB_UNBOUND_H */
@@ -4,22 +4,22 @@
 * Copyright (c) 2007, NLnet Labs. All rights reserved.
 *
 * This software is open source.
- *
+ * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
- *
+ * 
 * Redistributions of source code must retain the above copyright notice,
 * this list of conditions and the following disclaimer.
- *
+ * 
 * Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
- *
+ * 
 * Neither the name of the NLNET LABS nor the names of its contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
- *
+ * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -36,7 +36,7 @@
 /**
 * \file
 *
- * This file contains functions to resolve DNS queries and
+ * This file contains functions to resolve DNS queries and 
 * validate the answers. Synchronously and asynchronously.
 *
 * Several ways to use this interface from an application wishing
@@ -65,7 +65,7 @@
 *	... or process() calls my_callback() with results.
 *
 *      ... if the application has nothing more to do, wait for answer
- *      ub_wait(ctx);
+ *      ub_wait(ctx); 
 *
 * Application threaded. Blocking.
 *	Blocking, same as above. The current thread does the work.
@@ -83,7 +83,7 @@
 * CRYPTO_set_id_callback and CRYPTO_set_locking_callback.
 *
 * If no threading is compiled in, the above async example uses fork(2) to
- * create a process to perform the work. The forked process exits when the
+ * create a process to perform the work. The forked process exits when the 
 * calling process exits, or ctx_delete() is called.
 * Otherwise, for asynchronous with threading, a worker thread is created.
 *
@@ -94,8 +94,8 @@
 * The second calls another worker thread (or process) to perform the work.
 * And no buffers need to be set up, but a context-switch happens.
 */
-#ifndef UB_UNBOUND_H
-#define UB_UNBOUND_H
+#ifndef _UB_UNBOUND_H
+#define _UB_UNBOUND_H

 #ifdef __cplusplus
 extern "C" {
@@ -128,10 +128,10 @@ struct ub_result {
 	/** the class asked for */
 	int qclass;

-	/**
-	 * a list of network order DNS rdata items, terminated with a
+	/** 
+	 * a list of network order DNS rdata items, terminated with a 
 	 * NULL pointer, so that data[0] is the first result entry,
-	 * data[1] the second, and the last entry is NULL.
+	 * data[1] the second, and the last entry is NULL. 
 	 * If there was no data, data[0] is NULL.
 	 */
 	char** data;
@@ -139,8 +139,8 @@ struct ub_result {
 	/** the length in bytes of the data items, len[i] for data[i] */
 	int* len;

-	/**
-	 * canonical name for the result (the final cname).
+	/** 
+	 * canonical name for the result (the final cname). 
 	 * zero terminated string.
 	 * May be NULL if no canonical name exists.
 	 */
@@ -165,9 +165,9 @@ struct ub_result {
 	 */
 	int havedata;

-	/**
+	/** 
 	 * If there was no data, and the domain did not exist, this is true.
-	 * If it is false, and there was no data, then the domain name
+	 * If it is false, and there was no data, then the domain name 
 	 * is purported to exist, but the requested data type is not available.
 	 */
 	int nxdomain;
@@ -182,19 +182,19 @@ struct ub_result {
 	 */
 	int secure;

-	/**
-	 * If the result was not secure (secure==0), and this result is due
+	/** 
+	 * If the result was not secure (secure==0), and this result is due 
 	 * to a security failure, bogus is true.
 	 * This means the data has been actively tampered with, signatures
-	 * failed, expected signatures were not present, timestamps on
+	 * failed, expected signatures were not present, timestamps on 
 	 * signatures were out of date and so on.
 	 *
-	 * If !secure and !bogus, this can happen if the data is not secure
-	 * because security is disabled for that domain name.
+	 * If !secure and !bogus, this can happen if the data is not secure 
+	 * because security is disabled for that domain name. 
 	 * This means the data is from a domain where data is not signed.
 	 */
 	int bogus;
-
+	
 	/**
 	 * If the result is bogus this contains a string (zero terminated)
 	 * that describes the failure.  There may be other errors as well
@@ -222,7 +222,7 @@ struct ub_result {
 * The readable function definition looks like:
 * void my_callback(void* my_arg, int err, struct ub_result* result);
 * It is called with
- *	void* my_arg: your pointer to a (struct of) data of your choice,
+ *	void* my_arg: your pointer to a (struct of) data of your choice, 
 *		or NULL.
 *	int err: if 0 all is OK, otherwise an error occurred and no results
 *	     are forthcoming.
@@ -301,8 +301,8 @@ int ub_ctx_set_option(struct ub_ctx* ctx, const char* opt, const char* val);
 * 	This is a power-users interface that lets you specify all sorts
 * 	of options.
 * @param str: the string is malloced and returned here. NULL on error.
- * 	The caller must free() the string.  In cases with multiple
- * 	entries (auto-trust-anchor-file), a newline delimited list is
+ * 	The caller must free() the string.  In cases with multiple 
+ * 	entries (auto-trust-anchor-file), a newline delimited list is 
 * 	returned in the string.
 * @return 0 if OK else an error code (malloc failure, syntax error).
 */
@@ -321,10 +321,10 @@ int ub_ctx_get_option(struct ub_ctx* ctx, const char* opt, char** str);
 int ub_ctx_config(struct ub_ctx* ctx, const char* fname);

 /**
- * 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
+ * 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.
 *
 * To read the list of nameservers from /etc/resolv.conf (from DHCP or so),
@@ -389,7 +389,7 @@ int ub_ctx_resolvconf(struct ub_ctx* ctx, const char* fname);

 /**
 * Read list of hosts from the filename given.
- * Usually "/etc/hosts".
+ * Usually "/etc/hosts". 
 * These addresses are not flagged as DNSSEC secure when queried for.
 *
 * @param ctx: context.
@@ -403,7 +403,7 @@ int ub_ctx_hosts(struct ub_ctx* ctx, const char* fname);
 /**
 * Add a trust anchor to the given context.
 * The trust anchor is a string, on one line, that holds a valid DNSKEY or
- * DS RR.
+ * DS RR. 
 * @param ctx: context.
 *	At this time it is only possible to add trusted keys before the
 *	first resolve is done.
@@ -465,7 +465,7 @@ int ub_ctx_debugout(struct ub_ctx* ctx, void* out);
 * Set debug verbosity for the context
 * Output is directed to stderr.
 * @param ctx: context.
- * @param d: debug level, 0 is off, 1 is very minimal, 2 is detailed,
+ * @param d: debug level, 0 is off, 1 is very minimal, 2 is detailed, 
 *	and 3 is lots.
 * @return 0 if OK, else error.
 */
@@ -474,10 +474,10 @@ int ub_ctx_debuglevel(struct ub_ctx* ctx, int d);
 /**
 * Set a context behaviour for asynchronous action.
 * @param ctx: context.
- * @param dothread: if true, enables threading and a call to resolve_async()
+ * @param dothread: if true, enables threading and a call to 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 async() calls have been made have
+ *	Changes to this setting after async() calls have been made have 
 *	no effect (delete and re-create the context to change).
 * @return 0 if OK, else error.
 */
@@ -495,7 +495,7 @@ int ub_poll(struct ub_ctx* ctx);

 /**
 * Wait for a context to finish with results. Calls ub_process() after
- * the wait for you. After the wait, there are no more outstanding
+ * the wait for you. After the wait, there are no more outstanding 
 * asynchronous queries.
 * @param ctx: context.
 * @return: 0 if OK, else error.
@@ -530,11 +530,11 @@ int ub_process(struct ub_ctx* ctx);
 * @param rrtype: type of RR in host order, 1 is A (address).
 * @param rrclass: class of RR in host order, 1 is IN (for internet).
 * @param result: the result data is returned in a newly allocated result
- * 	structure. May be NULL on return, return value is set to an error
+ * 	structure. May be NULL on return, return value is set to an error 
 * 	in that case (out of memory).
 * @return 0 if OK, else error.
 */
-int ub_resolve(struct ub_ctx* ctx, const char* name, int rrtype,
+int ub_resolve(struct ub_ctx* ctx, const char* name, int rrtype, 
 	int rrclass, struct ub_result** result);

 /**
@@ -561,11 +561,11 @@ int ub_resolve(struct ub_ctx* ctx, const char* name, int rrtype,
 * 	If an error happens during processing, your callback will be called
 * 	with error set to a nonzero value (and result==NULL).
 * @param async_id: if you pass a non-NULL value, an identifier number is
- *	returned for the query as it is in progress. It can be used to
+ *	returned for the query as it is in progress. It can be used to 
 *	cancel the query.
 * @return 0 if OK, else error.
 */
-int ub_resolve_async(struct ub_ctx* ctx, const char* name, int rrtype,
+int ub_resolve_async(struct ub_ctx* ctx, const char* name, int rrtype, 
 	int rrclass, void* mydata, ub_callback_type callback, int* async_id);

 /**
@@ -589,7 +589,7 @@ int ub_cancel(struct ub_ctx* ctx, int async_id);
 */
 void ub_resolve_free(struct ub_result* result);

-/**
+/** 
 * Convert error value to a human readable string.
 * @param err: error code from one of the libunbound functions.
 * 	The error codes are from the type enum ub_ctx_err.
@@ -605,7 +605,7 @@ const char* ub_strerror(int err);
 int ub_ctx_print_local_zones(struct ub_ctx* ctx);

 /**
- * Add a new zone with the zonetype to the local authority info of the
+ * Add a new zone with the zonetype to the local authority info of the 
 * library.
 * @param ctx: context.  Is finalized by the routine.
 * @param zone_name: name of the zone in text, "example.com"
@@ -613,7 +613,7 @@ int ub_ctx_print_local_zones(struct ub_ctx* ctx);
 * @param zone_type: type of the zone (like for unbound.conf) in text.
 * @return 0 if OK, else error.
 */
-int ub_ctx_zone_add(struct ub_ctx* ctx, const char *zone_name,
+int ub_ctx_zone_add(struct ub_ctx* ctx, const char *zone_name, 
 	const char *zone_type);

 /**
@@ -649,7 +649,7 @@ int ub_ctx_data_remove(struct ub_ctx* ctx, const char *data);
 */
 const char* ub_version(void);

-/**
+/** 
 * Some global statistics that are not in struct stats_info,
 * this struct is shared on a shm segment (shm-key in unbound.conf)
 */
@@ -695,22 +695,13 @@ struct ub_server_stats {
 	long long num_queries;
 	/** number of queries that have been dropped/ratelimited by ip. */
 	long long num_queries_ip_ratelimited;
-	/** number of queries with a valid DNS Cookie. */
-	long long num_queries_cookie_valid;
-	/** number of queries with only the client part of the DNS Cookie. */
-	long long num_queries_cookie_client;
-	/** number of queries with invalid DNS Cookie. */
-	long long num_queries_cookie_invalid;
 	/** number of queries that had a cache-miss. */
 	long long num_queries_missed_cache;
 	/** number of prefetch queries - cachehits with prefetch */
 	long long num_queries_prefetch;
-	/** number of queries which are too late to process */
-	long long num_queries_timed_out;
-	/** the longest wait time in the queue */
-	long long max_query_time_us;
+
 	/**
-	 * Sum of the querylistsize of the worker for
+	 * Sum of the querylistsize of the worker for 
 	 * every query that missed cache. To calculate average.
 	 */
 	long long sum_query_list_size;
@@ -734,8 +725,6 @@ struct ub_server_stats {
 	long long qtcp;
 	/** number of outgoing queries over TCP */
 	long long qtcp_outgoing;
-	/** number of outgoing queries over UDP */
-	long long qudp_outgoing;
 	/** number of queries over (DNS over) TLS */
 	long long qtls;
 	/** number of queries over (DNS over) HTTPS */
@@ -782,12 +771,12 @@ struct ub_server_stats {
 	long long tcp_accept_usage;
 	/** expired answers served from cache */
 	long long ans_expired;
-	/** histogram data exported to array
+	/** histogram data exported to array 
 	 * if the array is the same size, no data is lost, and
 	 * if all histograms are same size (is so by default) then
 	 * adding up works well. */
 	long long hist[UB_STATS_BUCKET_NUM];
-
+	
 	/** number of message cache entries */
 	long long msg_cache_count;
 	/** number of rrset cache entries */
@@ -797,11 +786,6 @@ struct ub_server_stats {
 	/** number of key cache entries */
 	long long key_cache_count;

-	/** maximum number of collisions in the msg cache */
-	long long msg_cache_max_collisions;
-	/** maximum number of collisions in the rrset cache */
-	long long rrset_cache_max_collisions;
-
 	/** number of queries that used dnscrypt */
 	long long num_query_dnscrypt_crypted;
 	/** number of queries that queried dnscrypt certificates */
@@ -833,8 +817,6 @@ struct ub_server_stats {
 	/** number of queries answered from edns-subnet specific data, and
 	 * the answer was from the edns-subnet cache. */
 	long long num_query_subnet_cache;
-	/** number of queries served from cachedb */
-	long long num_query_cachedb;
 	/** number of bytes in the stream wait buffers */
 	long long mem_stream_wait;
 	/** number of bytes in the HTTP2 query buffers */
@@ -847,7 +829,7 @@ struct ub_server_stats {
 	long long rpz_action[UB_STATS_RPZ_ACTION_NUM];
 };

-/**
+/** 
 * Statistics to send over the control pipe when asked
 * This struct is made to be memcopied, sent in binary.
 * shm mapped with (number+1) at num_threads+1, with first as total
@@ -876,4 +858,4 @@ struct ub_stats_info {
 }
 #endif

-#endif /* UB_UNBOUND_H */
+#endif /* _UB_UNBOUND_H */
@@ -58,7 +58,6 @@ struct query_info;
 * @param dnssec: if set, EDNS record will have DO bit set.
 * @param want_dnssec: signatures needed.
 * @param nocaps: ignore capsforid(if in config), do not perturb qname.
- * @param check_ratelimit: if set, will check ratelimit before sending out.
 * @param addr: where to.
 * @param addrlen: length of addr.
 * @param zone: delegation point name.
@@ -68,17 +67,14 @@ struct query_info;
 * @param tls_auth_name: if ssl_upstream, use this name with TLS
 * 	authentication.
 * @param q: which query state to reactivate upon return.
- * @param was_ratelimited: it will signal back if the query failed to pass the
- *	ratelimit check.
 * @return: false on failure (memory or socket related). no query was
 *      sent.
 */
 struct outbound_entry* libworker_send_query(struct query_info* qinfo,
 	uint16_t flags, int dnssec, int want_dnssec, int nocaps,
-	int check_ratelimit,
 	struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone,
 	size_t zonelen, int tcp_upstream, int ssl_upstream, char* tls_auth_name,
-	struct module_qstate* q, int* was_ratelimited);
+	struct module_qstate* q);

 /** process incoming serviced query replies from the network */
 int libworker_handle_service_reply(struct comm_point* c, void* arg, int error,
@@ -114,7 +110,6 @@ void worker_sighandler(int sig, void* arg);
 * @param dnssec: if set, EDNS record will have DO bit set.
 * @param want_dnssec: signatures needed.
 * @param nocaps: ignore capsforid(if in config), do not perturb qname.
- * @param check_ratelimit: if set, will check ratelimit before sending out.
 * @param addr: where to.
 * @param addrlen: length of addr.
 * @param zone: wireformat dname of the zone.
@@ -124,17 +119,14 @@ void worker_sighandler(int sig, void* arg);
 * @param tls_auth_name: if ssl_upstream, use this name with TLS
 * 	authentication.
 * @param q: which query state to reactivate upon return.
- * @param was_ratelimited: it will signal back if the query failed to pass the
- *	ratelimit check.
 * @return: false on failure (memory or socket related). no query was
 *      sent.
 */
 struct outbound_entry* worker_send_query(struct query_info* qinfo,
 	uint16_t flags, int dnssec, int want_dnssec, int nocaps,
-	int check_ratelimit,
 	struct sockaddr_storage* addr, socklen_t addrlen, uint8_t* zone,
 	size_t zonelen, int tcp_upstream, int ssl_upstream, char* tls_auth_name,
-	struct module_qstate* q, int* was_ratelimited);
+	struct module_qstate* q);

 /** 
 * process control messages from the main thread. Frees the control 
@@ -45,24 +45,20 @@ usage () {
 Usage $0: [-h] [-s] [-u git_url] [-b git_branch] [-w ...args...]
 Generate a distribution tar file for unbound.

-    -h                  This usage information.
-    -s                  Build a snapshot distribution file.  The current date is
-                        automatically appended to the current unbound version number.
-    -rc <nr>            Build a release candidate, the given string will be added
-                        to the version number
-                        (which will then be unbound-<version>rc<number>)
-    -u git_url          Retrieve the source from the specified repository url.
-                        Detected from the working copy if not specified.
-    -b git_branch       Retrieve the the specified branch or tag.
-                        Detected from the working copy if not specified.
+    -h           This usage information.
+    -s           Build a snapshot distribution file.  The current date is
+                 automatically appended to the current unbound version number.
+    -rc <nr>     Build a release candidate, the given string will be added
+                 to the version number 
+                 (which will then be unbound-<version>rc<number>)
+    -u git_url   Retrieve the source from the specified repository url.
+                 Detected from the working copy if not specified.
+    -b git_branch Retrieve the the specified branch or tag.
+                 Detected from the working copy if not specified.
    -wssl openssl.xx.tar.gz Also build openssl from tarball for windows dist.
    -wxp expat.xx.tar.gz Also build expat from tarball for windows dist.
-    -wdir directory     Build openssl and expat in a persistent directory for
-                        windows dist. If builds are already in that directory
-                        they are used right away. Useful when debuggin windows
-                        builds.
-    -w32                32bit windows compile.
-    -w ...              Build windows binary dist. last args passed to configure.
+    -w32	 32bit windows compile.
+    -w ...       Build windows binary dist. last args passed to configure.
 EOF
    exit 1
 }
@@ -147,16 +143,6 @@ create_temp_dir () {
    cd $temp_dir
 }

-activate_windebug_dir () {
-    info "Activating persistent directory for windows build."
-    if test ! -d "$WINDIR"; then
-        mkdir -p "$WINDIR"
-        info "Created $WINDIR persistent directory."
-    fi
-    cd "$WINDIR"
-    WINDIR="`pwd`"
-}
-
 # pass filename as $1 arg.
 # creates file.sha1 and file.sha256
 storehash () {
@@ -201,9 +187,7 @@ DOWIN="no"
 W64="yes"
 WINSSL=""
 WINEXPAT=""
-WINDIR=""
-# Use environment if set otherwise null
-MINJ="${MINJ:+$MINJ}"
+MINJ=""

 # Parse the command line arguments.
 while [ "$1" ]; do
@@ -230,10 +214,6 @@ while [ "$1" ]; do
 	    WINEXPAT="$2"
 	    shift
 	    ;;
-        "-wdir")
-	    WINDIR="$2"
-	    shift
-	    ;;
 	"-w32")
 	    W64="no"
 	    ;;
@@ -273,27 +253,8 @@ if [ "$DOWIN" = "yes" ]; then
 	shared_cross_flag=""

 	check_git_repo
+	create_temp_dir

-	if test -n "$WINDIR"; then
-		activate_windebug_dir
-	else
-		create_temp_dir
-	fi
-
-	if test -n "$WINSSL" \
-		-a -n "$WINDIR" \
-		-a -d "$WINDIR" \
-		-a -d "${WINDIR}/sslinstall" \
-		-a -d "${WINDIR}/openssl_shared" \
-		-a -d "${WINDIR}/sslsharedinstall"; then
-		info "Found already compiled openssl at $WINDIR/sslinstall; using that."
-		WINSSL=""
-		# Variables needed later on.
-		sslinstall="${WINDIR}/sslinstall"
-		cross_flag="$cross_flag --with-ssl=$sslinstall"
-		sslsharedinstall="${WINDIR}/sslsharedinstall"
-		shared_cross_flag="$shared_cross_flag --with-ssl=$sslsharedinstall"
-	fi
 	# crosscompile openssl for windows.
 	if test -n "$WINSSL"; then
 		info "Cross compile $WINSSL"
@@ -306,13 +267,11 @@ if [ "$DOWIN" = "yes" ]; then
 		# cross-compilation and it is not used anyway
 		# before 1.0.1i need --cross-compile-prefix=i686-w64-mingw32-
 		if test "$mw64" = "mingw64"; then
-			sslflags="no-asm no-tests -DOPENSSL_NO_CAPIENG mingw64"
-			sspdll="/usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll"
+			sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw64"
 		else
-			sslflags="no-asm no-tests -DOPENSSL_NO_CAPIENG mingw"
-			sspdll="/usr/i686-w64-mingw32/sys-root/mingw/bin/libssp-0.dll"
+			sslflags="no-asm -DOPENSSL_NO_CAPIENG mingw"
 		fi
-		if test -f "$sspdll"; then
+		if test -f /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll; then
 			# stack protector lib needs to link in to make
 			# -lws2_32 work in openssl link stage
 			SSPLIB="-l:libssp.a"
@@ -321,18 +280,9 @@ if [ "$DOWIN" = "yes" ]; then
 			SSPLIB=""
 		fi
 		info "winssl: Configure no-shared $sslflags"
-		if test "$W64" = "no"; then
-			# Disable stack-protector for 32-bit windows builds.
-			# mingw passes an LDFLAGS, so there is something
-			# passed in the LDFLAGS to stop -lssp passed in it.
-			set -x # echo the configure command
-			__CNF_LDLIBS=$SSPLIB __CNF_LDFLAGS="-fno-stack-protector" CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" no-shared $sslflags || error_cleanup "OpenSSL Configure failed"
-			set +x
-		else
-			set -x # echo the configure command
-			__CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" no-shared $sslflags || error_cleanup "OpenSSL Configure failed"
-			set +x
-		fi
+		set -x # echo the configure command
+		__CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslinstall" no-shared $sslflags || error_cleanup "OpenSSL Configure failed"
+		set +x
 		info "winssl: make"
 		make $MINJ || error_cleanup "OpenSSL crosscompile failed"
 		# only install sw not docs, which take a long time.
@@ -345,15 +295,9 @@ if [ "$DOWIN" = "yes" ]; then
 		sslsharedinstall="`pwd`/sslsharedinstall"
 		cd openssl_shared
 		info "winssl: Configure shared $sslflags"
-		if test "$W64" = "no"; then
-			set -x # echo the configure command
-			__CNF_LDLIBS=$SSPLIB __CNF_LDFLAGS="-fno-stack-protector" CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslsharedinstall" shared $sslflags || error_cleanup "OpenSSL Configure failed"
-			set +x
-		else
-			set -x # echo the configure command
-			__CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslsharedinstall" shared $sslflags || error_cleanup "OpenSSL Configure failed"
-			set +x
-		fi
+		set -x # echo the configure command
+		__CNF_LDLIBS=$SSPLIB CC=${warch}-w64-mingw32-gcc AR=${warch}-w64-mingw32-ar RANLIB=${warch}-w64-mingw32-ranlib WINDRES=${warch}-w64-mingw32-windres ./Configure --prefix="$sslsharedinstall" shared $sslflags || error_cleanup "OpenSSL Configure failed"
+		set +x
 		info "winssl: make"
 		make $MINJ || error_cleanup "OpenSSL crosscompile failed"
 		info "winssl: make install_sw"
@@ -362,17 +306,6 @@ if [ "$DOWIN" = "yes" ]; then
 		cd ..
 	fi

-	if test -n "$WINEXPAT" \
-		-a -n "$WINDIR" \
-		-a -d "$WINDIR" \
-		-a -d "${WINDIR}/wxpinstall"; then
-		info "Found already compiled expat at $WINDIR/wxpinstall; using that."
-		WINEXPAT=""
-		# Variables needed later on.
-		wxpinstall="${WINDIR}/wxpinstall"
-		cross_flag="$cross_flag --with-libexpat=$wxpinstall"
-		shared_cross_flag="$shared_cross_flag --with-libexpat=$wxpinstall"
-	fi
 	if test -n "$WINEXPAT"; then
 		info "Cross compile $WINEXPAT"
 		info "wxp: tar unpack"
@@ -380,16 +313,7 @@ if [ "$DOWIN" = "yes" ]; then
 		wxpinstall="`pwd`/wxpinstall"
 		cd expat-* || error_cleanup "no expat-X dir in tarball"
 		info "wxp: configure"
-		if test "$W64" = "no"; then
-			# Disable stack-protector for 32-bit windows builds.
-			set -x # echo the configure command
-			$configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib" LDFLAGS="-fno-stack-protector" || error_cleanup "libexpat configure failed"
-			set +x
-		else
-			set -x # echo the configure command
-			$configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib"  || error_cleanup "libexpat configure failed"
-			set +x
-		fi
+		$configure --prefix="$wxpinstall" --exec-prefix="$wxpinstall" --bindir="$wxpinstall/bin" --includedir="$wxpinstall/include" --mandir="$wxpinstall/man" --libdir="$wxpinstall/lib"  || error_cleanup "libexpat configure failed"
 		info "wxp: make"
 		make $MINJ || error_cleanup "libexpat crosscompile failed"
 		info "wxp: make install"
@@ -399,12 +323,8 @@ if [ "$DOWIN" = "yes" ]; then
 		cd ..
 	fi

-	if test -n "$WINDIR"; then
-		cd "$cwd"
-		create_temp_dir
-	fi
-	info "GITREPO   is $GITREPO"
-	info "GITBRANCH is $GITBRANCH"
+        info "GITREPO   is $GITREPO"
+        info "GITBRANCH is $GITBRANCH"
 	info "Exporting source from git."
 	info "git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound"
 	git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound || error_cleanup "git clone failed"
@@ -436,17 +356,13 @@ if [ "$DOWIN" = "yes" ]; then
 	replace_version "configure.ac" "$version" "$version2"
    	version="$version2"
    	info "Rebuilding configure script (autoconf) snapshot."
-	autoconf -f || error_cleanup "Autoconf failed."
-	autoheader -f || error_cleanup "Autoheader failed."
+    	autoconf || error_cleanup "Autoconf failed."
+    	autoheader || error_cleanup "Autoheader failed."
    	rm -r autom4te* || echo "ignored"
-	rm -f config.h.in~ || echo "ignore absence of config.h.in~ file."
    fi

    if test "`uname`" = "Linux"; then 
-	    cd ..
-	    cp -r unbound unbound_shared
-	    unbound_shared="`pwd`/unbound_shared"
-	    cd unbound
+	    (cd ..; cp -r unbound unbound_shared)
    fi

    # procedure for making unbound installer on mingw. 
@@ -460,15 +376,13 @@ if [ "$DOWIN" = "yes" ]; then
    fi
    if test "$W64" = "no"; then
 		# Disable stack-protector for 32-bit windows builds.
-		set -x
-		$configure --enable-debug --enable-static-exe --disable-flto --disable-gost $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector' LDFLAGS="-fno-stack-protector" \
+		echo "$configure"' --enable-debug --enable-static-exe --disable-flto --disable-gost '"$* $cross_flag" "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'
+		$configure --enable-debug --enable-static-exe --disable-flto --disable-gost $* $cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
 		|| error_cleanup "Could not configure"
-		set +x
    else
-		set -x
+		echo "$configure"' --enable-debug --enable-static-exe --disable-flto --disable-gost '"$* $cross_flag"
 		$configure --enable-debug --enable-static-exe --disable-flto --disable-gost $* $cross_flag \
 		|| error_cleanup "Could not configure"
-		set +x
    fi
    info "Calling make"
 	make $MINJ || error_cleanup "Could not make"
@@ -476,18 +390,16 @@ if [ "$DOWIN" = "yes" ]; then

    if test "`uname`" = "Linux"; then 
    info "Make DLL"
-    cd $unbound_shared
+    cd ../unbound_shared
    if test "$W64" = "no"; then
 	# Disable stack-protector for 32-bit windows builds.
-		set -x
-		$configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector' LDFLAGS="-fno-stack-protector" \
+		echo "$configure"' --enable-debug --disable-flto --disable-gost '"$* $shared_cross_flag" "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'
+		$configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag "$file_flag" "$file2_flag" "$file3_flag" CFLAGS='-O2 -g -fno-stack-protector'\
 		|| error_cleanup "Could not configure"
-		set +x
    else
-		set -x
-		$configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag \
+		echo "$configure"' --enable-debug --disable-flto --disable-gost '"$* $shared_cross_flag"
+        $configure --enable-debug --disable-flto --disable-gost $* $shared_cross_flag \
 		|| error_cleanup "Could not configure"
-		set +x
    fi
    info "Calling make for DLL"
 	make $MINJ || error_cleanup "Could not make DLL"
@@ -516,28 +428,19 @@ if [ "$DOWIN" = "yes" ]; then
    cp ../unbound.exe ../unbound-anchor.exe ../unbound-host.exe ../unbound-control.exe ../unbound-checkconf.exe ../unbound-service-install.exe ../unbound-service-remove.exe ../LICENSE ../winrc/unbound-control-setup.cmd ../winrc/unbound-website.url ../winrc/service.conf ../winrc/README.txt ../contrib/create_unbound_ad_servers.cmd ../contrib/warmup.cmd ../contrib/unbound_cache.cmd .
    mkdir libunbound
    # test to see if lib or lib64 (for openssl 3.0.0) needs to be used
-    if test -f $sslsharedinstall/lib/libcrypto.dll.a; then
-	cp $sslsharedinstall/lib/libcrypto.dll.a libunbound/.
+    if test -f ../../sslsharedinstall/lib/libcrypto.dll.a; then
+	cp ../../sslsharedinstall/lib/libcrypto.dll.a libunbound/.
    else
-	cp $sslsharedinstall/lib64/libcrypto.dll.a libunbound/.
+	cp ../../sslsharedinstall/lib64/libcrypto.dll.a libunbound/.
    fi
-    if test -f $sslsharedinstall/lib/libssl.dll.a; then
-	cp $sslsharedinstall/lib/libssl.dll.a libunbound/.
+    if test -f ../../sslsharedinstall/lib/libssl.dll.a; then
+	cp ../../sslsharedinstall/lib/libssl.dll.a libunbound/.
    else
-	cp $sslsharedinstall/lib64/libssl.dll.a libunbound/.
+	cp ../../sslsharedinstall/lib64/libssl.dll.a libunbound/.
    fi
-    cp $unbound_shared/unbound.h               \
-	$unbound_shared/.libs/libunbound*.dll  \
-	$unbound_shared/.libs/libunbound.dll.a \
-	$unbound_shared/.libs/libunbound.a     \
-	$unbound_shared/.libs/libunbound*.def  \
-	$sslsharedinstall/bin/libcrypto*.dll   \
-	$sslsharedinstall/bin/libssl*.dll      \
-	$wxpinstall/bin/libexpat*.dll          \
-	$wxpinstall/lib/libexpat.dll.a         \
-	libunbound/.
-    if test -f "$sspdll"; then
-	    cp "$sspdll" libunbound/.
+    cp ../../unbound_shared/unbound.h ../../unbound_shared/.libs/libunbound*.dll ../../unbound_shared/.libs/libunbound.dll.a ../../unbound_shared/.libs/libunbound.a ../../unbound_shared/.libs/libunbound*.def ../../sslsharedinstall/bin/libcrypto*.dll ../../sslsharedinstall/bin/libssl*.dll ../../wxpinstall/bin/libexpat*.dll ../../wxpinstall/lib/libexpat.dll.a libunbound/.
+    if test -f /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll; then
+	    cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libssp-0.dll libunbound/.
    fi
    # zipfile
    zip -r ../$file LICENSE README.txt unbound.exe unbound-anchor.exe unbound-host.exe unbound-control.exe unbound-checkconf.exe unbound-service-install.exe unbound-service-remove.exe unbound-control-setup.cmd example.conf service.conf root.key unbound-website.url create_unbound_ad_servers.cmd warmup.cmd unbound_cache.cmd Changelog libunbound
@@ -565,11 +468,6 @@ if [ "$DOWIN" = "yes" ]; then
    storehash unbound-$version.zip
    ls -lG unbound_setup_$version.exe
    ls -lG unbound-$version.zip
-
-    echo "create signed versions with:"
-    echo "  gpg --armor --detach-sign --digest-algo SHA256 unbound_setup_$version.exe"
-    echo "  gpg --armor --detach-sign --digest-algo SHA256 unbound-$version.zip"
-
    info "Done"
    exit 0
 fi
@@ -611,10 +509,9 @@ if [ `uname -s | grep -i -c darwin` -ne 0 ]; then
 fi

 info "Building configure script (autoreconf)."
-autoreconf -f || error_cleanup "Autoconf failed."
+autoreconf || error_cleanup "Autoconf failed."

 rm -r autom4te* || error_cleanup "Failed to remove autoconf cache directory."
-rm -f config.h.in~ || echo "ignore absence of config.h.in~ file."

 info "Building lexer and parser."
 echo "#include \"config.h\"" > util/configlexer.c || error_cleanup "Failed to create configlexer"
@@ -657,9 +554,8 @@ fi

 if [ "$RECONFIGURE" = "yes" ]; then
    info "Rebuilding configure script (autoconf) snapshot."
-    autoreconf -f || error_cleanup "Autoconf failed."
+    autoreconf || error_cleanup "Autoconf failed."
    rm -r autom4te* || error_cleanup "Failed to remove autoconf cache directory."
-    rm -f config.h.in~ || echo "ignore absence of config.h.in~ file."
 fi

 replace_all doc/README
@@ -1,9 +1,9 @@
 def init(id, cfg):
-   log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, mod_env['script']))
+   log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, cfg.python_script))
   return True

 def init_standard(id, env):
-   log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, env.cfg.port, mod_env['script']))
+   log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, env.cfg.port, env.cfg.python_script))
   return True

 def deinit(id):
@@ -50,7 +50,7 @@ Script file must contain four compulsory functions:
 ::

   def init(id, cfg):
-      log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, mod_env['script']))
+      log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, cfg.python_script))
      return True


@@ -69,7 +69,7 @@ Script file must contain four compulsory functions:
 ::

    def init_standard(id, env):
-       log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, env.cfg.port, mod_env['script']))
+       log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, env.cfg.port, env.cfg.python_script))
       return True


@@ -129,7 +129,7 @@ config_file
   
   .. attribute:: ifs
   
-      List of interface description strings (IP addresses).
+      Interface description strings (IP addresses).

   .. attribute:: num_out_ifs
   
@@ -138,7 +138,7 @@ config_file

   .. attribute:: out_ifs
   
-      List of outgoing interface description strings (IP addresses).
+      Outgoing interface description strings (IP addresses).
      
   .. attribute:: root_hints
   
@@ -339,5 +339,4 @@ config_file

   .. attribute:: python_script
   
-      Linked list of Python script files.
-      Deprecated; `mod_env['script']` should be used instead.
+      Python script file.
@@ -6,11 +6,8 @@ Global variables

 .. envvar:: mod_env

-   Module environment, it is the 'data' pointer for module-specific data
-   in :class:`pythonmod_env`.
-   It is initialized as a dictionary with the 'script' key pointing to the
-   module's python script.
-   It can be further populated during runtime for module-specific data.
+   Module environment, contains data pointer for module-specific data.
+   See :class:`pythonmod_env`.


 Predefined constants
@@ -60,7 +60,7 @@ EDNS options

 .. function:: edns_opt_list_remove(list, code);

-    Remove an EDNS option code from the list.
+    Remove an ENDS option code from the list.
    .. note:: All :class:`edns_option` with the code will be removed

    :param list: linked list of :class:`edns_option`
@@ -77,7 +77,7 @@ module_qstate

    .. attribute:: edns_opts_back_in_iter

-        Iterator for `edns_opts_back_in`.
+        Iterator for `ends_opts_back_in`.

    .. attribute:: edns_opts_front_out

@@ -80,7 +80,7 @@ def init_standard(id, env):
    ..note:: The previously accessible configuration options can now be found in
             env.cfg.
    """
-    log_info("python: inited script {}".format(mod_env['script']))
+    log_info("python: inited script {}".format(env.cfg.python_script))

    # Register EDNS option 65001 as a known EDNS option.
    if not register_edns_option(env, 65001, bypass_cache_stage=True,
@@ -34,9 +34,6 @@
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''
-
-import os
-
 #Try:
 # - dig @localhost nlnetlabs.nl +ednsopt=65002:
 #       This query *could* be answered from cache. If so, unbound will reply
@@ -210,7 +207,7 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out,

    """
    log_info("python: called back while servfail.")
-    # Append the example EDNS option
+    # Append the example ENDS option
    b = bytearray.fromhex("")
    edns_opt_list_append(opt_list_out, 65003, b, region)

@@ -245,36 +242,6 @@ def inplace_query_callback(qinfo, flags, qstate, addr, zone, region, **kwargs):
    return True


-def inplace_query_response_callback(qstate, response, **kwargs):
-    """
-    Function that will be registered as an inplace callback function.
-    It will be called after receiving a reply from a backend server.
-
-    :param qstate: module qstate. opt_lists are available here;
-    :param response: struct dns_msg. The reply received from the backend server;
-    :param **kwargs: Dictionary that may contain parameters added in a future
-                     release.
-    """
-    log_dns_msg(
-        "python: incoming reply from {}{}".format(qstate.reply.addr, os.linesep),
-        response.qinfo, response.rep
-    )
-    return True
-
-
-def inplace_edns_back_parsed_call(qstate, **kwargs):
-    """
-    Function that will be registered as an inplace callback function.
-    It will be called after EDNS is parsed on a reply from a backend server..
-
-    :param qstate: module qstate. opt_lists are available here;
-    :param **kwargs: Dictionary that may contain parameters added in a future
-                     release.
-    """
-    log_info("python: edns parsed")
-    return True
-
-
 def init_standard(id, env):
    """
    New version of the init function.
@@ -287,7 +254,7 @@ def init_standard(id, env):
             env.cfg.

    """
-    log_info("python: inited script {}".format(mod_env['script']))
+    log_info("python: inited script {}".format(env.cfg.python_script))

    # Register the inplace_reply_callback function as an inplace callback
    # function when answering a resolved query.
@@ -314,16 +281,6 @@ def init_standard(id, env):
    if not register_inplace_cb_query(inplace_query_callback, env, id):
        return False

-    # Register the inplace_edns_back_parsed_call function as an inplace callback
-    # for when a reply is received from a backend server.
-    if not register_inplace_cb_query_response(inplace_query_response_callback, env, id):
-        return False
-
-    # Register the inplace_edns_back_parsed_call function as an inplace callback
-    # for when EDNS is parsed on a reply from a backend server.
-    if not register_inplace_cb_edns_back_parsed_call(inplace_edns_back_parsed_call, env, id):
-        return False
-
    return True


@@ -87,7 +87,7 @@ def logDnsMsg(qstate):
    print "-"*100

 def init(id, cfg):
-   log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, mod_env['script']))
+   log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, cfg.python_script))
   return True

 def deinit(id):
@@ -86,20 +86,6 @@
     }
     return list;
   }
-
-   /* converts an array of strings (char**) to a List of strings */
-   PyObject* CharArrayAsStringList(char** array, int len) {
-     PyObject* list;
-     int i;
-
-     if(!array||len==0) return PyList_New(0);
-
-     list = PyList_New(len);
-     for (i=0; i < len; i++) {
-            PyList_SET_ITEM(list, i, PyString_FromString(array[i]));
-     }
-     return list;
-   }
 %}

 /* ************************************************************************************ *
@@ -623,9 +609,9 @@ struct mesh_reply {
   struct comm_reply query_reply;
 };

-%rename(_addr) comm_reply::client_addr;
+%rename(_addr) comm_reply::addr;
 struct comm_reply {
-   struct sockaddr_storage client_addr;
+   struct sockaddr_storage addr;
 };

 %extend comm_reply {
@@ -726,10 +712,9 @@ struct module_env {
    /* --- services --- */
    struct outbound_entry* (*send_query)(struct query_info* qinfo,
        uint16_t flags, int dnssec, int want_dnssec, int nocaps,
-        int check_ratelimit,
        struct sockaddr_storage* addr, socklen_t addrlen,
        uint8_t* zone, size_t zonelen, int tcp_upstream, int ssl_upstream,
-        char* tls_auth_name, struct module_qstate* q, int* was_ratelimited);
+        char* tls_auth_name, struct module_qstate* q);
    void (*detach_subs)(struct module_qstate* qstate);
    int (*attach_sub)(struct module_qstate* qstate,
        struct query_info* qinfo, uint16_t qflags, int prime,
@@ -966,9 +951,6 @@ struct config_str2list {
 /* ************************************************************************************ *
   Structure config_file
 * ************************************************************************************ */
-%ignore config_file::ifs;
-%ignore config_file::out_ifs;
-%ignore config_file::python_script;
 struct config_file {
   int verbosity;
   int stat_interval;
@@ -1052,25 +1034,6 @@ struct config_file {
   struct config_strlist* python_script;
 };

-%inline %{
-   PyObject* _get_ifs_tuple(struct config_file* cfg) {
-      return CharArrayAsStringList(cfg->ifs, cfg->num_ifs);
-   }
-   PyObject* _get_ifs_out_tuple(struct config_file* cfg) {
-      return CharArrayAsStringList(cfg->out_ifs, cfg->num_out_ifs);
-   }
-%}
-
-%extend config_file {
-   %pythoncode %{
-        ifs = property(_unboundmodule._get_ifs_tuple)
-        out_ifs = property(_unboundmodule._get_ifs_out_tuple)
-
-        def _deprecated_python_script(self): return "cfg.python_script is deprecated, you can use `mod_env['script']` instead."
-        python_script = property(_deprecated_python_script)
-   %}
-}
-
 /* ************************************************************************************ *
   ASN: Adding structures related to forwards_lookup and dns_cache_find_delegation
 * ************************************************************************************ */
@@ -1411,12 +1374,11 @@ int set_return_msg(struct module_qstate* qstate,
 /* Functions which we will need to lookup delegations */
 struct delegpt* dns_cache_find_delegation(struct module_env* env,
        uint8_t* qname, size_t qnamelen, uint16_t qtype, uint16_t qclass,
-        struct regional* region, struct dns_msg** msg, uint32_t timenow,
-        int noexpiredabove, uint8_t* expiretop, size_t expiretoplen);
+        struct regional* region, struct dns_msg** msg, uint32_t timenow);
 int iter_dp_is_useless(struct query_info* qinfo, uint16_t qflags,
-        struct delegpt* dp, int supports_ipv4, int supports_ipv6, int use_nat64);
+        struct delegpt* dp);
 struct iter_hints_stub* hints_lookup_stub(struct iter_hints* hints,
-        uint8_t* qname, uint16_t qclass, struct delegpt* dp, int nolock);
+        uint8_t* qname, uint16_t qclass, struct delegpt* dp);

 /* Custom function to perform logic similar to the one in daemon/cachedump.c */
 struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t nmlen);
@@ -1433,7 +1395,6 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n
    struct query_info qinfo;
    struct iter_hints_stub* stub;
    uint32_t timenow = *qstate->env->now;
-    int nolock = 0;

    regional_free_all(region);
    qinfo.qname = (uint8_t*)nm;
@@ -1442,12 +1403,10 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n
    qinfo.qclass = LDNS_RR_CLASS_IN;

    while(1) {
-        dp = dns_cache_find_delegation(qstate->env, (uint8_t*)nm, nmlen, qinfo.qtype, qinfo.qclass, region, &msg, timenow, 0, NULL, 0);
+        dp = dns_cache_find_delegation(qstate->env, (uint8_t*)nm, nmlen, qinfo.qtype, qinfo.qclass, region, &msg, timenow);
        if(!dp)
            return NULL;
-        if(iter_dp_is_useless(&qinfo, BIT_RD, dp,
-                qstate->env->cfg->do_ip4, qstate->env->cfg->do_ip6,
-                qstate->env->cfg->do_nat64)) {
+        if(iter_dp_is_useless(&qinfo, BIT_RD, dp)) {
            if (dname_is_root((uint8_t*)nm))
                return NULL;
            nm = (char*)dp->name;
@@ -1456,12 +1415,9 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n
            dname_str((uint8_t*)nm, b);
            continue;
        }
-        stub = hints_lookup_stub(qstate->env->hints, qinfo.qname,
-            qinfo.qclass, dp, nolock);
+        stub = hints_lookup_stub(qstate->env->hints, qinfo.qname, qinfo.qclass, dp);
        if (stub) {
-            struct delegpt* stubdp = delegpt_copy(stub->dp, region);
-            lock_rw_unlock(&qstate->env->hints->lock);
-            return stubdp;
+            return stub->dp;
        } else {
            return dp;
        }
@@ -1591,15 +1547,13 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
        struct comm_reply* repinfo, struct regional* region,
        struct timeval* start_time, int id, void* python_callback)
    {
-        PyObject *func = NULL, *py_edns = NULL, *py_qstate = NULL;
-        PyObject *py_opt_list_out = NULL, *py_qinfo = NULL;
-        PyObject *py_rep = NULL, *py_repinfo = NULL, *py_region = NULL;
+        PyObject *func, *py_edns, *py_qstate, *py_opt_list_out, *py_qinfo;
+        PyObject *py_rep, *py_repinfo, *py_region;
        PyObject *py_args = NULL, *py_kwargs = NULL, *result = NULL;
        int res = 0;
        double py_start_time = ((double)start_time->tv_sec) + ((double)start_time->tv_usec) / 1.0e6;

        PyGILState_STATE gstate = PyGILState_Ensure();
-
        func = (PyObject *) python_callback;
        py_edns = SWIG_NewPointerObj((void*) edns, SWIGTYPE_p_edns_data, 0);
        py_qstate = SWIG_NewPointerObj((void*) qstate,
@@ -1610,24 +1564,20 @@ int edns_opt_list_append(struct edns_option** list, uint16_t code, size_t len,
        py_rep = SWIG_NewPointerObj((void*) rep, SWIGTYPE_p_reply_info, 0);
        py_repinfo = SWIG_NewPointerObj((void*) repinfo, SWIGTYPE_p_comm_reply, 0);
        py_region = SWIG_NewPointerObj((void*) region, SWIGTYPE_p_regional, 0);
-        if(!(py_qinfo && py_qstate && py_rep && py_edns && py_opt_list_out
-                && py_region && py_repinfo)) {
-                log_err("pythonmod: swig pointer failure in python_inplace_cb_reply_generic");
-                goto out;
+        if(py_qinfo && py_qstate && py_rep && py_edns && py_opt_list_out
+                && py_region && py_repinfo) {
+                py_args = Py_BuildValue("(OOOiOOO)", py_qinfo, py_qstate, py_rep,
+                        rcode, py_edns, py_opt_list_out, py_region);
+                py_kwargs = Py_BuildValue("{s:O,s:d}", "repinfo", py_repinfo, "start_time",
+                          py_start_time);
+                if(py_args && py_kwargs) {
+                        result = PyObject_Call(func, py_args, py_kwargs);
+                } else {
+                        log_err("pythonmod: malloc failure in python_inplace_cb_reply_generic");
+                }
+        } else {
+                log_err("pythonmod: malloc failure in python_inplace_cb_reply_generic");
        }
-        py_args = Py_BuildValue("(OOOiOOO)", py_qinfo, py_qstate, py_rep,
-                rcode, py_edns, py_opt_list_out, py_region);
-        py_kwargs = Py_BuildValue("{s:O,s:d}", "repinfo", py_repinfo, "start_time",
-                py_start_time);
-        if(!(py_args && py_kwargs)) {
-                log_err("pythonmod: BuildValue failure in python_inplace_cb_reply_generic");
-                goto out;
-        }
-        result = PyObject_Call(func, py_args, py_kwargs);
-        if (result) {
-            res = PyInt_AsLong(result);
-        }
-out:
        Py_XDECREF(py_edns);
        Py_XDECREF(py_qstate);
        Py_XDECREF(py_opt_list_out);
@@ -1637,6 +1587,9 @@ out:
        Py_XDECREF(py_region);
        Py_XDECREF(py_args);
        Py_XDECREF(py_kwargs);
+        if (result) {
+            res = PyInt_AsLong(result);
+        }
        Py_XDECREF(result);
        PyGILState_Release(gstate);
        return res;
@@ -1684,34 +1637,29 @@ out:
        int res = 0;
        PyObject *func = python_callback;
        PyObject *py_args = NULL, *py_kwargs = NULL, *result = NULL;
-        PyObject *py_qinfo = NULL;
-        PyObject *py_qstate = NULL;
-        PyObject *py_addr = NULL;
-        PyObject *py_zone = NULL;
-        PyObject *py_region = NULL;

        PyGILState_STATE gstate = PyGILState_Ensure();

-        py_qinfo = SWIG_NewPointerObj((void*) qinfo, SWIGTYPE_p_query_info, 0);
-        py_qstate = SWIG_NewPointerObj((void*) qstate, SWIGTYPE_p_module_qstate, 0);
-        py_addr = SWIG_NewPointerObj((void *) addr, SWIGTYPE_p_sockaddr_storage, 0);
-        py_zone = PyBytes_FromStringAndSize((const char *)zone, zonelen);
-        py_region = SWIG_NewPointerObj((void*) region, SWIGTYPE_p_regional, 0);
-        if(!(py_qinfo && py_qstate && py_addr && py_zone && py_region)) {
-                log_err("pythonmod: swig pointer failure in python_inplace_cb_query_generic");
-                goto out;
+        PyObject *py_qinfo = SWIG_NewPointerObj((void*) qinfo, SWIGTYPE_p_query_info, 0);
+        PyObject *py_qstate = SWIG_NewPointerObj((void*) qstate, SWIGTYPE_p_module_qstate, 0);
+        PyObject *py_addr = SWIG_NewPointerObj((void *) addr, SWIGTYPE_p_sockaddr_storage, 0);
+        PyObject *py_zone = PyBytes_FromStringAndSize((const char *)zone, zonelen);
+        PyObject *py_region = SWIG_NewPointerObj((void*) region, SWIGTYPE_p_regional, 0);
+        if(py_qinfo && py_qstate && py_addr && py_zone && py_region) {
+                py_args = Py_BuildValue("(OiOOOO)", py_qinfo, flags, py_qstate, py_addr, py_zone, py_region);
+                py_kwargs = Py_BuildValue("{}");
+                if(py_args && py_kwargs) {
+                        result = PyObject_Call(func, py_args, py_kwargs);
+                        if (result) {
+                            res = PyInt_AsLong(result);
+                        }
+                } else {
+                        log_err("pythonmod: malloc failure in python_inplace_cb_query_generic");
+                }
+        } else {
+                log_err("pythonmod: malloc failure in python_inplace_cb_query_generic");
        }
-        py_args = Py_BuildValue("(OiOOOO)", py_qinfo, flags, py_qstate, py_addr, py_zone, py_region);
-        py_kwargs = Py_BuildValue("{}");
-        if(!(py_args && py_kwargs)) {
-                log_err("pythonmod: BuildValue failure in python_inplace_cb_query_generic");
-                goto out;
-        }
-        result = PyObject_Call(func, py_args, py_kwargs);
-        if (result) {
-            res = PyInt_AsLong(result);
-        }
-out:
+
        Py_XDECREF(py_qinfo);
        Py_XDECREF(py_qstate);
        Py_XDECREF(py_addr);
@@ -1735,105 +1683,6 @@ out:
        if (ret) Py_INCREF(py_cb);
        return ret;
    }
-
-    int python_inplace_cb_query_response(struct module_qstate* qstate,
-        struct dns_msg* response, int id, void* python_callback)
-    {
-        int res = 0;
-        PyObject *func = python_callback;
-        PyObject *py_qstate = NULL;
-        PyObject *py_response = NULL;
-        PyObject *py_args = NULL;
-        PyObject *py_kwargs = NULL;
-        PyObject *result = NULL;
-
-        PyGILState_STATE gstate = PyGILState_Ensure();
-
-        py_qstate = SWIG_NewPointerObj((void*) qstate, SWIGTYPE_p_module_qstate, 0);
-        py_response = SWIG_NewPointerObj((void*) response, SWIGTYPE_p_dns_msg, 0);
-        if(!(py_qstate && py_response)) {
-                log_err("pythonmod: swig pointer failure in python_inplace_cb_query_response");
-                goto out;
-        }
-        py_args = Py_BuildValue("(OO)", py_qstate, py_response);
-        py_kwargs = Py_BuildValue("{}");
-        if(!(py_args && py_kwargs)) {
-                log_err("pythonmod: BuildValue failure in python_inplace_cb_query_response");
-                goto out;
-        }
-        result = PyObject_Call(func, py_args, py_kwargs);
-        if (result) {
-            res = PyInt_AsLong(result);
-        }
-out:
-        Py_XDECREF(py_qstate);
-        Py_XDECREF(py_response);
-
-        Py_XDECREF(py_args);
-        Py_XDECREF(py_kwargs);
-        Py_XDECREF(result);
-
-        PyGILState_Release(gstate);
-
-        return res;
-    }
-
-    static int register_inplace_cb_query_response(PyObject* py_cb,
-        struct module_env* env, int id)
-    {
-        int ret = inplace_cb_register(python_inplace_cb_query_response,
-            inplace_cb_query_response, (void*) py_cb, env, id);
-        if (ret) Py_INCREF(py_cb);
-        return ret;
-    }
-
-    int python_inplace_cb_edns_back_parsed_call(struct module_qstate* qstate,
-        int id, void* python_callback)
-    {
-        int res = 0;
-        PyObject *func = python_callback;
-        PyObject *py_qstate = NULL;
-        PyObject *py_args = NULL;
-        PyObject *py_kwargs = NULL;
-        PyObject *result = NULL;
-
-        PyGILState_STATE gstate = PyGILState_Ensure();
-
-        py_qstate = SWIG_NewPointerObj((void*) qstate, SWIGTYPE_p_module_qstate, 0);
-        if(!py_qstate) {
-                log_err("pythonmod: swig pointer failure in python_inplace_cb_edns_back_parsed_call");
-                goto out;
-        }
-        py_args = Py_BuildValue("(O)", py_qstate);
-        py_kwargs = Py_BuildValue("{}");
-        if(!(py_args && py_kwargs)) {
-                log_err("pythonmod: BuildValue failure in python_inplace_cb_edns_back_parsed_call");
-                goto out;
-        }
-        result = PyObject_Call(func, py_args, py_kwargs);
-        if (result) {
-            res = PyInt_AsLong(result);
-        }
-out:
-        Py_XDECREF(py_qstate);
-
-        Py_XDECREF(py_args);
-        Py_XDECREF(py_kwargs);
-        Py_XDECREF(result);
-
-        PyGILState_Release(gstate);
-
-        return res;
-    }
-
-    static int register_inplace_cb_edns_back_parsed_call(PyObject* py_cb,
-        struct module_env* env, int id)
-    {
-        int ret = inplace_cb_register(python_inplace_cb_edns_back_parsed_call,
-            inplace_cb_edns_back_parsed, (void*) py_cb, env, id);
-        if (ret) Py_INCREF(py_cb);
-        return ret;
-    }
 %}
 /* C declarations */
 int inplace_cb_register(void* cb, enum inplace_cb_list_type type, void* cbarg,
@@ -1850,7 +1699,3 @@ static int register_inplace_cb_reply_servfail(PyObject* py_cb,
    struct module_env* env, int id);
 static int register_inplace_cb_query(PyObject *py_cb,
    struct module_env* env, int id);
-static int register_inplace_cb_query_response(PyObject *py_cb,
-    struct module_env* env, int id);
-static int register_inplace_cb_edns_back_parsed_call(PyObject *py_cb,
-    struct module_env* env, int id);
@@ -112,34 +112,6 @@ struct pythonmod_qstate {
 	PyObject* data;
 };

-/* The dict from __main__ could have remnants from a previous script
- * invocation, in a multi python module setup. Usually this is fine since newer
- * scripts will update their values. The obvious erroneous case is when mixing
- * python scripts that make use of both 'init' and 'init_standard'. This
- * results in 'init_standard' to persist on following scripts that don't use it
- * (thus not replacing it). This is also problematic in case where a script
- * does not define a required function but a previously loaded script did. The
- * current solution is to make sure to clean offensive remnants that influence
- * further parsing of the individual scripts.
- */
-static void
-clean_python_function_objects(PyObject* dict) {
-	const char* function_names[] = {
-		"init",
-		"init_standard",
-		"deinit",
-		"operate",
-		"inform_super"
-	};
-	size_t i;
-
-	for(i=0; i<sizeof(function_names)/sizeof(function_names[0]); i++) {
-		if(PyDict_GetItemString(dict, function_names[i]) != NULL) {
-			PyDict_DelItemString(dict, function_names[i]);
-		}
-	}
-};
-
 /* Generated */
 #ifndef S_SPLINT_S
 #include "pythonmod/interface.h"
@@ -280,24 +252,13 @@ cleanup:
 	Py_XDECREF(exc_tb);
 }

-/* we only want to unwind Python once at exit */
-static void
-pythonmod_atexit(void)
-{
-   log_assert(py_mod_count == 0);
-   log_assert(mainthr != NULL);
- 
-   PyEval_RestoreThread(mainthr);
-   Py_Finalize();
-}
-
 int pythonmod_init(struct module_env* env, int id)
 {
   int py_mod_idx = py_mod_count++;
-
+    
   /* Initialize module */
   FILE* script_py = NULL;
-   PyObject* py_init_arg = NULL, *res = NULL, *fname = NULL;
+   PyObject* py_init_arg, *res;
   PyGILState_STATE gil;
   int init_standard = 1, i = 0;
 #if PY_MAJOR_VERSION < 3
@@ -331,98 +292,47 @@ int pythonmod_init(struct module_env* env, int id)
   /* Initialize Python libraries */
   if (py_mod_count==1 && !Py_IsInitialized()) 
   {
-#if PY_VERSION_HEX >= 0x03080000
-      PyStatus status;
-      PyPreConfig preconfig;
-      PyConfig config;
-#endif
 #if PY_MAJOR_VERSION >= 3
      wchar_t progname[8];
      mbstowcs(progname, "unbound", 8);
 #else
      char *progname = "unbound";
 #endif
-#if PY_VERSION_HEX < 0x03080000
      Py_SetProgramName(progname);
-#else
-      /* Python must be preinitialized, before the PyImport_AppendInittab
-       * call. */
-      PyPreConfig_InitPythonConfig(&preconfig);
-      status = Py_PreInitialize(&preconfig);
-      if(PyStatus_Exception(status)) {
-	log_err("python exception in Py_PreInitialize: %s%s%s",
-		(status.func?status.func:""), (status.func?": ":""),
-		(status.err_msg?status.err_msg:""));
-	return 0;
-      }
-#endif
+      Py_NoSiteFlag = 1;
 #if PY_MAJOR_VERSION >= 3
      PyImport_AppendInittab(SWIG_name, (void*)SWIG_init);
 #endif
-#if PY_VERSION_HEX < 0x03080000
-      Py_NoSiteFlag = 1;
      Py_Initialize();
-#else
-      PyConfig_InitPythonConfig(&config);
-      status = PyConfig_SetString(&config, &config.program_name, progname);
-      if(PyStatus_Exception(status)) {
-	log_err("python exception in PyConfig_SetString(.. program_name ..): %s%s%s",
-		(status.func?status.func:""), (status.func?": ":""),
-		(status.err_msg?status.err_msg:""));
-	PyConfig_Clear(&config);
-	return 0;
-      }
-      config.site_import = 0;
-      status = Py_InitializeFromConfig(&config);
-      if(PyStatus_Exception(status)) {
-	log_err("python exception in Py_InitializeFromConfig: %s%s%s",
-		(status.func?status.func:""), (status.func?": ":""),
-		(status.err_msg?status.err_msg:""));
-	PyConfig_Clear(&config);
-	return 0;
-      }
-      PyConfig_Clear(&config);
-#endif
 #if PY_MAJOR_VERSION <= 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 6)
      /* initthreads only for python 3.6 and older */
      PyEval_InitThreads();
 #endif
      SWIG_init();
      mainthr = PyEval_SaveThread();
-
-      /* register callback to unwind Python at exit */
-      atexit(pythonmod_atexit);
   }

   gil = PyGILState_Ensure();

   if (py_mod_count==1) {
      /* Initialize Python */
-      if(PyRun_SimpleString("import sys \n") < 0 ) {
-         log_err("pythonmod: cannot initialize core module: unboundmodule.py");
-         goto python_init_fail;
-      }
+      PyRun_SimpleString("import sys \n");
      PyRun_SimpleString("sys.path.append('.') \n");
-      PyRun_SimpleString("sys.path.append('"RUN_DIR"') \n");
-      PyRun_SimpleString("sys.path.append('"SHARE_DIR"') \n");
      if(env->cfg->directory && env->cfg->directory[0]) {
         char wdir[1524];
         snprintf(wdir, sizeof(wdir), "sys.path.append('%s') \n",
         env->cfg->directory);
         PyRun_SimpleString(wdir);
      }
-      if(PyRun_SimpleString("import site\n") < 0) {
-         log_err("pythonmod: cannot initialize core module: unboundmodule.py");
-         goto python_init_fail;
-      }
-      if(PyRun_SimpleString("sys.path.extend(site.getsitepackages())\n") < 0) {
-         log_err("pythonmod: cannot initialize core module: unboundmodule.py");
-         goto python_init_fail;
-      }
-      if(PyRun_SimpleString("from unboundmodule import *\n") < 0)
+      PyRun_SimpleString("sys.path.append('"RUN_DIR"') \n");
+      PyRun_SimpleString("sys.path.append('"SHARE_DIR"') \n");
+      PyRun_SimpleString("import distutils.sysconfig \n");
+      PyRun_SimpleString("sys.path.append(distutils.sysconfig.get_python_lib(1,0)) \n");
+      if (PyRun_SimpleString("from unboundmodule import *\n") < 0)
      {
         log_err("pythonmod: cannot initialize core module: unboundmodule.py");
-         goto python_init_fail;
+         PyGILState_Release(gil);
+         return 0;
      }
   }

@@ -438,32 +348,18 @@ int pythonmod_init(struct module_env* env, int id)
   if (script_py == NULL)
   {
      log_err("pythonmod: can't open file %s for reading", pe->fname);
-      goto python_init_fail;
+      PyGILState_Release(gil);
+      return 0;
   }

   /* Load file */
   pe->module = PyImport_AddModule("__main__");
-   Py_XINCREF(pe->module);
   pe->dict = PyModule_GetDict(pe->module);
-   Py_XINCREF(pe->dict);
-   clean_python_function_objects(pe->dict);
-
   pe->data = PyDict_New();
-   /* add the script filename to the global "mod_env" for trivial access */
-   fname = PyString_FromString(pe->fname);
-   if(PyDict_SetItemString(pe->data, "script", fname) < 0) {
-	log_err("pythonmod: could not add item to dictionary");
-	Py_XDECREF(fname);
-	goto python_init_fail;
-   }
-   Py_XDECREF(fname);
-   Py_XINCREF(pe->data);  /* reference will be stolen below */
-   if(PyModule_AddObject(pe->module, "mod_env", pe->data) < 0) {
-	log_err("pythonmod: could not add mod_env object");
-	Py_XDECREF(pe->data);  /* 2 times, here and on python_init_fail; */
-	                       /* on failure the reference is not stolen */
-	goto python_init_fail;
-   }
+   Py_XINCREF(pe->data);
+   PyModule_AddObject(pe->module, "mod_env", pe->data);
+
+   /* TODO: deallocation of pe->... if an error occurs */

   if (PyRun_SimpleFile(script_py, pe->fname) < 0) {
 #if PY_MAJOR_VERSION <= 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 9)
@@ -494,30 +390,18 @@ int pythonmod_init(struct module_env* env, int id)
      fstr = malloc(flen+1);
      if(!fstr) {
 	      log_err("malloc failure to print parse error");
-
-/* close the file */
-#if PY_MAJOR_VERSION < 3
-	      Py_XDECREF(PyFileObject);
-#else
+	      PyGILState_Release(gil);
 	      fclose(script_py);
-#endif
-
-	      goto python_init_fail;
+	      return 0;
      }
      fseek(script_py, 0, SEEK_SET);
      if(fread(fstr, flen, 1, script_py) < 1) {
 	      log_err("file read failed to print parse error: %s: %s",
 		pe->fname, strerror(errno));
-	      free(fstr);
-
-/* close the file */
-#if PY_MAJOR_VERSION < 3
-	      Py_XDECREF(PyFileObject);
-#else
+	      PyGILState_Release(gil);
 	      fclose(script_py);
-#endif
-
-	      goto python_init_fail;
+	      free(fstr);
+	      return 0;
      }
      fstr[flen] = 0;
      /* we compile the string, but do not run it, to stop side-effects */
@@ -525,26 +409,17 @@ int pythonmod_init(struct module_env* env, int id)
       * that we are expecting */
      (void)Py_CompileString(fstr, pe->fname, Py_file_input);
 #endif
-
      log_py_err();
-
-/* close the file */
-#if PY_MAJOR_VERSION < 3
-      Py_XDECREF(PyFileObject);
-#else
+      PyGILState_Release(gil);
      fclose(script_py);
-#endif
-
 #if PY_MAJOR_VERSION <= 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 9)
      /* no cleanup needed for python before 3.9 */
 #else
      /* cleanup for python 3.9 and newer */
      free(fstr);
 #endif
-      goto python_init_fail;
+      return 0;
   }
-
-/* close the file */
 #if PY_MAJOR_VERSION < 3
   Py_XDECREF(PyFileObject);
 #else
@@ -557,28 +432,28 @@ int pythonmod_init(struct module_env* env, int id)
      if ((pe->func_init = PyDict_GetItemString(pe->dict, "init")) == NULL)
      {
         log_err("pythonmod: function init is missing in %s", pe->fname);
-         goto python_init_fail;
+         PyGILState_Release(gil);
+         return 0;
      }
   }
-   Py_XINCREF(pe->func_init);
   if ((pe->func_deinit = PyDict_GetItemString(pe->dict, "deinit")) == NULL)
   {
      log_err("pythonmod: function deinit is missing in %s", pe->fname);
-      goto python_init_fail;
+      PyGILState_Release(gil);
+      return 0;
   }
-   Py_XINCREF(pe->func_deinit);
   if ((pe->func_operate = PyDict_GetItemString(pe->dict, "operate")) == NULL)
   {
      log_err("pythonmod: function operate is missing in %s", pe->fname);
-      goto python_init_fail;
+      PyGILState_Release(gil);
+      return 0;
   }
-   Py_XINCREF(pe->func_operate);
   if ((pe->func_inform = PyDict_GetItemString(pe->dict, "inform_super")) == NULL)
   {
      log_err("pythonmod: function inform_super is missing in %s", pe->fname);
-      goto python_init_fail;
+      PyGILState_Release(gil);
+      return 0;
   }
-   Py_XINCREF(pe->func_inform);

   if (init_standard)
   {
@@ -594,31 +469,21 @@ int pythonmod_init(struct module_env* env, int id)
   {
      log_err("pythonmod: Exception occurred in function init");
      log_py_err();
-      goto python_init_fail;
+      Py_XDECREF(res);
+      Py_XDECREF(py_init_arg);
+      PyGILState_Release(gil);
+      return 0;
   }

   Py_XDECREF(res);
   Py_XDECREF(py_init_arg);
   PyGILState_Release(gil);
-   return 1;

-python_init_fail:
-   Py_XDECREF(pe->module);
-   Py_XDECREF(pe->dict);
-   Py_XDECREF(pe->data);
-   Py_XDECREF(pe->func_init);
-   Py_XDECREF(pe->func_deinit);
-   Py_XDECREF(pe->func_operate);
-   Py_XDECREF(pe->func_inform);
-   Py_XDECREF(res);
-   Py_XDECREF(py_init_arg);
-   PyGILState_Release(gil);
-   return 0;
+   return 1;
 }

 void pythonmod_deinit(struct module_env* env, int id)
 {
-   int cbtype;
   struct pythonmod_env* pe = env->modinfo[id];
   if(pe == NULL)
      return;
@@ -638,24 +503,18 @@ void pythonmod_deinit(struct module_env* env, int id)
      /* Free result if any */
      Py_XDECREF(res);
      /* Free shared data if any */
-      Py_XDECREF(pe->module);
-      Py_XDECREF(pe->dict);
      Py_XDECREF(pe->data);
-      Py_XDECREF(pe->func_init);
-      Py_XDECREF(pe->func_deinit);
-      Py_XDECREF(pe->func_inform);
-      Py_XDECREF(pe->func_operate);
      PyGILState_Release(gil);

-      py_mod_count--;
+      if(--py_mod_count==0) {
+         PyEval_RestoreThread(mainthr);
+         Py_Finalize();
+         mainthr = NULL;
+      }
   }
   pe->fname = NULL;
   free(pe);

-   /* iterate over all possible callback types and clean up each in turn */
-   for (cbtype = 0; cbtype < inplace_cb_types_total; cbtype++)
-      inplace_cb_delete(env, cbtype, id);
-
   /* Module is deallocated in Python */
   env->modinfo[id] = NULL;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
TCY16	8c96e26074	modify tdir to ignore localzone tests	2022-01-13 14:50:43 +01:00
Willem Toorop	9ae988cea6	Merge branch 'master' into review-rfc8914-ede	2022-01-11 09:26:49 +01:00
TCY16	80957b6da3	remove debug line	2022-01-10 16:28:54 +01:00
TCY16	69e188b5cf	fix missing disable in remote-control local_zone do_ede and typos	2021-12-22 15:47:50 +01:00
TCY16	49f2960089	add remote control options for local-zone and RPZ do_ede	2021-12-22 14:39:06 +01:00
TCY16	94f04a77d9	remove superfluous linebreaks	2021-12-21 13:17:57 +01:00
TCY16	fe8ef6e53d	add logic for per zone EDE for RPZ and configurable rpz-do-ede	2021-12-21 13:17:07 +01:00
TCY16	79024484a7	Document how the log-val-level: config options influences the returned EDE option text	2021-12-16 11:45:18 +01:00
TCY16	05e06fdcf5	fix rpl tests	2021-12-15 14:59:45 +01:00
tcarpayandGitHub	df229db074	Merge branch 'master' into features/rfc8914-ede	2021-12-15 13:07:01 +01:00
TCY16	4f37d6489e	fix DNSSEC nsec-failure test	2021-12-15 12:49:54 +01:00
TCY16	ea1a5f35e4	add todo for tests and fix EDE codes for DNSKEY missing	2021-12-15 12:29:11 +01:00
Tom Carpay	dc38aacefc	expand ede.tdir to do validator test for DNSKEY, RRSIG and NSEC missing	2021-12-15 11:05:45 +00:00
TCY16	63e6604b2a	add config options to test conf, fix local-zone EDE printing logic, and fix typo in the unbound.conf	2021-12-07 13:25:32 +01:00
TCY16	65ee2f2c39	finish up adding validator EDEs and other TODOs and fix tests with more specific EDE codes	2021-12-06 14:19:28 +01:00
TCY16	db98a8b825	add ede-local-zones in the manpage and update the iana_ports.inc for some reason	2021-11-30 12:12:57 +01:00
TCY16	3ccb4c6c26	change local-zone-default-ede keywords to '-', add missing {}, and add manpage entry for local-zone-do-ede, local-zone-default-ede, and ede-local-zones	2021-11-30 11:32:01 +01:00
TCY16	ff356b940b	add error in case of incorrect string for local-zone-default-ede	2021-11-26 15:35:53 +01:00
TCY16	7926874669	add config option for global EDE flag, local-zone specific EDE flag and default EDE code for a zone	2021-11-26 15:12:56 +01:00
TCY16	575a6865be	add forgotten autogenerated files	2021-11-19 11:55:13 +01:00
TCY16	0572870592	change do_ede to be local-zone specific and add places for more EDE codes	2021-11-19 11:27:13 +01:00
Tom Carpay	0747d016e4	add missing parsing	2021-11-16 13:21:03 +00:00
TCY16	4a43aee99e	setup for configurable EDEs for local-zone	2021-11-16 11:25:58 +01:00
Tom Carpay	a3171a1d48	remove superfluous EDE left over from merge	2021-11-16 08:25:53 +00:00
Tom Carpay	f22e42f554	Fix merge bugs	2021-11-15 15:00:35 +00:00
Tom Carpay	787d7a5952	Merge branch 'master' into features/rfc8914-ede	2021-11-15 14:48:35 +00:00
TCY16	0eba781ed3	make local_data ede inclusion configurable, rewrite local_error_encode to include this logic, and remove superfluous msgparse_check_edns_in_packet function	2021-11-10 16:58:54 +01:00
TCY16	df984d9c6f	add dnssec ede tests	2021-10-18 16:45:42 +02:00
George Thessalonikefs	fed0fb42dd	- Fix testcode, 0 is a valid EDE INFO-CODE.	2021-10-14 14:01:39 +02:00
TCY16	abd948f3d7	change unittests to match just the ede code	2021-10-13 15:28:10 +02:00
George Thessalonikefs	f7bb7f2a94	Merge branch 'features/rfc8914-ede' of github.com:NLnetLabs/unbound into features/rfc8914-ede	2021-10-13 12:02:29 +02:00
George Thessalonikefs	9bff0b94dd	- Introduce 'ede=<info-code>' and 'all_noedns' as options in the MATCH line for replay test packets.	2021-10-13 12:01:36 +02:00
TCY16	d2a719f606	add test setup for DNSSEC EDEs	2021-10-13 11:17:42 +02:00
TCY16	b825bb668d	add more tests	2021-10-08 15:55:40 +02:00
TCY16	8a6b3f088b	add DNSKEY EDE code	2021-10-08 15:54:10 +02:00
TCY16	86e8050352	add EDE responses to unittests	2021-10-01 14:46:29 +02:00
TCY16	c42c2cbbff	add EDE response to autotrust_init_failsig test	2021-09-30 16:56:50 +02:00
TCY16	7df2df0fc9	add EDE response to autotrust_init_fail test	2021-09-30 16:39:40 +02:00
TCY16	320aa64d18	add QDCOUNT=0 to CHAOS query in ACL	2021-09-29 12:54:41 +02:00
TCY16	3ba8ea321a	fix CH class response	2021-09-28 16:35:50 +02:00
TCY16	42ba5ae4a2	process @wcawijngaards' comments v2	2021-09-28 13:48:36 +02:00
TCY16	732ad94729	process @wcawijngaards' comments	2021-09-28 13:28:25 +02:00
TCY16	84da2409b3	change strncpy to memmove at @wcawijngaards' suggestion	2021-09-28 10:05:47 +02:00
Tom Carpay	0b376cc42f	add routine to add EDE to ACL:refused at correct location	2021-09-27 14:17:21 +00:00
Tom Carpay	b606c8273d	Merge branch 'features/rfc8914-ede' of github.com:NLnetLabs/unbound into features/rfc8914-ede	2021-09-20 09:42:47 +00:00
TCY16	4df2965459	add forgotten compile error fixes from previous commit	2021-09-20 11:42:39 +02:00
Tom Carpay	65852bcbc4	Merge branch 'features/rfc8914-ede' of github.com:NLnetLabs/unbound into features/rfc8914-ede	2021-09-20 09:35:30 +00:00
TCY16	4d15603a8c	add routine to do EDE on ACL blocked messages	2021-09-20 11:35:00 +02:00
Tom Carpay	5617de6867	Answer LDNS_EDE_RRSIGS_MISSING for normal answers with missing signatures	2021-09-15 10:15:35 +00:00
TCY16	3576033b62	add possible EDE spots	2021-09-15 11:17:04 +02:00
Tom Carpay	a664e8cec4	First step towards specific EDE DNSSEC errors	2021-09-14 07:45:51 +00:00
TCY16	2360120562	add mesh bogus test, possible locations for more EDE and remove superfluous todo comments	2021-09-13 13:25:17 +02:00
TCY16	9df75a842b	add DNSSEC indeterminate EDE and DNAME expansion test	2021-09-08 16:38:33 +02:00
Tom Carpay	7079f0b5aa	add ede to always_refuse and always_null	2021-09-06 13:13:49 +00:00
tcarpay	33445be8df	add setup of RPZ and full tests of earlier implemented EDEs	2021-08-31 15:22:44 +02:00
tcarpay	fba1c302ac	add localzones test	2021-08-23 14:26:32 +02:00
tcarpay	ec4cf69eb7	set up for tpkg test	2021-08-23 14:00:04 +02:00
tcarpay	d9a947f267	Merge branch 'master' into features/rfc8914-ede	2021-08-20 16:28:27 +02:00
Tom Carpay	a98659791e	EDE Blocked with local-zone refused answers	2021-08-19 14:31:03 +00:00
Tom Carpay	5fff0f7e30	Fix dont echo edns0 option list ... when refusing to answer authoritatively. Also remove TODO comments that were already done	2021-08-19 14:28:26 +00:00
Tom Carpay	935634dcae	Revert "add local anwser blocked" This reverts commit `b3f60db184`.	2021-08-19 14:21:10 +00:00
tcarpay	b3f60db184	add local anwser blocked	2021-08-19 14:01:14 +02:00
Tom Carpay	a9e6f6bc23	add variable bogus reason	2021-08-17 14:10:48 +00:00
Tom Carpay	6b5f314a3a	Show reason when returning EDE_DNSSEC_BOGUS	2021-08-16 13:36:45 +00:00
Tom Carpay	eac4eb3a9e	Return EDE_DNSSEC_BOGUS when returning bogus answers	2021-08-16 12:46:24 +00:00
Tom Carpay	0703a38243	Fix: use EDE codes with EDNS_OPT_APPEND_EDE + complete EDE codes	2021-08-16 09:59:13 +00:00
tcarpay	4049885da2	add locations for EDE errors	2021-08-13 12:01:28 +02:00
Willem Toorop	a8d78b2083	Simple EDE example	2021-06-24 12:55:46 +02:00
Willem Toorop	285f93ff82	Add EDE EDNS0 Option code	2021-06-24 11:20:58 +02:00