From 5b9881675177db49329a0fd53117f98303b465cc Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 26 Sep 2022 15:51:28 +0200
Subject: [PATCH 01/25] - Better output for skipped tdir tests.

---
 doc/Changelog         | 3 +++
 testcode/mini_tdir.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 824674488..bbcef6f31 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+26 September 2022: George
+	- Better output for skipped tdir tests.
+
 21 September 2022: Wouter
 	- Patch for CVE-2022-3204 Non-Responsive Delegation Attack.
 	- This patch was released in 1.16.3, the code repository continues
diff --git a/testcode/mini_tdir.sh b/testcode/mini_tdir.sh
index 55c24c107..46914b38a 100755
--- a/testcode/mini_tdir.sh
+++ b/testcode/mini_tdir.sh
@@ -163,6 +163,7 @@ if test -f $name.pre; then
 	if test $exit_value -eq 3; then
 		echo "$name: SKIPPED" >> $result
 		echo "$name: SKIPPED" > ../$skip
+		echo "$name: SKIPPED"
 	elif test $exit_value -ne 0; then
 		echo "Warning: $name.pre did not exit successfully"
 	fi

From a102fb1df888d8a5eee07b7cc3f8f1d6d4cda840 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 3 Oct 2022 09:53:41 +0200
Subject: [PATCH 02/25] - Fix to remove erroneous TC flag from TCP upstream.

---
 doc/Changelog                                 |   3 +
 iterator/iterator.c                           |   2 +
 testdata/iter_auth_tc.rpl                     | 123 ++++++++++++++++++
 testdata/stub_auth_tc.tdir/stub_auth_tc.conf  |  16 +++
 testdata/stub_auth_tc.tdir/stub_auth_tc.dsc   |  16 +++
 testdata/stub_auth_tc.tdir/stub_auth_tc.post  |  11 ++
 testdata/stub_auth_tc.tdir/stub_auth_tc.pre   |  31 +++++
 testdata/stub_auth_tc.tdir/stub_auth_tc.test  |  26 ++++
 .../stub_auth_tc.tdir/stub_auth_tc.testns     |  26 ++++
 9 files changed, 254 insertions(+)
 create mode 100644 testdata/iter_auth_tc.rpl
 create mode 100644 testdata/stub_auth_tc.tdir/stub_auth_tc.conf
 create mode 100644 testdata/stub_auth_tc.tdir/stub_auth_tc.dsc
 create mode 100644 testdata/stub_auth_tc.tdir/stub_auth_tc.post
 create mode 100644 testdata/stub_auth_tc.tdir/stub_auth_tc.pre
 create mode 100644 testdata/stub_auth_tc.tdir/stub_auth_tc.test
 create mode 100644 testdata/stub_auth_tc.tdir/stub_auth_tc.testns

diff --git a/doc/Changelog b/doc/Changelog
index bbcef6f31..2c9ed1aba 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+3 October 2022: Wouter
+	- Fix to remove erroneous TC flag from TCP upstream.
+
 26 September 2022: George
 	- Better output for skipped tdir tests.
 
diff --git a/iterator/iterator.c b/iterator/iterator.c
index da9b7990c..b99b188e6 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -3990,6 +3990,8 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
 
 	/* remove CD-bit, we asked for in case we handle validation ourself */
 	prs->flags &= ~BIT_CD;
+	/* remove TC flag, if this is erroneously set by TCP upstream */
+	prs->flags &= ~BIT_TC;
 
 	/* normalize and sanitize: easy to delete items from linked lists */
 	if(!scrub_message(pkt, prs, &iq->qinfo_out, iq->dp->name, 
diff --git a/testdata/iter_auth_tc.rpl b/testdata/iter_auth_tc.rpl
new file mode 100644
index 000000000..2136ca8b0
--- /dev/null
+++ b/testdata/iter_auth_tc.rpl
@@ -0,0 +1,123 @@
+; config options
+server:
+	target-fetch-policy: "0 0 0 0 0"
+	qname-minimisation: "no"
+	minimal-responses: no
+
+stub-zone:
+	name: "."
+	stub-addr: 193.0.14.129 	# K.ROOT-SERVERS.NET.
+CONFIG_END
+
+SCENARIO_BEGIN Test authoritative response with erroneous TC flag
+
+; K.ROOT-SERVERS.NET.
+RANGE_BEGIN 0 100
+	ADDRESS 193.0.14.129
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+. IN NS
+SECTION ANSWER
+. IN NS	K.ROOT-SERVERS.NET.
+SECTION ADDITIONAL
+K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION AUTHORITY
+com.	IN NS	a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.	IN 	A	192.5.6.30
+ENTRY_END
+RANGE_END
+
+; a.gtld-servers.net.
+RANGE_BEGIN 0 100
+	ADDRESS 192.5.6.30
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+com. IN NS
+SECTION ANSWER
+com.	IN NS	a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.	IN 	A	192.5.6.30
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION AUTHORITY
+example.com.	IN NS	ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.		IN 	A	1.2.3.4
+ENTRY_END
+RANGE_END
+
+; ns.example.com.
+RANGE_BEGIN 0 100
+	ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+example.com. IN NS
+SECTION ANSWER
+example.com.	IN NS	ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.		IN 	A	1.2.3.4
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+; erroneous TC flag here
+REPLY QR TC NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A	10.20.30.40
+SECTION AUTHORITY
+example.com.	IN NS	ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.		IN 	A	1.2.3.4
+ENTRY_END
+RANGE_END
+
+STEP 1 QUERY
+ENTRY_BEGIN
+REPLY RD
+SECTION QUESTION
+www.example.com. IN A
+ENTRY_END
+
+; recursion happens here.
+STEP 10 CHECK_ANSWER
+ENTRY_BEGIN
+MATCH all
+REPLY QR RD RA NOERROR
+SECTION QUESTION
+www.example.com. IN A
+SECTION ANSWER
+www.example.com. IN A	10.20.30.40
+SECTION AUTHORITY
+example.com.	IN NS	ns.example.com.
+SECTION ADDITIONAL
+ns.example.com.		IN 	A	1.2.3.4
+ENTRY_END
+
+SCENARIO_END
diff --git a/testdata/stub_auth_tc.tdir/stub_auth_tc.conf b/testdata/stub_auth_tc.tdir/stub_auth_tc.conf
new file mode 100644
index 000000000..b74942799
--- /dev/null
+++ b/testdata/stub_auth_tc.tdir/stub_auth_tc.conf
@@ -0,0 +1,16 @@
+server:
+	verbosity: 4
+	# num-threads: 1
+	interface: 127.0.0.1
+	port: @PORT@
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+
+stub-zone:
+	name: "example.com"
+	stub-addr: "127.0.0.1@@TOPORT@"
+
diff --git a/testdata/stub_auth_tc.tdir/stub_auth_tc.dsc b/testdata/stub_auth_tc.tdir/stub_auth_tc.dsc
new file mode 100644
index 000000000..1f71961f1
--- /dev/null
+++ b/testdata/stub_auth_tc.tdir/stub_auth_tc.dsc
@@ -0,0 +1,16 @@
+BaseName: stub_auth_tc
+Version: 1.0
+Description: Authority reply with erroneous TC in TCP
+CreationDate: Mon Oct  3 09:11:32 CEST 2022
+Maintainer: dr. W.C.A. Wijngaards
+Category:
+Component:
+CmdDepends:
+Depends:
+Help:
+Pre: stub_auth_tc.pre
+Post: stub_auth_tc.post
+Test: stub_auth_tc.test
+AuxFiles:
+Passed:
+Failure:
diff --git a/testdata/stub_auth_tc.tdir/stub_auth_tc.post b/testdata/stub_auth_tc.tdir/stub_auth_tc.post
new file mode 100644
index 000000000..907a885e4
--- /dev/null
+++ b/testdata/stub_auth_tc.tdir/stub_auth_tc.post
@@ -0,0 +1,11 @@
+# #-- stub_auth_tc.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $FWD_PID
+kill_pid $UNBOUND_PID
+
diff --git a/testdata/stub_auth_tc.tdir/stub_auth_tc.pre b/testdata/stub_auth_tc.tdir/stub_auth_tc.pre
new file mode 100644
index 000000000..2f7e317bc
--- /dev/null
+++ b/testdata/stub_auth_tc.tdir/stub_auth_tc.pre
@@ -0,0 +1,31 @@
+# #-- stub_auth_tc.pre--#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+. ../common.sh
+get_random_port 2
+UNBOUND_PORT=$RND_PORT
+FWD_PORT=$(($RND_PORT + 1))
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+
+# start forwarder
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT stub_auth_tc.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# make config file
+sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < stub_auth_tc.conf > ub.conf
+# start unbound in the background
+PRE="../.."
+$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+cat .tpkg.var.test
+wait_ldns_testns_up fwd.log
+wait_unbound_up unbound.log
+
diff --git a/testdata/stub_auth_tc.tdir/stub_auth_tc.test b/testdata/stub_auth_tc.tdir/stub_auth_tc.test
new file mode 100644
index 000000000..2d3df5365
--- /dev/null
+++ b/testdata/stub_auth_tc.tdir/stub_auth_tc.test
@@ -0,0 +1,26 @@
+# #-- stub_auth_tc.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+PRE="../.."
+# do the test
+echo "> dig www.example.com."
+dig @localhost -p $UNBOUND_PORT www.example.com. | tee outfile
+echo "> cat logfiles"
+cat fwd.log
+cat unbound.log
+echo "> check answer"
+if grep "10.20.30.42" outfile; then
+	echo "OK"
+else
+	echo "Not OK"
+	exit 1
+fi
+if grep "flags:" outfile | grep " tc "; then
+	echo "Not OK, TC flag in output"
+	exit 1
+fi
+
+exit 0
diff --git a/testdata/stub_auth_tc.tdir/stub_auth_tc.testns b/testdata/stub_auth_tc.tdir/stub_auth_tc.testns
new file mode 100644
index 000000000..f2829add4
--- /dev/null
+++ b/testdata/stub_auth_tc.tdir/stub_auth_tc.testns
@@ -0,0 +1,26 @@
+; nameserver test file
+$ORIGIN example.com.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname UDP
+REPLY QR AA TC NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www	IN	A
+SECTION ANSWER
+www	IN	A	10.20.30.40
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname TCP
+; erroneous TC flag here.
+REPLY QR AA TC NOERROR
+ADJUST copy_id
+SECTION QUESTION
+www	IN	A
+SECTION ANSWER
+www	IN	A	10.20.30.40
+www	IN	A	10.20.30.41
+www	IN	A	10.20.30.42
+ENTRY_END

From 9842fbf7602875b15de63aefc9ddce3278537877 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 3 Oct 2022 10:26:30 +0200
Subject: [PATCH 03/25] - Fix test tdir skip report printout.

---
 doc/Changelog         | 1 +
 testcode/mini_tdir.sh | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 2c9ed1aba..2044e1b43 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 3 October 2022: Wouter
 	- Fix to remove erroneous TC flag from TCP upstream.
+	- Fix test tdir skip report printout.
 
 26 September 2022: George
 	- Better output for skipped tdir tests.
diff --git a/testcode/mini_tdir.sh b/testcode/mini_tdir.sh
index 46914b38a..3b0719369 100755
--- a/testcode/mini_tdir.sh
+++ b/testcode/mini_tdir.sh
@@ -56,7 +56,7 @@ if test "$1" = "-f" && test "$2" = "report"; then
 			fi
 		elif test -f ".skip-$name"; then
 			echo ".. SKIPPED.. $timelen $name: $desc"
-			skip=`expr $pass + 1`
+			skip=`expr $skip + 1`
 		else
 			if test -f "result.$name"; then
 				echo "!! FAILED !! $timelen $name: $desc"
@@ -92,7 +92,9 @@ if test "$1" = "report" || test "$2" = "report"; then
 			if test -f "result.$name"; then
 				echo "!! FAILED !! : $name"
 			else
-				echo ".. SKIPPED.. : $name"
+				if test $quiet = 0; then
+					echo ".. SKIPPED.. : $name"
+				fi
 			fi
 		fi
 	done

From 7d96a7e3fee775895a2f7faf370344a2d3fdd642 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 3 Oct 2022 15:03:50 +0200
Subject: [PATCH 04/25] - Fix windows compile, the identifier interface is
 defined in headers.

---
 daemon/acl_list.c | 6 +++---
 doc/Changelog     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/daemon/acl_list.c b/daemon/acl_list.c
index 8e8e1fc9b..f3961dbbb 100644
--- a/daemon/acl_list.c
+++ b/daemon/acl_list.c
@@ -197,7 +197,7 @@ acl_find_or_create(struct acl_list* acl, struct sockaddr_storage* addr,
 
 /** apply acl_interface string */
 static int
-acl_interface_str_cfg(struct acl_list* acl_interface, const char* interface,
+acl_interface_str_cfg(struct acl_list* acl_interface, const char* iface,
 	const char* s2, int port)
 {
 	struct acl_addr* node;
@@ -205,9 +205,9 @@ acl_interface_str_cfg(struct acl_list* acl_interface, const char* interface,
 	if(!parse_acl_access(s2, &control)) {
 		return 0;
 	}
-	if(!(node=acl_find_or_create_str2addr(acl_interface, interface, 1, port))) {
+	if(!(node=acl_find_or_create_str2addr(acl_interface, iface, 1, port))) {
 		log_err("cannot update ACL on non-configured interface: %s %d",
-			interface, port);
+			iface, port);
 		return 0;
 	}
 	node->control = control;
diff --git a/doc/Changelog b/doc/Changelog
index 2044e1b43..5ddf73183 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 3 October 2022: Wouter
 	- Fix to remove erroneous TC flag from TCP upstream.
 	- Fix test tdir skip report printout.
+	- Fix windows compile, the identifier interface is defined in headers.
 
 26 September 2022: George
 	- Better output for skipped tdir tests.

From c4e51a4cfe4d5320341ebb9e3b0965aa2003c467 Mon Sep 17 00:00:00 2001
From: Yorgos Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 3 Oct 2022 15:29:47 +0200
Subject: [PATCH 05/25] PROXYv2 downstream support (#760)

---
 Makefile.in                                   |    8 +-
 daemon/remote.c                               |    6 +-
 daemon/stats.c                                |    2 +-
 daemon/worker.c                               |  143 +-
 doc/example.conf.in                           |    4 +
 doc/unbound.conf.5.in                         |   11 +
 edns-subnet/subnetmod.c                       |    2 +-
 iterator/iterator.c                           |   48 +-
 pythonmod/interface.i                         |    4 +-
 pythonmod/pythonmod_utils.c                   |    8 +-
 respip/respip.c                               |   10 +-
 respip/respip.h                               |    6 +-
 services/cache/infra.c                        |   33 +-
 services/cache/infra.h                        |    7 +-
 services/listen_dnsport.c                     |   66 +-
 services/listen_dnsport.h                     |    5 +-
 services/localzone.c                          |   12 +-
 services/mesh.c                               |   13 +-
 services/outside_network.c                    |   26 +-
 services/rpz.c                                |   14 +-
 smallapp/unbound-checkconf.c                  |   16 +-
 testcode/do-tests.sh                          |    2 +-
 testcode/fake_event.c                         |   19 +-
 testcode/streamtcp.c                          |  128 +-
 testdata/04-checkconf.tdir/04-checkconf.test  |   10 +
 .../04-checkconf.tdir/bad.proxy-and-dnscrypt  |    5 +
 .../04-checkconf.tdir/bad.proxy-and-https     |    4 +
 .../proxy_protocol.tdir/proxy_protocol.conf   |   34 +
 .../proxy_protocol.tdir/proxy_protocol.dsc    |   16 +
 .../proxy_protocol.tdir/proxy_protocol.post   |   12 +
 .../proxy_protocol.tdir/proxy_protocol.pre    |   66 +
 .../proxy_protocol.tdir/proxy_protocol.test   |   12 +
 .../proxy_protocol.test.scenario              |  193 +
 .../proxy_protocol.tdir/proxy_protocol.testns |   23 +
 .../proxy_protocol.tdir/unbound_server.key    |   39 +
 .../proxy_protocol.tdir/unbound_server.pem    |   22 +
 util/config_file.c                            |   35 +
 util/config_file.h                            |    8 +
 util/configlexer.c                            | 5505 +++++++++--------
 util/configlexer.lex                          |    1 +
 util/configparser.c                           | 3542 +++++------
 util/configparser.h                           |    6 +-
 util/configparser.y                           |   12 +-
 util/netevent.c                               |  649 +-
 util/netevent.h                               |   40 +-
 util/proxy_protocol.c                         |  139 +
 util/proxy_protocol.h                         |  131 +
 47 files changed, 6224 insertions(+), 4873 deletions(-)
 create mode 100644 testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt
 create mode 100644 testdata/04-checkconf.tdir/bad.proxy-and-https
 create mode 100644 testdata/proxy_protocol.tdir/proxy_protocol.conf
 create mode 100644 testdata/proxy_protocol.tdir/proxy_protocol.dsc
 create mode 100644 testdata/proxy_protocol.tdir/proxy_protocol.post
 create mode 100644 testdata/proxy_protocol.tdir/proxy_protocol.pre
 create mode 100644 testdata/proxy_protocol.tdir/proxy_protocol.test
 create mode 100644 testdata/proxy_protocol.tdir/proxy_protocol.test.scenario
 create mode 100644 testdata/proxy_protocol.tdir/proxy_protocol.testns
 create mode 100644 testdata/proxy_protocol.tdir/unbound_server.key
 create mode 100644 testdata/proxy_protocol.tdir/unbound_server.pem
 create mode 100644 util/proxy_protocol.c
 create mode 100644 util/proxy_protocol.h

diff --git a/Makefile.in b/Makefile.in
index 3189731ad..e7c76c258 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,7 +130,7 @@ 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/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/timehist.c util/tube.c util/proxy_protocol.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 \
@@ -148,7 +148,7 @@ outbound_list.lo alloc.lo config_file.lo configlexer.lo configparser.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 \
+autotrust.lo val_anchor.lo rpz.lo proxy_protocol.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) \
@@ -984,6 +984,8 @@ netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/neteve
  $(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
+proxy_protocol.lo proxy_protocol.o: $(srcdir)/util/proxy_protocol.c config.h \
+ $(srcdir)/util/proxy_protocol.h $(srcdir)/sldns/sbuffer.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 \
@@ -1512,7 +1514,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/data/msgencode.h $(srcdir)/util/data/msgparse.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/proxy_protocol.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgparse.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h
diff --git a/daemon/remote.c b/daemon/remote.c
index ec7a4d5d9..7d4a41400 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -494,8 +494,8 @@ int remote_accept_callback(struct comm_point* c, void* arg, int err,
 	n->c->do_not_close = 0;
 	comm_point_stop_listening(n->c);
 	comm_point_start_listening(n->c, -1, REMOTE_CONTROL_TCP_TIMEOUT);
-	memcpy(&n->c->repinfo.addr, &addr, addrlen);
-	n->c->repinfo.addrlen = addrlen;
+	memcpy(&n->c->repinfo.remote_addr, &addr, addrlen);
+	n->c->repinfo.remote_addrlen = addrlen;
 	if(rc->use_cert) {
 		n->shake_state = rc_hs_read;
 		n->ssl = SSL_new(rc->ctx);
@@ -3304,7 +3304,7 @@ remote_handshake_later(struct daemon_remote* rc, struct rc_state* s,
 		if(r == 0)
 			log_err("remote control connection closed prematurely");
 		log_addr(VERB_OPS, "failed connection from",
-			&s->c->repinfo.addr, s->c->repinfo.addrlen);
+			&s->c->repinfo.remote_addr, s->c->repinfo.remote_addrlen);
 		log_crypto_err("remote control failed ssl");
 		clean_point(rc, s);
 	}
diff --git a/daemon/stats.c b/daemon/stats.c
index fde411a1e..6b3834977 100644
--- a/daemon/stats.c
+++ b/daemon/stats.c
@@ -521,7 +521,7 @@ void server_stats_insquery(struct ub_server_stats* stats, struct comm_point* c,
 				stats->qhttps++;
 		}
 	}
-	if(repinfo && addr_is_ip6(&repinfo->addr, repinfo->addrlen))
+	if(repinfo && addr_is_ip6(&repinfo->remote_addr, repinfo->remote_addrlen))
 		stats->qipv6++;
 	if( (flags&BIT_QR) )
 		stats->qbit_QR++;
diff --git a/daemon/worker.c b/daemon/worker.c
index 29c1961ed..6b188047f 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -547,7 +547,8 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
 static int
 apply_respip_action(struct worker* worker, const struct query_info* qinfo,
 	struct respip_client_info* cinfo, struct reply_info* rep,
-	struct comm_reply* repinfo, struct ub_packed_rrset_key** alias_rrset,
+	struct sockaddr_storage* addr, socklen_t addrlen,
+	struct ub_packed_rrset_key** alias_rrset,
 	struct reply_info** encode_repp, struct auth_zones* az)
 {
 	struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL};
@@ -574,7 +575,7 @@ apply_respip_action(struct worker* worker, const struct query_info* qinfo,
 	if(actinfo.addrinfo) {
 		respip_inform_print(&actinfo, qinfo->qname,
 			qinfo->qtype, qinfo->qclass, qinfo->local_alias,
-			repinfo);
+			addr, addrlen);
 
 		if(worker->stats.extended && actinfo.rpz_used) {
 			if(actinfo.rpz_disabled)
@@ -703,7 +704,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
 	*alias_rrset = NULL; /* avoid confusion if caller set it to non-NULL */
 	if((worker->daemon->use_response_ip || worker->daemon->use_rpz) &&
 		!partial_rep && !apply_respip_action(worker, qinfo, cinfo, rep,
-		repinfo, alias_rrset,
+		&repinfo->client_addr, repinfo->client_addrlen, alias_rrset,
 		&encode_rep, worker->env.auth_zones)) {
 		goto bail_out;
 	} else if(partial_rep &&
@@ -991,12 +992,14 @@ answer_chaos(struct worker* w, struct query_info* qinfo,
  * @param w: worker
  * @param qinfo: query info. Pointer into packet buffer.
  * @param edns: edns info from query.
- * @param repinfo: reply info with source address.
+ * @param addr: client address.
+ * @param addrlen: client address length.
  * @param pkt: packet buffer.
  */
 static void
-answer_notify(struct worker* w, struct query_info* qinfo, 
-	struct edns_data* edns, sldns_buffer* pkt, struct comm_reply* repinfo)
+answer_notify(struct worker* w, struct query_info* qinfo,
+	struct edns_data* edns, sldns_buffer* pkt,
+	struct sockaddr_storage* addr, socklen_t addrlen)
 {
 	int refused = 0;
 	int rcode = LDNS_RCODE_NOERROR;
@@ -1005,8 +1008,8 @@ answer_notify(struct worker* w, struct query_info* qinfo,
 	if(!w->env.auth_zones) return;
 	has_serial = auth_zone_parse_notify_serial(pkt, &serial);
 	if(auth_zones_notify(w->env.auth_zones, &w->env, qinfo->qname,
-		qinfo->qname_len, qinfo->qclass, &repinfo->addr,
-		repinfo->addrlen, has_serial, serial, &refused)) {
+		qinfo->qname_len, qinfo->qclass, addr,
+		addrlen, has_serial, serial, &refused)) {
 		rcode = LDNS_RCODE_NOERROR;
 	} else {
 		if(refused)
@@ -1031,7 +1034,7 @@ answer_notify(struct worker* w, struct query_info* qinfo,
 				"servfail for NOTIFY %sfor %s from", sr, zname);
 		else	snprintf(buf, sizeof(buf),
 				"received NOTIFY %sfor %s from", sr, zname);
-		log_addr(VERB_DETAIL, buf, &repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_DETAIL, buf, addr, addrlen);
 	}
 	edns->edns_version = EDNS_ADVERTISED_VERSION;
 	edns->udp_size = EDNS_ADVERTISED_SIZE;
@@ -1051,8 +1054,8 @@ deny_refuse(struct comm_point* c, enum acl_access acl,
 {
 	if(acl == deny) {
 		if(verbosity >= VERB_ALGO) {
-			log_acl_action("dropped", &repinfo->addr,
-				repinfo->addrlen, acl, acladdr);
+			log_acl_action("dropped", &repinfo->client_addr,
+				repinfo->client_addrlen, acl, acladdr);
 			log_buf(VERB_ALGO, "dropped", c->buffer);
 		}
 		comm_point_drop_reply(repinfo);
@@ -1063,8 +1066,8 @@ deny_refuse(struct comm_point* c, enum acl_access acl,
 		size_t opt_rr_mark;
 
 		if(verbosity >= VERB_ALGO) {
-			log_acl_action("refused", &repinfo->addr,
-				repinfo->addrlen, acl, acladdr);
+			log_acl_action("refused", &repinfo->client_addr,
+				repinfo->client_addrlen, acl, acladdr);
 			log_buf(VERB_ALGO, "refuse", c->buffer);
 		}
 
@@ -1224,12 +1227,24 @@ deny_refuse(struct comm_point* c, enum acl_access acl,
 }
 
 static int
-deny_refuse_all(struct comm_point* c, enum acl_access acl,
+deny_refuse_all(struct comm_point* c, enum acl_access* acl,
 	struct worker* worker, struct comm_reply* repinfo,
-	struct acl_addr* acladdr, int ede)
+	struct acl_addr** acladdr, int ede, int check_proxy)
 {
-	return deny_refuse(c, acl, acl_deny, acl_refuse, worker, repinfo,
-		acladdr, ede);
+	if(check_proxy) {
+		*acladdr = acl_addr_lookup(worker->daemon->acl,
+			&repinfo->remote_addr, repinfo->remote_addrlen);
+	} else {
+		*acladdr = acl_addr_lookup(worker->daemon->acl,
+			&repinfo->client_addr, repinfo->client_addrlen);
+	}
+	/* If there is no ACL based on client IP use the interface ACL. */
+	if(!(*acladdr) && c->socket) {
+		*acladdr = c->socket->acl;
+	}
+	*acl = acl_get_control(*acladdr);
+	return deny_refuse(c, *acl, acl_deny, acl_refuse, worker, repinfo,
+		*acladdr, ede);
 }
 
 static int
@@ -1241,7 +1256,7 @@ deny_refuse_non_local(struct comm_point* c, enum acl_access acl,
 		worker, repinfo, acladdr, ede);
 }
 
-int 
+int
 worker_handle_request(struct comm_point* c, void* arg, int error,
 	struct comm_reply* repinfo)
 {
@@ -1323,29 +1338,30 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	 * sending src (client)/dst (local service) addresses over DNSTAP from incoming request handler
 	 */
 	if(worker->dtenv.log_client_query_messages) {
-		log_addr(VERB_ALGO, "request from client", &repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_ALGO, "request from client", &repinfo->client_addr, repinfo->client_addrlen);
 		log_addr(VERB_ALGO, "to local addr", (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->socket->addr->ai_addrlen);
-		dt_msg_send_client_query(&worker->dtenv, &repinfo->addr, (void*)repinfo->c->socket->addr->ai_addr, c->type, c->buffer);
+		dt_msg_send_client_query(&worker->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr->ai_addr, c->type, c->buffer);
 	}
 #endif
-	acladdr = acl_addr_lookup(worker->daemon->acl, &repinfo->addr, 
-		repinfo->addrlen);
-	/* If there is no ACL based on client IP use the interface ACL. */
-	if(!acladdr && c->socket) {
-		acladdr = c->socket->acl;
+	/* Check deny/refuse ACLs */
+	if(repinfo->is_proxied) {
+		if((ret=deny_refuse_all(c, &acl, worker, repinfo, &acladdr,
+			worker->env.cfg->ede, 1)) != -1) {
+			if(ret == 1)
+				goto send_reply;
+			return ret;
+		}
 	}
-	acl = acl_get_control(acladdr);
-
-	if((ret=deny_refuse_all(c, acl, worker, repinfo, acladdr,
-		worker->env.cfg->ede)) != -1)
-	{
+	if((ret=deny_refuse_all(c, &acl, worker, repinfo, &acladdr,
+		worker->env.cfg->ede, 0)) != -1) {
 		if(ret == 1)
 			goto send_reply;
 		return ret;
 	}
+
 	if((ret=worker_check_request(c->buffer, worker)) != 0) {
 		verbose(VERB_ALGO, "worker check request: bad query.");
-		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_CLIENT,"from",&repinfo->client_addr, repinfo->client_addrlen);
 		if(ret != -1) {
 			LDNS_QR_SET(sldns_buffer_begin(c->buffer));
 			LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), ret);
@@ -1357,20 +1373,24 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 
 	worker->stats.num_queries++;
 
-	/* check if this query should be dropped based on source ip rate limiting */
-	if(!infra_ip_ratelimit_inc(worker->env.infra_cache, repinfo,
+	/* check if this query should be dropped based on source ip rate limiting
+	 * NOTE: we always check the repinfo->client_address. IP ratelimiting is
+	 *       implicitly disabled for proxies. */
+	if(!infra_ip_ratelimit_inc(worker->env.infra_cache,
+			&repinfo->client_addr, repinfo->client_addrlen,
 			*worker->env.now,
 			worker->env.cfg->ip_ratelimit_backoff, c->buffer)) {
 		/* See if we are passed through with slip factor */
 		if(worker->env.cfg->ip_ratelimit_factor != 0 &&
 			ub_random_max(worker->env.rnd,
-						  worker->env.cfg->ip_ratelimit_factor) == 0) {
-
+			worker->env.cfg->ip_ratelimit_factor) == 0) {
 			char addrbuf[128];
-			addr_to_str(&repinfo->addr, repinfo->addrlen,
-						addrbuf, sizeof(addrbuf));
-		  verbose(VERB_QUERY, "ip_ratelimit allowed through for ip address %s because of slip in ip_ratelimit_factor",
-				  addrbuf);
+			addr_to_str(&repinfo->client_addr,
+				repinfo->client_addrlen, addrbuf,
+				sizeof(addrbuf));
+			verbose(VERB_QUERY, "ip_ratelimit allowed through for "
+				"ip address %s because of slip in "
+				"ip_ratelimit_factor", addrbuf);
 		} else {
 			worker->stats.num_queries_ip_ratelimited++;
 			comm_point_drop_reply(repinfo);
@@ -1381,7 +1401,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	/* see if query is in the cache */
 	if(!query_info_parse(&qinfo, c->buffer)) {
 		verbose(VERB_ALGO, "worker parse request: formerror.");
-		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+			repinfo->client_addrlen);
 		memset(&qinfo, 0, sizeof(qinfo)); /* zero qinfo.qname */
 		if(worker_err_ratelimit(worker, LDNS_RCODE_FORMERR) == -1) {
 			comm_point_drop_reply(repinfo);
@@ -1395,13 +1416,14 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	}
 	if(worker->env.cfg->log_queries) {
 		char ip[128];
-		addr_to_str(&repinfo->addr, repinfo->addrlen, ip, sizeof(ip));
+		addr_to_str(&repinfo->client_addr, repinfo->client_addrlen, ip, sizeof(ip));
 		log_query_in(ip, qinfo.qname, qinfo.qtype, qinfo.qclass);
 	}
 	if(qinfo.qtype == LDNS_RR_TYPE_AXFR || 
 		qinfo.qtype == LDNS_RR_TYPE_IXFR) {
 		verbose(VERB_ALGO, "worker request: refused zone transfer.");
-		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+			repinfo->client_addrlen);
 		sldns_buffer_rewind(c->buffer);
 		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
 		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), 
@@ -1418,7 +1440,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		qinfo.qtype == LDNS_RR_TYPE_MAILB ||
 		(qinfo.qtype >= 128 && qinfo.qtype <= 248)) {
 		verbose(VERB_ALGO, "worker request: formerror for meta-type.");
-		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+			repinfo->client_addrlen);
 		if(worker_err_ratelimit(worker, LDNS_RCODE_FORMERR) == -1) {
 			comm_point_drop_reply(repinfo);
 			return 0;
@@ -1436,7 +1459,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 					worker->scratchpad)) != 0) {
 		struct edns_data reply_edns;
 		verbose(VERB_ALGO, "worker parse edns: formerror.");
-		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+			repinfo->client_addrlen);
 		memset(&reply_edns, 0, sizeof(reply_edns));
 		reply_edns.edns_present = 1;
 		reply_edns.udp_size = EDNS_ADVERTISED_SIZE;
@@ -1458,7 +1482,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			edns.opt_list_inplace_cb_out = NULL;
 			edns.padding_block_size = 0;
 			verbose(VERB_ALGO, "query with bad edns version.");
-			log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+			log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+				repinfo->client_addrlen);
 			error_encode(c->buffer, EDNS_RCODE_BADVERS&0xf, &qinfo,
 				*(uint16_t*)(void *)sldns_buffer_begin(c->buffer),
 				sldns_buffer_read_u16_at(c->buffer, 2), NULL);
@@ -1472,7 +1497,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		   worker->daemon->cfg->harden_short_bufsize) {
 			verbose(VERB_QUERY, "worker request: EDNS bufsize %d ignored",
 				(int)edns.udp_size);
-			log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+			log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+				repinfo->client_addrlen);
 			edns.udp_size = NORMAL_UDP_SIZE;
 		}
 	}
@@ -1481,12 +1507,14 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		verbose(VERB_QUERY,
 			"worker request: max UDP reply size modified"
 			" (%d to max-udp-size)", (int)edns.udp_size);
-		log_addr(VERB_CLIENT,"from",&repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+			repinfo->client_addrlen);
 		edns.udp_size = worker->daemon->cfg->max_udp_size;
 	}
 	if(edns.udp_size < LDNS_HEADER_SIZE) {
 		verbose(VERB_ALGO, "worker request: edns is too small.");
-		log_addr(VERB_CLIENT, "from", &repinfo->addr, repinfo->addrlen);
+		log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+			repinfo->client_addrlen);
 		LDNS_QR_SET(sldns_buffer_begin(c->buffer));
 		LDNS_TC_SET(sldns_buffer_begin(c->buffer));
 		LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), 
@@ -1510,7 +1538,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	}
 	if(LDNS_OPCODE_WIRE(sldns_buffer_begin(c->buffer)) ==
 		LDNS_PACKET_NOTIFY) {
-		answer_notify(worker, &qinfo, &edns, c->buffer, repinfo);
+		answer_notify(worker, &qinfo, &edns, c->buffer,
+			&repinfo->client_addr, repinfo->client_addrlen);
 		regional_free_all(worker->scratchpad);
 		goto send_reply;
 	}
@@ -1586,7 +1615,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			sldns_buffer_read_u16_at(c->buffer, 2), &edns);
 		regional_free_all(worker->scratchpad);
 		log_addr(VERB_ALGO, "refused nonrec (cache snoop) query from",
-			&repinfo->addr, repinfo->addrlen);
+			&repinfo->client_addr, repinfo->client_addrlen);
 
 		goto send_reply;
 	}
@@ -1726,9 +1755,9 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	if(verbosity >= VERB_CLIENT) {
 		if(c->type == comm_udp)
 			log_addr(VERB_CLIENT, "udp request from",
-				&repinfo->addr, repinfo->addrlen);
+				&repinfo->client_addr, repinfo->client_addrlen);
 		else	log_addr(VERB_CLIENT, "tcp request from",
-				&repinfo->addr, repinfo->addrlen);
+				&repinfo->client_addr, repinfo->client_addrlen);
 	}
 
 	/* grab a work request structure for this new request */
@@ -1760,8 +1789,8 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 	 */
 	if(worker->dtenv.log_client_response_messages) {
 		log_addr(VERB_ALGO, "from local addr", (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->socket->addr->ai_addrlen);
-                log_addr(VERB_ALGO, "response to client", &repinfo->addr, repinfo->addrlen);
-		dt_msg_send_client_response(&worker->dtenv, &repinfo->addr, (void*)repinfo->c->socket->addr->ai_addr, c->type, c->buffer);
+		log_addr(VERB_ALGO, "response to client", &repinfo->client_addr, repinfo->client_addrlen);
+		dt_msg_send_client_response(&worker->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr->ai_addr, c->type, c->buffer);
 	}
 #endif
 	if(worker->env.cfg->log_replies)
@@ -1773,10 +1802,12 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 			/* log original qname, before the local alias was
 			 * used to resolve that CNAME to something else */
 			qinfo.qname = qinfo.local_alias->rrset->rk.dname;
-			log_reply_info(NO_VERBOSE, &qinfo, &repinfo->addr, repinfo->addrlen,
+			log_reply_info(NO_VERBOSE, &qinfo,
+				&repinfo->client_addr, repinfo->client_addrlen,
 				tv, 1, c->buffer);
 		} else {
-			log_reply_info(NO_VERBOSE, &qinfo, &repinfo->addr, repinfo->addrlen,
+			log_reply_info(NO_VERBOSE, &qinfo,
+				&repinfo->client_addr, repinfo->client_addrlen,
 				tv, 1, c->buffer);
 		}
 	}
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 51e51b58b..c21246e4c 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -902,6 +902,10 @@ 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
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 73575d93a..4d610c15d 100644
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -656,6 +656,17 @@ 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.
diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index d4f61bdd6..0f1df417f 100644
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -765,7 +765,7 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 		}
 		else if(qstate->mesh_info->reply_list) {
 			subnet_option_from_ss(
-				&qstate->mesh_info->reply_list->query_reply.addr,
+				&qstate->mesh_info->reply_list->query_reply.client_addr,
 				&sq->ecs_client_in, qstate->env->cfg);
 		}
 		
diff --git a/iterator/iterator.c b/iterator/iterator.c
index b99b188e6..e1c556b39 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -596,15 +596,17 @@ errinf_reply(struct module_qstate* qstate, struct iter_qstate* iq)
 {
 	if(qstate->env->cfg->val_log_level < 2 && !qstate->env->cfg->log_servfail)
 		return;
-	if((qstate->reply && qstate->reply->addrlen != 0) ||
-		(iq->fail_reply && iq->fail_reply->addrlen != 0)) {
+	if((qstate->reply && qstate->reply->remote_addrlen != 0) ||
+		(iq->fail_reply && iq->fail_reply->remote_addrlen != 0)) {
 		char from[256], frm[512];
-		if(qstate->reply && qstate->reply->addrlen != 0)
-			addr_to_str(&qstate->reply->addr, qstate->reply->addrlen,
-				from, sizeof(from));
+		if(qstate->reply && qstate->reply->remote_addrlen != 0)
+			addr_to_str(&qstate->reply->remote_addr,
+				qstate->reply->remote_addrlen, from,
+				sizeof(from));
 		else
-			addr_to_str(&iq->fail_reply->addr, iq->fail_reply->addrlen,
-				from, sizeof(from));
+			addr_to_str(&iq->fail_reply->remote_addr,
+				iq->fail_reply->remote_addrlen, from,
+				sizeof(from));
 		snprintf(frm, sizeof(frm), "from %s", from);
 		errinf(qstate, frm);
 	}
@@ -2896,8 +2898,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 			 * use dnssec-lame-bypass if it needs to query there.*/
 			if(qstate->reply) {
 				struct delegpt_addr* a = delegpt_find_addr(
-					iq->dp, &qstate->reply->addr,
-					qstate->reply->addrlen);
+					iq->dp, &qstate->reply->remote_addr,
+					qstate->reply->remote_addrlen);
 				if(a) a->dnsseclame = 1;
 			}
 			/* test the answer is from the zone we expected,
@@ -2993,9 +2995,9 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 		(*qstate->env->detach_subs)(qstate);
 		iq->num_target_queries = 0;
 		if(qstate->reply)
-			sock_list_insert(&qstate->reply_origin, 
-				&qstate->reply->addr, qstate->reply->addrlen, 
-				qstate->region);
+			sock_list_insert(&qstate->reply_origin,
+				&qstate->reply->remote_addr,
+				qstate->reply->remote_addrlen, qstate->region);
 		if(iq->minimisation_state != DONOT_MINIMISE_STATE
 			&& !(iq->chase_flags & BIT_RD)) {
 			if(FLAGS_GET_RCODE(iq->response->rep->flags) != 
@@ -3250,9 +3252,9 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 		(*qstate->env->detach_subs)(qstate);
 		iq->num_target_queries = 0;
 		if(qstate->reply)
-			sock_list_insert(&qstate->reply_origin, 
-				&qstate->reply->addr, qstate->reply->addrlen, 
-				qstate->region);
+			sock_list_insert(&qstate->reply_origin,
+				&qstate->reply->remote_addr,
+				qstate->reply->remote_addrlen, qstate->region);
 		verbose(VERB_ALGO, "cleared outbound list for query restart");
 		/* go to INIT_REQUEST_STATE for new qname. */
 		return next_state(iq, INIT_REQUEST_STATE);
@@ -3266,9 +3268,10 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 		} else if(qstate->reply) {
 			/* need addr for lameness cache, but we may have
 			 * gotten this from cache, so test to be sure */
-			if(!infra_set_lame(qstate->env->infra_cache, 
-				&qstate->reply->addr, qstate->reply->addrlen, 
-				iq->dp->name, iq->dp->namelen, 
+			if(!infra_set_lame(qstate->env->infra_cache,
+				&qstate->reply->remote_addr,
+				qstate->reply->remote_addrlen,
+				iq->dp->name, iq->dp->namelen,
 				*qstate->env->now, dnsseclame, 0,
 				iq->qchase.qtype))
 				log_err("mark host lame: out of memory");
@@ -3285,8 +3288,9 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 			 * gotten this from cache, so test to be sure */
 			verbose(VERB_DETAIL, "mark as REC_LAME");
 			if(!infra_set_lame(qstate->env->infra_cache, 
-				&qstate->reply->addr, qstate->reply->addrlen, 
-				iq->dp->name, iq->dp->namelen, 
+				&qstate->reply->remote_addr,
+				qstate->reply->remote_addrlen,
+				iq->dp->name, iq->dp->namelen,
 				*qstate->env->now, 0, 1, iq->qchase.qtype))
 				log_err("mark host lame: out of memory");
 		} 
@@ -4016,8 +4020,8 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
 	if(!iq->response)
 		goto handle_it;
 	log_query_info(VERB_DETAIL, "response for", &qstate->qinfo);
-	log_name_addr(VERB_DETAIL, "reply from", iq->dp->name, 
-		&qstate->reply->addr, qstate->reply->addrlen);
+	log_name_addr(VERB_DETAIL, "reply from", iq->dp->name,
+		&qstate->reply->remote_addr, qstate->reply->remote_addrlen);
 	if(verbosity >= VERB_ALGO)
 		log_dns_msg("incoming scrubbed packet:", &iq->response->qinfo, 
 			iq->response->rep);
diff --git a/pythonmod/interface.i b/pythonmod/interface.i
index 0d95613f8..df8514b47 100644
--- a/pythonmod/interface.i
+++ b/pythonmod/interface.i
@@ -609,9 +609,9 @@ struct mesh_reply {
    struct comm_reply query_reply;
 };
 
-%rename(_addr) comm_reply::addr;
+%rename(_addr) comm_reply::client_addr;
 struct comm_reply {
-   struct sockaddr_storage addr;
+   struct sockaddr_storage client_addr;
 };
 
 %extend comm_reply {
diff --git a/pythonmod/pythonmod_utils.c b/pythonmod/pythonmod_utils.c
index 1f6f25129..aebe4d2bb 100644
--- a/pythonmod/pythonmod_utils.c
+++ b/pythonmod/pythonmod_utils.c
@@ -172,14 +172,14 @@ int createResponse(struct module_qstate* qstate, sldns_buffer* pkt)
 }
 
 
-/* Convert reply->addr to string */
+/* Convert reply->client_addr to string */
 void reply_addr2str(struct comm_reply* reply, char* dest, int maxlen)
 {
-	int af = (int)((struct sockaddr_in*) &(reply->addr))->sin_family;
-	void* sinaddr = &((struct sockaddr_in*) &(reply->addr))->sin_addr;
+	int af = (int)((struct sockaddr_in*) &(reply->client_addr))->sin_family;
+	void* sinaddr = &((struct sockaddr_in*) &(reply->client_addr))->sin_addr;
 
 	if(af == AF_INET6)
-		sinaddr = &((struct sockaddr_in6*)&(reply->addr))->sin6_addr;
+		sinaddr = &((struct sockaddr_in6*)&(reply->client_addr))->sin6_addr;
 	dest[0] = 0;
 	if (inet_ntop(af, sinaddr, dest, (socklen_t)maxlen) == 0)
 		return;
diff --git a/respip/respip.c b/respip/respip.c
index deff66317..942e082b9 100644
--- a/respip/respip.c
+++ b/respip/respip.c
@@ -1290,7 +1290,7 @@ respip_set_is_empty(const struct respip_set* set)
 void
 respip_inform_print(struct respip_action_info* respip_actinfo, uint8_t* qname,
 	uint16_t qtype, uint16_t qclass, struct local_rrset* local_alias,
-	struct comm_reply* repinfo)
+	struct sockaddr_storage* addr, socklen_t addrlen)
 {
 	char srcip[128], respip[128], txt[512];
 	unsigned port;
@@ -1300,10 +1300,10 @@ respip_inform_print(struct respip_action_info* respip_actinfo, uint8_t* qname,
 
 	if(local_alias)
 		qname = local_alias->rrset->rk.dname;
-	port = (unsigned)((repinfo->addr.ss_family == AF_INET) ?
-		ntohs(((struct sockaddr_in*)&repinfo->addr)->sin_port) :
-		ntohs(((struct sockaddr_in6*)&repinfo->addr)->sin6_port));
-	addr_to_str(&repinfo->addr, repinfo->addrlen, srcip, sizeof(srcip));
+	port = (unsigned)((addr->ss_family == AF_INET) ?
+		ntohs(((struct sockaddr_in*)addr)->sin_port) :
+		ntohs(((struct sockaddr_in6*)addr)->sin6_port));
+	addr_to_str(addr, addrlen, srcip, sizeof(srcip));
 	addr_to_str(&respip_addr->addr, respip_addr->addrlen,
 		respip, sizeof(respip));
 	if(respip_actinfo->rpz_log) {
diff --git a/respip/respip.h b/respip/respip.h
index 988a72263..e4ab5cc9c 100644
--- a/respip/respip.h
+++ b/respip/respip.h
@@ -251,11 +251,13 @@ int respip_set_is_empty(const struct respip_set* set);
  * @param local_alias: set to a local alias if the query matches an alias in
  *  a local zone.  In this case its owner name will be considered the actual
  *  query name.
- * @param repinfo: reply info containing the client's source address and port.
+ * @param addr: the client's source address and port.
+ * @param addrlen: the client's source address length.
  */
 void respip_inform_print(struct respip_action_info* respip_actinfo,
 	uint8_t* qname, uint16_t qtype, uint16_t qclass,
-	struct local_rrset* local_alias, struct comm_reply* repinfo);
+	struct local_rrset* local_alias, struct sockaddr_storage* addr,
+	socklen_t addrlen);
 
 /**
  * Find resp_addr in tree, create and add to tree if it does not exist.
diff --git a/services/cache/infra.c b/services/cache/infra.c
index 9d5cdb162..537cb949c 100644
--- a/services/cache/infra.c
+++ b/services/cache/infra.c
@@ -834,14 +834,13 @@ static struct lruhash_entry* infra_find_ratedata(struct infra_cache* infra,
 
 /** find data item in array for ip addresses */
 static struct lruhash_entry* infra_find_ip_ratedata(struct infra_cache* infra,
-	struct comm_reply* repinfo, int wr)
+	struct sockaddr_storage* addr, socklen_t addrlen, int wr)
 {
 	struct ip_rate_key key;
-	hashvalue_type h = hash_addr(&(repinfo->addr),
-		repinfo->addrlen, 0);
+	hashvalue_type h = hash_addr(addr, addrlen, 0);
 	memset(&key, 0, sizeof(key));
-	key.addr = repinfo->addr;
-	key.addrlen = repinfo->addrlen;
+	key.addr = *addr;
+	key.addrlen = addrlen;
 	key.entry.hash = h;
 	return slabhash_lookup(infra->client_ip_rates, h, &key, wr);
 }
@@ -876,10 +875,9 @@ static void infra_create_ratedata(struct infra_cache* infra,
 
 /** create rate data item for ip address */
 static void infra_ip_create_ratedata(struct infra_cache* infra,
-	struct comm_reply* repinfo, time_t timenow)
+	struct sockaddr_storage* addr, socklen_t addrlen, time_t timenow)
 {
-	hashvalue_type h = hash_addr(&(repinfo->addr),
-	repinfo->addrlen, 0);
+	hashvalue_type h = hash_addr(addr, addrlen, 0);
 	struct ip_rate_key* k = (struct ip_rate_key*)calloc(1, sizeof(*k));
 	struct ip_rate_data* d = (struct ip_rate_data*)calloc(1, sizeof(*d));
 	if(!k || !d) {
@@ -887,8 +885,8 @@ static void infra_ip_create_ratedata(struct infra_cache* infra,
 		free(d);
 		return; /* alloc failure */
 	}
-	k->addr = repinfo->addr;
-	k->addrlen = repinfo->addrlen;
+	k->addr = *addr;
+	k->addrlen = addrlen;
 	lock_rw_init(&k->entry.lock);
 	k->entry.hash = h;
 	k->entry.key = k;
@@ -985,8 +983,8 @@ int infra_ratelimit_inc(struct infra_cache* infra, uint8_t* name,
 			sldns_wire2str_class_buf(qinfo->qclass, cs, sizeof(cs));
 			ip[0]=0;
 			if(replylist) {
-				addr_to_str((struct sockaddr_storage *)&replylist->addr,
-					replylist->addrlen, ip, sizeof(ip));
+				addr_to_str((struct sockaddr_storage *)&replylist->remote_addr,
+					replylist->remote_addrlen, ip, sizeof(ip));
 				verbose(VERB_OPS, "ratelimit exceeded %s %d query %s %s %s from %s", buf, lim, qnm, cs, ts, ip);
 			} else {
 				verbose(VERB_OPS, "ratelimit exceeded %s %d query %s %s %s", buf, lim, qnm, cs, ts);
@@ -1054,8 +1052,8 @@ infra_get_mem(struct infra_cache* infra)
 }
 
 int infra_ip_ratelimit_inc(struct infra_cache* infra,
-	struct comm_reply* repinfo, time_t timenow, int backoff,
-	struct sldns_buffer* buffer)
+	struct sockaddr_storage* addr, socklen_t addrlen, time_t timenow,
+	int backoff, struct sldns_buffer* buffer)
 {
 	int max;
 	struct lruhash_entry* entry;
@@ -1065,7 +1063,7 @@ int infra_ip_ratelimit_inc(struct infra_cache* infra,
 		return 1;
 	}
 	/* find or insert ratedata */
-	entry = infra_find_ip_ratedata(infra, repinfo, 1);
+	entry = infra_find_ip_ratedata(infra, addr, addrlen, 1);
 	if(entry) {
 		int premax = infra_rate_max(entry->data, timenow, backoff);
 		int* cur = infra_rate_give_second(entry->data, timenow);
@@ -1075,8 +1073,7 @@ int infra_ip_ratelimit_inc(struct infra_cache* infra,
 
 		if(premax <= infra_ip_ratelimit && max > infra_ip_ratelimit) {
 			char client_ip[128], qnm[LDNS_MAX_DOMAINLEN+1+12+12];
-			addr_to_str((struct sockaddr_storage *)&repinfo->addr,
-				repinfo->addrlen, client_ip, sizeof(client_ip));
+			addr_to_str(addr, addrlen, client_ip, sizeof(client_ip));
 			qnm[0]=0;
 			if(sldns_buffer_limit(buffer)>LDNS_HEADER_SIZE &&
 				LDNS_QDCOUNT(sldns_buffer_begin(buffer))!=0) {
@@ -1101,6 +1098,6 @@ int infra_ip_ratelimit_inc(struct infra_cache* infra,
 	}
 
 	/* create */
-	infra_ip_create_ratedata(infra, repinfo, timenow);
+	infra_ip_create_ratedata(infra, addr, addrlen, timenow);
 	return 1;
 }
diff --git a/services/cache/infra.h b/services/cache/infra.h
index 6a2371aca..faf7fd2f3 100644
--- a/services/cache/infra.h
+++ b/services/cache/infra.h
@@ -416,15 +416,16 @@ int infra_find_ratelimit(struct infra_cache* infra, uint8_t* name,
 /** Update query ratelimit hash and decide
  *  whether or not a query should be dropped.
  *  @param infra: infra cache
- *  @param repinfo: information about client
+ *  @param addr: client address
+ *  @param addrlen: client address length
  *  @param timenow: what time it is now.
  *  @param backoff: if backoff is enabled.
  *  @param buffer: with query for logging.
  *  @return 1 if it could be incremented. 0 if the increment overshot the
  *  ratelimit and the query should be dropped. */
 int infra_ip_ratelimit_inc(struct infra_cache* infra,
-	struct comm_reply* repinfo, time_t timenow, int backoff,
-	struct sldns_buffer* buffer);
+	struct sockaddr_storage* addr, socklen_t addrlen, time_t timenow,
+	int backoff, struct sldns_buffer* buffer);
 
 /**
  * Get memory used by the infra cache.
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index e823b3c12..95606aff5 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1093,11 +1093,13 @@ make_sock_port(int stype, const char* ifname, const char* port,
  * @param list: list head. changed.
  * @param s: fd.
  * @param ftype: if fd is UDP.
+ * @param pp2_enabled: if PROXYv2 is enabled for this port.
  * @param ub_sock: socket with address.
  * @return false on failure. list in unchanged then.
  */
 static int
-port_insert(struct listen_port** list, int s, enum listen_type ftype, struct unbound_socket* ub_sock)
+port_insert(struct listen_port** list, int s, enum listen_type ftype,
+	int pp2_enabled, struct unbound_socket* ub_sock)
 {
 	struct listen_port* item = (struct listen_port*)malloc(
 		sizeof(struct listen_port));
@@ -1106,6 +1108,7 @@ port_insert(struct listen_port** list, int s, enum listen_type ftype, struct unb
 	item->next = *list;
 	item->fd = s;
 	item->ftype = ftype;
+	item->pp2_enabled = pp2_enabled;
 	item->socket = ub_sock;
 	*list = item;
 	return 1;
@@ -1201,6 +1204,7 @@ if_is_ssl(const char* ifname, const char* port, int ssl_port,
  * @param ssl_port: ssl service port number
  * @param tls_additional_port: list of additional ssl service port numbers.
  * @param https_port: DoH service port number
+ * @param proxy_protocol_port: list of PROXYv2 port numbers.
  * @param reuseport: try to set SO_REUSEPORT if nonNULL and true.
  * 	set to false on exit if reuseport failed due to no kernel support.
  * @param transparent: set IP_TRANSPARENT socket option.
@@ -1217,25 +1221,30 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 	struct addrinfo *hints, const char* port, struct listen_port** list,
 	size_t rcv, size_t snd, int ssl_port,
 	struct config_strlist* tls_additional_port, int https_port,
+	struct config_strlist* proxy_protocol_port,
 	int* reuseport, int transparent, int tcp_mss, int freebind,
 	int http2_nodelay, int use_systemd, int dnscrypt_port, int dscp)
 {
 	int s, noip6=0;
 	int is_https = if_is_https(ifname, port, https_port);
+	int is_dnscrypt = if_is_dnscrypt(ifname, port, dnscrypt_port);
+	int is_pp2 = if_is_pp2(ifname, port, proxy_protocol_port);
 	int nodelay = is_https && http2_nodelay;
 	struct unbound_socket* ub_sock;
-#ifdef USE_DNSCRYPT
-	int is_dnscrypt = ((strchr(ifname, '@') &&
-			atoi(strchr(ifname, '@')+1) == dnscrypt_port) ||
-			(!strchr(ifname, '@') && atoi(port) == dnscrypt_port));
-#else
-	int is_dnscrypt = 0;
-	(void)dnscrypt_port;
-#endif
 
 	if(!do_udp && !do_tcp)
 		return 0;
 
+	if(is_pp2) {
+		if(is_dnscrypt) {
+			fatal_exit("PROXYv2 and DNSCrypt combination not "
+				"supported!");
+		} else if(is_https) {
+			fatal_exit("PROXYv2 and DoH combination not "
+				"supported!");
+		}
+	}
+
 	if(do_auto) {
 		ub_sock = calloc(1, sizeof(struct unbound_socket));
 		if(!ub_sock)
@@ -1260,7 +1269,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		}
 		if(!port_insert(list, s, is_dnscrypt
 			?listen_type_udpancil_dnscrypt:listen_type_udpancil,
-			ub_sock)) {
+			is_pp2, ub_sock)) {
 			sock_close(s);
 			freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
@@ -1283,7 +1292,8 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 			return 0;
 		}
 		if(!port_insert(list, s, is_dnscrypt
-			?listen_type_udp_dnscrypt:listen_type_udp, ub_sock)) {
+			?listen_type_udp_dnscrypt:listen_type_udp,
+			is_pp2, ub_sock)) {
 			sock_close(s);
 			freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
@@ -1318,7 +1328,7 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 		}
 		if(is_ssl)
 			verbose(VERB_ALGO, "setup TCP for SSL service");
-		if(!port_insert(list, s, port_type, ub_sock)) {
+		if(!port_insert(list, s, port_type, is_pp2, ub_sock)) {
 			sock_close(s);
 			freeaddrinfo(ub_sock->addr);
 			free(ub_sock);
@@ -1407,14 +1417,16 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 		if(ports->ftype == listen_type_udp ||
 		   ports->ftype == listen_type_udp_dnscrypt) {
 			cp = comm_point_create_udp(base, ports->fd,
-				front->udp_buff, cb, cb_arg, ports->socket);
+				front->udp_buff, ports->pp2_enabled, cb,
+				cb_arg, ports->socket);
 		} else if(ports->ftype == listen_type_tcp ||
 				ports->ftype == listen_type_tcp_dnscrypt) {
 			cp = comm_point_create_tcp(base, ports->fd,
 				tcp_accept_count, tcp_idle_timeout,
 				harden_large_queries, 0, NULL,
 				tcp_conn_limit, bufsize, front->udp_buff,
-				ports->ftype, cb, cb_arg, ports->socket);
+				ports->ftype, ports->pp2_enabled, cb, cb_arg,
+				ports->socket);
 		} else if(ports->ftype == listen_type_ssl ||
 			ports->ftype == listen_type_http) {
 			cp = comm_point_create_tcp(base, ports->fd,
@@ -1422,7 +1434,8 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 				harden_large_queries,
 				http_max_streams, http_endpoint,
 				tcp_conn_limit, bufsize, front->udp_buff,
-				ports->ftype, cb, cb_arg, ports->socket);
+				ports->ftype, ports->pp2_enabled, cb, cb_arg,
+				ports->socket);
 			if(ports->ftype == listen_type_http) {
 				if(!sslctx && !http_notls) {
 					log_warn("HTTPS port configured, but "
@@ -1448,7 +1461,8 @@ listen_create(struct comm_base* base, struct listen_port* ports,
 		} else if(ports->ftype == listen_type_udpancil ||
 				  ports->ftype == listen_type_udpancil_dnscrypt) {
 			cp = comm_point_create_udp_ancil(base, ports->fd,
-				front->udp_buff, cb, cb_arg, ports->socket);
+				front->udp_buff, ports->pp2_enabled, cb,
+				cb_arg, ports->socket);
 		}
 		if(!cp) {
 			log_err("can't create commpoint");
@@ -1783,7 +1797,9 @@ listening_ports_open(struct config_file* cfg, char** ifs, int num_ifs,
 						&hints, portbuf, &list,
 						cfg->so_rcvbuf, cfg->so_sndbuf,
 						cfg->ssl_port, cfg->tls_additional_port,
-						cfg->https_port, reuseport, cfg->ip_transparent,
+						cfg->https_port,
+						cfg->proxy_protocol_port,
+						reuseport, cfg->ip_transparent,
 						cfg->tcp_mss, cfg->ip_freebind,
 						cfg->http_nodelay, cfg->use_systemd,
 						cfg->dnscrypt_port, cfg->ip_dscp)) {
@@ -1798,7 +1814,9 @@ listening_ports_open(struct config_file* cfg, char** ifs, int num_ifs,
 						&hints, portbuf, &list,
 						cfg->so_rcvbuf, cfg->so_sndbuf,
 						cfg->ssl_port, cfg->tls_additional_port,
-						cfg->https_port, reuseport, cfg->ip_transparent,
+						cfg->https_port,
+						cfg->proxy_protocol_port,
+						reuseport, cfg->ip_transparent,
 						cfg->tcp_mss, cfg->ip_freebind,
 						cfg->http_nodelay, cfg->use_systemd,
 						cfg->dnscrypt_port, cfg->ip_dscp)) {
@@ -1816,7 +1834,8 @@ listening_ports_open(struct config_file* cfg, char** ifs, int num_ifs,
 				&hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->https_port, cfg->proxy_protocol_port,
+				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind,
 				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
@@ -1831,7 +1850,8 @@ listening_ports_open(struct config_file* cfg, char** ifs, int num_ifs,
 				&hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->https_port, cfg->proxy_protocol_port,
+				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind,
 				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
@@ -1848,7 +1868,8 @@ listening_ports_open(struct config_file* cfg, char** ifs, int num_ifs,
 				do_tcp, &hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->https_port, cfg->proxy_protocol_port,
+				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind,
 				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
@@ -1863,7 +1884,8 @@ listening_ports_open(struct config_file* cfg, char** ifs, int num_ifs,
 				do_tcp, &hints, portbuf, &list,
 				cfg->so_rcvbuf, cfg->so_sndbuf,
 				cfg->ssl_port, cfg->tls_additional_port,
-				cfg->https_port, reuseport, cfg->ip_transparent,
+				cfg->https_port, cfg->proxy_protocol_port,
+				reuseport, cfg->ip_transparent,
 				cfg->tcp_mss, cfg->ip_freebind,
 				cfg->http_nodelay, cfg->use_systemd,
 				cfg->dnscrypt_port, cfg->ip_dscp)) {
diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h
index f27fa597b..816d79aea 100644
--- a/services/listen_dnsport.h
+++ b/services/listen_dnsport.h
@@ -128,7 +128,10 @@ struct listen_port {
 	int fd;
 	/** type of file descriptor, udp or tcp */
 	enum listen_type ftype;
-	/** fill in unbpound_socket structure for every opened socket at Unbound startup */
+	/** if the port should support PROXYv2 */
+	int pp2_enabled;
+	/** fill in unbound_socket structure for every opened socket at
+	 * Unbound startup */
 	struct unbound_socket* socket;
 };
 
diff --git a/services/localzone.c b/services/localzone.c
index 3ed7d835d..3536b7aaa 100644
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -1744,13 +1744,13 @@ local_zones_zone_answer(struct local_zone* z, struct module_env* env,
 /** print log information for an inform zone query */
 static void
 lz_inform_print(struct local_zone* z, struct query_info* qinfo,
-	struct comm_reply* repinfo)
+	struct sockaddr_storage* addr, socklen_t addrlen)
 {
 	char ip[128], txt[512];
 	char zname[LDNS_MAX_DOMAINLEN+1];
-	uint16_t port = ntohs(((struct sockaddr_in*)&repinfo->addr)->sin_port);
+	uint16_t port = ntohs(((struct sockaddr_in*)addr)->sin_port);
 	dname_str(z->name, zname);
-	addr_to_str(&repinfo->addr, repinfo->addrlen, ip, sizeof(ip));
+	addr_to_str(addr, addrlen, ip, sizeof(ip));
 	snprintf(txt, sizeof(txt), "%s %s %s@%u", zname, local_zone_type2str(z->type), ip,
 		(unsigned)port);
 	log_nametypeclass(NO_VERBOSE, txt, qinfo->qname, qinfo->qtype, qinfo->qclass);
@@ -1765,7 +1765,8 @@ lz_type(uint8_t *taglist, size_t taglen, uint8_t *taglist2, size_t taglen2,
 	struct local_zone_override* lzo;	
 	if(repinfo && override_tree) {
 		lzo = (struct local_zone_override*)addr_tree_lookup(
-			override_tree, &repinfo->addr, repinfo->addrlen);
+			override_tree, &repinfo->client_addr,
+			repinfo->client_addrlen);
 		if(lzo && lzo->type) {
 			verbose(VERB_ALGO, "local zone override to type %s",
 				local_zone_type2str(lzo->type));
@@ -1888,7 +1889,8 @@ local_zones_answer(struct local_zones* zones, struct module_env* env,
 			lzt == local_zone_inform_deny ||
 			lzt == local_zone_inform_redirect)
 			&& repinfo)
-		lz_inform_print(z, qinfo, repinfo);
+		lz_inform_print(z, qinfo, &repinfo->client_addr,
+			repinfo->client_addrlen);
 
 	if(lzt != local_zone_always_refuse
 		&& lzt != local_zone_always_transparent
diff --git a/services/mesh.c b/services/mesh.c
index 2a4119426..9007b6e08 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -806,7 +806,7 @@ static void mesh_schedule_prefetch_subnet(struct mesh_area* mesh,
 		/* Fake the ECS data from the client's IP */
 		struct ecs_data ecs;
 		memset(&ecs, 0, sizeof(ecs));
-		subnet_option_from_ss(&rep->addr, &ecs, mesh->env->cfg);
+		subnet_option_from_ss(&rep->client_addr, &ecs, mesh->env->cfg);
 		if(ecs.subnet_validdata == 0) {
 			log_err("prefetch_subnet subnet_option_from_ss: invalid data");
 			return;
@@ -1488,8 +1488,9 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
 	}
 	/* Log reply sent */
 	if(m->s.env->cfg->log_replies) {
-		log_reply_info(NO_VERBOSE, &m->s.qinfo, &r->query_reply.addr,
-			r->query_reply.addrlen, duration, 0, r_buffer);
+		log_reply_info(NO_VERBOSE, &m->s.qinfo,
+			&r->query_reply.client_addr,
+			r->query_reply.client_addrlen, duration, 0, r_buffer);
 	}
 }
 
@@ -1530,7 +1531,8 @@ void mesh_query_done(struct mesh_state* mstate)
 			respip_inform_print(mstate->s.respip_action_info,
 				r->qname, mstate->s.qinfo.qtype,
 				mstate->s.qinfo.qclass, r->local_alias,
-				&r->query_reply);
+				&r->query_reply.client_addr,
+				r->query_reply.client_addrlen);
 			if(mstate->s.env->cfg->stat_extended &&
 				mstate->s.respip_action_info->rpz_used) {
 				if(mstate->s.respip_action_info->rpz_disabled)
@@ -2180,7 +2182,8 @@ mesh_serve_expired_callback(void* arg)
 		if(actinfo.addrinfo) {
 			respip_inform_print(&actinfo, r->qname,
 				qstate->qinfo.qtype, qstate->qinfo.qclass,
-				r->local_alias, &r->query_reply);
+				r->local_alias, &r->query_reply.client_addr,
+				r->query_reply.client_addrlen);
 
 			if(qstate->env->cfg->stat_extended && actinfo.rpz_used) {
 				if(actinfo.rpz_disabled)
diff --git a/services/outside_network.c b/services/outside_network.c
index b5b20cbb0..165a50755 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -721,12 +721,12 @@ outnet_tcp_take_into_use(struct waiting_tcp* w)
 	pend->next_free = NULL;
 	pend->query = w;
 	pend->reuse.outnet = w->outnet;
-	pend->c->repinfo.addrlen = w->addrlen;
+	pend->c->repinfo.remote_addrlen = w->addrlen;
 	pend->c->tcp_more_read_again = &pend->reuse.cp_more_read_again;
 	pend->c->tcp_more_write_again = &pend->reuse.cp_more_write_again;
 	pend->reuse.cp_more_read_again = 0;
 	pend->reuse.cp_more_write_again = 0;
-	memcpy(&pend->c->repinfo.addr, &w->addr, w->addrlen);
+	memcpy(&pend->c->repinfo.remote_addr, &w->addr, w->addrlen);
 	pend->reuse.pending = pend;
 
 	/* Remove from tree in case the is_ssl will be different and causes the
@@ -1417,11 +1417,11 @@ outnet_udp_cb(struct comm_point* c, void* arg, int error,
 
 	/* setup lookup key */
 	key.id = (unsigned)LDNS_ID_WIRE(sldns_buffer_begin(c->buffer));
-	memcpy(&key.addr, &reply_info->addr, reply_info->addrlen);
-	key.addrlen = reply_info->addrlen;
+	memcpy(&key.addr, &reply_info->remote_addr, reply_info->remote_addrlen);
+	key.addrlen = reply_info->remote_addrlen;
 	verbose(VERB_ALGO, "Incoming reply id = %4.4x", key.id);
 	log_addr(VERB_ALGO, "Incoming reply addr =", 
-		&reply_info->addr, reply_info->addrlen);
+		&reply_info->remote_addr, reply_info->remote_addrlen);
 
 	/* find it, see if this thing is a valid query response */
 	verbose(VERB_ALGO, "lookup size is %d entries", (int)outnet->pending->count);
@@ -1690,7 +1690,7 @@ outside_network_create(struct comm_base *base, size_t bufsize,
 			return NULL;
 		}
 		pc->cp = comm_point_create_udp(outnet->base, -1, 
-			outnet->udp_buff, outnet_udp_cb, outnet, NULL);
+			outnet->udp_buff, 0, outnet_udp_cb, outnet, NULL);
 		if(!pc->cp) {
 			log_err("malloc failed");
 			free(pc);
@@ -3103,8 +3103,8 @@ serviced_tcp_callback(struct comm_point* c, void* arg, int error,
 		rep = &r2;
 		r2.c = c;
 	}
-	memcpy(&rep->addr, &sq->addr, sq->addrlen);
-	rep->addrlen = sq->addrlen;
+	memcpy(&rep->remote_addr, &sq->addr, sq->addrlen);
+	rep->remote_addrlen = sq->addrlen;
 	serviced_callbacks(sq, error, c, rep);
 	return 0;
 }
@@ -3582,7 +3582,7 @@ outnet_comm_point_for_udp(struct outside_network* outnet,
 	if(fd == -1) {
 		return NULL;
 	}
-	cp = comm_point_create_udp(outnet->base, fd, outnet->udp_buff,
+	cp = comm_point_create_udp(outnet->base, fd, outnet->udp_buff, 0,
 		cb, cb_arg, NULL);
 	if(!cp) {
 		log_err("malloc failure");
@@ -3670,8 +3670,8 @@ outnet_comm_point_for_tcp(struct outside_network* outnet,
 		close(fd);
 		return 0;
 	}
-	cp->repinfo.addrlen = to_addrlen;
-	memcpy(&cp->repinfo.addr, to_addr, to_addrlen);
+	cp->repinfo.remote_addrlen = to_addrlen;
+	memcpy(&cp->repinfo.remote_addr, to_addr, to_addrlen);
 
 	/* setup for SSL (if needed) */
 	if(ssl) {
@@ -3746,8 +3746,8 @@ outnet_comm_point_for_http(struct outside_network* outnet,
 		close(fd);
 		return 0;
 	}
-	cp->repinfo.addrlen = to_addrlen;
-	memcpy(&cp->repinfo.addr, to_addr, to_addrlen);
+	cp->repinfo.remote_addrlen = to_addrlen;
+	memcpy(&cp->repinfo.remote_addr, to_addr, to_addrlen);
 
 	/* setup for SSL (if needed) */
 	if(ssl) {
diff --git a/services/rpz.c b/services/rpz.c
index 77b6266fe..e8b734a89 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -1392,11 +1392,13 @@ log_rpz_apply(char* trigger, uint8_t* dname, struct addr_tree_node* addrnode,
 		dnamestr[0]=0;
 	}
 	if(repinfo) {
-		addr_to_str(&repinfo->addr, repinfo->addrlen, ip, sizeof(ip));
-		port = ntohs(((struct sockaddr_in*)&repinfo->addr)->sin_port);
+		addr_to_str(&repinfo->client_addr, repinfo->client_addrlen, ip, sizeof(ip));
+		port = ntohs(((struct sockaddr_in*)&repinfo->client_addr)->sin_port);
 	} else if(ms && ms->mesh_info && ms->mesh_info->reply_list) {
-		addr_to_str(&ms->mesh_info->reply_list->query_reply.addr, ms->mesh_info->reply_list->query_reply.addrlen, ip, sizeof(ip));
-		port = ntohs(((struct sockaddr_in*)&ms->mesh_info->reply_list->query_reply.addr)->sin_port);
+		addr_to_str(&ms->mesh_info->reply_list->query_reply.client_addr,
+			ms->mesh_info->reply_list->query_reply.client_addrlen,
+			ip, sizeof(ip));
+		port = ntohs(((struct sockaddr_in*)&ms->mesh_info->reply_list->query_reply.client_addr)->sin_port);
 	} else {
 		ip[0]=0;
 		port = 0;
@@ -1468,7 +1470,9 @@ rpz_resolve_client_action_and_zone(struct auth_zones* az, struct query_info* qin
 		}
 		z = rpz_find_zone(r->local_zones, qinfo->qname, qinfo->qname_len,
 			qinfo->qclass, 0, 0, 0);
-		node = rpz_ipbased_trigger_lookup(r->client_set, &repinfo->addr, repinfo->addrlen, "clientip");
+		node = rpz_ipbased_trigger_lookup(r->client_set,
+			&repinfo->client_addr, repinfo->client_addrlen,
+			"clientip");
 		if((z || node) && r->action_override == RPZ_DISABLED_ACTION) {
 			if(r->log)
 				log_rpz_apply((node?"clientip":"qname"),
diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index 39b507499..f850469ba 100644
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -338,6 +338,8 @@ interfacechecks(struct config_file* cfg)
 	int i, j, i2, j2;
 	char*** resif = NULL;
 	int* num_resif = NULL;
+	char portbuf[32];
+	snprintf(portbuf, sizeof(portbuf), "%d", cfg->port);
 
 	if(cfg->num_ifs != 0) {
 		resif = (char***)calloc(cfg->num_ifs, sizeof(char**));
@@ -359,9 +361,21 @@ interfacechecks(struct config_file* cfg)
 			fatal_exit("could not resolve interface names, for %s",
 				cfg->ifs[i]);
 		}
+		/* check for port combinations that are not supported */
+		if(if_is_pp2(resif[i][0], portbuf, cfg->proxy_protocol_port)) {
+			if(if_is_dnscrypt(resif[i][0], portbuf,
+				cfg->dnscrypt_port)) {
+				fatal_exit("PROXYv2 and DNSCrypt combination not "
+					"supported!");
+			} else if(if_is_https(resif[i][0], portbuf,
+				cfg->https_port)) {
+				fatal_exit("PROXYv2 and DoH combination not "
+					"supported!");
+			}
+		}
 		/* search for duplicates in the returned addresses */
 		for(j=0; j<num_resif[i]; j++) {
-			if(!extstrtoaddr(resif[i][j], &a, &alen, UNBOUND_DNS_PORT)) {
+			if(!extstrtoaddr(resif[i][j], &a, &alen, cfg->port)) {
 				if(strcmp(cfg->ifs[i], resif[i][j]) != 0)
 					fatal_exit("cannot parse interface address '%s' from the interface specified as '%s'",
 						resif[i][j], cfg->ifs[i]);
diff --git a/testcode/do-tests.sh b/testcode/do-tests.sh
index 1669d6c33..6599f9f66 100755
--- a/testcode/do-tests.sh
+++ b/testcode/do-tests.sh
@@ -16,7 +16,7 @@ NEED_WHOAMI='07-confroot.tdir'
 NEED_IPV6='fwd_ancil.tdir fwd_tcp_tc6.tdir stub_udp6.tdir edns_cache.tdir'
 NEED_NOMINGW='tcp_sigpipe.tdir 07-confroot.tdir 08-host-lib.tdir fwd_ancil.tdir'
 NEED_DNSCRYPT_PROXY='dnscrypt_queries.tdir dnscrypt_queries_chacha.tdir'
-NEED_UNSHARE='acl_interface.tdir'
+NEED_UNSHARE='acl_interface.tdir proxy_protocol.tdir'
 
 # test if dig and ldns-testns are available.
 test_tool_avail "dig"
diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 03e1c04f3..efb22a6fb 100644
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -384,8 +384,8 @@ answer_callback_from_entry(struct replay_runtime* runtime,
 	fill_buffer_with_reply(c.buffer, entry, pend->pkt, pend->pkt_len,
 		pend->tcp_pkt_counter);
 	repinfo.c = &c;
-	repinfo.addrlen = pend->addrlen;
-	memcpy(&repinfo.addr, &pend->addr, pend->addrlen);
+	repinfo.remote_addrlen = pend->addrlen;
+	memcpy(&repinfo.remote_addr, &pend->addr, pend->addrlen);
 	if(!pend->serviced) {
 		if(entry && entry->reply_list->next &&
 			pend->tcp_pkt_counter < count_reply_packets(entry)) {
@@ -415,7 +415,7 @@ answer_check_it(struct replay_runtime* runtime)
 			tr = transport_udp;
 		if((runtime->now->addrlen == 0 || sockaddr_cmp(
 			&runtime->now->addr, runtime->now->addrlen,
-			&ans->repinfo.addr, ans->repinfo.addrlen) == 0) &&
+			&ans->repinfo.remote_addr, ans->repinfo.remote_addrlen) == 0) &&
 			find_match(runtime->now->match, ans->pkt,
 				ans->pkt_len, tr)) {
 			log_info("testbound matched event entry from line %d",
@@ -453,10 +453,12 @@ fake_front_query(struct replay_runtime* runtime, struct replay_moment *todo)
 	repinfo.c = (struct comm_point*)calloc(1, sizeof(struct comm_point));
 	if(!repinfo.c)
 		fatal_exit("out of memory in fake_front_query");
-	repinfo.addrlen = (socklen_t)sizeof(struct sockaddr_in);
+	repinfo.remote_addrlen = (socklen_t)sizeof(struct sockaddr_in);
 	if(todo->addrlen != 0) {
-		repinfo.addrlen = todo->addrlen;
-		memcpy(&repinfo.addr, &todo->addr, todo->addrlen);
+		repinfo.remote_addrlen = todo->addrlen;
+		memcpy(&repinfo.remote_addr, &todo->addr, todo->addrlen);
+		repinfo.client_addrlen = todo->addrlen;
+		memcpy(&repinfo.client_addr, &todo->addr, todo->addrlen);
 	}
 	repinfo.c->fd = -1;
 	repinfo.c->ev = (struct internal_event*)runtime;
@@ -510,8 +512,8 @@ fake_pending_callback(struct replay_runtime* runtime,
 			p->pkt_len, p->tcp_pkt_counter);
 	}
 	repinfo.c = &c;
-	repinfo.addrlen = p->addrlen;
-	memcpy(&repinfo.addr, &p->addr, p->addrlen);
+	repinfo.remote_addrlen = p->addrlen;
+	memcpy(&repinfo.remote_addr, &p->addr, p->addrlen);
 	if(!p->serviced) {
 		if(todo->match && todo->match->reply_list->next && !error &&
 			p->tcp_pkt_counter < count_reply_packets(todo->match)) {
@@ -1663,6 +1665,7 @@ int create_udp_sock(int ATTR_UNUSED(family), int ATTR_UNUSED(socktype),
 
 struct comm_point* comm_point_create_udp(struct comm_base *ATTR_UNUSED(base),
 	int ATTR_UNUSED(fd), sldns_buffer* ATTR_UNUSED(buffer),
+	int ATTR_UNUSED(pp2_enabled),
 	comm_point_callback_type* ATTR_UNUSED(callback),
 	void* ATTR_UNUSED(callback_arg),
 	struct unbound_socket* ATTR_UNUSED(socket))
diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index 0761e9d18..b2c0d5328 100644
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -49,6 +49,7 @@
 #include "util/locks.h"
 #include "util/log.h"
 #include "util/net_help.h"
+#include "util/proxy_protocol.h"
 #include "util/data/msgencode.h"
 #include "util/data/msgparse.h"
 #include "util/data/msgreply.h"
@@ -71,6 +72,7 @@ static void usage(char* argv[])
 	printf("usage: %s [options] name type class ...\n", argv[0]);
 	printf("	sends the name-type-class queries over TCP.\n");
 	printf("-f server	what ipaddr@portnr to send the queries to\n");
+	printf("-p client	what ipaddr@portnr to include in PROXYv2\n");
 	printf("-u 		use UDP. No retries are attempted.\n");
 	printf("-n 		do not wait for an answer.\n");
 	printf("-a 		print answers as they arrive.\n");
@@ -82,18 +84,17 @@ static void usage(char* argv[])
 
 /** open TCP socket to svr */
 static int
-open_svr(const char* svr, int udp)
+open_svr(const char* svr, int udp, struct sockaddr_storage* addr,
+	socklen_t* addrlen)
 {
-	struct sockaddr_storage addr;
-	socklen_t addrlen;
 	int fd = -1;
 	/* svr can be ip@port */
-	memset(&addr, 0, sizeof(addr));
-	if(!extstrtoaddr(svr, &addr, &addrlen, UNBOUND_DNS_PORT)) {
+	memset(addr, 0, sizeof(*addr));
+	if(!extstrtoaddr(svr, addr, addrlen, UNBOUND_DNS_PORT)) {
 		printf("fatal: bad server specs '%s'\n", svr);
 		exit(1);
 	}
-	fd = socket(addr_is_ip6(&addr, addrlen)?PF_INET6:PF_INET,
+	fd = socket(addr_is_ip6(addr, *addrlen)?PF_INET6:PF_INET,
 		udp?SOCK_DGRAM:SOCK_STREAM, 0);
 	if(fd == -1) {
 #ifndef USE_WINSOCK
@@ -103,7 +104,7 @@ open_svr(const char* svr, int udp)
 #endif
 		exit(1);
 	}
-	if(connect(fd, (struct sockaddr*)&addr, addrlen) < 0) {
+	if(connect(fd, (struct sockaddr*)addr, *addrlen) < 0) {
 #ifndef USE_WINSOCK
 		perror("connect() error");
 #else
@@ -116,11 +117,12 @@ open_svr(const char* svr, int udp)
 
 /** write a query over the TCP fd */
 static void
-write_q(int fd, int udp, SSL* ssl, sldns_buffer* buf, uint16_t id, 
+write_q(int fd, int udp, SSL* ssl, sldns_buffer* buf, uint16_t id,
+	sldns_buffer* proxy_buf, int pp2_parsed,
 	const char* strname, const char* strtype, const char* strclass)
 {
 	struct query_info qinfo;
-	uint16_t len;
+	size_t proxy_buf_limit = sldns_buffer_limit(proxy_buf);
 	/* qname */
 	qinfo.qname = sldns_str2wire_dname(strname, &qinfo.qname_len);
 	if(!qinfo.qname) {
@@ -152,9 +154,27 @@ write_q(int fd, int udp, SSL* ssl, sldns_buffer* buf, uint16_t id,
 			attach_edns_record(buf, &edns);
 	}
 
+	/* we need to send the PROXYv2 information in every UDP message */
+	if(udp && pp2_parsed) {
+		/* append the proxy_buf with the buf's content
+		 * and use that for sending */
+		if(sldns_buffer_capacity(proxy_buf) <
+			sldns_buffer_limit(proxy_buf) +
+			sldns_buffer_limit(buf)) {
+			printf("buffer too small for packet + proxy");
+			exit(1);
+		}
+		sldns_buffer_clear(proxy_buf);
+		sldns_buffer_skip(proxy_buf, proxy_buf_limit);
+		sldns_buffer_write(proxy_buf, sldns_buffer_begin(buf),
+			sldns_buffer_limit(buf));
+		sldns_buffer_flip(proxy_buf);
+		buf = proxy_buf;
+	}
+
 	/* send it */
 	if(!udp) {
-		len = (uint16_t)sldns_buffer_limit(buf);
+		uint16_t len = (uint16_t)sldns_buffer_limit(buf);
 		len = htons(len);
 		if(ssl) {
 			if(SSL_write(ssl, (void*)&len, (int)sizeof(len)) <= 0) {
@@ -167,7 +187,7 @@ write_q(int fd, int udp, SSL* ssl, sldns_buffer* buf, uint16_t id,
 #ifndef USE_WINSOCK
 				perror("send() len failed");
 #else
-				printf("send len: %s\n", 
+				printf("send len: %s\n",
 					wsa_strerror(WSAGetLastError()));
 #endif
 				exit(1);
@@ -182,17 +202,20 @@ write_q(int fd, int udp, SSL* ssl, sldns_buffer* buf, uint16_t id,
 		}
 	} else {
 		if(send(fd, (void*)sldns_buffer_begin(buf),
-			sldns_buffer_limit(buf), 0) < 
+			sldns_buffer_limit(buf), 0) <
 			(ssize_t)sldns_buffer_limit(buf)) {
 #ifndef USE_WINSOCK
 			perror("send() data failed");
 #else
-			printf("send data: %s\n", wsa_strerror(WSAGetLastError()));
+			printf("send data: %s\n",
+				wsa_strerror(WSAGetLastError()));
 #endif
 			exit(1);
 		}
 	}
 
+	/* reset the proxy_buf for next packet */
+	sldns_buffer_set_limit(proxy_buf, proxy_buf_limit);
 	free(qinfo.qname);
 }
 
@@ -224,7 +247,7 @@ recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf)
 #ifndef USE_WINSOCK
 				perror("read() len failed");
 #else
-				printf("read len: %s\n", 
+				printf("read len: %s\n",
 					wsa_strerror(WSAGetLastError()));
 #endif
 				exit(1);
@@ -243,12 +266,12 @@ recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf)
 			if(r != (int)len)
 				fatal_exit("ssl_read %d of %d", r, len);
 		} else {
-			if(recv(fd, (void*)sldns_buffer_begin(buf), len, 0) < 
+			if(recv(fd, (void*)sldns_buffer_begin(buf), len, 0) <
 				(ssize_t)len) {
 #ifndef USE_WINSOCK
 				perror("read() data failed");
 #else
-				printf("read data: %s\n", 
+				printf("read data: %s\n",
 					wsa_strerror(WSAGetLastError()));
 #endif
 				exit(1);
@@ -257,12 +280,12 @@ recv_one(int fd, int udp, SSL* ssl, sldns_buffer* buf)
 	} else {
 		ssize_t l;
 		sldns_buffer_clear(buf);
-		if((l=recv(fd, (void*)sldns_buffer_begin(buf), 
+		if((l=recv(fd, (void*)sldns_buffer_begin(buf),
 			sldns_buffer_capacity(buf), 0)) < 0) {
 #ifndef USE_WINSOCK
 			perror("read() data failed");
 #else
-			printf("read data: %s\n", 
+			printf("read data: %s\n",
 				wsa_strerror(WSAGetLastError()));
 #endif
 			exit(1);
@@ -324,17 +347,40 @@ static int get_random(void)
 	return (int)arc4random();
 }
 
+/* parse the pp2_client and populate the proxy_buffer
+ * It doesn't populate the destination parts. */
+static int parse_pp2_client(const char* pp2_client, int udp,
+	sldns_buffer* proxy_buf)
+{
+	struct sockaddr_storage pp2_addr;
+	socklen_t pp2_addrlen = 0;
+	memset(&pp2_addr, 0, sizeof(pp2_addr));
+	if(*pp2_client == 0) return 0;
+	if(!extstrtoaddr(pp2_client, &pp2_addr, &pp2_addrlen, UNBOUND_DNS_PORT)) {
+		printf("fatal: bad proxy client specs '%s'\n", pp2_client);
+		exit(1);
+	}
+	sldns_buffer_clear(proxy_buf);
+	pp2_write_to_buf(proxy_buf, &pp2_addr, !udp);
+	sldns_buffer_flip(proxy_buf);
+	return 1;
+}
+
 /** send the TCP queries and print answers */
 static void
-send_em(const char* svr, int udp, int usessl, int noanswer, int onarrival,
-	int delay, int num, char** qs)
+send_em(const char* svr, const char* pp2_client, int udp, int usessl,
+	int noanswer, int onarrival, int delay, int num, char** qs)
 {
 	sldns_buffer* buf = sldns_buffer_new(65553);
-	int fd = open_svr(svr, udp);
-	int i, wait_results = 0;
+	sldns_buffer* proxy_buf = sldns_buffer_new(65553);
+	struct sockaddr_storage svr_addr;
+	socklen_t svr_addrlen;
+	int fd = open_svr(svr, udp, &svr_addr, &svr_addrlen);
+	int i, wait_results = 0, pp2_parsed;
 	SSL_CTX* ctx = NULL;
 	SSL* ssl = NULL;
 	if(!buf) fatal_exit("out of memory");
+	pp2_parsed = parse_pp2_client(pp2_client, udp, proxy_buf);
 	if(usessl) {
 		ctx = connect_sslctx_create(NULL, NULL, NULL, 0);
 		if(!ctx) fatal_exit("cannot create ssl ctx");
@@ -361,6 +407,28 @@ send_em(const char* svr, int udp, int usessl, int noanswer, int onarrival,
 			}
 		}
 	}
+	/* Send the PROXYv2 information once per stream */
+	if(!udp && pp2_parsed) {
+		if(ssl) {
+			if(SSL_write(ssl, (void*)sldns_buffer_begin(proxy_buf),
+				(int)sldns_buffer_limit(proxy_buf)) <= 0) {
+				log_crypto_err("cannot SSL_write");
+				exit(1);
+			}
+		} else {
+			if(send(fd, (void*)sldns_buffer_begin(proxy_buf),
+				sldns_buffer_limit(proxy_buf), 0) <
+				(ssize_t)sldns_buffer_limit(proxy_buf)) {
+#ifndef USE_WINSOCK
+				perror("send() data failed");
+#else
+				printf("send data: %s\n",
+					wsa_strerror(WSAGetLastError()));
+#endif
+				exit(1);
+			}
+		}
+	}
 	for(i=0; i<num; i+=3) {
 		if (delay != 0) {
 #ifdef HAVE_SLEEP
@@ -370,8 +438,9 @@ send_em(const char* svr, int udp, int usessl, int noanswer, int onarrival,
 #endif
 		}
 		printf("\nNext query is %s %s %s\n", qs[i], qs[i+1], qs[i+2]);
-		write_q(fd, udp, ssl, buf, (uint16_t)get_random(), qs[i],
-			qs[i+1], qs[i+2]);
+		write_q(fd, udp, ssl, buf, (uint16_t)get_random(), proxy_buf,
+			pp2_parsed,
+			qs[i], qs[i+1], qs[i+2]);
 		/* print at least one result */
 		if(onarrival) {
 			wait_results += 1; /* one more answer to fetch */
@@ -390,6 +459,7 @@ send_em(const char* svr, int udp, int usessl, int noanswer, int onarrival,
 	}
 	sock_close(fd);
 	sldns_buffer_free(buf);
+	sldns_buffer_free(proxy_buf);
 	printf("orderly exit\n");
 }
 
@@ -418,10 +488,11 @@ extern int optind;
 extern char* optarg;
 
 /** main program for streamtcp */
-int main(int argc, char** argv) 
+int main(int argc, char** argv)
 {
 	int c;
 	const char* svr = "127.0.0.1";
+	const char* pp2_client = "";
 	int udp = 0;
 	int noanswer = 0;
 	int onarrival = 0;
@@ -451,11 +522,14 @@ int main(int argc, char** argv)
 	if(argc == 1) {
 		usage(argv);
 	}
-	while( (c=getopt(argc, argv, "af:hnsud:")) != -1) {
+	while( (c=getopt(argc, argv, "af:p:hnsud:")) != -1) {
 		switch(c) {
 			case 'f':
 				svr = optarg;
 				break;
+			case 'p':
+				pp2_client = optarg;
+				break;
 			case 'a':
 				onarrival = 1;
 				break;
@@ -508,7 +582,7 @@ int main(int argc, char** argv)
 		(void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
 #endif
 	}
-	send_em(svr, udp, usessl, noanswer, onarrival, delay, argc, argv);
+	send_em(svr, pp2_client, udp, usessl, noanswer, onarrival, delay, argc, argv);
 	checklock_stop();
 #ifdef USE_WINSOCK
 	WSACleanup();
diff --git a/testdata/04-checkconf.tdir/04-checkconf.test b/testdata/04-checkconf.tdir/04-checkconf.test
index a2396fef7..339e346d9 100644
--- a/testdata/04-checkconf.tdir/04-checkconf.test
+++ b/testdata/04-checkconf.tdir/04-checkconf.test
@@ -28,6 +28,12 @@ if grep "define UB_ON_WINDOWS 1" ../../config.h; then
 else
 	onwin=0
 fi
+# detect dnscrypt
+if grep "define USE_DNSCRYPT 1" ../../config.h; then
+	with_dnscrypt=1
+else
+	with_dnscrypt=0
+fi
 
 # test check of config files.
 for f in bad.*; do
@@ -37,6 +43,10 @@ for f in bad.*; do
 		echo "skipped on windows"
 		continue
 	fi
+	if test $f = "bad.proxy-and-dnscrypt" -a $with_dnscrypt -eq 0; then
+		echo "skipped; no DNSCRYPT support"
+		continue
+	fi
 
 	$PRE/unbound-checkconf $f
 	if test $? != 1; then
diff --git a/testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt b/testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt
new file mode 100644
index 000000000..ece7544ba
--- /dev/null
+++ b/testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt
@@ -0,0 +1,5 @@
+server:
+	interface: 127.0.0.1
+        proxy-protocol-port: 53
+dnscrypt:
+        dnscrypt-port: 53
diff --git a/testdata/04-checkconf.tdir/bad.proxy-and-https b/testdata/04-checkconf.tdir/bad.proxy-and-https
new file mode 100644
index 000000000..d27373ce0
--- /dev/null
+++ b/testdata/04-checkconf.tdir/bad.proxy-and-https
@@ -0,0 +1,4 @@
+server:
+	interface: 127.0.0.1
+        proxy-protocol-port: 53
+        https-port: 53
diff --git a/testdata/proxy_protocol.tdir/proxy_protocol.conf b/testdata/proxy_protocol.tdir/proxy_protocol.conf
new file mode 100644
index 000000000..c5fa0ab33
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/proxy_protocol.conf
@@ -0,0 +1,34 @@
+server:
+	verbosity: 5
+	num-threads: 1
+	interface: 127.0.0.1@@PORT@
+	interface: 127.0.0.1@@PROXYPORT@
+	interface: 127.0.0.1@@PROXYTLSPORT@
+	interface: @INTERFACE_ALLOW_ADDR@@@PORT@
+	interface: @INTERFACE_ALLOW_ADDR@@@PROXYPORT@
+	interface: @INTERFACE_ALLOW_ADDR@@@PROXYTLSPORT@
+	interface: @INTERFACE_REFUSE_ADDR@@@PORT@
+	interface: @INTERFACE_REFUSE_ADDR@@@PROXYPORT@
+	interface: @INTERFACE_REFUSE_ADDR@@@PROXYTLSPORT@
+	proxy-protocol-port: @PROXYPORT@
+	proxy-protocol-port: @PROXYTLSPORT@
+	tls-port: @PROXYTLSPORT@
+	use-syslog: no
+	directory: .
+	pidfile: "unbound.pid"
+	chroot: ""
+	username: ""
+	do-not-query-localhost: no
+	tls-service-key: "unbound_server.key"
+	tls-service-pem: "unbound_server.pem"
+
+	# 127.0.0.0/8 is allowed by default.
+	access-control: @CLIENT_ADDR_ALLOW@/32 allow
+	access-control: @CLIENT_ADDR_REFUSE@/32 refuse
+	access-control: @CLIENT_ADDR_ALLOW6@/128 allow
+	access-control: @CLIENT_ADDR_REFUSE6@/128 refuse
+	access-control: @INTERFACE_ALLOW_ADDR@/32 allow
+
+forward-zone:
+	name: "."
+	forward-addr: "127.0.0.1@@TOPORT@"
diff --git a/testdata/proxy_protocol.tdir/proxy_protocol.dsc b/testdata/proxy_protocol.tdir/proxy_protocol.dsc
new file mode 100644
index 000000000..34155f035
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/proxy_protocol.dsc
@@ -0,0 +1,16 @@
+BaseName: proxy_protocol
+Version: 1.0
+Description: Test proxy protocol
+CreationDate: Mon Mar 14 16:17:00 CET 2022
+Maintainer: Yorgos Thessalonikefs
+Category:
+Component:
+CmdDepends:
+Depends:
+Help:
+Pre: proxy_protocol.pre
+Post: proxy_protocol.post
+Test: proxy_protocol.test
+AuxFiles:
+Passed:
+Failure:
diff --git a/testdata/proxy_protocol.tdir/proxy_protocol.post b/testdata/proxy_protocol.tdir/proxy_protocol.post
new file mode 100644
index 000000000..cbf56bbd9
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/proxy_protocol.post
@@ -0,0 +1,12 @@
+# #-- proxy_protocol.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $FWD_PID
+kill_pid $UNBOUND_PID
+cat unbound.log
+exit 0
diff --git a/testdata/proxy_protocol.tdir/proxy_protocol.pre b/testdata/proxy_protocol.tdir/proxy_protocol.pre
new file mode 100644
index 000000000..01cf357f5
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/proxy_protocol.pre
@@ -0,0 +1,66 @@
+# #-- proxy_protocol.pre--#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+PRE="../.."
+. ../common.sh
+
+# This test uses the unshare utility
+if test ! -x "`which unshare 2>&1`"; then
+	skip_test "no unshare (from util-linux package) available, skip test"
+fi
+
+get_make
+(cd $PRE; $MAKE streamtcp)
+
+get_random_port 4
+UNBOUND_PORT=$RND_PORT
+FWD_PORT=$(($RND_PORT + 1))
+PROXY_PORT=$(($RND_PORT + 2))
+PROXY_TLS_PORT=$(($RND_PORT + 3))
+
+INTERFACE_ALLOW=eth123
+INTERFACE_ALLOW_ADDR=10.1.2.3
+INTERFACE_REFUSE=eth234
+INTERFACE_REFUSE_ADDR=10.2.3.4
+
+CLIENT_ADDR_ALLOW=1.2.3.4
+CLIENT_ADDR_ALLOW6=2001:db8::cafe:cafe
+CLIENT_ADDR_REFUSE=5.6.7.8
+CLIENT_ADDR_REFUSE6=2001:db8::dead:beef
+
+# make config file
+sed \
+	-e 's/@PORT\@/'$UNBOUND_PORT'/' \
+	-e 's/@TOPORT\@/'$FWD_PORT'/' \
+	-e 's/@PROXYPORT\@/'$PROXY_PORT'/' \
+	-e 's/@PROXYTLSPORT\@/'$PROXY_TLS_PORT'/' \
+	-e 's/@INTERFACE_ALLOW_ADDR\@/'$INTERFACE_ALLOW_ADDR'/' \
+	-e 's/@INTERFACE_REFUSE_ADDR\@/'$INTERFACE_REFUSE_ADDR'/' \
+	-e 's/@CLIENT_ADDR_ALLOW\@/'$CLIENT_ADDR_ALLOW'/' \
+	-e 's/@CLIENT_ADDR_ALLOW6\@/'$CLIENT_ADDR_ALLOW6'/' \
+	-e 's/@CLIENT_ADDR_REFUSE\@/'$CLIENT_ADDR_REFUSE'/' \
+	-e 's/@CLIENT_ADDR_REFUSE6\@/'$CLIENT_ADDR_REFUSE6'/' \
+	< proxy_protocol.conf > ub.conf
+
+if test -x "`which bash`"; then
+	shell="bash"
+else
+	shell="sh"
+fi
+
+echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test
+echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test
+echo "PROXY_PORT=$PROXY_PORT" >> .tpkg.var.test
+echo "PROXY_TLS_PORT=$PROXY_TLS_PORT" >> .tpkg.var.test
+echo "INTERFACE_ALLOW=$INTERFACE_ALLOW" >> .tpkg.var.test
+echo "INTERFACE_ALLOW_ADDR=$INTERFACE_ALLOW_ADDR" >> .tpkg.var.test
+echo "INTERFACE_REFUSE=$INTERFACE_REFUSE" >> .tpkg.var.test
+echo "INTERFACE_REFUSE_ADDR=$INTERFACE_REFUSE_ADDR" >> .tpkg.var.test
+echo "CLIENT_ADDR_ALLOW=$CLIENT_ADDR_ALLOW" >> .tpkg.var.test
+echo "CLIENT_ADDR_ALLOW6=$CLIENT_ADDR_ALLOW6" >> .tpkg.var.test
+echo "CLIENT_ADDR_REFUSE=$CLIENT_ADDR_REFUSE" >> .tpkg.var.test
+echo "CLIENT_ADDR_REFUSE6=$CLIENT_ADDR_REFUSE6" >> .tpkg.var.test
+echo "shell=$shell" >> .tpkg.var.test
diff --git a/testdata/proxy_protocol.tdir/proxy_protocol.test b/testdata/proxy_protocol.tdir/proxy_protocol.test
new file mode 100644
index 000000000..3f65e2932
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/proxy_protocol.test
@@ -0,0 +1,12 @@
+# #-- proxy_protocol.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+PRE="../.."
+. ../common.sh
+
+# Run the scenario in an unshared namespace
+unshare -rUn $shell proxy_protocol.test.scenario
+exit $?
diff --git a/testdata/proxy_protocol.tdir/proxy_protocol.test.scenario b/testdata/proxy_protocol.tdir/proxy_protocol.test.scenario
new file mode 100644
index 000000000..0b8fe6efa
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/proxy_protocol.test.scenario
@@ -0,0 +1,193 @@
+# #-- proxy_protocol.test.scenario --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+PRE="../.."
+. ../common.sh
+
+ip addr add 127.0.0.1 dev lo
+ip link set lo up
+
+ip link add $INTERFACE_ALLOW type dummy
+ip addr add $INTERFACE_ALLOW_ADDR dev $INTERFACE_ALLOW
+ip link set $INTERFACE_ALLOW up
+
+ip link add $INTERFACE_REFUSE type dummy
+ip addr add $INTERFACE_REFUSE_ADDR dev $INTERFACE_REFUSE
+ip link set $INTERFACE_REFUSE up
+
+# start forwarder in the background
+get_ldns_testns
+$LDNS_TESTNS -p $FWD_PORT proxy_protocol.testns >fwd.log 2>&1 &
+FWD_PID=$!
+echo "FWD_PID=$FWD_PID" >> .tpkg.var.test
+
+# start unbound in the background
+$PRE/unbound -d -c ub.conf >unbound.log 2>&1 &
+UNBOUND_PID=$!
+echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
+
+wait_ldns_testns_up fwd.log
+wait_unbound_up unbound.log
+
+# call streamtcp and check return value
+do_streamtcp () {
+	$PRE/streamtcp $* A IN >outfile 2>&1
+	if test "$?" -ne 0; then
+		echo "exit status not OK"
+		echo "> cat logfiles"
+		cat outfile
+		cat unbound.log
+		echo "Not OK"
+		exit 1
+	fi
+}
+
+send_query () {
+	server=$1
+	client=$2
+	prot=$3
+	query=$4
+	echo -n "> query $query to $server"
+	port=$UNBOUND_PORT
+	if test ! -z "$client"; then
+		port=$PROXY_PORT
+	fi
+	case $prot in
+		-u)
+			echo -n " (over UDP)"
+			;;
+		-s)
+			echo -n " (over TLS)"
+			port=$PROXY_TLS_PORT
+			;;
+		*)
+			echo -n " (over TCP)"
+	esac
+	if test ! -z "$client"; then
+		echo -n " ($client proxied)"
+	fi
+	echo
+	do_streamtcp $prot -f $server@$port $client $query
+	#cat outfile
+}
+
+expect_answer () {
+	#query=$1
+	#answer=$2
+	if grep "$query" outfile | grep "$answer"; then
+		echo "content OK"
+		echo
+	else
+		echo "> cat logfiles"
+		cat outfile
+		cat unbound.log
+		echo "result contents not OK"
+		exit 1
+	fi
+}
+
+expect_refuse () {
+	if grep "rcode: REFUSE" outfile; then
+		echo "content OK"
+		echo
+	else
+		echo "> cat logfiles"
+		cat outfile
+		cat unbound.log
+		echo "result contents not OK"
+		exit 1
+	fi
+}
+
+# Start the test
+
+# Query without PROXYv2
+# Client localhost
+# Expect the result back
+server=127.0.0.1
+client=""
+query="two.example.net."
+answer="2.2.2.2"
+for prot in "-u" ""; do
+	send_query "$server" "$client" "$prot" "$query"
+	expect_answer
+done
+
+# Query with PROXYv2
+# Client $CLIENT_ADDR_ALLOW should be allowed
+# Expect the result back
+server=127.0.0.1
+client="-p $CLIENT_ADDR_ALLOW@1234"
+query="one.example.net."
+answer="1.1.1.1"
+for prot in "-u" "" "-s"; do
+	send_query "$server" "$client" "$prot" "$query"
+	expect_answer
+done
+
+# Query with PROXYv2
+# Client $CLIENT_ADDR_ALLOW6 should be allowed
+# Expect the result back
+server=127.0.0.1
+client="-p $CLIENT_ADDR_ALLOW6@1234"
+query="one.example.net."
+answer="1.1.1.1"
+for prot in "-u" "" "-s"; do
+	send_query "$server" "$client" "$prot" "$query"
+	expect_answer
+done
+
+# Query with PROXYv2
+# Client $CLIENT_ADDR_REFUSE should be refused
+# Expect the REFUSE back
+server=127.0.0.1
+client="-p $CLIENT_ADDR_REFUSE"
+query="one.example.net."
+answer=""
+for prot in "-u" "" "-s"; do
+	send_query "$server" "$client" "$prot" "$query"
+	expect_refuse
+done
+
+# Query with PROXYv2
+# Client $CLIENT_ADDR_REFUSE6 should be refused
+# Expect the REFUSE back
+server=127.0.0.1
+client="-p $CLIENT_ADDR_REFUSE6"
+query="one.example.net."
+answer=""
+for prot in "-u" "" "-s"; do
+	send_query "$server" "$client" "$prot" "$query"
+	expect_refuse
+done
+
+# Query with PROXYv2
+# Client $CLIENT_ADDR_ALLOW should be allowed; proxy source address should be allowed
+# Expect the result back
+server=$INTERFACE_ALLOW_ADDR
+client="-p $CLIENT_ADDR_ALLOW@1234"
+query="one.example.net."
+answer="1.1.1.1"
+for prot in "-u" "" "-s"; do
+	send_query "$server" "$client" "$prot" "$query"
+	expect_answer
+done
+
+# Query with PROXYv2
+# Client $CLIENT_ADDR_ALLOW should be allowed; proxy source address should be refused
+# Expect the REFUSE back
+server=$INTERFACE_REFUSE_ADDR
+client="-p $CLIENT_ADDR_ALLOW@1234"
+query="one.example.net."
+answer=""
+for prot in "-u" "" "-s"; do
+	send_query "$server" "$client" "$prot" "$query"
+	expect_refuse
+done
+
+echo "OK"
+exit 0
+
diff --git a/testdata/proxy_protocol.tdir/proxy_protocol.testns b/testdata/proxy_protocol.tdir/proxy_protocol.testns
new file mode 100644
index 000000000..176bc936a
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/proxy_protocol.testns
@@ -0,0 +1,23 @@
+; nameserver test file
+$ORIGIN example.net.
+$TTL 3600
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR RD RA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+one	IN	A
+SECTION ANSWER
+one	IN	A	1.1.1.1
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+REPLY QR RD RA NOERROR
+ADJUST copy_id
+SECTION QUESTION
+two	IN	A
+SECTION ANSWER
+two	IN	A	2.2.2.2
+ENTRY_END
diff --git a/testdata/proxy_protocol.tdir/unbound_server.key b/testdata/proxy_protocol.tdir/unbound_server.key
new file mode 100644
index 000000000..370a7bbb2
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/unbound_server.key
@@ -0,0 +1,39 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIG5AIBAAKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI
+0x41iG32a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+Nqq
+GRS7XVQ24vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Z
+uh9MDgotaBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8K
+WaBe1ca4TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5
+FzUReSXZuTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xP
+q6O9UPj4+nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XL
+A5UoZgRzXgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP
+7kFZSngxdy1+A/bNAgMBAAECggGBALpTOIqQwVg4CFBylL/a8K1IWJTI/I65sklf
+XxYL7G7SB2HlEJ//z+E+F0+S4Vlao1vyLQ5QkgE82pAUB8FoMWvY1qF0Y8A5wtm6
+iZSGk4OLK488ZbT8Ii9i+AGKgPe2XbVxsJwj8N4k7Zooqec9hz73Up8ATEWJkRz7
+2u7oMGG4z91E0PULA64dOi3l/vOQe5w/Aa+CwVbAWtI05o7kMvQEBMDJn6C7CByo
+MB5op9wueJMnz7PM7hns+U7Dy6oE4ljuolJUy51bDzFWwoM54cRoQqLFNHd8JVQj
+WxldCkbfF43iyprlsEcUrTyUjtdA+ZeiG39vg/mtdmgNpGmdupHJZQvSuG8IcVlz
+O+eMSeQS1QXPD6Ik8UK4SU0h+zOl8xIWtRrsxQuh4fnTN40udm/YUWl/6gOebsBI
+IrVLlKGqJSfB3tMjpCRqdTzJ0dA9keVpkqm2ugZkxEf1+/efq/rFIQ2pUBLCqNTN
+qpNqruK8y8FphP30I2uI4Ej2UIB8AQKBwQDd2Yptj2FyDyaXCycsyde0wYkNyzGU
+dRnzdibfHnMZwjgTjwAwgIUBVIS8H0/z7ZJQKN7osJfddMrtjJtYYUk9g/dCpHXs
+bNh2QSoWah3FdzNGuWd0iRf9+LFxhjAAMo/FS8zFJAJKrFsBdCGTfFUMdsLC0bjr
+YjiWBuvV72uKf8XIZX5KIZruKdWBBcWukcb21R1UDyFYyXRBsly5XHaIYKZql3km
+7pV7MKWO0IYgHbHIqGUqPQlzZ/lkunS1jKECgcEA23wHffD6Ou9/x3okPx2AWpTr
+gh8rgqbyo6hQkBW5Y90Wz824cqaYebZDaBR/xlVx/YwjKkohv8Bde2lpH/ZxRZ1Z
+5Sk2s6GJ/vU0L9RsJZgCgj4L6Coal1NMxuZtCXAlnOpiCdxSZgfqbshbTVz30KsG
+ZJG361Cua1ScdAHxlZBxT52/1Sm0zRC2hnxL7h4qo7Idmtzs40LAJvYOKekR0pPN
+oWeJfra7vgx/jVNvMFWoOoSLpidVO4g+ot4ery6tAoHAdW3rCic1C2zdnmH28Iw+
+s50l8Lk3mz+I5wgJd1zkzCO0DxZIoWPGA3g7cmCYr6N3KRsZMs4W9NAXgjpFGDkW
+zYsG3K21BdpvkdjYcFjnPVjlOXB2RIc0vehf9Jl02wXoeCSxVUDEPcaRvWk9RJYx
+ZpGOchUU7vNkxHURbIJ4yCzuAi9G8/Jp0dsu+kaV5tufF5SjG5WOrzKjaQsCbdN1
+oqaWMCHRrTvov/Z2C+xwsptFOdN5CSyZzg6hQiI4GMlBAoHAXyb6KINcOEi0YMp3
+BFXJ23tMTnEs78tozcKeipigcsbaqORK3omS+NEnj+uzKUzJyl4CsMbKstK2tFYS
+mSTCHqgE3PBtIpsZtEqhgUraR8IK9GPpzZDTTl9ynZgwFTNlWw3RyuyVXF56J+T8
+kCGJ3hEHCHqT/ZRQyX85BKIDFhA0z4tYKxWVqIFiYBNq56R0X9tMMmMs36mEnF93
+7Ht6mowxTZQRa7nU0qOgeKh/P7ki4Zus3y+WJ+T9IqahLtlRAoHBAIhqMrcxSAB8
+RpB9jukJlAnidw2jCMPgrFE8tP0khhVvGrXMldxAUsMKntDIo8dGCnG1KTcWDI0O
+jepvSPHSsxVLFugL79h0eVIS5z4huW48i9xgU8VlHdgAcgEPIAOFcOw2BCu/s0Vp
+O+MM/EyUOdo3NsibB3qc/GJI6iNBYS7AljYEVo6rXo5V/MZvZUF4vClen6Obzsre
+MTTb+4sJjfqleWuvr1XNMeu2mBfXBQkWGZP1byBK0MvD/aQ2PWq92A==
+-----END RSA PRIVATE KEY-----
diff --git a/testdata/proxy_protocol.tdir/unbound_server.pem b/testdata/proxy_protocol.tdir/unbound_server.pem
new file mode 100644
index 000000000..986807310
--- /dev/null
+++ b/testdata/proxy_protocol.tdir/unbound_server.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCAhMCFBHWXeQ6ZIa9QcQbXLFfC6tj+KA+MA0GCSqGSIb3DQEBCwUAMBIx
+EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjI5WhcNNDAwMzI1MTMzMjI5
+WjASMRAwDgYDVQQDDAd1bmJvdW5kMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+igKCAYEAvjSVSN2QMXudpzukdLCqgg/IOhCX8KYkD0FFFfWcQjgKq5wI0x41iG32
+a6wbGanre4IX7VxaSPu9kkHfnGgynCk5nwDRedE/FLFhAU78PoT0+NqqGRS7XVQ2
+4vLmIz9Hqc2Ozx1um1BXBTmIT0UfN2e22I0LWQ6a3seZlEDRj45gnk7Zuh9MDgot
+aBdm+v1JAbupSf6Zis4VEH3JNdvVGE3O1DHEIeuuz/3BDhpf6WBDH+8KWaBe1ca4
+TZHr9ThL2gEMEfAQl0wXDwRWRoi3NjNMH+mw0L1rjwThI5GXqNIee7o5FzUReSXZ
+uTdFMyGe3Owcx+XoYnwi6cplSNoGsDBu4B9bKKglR9YleJVw4L4Xi8xPq6O9UPj4
++nypHk/DOoC7DIM3ufN0yxPBsFo5TVowxfhdjZXJbbftd2TZv7AH8+XLA5UoZgRz
+XgzECelXSCTBFlMTnT48LfA9pMLydyjAz2UdPHs5Iv+TK5nnI+aJoeaP7kFZSngx
+dy1+A/bNAgMBAAEwDQYJKoZIhvcNAQELBQADggGBABunf93MKaCUHiZgnoOTinsW
+84/EgInrgtKzAyH+BhnKkJOhhR0kkIAx5d9BpDlaSiRTACFon9moWCgDIIsK/Ar7
+JE0Kln9cV//wiiNoFU0O4mnzyGUIMvlaEX6QHMJJQYvL05+w/3AAcf5XmMJtR5ca
+fJ8FqvGC34b2WxX9lTQoyT52sRt+1KnQikiMEnEyAdKktMG+MwKsFDdOwDXyZhZg
+XZhRrfX3/NVJolqB6EahjWIGXDeKuSSKZVtCyib6LskyeMzN5lcRfvubKDdlqFVF
+qlD7rHBsKhQUWK/IO64mGf7y/de+CgHtED5vDvr/p2uj/9sABATfbrOQR3W/Of25
+sLBj4OEfrJ7lX8hQgFaxkMI3x6VFT3W8dTCp7xnQgb6bgROWB5fNEZ9jk/gjSRmD
+yIU+r0UbKe5kBk/CmZVFXL2TyJ92V5NYEQh8V4DGy19qZ6u/XKYyNJL4ocs35GGe
+CA8SBuyrmdhx38h1RHErR2Skzadi1S7MwGf1y431fQ==
+-----END CERTIFICATE-----
diff --git a/util/config_file.c b/util/config_file.c
index 158169c42..f807397e4 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -786,6 +786,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_SIZET_NONZERO("pad-responses-block-size:", pad_responses_block_size)
 	else S_YNO("pad-queries:", pad_queries)
 	else S_SIZET_NONZERO("pad-queries-block-size:", pad_queries_block_size)
+	else S_STRLIST("proxy-protocol-port:", proxy_protocol_port)
 #ifdef USE_IPSECMOD
 	else S_YNO("ipsecmod-enabled:", ipsecmod_enabled)
 	else S_YNO("ipsecmod-ignore-bogus:", ipsecmod_ignore_bogus)
@@ -1262,6 +1263,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_YNO(opt, "pad-queries", pad_queries)
 	else O_DEC(opt, "pad-queries-block-size", pad_queries_block_size)
 	else O_LS2(opt, "edns-client-strings", edns_client_strings)
+	else O_LST(opt, "proxy-protocol-port", proxy_protocol_port)
 #ifdef USE_IPSECMOD
 	else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled)
 	else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus)
@@ -1642,6 +1644,7 @@ config_delete(struct config_file* cfg)
 	config_delstrlist(cfg->python_script);
 	config_delstrlist(cfg->dynlib_file);
 	config_deldblstrlist(cfg->edns_client_strings);
+	config_delstrlist(cfg->proxy_protocol_port);
 #ifdef USE_IPSECMOD
 	free(cfg->ipsecmod_hook);
 	config_delstrlist(cfg->ipsecmod_whitelist);
@@ -2624,3 +2627,35 @@ int cfg_has_https(struct config_file* cfg)
 	}
 	return 0;
 }
+
+/** see if interface is PROXYv2, its port number == the proxy port number */
+int
+if_is_pp2(const char* ifname, const char* port,
+	struct config_strlist* proxy_protocol_port)
+{
+	struct config_strlist* s;
+	char* p = strchr(ifname, '@');
+	for(s = proxy_protocol_port; s; s = s->next) {
+		if(p && atoi(p+1) == atoi(s->str))
+			return 1;
+		if(!p && atoi(port) == atoi(s->str))
+			return 1;
+	}
+	return 0;
+}
+
+/** see if interface is DNSCRYPT, its port number == the dnscrypt port number */
+int
+if_is_dnscrypt(const char* ifname, const char* port, int dnscrypt_port)
+{
+#ifdef USE_DNSCRYPT
+	return ((strchr(ifname, '@') &&
+		atoi(strchr(ifname, '@')+1) == dnscrypt_port) ||
+		(!strchr(ifname, '@') && atoi(port) == dnscrypt_port));
+#else
+	(void)ifname;
+	(void)port;
+	(void)dnscrypt_port;
+	return 0;
+#endif
+}
diff --git a/util/config_file.h b/util/config_file.h
index bbc6d4ac1..b1406913a 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -114,6 +114,8 @@ struct config_file {
 	int do_tcp_keepalive;
 	/** tcp keepalive timeout, in msec */
 	int tcp_keepalive_timeout;
+	/** proxy protocol ports */
+	struct config_strlist* proxy_protocol_port;
 
 	/** private key file for dnstcp-ssl service (enabled if not NULL) */
 	char* ssl_service_key;
@@ -1322,6 +1324,12 @@ int if_is_https(const char* ifname, const char* port, int https_port);
  */
 int cfg_has_https(struct config_file* cfg);
 
+/** see if interface is PROXYv2, its port number == the proxy port number */
+int if_is_pp2(const char* ifname, const char* port,
+	struct config_strlist* proxy_protocol_port);
+
+/** see if interface is DNSCRYPT, its port number == the dnscrypt port number */
+int if_is_dnscrypt(const char* ifname, const char* port, int dnscrypt_port);
 #ifdef USE_LINUX_IP_LOCAL_PORT_RANGE
 #define LINUX_IP_LOCAL_PORT_RANGE_PATH "/proc/sys/net/ipv4/ip_local_port_range"
 #endif
diff --git a/util/configlexer.c b/util/configlexer.c
index 0323464e3..845d9e00d 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -354,8 +354,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 368
-#define YY_END_OF_BUFFER 369
+#define YY_NUM_RULES 369
+#define YY_END_OF_BUFFER 370
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -363,407 +363,409 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[3628] =
+static const flex_int16_t yy_accept[3646] =
     {   0,
-        1,    1,  342,  342,  346,  346,  350,  350,  354,  354,
-        1,    1,  358,  358,  362,  362,  369,  366,    1,  340,
-      340,  367,    2,  367,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  342,  343,  343,  344,
-      367,  346,  347,  347,  348,  367,  353,  350,  351,  351,
-      352,  367,  354,  355,  355,  356,  367,  365,  341,    2,
-      345,  367,  365,  361,  358,  359,  359,  360,  367,  362,
-      363,  363,  364,  367,  366,    0,    1,    2,    2,    2,
-        2,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  342,
-        0,  346,    0,  353,    0,  350,  354,    0,  365,    0,
-        2,    2,  365,  361,    0,  358,  362,    0,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  365,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  339,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  133,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  143,  366,  366,  366,  366,  366,  366,
-      366,  365,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  115,  366,  338,  366,  366,  366,  366,  366,
-      366,  366,  366,    8,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  134,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  148,  366,
-      366,  365,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  331,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  365,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,   69,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  260,  366,   14,   15,  366,   19,   18,
-      366,  366,  240,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  141,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  238,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,    3,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  365,  366,  366,  366,  366,
-      366,  366,  366,  325,  366,  366,  324,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  349,  366,  366,
-      366,  366,  366,  366,  366,  366,   68,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,   72,  366,  294,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  332,  333,  366,  366,  366,
-      366,  366,  366,  366,  366,   73,  366,  366,  142,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  137,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  227,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,   21,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      169,  366,  366,  366,  366,  366,  365,  349,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  113,
-      366,  366,  366,  366,  366,  366,  366,  302,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  196,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  168,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  112,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,   35,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,   36,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,   70,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  140,  366,  366,  366,
-      365,  366,  366,  366,  366,  366,  132,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,   71,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  264,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      197,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,   58,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  282,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,   63,  366,   64,
-      366,  366,  366,  366,  366,  116,  366,  117,  366,  366,
-      366,  366,  366,  114,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,    7,  366,  366,
-      366,  366,  365,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  249,  366,  366,  366,  366,  172,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  265,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,   49,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,   59,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  219,  366,  218,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,   16,   17,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,   74,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  226,  366,  366,  366,  366,  366,  366,
-      119,  366,  118,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  210,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  149,
-
-      366,  366,  366,  365,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  107,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,   95,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      239,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  100,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,   67,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  213,  214,  366,
-      366,  366,  296,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,    6,  366,  366,  366,
-      366,  366,  366,  366,  315,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  300,  366,  366,  366,  366,  366,  366,
-      366,  326,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,   46,  366,  366,  366,
-
-      366,  366,   48,  366,  366,  366,   96,  366,  366,  366,
-      366,  366,   56,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  365,  366,  206,  366,  366,  366,
-      144,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  231,  366,  207,  366,  366,  366,  246,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,   57,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      146,  125,  366,  126,  366,  366,  366,  366,  124,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  165,  366,
-
-      366,   54,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  281,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  208,  366,  366,  366,  366,  366,  211,  366,
-      217,  366,  366,  366,  366,  366,  366,  245,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  111,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  138,  366,  366,  366,  366,
-      366,  366,  366,  366,   65,  366,  366,  366,   29,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,   20,  366,  366,  366,  366,  366,  366,  366,   30,
-       39,  366,  177,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  204,  366,  366,
-      365,  366,  366,  366,  366,  366,  366,   82,   84,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  304,  366,  366,  366,  366,  261,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  127,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  164,  366,   50,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  255,  366,  366,  366,
-      366,  366,  366,  366,  319,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  171,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  313,  366,
-      366,  366,  237,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  329,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  189,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  120,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      184,  366,  198,  366,  366,  366,  366,  366,  366,  366,
-      365,  366,  152,  366,  366,  366,  366,  366,  106,  366,
-      366,  366,  366,  229,  366,  366,  366,  366,  366,  366,
-      247,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  273,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  145,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  188,  366,  366,
-      366,  366,  366,  366,  366,   85,  366,   86,  366,  366,
-      366,  366,  366,  258,  366,  366,  366,  366,   66,  322,
-      366,  366,  366,  366,  366,   94,  199,  366,  220,  366,
-      250,  366,  366,  212,  297,  366,  366,  366,  366,  366,
-      366,   78,  366,  201,  366,  366,  366,  366,  366,  366,
-        9,  366,  366,  366,  366,  366,  110,  366,  366,  366,
-      366,  366,  286,  366,  366,  366,  366,  228,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  365,  366,  366,  366,  366,  187,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  173,  366,
-      303,  366,  366,  366,  366,  366,  272,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  241,  366,
-      366,  366,  366,  366,  366,  295,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  170,  366,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  323,  366,  200,  366,  366,  366,
-      366,  366,  366,  366,  366,   77,   79,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  109,  366,  366,
-      366,  366,  366,  284,  366,  366,  366,  366,  299,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  233,   37,   31,   33,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,   38,  366,
-       32,   34,  366,   40,  366,  366,  366,  366,  366,  366,
-      366,  105,  366,  183,  366,  366,  366,  366,  366,  366,
-
-      366,  365,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  235,  232,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,   76,  366,  366,  366,  147,  366,
-      128,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  166,   51,  366,  366,  366,  357,   13,  366,  366,
-      366,  366,  366,  366,  366,  153,  366,  366,  366,  366,
-      366,  366,  366,  317,  366,  320,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,   12,  366,
-      366,   22,  366,  366,  366,  366,  366,  366,  290,  366,
-
-      366,  366,  366,  301,  366,  366,  366,  366,   80,  366,
-      243,  366,  366,  366,  366,  366,  234,  366,  366,   75,
-      366,  366,  366,  366,  366,  366,   23,  366,  366,   47,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  182,  181,  366,  366,  357,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  236,  230,  366,  248,
-      366,  366,  305,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  194,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,   87,
-
-      366,  366,  366,  366,  366,  366,  366,  285,  366,  366,
-      366,  366,  216,  366,  366,  366,  366,  366,  242,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  292,  366,
-      366,  366,  327,  328,  179,  366,  366,  366,   81,  366,
-      366,  366,  366,  190,  366,  366,  366,  121,  123,  122,
-      366,  366,  366,   25,  366,  366,  174,  366,  176,  366,
-      221,  366,  366,  366,  366,  180,  366,  366,  366,  366,
-      251,  366,  366,  366,  366,  366,  366,  366,  155,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  263,  366,  366,  366,  366,  366,  366,  366,  336,
-
-      366,   27,  366,  298,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,   92,  222,  366,  366,  257,  366,  366,  283,  366,
-      321,  366,  215,  366,  366,  366,  366,  366,  293,   60,
-      366,  366,  366,  366,  366,  366,    4,  366,  366,  366,
-      366,  136,  366,  154,  366,  366,  366,  195,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  254,   41,   42,  366,
-      366,  366,  366,  366,  366,  366,  306,  366,  366,  366,
-      366,  366,  366,  366,  271,  366,  366,  366,  366,  366,
-
-      366,  366,  366,  225,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,   91,   90,
-      366,  366,   61,  366,  366,  289,  366,  259,  366,  366,
-      366,  366,  366,   11,  366,  366,  366,  366,  366,  366,
-      366,  366,  135,  366,  366,  366,  366,  366,  223,   97,
-      366,  366,   44,  366,  366,  366,  366,  366,  366,  366,
-      366,  186,  366,  366,  366,  366,  366,  366,  366,  157,
-      366,  366,  366,  366,  262,  366,  366,  366,  366,  366,
-      270,  366,  366,  366,  366,  150,  366,  366,  366,  129,
-      131,  130,  366,  366,  366,   99,  103,   98,  167,  366,
-
-      366,  366,  366,   88,  366,  256,  291,  366,  366,  366,
-      366,  366,  366,   10,  366,  366,  366,  366,  366,  287,
-      330,  366,  366,  366,  366,  366,  366,  335,   43,  366,
-      366,  366,  366,  366,  185,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      104,  102,  366,   55,  366,  366,   89,  366,  318,  366,
-      366,  366,  366,   24,  366,  366,  366,  366,  366,  209,
-      366,  366,  366,  366,  366,  366,  224,  366,  366,  366,
-      366,  366,  366,  366,  366,  205,  366,  366,  175,   83,
-
-      366,  366,  366,  366,  366,  307,  366,  366,  366,  366,
-      366,  366,  366,  267,  366,  366,  266,  151,  366,  366,
-      101,   52,  366,  366,  158,  159,  162,  163,  160,  161,
-       93,  316,  366,  366,  288,  139,  366,  366,  366,   26,
-      366,  178,  366,  366,  366,  366,  203,  366,  253,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      192,  191,   45,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  314,  366,  366,  366,
-
-      366,  108,  366,  252,  366,  280,  311,  366,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  337,  366,
-       53,   62,    5,  366,  366,  244,  366,  366,  312,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  268,   28,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  269,  366,  366,  366,  156,  366,  366,  366,
-      366,  366,  366,  366,  366,  193,  366,  202,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  308,  366,  366,
-      366,  366,  366,  366,  366,  366,  366,  366,  366,  366,
-      366,  366,  366,  366,  366,  334,  366,  366,  276,  366,
-
-      366,  366,  366,  366,  309,  366,  366,  366,  366,  366,
-      366,  310,  366,  366,  366,  274,  366,  277,  278,  366,
-      366,  366,  366,  366,  275,  279,    0
+        1,    1,  343,  343,  347,  347,  351,  351,  355,  355,
+        1,    1,  359,  359,  363,  363,  370,  367,    1,  341,
+      341,  368,    2,  368,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  343,  344,  344,  345,
+      368,  347,  348,  348,  349,  368,  354,  351,  352,  352,
+      353,  368,  355,  356,  356,  357,  368,  366,  342,    2,
+      346,  368,  366,  362,  359,  360,  360,  361,  368,  363,
+      364,  364,  365,  368,  367,    0,    1,    2,    2,    2,
+        2,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  343,
+        0,  347,    0,  354,    0,  351,  355,    0,  366,    0,
+        2,    2,  366,  362,    0,  359,  363,    0,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  366,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  339,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  133,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  143,  367,  367,  367,  367,
+      367,  367,  367,  366,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  115,  367,  338,  367,  367,  367,
+      367,  367,  367,  367,  367,    8,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  134,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  148,  367,  367,  366,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  331,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  366,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,   69,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  260,  367,   14,
+       15,  367,   19,   18,  367,  367,  240,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  141,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  238,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,    3,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      366,  367,  367,  367,  367,  367,  367,  367,  325,  367,
+      367,  324,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  350,  367,  367,  367,  367,  367,  367,  367,
+      367,   68,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,   72,  367,
+      294,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      332,  333,  367,  367,  367,  367,  367,  367,  367,  367,
+       73,  367,  367,  142,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  137,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      227,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,   21,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  169,  367,  367,  367,
+      367,  367,  366,  350,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  113,  367,  367,  367,  367,
+      367,  367,  367,  302,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  196,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  168,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  112,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,   35,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,   36,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,   70,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  140,  367,  367,  367,  366,  367,  367,
+      367,  367,  367,  132,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,   71,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  264,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  197,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,   58,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  282,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,   63,  367,   64,  367,  367,
+      367,  367,  367,  116,  367,  117,  367,  367,  367,  367,
+      367,  114,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,    7,  367,  367,  367,  367,
+      366,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  249,
+      367,  367,  367,  367,  172,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  265,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,   49,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,   59,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  219,
+
+      367,  218,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,   16,   17,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,   74,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  226,  367,  367,  367,  367,  367,  367,  119,
+      367,  118,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  210,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  149,  367,
+      367,  367,  366,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  107,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,   95,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  239,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      100,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,   67,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  213,  214,  367,  367,
+      367,  296,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,    6,  367,  367,  367,  367,
+      367,  367,  367,  315,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  300,  367,  367,  367,  367,  367,  367,
+      367,  326,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,   46,  367,  367,  367,
+      367,  367,   48,  367,  367,  367,   96,  367,  367,  367,
+      367,  367,   56,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  366,  367,  206,  367,  367,  367,
+      144,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  231,  367,  207,  367,  367,  367,  246,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,   57,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      146,  125,  367,  126,  367,  367,  367,  367,  124,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  165,  367,
+      367,   54,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  281,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  208,  367,  367,  367,  367,  367,  211,  367,
+      217,  367,  367,  367,  367,  367,  367,  245,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  111,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  138,  367,  367,  367,
+
+      367,  367,  367,  367,  367,   65,  367,  367,  367,   29,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,   20,  367,  367,  367,  367,  367,  367,  367,
+       30,   39,  367,  177,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  204,  367,
+      367,  366,  367,  367,  367,  367,  367,  367,   82,   84,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  304,  367,  367,  367,  367,  261,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  127,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  164,  367,   50,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  255,  367,  367,
+      367,  367,  367,  367,  367,  319,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  171,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  313,
+      367,  367,  367,  367,  237,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  329,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  189,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  120,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  184,  367,  198,  367,  367,  367,  367,  367,
+      367,  367,  366,  367,  152,  367,  367,  367,  367,  367,
+      106,  367,  367,  367,  367,  229,  367,  367,  367,  367,
+      367,  367,  247,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  273,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  145,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  188,
+      367,  367,  367,  367,  367,  367,  367,   85,  367,   86,
+      367,  367,  367,  367,  367,  258,  367,  367,  367,  367,
+       66,  322,  367,  367,  367,  367,  367,   94,  199,  367,
+      220,  367,  250,  367,  367,  212,  297,  367,  367,  367,
+      367,  367,  367,   78,  367,  201,  367,  367,  367,  367,
+      367,  367,    9,  367,  367,  367,  367,  367,  110,  367,
+      367,  367,  367,  367,  367,  286,  367,  367,  367,  367,
+      228,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  366,  367,  367,  367,  367,
+      187,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  173,  367,  303,  367,  367,  367,  367,  367,  272,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  241,  367,  367,  367,  367,  367,  367,  295,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  170,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  323,  367,  200,
+      367,  367,  367,  367,  367,  367,  367,  367,   77,   79,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      109,  367,  367,  367,  367,  367,  367,  284,  367,  367,
+      367,  367,  299,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  233,   37,   31,   33,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,   38,  367,   32,   34,  367,   40,  367,  367,
+
+      367,  367,  367,  367,  367,  105,  367,  183,  367,  367,
+      367,  367,  367,  367,  367,  366,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  235,  232,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,   76,  367,
+      367,  367,  147,  367,  128,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  166,   51,  367,  367,  367,
+      358,   13,  367,  367,  367,  367,  367,  367,  367,  153,
+      367,  367,  367,  367,  367,  367,  367,  317,  367,  320,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,   12,  367,  367,   22,  367,  367,  367,  367,
+      367,  367,  367,  290,  367,  367,  367,  367,  301,  367,
+      367,  367,  367,   80,  367,  243,  367,  367,  367,  367,
+      367,  234,  367,  367,   75,  367,  367,  367,  367,  367,
+      367,   23,  367,  367,   47,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  182,  181,  367,
+      367,  358,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  236,  230,  367,  248,  367,  367,  305,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  194,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,   87,  367,  367,  367,  367,  367,
+      367,  367,  285,  367,  367,  367,  367,  216,  367,  367,
+      367,  367,  367,  242,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  292,  367,  367,  367,  327,  328,
+      179,  367,  367,  367,   81,  367,  367,  367,  367,  190,
+      367,  367,  367,  121,  123,  122,  367,  367,  367,   25,
+      367,  367,  174,  367,  176,  367,  221,  367,  367,  367,
+      367,  180,  367,  367,  367,  367,  251,  367,  367,  367,
+      367,  367,  367,  367,  155,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  263,  367,  367,
+      367,  367,  367,  367,  367,  336,  367,   27,  367,  298,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,   92,  222,  367,
+      367,  257,  367,  367,  283,  367,  321,  367,  215,  367,
+      367,  367,  367,  367,  293,   60,  367,  367,  367,  367,
+      367,  367,  367,    4,  367,  367,  367,  367,  136,  367,
+      154,  367,  367,  367,  195,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  254,   41,   42,  367,  367,  367,  367,
+
+      367,  367,  367,  306,  367,  367,  367,  367,  367,  367,
+      367,  271,  367,  367,  367,  367,  367,  367,  367,  367,
+      225,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,   91,   90,  367,  367,   61,
+      367,  367,  289,  367,  259,  367,  367,  367,  367,  367,
+       11,  367,  367,  367,  367,  340,  367,  367,  367,  367,
+      135,  367,  367,  367,  367,  367,  223,   97,  367,  367,
+       44,  367,  367,  367,  367,  367,  367,  367,  367,  186,
+      367,  367,  367,  367,  367,  367,  367,  157,  367,  367,
+      367,  367,  262,  367,  367,  367,  367,  367,  270,  367,
+
+      367,  367,  367,  150,  367,  367,  367,  129,  131,  130,
+      367,  367,  367,   99,  103,   98,  167,  367,  367,  367,
+      367,   88,  367,  256,  291,  367,  367,  367,  367,  367,
+      367,   10,  367,  367,  367,  367,  367,  287,  330,  367,
+      367,  367,  367,  367,  367,  335,   43,  367,  367,  367,
+      367,  367,  185,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  104,  102,
+      367,   55,  367,  367,   89,  367,  318,  367,  367,  367,
+      367,   24,  367,  367,  367,  367,  367,  209,  367,  367,
+
+      367,  367,  367,  367,  224,  367,  367,  367,  367,  367,
+      367,  367,  367,  205,  367,  367,  175,   83,  367,  367,
+      367,  367,  367,  307,  367,  367,  367,  367,  367,  367,
+      367,  267,  367,  367,  266,  151,  367,  367,  101,   52,
+      367,  367,  158,  159,  162,  163,  160,  161,   93,  316,
+      367,  367,  288,  139,  367,  367,  367,   26,  367,  178,
+      367,  367,  367,  367,  203,  367,  253,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  192,  191,
+       45,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  314,  367,  367,  367,  367,  108,
+      367,  252,  367,  280,  311,  367,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  337,  367,   53,   62,
+        5,  367,  367,  244,  367,  367,  312,  367,  367,  367,
+      367,  367,  367,  367,  367,  367,  268,   28,  367,  367,
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      269,  367,  367,  367,  156,  367,  367,  367,  367,  367,
+      367,  367,  367,  193,  367,  202,  367,  367,  367,  367,
+      367,  367,  367,  367,  367,  308,  367,  367,  367,  367,
+
+      367,  367,  367,  367,  367,  367,  367,  367,  367,  367,
+      367,  367,  367,  334,  367,  367,  276,  367,  367,  367,
+      367,  367,  309,  367,  367,  367,  367,  367,  367,  310,
+      367,  367,  367,  274,  367,  277,  278,  367,  367,  367,
+      367,  367,  275,  279,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -806,17 +808,17 @@ static const YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[3646] =
+static const flex_int16_t yy_base[3664] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112,   96,  118,  124,  136, 4833, 4680,   81, 7073,
-     7073, 7073,  129,   52,  130,   63,  131,  152,   70,  140,
+       90,  112,   96,  118,  124,  136, 4156, 2779,   81, 7110,
+     7110, 7110,  129,   52,  130,   63,  131,  152,   70,  140,
       149,  156,   57,   88,   76,  173,  175,   95,  197,  145,
-      185,  199,  208,  213,  178,  123, 4078, 7073, 7073, 7073,
-      107, 3686, 7073, 7073, 7073,  154, 3641, 2669, 7073, 7073,
-     7073,  245, 2592, 7073, 7073, 7073,  163, 2519, 7073,  249,
-     7073,  253,  148, 2320, 2287, 7073, 7073, 7073,  257, 2134,
-     7073, 7073, 7073,  233, 1825,  263,  201,    0,  267,    0,
+      185,  199,  208,  213,  178,  123, 2391, 7110, 7110, 7110,
+      107, 2147, 7110, 7110, 7110,  154, 2117, 1982, 7110, 7110,
+     7110,  245, 1770, 7110, 7110, 7110,  163, 1609, 7110,  249,
+     7110,  253,  148, 1509, 1480, 7110, 7110, 7110,  257, 1324,
+     7110, 7110, 7110,  233, 1201,  263,  201,    0,  267,    0,
         0,  165,  191,  221,  252,  205,  181,  265,   92,  261,
 
       216,  263,  271,  272,  210,  279,  274,  282,  278,  291,
@@ -824,9 +826,9 @@ static const flex_int16_t yy_base[3646] =
       317,  311,  315,  319,  321,  331,  327,  332,  336,  322,
       339,  337,  346,  345,  347,  348,  353,  351,  357,  284,
       358,  359,  369,  360,  380,  365,  381,  379,  375,  366,
-      367,  389,  390,  394,  393,  395,  396,  403,  404, 1718,
-      419, 1459,  422, 1387,  429, 1205, 1013,  433,  984,  437,
-      441,    0,  433,  780,  447,  527,  467,  452,  411,  445,
+      367,  389,  390,  394,  393,  395,  396,  403,  404, 1026,
+      419,  993,  422,  933,  429,  800,  757,  433,  713,  437,
+      441,    0,  433,  515,  447,  479,  364,  452,  411,  445,
       426,  446,  447,  448,  449,  450,  451,  453,  452,  456,
       470,  234,  463,  473,  481,  479,  476,  483,  486,  493,
 
@@ -834,789 +836,793 @@ static const flex_int16_t yy_base[3646] =
       512,  513,  460,  514,  517,  529,  518,  516,  526,  538,
       539,  550,  543,  534,  551,  552,  400,  559,  555,  563,
       558,  570,  565,  574,  566,  569,  571,  576,  573,  577,
-      580,  578,  581,  584,  587,  588,  598,  589,  596,  600,
-      601,  611,  602,  612,  607,  610,  362,  609,  541,  619,
-      622,  617,  624,  625,  626,  629,  632,  639,  641,  642,
-      643,  645,  634,  648,  647,  638,  649,  651,  659,  662,
-      660,  663,  670,  669,  671,  672,  673,  675,  652,  682,
-      678,  686,  679,  692,  691,  693,  695,  697,  699,  698,
-
-      700,  702,  703,  705, 7073,  716,  706,  721,  717,  728,
-      723,  707,  725,  732,  735,  718,  731,  734,  733,  736,
-      739,  740,  741,  743,  747,  750,  748,  753,  752,  763,
-      767,  759,  774,  760,  761,  772,  782,  775,  768,  776,
-      795,  790,  796,  802,  804,  805,  807,  808,  806,  809,
-      811,  812,  813,  827,  816,  829,  823,  819,  830,  832,
-      839,  840, 7073,  836,  837,  851,  844,  853,  857,  854,
-      863,  846,  869,  867,  872,  873,  885,  907,  875,  880,
-      874,  876,  890, 7073,  893,  897,  931,  877,  900,  919,
-      914,  881,  905,  917,  916,  921,  935,  915,  922,  937,
-
-      954,  952,  936,  939,  938,  955,  949,  967,  962,  965,
-      887,  966,  974,  969,  970,  971,  981,  972,  973,  977,
-      982,  988,  995,  999,  983, 1003,  997,  991, 1005, 1008,
-     1009, 1004, 1006, 1029, 1017, 1012, 1025, 1031, 1023, 1039,
-     1016, 1038, 1036, 1045, 1049, 1041, 1051, 1053, 1056, 1057,
-     1058, 1059, 1069, 1064, 1065, 1067, 1070, 1072, 1073, 1078,
-     1076, 1079, 1081, 1083, 1084, 1087, 1092, 1094, 1098, 1085,
-     1099, 1101, 7073, 1107, 7073, 1105, 1102, 1109, 1111, 1112,
-     1113, 1114, 1115, 7073, 1117, 1121, 1116, 1124, 1125, 1122,
-     1146, 1142, 1129, 1141, 1145, 1144, 1150, 1151, 1159, 1154,
-
-     1161, 1162, 1155, 1163, 1157, 1166, 1128, 1167, 1170, 1171,
-     1173, 1175, 1177, 1195, 7073, 1178, 1181, 1182, 1184, 1186,
-     1199, 1191, 1206, 1208, 1212, 1218, 1200, 1183, 1226, 1222,
-     1224, 1225, 1229, 1230, 1232, 1234, 1235, 1238, 1239, 1241,
-     1244, 1242, 1246, 1249, 1248, 1247, 1255, 1258, 7073, 1260,
-     1263, 1271, 1278, 1262, 1265, 1273, 1276, 1279, 1277, 1281,
-     1283, 1282, 1286, 1289, 1288, 1299, 1291, 1304, 1300, 1302,
-     1301, 1306, 1308, 1311, 1307, 1309, 1328, 1317, 1319, 1332,
-     1335, 1334, 1337, 1344, 1346, 1324, 1320, 1339, 1347, 1343,
-     1349, 1352, 1353, 1354, 1355, 1357, 1358, 1367, 1363, 1365,
-
-     1364, 1366, 1370, 1372, 1374, 1375, 1380, 1379, 1377, 1381,
-     1392, 1390, 1388, 1397, 1394, 1403, 1399, 1391, 1406, 1410,
-     1413, 1414, 7073, 1422, 1419, 1418, 1420, 1425, 1423, 1431,
-     1432, 1433, 1434, 1437, 1435, 1438, 1443, 1444, 1445, 1439,
-     1447, 1452, 1454, 1455, 1456, 1465, 1472, 1471, 1473, 1457,
-     1467, 1476, 1477, 1479, 1486, 1483, 1491, 1484, 1489, 1492,
-     1500, 1493, 1495, 1496, 1509, 1502, 1504, 1505, 1507, 1511,
-     1517, 1518, 1519, 1526, 1523, 1528, 1540, 1529, 1531, 1536,
-     1532, 1542, 1541, 1545, 1546, 1547, 1548, 1555, 1550, 1552,
-     1557, 1558, 1553, 1560, 1562, 1567, 1575, 1570, 1577, 1576,
-
-     1578, 1580, 1581, 1583, 1584, 1589, 1585, 1592, 1593, 1594,
-     1599, 1595, 1606, 1614, 1608, 1596, 1616, 1617, 1619, 1620,
-     1621, 1625, 1623, 1628, 1632, 1626, 1629, 1637, 1635, 1641,
-     1643, 1644, 1645, 1586, 1655, 1646, 1656, 1657, 1660, 1662,
-     1663, 1665, 1647, 1667, 1672, 1670, 1675, 1676, 7073, 1664,
-     1688, 1677, 1686, 1684, 1687, 1689, 1698, 1691, 1693, 1695,
-     1694, 1701, 1722, 7073, 1702, 7073, 7073,  848, 7073, 7073,
-     1705, 1703, 7073, 1704, 1710, 1706, 1720, 1725, 1732, 1737,
-     1728, 1730, 1735, 1723, 1746, 1750, 1745, 1753, 1755, 1756,
-     1759, 1747, 1760, 1761, 1767, 1770, 1772, 1773, 1708, 1783,
-
-     1778, 1788, 1779, 1790, 1791, 1796, 1781, 1797, 1800, 1803,
-     1804, 1793, 1806, 1807, 1809, 1811, 1813, 1808, 1815, 1817,
-     1820, 1821, 1822, 1830, 1826, 1835, 1842, 7073, 1832, 1845,
-     1840, 1849, 1846, 1853, 1852, 1848, 1850, 1857, 1861, 1862,
-     1863, 1864, 1867, 1865, 1866, 1873, 1868, 1875, 1876, 1878,
-     1880, 1883, 1882, 7073, 1888, 1890, 1891, 1893, 1894, 1892,
-     1900, 1896, 1902, 1904, 1906, 1917, 1907, 1908, 1914, 1912,
-     1923, 1918, 1920, 1922, 7073, 1924, 1935, 1928, 1936, 1930,
-     1937, 1939, 1940, 1943, 1944, 1945, 1946, 1947, 1948, 1958,
-     1955, 1954, 1956, 1960, 1961, 1970, 1969, 1971, 1973, 1981,
-
-     1974, 1982, 1983, 1984, 1986, 1987, 1988, 1989, 1991, 1995,
-     1996, 2003, 1998, 2005, 2000, 2001, 2019, 2022, 2020, 2006,
-     2017, 2018, 2009, 2026, 2034, 2038, 2033, 2031, 2035, 2045,
-     2040, 2042, 2043, 2046, 2047, 2058, 2044, 2062, 2053, 2055,
-     2056, 2064, 2067, 7073, 2068, 2070, 7073, 2072, 2071, 2073,
-     2095, 2074, 2078, 2081, 2080, 2083, 2089, 2087, 2099, 2105,
-     2101, 2118, 2088, 2107, 2119, 2109, 2122, 2114, 2120, 2128,
-     2129, 2130, 2131, 2133, 2139, 2136, 2149, 2152, 2148, 2156,
-     2159, 2132, 2155, 2157, 2176, 2158, 2160, 2164, 2161, 2162,
-     2166, 2172, 2167, 2179, 2168, 2169, 2181, 2191, 2189, 2186,
-
-     2192, 2199, 2200, 2201, 2204, 2205, 2206, 7073, 2213, 2208,
-     2212, 2216, 2090, 2220, 2217, 2223, 7073, 2224, 2225, 2227,
-     2235, 2228, 2230, 2236, 2232, 2239, 2238, 2244, 2245, 2246,
-     2251, 2247, 2265, 7073, 2250, 7073, 2248, 2240, 2263, 2261,
-     2267, 2269, 2270, 2271, 2272, 7073, 7073, 2273, 2274, 2288,
-     2290, 2292, 2282, 2279, 2293, 7073, 2295, 2302, 7073, 2299,
-     2304, 2298, 2297, 2305, 2308, 2309, 2310, 2319, 2314, 2324,
-     2315, 2323, 2327, 7073, 2331, 2333, 2316, 2335, 2338, 2329,
-     2339, 2342, 2344, 2346, 7073, 2350, 2351, 2353, 2360, 2362,
-     2355, 2352, 2363, 2368, 2357, 2365, 2371, 2373, 2372, 2380,
-
-     2383, 2387, 2388, 2389, 2392, 2390, 2402, 7073, 2398, 2379,
-     2399, 2406, 2404, 2408, 2401, 2405, 2411, 2412, 2413, 2415,
-     2417, 2422, 2421, 2423, 2424, 2425, 2434, 2435, 2427, 2438,
-     2440, 2431, 2437, 2445, 2446, 2382, 2447, 2449, 2448, 2452,
-     7073, 2453, 2455, 2460, 2456, 2466, 2459,  171, 2462, 2463,
-     2469, 2470, 2473, 2484, 2474, 2486, 2491, 2487, 2488, 2490,
-     2495, 2496, 2497, 2499, 2498, 2489, 2502, 2501, 2505, 7073,
-     2507, 2512, 2514, 2515, 2517, 2518, 2520, 7073, 2527, 2521,
-     2528, 2541, 2535, 2529, 2544, 2537, 2545, 2546, 2548, 2549,
-     2550, 2557, 2554, 2552, 2558, 2560, 7073, 2565, 2567, 2570,
-
-     2561, 2571, 2573, 2574, 2578, 2580, 2582, 2584, 2585, 2590,
-     2586, 2588, 2589, 2591, 2599, 2602, 2612, 2594, 2603, 2604,
-     2611, 2608, 2616, 2615, 2618, 2620, 2625, 2621, 7073, 2630,
-     2622, 2631, 2632, 2629, 2636, 2633, 2639, 2648, 2644, 2646,
-     2653, 2654, 2667, 2656, 2650, 2664, 2661, 2665, 2673, 2677,
-     2674, 2678, 2684, 2681, 2687, 2689, 2691, 2695, 2699, 2696,
-     2697, 2698, 2700, 2701, 2710, 2712, 2715, 2718, 2708, 2716,
-     2723, 2724, 2726, 2742, 2733, 7073, 2731, 2737, 2729, 2741,
-     2749, 2745, 2746, 2751, 2753, 2755, 2757, 2758, 2759, 2766,
-     2761, 2763, 2770, 2765, 2769, 2771, 2772, 2780, 2782, 2783,
-
-     2784, 2791, 2786, 2793, 2707, 7073, 2794, 2798, 2788, 2795,
-     2806, 2796, 2810, 2811, 2813, 2799, 2802, 2814, 2822, 2817,
-     2815, 2824, 2819, 2831, 2828, 2829, 2834, 2826, 7073, 2840,
-     2830, 2841, 2842, 2846, 2848, 2849, 2850, 2856, 2858, 2851,
-     2861, 2862, 2864, 2865, 2868, 7073, 2873, 2875, 2871, 2874,
-     2883, 2878, 2882, 2884, 2886, 2888, 7073, 2889, 2891, 2890,
-     2892, 2893, 2896, 2903, 2904, 2899, 7073, 2912, 2902, 2910,
-     2911, 2914, 2915, 2917, 2920, 2918, 2923, 2924, 2927, 2934,
-     2928, 2936, 7073, 2925, 2946, 2937, 2943, 2939, 2949, 2950,
-     2953, 2954, 2957, 2956, 2960, 7073, 2967, 2969, 2964, 2978,
-
-     2970, 2976, 2979, 2980, 2981, 2982, 2983, 2984, 2988, 2990,
-     7073, 2991, 2994, 2995, 2998, 2992, 3000, 3003, 3014, 3007,
-     3009, 3011, 3006, 3016, 3017, 3015, 3021, 3028, 3024, 3023,
-     3027, 3033, 3036, 3038, 3040, 3039, 3043, 3051, 3052, 3047,
-     3054, 3057, 3058, 3050, 3060, 3062, 3069, 3071, 3074, 3072,
-     3075, 7073, 3078, 3079, 3080, 3070, 3082, 3084, 3085, 3086,
-     3090, 3087, 3096, 3101, 3099, 3092, 3109, 3116, 3102, 3117,
-     3105, 3112, 3114, 3120, 3119, 3121, 3126, 3133, 3129, 3128,
-     3130, 3142, 3132, 3137, 3145, 3135, 3140, 3146, 3147, 3149,
-     3150, 3152, 3155, 3157, 3160, 3153, 3161, 3162, 3176, 3178,
-
-     3179, 3167, 3169, 3181, 3183, 3185, 7073, 3188, 3189, 3186,
-     3192, 3193, 3198, 3195, 3205, 3202, 3203, 3213, 3210, 3214,
-     3219, 3208, 3211, 3221, 3220, 3231, 3227, 7073, 3224, 7073,
-     3222, 3232, 3233, 3241, 3236, 7073, 3239, 7073, 3244, 3246,
-     3248, 3249, 3250, 7073, 3251, 3252, 3255, 3253, 3257, 3258,
-     3261, 3260, 3263, 3267, 3269, 3274, 3270, 3278, 3279, 3280,
-     3284, 3285, 3288, 3286, 3290, 3291, 3292, 3294, 3298, 3299,
-     3303, 3301, 3306, 3310, 3311, 3312, 3313, 7073, 3317, 3324,
-     3320, 3329, 3314, 3322, 3328, 3326, 3335, 3332, 3336, 3338,
-     3339, 3341, 3348, 3344, 3350, 3351, 3352, 3358, 3362, 3360,
-
-     3370, 7073, 3365, 3367, 3368, 3369, 7073, 3372, 3373, 3381,
-     3383, 3374, 3376, 3378, 3386, 3390, 3385, 3392, 3395, 3396,
-     3406, 3405, 3398, 7073, 3407, 3408, 3409, 3418, 3412, 3419,
-     3426, 3428, 3424, 3430, 3432, 3441, 3437, 3423, 3427, 3425,
-     3438, 3446, 3453, 3454, 3456, 3452, 3461, 3439, 3459, 3466,
-     3463, 3451, 3440, 3467, 3470, 3471, 3473, 3474, 3475, 3472,
-     3476, 3477, 3481, 3482, 7073, 3483, 3484, 3478, 3498, 3494,
-     3499, 3501, 3502, 3503, 3504, 3508, 7073, 3510, 3507, 3513,
-     3511, 3519, 3522, 3512, 3525, 3528, 3529, 3530, 3532, 3531,
-     3534, 7073, 3533, 7073, 3535, 3541, 3552, 3555, 3547, 3556,
-
-     3558, 3563, 3557, 3564, 3566, 3565, 3567, 3569, 3573, 3575,
-     3576, 3578, 3577, 3542, 3580, 3585, 3581, 3591, 3582, 3593,
-     3594, 3603, 3606, 3596, 7073, 7073, 3598, 3599, 3612, 3605,
-     3609, 3614, 3624, 3620, 3622, 3616, 3626, 3628, 3636, 7073,
-     3631, 3633, 3637, 3638, 3640, 3650, 3642, 3652, 3655, 3653,
-     3656, 3663, 3661, 7073, 3662, 3664, 3671, 3666, 3672, 3674,
-     7073, 3669, 7073, 3673, 3676, 3680, 3683, 3684, 3685, 3687,
-     3688, 3690, 3693, 3696, 3702, 3704, 3711, 3706, 3708, 3713,
-     3714, 3715, 3716, 3718, 3719, 3726, 3722, 3724, 3725, 7073,
-     3728, 3729, 3737, 3731, 3730, 3742, 3746, 3739, 3738, 7073,
-
-     3745, 3753, 3752, 3754, 3757, 3759, 3760, 3763, 3764, 3768,
-     3770, 3769, 3765, 3773, 7073, 3771, 3774, 3786, 3781, 3778,
-     3782, 3792, 3795, 3800, 7073, 3797, 3801, 3809, 3805, 3806,
-     3787, 3808, 3807, 3812, 3813, 3814, 3815, 3816, 3817, 3823,
-     3822, 3819, 3829, 3825, 3828, 3836, 3839, 3843, 3850, 3846,
-     7073, 3847, 3830, 3852, 3848, 3853, 3855, 3856, 3858, 3861,
-     3866, 3862, 3869, 3874, 3876, 3877, 3878, 3880, 3881, 3889,
-     3884, 7073, 3892, 3888, 3896, 3895, 3891, 3901, 3894, 3902,
-     3903, 3910, 3905, 3907, 3912, 3913, 3914, 3919, 3927, 3923,
-     3911, 3925, 3926, 3938, 3929, 3930, 3933, 3934, 7073, 3953,
-
-     3941, 3944, 3954, 3951, 3945, 3963, 3958, 3948, 3961, 3965,
-     3966, 3969, 3971, 3972, 3973, 3976, 3977, 7073, 7073, 3979,
-     3980, 3981, 7073, 3984, 3983, 3995, 3985, 3987, 3988, 3996,
-     3999, 3998, 4000, 4002, 4008, 4012, 7073, 4016, 4013, 4020,
-     4015, 4017, 4025, 4021, 7073, 4022, 4033, 4030, 4031, 4037,
-     4032, 4038, 4039, 4043, 4044, 4040, 4045, 4048, 4056, 4059,
-     4054, 4051, 4060, 7073, 4061, 4062, 4063, 4070, 4065, 4067,
-     4072, 7073, 4073, 4075, 4076, 4082, 4085, 4091, 4093, 4095,
-     4099, 4083, 4096, 4100, 4102, 4101, 4103, 4105, 4114, 4109,
-     4113, 4112, 4116, 4131, 4132, 4118, 7073, 4115, 4126, 4120,
-
-     4134, 4136, 7073, 4144, 4147, 4151, 7073, 4154, 4138, 4150,
-     4149, 4158, 7073, 4153, 4156, 4157, 4162, 4159, 4172, 4167,
-     4174, 4171, 4173, 4175, 4176, 4178, 7073, 4179, 4177, 4180,
-     7073, 4183, 4187, 4194, 4198, 4182, 4205, 4200, 4203, 4201,
-     4204, 7073, 4209, 7073, 4212, 4210, 4216, 7073, 4211, 4218,
-     4219, 4221, 4225, 4226, 4227, 4233, 4229, 4235, 4237, 4238,
-     4239, 4240, 4242, 4249, 4241, 4245, 4248, 4250, 7073, 4251,
-     4253, 4260, 4261, 4257, 4267, 4265, 4272, 4262, 4273, 4275,
-     7073, 7073, 4280, 7073, 4282, 4276, 4281, 4286, 7073, 4289,
-     4287, 4296, 4291, 4293, 4298, 4295, 4306, 4299, 7073, 4310,
-
-     4311, 7073, 4303, 4314, 4321, 4316, 4317, 4318, 4319, 4322,
-     4327, 4325, 4329, 4331, 4332, 4333, 4334, 4335, 4337, 4354,
-     4338, 4349, 7073, 4342, 4350, 4357, 4359, 4356, 4363, 4364,
-     4365, 4366, 7073, 4371, 4375, 4372, 4379, 4378, 7073, 4380,
-     7073, 4381, 4382, 4388, 4392, 4387, 4401, 7073, 4396, 4393,
-     4403, 4397, 4404, 4408, 4411, 4412, 4413, 4414, 4405, 4421,
-     4419, 4420, 4418, 4428, 4426, 7073, 4429, 4435, 4437, 4438,
-     4440, 4441, 4442, 4450, 4447, 4443, 4446, 4453, 4455, 4458,
-     4459, 4465, 4463, 4468, 4457, 7073, 4467, 4474, 4476, 4477,
-     4485, 4480, 4481, 4482, 7073, 4487, 4488, 4491, 7073, 4489,
-
-     4495, 4497, 4501, 4503, 4504, 4505, 4508, 4507, 4511, 4512,
-     4509, 7073, 4516, 4517, 4510, 4513, 4526, 4533, 4519, 7073,
-     7073, 4534, 7073, 4535, 4520, 4536, 4538, 4539, 4545, 4547,
-     4548, 4550, 4544, 4552, 4555, 4558, 4560, 7073, 4561, 4572,
-     4565, 4575, 4576, 4583, 4578, 4582, 4568, 7073, 7073, 4585,
-     4591, 4586, 4594, 4596, 4567, 4589, 4604, 4600, 4601, 4609,
-     4610, 4618, 7073, 4599, 4611, 4616, 4613, 7073, 4614, 4619,
-     4621, 4622, 4623, 4625, 4626, 4627, 4629, 4630, 4636, 4641,
-     4638, 4646, 4632, 4640, 4649, 4648, 4654, 4656, 4655, 4657,
-     4659, 7073, 4662, 4663, 4664, 4665, 4669, 4671, 4672, 4676,
-
-     4674, 4677, 4685, 7073, 4678, 7073, 4681, 4687, 4690, 4700,
-     4688, 4704, 4705, 4706, 4699, 4689, 4707, 4711, 4714, 4717,
-     4718, 4723, 4719, 4725, 4726, 4727, 7073, 4730, 4732, 4735,
-     4737, 4742, 4744, 4745, 7073, 4747, 4738, 4748, 4751, 4754,
-     4756, 4757, 4760, 4761, 4765, 4762, 4766, 4770, 4773, 4767,
-     4774, 4775, 4780, 4778, 7073, 4782, 4785, 4786, 4789, 4790,
-     4791, 4793, 4795, 4800, 4803, 4804, 4806, 4807, 7073, 4810,
-     4811, 4813, 7073, 4814, 4817, 4815, 4818, 4820, 4827, 4822,
-     4831, 4828, 4829, 7073, 4840, 4835, 4842, 4837, 4845, 4846,
-     4847, 4848, 4852, 4850, 4854, 4857, 7073, 4867, 4858, 4866,
-
-     4868, 4865, 4869, 4872, 4876, 4878, 7073, 4879, 4880, 4883,
-     4886, 4895, 4897, 4887, 4892, 4900, 4898, 4905, 4896, 4899,
-     4906, 4902, 4911, 4914, 4915, 4916, 4913, 4932, 4934, 4929,
-     7073, 4917, 7073, 4918, 4930, 4935, 4946, 4941, 4943, 4944,
-     4948, 4947, 7073, 4949, 4954, 4956, 4951, 4959, 7073, 4919,
-     4957, 4960, 4962, 7073, 4958, 4971, 4963, 4972, 4978, 4979,
-     7073, 4982, 4985, 4986, 4993, 4995, 4990, 4997, 4992, 5000,
-     4998, 4994, 5002, 5003, 5011, 5009, 5007, 7073, 5013, 5015,
-     5020, 5022, 5024, 5016, 5026, 5014, 5028, 5031, 5033, 7073,
-     5036, 5037, 5038, 5039, 5040, 5043, 5042, 5044, 5051, 5050,
-
-     5052, 5048, 5055, 5060, 5063, 5061, 5065, 7073, 5069, 5067,
-     5070, 5077, 5078, 5076, 5085, 7073, 5080, 7073, 5086, 5088,
-     5090, 5092, 5093, 7073, 5096, 5098, 5097, 5103, 7073, 7073,
-     5105, 5112, 5107, 5111, 5108, 7073, 7073, 5114, 7073, 5115,
-     7073, 5116, 5118, 7073, 7073, 5120, 5121, 5122, 5124, 5126,
-     5128, 7073, 5136, 7073, 5138, 5137, 5139, 5142, 5141, 5144,
-     7073, 5145, 5148, 5150, 5153, 5155, 7073, 5152, 5160, 5173,
-     5156, 5168, 7073, 5170, 5172, 5159, 5171, 7073, 5176, 5180,
-     5181, 5182, 5184, 5185, 5187, 5188, 5191, 5194, 5195, 5196,
-     5197, 5199, 5204, 5203, 5211, 5213, 5215, 5206, 5216, 5220,
-
-     5221, 5223, 5226, 5228, 5229, 5230, 5231, 5232, 5236, 5238,
-     5235, 5244, 5246, 5239, 5248, 5255, 5256, 5257, 5241, 5259,
-     5258, 5260, 5266, 5262, 5273, 5268, 5270, 5274, 5275, 5277,
-     5276, 5279, 5283, 5284, 5288, 5286, 5289, 7073, 5282, 5292,
-     5293, 5302, 5296, 5303, 5306, 5313, 5318, 5319, 7073, 5321,
-     7073, 5323, 5307, 5315, 5309, 5327, 7073, 5329, 5330, 5331,
-     5332, 5334, 5335, 5336, 5337, 5333, 5340, 5344, 7073, 5346,
-     5360, 5347, 5341, 5356, 5367, 7073, 5362, 5369, 5354, 5364,
-     5370, 5373, 5374, 5375, 5376, 5379, 5377, 5378, 5384, 5387,
-     5381, 5390, 5391, 7073, 5399, 5403, 5406, 5392, 5404, 5405,
-
-     5407, 5409, 5411, 5413, 5414, 5415, 5417, 5418, 5419, 5425,
-     5431, 5428, 5436, 5441, 7073, 5424, 7073, 5442, 5444, 5445,
-     5432, 5448, 5449, 5446, 5450, 7073, 7073, 5447, 5455, 5456,
-     5461, 5462, 5458, 5465, 5468, 5470, 5471, 7073, 5472, 5474,
-     5478, 5484, 5481, 7073, 5486, 5488, 5489, 5491, 7073, 5492,
-     5493, 5495, 5496, 5506, 5498, 5511, 5507, 5513, 5500, 5503,
-     5514, 5519, 7073, 7073, 7073, 7073, 5520, 5523, 5525, 5526,
-     5527, 5528, 5529, 5533, 5535, 5531, 5532, 5536, 7073, 5547,
-     7073, 7073, 5543, 7073, 5549, 5550, 5553, 5555, 5537, 5557,
-     5559, 7073, 5560, 7073, 5565, 5568, 5561, 5572, 5578, 5569,
-
-     5562, 5580, 5582, 5583, 5584, 5585, 5592, 5590, 5593, 5591,
-     5596, 5598, 5600, 7073, 7073, 5604, 5608, 5609, 5611, 5613,
-     5614, 5615, 5622, 5620, 5621, 5623, 5625, 5627, 5628, 5636,
-     5637, 5633, 5634, 5642, 7073, 5643, 5639, 5645, 7073, 5647,
-     7073, 5651, 5652, 5653, 5654, 5655, 5660, 5661, 5662, 5664,
-     5666, 7073, 7073, 5665, 5680, 5675, 7073, 7073, 5667, 5676,
-     5677, 5679, 5685, 5682, 5687, 7073, 5690, 5691, 5692, 5688,
-     5694, 5702, 5695, 7073, 5704, 7073, 5705, 5707, 5713, 5708,
-     5716, 5721, 5717, 5724, 5723, 5720, 5726, 5727, 7073, 5729,
-     5730, 7073, 5737, 5736, 5740, 5734, 5742, 5745, 7073, 5746,
-
-     5749, 5753, 5755, 7073, 5757, 5758, 5759, 5761, 7073, 5766,
-     7073, 5763, 5768, 5769, 5777, 5772, 7073, 5774, 5778, 7073,
-     5786, 5788, 5790, 5792, 5780, 5791, 7073, 5797, 5782, 7073,
-     5798, 5802, 5805, 5808, 5799, 5810, 5803, 5811, 5812, 5819,
-     5821, 5823, 7073, 7073, 5828, 5825,  135, 5837, 5815, 5824,
-     5832, 5833, 5840, 5750, 5841, 5843, 7073, 7073, 5846, 7073,
-     5847, 5850, 7073, 5835, 5854, 5848, 5856, 5858, 5859, 5861,
-     5862, 5865, 5866, 5867, 5868, 5869, 5871, 7073, 5890, 5892,
-     5875, 5896, 5897, 5899, 5901, 5903, 5905, 5893, 5907, 5908,
-     5885, 5910, 5913, 5914, 5915, 5916, 5917, 5919, 5921, 7073,
-
-     5923, 5927, 5929, 5872, 5931, 5934, 5935, 7073, 5943, 5938,
-     5947, 5944, 7073, 5951, 5948, 5952, 5954, 5955, 7073, 5956,
-     5959, 5966, 5967, 5960, 5962, 5968, 5970, 5978, 7073, 5973,
-     5975, 5976, 7073, 7073, 7073, 5982, 5989, 5983, 7073, 5991,
-     5992, 5993, 5994, 7073, 5996, 5998, 5999, 7073, 7073, 7073,
-     6000, 6003, 6001, 7073, 6002, 6015, 7073, 6004, 7073, 6005,
-     7073, 6014, 6023, 6020, 6024, 7073, 6027, 6017, 6029, 6034,
-     7073, 6037, 6040, 6042, 6044, 6031, 6045, 6047, 7073, 6054,
-     6050, 6056, 6058, 6049, 6059, 6060, 6063, 6062, 6072, 6065,
-     6070, 7073, 6073, 6074, 6078, 6075, 6082, 6084, 6085, 7073,
-
-     6086, 7073, 6088, 7073, 6089, 6091, 6092, 6093, 6094, 6095,
-     6096, 6108, 6107, 6098, 6109, 6113, 6114, 6117, 6120, 6124,
-     6121, 7073, 7073, 6131, 6127, 7073, 6128, 6136, 7073, 6126,
-     7073, 6138, 7073, 6129, 6133, 6139, 6142, 6146, 7073, 7073,
-     6153, 6148, 6150, 6160, 6155, 6156, 7073, 6161, 6157, 6163,
-     6165, 7073, 6172, 7073, 6167, 6176, 6169, 7073, 6173, 6180,
-     6184, 6177, 6181, 6186, 6188, 6189, 6190, 6197, 6193, 6194,
-     6196, 6203, 6200, 6204, 6208, 6213, 7073, 7073, 7073, 6209,
-     6217, 6224, 6220, 6222, 6229, 6226, 7073, 6227, 6231, 6228,
-     6234, 6241, 6238, 6240, 7073, 6236, 6242, 6243, 6245, 6247,
-
-     6250, 6249, 6252, 7073, 6263, 6267, 6271, 6254, 6264, 6272,
-     6274, 6276, 6280, 6282, 6283, 6284, 6257, 6285, 7073, 7073,
-     6287, 6288, 7073, 6292, 6294, 7073, 6289, 7073, 6295, 6297,
-     6299, 6298, 6300, 7073, 6303, 6305, 6306, 6307, 6309, 6313,
-     6312, 6315, 7073, 6316, 6330, 6323, 6326, 6327, 7073, 7073,
-     6328, 6336, 7073, 6338, 6339, 6333, 6346, 6341, 6342, 6352,
-     6354, 7073, 6356, 6357, 6348, 6355, 6358, 6361, 6364, 7073,
-     6366, 6365, 6367, 6369, 7073, 6372, 6376, 6377, 6378, 6380,
-     7073, 6381, 6371, 6388, 6393, 7073, 6383, 6397, 6396, 7073,
-     7073, 7073, 6402, 6405, 6406, 7073, 7073, 7073, 7073, 6408,
-
-     6411, 6412, 6414, 7073, 6415, 7073, 7073, 6418, 6422, 6426,
-     6428, 6435, 6421, 7073, 6429, 6436, 6438, 6439, 6440, 7073,
-     7073, 6441, 6443, 6444, 6446, 6448, 6449, 7073, 7073, 6450,
-     6452, 6456, 6453, 6455, 7073, 6458, 6461, 6468, 6465, 6471,
-     6478, 6480, 6473, 6481, 6482, 6490, 6493, 6483, 6485, 6492,
-     6496, 6497, 6495, 6499, 6509, 6504, 6506, 6512, 6507, 6515,
-     7073, 7073, 6517, 7073, 6519, 6521, 7073, 6523, 7073, 6525,
-     6527, 6529, 6532, 7073, 6534, 6536, 6538, 6540, 6542, 7073,
-     6543, 6545, 6547, 6548, 6549, 6550, 7073, 6554, 6555, 6559,
-     6551, 6556, 6560, 6562, 6565, 7073, 6567, 6576, 7073, 7073,
-
-     6571, 6577, 6573, 6578, 6583, 7073, 6581, 6591, 6586, 6587,
-     6588, 6590, 6593, 7073, 6596, 6594, 7073, 7073, 6606, 6597,
-     7073, 7073, 6595, 6598, 7073, 7073, 7073, 7073, 7073, 7073,
-     7073, 7073, 6611, 6614, 7073, 7073, 6613, 6605, 6620, 7073,
-     6623, 7073, 6615, 6624, 6625, 6627, 7073, 6628, 7073, 6630,
-     6632, 6631, 6635, 6634, 6639, 6641, 6644, 6646, 6645, 6648,
-     6650, 6651, 6655, 6652, 6656, 6666, 6659, 6669, 6662, 6670,
-     7073, 7073, 7073, 6658, 6674, 6680, 6676, 6684, 6686, 6689,
-     6691, 6681, 6692, 6693, 6697, 6698, 6695, 6699, 6707, 6704,
-     6705, 6706, 6709, 6710, 6716, 6722, 7073, 6724, 6713, 6719,
-
-     6726, 7073, 6727, 7073, 6729, 7073, 7073, 6732, 6733, 6735,
-     6736, 6745, 6746, 6737, 6741, 6744, 6748, 6750, 7073, 6757,
-     7073, 7073, 7073, 6752, 6758, 7073, 6760, 6761, 7073, 6759,
-     6762, 6764, 6768, 6769, 6766, 6770, 6771, 6787, 7073, 7073,
-     6772, 6777, 6780, 6789, 6791, 6790, 6793, 6797, 6798, 6800,
-     6801, 6810, 7073, 6807, 6808, 6812, 7073, 6814, 6809, 6815,
-     6816, 6817, 6825, 6821, 6824, 7073, 6826, 7073, 6830, 6832,
-     6833, 6823, 6831, 6834, 6845, 6843, 6839, 7073, 6849, 6853,
-     6851, 6855, 6857, 6859, 6860, 6861, 6863, 6866, 6872, 6869,
-     6876, 6877, 6873, 6881, 6878, 7073, 6888, 6879, 7073, 6885,
-
-     6889, 6882, 6891, 6895, 7073, 6900, 6893, 6902, 6903, 6906,
-     6907, 7073, 6909, 6916, 6911, 7073, 6917, 7073, 7073, 6919,
-     6913, 6920, 6926, 6928, 7073, 7073, 7073, 6953, 6960, 6967,
-     6974, 6981, 6988, 6995,   88, 7002, 7009, 7016, 7023, 7030,
-     7037, 7044, 7051, 7058, 7065
+      580,  581,  578,  584,  585,  587,  589,  598,  599,  590,
+      602,  596,  611,  607,  616,  612,  614,  613,  617,  541,
+      627,  628,  620,  629,  630,  624,  633,  641,  637,  649,
+      644,  635,  645,  647,  648,  652,  651,  656,  653,  668,
+      670,  669,  672,  679,  665,  675,  666,  678,  682,  681,
+      691,  654,  686,  693,  698,  683,  696,  699,  687,  702,
+
+      704,  705,  710,  711,  708, 7110,  718,  714,  721,  722,
+      729,  726,  731,  733,  740,  741,  716,  725,  737,  739,
+      744,  746,  748,  750,  742,  751,  755,  753,  759,  763,
+      770,  765,  772,  785,  767,  773,  777,  778,  786,  774,
+      780,  798,  812,  790,  808,  809,  795,  813,  814,  815,
+      816,  818,  822,  819,  833,  821,  823,  830,  836,  837,
+      839,  840,  847,  842, 7110,  844,  852,  866,  853,  862,
+      865,  849,  869,  871,  850,  881,  877,  874,  891,  913,
+      878,  884,  882,  886,  889, 7110,  896,  893,  937,  895,
+      902,  923,  918,  906,  919,  920,  921,  925,  947,  928,
+
+      926,  943,  961,  958,  942,  948,  945,  959,  967,  972,
+      969,  971,  973,  974,  983,  883,  976,  975,  989,  978,
+      979,  984,  990,  994,  997, 1003, 1007, 1008, 1009,  999,
+     1001, 1013, 1014, 1017, 1025, 1048, 1021, 1019, 1030, 1020,
+     1037, 1042, 1022, 1038, 1050, 1049, 1051, 1039, 1040, 1055,
+     1058, 1067, 1060, 1063, 1076, 1071, 1074, 1077, 1078, 1079,
+     1081, 1080, 1085, 1086, 1087, 1088, 1095, 1093, 1094, 1101,
+     1103, 1096, 1109, 1107, 7110, 1111, 7110, 1113, 1114, 1115,
+     1116, 1118, 1119, 1120, 1121, 7110, 1123, 1126, 1127, 1137,
+     1128, 1138, 1145, 1152, 1130, 1148, 1149, 1150, 1151, 1155,
+
+     1158, 1169, 1156, 1161, 1172, 1159, 1174, 1171, 1168, 1177,
+     1175, 1182, 1178, 1184, 1185, 1186, 1205, 7110, 1187, 1188,
+     1195, 1192, 1198, 1203, 1202, 1212, 1223, 1214, 1215, 1222,
+     1226, 1239, 1227, 1230, 1191, 1234, 1236, 1247, 1237, 1249,
+     1243, 1251, 1245, 1252, 1254, 1255, 1259, 1261, 1265, 1266,
+     1268, 7110, 1267, 1271, 1278, 1285, 1280, 1272, 1269, 1283,
+     1286, 1289, 1290, 1291, 1293, 1296, 1298, 1300, 1308, 1303,
+     1311, 1309, 1310, 1312, 1314, 1317, 1316, 1318, 1323, 1331,
+     1328, 1333, 1336, 1344, 1343, 1346, 1353, 1355, 1340, 1348,
+     1350, 1356, 1352, 1351, 1360, 1361, 1366, 1363, 1365, 1372,
+
+     1373, 1374, 1375, 1377, 1378, 1382, 1380, 1385, 1387, 1388,
+     1390, 1389, 1391, 1398, 1397, 1399, 1404, 1401, 1417, 1403,
+     1406, 1420, 1423, 1410, 1414, 7110, 1432, 1427, 1430, 1431,
+     1434, 1437, 1438, 1442, 1441, 1444, 1447, 1445, 1446, 1449,
+     1452, 1453, 1454, 1455, 1456, 1462, 1469, 1464, 1473, 1480,
+     1479, 1481, 1467, 1483, 1484, 1487, 1488, 1495, 1491, 1499,
+     1500, 1490, 1501, 1494, 1514, 1504, 1505, 1511, 1525, 1502,
+     1520, 1522, 1512, 1523, 1526, 1528, 1534, 1542, 1538, 1539,
+     1546, 1547, 1541, 1549, 1543, 1553, 1556, 1557, 1558, 1559,
+     1560, 1567, 1564, 1563, 1569, 1570, 1565, 1571, 1579, 1573,
+
+     1587, 1577, 1586, 1589, 1592, 1593, 1594, 1595, 1598, 1596,
+     1602, 1603, 1604, 1605, 1610, 1617, 1606, 1625, 1618, 1608,
+     1619, 1626, 1628, 1634, 1635, 1636, 1637, 1638, 1639, 1641,
+     1642, 1648, 1645, 1651, 1652, 1655, 1657, 1656, 1670, 1662,
+     1671, 1672, 1659, 1675, 1677, 1679, 1660, 1683, 1685, 1688,
+     1690, 1680, 7110, 1678, 1702, 1691, 1699, 1698, 1700, 1701,
+     1712, 1705, 1707, 1704, 1708, 1709, 1734, 7110, 1715, 7110,
+     7110, 1718, 7110, 7110, 1717, 1721, 7110, 1716, 1731, 1723,
+     1724, 1741, 1747, 1749, 1744, 1742, 1751, 1752, 1763, 1773,
+     1758, 1759, 1761, 1766, 1767, 1762, 1779, 1776, 1768, 1788,
+
+     1789, 1769, 1795, 1802, 1790, 1805, 1800, 1803, 1809, 1807,
+     1811, 1813, 1817, 1819, 1820, 1822, 1823, 1824, 1826, 1720,
+     1828, 1825, 1833, 1830, 1834, 1836, 1835, 1843, 1846, 1839,
+     1855, 7110, 1853, 1856, 1842, 1865, 1862, 1866, 1868, 1863,
+     1864, 1874, 1876, 1870, 1877, 1879, 1881, 1880, 1882, 1883,
+     1886, 1889, 1892, 1890, 1894, 1897, 1896, 1902, 7110, 1903,
+     1904, 1906, 1910, 1907, 1908, 1917, 1909, 1918, 1919, 1920,
+     1932, 1924, 1934, 1925, 1927, 1936, 1929, 1937, 1939, 7110,
+     1947, 1952, 1941, 1954, 1944, 1948, 1956, 1957, 1958, 1960,
+     1961, 1963, 1964, 1966, 1977, 1972, 1974, 1973, 1975, 1983,
+
+     1987, 1980, 1990, 1991, 1999, 1992, 1995, 2000, 2001, 2002,
+     2003, 2005, 2006, 2008, 2012, 2013, 2020, 2016, 2024, 2017,
+     2019, 2035, 2040, 2022, 2033, 2036, 2037, 2038, 2043, 2047,
+     2051, 2046, 2050, 2053, 2060, 2055, 2058, 2061, 2062, 2069,
+     2071, 2063, 2073, 2080, 2064, 2074, 2083, 2076, 7110, 2082,
+     2084, 7110, 2089, 2090, 2091, 2113, 2092, 2096, 2099, 2104,
+     2101, 2105, 2108, 2097, 2115, 2107, 2131, 2119, 2127, 2132,
+     2135, 2137, 2133, 2138, 2139, 2140, 2144, 2146, 2149, 2151,
+     2159, 2162, 2166, 2168, 2170, 2169, 2171, 2172, 2174, 2194,
+     2173, 2175, 2176, 2177, 2178, 2181, 2188, 2182, 2183, 2184,
+
+     2187, 2199, 2207, 2204, 2205, 2210, 2211, 2212, 2216, 2219,
+     2221, 2222, 7110, 2229, 2232, 2224, 2226, 2233, 2244, 2236,
+     2237, 7110, 2239, 2240, 2245, 2253, 2250, 2251, 2252, 2254,
+     2255, 2258, 2260, 2262, 2264, 2275, 2263, 2282, 7110, 2267,
+     7110, 2265, 2266, 2284, 2268, 2277, 2285, 2290, 2288, 2292,
+     7110, 7110, 2294, 2295, 2300, 2302, 2312, 2298, 2308, 2309,
+     7110, 2310, 2317, 7110, 2314, 2313, 2321, 2319, 2320, 2325,
+     2327, 2329, 2331, 2336, 2332, 2343, 2334, 2339, 2347, 7110,
+     2350, 2335, 2348, 2353, 2354, 2355, 2356, 2357, 2363, 2360,
+     7110, 2364, 2366, 2367, 2380, 2376, 2377, 2378, 2381, 2387,
+
+     2379, 2383, 2385, 2389, 2390, 2399, 2400, 2401, 2404, 2406,
+     2413, 2410, 2414, 7110, 2412, 2398, 2418, 2425, 2421, 2423,
+     2420, 2424, 2427, 2428, 2430, 2431, 2436, 2437, 2435, 2441,
+     2442, 2443, 2450, 2451, 2452, 2453, 2456, 2447, 2457, 2460,
+     2461, 2468, 2463, 2465, 2469, 2470, 7110, 2473, 2476, 2477,
+     2478, 2482, 2480,  171, 2484, 2486, 2490, 2489, 2496, 2504,
+     2491, 2499, 2512, 2497, 2509, 2508, 2515, 2507, 2516, 2517,
+     2518, 2519, 2524, 2525, 2523, 7110, 2527, 2529, 2528, 2532,
+     2535, 2534, 2539, 7110, 2545, 2536, 2551, 2560, 2550, 2548,
+     2561, 2552, 2563, 2565, 2567, 2566, 2568, 2575, 2573, 2570,
+
+     2576, 2577, 7110, 2583, 2586, 2588, 2579, 2589, 2597, 2595,
+     2590, 2592, 2598, 2600, 2606, 2602, 2608, 2610, 2611, 2613,
+     2616, 2615, 2624, 2614, 2619, 2626, 2623, 2625, 2628, 2627,
+     2633, 2636, 2643, 2641, 7110, 2648, 2645, 2649, 2647, 2650,
+     2652, 2654, 2653, 2672, 2656, 2662, 2664, 2673, 2678, 2667,
+     2681, 2688, 2684, 2689, 2693, 2698, 2695, 2699, 2705, 2696,
+     2707, 2709, 2703, 2710, 2719, 2711, 2715, 2716, 2718, 2722,
+     2730, 2731, 2729, 2733, 2726, 2727, 2744, 2738, 2750, 2756,
+     2746, 7110, 2755, 2748, 2742, 2758, 2760, 2767, 2764, 2765,
+     2770, 2768, 2771, 2772, 2774, 2778, 2783, 2784, 2657, 2781,
+
+     2786, 2790, 2788, 2794, 2797, 2796, 2798, 2801, 2808, 2805,
+     2810, 2811, 7110, 2812, 2816, 2799, 2817, 2825, 2819, 2828,
+     2829, 2831, 2822, 2832, 2833, 2835, 2837, 2838, 2841, 2840,
+     2848, 2845, 2847, 2849, 2846, 7110, 2858, 2852, 2859, 2863,
+     2862, 2865, 2866, 2873, 2877, 2879, 2881, 2883, 2869, 2885,
+     2886, 2889, 7110, 2896, 2898, 2894, 2895, 2903, 2901, 2904,
+     2905, 2907, 2908, 7110, 2909, 2911, 2912, 2915, 2913, 2917,
+     2924, 2925, 2920, 7110, 2927, 2931, 2932, 2934, 2935, 2936,
+     2937, 2938, 2941, 2942, 2944, 2943, 2957, 2946, 2953, 7110,
+     2949, 2965, 2960, 2963, 2966, 2970, 2971, 2973, 2975, 2976,
+
+     2977, 2981, 7110, 2993, 2871, 2989, 2998, 2982, 2990, 2994,
+     2999, 3002, 3003, 2996, 3005, 3006, 3009, 7110, 3010, 3013,
+     3015, 3017, 3019, 3020, 3021, 3028, 3027, 3026, 3030, 3032,
+     3035, 3036, 3034, 3043, 3037, 3047, 3041, 3045, 3054, 3055,
+     3057, 3058, 3060, 3061, 3070, 3071, 3068, 3073, 3076, 3077,
+     3069, 3078, 3079, 3087, 3092, 3094, 3089, 3095, 7110, 3098,
+     3100, 3093, 3091, 3101, 3105, 3103, 3107, 3110, 3106, 3108,
+     3120, 3121, 3112, 3128, 3130, 3123, 3132, 3134, 3136, 3137,
+     3139, 3138, 3140, 3141, 3148, 3145, 3147, 3149, 3158, 3151,
+     3156, 3169, 3154, 3161, 3164, 3165, 3166, 3168, 3171, 3172,
+
+     3176, 3178, 3174, 3179, 3188, 3190, 3195, 3186, 3197, 3196,
+     3199, 3202, 3203, 3204, 7110, 3207, 3208, 3205, 3212, 3215,
+     3218, 3219, 3227, 3222, 3226, 3234, 3230, 3229, 3236, 3238,
+     3241, 3242, 3243, 3250, 3246, 7110, 3247, 7110, 3248, 3249,
+     3252, 3261, 3256, 7110, 3267, 7110, 3257, 3271, 3262, 3264,
+     3268, 7110, 3272, 3273, 3277, 3274, 3279, 3281, 3285, 3286,
+     3287, 3288, 3289, 3296, 3291, 3295, 3298, 3302, 3301, 3305,
+     3308, 3310, 3311, 3313, 3312, 3315, 3319, 3320, 3321, 3328,
+     3330, 3331, 3332, 3333, 3334, 7110, 3338, 3341, 3335, 3346,
+     3343, 3345, 3347, 3353, 3354, 3355, 3356, 3360, 3358, 3362,
+
+     3367, 3370, 3364, 3371, 3374, 3381, 3383, 3375, 3390, 7110,
+     3385, 3388, 3389, 3392, 7110, 3396, 3393, 3402, 3404, 3397,
+     3394, 3400, 3406, 3413, 3407, 3410, 3416, 3420, 3424, 3427,
+     3428, 7110, 3421, 3429, 3419, 3437, 3442, 3433, 3445, 3449,
+     3446, 3452, 3454, 3456, 3458, 3435, 3459, 3460, 3461, 3462,
+     3470, 3472, 3473, 3469, 3482, 3468, 3475, 3484, 3485, 3471,
+     3478, 3486, 3487, 3488, 3492, 3494, 3493, 3495, 3496, 3497,
+     3503, 3509, 7110, 3501, 3512, 3504, 3521, 3510, 3518, 3519,
+     3514, 3523, 3531, 3527, 7110, 3538, 3525, 3535, 3529, 3542,
+     3533, 3546, 3547, 3549, 3550, 3551, 3554, 3553, 3552, 7110,
+
+     3555, 7110, 3556, 3569, 3558, 3564, 3573, 3574, 3576, 3578,
+     3580, 3582, 3583, 3584, 3586, 3589, 3590, 3594, 3595, 3598,
+     3596, 3615, 3600, 3597, 3602, 3611, 3612, 3613, 3616, 3626,
+     3618, 3617, 7110, 7110, 3619, 3621, 3633, 3628, 3635, 3636,
+     3637, 3640, 3647, 3643, 3646, 3649, 3650, 3658, 7110, 3653,
+     3654, 3660, 3661, 3662, 3671, 3663, 3673, 3680, 3678, 3675,
+     3685, 3684, 7110, 3677, 3686, 3693, 3688, 3695, 3702, 7110,
+     3691, 7110, 3692, 3694, 3703, 3706, 3705, 3707, 3708, 3709,
+     3712, 3715, 3717, 3720, 3730, 3732, 3733, 3727, 3735, 3723,
+     3728, 3737, 3739, 3742, 3750, 3745, 3747, 3748, 7110, 3752,
+
+     3749, 3753, 3754, 3758, 3760, 3768, 3761, 3762, 7110, 3764,
+     3771, 3774, 3772, 3776, 3782, 3779, 3783, 3786, 3788, 3789,
+     3790, 3792, 3794, 7110, 3793, 3796, 3807, 3799, 3800, 3802,
+     3810, 3814, 3820, 7110, 3821, 3813, 3829, 3825, 3815, 3828,
+     3831, 3832, 3833, 3835, 3836, 3837, 3838, 3839, 3844, 3845,
+     3841, 3840, 3847, 3858, 3859, 3850, 3869, 3857, 3861, 7110,
+     3871, 3866, 3872, 3873, 3874, 3875, 3876, 3878, 3881, 3884,
+     3886, 3896, 3897, 3888, 3893, 3899, 3901, 3903, 3908, 3910,
+     7110, 3911, 3904, 3918, 3916, 3915, 3923, 3925, 3917, 3927,
+     3929, 3919, 3930, 3931, 3933, 3941, 3939, 3949, 3945, 3935,
+
+     3947, 3946, 3954, 3950, 3952, 3953, 3956, 7110, 3968, 3963,
+     3969, 3971, 3974, 3975, 3982, 3978, 3979, 3980, 3989, 3981,
+     3991, 3983, 3986, 3993, 3996, 3997, 7110, 7110, 4005, 3998,
+     4000, 7110, 4002, 4006, 4016, 4012, 4014, 4015, 4018, 4019,
+     4020, 4021, 4024, 4022, 4030, 7110, 4037, 4034, 4038, 4035,
+     4042, 4050, 4041, 7110, 4040, 4051, 4053, 4056, 4054, 4057,
+     4058, 4060, 4062, 4064, 4066, 4067, 4068, 4070, 4080, 4081,
+     4073, 4077, 4082, 7110, 4083, 4084, 4090, 4088, 4089, 4091,
+     4096, 7110, 4097, 4100, 4098, 4101, 4105, 4109, 4115, 4112,
+     4118, 4120, 4121, 4124, 4122, 4125, 4126, 4129, 4136, 4132,
+
+     4133, 4134, 4131, 4138, 4151, 4153, 7110, 4147, 4154, 4140,
+     4158, 4162, 7110, 4167, 4174, 4175, 7110, 4177, 4155, 4159,
+     4172, 4182, 7110, 4178, 4179, 4180, 4185, 4187, 4194, 4189,
+     4197, 4196, 4198, 4193, 4199, 4202, 7110, 4203, 4200, 4201,
+     7110, 4205, 4209, 4221, 4223, 4207, 4224, 4225, 4228, 4226,
+     4229, 7110, 4230, 7110, 4234, 4236, 4239, 7110, 4241, 4242,
+     4244, 4246, 4243, 4250, 4251, 4257, 4259, 4247, 4261, 4262,
+     4263, 4264, 4266, 4275, 4265, 4272, 4273, 4274, 7110, 4277,
+     4276, 4284, 4286, 4279, 4296, 4292, 4290, 4285, 4298, 4287,
+     7110, 7110, 4305, 7110, 4307, 4308, 4309, 4311, 7110, 4313,
+
+     4312, 4320, 4315, 4316, 4319, 4318, 4323, 4329, 7110, 4331,
+     4333, 7110, 4335, 4338, 4345, 4340, 4341, 4342, 4343, 4346,
+     4350, 4349, 4353, 4355, 4356, 4357, 4352, 4366, 4361, 4374,
+     4360, 4379, 7110, 4362, 4372, 4377, 4387, 4384, 4380, 4388,
+     4392, 4390, 7110, 4394, 4401, 4393, 4404, 4405, 7110, 4406,
+     7110, 4396, 4407, 4408, 4417, 4413, 4424, 7110, 4421, 4422,
+     4426, 4427, 4428, 4429, 4430, 4434, 4437, 4438, 4440, 4447,
+     4443, 4444, 4442, 4451, 4458, 7110, 4446, 4449, 4452, 4462,
+     4467, 4459, 4469, 4471, 4478, 4474, 4473, 4476, 4477, 4481,
+     4483, 4486, 4488, 4490, 4492, 4482, 7110, 4498, 4496, 4501,
+
+     4504, 4512, 4507, 4509, 4510, 7110, 4514, 4515, 4516, 7110,
+     4517, 4513, 4523, 4528, 4524, 4529, 4531, 4534, 4535, 4537,
+     4538, 4536, 7110, 4540, 4543, 4539, 4556, 4557, 4545, 4546,
+     7110, 7110, 4563, 7110, 4565, 4544, 4558, 4548, 4568, 4570,
+     4575, 4572, 4577, 4578, 4580, 4583, 4584, 4585, 7110, 4586,
+     4594, 4590, 4601, 4597, 4608, 4603, 4607, 4604, 7110, 7110,
+     4610, 4613, 4611, 4617, 4618, 4621, 4622, 4629, 4625, 4626,
+     4632, 4636, 4643, 7110, 4634, 4635, 4642, 4644, 7110, 4645,
+     4647, 4648, 4650, 4649, 4651, 4656, 4653, 4657, 4658, 4660,
+     4663, 4661, 4674, 4666, 4668, 4675, 4677, 4678, 4681, 4682,
+
+     4683, 4688, 7110, 4690, 4685, 4691, 4692, 4696, 4699, 4702,
+     4703, 4700, 4705, 4713, 7110, 4714, 7110, 4709, 4706, 4725,
+     4715, 4708, 4733, 4730, 4734, 4727, 4718, 4736, 4738, 4743,
+     4746, 4739, 4748, 4749, 4752, 4753, 4754, 7110, 4757, 4759,
+     4761, 4763, 4769, 4771, 4773, 7110, 4774, 4765, 4776, 4777,
+     4781, 4783, 4784, 4787, 4788, 4791, 4792, 4793, 4795, 4800,
+     4797, 4801, 4802, 4804, 4805, 7110, 4808, 4815, 4809, 4817,
+     4812, 4820, 4821, 4823, 4831, 4834, 4822, 4829, 4835, 7110,
+     4836, 4838, 4840, 4848, 7110, 4843, 4845, 4846, 4849, 4850,
+     4853, 4855, 4856, 4858, 4862, 7110, 4866, 4859, 4868, 4867,
+
+     4870, 4871, 4872, 4876, 4882, 4884, 4878, 4891, 7110, 4892,
+     4885, 4890, 4896, 4898, 4899, 4900, 4903, 4904, 7110, 4905,
+     4913, 4914, 4907, 4926, 4931, 4906, 4917, 4934, 4924, 4933,
+     4915, 4935, 4936, 4937, 4941, 4942, 4943, 4944, 4945, 4955,
+     4960, 4958, 7110, 4946, 7110, 4947, 4956, 4963, 4974, 4969,
+     4971, 4972, 4976, 4975, 7110, 4961, 4982, 4984, 4979, 4987,
+     7110, 4988, 4985, 4989, 4990, 7110, 5003, 4986, 4992, 4993,
+     5008, 5009, 7110, 5014, 5015, 5011, 5023, 5025, 5020, 5022,
+     5024, 5026, 5028, 5030, 5031, 5032, 5041, 5034, 5037, 7110,
+     5039, 5046, 5052, 5053, 5054, 5036, 5047, 5055, 5057, 5063,
+
+     5060, 7110, 5064, 5065, 5066, 5067, 5068, 5070, 5071, 5072,
+     5084, 5083, 5079, 5076, 5081, 5088, 5090, 5092, 5097, 7110,
+     5093, 5098, 5099, 5108, 5109, 5110, 5115, 7110, 5111, 7110,
+     5112, 5116, 5121, 5124, 5128, 7110, 5131, 5132, 5119, 5136,
+     7110, 7110, 5138, 5139, 5140, 5144, 5141, 7110, 7110, 5147,
+     7110, 5148, 7110, 5149, 5151, 7110, 7110, 5101, 5153, 5154,
+     5155, 5156, 5158, 7110, 5165, 7110, 5168, 5169, 5170, 5172,
+     5159, 5173, 7110, 5174, 5177, 5182, 5183, 5185, 7110, 5176,
+     5187, 5191, 5204, 5190, 5186, 7110, 5200, 5202, 5203, 5206,
+     7110, 5209, 5212, 5213, 5207, 5214, 5215, 5216, 5123, 5217,
+
+     5219, 5220, 5229, 5226, 5227, 5230, 5237, 5239, 5241, 5243,
+     5244, 5245, 5248, 5249, 5251, 5254, 5257, 5258, 5259, 5260,
+     5261, 5265, 5267, 5264, 5273, 5275, 5268, 5277, 5284, 5285,
+     5286, 5270, 5288, 5287, 5289, 5295, 5291, 5302, 5297, 5299,
+     5303, 5304, 5306, 5305, 5308, 5312, 5313, 5317, 5315, 5318,
+     7110, 5311, 5321, 5322, 5331, 5325, 5332, 5335, 5342, 5347,
+     5348, 7110, 5350, 7110, 5352, 5336, 5344, 5338, 5356, 7110,
+     5358, 5359, 5360, 5361, 5363, 5364, 5365, 5366, 5362, 5369,
+     5373, 7110, 5375, 5389, 5376, 5370, 5385, 5396, 7110, 5391,
+     5398, 5383, 5393, 5399, 5402, 5403, 5404, 5405, 5408, 5406,
+
+     5407, 5413, 5416, 5410, 5419, 5420, 7110, 5428, 5432, 5435,
+     5421, 5433, 5434, 5436, 5438, 5440, 5442, 5443, 5444, 5446,
+     5447, 5448, 5454, 5460, 5457, 5465, 5470, 7110, 5453, 7110,
+     5471, 5473, 5474, 5461, 5477, 5478, 5475, 5479, 7110, 7110,
+     5476, 5484, 5485, 5490, 5491, 5487, 5494, 5497, 5499, 5500,
+     7110, 5501, 5503, 5507, 5511, 5510, 5512, 7110, 5517, 5519,
+     5520, 5522, 7110, 5523, 5524, 5526, 5527, 5537, 5529, 5542,
+     5538, 5544, 5531, 5534, 5545, 5550, 7110, 7110, 7110, 7110,
+     5551, 5554, 5556, 5557, 5558, 5559, 5560, 5564, 5566, 5562,
+     5563, 5567, 7110, 5578, 7110, 7110, 5574, 7110, 5580, 5581,
+
+     5584, 5586, 5568, 5588, 5590, 7110, 5591, 7110, 5596, 5599,
+     5592, 5603, 5609, 5600, 5593, 5611, 5613, 5614, 5615, 5616,
+     5623, 5621, 5624, 5622, 5627, 5629, 5631, 7110, 7110, 5635,
+     5639, 5640, 5642, 5644, 5645, 5646, 5653, 5651, 5652, 5654,
+     5656, 5658, 5659, 5667, 5668, 5664, 5665, 5673, 7110, 5674,
+     5670, 5676, 7110, 5678, 7110, 5682, 5683, 5684, 5685, 5686,
+     5691, 5692, 5693, 5695, 5697, 7110, 7110, 5696, 5711, 5706,
+     7110, 7110, 5698, 5707, 5708, 5710, 5716, 5713, 5718, 7110,
+     5721, 5722, 5723, 5719, 5725, 5733, 5726, 7110, 5735, 7110,
+     5736, 5738, 5744, 5739, 5747, 5752, 5748, 5755, 5754, 5751,
+
+     5757, 5758, 7110, 5760, 5761, 7110, 5768, 5767, 5771, 5765,
+     5772, 5777, 5773, 7110, 5778, 5780, 5785, 5790, 7110, 5792,
+     5793, 5794, 5787, 7110, 5801, 7110, 5795, 5802, 5804, 5809,
+     5805, 7110, 5806, 5810, 7110, 5813, 5819, 5821, 5822, 5814,
+     5823, 7110, 5829, 5824, 7110, 5830, 5832, 5833, 5838, 5839,
+     5841, 5835, 5843, 5844, 5851, 5847, 5849, 7110, 7110, 5862,
+     5852,  135, 5865, 5855, 5860, 5863, 5866, 5873, 5868, 5870,
+     5876, 7110, 7110, 5877, 7110, 5871, 5881, 7110, 5869, 5885,
+     5886, 5889, 5890, 5891, 5892, 5896, 5898, 5899, 5900, 5901,
+     5902, 5908, 7110, 5920, 5923, 5905, 5926, 5927, 5929, 5931,
+
+     5933, 5935, 5937, 5938, 5939, 5918, 5940, 5941, 5942, 5945,
+     5947, 5948, 5949, 5951, 7110, 5958, 5963, 5952, 5960, 5965,
+     5966, 5967, 7110, 5974, 5970, 5979, 5976, 7110, 5983, 5980,
+     5984, 5986, 5987, 7110, 5988, 5991, 5998, 5999, 5992, 5994,
+     6000, 6002, 6004, 6015, 7110, 6005, 6007, 6008, 7110, 7110,
+     7110, 6020, 6022, 6019, 7110, 6027, 6023, 6010, 6028, 7110,
+     6030, 6031, 6032, 7110, 7110, 7110, 6034, 6036, 6038, 7110,
+     6042, 6045, 7110, 6043, 7110, 6048, 7110, 6049, 6051, 6052,
+     6057, 7110, 6058, 6060, 6050, 6067, 7110, 6075, 6077, 6079,
+     6061, 6065, 6072, 6081, 7110, 6088, 6084, 6087, 6094, 6080,
+
+     6083, 6090, 6096, 6097, 6105, 6100, 6103, 7110, 6104, 6107,
+     6109, 6116, 6110, 6106, 6113, 7110, 6118, 7110, 6120, 7110,
+     6122, 6123, 6124, 6126, 6131, 6127, 6132, 6133, 6134, 6142,
+     6144, 6146, 6147, 6148, 6150, 6153, 6154, 7110, 7110, 6164,
+     6156, 7110, 6160, 6168, 7110, 6157, 7110, 6172, 7110, 6159,
+     6161, 6176, 6169, 6179, 7110, 7110, 6183, 6180, 6186, 6193,
+     6188, 6190, 6191, 7110, 6196, 6192, 6194, 6199, 7110, 6207,
+     7110, 6202, 6209, 6212, 7110, 6204, 6215, 6219, 6205, 6208,
+     6224, 6216, 6221, 6225, 6235, 6231, 6232, 6233, 6237, 6234,
+     6238, 6239, 6246, 7110, 7110, 7110, 6240, 6248, 6257, 6255,
+
+     6256, 6264, 6260, 7110, 6261, 6263, 6265, 6267, 6275, 6271,
+     6273, 7110, 6279, 6274, 6276, 6277, 6281, 6283, 6282, 6284,
+     7110, 6295, 6297, 6300, 6303, 6304, 6305, 6307, 6312, 6314,
+     6316, 6309, 6317, 6325, 6321, 7110, 7110, 6324, 6320, 7110,
+     6328, 6330, 7110, 6331, 7110, 6332, 6333, 6334, 6335, 6337,
+     7110, 6340, 6341, 6342, 6344, 7110, 6345, 6347, 6349, 6352,
+     7110, 6346, 6366, 6359, 6362, 6363, 7110, 7110, 6369, 6371,
+     7110, 6373, 6375, 6374, 6382, 6377, 6378, 6384, 6387, 7110,
+     6391, 6393, 6385, 6394, 6396, 6397, 6400, 7110, 6399, 6402,
+     6403, 6404, 7110, 6408, 6411, 6412, 6410, 6413, 7110, 6415,
+
+     6416, 6425, 6417, 7110, 6428, 6432, 6433, 7110, 7110, 7110,
+     6438, 6440, 6441, 7110, 7110, 7110, 7110, 6443, 6444, 6434,
+     6451, 7110, 6447, 7110, 7110, 6455, 6459, 6463, 6465, 6469,
+     6468, 7110, 6470, 6471, 6474, 6458, 6477, 7110, 7110, 6478,
+     6481, 6482, 6483, 6485, 6486, 7110, 7110, 6487, 6489, 6490,
+     6495, 6492, 7110, 6493, 6498, 6500, 6505, 6508, 6516, 6518,
+     6510, 6519, 6520, 6527, 6528, 6513, 6530, 6523, 6531, 6534,
+     6533, 6541, 6543, 6542, 6547, 6550, 6551, 6553, 7110, 7110,
+     6555, 7110, 6557, 6559, 7110, 6560, 7110, 6562, 6564, 6570,
+     6572, 7110, 6574, 6576, 6580, 6582, 6565, 7110, 6577, 6584,
+
+     6588, 6585, 6589, 6590, 7110, 6593, 6595, 6597, 6598, 6599,
+     6603, 6604, 6607, 7110, 6602, 6609, 7110, 7110, 6600, 6616,
+     6611, 6620, 6622, 7110, 6623, 6630, 6625, 6627, 6628, 6631,
+     6629, 7110, 6635, 6633, 7110, 7110, 6634, 6636, 7110, 7110,
+     6643, 6644, 7110, 7110, 7110, 7110, 7110, 7110, 7110, 7110,
+     6648, 6652, 7110, 7110, 6646, 6657, 6661, 7110, 6663, 7110,
+     6650, 6658, 6666, 6654, 7110, 6665, 7110, 6668, 6671, 6672,
+     6285, 6675, 6680, 6676, 6678, 6683, 6684, 6685, 6687, 6686,
+     6692, 6688, 6694, 6698, 6699, 6706, 6696, 6707, 7110, 7110,
+     7110, 6708, 6709, 6714, 6711, 6724, 6725, 6728, 6731, 6717,
+
+     6719, 6732, 6733, 6737, 6721, 6734, 6747, 6740, 6743, 6745,
+     6752, 6744, 6757, 6759, 7110, 6761, 6748, 6753, 6766, 7110,
+     6762, 7110, 6767, 7110, 7110, 6769, 6770, 6773, 6774, 6782,
+     6784, 6775, 6779, 6780, 6783, 6787, 7110, 6791, 7110, 7110,
+     7110, 6794, 6796, 7110, 6795, 6797, 7110, 6798, 6800, 6802,
+     6804, 6806, 6803, 6807, 6808, 6811, 7110, 7110, 6814, 6820,
+     6823, 6825, 6826, 6833, 6828, 6830, 6832, 6836, 6839, 6846,
+     7110, 6844, 6845, 6848, 7110, 6849, 6851, 6852, 6854, 6855,
+     6862, 6857, 6864, 7110, 6860, 7110, 6866, 6863, 6878, 6867,
+     6868, 6869, 6879, 6884, 6881, 7110, 6871, 6890, 6885, 6892,
+
+     6895, 6898, 6899, 6888, 6901, 6905, 6909, 6913, 6908, 6914,
+     6916, 6917, 6918, 7110, 6920, 6923, 7110, 6924, 6925, 6926,
+     6927, 6931, 7110, 6934, 6928, 6936, 6938, 6941, 6943, 7110,
+     6949, 6952, 6953, 7110, 6954, 7110, 7110, 6956, 6944, 6957,
+     6965, 6967, 7110, 7110, 7110, 6990, 6997, 7004, 7011, 7018,
+     7025, 7032,   88, 7039, 7046, 7053, 7060, 7067, 7074, 7081,
+     7088, 7095, 7102
     } ;
 
-static const flex_int16_t yy_def[3646] =
+static const flex_int16_t yy_def[3664] =
     {   0,
-     3627,    1, 3628, 3628, 3629, 3629, 3630, 3630, 3631, 3631,
-     3632, 3632, 3633, 3633, 3634, 3634, 3627, 3635, 3627, 3627,
-     3627, 3627, 3636, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3637, 3627, 3627, 3627,
-     3637, 3638, 3627, 3627, 3627, 3638, 3639, 3627, 3627, 3627,
-     3627, 3639, 3640, 3627, 3627, 3627, 3640, 3641, 3627, 3642,
-     3627, 3641, 3641, 3643, 3627, 3627, 3627, 3627, 3643, 3644,
-     3627, 3627, 3627, 3644, 3635, 3635, 3627, 3645, 3636, 3645,
-     3636, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3637,
-     3637, 3638, 3638, 3639, 3639, 3627, 3640, 3640, 3641, 3641,
-     3642, 3642, 3641, 3643, 3643, 3627, 3644, 3644, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3641, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3641, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3641, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3641, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3627, 3627, 3635, 3627, 3627,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3641, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3641, 3641, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3641, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3641, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3627, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-
-     3635, 3635, 3635, 3641, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3627, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-
-     3635, 3635, 3627, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3641, 3635, 3627, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3627, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3627, 3635, 3627, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3627, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-     3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3641, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3641, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3627, 3627,
-     3635, 3635, 3635, 3635, 3635, 3627, 3627, 3635, 3627, 3635,
-     3627, 3635, 3635, 3627, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3641, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3627, 3627, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3627, 3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3641, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3627, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3627, 3635, 3635, 3635, 3627, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3627, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3627, 3635, 3635, 3641, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3627, 3635, 3627,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3627, 3627, 3627, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3627, 3627, 3627,
-     3635, 3635, 3635, 3627, 3635, 3635, 3627, 3635, 3627, 3635,
-     3627, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-
-     3635, 3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3627, 3635, 3635, 3627, 3635, 3635, 3627, 3635,
-     3627, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3627, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3627, 3635, 3627, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3627, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3627,
-     3635, 3635, 3627, 3635, 3635, 3627, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3627, 3627,
-     3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3627, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3627,
-     3627, 3627, 3635, 3635, 3635, 3627, 3627, 3627, 3627, 3635,
-
-     3635, 3635, 3635, 3627, 3635, 3627, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3627,
-     3627, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3627, 3635,
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3627, 3635, 3627, 3635, 3635, 3627, 3635, 3627, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3627, 3627,
-
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3627, 3635, 3635, 3627, 3627, 3635, 3635,
-     3627, 3627, 3635, 3635, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3635, 3635, 3627, 3627, 3635, 3635, 3635, 3627,
-     3635, 3627, 3635, 3635, 3635, 3635, 3627, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3627, 3627, 3627, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-
-     3635, 3627, 3635, 3627, 3635, 3627, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635,
-     3627, 3627, 3627, 3635, 3635, 3627, 3635, 3635, 3627, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3627,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3627, 3635, 3635, 3635, 3627, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635, 3635,
-     3635, 3635, 3635, 3635, 3635, 3627, 3635, 3635, 3627, 3635,
-
-     3635, 3635, 3635, 3635, 3627, 3635, 3635, 3635, 3635, 3635,
-     3635, 3627, 3635, 3635, 3635, 3627, 3635, 3627, 3627, 3635,
-     3635, 3635, 3635, 3635, 3627, 3627,    0, 3627, 3627, 3627,
-     3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3627, 3627, 3627
+     3645,    1, 3646, 3646, 3647, 3647, 3648, 3648, 3649, 3649,
+     3650, 3650, 3651, 3651, 3652, 3652, 3645, 3653, 3645, 3645,
+     3645, 3645, 3654, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3655, 3645, 3645, 3645,
+     3655, 3656, 3645, 3645, 3645, 3656, 3657, 3645, 3645, 3645,
+     3645, 3657, 3658, 3645, 3645, 3645, 3658, 3659, 3645, 3660,
+     3645, 3659, 3659, 3661, 3645, 3645, 3645, 3645, 3661, 3662,
+     3645, 3645, 3645, 3662, 3653, 3653, 3645, 3663, 3654, 3663,
+     3654, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3655,
+     3655, 3656, 3656, 3657, 3657, 3645, 3658, 3658, 3659, 3659,
+     3660, 3660, 3659, 3661, 3661, 3645, 3662, 3662, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3659, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3659, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3659, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3659,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645,
+     3645, 3653, 3645, 3645, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3659, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3659, 3659, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3659, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3659, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3659, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3659, 3653, 3645, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3645, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3645, 3653, 3645, 3653, 3653, 3653, 3653, 3645, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3645, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3659, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3659, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3645, 3645, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653,
+     3645, 3653, 3645, 3653, 3653, 3645, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3659, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3645, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3645, 3645, 3653, 3645, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3659, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653, 3653, 3653,
+     3645, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3645, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3645, 3653,
+     3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653,
+     3653, 3659, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3645, 3653, 3645, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3645, 3645,
+     3645, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3645, 3645, 3645, 3653, 3653, 3653, 3645,
+     3653, 3653, 3645, 3653, 3645, 3653, 3645, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653,
+     3653, 3645, 3653, 3653, 3645, 3653, 3645, 3653, 3645, 3653,
+     3653, 3653, 3653, 3653, 3645, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3645, 3653,
+     3645, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3645, 3645, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653, 3653, 3645,
+     3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653, 3653,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3645, 3653,
+
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3645, 3645, 3645,
+     3653, 3653, 3653, 3645, 3645, 3645, 3645, 3653, 3653, 3653,
+     3653, 3645, 3653, 3645, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645,
+     3653, 3645, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3645, 3645, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3645, 3653, 3653, 3645, 3645, 3653, 3653, 3645, 3645,
+     3653, 3653, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3653, 3653, 3645, 3645, 3653, 3653, 3653, 3645, 3653, 3645,
+     3653, 3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645,
+     3645, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3645,
+     3653, 3645, 3653, 3645, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3653, 3645, 3645,
+     3645, 3653, 3653, 3645, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3645, 3645, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3645, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3645, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3653, 3653, 3645, 3653, 3653, 3653, 3653,
+
+     3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653, 3653,
+     3653, 3653, 3653, 3645, 3653, 3653, 3645, 3653, 3653, 3653,
+     3653, 3653, 3645, 3653, 3653, 3653, 3653, 3653, 3653, 3645,
+     3653, 3653, 3653, 3645, 3653, 3645, 3645, 3653, 3653, 3653,
+     3653, 3653, 3645, 3645,    0, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645
     } ;
 
-static const flex_int16_t yy_nxt[7114] =
+static const flex_int16_t yy_nxt[7151] =
     {   0,
        18,   19,   20,   21,   22,   23,   22,   18,   18,   18,
        18,   18,   22,   24,   25,   26,   27,   28,   29,   30,
@@ -1647,763 +1653,766 @@ static const flex_int16_t yy_nxt[7114] =
       153,  181,  196,  189,  154,  155,  164,   86,  164,  164,
        90,  164,   90,   90,  169,   90,  169,  169,  174,  169,
       174,  174,  172,  174,   85,   86,   85,   85,   90,   85,
-       90,   90,  290,   90,   86,   85,   86,  182,   86,   90,
+       90,   90,  291,   90,   86,   85,   86,  182,   86,   90,
        91,  185,  190,  188,   86,   86,  197,   86,  191,   86,
       192,   86,   86,  208,  186,   86,   86,   86,   86,   86,
 
       200,  199,  193,  194,   86,  198,   86,  195,   86,  201,
-       86,  202,  246,  210,  206,  203,  204,  207,  209,   86,
+       86,  202,  247,  210,  206,  203,  204,  207,  209,   86,
       211,  216,  212,  205,   86,  213,   86,   86,   86,  218,
        86,  219,   86,  221,   86,   86,  227,  222,  214,  215,
        86,  228,  226,  224,   86,   86,  217,  230,  225,   86,
        86,  220,   86,  223,  231,  233,  234,  229,   86,   86,
-       86,   86,  232,  236,   86,  238,   86,  241,  235,  239,
-       86,   86,   86,   86,  243,   86,  237,  374,   86,   86,
-       86,  240,   86,  244,  242,  249,  252,  253,   86,  245,
-      254,  248,   86,   86,   86,  255,  250,  247,  261,  258,
-
-      251,  262,   86,   86,  260,  264,   86,   86,   86,   86,
-      259,  268,  256,   86,  265,  257,   86,   86,  263,  267,
-      269,  271,  160,  160,   86,  162,  266,  270,  162,  274,
-      164,  272,  164,  164,  340,  164,  167,  167,  169,   86,
-      169,  169,   90,  169,   90,   90,  170,   90,  174,  273,
-      174,  174,  275,  174,  172,  177,  177,  277,   86,   86,
-       86,   86,   86,   86,   86,   86,   86,  276,  279,   86,
-      282,  285,  281,   86,  278,  280,   86,  288,  287,  284,
-      178,  291,  283,   86,  289,  286,   86,  292,  293,   86,
-      294,  320,   86,  297,   86,  295,   86,  302,  298,   86,
-
-      304,   86,   86,  299,   86,  305,   86,  307,   86,  300,
-      301,  303,  296,  308,   86,  311,  309,   86,   86,   86,
-      306,   86,  313,   86,  314,   86,   86,   86,  176,   86,
-       86,   86,  321,  315,  310,  322,  328,  316,  318,   86,
-      317,  319,   86,  323,  312,  331,  324,   86,  325,  329,
-      335,   86,   86,  332,   86,  330,   86,  333,  337,  338,
-      326,  376,  327,   86,   86,   86,  341,  336,   86,  334,
-      343,   86,   86,  342,  339,  344,   86,  345,   86,   86,
-      346,  348,   86,   86,   86,  347,   86,   86,  350,   86,
-       86,   86,  349,   86,   86,  352,  357,   86,  355,  353,
-
-       86,   86,   86,  358,  351,  362,  356,  364,  354,   86,
-      363,   86,  359,   86,   86,   86,  360,  366,  368,  371,
-       86,  361,   86,   86,   86,   86,  377,  365,  373,  378,
-       86,  380,   86,  369,  370,   86,  367,   86,   86,   86,
-      372,  375,   86,  383,  384,   86,  385,  170,  387,  379,
-      381,   86,   86,  382,   86,   86,   86,  388,   86,  392,
-       86,   86,   86,  391,   86,   86,  398,  396,  394,  399,
-      386,  395,   86,   86,  389,   86,   86,  402,  400,  390,
-      393,  401,   86,   86,   86,   86,   86,  397,   86,  409,
-      408,   86,   86,  412,  410,   86,  407,  403,  404,   86,
-
-      406,  411,  413,  405,   86,   86,   86,  415,   86,  416,
-       86,   86,   86,   86,  419,   86,   86,  420,   86,   86,
-       86,  431,  414,  424,  421,  422,  417,  418,  426,   86,
-       86,   86,  427,  425,   86,  428,   86,  423,   86,  433,
-      429,   86,  434,  432,   86,   86,   86,   86,   86,   86,
-      440,  436,   86,   86,   86,  441,   86,  430,  443,  439,
-       86,   86,  437,   86,  446,   86,   86,  435,  438,  448,
-      451,  442,   86,   86,   86,  444,   86,  450,  445,  447,
-       86,   86,  460,  452,  453,   86,  449,   86,   86,   86,
-      462,  467,  461,  175,  468,   86,  454,  472,  463,  455,
-
-      464,  469,  473,   86,  456,  457,  458,  459,   86,   86,
-      470,  471,  474,  465,  475,   86,  466,   86,   86,   86,
-       86,   86,   86,  484,   86,   86,   86,  486,  482,   86,
-      485,  483,   86,  478,  476,  479,   86,  477,  480,  481,
-       86,  487,   86,   86,  488,   86,  494,  489,  490,   86,
-       86,  491,   86,   86,  495,  500,  496,   86,  501,   86,
-      493,   86,  502,  492,   86,  497,   86,   86,  512,  499,
-       86,  503,  498,  505,  514,  506,   86,  504,  971,  508,
-       86,  507,   86,  513,  515,   86,   86,   86,   86,   86,
-       86,  516,  509,   86,  170,  510,  530,  511,   86,  517,
-
-       86,  518,  532,   86,  533,  546,   86,  519,  529,  535,
-       86,  520,  573,   86,  531,  552,  521,  534,   86,  522,
-       86,  523,  547,  524,  537,  536,  548,   86,   86,   86,
-       86,  549,   86,  550,   86,   86,  525,  553,  555,  526,
-      551,  527,  557,  528,   86,  554,  538,  539,   86,   86,
-       86,   86,   86,  556,  558,  559,  540,  541,  542,  543,
-      544,  561,   86,  545,  560,   86,  567,   86,   86,  565,
-      563,  562,  566,  568,  570,   86,  571,  569,   86,   86,
-       86,  575,   86,   86,   86,   86,   86,   86,  564,  578,
-       86,  579,  580,  574,   86,   86,   86,  170,  572,  577,
-
-      590,   86,  582,  585,   86,  581,  583,  576,   86,  584,
-       86,  593,   86,  586,  587,  588,   86,   86,   86,   86,
-      591,   86,   86,  594,  609,   86,  168,  599,  600,   86,
-       86,  598,  589,  595,  610,  592,   86,  596,   86,  601,
-      597,  602,   86,  611,   86,  613,  614,  603,  612,   86,
-      615,   86,   86,  617,   86,  604,  605,  616,   86,  606,
-      607,  618,   86,  608,   86,  621,   86,  619,  623,   86,
-       86,   86,   86,  626,  620,  624,  627,   86,   86,  622,
-       86,  628,   86,   86,  625,   86,   86,  633,  631,   86,
-      632,   86,   86,  629,   86,  634,   86,   86,   86,  639,
-
-       86,  630,  640,  635,  641,   86,  638,   86,  643,  636,
-      637,   86,   86,  646,   86,   86,  644,  642,   86,  645,
-       86,  648,   86,  650,   86,   86,   86,   86,   86,   86,
-       86,  654,  662,  652,   86,   86,  647,   86,   86,  649,
-      656,   86,   86,  651,  663,  682,  653,  655,  657,  660,
-      658,  661,  659,  664,   86,   86,  666,   86,   86,   86,
-      665,  669,  667,   86,   86,  668,  673,   86,   86,  676,
-       86,  670,   86,  672,   86,   86,   86,  675,  671,   86,
-       86,  679,  678,   86,   86,  683,   86,  674,   86,  685,
-       86,   86,  680,  677,   86,   86,   86,   86,  684,   86,
-
-      681,  700,  686,  688,   86,  712,  166,  687,   86,  689,
-      699,  697,   86,   86,  690,  698,  691,  702,  701,   86,
-      703,   86,  692,  704,  693,   86,  705,  694,  695,  710,
-      706,   86,  711,  713,  696,   86,  708,   86,   86,   86,
-      707,  717,   86,   86,  714,   86,  720,   86,   86,  722,
-      715,   86,   86,  716,   86,   86,  709,   86,  726,   86,
-       86,   86,   86,  719,  724,  718,  723,  729,   86,  725,
-      730,   86,  721,   86,  727,   86,   86,  733,   86,  731,
-      735,  728,  734,  732,  170,  737,   86,  738,  736,   86,
-       86,   86,   86,  739,   86,   86,   86,  746,  744,   86,
-
-      749,   86,   86,  741,   86,  740,  750,  742,  743,  745,
-      748,  752,   86,   86,   86,   86,  751,   86,  754,   86,
-       86,   86,   86,  747,   86,  753,  757,  758,  755,  759,
-       86,  766,   86,   86,  756,  763,  760,   86,  762,  761,
-      764,   86,  768,  765,  767,   86,  769,   86,   86,  770,
-       86,  771,   86,  772,  775,  774,   86,   86,  773,   86,
-       86,  778,   86,  777,  776,   86,   86,   86,   86,  781,
-       86,   86,  782,  780,  786,  785,   86,   86,   86,   86,
-       86,  779,  788,   86,  790,   86,  792,   86,   86,  784,
-       86,  783,   86,   86,   86,  789,  787,  791,  795,  799,
-
-      165,   86,  793,   86,   86,   86,  797,   86,  800,  794,
-       86,  796,   86,  802,  798,  801,   86,  807,  803,   86,
-      809,  804,  805,   86,  810,  806,   86,   86,  811,  814,
-      808,   86,   86,   86,  816,   86,   86,  817,   86,  820,
-      812,  815,  813,  819,   86,   86,   86,   86,   86,  821,
-       86,   86,   86,  826,  824,  828,   86,   86,   86,  818,
-       86,  822,  835,  825,  823,   86,  829,   86,   86,   86,
-       86,  827,  163,  831,  833,  836,  832,  830,   86,  834,
-       86,  837,  838,  839,   86,   86,   86,  840,  842,   86,
-       86,  841,   86,  847,  843,  845,   86,   86,  849,   86,
-
-      850,  848,   86,  844,   86,   86,   86,  853,   86,   86,
-      852,  846,  854,   86,  857,   86,  860,   86,   86,  855,
-       86,  856,   86,  863,   86,  865,  862,  851,  858,  859,
-       86,   86,   86,  870,  861,  868,   86,  866,  867,   86,
-      864,   86,   86,  876,   86,   86,  872,  874,  871,   86,
-      869,  878,  875,   86,   86,   86,  873,  880,   86,   86,
-       86,   86,  886,   86,  879,   86,   86,  887,   86,  877,
-       86,   86,  881,   86,  888,   86,  882,  883,  893,  884,
-       86,  885,  896,   86,  891,  889,  890,  894,   86,   86,
-       86,   86,  892,   86,   86,  895,   86,   86,   86,   86,
-
-      903,  899,   86,  897,  898,   86,   86,   86,   86,   86,
-      900,  934,   86,  902,  901,  904,  906,  911,  905,   86,
-      913,   86,  912,  907,  908,  909,  910,   86,  916,   86,
-       86,  914,   86,   86,   86,  915,   86,  919,   86,   86,
-      917,   86,   86,  923,  918,   86,  924,  927,   86,  920,
-       86,  922,  925,  921,   86,  928,   86,   86,   86,  170,
-       86,  930,  935,  926,  936,  931,  929,  933,   86,   86,
-       86,  932,  937,   86,  938,   86,   86,   86,   86,  944,
-       86,  943,  947,   86,  940,   86,  945,  939,   86,   86,
-       86,  941,  942,  948,  946,  951,  950,   86,  949,   86,
-
-       86,   86,   86,  953,   86,  957,   86,   86,   86,  954,
-      952,   86,  958,  959,   86,   86,   86,   86,   86,   86,
-      956,   86,  973,   86, 1006,  955,  960,  972,  976,  975,
-      970,  161,  961,   86,  962,   86,   86,  963,   86,  974,
-      964,   86,  978,   86,  965,   86,  979,  966,   86,  977,
-       86,  980,  981,  985,  967,  968,  984,  969,   86,   86,
-       86,  982,  983,   86,  986,  987,   86,  988,   86,   86,
-      989,  994,   86,   86,   86,  990,  997,  999,  993, 1001,
-       86,  991,  992,   86,  998,   86,   86,  996, 1003,  995,
-     1007,   86,   86, 1000,   86, 1008,   86, 1015, 1009, 1002,
-
-     1004,   86, 1010,   86,   86, 1013,   86, 1011, 1012,   86,
-       86, 1005, 1017,   86, 1014, 1016,   86,   86, 1018,   86,
-       86,   86,   86, 1021,   86, 1020,   86, 1025,   86, 1019,
-       86, 1028, 1024,   86,   86,   86, 1026, 1032,   86,   86,
-     1022, 1023, 1027,   86, 1033,   86, 1030, 1034,   86, 1035,
-     1037, 1029, 1038,   86, 1036,   86, 1040, 1031,   86,   86,
-     1042,   86,   86,   86, 1041,   86,   86, 1044, 1043, 1046,
-       86, 1045, 1039, 1047,   86,   86,   86,   86,   86,   86,
-       86,   86, 1050, 1048, 1051, 1052,   86, 1056,   86,   86,
-     1060,   86, 1059,   86, 1049,   86,   86, 1053, 1057, 1058,
-
-     1055,   86, 1054,   86,   86,   86,   86,   86, 1067,   86,
-     1062, 1065, 1063,   86, 1061,   86, 1066,   86, 1068,   86,
-       86,   86, 1076, 1069, 1073,   86, 1071,   86, 1064, 1074,
-       86,   86, 1072,   86, 1075,   86,   86,   86, 1082, 1084,
-     1070,   86, 1077,   86, 1078, 1079, 1083, 1085,   86,   86,
-       86, 1081,   86,   86, 1087, 1080,   86,   86,   86,   86,
-       86,   86, 1086, 1095, 1088, 1098, 1093,   86,   86,   86,
-     1089,   86, 1090,   86,   86, 1091, 1092, 1099, 1096, 1100,
-     1097, 1094,   86,   86,   86, 1101,   86,   86, 1103, 1104,
-     1105, 1107, 1102, 1108,   86,   86,   86,   86, 1106,   86,
-
-       86,   86,   86, 1119,   86, 1111, 1109, 1113,   86,   86,
-     1120,   86, 1122,   86,   86, 1110,   86, 1112,   86,   86,
-     1114, 1116,   86, 1115, 1117, 1121, 1125, 1123, 1118, 1126,
-       86,   86,   86,   86, 1124,   86, 1131, 1127, 1128,   86,
-     1133, 1134, 1129, 1132,   86, 1135,   86,   86,   86, 1136,
-     1130,   86, 1139,   86, 1141,   86,   86,   86,   86,   86,
-       86, 1138, 1137, 1144, 1143, 1147,   86, 1151,   86,   86,
-     1148,  170, 1149, 1140, 1142,   86, 1145,   86, 1146, 1150,
-       86,   86, 1154,   86,   86,   86,   86,   86, 1167, 1153,
-     1152,   86, 1170,   86,   86, 1168,   86, 1157, 1158, 1155,
-
-       86,   86,   86,   86, 1159, 1156, 1172, 1160,   86, 1169,
-     1179, 1161,   86, 1162,   86, 1173, 1236, 1163,   86, 1164,
-       86, 1171,   86, 1175, 1165, 1177, 1174,   86, 1176, 1166,
-     1178,   86,   86,   86, 1180,   86, 1181, 1183, 1187, 1186,
-     1184,   86,   86,   86,   86,   86,   86,  178, 1182,   86,
-     1185, 1192,   86, 1191, 1194, 1188, 1195, 1190, 1193, 1196,
-     1197,   86,   86, 1189, 1198,   86, 1199, 1200,   86,   86,
-       86,   86,   86,   86,   86,   86, 1214,   86, 1211,   86,
-       86,   86,   86, 1210, 1215,   86, 1213, 1201, 1202,   86,
-     1203, 1212,   86, 1216,   86, 1204, 1217, 1205, 1222,   86,
-
-     1219, 1220,   86, 1206,   86,   86, 1218, 1223, 1207, 1208,
-     1221, 1224,   86,   86,   86, 1209, 1229,   86,   86,   86,
-     1232,   86, 1230, 1225, 1233,   86,   86, 1237, 1226,   86,
-       86, 1227, 1228,   86, 1235, 1238,   86,   86,   86, 1231,
-       86,   86, 1243,   86, 1234,   86, 1240, 1241,   86,   86,
-     1244,   86,   86,   86, 1246, 1239, 1242,   86,   86,   86,
-       86,   86, 1245,   86,   86, 1247, 1248, 1251, 1252, 1250,
-     1253, 1249, 1255, 1258,   86, 1257,   86, 1254,   86, 1256,
-       86, 1259,   86,   86,   86,   86,   86,   86,  176, 1264,
-     1265, 1266,   86, 1260, 1261,   86, 1267, 1269, 1263, 1270,
-
-     1262,   86, 1268,   86, 1271,   86,   86, 1272,   86, 1275,
-       86,   86,   86, 1277, 1276,   86, 1278,   86,   86, 1273,
-     1279,   86,   86,   86, 1274, 1280, 1286,   86,   86,   86,
-     1281, 1288,   86,  175, 1282, 1284,   86,   86, 1285, 1283,
-       86, 1290,   86, 1289,   86, 1292,   86, 1287,   86, 1293,
-     1294,   86,   86, 1295, 1291,   86, 1296,   86, 1297,   86,
-     1299, 1298, 1300,   86,   86,   86,   86, 1305,   86, 1302,
-       86, 1301, 1304,   86, 1306,   86,   86, 1307,   86, 1309,
-     1303,   86, 1310, 1308,   86,   86,   86, 1316, 1311, 1314,
-     1317, 1351,   86,   86, 1318,   86,   86, 1312, 1315, 1321,
-
-       86,   86,   86,   86, 1313,   86, 1319, 1320, 1322, 1323,
-     1325,   86,   86, 1327,   86,   86, 1324,   86,   86,   86,
-     1329,   86, 1328, 1330,   86,   86,   86, 1331,   86, 1332,
-       86, 1335, 1326, 1336,   86,   86,   86,   86,   86, 1338,
-       86, 1342, 1343, 1333,   86, 1334, 1337,   86,   86, 1340,
-       86,   86, 1346,   86, 1339, 1344, 1345, 1341,   86,   86,
-       86,   86,   86, 1347, 1348,   86,   86, 1357,   86,   86,
-     1349, 1353,  170,   86, 1359,   86,   86, 1350, 1352,   86,
-     1354, 1358,   86,   86, 1360, 1356,   86,   86, 1365, 1362,
-     1355, 1363, 1361, 1369, 1364, 1366, 1367,   86, 1370,   86,
-
-       86,   86,   86,   86,   86, 1373, 1372, 1368,   86,   86,
-       86,   86,   86, 1374,   86,   86, 1371, 1377,   86, 1383,
-       86, 1379, 1380, 1375, 1376,   86, 1378,   86,   86, 1381,
-       86,   86,  170,   86,   86, 1394, 1387, 1382, 1389, 1384,
-       86,   86,   86, 1386, 1393, 1385, 1395, 1390,   86, 1391,
-       86, 1388, 1392, 1396,   86, 1397, 1398,   86,   86,   86,
-     1399,   86,   86,   86, 1406,   86, 1403,   86, 1402, 1400,
-       86,   86, 1407,   86,   86, 1405, 1401, 1411,   86, 1408,
-       86, 1404, 1409,   86,   86, 1412,   86,   86, 1413, 1415,
-     1416,   86, 1410,   86, 1414,   86, 1417,   86,   86,   86,
-
-     1421,   86,   86,   86,   86,  168, 1418,   86, 1419, 1422,
-     1424, 1425,   86, 1423, 1420,   86,   86,   86, 1429, 1431,
-     1426,   86, 1428, 1427,   86,   86, 1434, 1432,   86,   86,
-     1430,   86, 1441,   86,   86,   86, 1433, 1443,   86, 1435,
-     1436, 1437,   86,   86,   86,   86,   86, 1438, 1440,   86,
-     1444, 1449,   86, 1446, 1442, 1451, 1439,   86, 1445,   86,
-     1452,   86, 1447,   86, 1450, 1448,   86,   86, 1456,   86,
-      166, 1466, 1465, 1454,   86, 1467, 1453,   86,   86, 1455,
-       86, 1457, 1464, 1468, 1470, 1458,   86,   86, 1459, 1460,
-       86,   86, 1471, 1461,   86, 1469, 1472,   86, 1473, 1462,
-
-       86, 1475,   86, 1463,   86, 1476, 1480, 1477,   86,   86,
-       86,   86,   86,   86,   86, 1474, 1483, 1486, 1481, 1487,
-       86,   86, 1531,   86, 1478,   86, 1479, 1484,   86,   86,
-     1482,   86, 1485, 1488, 1490, 1489,   86,   86, 1491,   86,
-     1498, 1496,   86, 1492,   86, 1493,   86, 1494, 1502, 1495,
-       86, 1497, 1499, 1500,   86,   86, 1506, 1501,   86,   86,
-     1504, 1507,   86, 1505,   86, 1503,   86, 1508,   86, 1510,
-       86,   86,   86, 1516,   86, 1517,   86, 1512,   86,   86,
-     1511, 1509,   86,   86,   86,   86, 1515, 1521, 1518, 1513,
-     1514, 1519, 1520,   86, 1523,   86,   86,   86, 1522,   86,
-
-     1524,   86, 1527, 1528,   86, 1530,   86,   86,   86,   86,
-     1532,   86,   86, 1525, 1529,   86, 1533, 1535, 1536,   86,
-     1534, 1526, 1538,   86,   86, 1539,   86,   86,   86, 1537,
-       86, 1540,   86, 1541, 1544,   86, 1542,   86, 1549,   86,
-     1547,   86,   86,   86,   86, 1546, 1550,   86, 1543, 1552,
-     1545, 1551, 1548,   86,   86,   86, 1554, 1553, 1555,   86,
-     1557,   86,   86,   86,   86, 1564, 1559, 1556, 1561,   86,
-     1560,   86, 1562, 1558,   86,   86, 1563,   86,   86, 1565,
-     1570,   86, 1571, 1567,   86, 1568,   86,   86,   86, 1572,
-     1574,   86, 1573, 1566, 1569,   86,   86,   86, 1578,   86,
-
-     1575,   86,   86,   86,   86,  170,   86, 1580, 1577,   86,
-     1586, 1587,   86, 1582, 1576,   86,   86,   86, 1588, 1589,
-     1583, 1579, 1581,   86,   86,   86, 1584,   86,   86, 1590,
-       86,   86, 1585,   86, 1597, 1591,   86,   86,   86, 1594,
-       86,   86, 1595, 1592, 1593, 1601, 1602,   86, 1596,   86,
-       86, 1598,   86, 1606, 1604, 1600,   86, 1605, 1607,   86,
-     1610, 1599,   86,   86, 1603, 1609,   86,   86, 1608,   86,
-       86, 1618, 1615,   86, 1620, 1616, 1611,   86, 1612, 1617,
-       86, 1613,   86,   86, 1614, 1623, 1621, 1619, 1622,   86,
-     1624,   86,   86,   86,   86,   86,   86,   86, 1628, 1629,
-
-     1630,   86, 1625,   86,   86,   86, 1633,   86,   86, 1639,
-     1627,   86, 1638,   86, 1631, 1626,   86, 1632, 1635,   86,
-       86, 1642,   86, 1634,   86, 1636, 1637,   86,   86,   86,
-       86, 1640, 1643, 1646,   86, 1641,   86,   86, 1644, 1650,
-       86,   86, 1652, 1645, 1647, 1648,   86, 1649, 1651,   86,
-     1656,   86,   86,   86, 1653, 1655,   86, 1660, 1661, 1662,
-       86, 1654, 1658,   86,   86,   86, 1657,   86, 1664, 1665,
-       86,   86, 1659,   86, 1663,   86, 1670, 1666, 1671, 1667,
-     1669, 1672,   86,   86,   86,   86, 1673,   86,   86, 1674,
-     1677,   86,   86,   86, 1668,   86, 1678,   86,   86,   86,
-
-       86, 1680, 1679,   86, 1685,   86, 1684, 1681, 1675,   86,
-     1676, 1682,   86, 1683,   86,   86, 1691, 1687,   86, 1688,
-     1686, 1692,   86, 1693, 1690,   86, 1689,   86, 1694,   86,
-       86, 1696,   86,   86,   86, 1695, 1699, 1697, 1700,   86,
-     1704,   86,   86,   86, 1698,   86,   86, 1705,   86, 1708,
-       86, 1701, 1711,   86, 1702,   86, 1710, 1703,   86,   86,
-       86, 1706,   86,   86, 1709,   86,   86, 1712,   86, 1707,
-       86, 1720, 1713,   86,   86,   86, 1721, 1717, 1714, 1715,
-       86, 1716,   86, 1719, 1728, 1722, 1718, 1724, 1725,   86,
-     1726,   86,   86, 1723,   86, 1729,   86, 1727,   86,   86,
-
-     1732,   86,   86, 1730, 1733,   86,   86, 1736,   86, 1731,
-     1740,   86, 1742, 1741, 1737,   86,   86, 1734,   86, 1735,
-     1745,   86, 1739,   86,   86, 1738,   86,   86, 1746, 1744,
-     1743, 1747,   86,   86,   86,   86, 1748,   86, 1753, 1754,
-       86, 1749, 1750, 1751,   86,   86,   86, 1758, 1759,   86,
-     1757, 1761,   86, 1752,   86, 1755, 1756,   86, 1763,   86,
-     1762,   86,   86,   86,   86,   86,   86, 1767,   86, 1760,
-       86,   86, 1772,   86,   86, 1770,   86, 1764, 1765, 1766,
-       86, 1778,   86,   86, 1779, 1776, 1768,   86, 1769, 1773,
-     1771,   86,   86,   86, 1774, 1775, 1777,   86,   86,   86,
-
-     1780,   86, 1785,   86,   86,   86, 1790,   86, 1782, 1788,
-     1781,   86,   86, 1786,   86, 1791,   86, 1793, 1784,   86,
-     1789, 1787, 1783,   86,   86,   86,   86,  170, 1797, 1800,
-       86, 1799, 1792,   86, 1796,   86, 1794,   86, 1795,   86,
-     1801,   86,   86, 1804, 1798,   86, 1802, 1803,   86,   86,
-     1811,   86,   86, 1805,   86, 1806, 1812,   86, 1807, 1808,
-     1815,   86, 1809,   86,   86,   86, 1816, 1819, 1817, 1821,
-     1810,   86, 1813,   86, 1814,   86, 1820, 1823,   86, 1825,
-       86,   86,   86,   86, 1818,   86,   86,   86, 1827,   86,
-     1828,   86, 1824, 1822,   86, 1830,   86, 1831,   86,   86,
-
-     1826, 1832, 1835,   86, 1836,   86, 1834, 1833,   86,   86,
-     1829,   86, 1840, 1843, 1845, 1841, 1837, 1838,   86,   86,
-       86,   86,   86, 1844, 1851,   86, 1848, 1842, 1839, 1847,
-     1846,   86,   86, 1853, 1850, 1854,   86,   86,   86,   86,
-       86,   86, 1855,   86, 1856,   86, 1857, 1849, 1858, 1860,
-       86,   86,   86,   86,   86, 1859, 1852, 1862, 1861,   86,
-     1865, 1866, 1864, 1867,   86,   86,   86,   86, 1869,   86,
-     1868, 1863,   86, 1875,   86, 1870,   86, 1871, 1872,   86,
-       86, 1873, 1874,   86,   86,   86,   86,   86,   86,   86,
-       86,   86, 1884, 1883,   86,   86,   86,   86, 1878, 1876,
-
-     1879, 1880, 1886, 1877, 1889, 1890, 1881,   86, 1887, 1888,
-     1882,   86,   86, 1885,   86,   86,   86,   86, 1897, 1895,
-       86,   86, 1899,   86,   86,   86,   86, 1891, 1892, 1894,
-     1898, 1901,   86, 1903, 1893,   86, 1902, 1896,   86, 1905,
-     1900,   86,   86,   86,   86,   86,   86,   86,   86, 1936,
-     1904, 1908, 1910, 1911,   86,   86, 1912, 1917, 1909, 1907,
-       86, 1914, 1906, 1913, 1918,   86, 1915, 1919,   86,   86,
-       86,   86, 1920, 1916, 1922, 1923,   86,   86,   86,   86,
-       86, 1927,   86, 1924, 1926, 1928,   86, 1921,   86,   86,
-       86,   86, 1937,   86,   86,   86, 1925, 1931,   86, 1935,
-
-     1933, 1929, 1930, 1934,   86, 1938,   86,   86, 1932,   86,
-     1944,   86,   86, 1941, 1939, 1945,   86, 1940,   86,   86,
-     1942, 1947,   86, 1943, 1946,   86, 1950,   86, 1953,   86,
-     1949, 1952, 1954,   86, 1951,   86, 1948,   86, 1955,   86,
-     1959,   86, 1957, 1963,   86, 1958,   86, 1960, 1964,   86,
-       86,   86, 1956,   86,  165,   86, 1968, 1970, 1965, 1962,
-     1961, 1966, 1973,   86, 1972,   86,   86, 1969,   86,   86,
-     1976, 1974, 1967, 1971,   86,   86,   86,   86, 1980,   86,
-     1977, 1984,   86, 1975,   86,   86,   86,   86, 1982,   86,
-     1985, 1979, 1981,   86, 1983, 1978,   86,   86,   86,  163,
-
-       86,   86, 1990,   86, 1989, 1986,   86, 1991, 1987,   86,
-     1993, 1999, 1988, 1992, 1997,   86, 1994,   86, 2000,   86,
-     1995,   86, 2001, 1996,   86, 2003,   86,   86,   86,   86,
-     2007,   86,   86, 2009, 2002,   86, 1998,   86,   86,   86,
-     2013,   86,   86,   86,   86, 2008, 2005, 2004, 2006, 2016,
-       86,   86,   86, 2011, 2015,   86, 2012, 2010,   86,   86,
-     2018, 2020, 2014, 2017, 2019,   86,   86,  170, 2024, 2022,
-       86, 2027,   86,   86, 2021, 2023,   86,   86,   86, 2025,
-     2031,   86,   86,   86,   86, 2026,   86,   86, 2029, 2033,
-     2034,   86, 2028, 2038,   86,   86, 2030, 2032, 2035,   86,
-
-       86, 2041, 2050, 2036, 2042,   86, 2039, 2037,   86, 2040,
-       86, 2043, 2044,   86,   86, 2045, 2047, 2048,   86,   86,
-       86,   86,   86, 2046, 2051,   86,   86,   86,   86,   86,
-       86, 2049,   86, 2056, 2057,   86,   86, 2061,   86, 2058,
-     2052,   86,   86,   86, 2054, 2055, 2065, 2053, 2059,   86,
-     2060, 2062,   86, 2066, 2067, 2069,   86, 2070, 2064,   86,
-       86,   86, 2073,   86, 2063,   86,   86, 2068,   86,   86,
-     2077,   86, 2080, 2081,   86,   86, 2072, 2075, 2082,   86,
-     2071, 2084,   86, 2078, 2074, 2079, 2076,   86, 2085,   86,
-       86,   86, 2089,   86,   86, 2083, 2091,   86, 2090, 2093,
-
-     2092,   86,   86, 2095,   86,   86, 2099,   86,   86,   86,
-     2086, 2087, 2088, 2096,   86,   86,   86, 2098,   86, 2094,
-       86, 2101, 2102,   86,   86,   86,   86,   86, 2107, 2097,
-     2105, 2106,   86, 2103, 2109, 2100,   86, 2108,   86,   86,
-       86, 2104,   86,   86, 2114, 2117,   86,   86, 2110, 2111,
-     2112,   86, 2121, 2120,   86, 2113, 2115,   86,   86, 2116,
-     2122,   86, 2118, 2119,   86, 2123,   86,   86, 2124, 2126,
-     2129,   86, 2125, 2128,   86, 2127,   86, 2133,   86,   86,
-     2130, 2131,   86, 2135,   86,   86,   86, 2138, 2139,   86,
-       86, 2141,   86,   86,   86, 2132,   86,   86,   86, 2148,
-
-       86,   86, 2146, 2143, 2136, 2134, 2144, 2137,   86,   86,
-     2140,   86,   86,   86, 2147,   86, 2154, 2145, 2142, 2151,
-     2152,   86, 2149, 2157, 2150,   86,   86, 2159,   86,   86,
-       86, 2158, 2162,   86,   86,   86, 2163, 2161,   86, 2153,
-     2165, 2156, 2166,   86,   86,   86,   86, 2155, 2160, 2167,
-       86,   86,   86,   86, 2164, 2171,   86,   86,   86, 2168,
-     2173,   86, 2176, 2177,   86, 2169, 2178,   86, 2172,   86,
-     2170, 2174,   86,   86,   86,   86,   86, 2181,   86, 2180,
-       86, 2185, 2186,   86, 2175,   86,   86, 2179,   86,   86,
-     2192,  161, 2191, 2182, 2183,   86,   86, 2184,   86, 2188,
-
-     2189, 2193, 2187, 2195,   86, 2190,   86, 2194,   86,   86,
-     2196, 2199,   86,   86,   86,   86,   86, 2200,   86, 2197,
-     2203, 2207,   86, 2201, 2198,   86,   86,   86,   86,   86,
-     2210,   86, 2202,   86, 2204, 2214, 2205, 2215, 2206,   86,
-     2208, 2209, 2211, 2212,   86,   86, 2213,   86, 2220,   86,
-     2216,   86, 2219, 2218, 2222, 2217, 2221,   86, 2224, 2223,
-       86, 2225,   86,   86,   86, 2229,   86,   86, 2227,   86,
-       86,   86,   86, 2231, 2228,   86, 2233, 2226, 2230, 2235,
-       86, 2237, 2232, 2238,   86,   86,   86,   86,   86,  170,
-       86,   86,   86,   86, 2241,   86,   86, 2234, 2245, 2246,
-
-       86, 2247, 2236, 2242, 2243, 2239, 2248,   86, 2240, 2244,
-     2249,   86, 2251,   86,   86, 2250,   86,   86,   86, 2252,
-     2254, 2253,   86,   86,   86,   86, 2255, 2256, 2257,   86,
-     2259,   86,   86, 2263,   86, 2258, 2260, 2262,   86,   86,
-       86, 2268,   86, 2261, 2265, 2266,   86, 2264,   86, 2267,
-       86,   86,   86,   86,   86,   86, 2275, 2273,   86, 2270,
-     2274,   86,   86,   86,   86, 2280,   86, 2277, 2269, 2271,
-       86, 2272, 2276,   86,   86,   86, 2281, 2279,   86, 2278,
-       86, 2286, 2283, 2284, 2282,   86,   86, 2287,   86,   86,
-     2285, 2290, 2292,   86,   86,   86, 2289, 2288, 2293,   86,
-
-       86, 2291,   86, 2299,   86, 2294,   86, 2301,   86,   86,
-     2295,   86,   86, 2302, 2298, 2296,   86, 2297, 2304,   86,
-     2305, 2300, 2306,   86,   86, 2307, 2303,   86, 2310,   86,
-       86,   86,   86, 2309,   86,   86, 2315, 2312,   86, 2308,
-       86, 2316,   86, 2311,   86,   86,   86,   86,   86, 2317,
-       86,   86, 2314, 2313, 2319,   86, 2320, 2324, 2322, 2318,
-     2321, 2326,   86,   86, 2329, 2325, 2327,   86, 2330,   86,
-       86, 2335,   86, 2323, 2328, 2332,   86,   86,   86,   86,
-     2338, 2331, 2334, 2339,   86,   86, 2333, 2336,   86, 2341,
-     2342,   86,   86,   86,   86,   86, 2337, 2344, 2345, 2340,
-
-       86,   86, 2346, 2343, 2348,   86,   86, 2350, 2352,   86,
-       86, 2353, 2347, 2349,   86, 2355,   86,   86,   86, 2351,
-     2354,   86, 2357, 2358,   86,   86,   86,   86, 2364, 2359,
-     2360,   86,   86,   86,   86, 2368, 2356, 2365, 2363,   86,
-     2369,   86,   86, 2367, 2361, 2362, 2366, 2370,   86, 2373,
-       86,   86, 2374,   86,   86,   86,   86, 2378, 2380,   86,
-       86, 2371, 2372,   86, 2375, 2379,   86, 2384,   86, 2376,
-       86,   86,   86, 2386, 2382, 2377,   86, 2381,   86, 2387,
-       86,   86, 2383, 2385, 2391, 2388, 2389,   86, 2390,   86,
-       86, 2394, 2396,   86,   86,   86, 2392, 2397,   86, 2393,
-
-       86,   86,   86, 2399,   86, 2398, 2402, 2400,   86, 2403,
-       86, 2395, 2401, 2407,   86, 2404,   86,   86,   86, 2406,
-       86,   86,   86,   86,   86,   86,   86, 2415, 2405,   86,
-       86, 2419,   86,   86, 2408, 2409, 2410, 2411, 2413,   86,
-     2414, 2416, 2417, 2418, 2420, 2412,   86,   86,   86,   86,
-     2422,   86,   86, 2423, 2425, 2421, 2426,   86,   86, 2431,
-       86,   86, 2433,   86, 2427,   86, 2424, 2430,   86, 2428,
-     2432,   86, 2436,   86,   86, 2434, 2437, 2429,  170, 2440,
-       86,   86, 2442, 2444, 2435,   86, 2438, 2443,   86,   86,
-     2445,   86, 2456, 2439, 2446,   86,   86, 2449,   86,   86,
-
-     2441, 2448,   86, 2447,   86, 2450, 2454,   86, 2453,   86,
-     2455, 2458,   86,   86,   86, 2460, 2464,   86, 2459, 2451,
-     2457, 2461,   86,   86,   86, 2463,   86,   86, 2462,   86,
-     2452,   86,   86, 2466,   86,   86,   86, 2469,   86,   86,
-       86, 2472,   86,   86, 2465,   86, 2467, 2476, 2478,   86,
-     2471,   86, 2468,   86,   86, 2474, 2473, 2470, 2479,   86,
-     2475,   86,   86, 2482, 2481, 2477, 2480,   86,   86,   86,
-       86, 2490,   86, 2485, 2487,   86,   86,   86,   86, 2483,
-     2484, 2488,   86, 2491,   86,   86, 2486,   86, 2489,   86,
-       86,   86, 2501,   86,   86, 2492, 2493, 2494,   86, 2499,
-
-       86,   86,   86,   86, 2497, 2495, 2502, 2503, 2496, 2505,
-     2498, 2500,   86,   86, 2504, 2506, 2508,   86,   86,   86,
-       86, 2507, 2510, 2509,   86, 2511, 2512,   86, 2515, 2516,
-       86,   86,   86, 2517, 2513, 2518,   86, 2514,   86,   86,
-       86, 2522, 2524,   86, 2523,   86, 2525, 2519,   86, 2526,
-       86,   86, 2521, 2520, 2529,   86, 2530,   86,   86, 2527,
-       86,   86, 2528, 2531,   86, 2532, 2536,   86, 2537,   86,
-       86, 2533, 2539,   86,   86,   86, 2535, 2541,   86,   86,
-       86, 2534, 2544,   86, 2543, 2545,   86,   86,   86, 2538,
-     2542,   86, 2540,   86, 2546,   86, 2547, 2552,   86,   86,
-
-     2551, 2554,   86,   86,   86, 2548,   86, 2549,   86, 2556,
-     2550, 2558, 2557,   86, 2559, 2561,   86,   86, 2553,   86,
-       86, 2555, 2564,   86,   86, 2567,   86,   86,   86, 2560,
-       86,   86, 3627,   86, 2563,   86, 2562, 2572, 2565, 2573,
-       86,   86,   86, 2566,   86, 2569, 2571, 2568,   86, 2575,
-       86, 2570, 2578,   86, 2574,   86, 2576, 2577,   86,   86,
-       86,   86, 2580,   86, 2581,   86, 2586,   86, 2579, 2588,
-       86,   86, 2587, 2589, 2592, 2584, 2582, 2583,   86,   86,
-       86,   86,   86, 2593, 2594,   86, 2595, 2585, 2590,   86,
-     2591,   86,   86,   86, 2599, 2597,   86, 2601, 2602,   86,
-
-       86, 2603, 2605, 2596, 2606,   86, 2598, 2609,   86,   86,
-       86,   86,   86,   86, 2604,   86, 2610, 2600,   86,   86,
-     2608, 2607, 2614, 2611,   86, 2613,   86,   86,   86,   86,
-       86,   86,   86, 2616, 2612, 2615, 2617, 2618, 2619, 2621,
-     2620, 2622,   86,   86, 2641,   86, 2623,   86,   86, 2627,
-     2624, 2625, 2626, 2628,   86, 2629,   86,   86, 2632,   86,
-       86,  170,   86, 2630,   86, 2631, 2633,   86, 2638,   86,
-       86,   86,   86,   86, 2645,   86,   86, 3627, 2636, 2639,
-     2634, 2640, 2635, 2637,   86,   86, 2642, 2644, 2643, 2646,
-     2649,   86,   86, 2650, 2651,   86, 2647, 2648,   86,   86,
-
-     2654, 2652, 2655,   86, 2653,   86,   86,   86,   86, 2657,
-       86,   86, 2656,   86, 2659,   86,   86, 2663, 2664, 2658,
-       86, 2661,   86, 2660,   86, 2666,   86,   86,   86,   86,
-     2667, 2668, 2669,   86, 2662,   86, 2665,   86, 2672,   86,
-     2670,   86, 2671, 2676,   86, 2675,   86, 2674, 2673,   86,
-       86,   86,   86,   86, 2678,   86,   86,   86, 2686, 2677,
-     2683,   86, 2685,   86,   86,   86, 2688, 2682,   86, 2687,
-     2679, 2680, 2681,   86,   86, 2684,   86, 2694,   86, 2689,
-       86, 2692,   86,   86, 2698, 2699, 3627, 2690, 2697,   86,
-       86,   86, 2691,   86, 2695, 2693, 2696, 2700,   86,   86,
-
-     2701,   86, 2702,   86, 2705,   86,   86, 2707, 2706,   86,
-       86,   86, 2708, 2703, 2709, 2704,   86, 2711,   86, 2713,
-       86,   86, 2712, 2715,   86,   86, 2717,   86,   86,   86,
-     2716,   86, 2714,   86,   86,   86, 2710,   86, 2721,   86,
-     2726,   86, 2724, 2719, 2725, 2728, 2718, 2720, 2727,   86,
-       86,   86,   86, 2730,   86,   86, 2723,   86,   86, 3627,
-     2722,   86, 2733,   86, 2735,   86,   86, 2738,   86,   86,
-     2729, 2731,   86,   86, 2739, 2736, 2732, 2734, 2737, 2740,
-     2741,   86, 2744,   86,   86,   86,   86, 2742, 2745,   86,
-     2748, 2746, 2749,   86,   86,   86, 2743,   86,   86, 2750,
-
-       86,   86, 2747, 2755,   86, 2754, 2752,   86,   86,   86,
-       86, 2753,   86, 2751, 2759, 2763,   86,   86, 2756,   86,
-     2758, 2757, 2762, 2764,   86, 2765,   86, 2766,   86,   86,
-     2760, 2767, 2761,   86,   86, 2770,   86, 2771, 2769,   86,
-     2772,   86,   86,   86,   86,   86, 3627, 2768,   86,   86,
-     2779,   86,   86, 2773,   86, 2775, 2781,   86, 2782,   86,
-     2784,   86, 2774, 2783, 2776, 2778, 2777, 2780,   86,   86,
-       86,   86,   86,   86, 2788,   86, 2786, 2789, 2792,   86,
-     2785,   86, 2787,   86, 2793, 2794,   86,   86,   86,   86,
-       86, 2790,   86, 2791, 2801,   86,  170,   86, 2803,   86,
-
-     2797,   86,   86, 2796, 2799,   86,   86, 2795, 2802,   86,
-     2804, 2800, 2798, 2807, 2805,   86,   86, 2806, 2810,   86,
-       86, 2812,   86, 2811, 2813, 2814,   86, 2808,   86, 2809,
-     2815,   86,   86, 2816,   86, 2817,   86, 2818, 2819, 2820,
-       86, 2821,   86,   86,   86,   86,   86,   86,   86,   86,
-       86, 2829, 3627,   86,   86, 2822, 2827,   86, 2833,   86,
-       86, 2824, 2823, 2834, 2831, 2826, 2825,   86, 2828,   86,
-     2830, 2832, 2835,   86, 2836,   86, 2837,   86, 2838, 2839,
-       86, 2841,   86,   86, 2840, 2842,   86,   86,   86,   86,
-       86,   86,   86, 2845,   86, 2843, 2852,   86, 2851, 2853,
-
-       86, 2844, 2846,   86,   86,   86, 2847, 2848, 2849, 2850,
-     2856, 2857,   86, 2859, 2854, 2858,   86,   86,   86,   86,
-       86, 2855,   86, 2860,   86, 2866,   86,   86,   86, 2865,
-       86,   86,   86, 2862, 3627, 2861, 2864,   86,   86, 2863,
-     2874,   86, 2870, 2872,   86,   86, 2873, 2867, 2868,   86,
-     2869, 2875, 2871, 2876,   86,   86, 2877,   86,   86,   86,
-       86,   86,   86,   86, 2878, 2881, 2882, 2883,   86,   86,
-     2880,   86, 2888, 2889,   86,   86, 2879, 2892,   86, 2884,
-     2886,   86, 2885,   86,   86,   86, 2887,   86, 2895, 2891,
-     2890,   86, 2893, 2897,   86, 2898, 2899,   86, 2894,   86,
-
-     2896,   86,   86, 2904,   86,   86,   86, 2900,   86,   86,
-     2908,   86, 2907,   86, 2901, 2906,   86, 2905, 2909,   86,
-       86, 2902, 2903, 2911,   86, 2912,   86,   86, 2915, 2914,
-     2910, 2917,   86,   86, 2918, 2913,   86, 2920,   86,   86,
-       86,   86,   86, 2927,   86,   86,   86, 2916,   86,   86,
-       86, 2924, 2921, 2922, 2923, 2925,   86, 2926, 2919, 2930,
-       86, 2931,   86,   86, 2929, 2928,   86, 2932,   86, 2936,
-       86, 2934,   86,   86,   86,   86, 2935, 2933,   86, 2937,
-     2938,   86,   86, 2940, 2943,   86, 2941, 2945, 2939, 2942,
-     2944,   86, 2947,  170, 2946,   86,   86,   86,   86, 2952,
-
-     3627, 2949, 2948,   86,   86,   86,   86, 2954, 2953,   86,
-     2957,   86, 2958,   86, 2956, 2950, 2951,   86, 2962, 2955,
-     2960,   86,   86, 2963,   86, 2961,   86,   86,   86, 2967,
-     2959, 2964, 2965,   86,   86,   86,   86, 2968,   86, 2969,
-       86,   86, 2966, 2974, 2975, 2970,   86,   86, 2972,   86,
-       86, 2976,   86, 2971, 2978,   86,   86, 2980,   86, 2977,
-       86, 2981, 2973, 2979,   86,   86,   86,   86,   86, 2983,
-     2984, 2985, 2982,   86,   86,   86, 2990,   86,   86,   86,
-       86, 2987, 2988, 2989, 2992, 2986, 2991, 2994,   86,   86,
-       86, 3627,   86,   86, 2995,   86, 2993, 3000,   86, 2996,
-
-       86,   86, 3001,   86,   86,   86, 3005,   86,   86, 2997,
-     2998, 2999, 3003, 3004, 3008,   86, 3006,   86,   86, 3002,
-       86,   86, 3007, 3015, 3012, 3013,   86, 3009, 3016,   86,
-       86, 3018, 3010,   86,   86, 3019,   86,   86, 3011,   86,
-       86, 3020,   86,   86, 3025, 3022, 3014,   86, 3017,   86,
-       86, 3023, 3026,   86, 3029,   86, 3024, 3027,   86,   86,
-     3031, 3028,   86,   86, 3021, 3033,   86, 3034,   86, 3035,
-       86,   86,   86, 3030,   86, 3036,   86, 3037, 3039,   86,
-     3032,   86,   86, 3038, 3043,   86, 3041,   86, 3077, 3044,
-       86,   86, 3047,   86, 3042,   86, 3040, 3045, 3048,   86,
-
-     3049,   86, 3050,   86,   86,   86, 3052, 3046, 3051, 3054,
-       86,   86,   86, 3055, 3057,   86,   86, 3053,   86, 3058,
-     3059,   86, 3061,   86,   86,   86, 3065, 3060,   86, 3062,
-     3627, 3056,   86, 3066,   86, 3068,   86,   86,   86, 3064,
-     3067,   86, 3063, 3069, 3070,   86,   86, 3076,   86, 3071,
-       86, 3072, 3075,   86,   86, 3079,   86, 3073, 3078,   86,
-       86,   86, 3085,   86, 3080, 3074, 3082,   86, 3081,   86,
-     3084,   86,   86, 3083,   86,   86, 3088, 3092,   86,   86,
-       86,   86,   86, 3094,   86,   86, 3086, 3087,   86, 3091,
-     3089, 3095, 3098, 3093, 3090, 3096, 3627, 3099,   86, 3101,
-
-     3125, 3097, 3100,   86, 3102,   86,   86, 3103, 3104,   86,
-       86, 3105,   86, 3106,   86, 3107,   86, 3108,   86, 3109,
-       86,   86, 3110,   86, 3113, 3111,   86,   86,   86,   86,
-       86, 3115,   86, 3117,   86, 3122,   86, 3114, 3118, 3123,
-       86, 3112,   86, 3126,   86, 3124, 3116,   86,   86, 3627,
-     3119,   86, 3120, 3127, 3121, 3129,   86,   86, 3130, 3131,
-       86,   86, 3132, 3133,   86,   86, 3128,   86,   86,   86,
-     3134, 3139,   86,   86, 3135,   86, 3136, 3137, 3140,   86,
-       86,   86, 3142,   86, 3141, 3146,   86, 3138,   86,   86,
-     3147,   86, 3144, 3150, 3143,   86,   86, 3149, 3145, 3148,
-
-     3151, 3152,   86, 3154,   86,   86,   86,   86, 3158,   86,
-     3153,   86,   86,   86,   86,   86,   86,   86,   86, 3155,
-     3159, 3162, 3165, 3163, 3160, 3157, 3627,   86,   86, 3166,
-       86, 3156, 3168,   86, 3170, 3164,   86,   86, 3161, 3167,
-       86, 3169,   86, 3173,   86, 3172, 3171,   86, 3175, 3177,
-       86, 3176, 3178,   86, 3179,   86, 3174,   86,   86, 3627,
-       86, 3184,   86,   86, 3181, 3183, 3180,   86, 3185,   86,
-     3187,   86,   86,   86, 3186,   86,   86, 3182,   86, 3193,
-     3188, 3191, 3195,   86, 3189,   86,   86,   86,   86, 3199,
-     3196,   86, 3197, 3192, 3190,   86, 3198,   86,   86,   86,
-
-     3204,   86,   86, 3194,   86,   86,   86,   86,   86,   86,
-     3208,   86, 3201, 3202, 3200, 3205, 3209, 3206, 3207, 3203,
-       86,   86,   86, 3215, 3210, 3213,   86,   86, 3211, 3212,
-       86, 3214, 3219,   86,   86, 3216, 3220,   86, 3222,   86,
-       86,   86,   86, 3223,   86, 3217,   86, 3225, 3226,   86,
-     3228,   86,   86, 3221, 3224,   86, 3218, 3231, 3229,   86,
-     3227,   86, 3230,   86, 3233, 3234,   86, 3237,   86,   86,
-       86, 3232, 3236,   86,   86, 3240,   86, 3243,   86, 3244,
-       86, 3235,   86, 3246, 3241,   86,   86, 3247, 3239,   86,
-       86, 3238, 3249,   86,   86, 3242, 3250,   86, 3253,   86,
-
-     3245,   86,   86,   86, 3258, 3251,   86,   86, 3248,   86,
-       86, 3256, 3255,   86, 3252, 3262,   86,   86, 3254, 3260,
-     3264,   86,   86, 3257, 3265, 3259,   86, 3266, 3263, 3261,
-       86, 3269, 3270,   86, 3267,   86, 3272,   86, 3271,   86,
-       86,   86,   86, 3275,   86, 3274, 3276,   86, 3278,   86,
-     3268,   86, 3281,   86,   86,   86,   86, 3273,   86, 3286,
-       86, 3282,   86,   86, 3302,   86, 3277,   86, 3279, 3280,
-       86, 3285, 3293, 3283, 3289, 3290,   86,   86, 3288, 3291,
-       86, 3284, 3287, 3292,   86,   86, 3296,   86, 3297,   86,
-     3295, 3294, 3298,   86, 3299,   86,   86,   86,   86, 3304,
-
-       86,   86,   86, 3303, 3306,   86, 3307,   86,   86, 3300,
-       86,   86,   86,   86, 3313, 3314,   86, 3305,   86,   86,
-       86, 3308,   86, 3301, 3320,   86,   86, 3321,   86,   86,
-     3309, 3311, 3310, 3312, 3317, 3319,   86, 3323, 3316,   86,
-       86,   86, 3318,   86, 3315, 3326,   86, 3322, 3328,   86,
-     3329,   86,   86, 3332,   86,   86, 3324, 3330, 3325,   86,
-     3331,   86, 3327, 3334, 3335,   86, 3333,   86,   86,   86,
-       86,   86, 3336, 3337,   86, 3338, 3341,   86,   86,   86,
-       86, 3339,   86, 3343,   86,   86, 3342, 3344, 3340,   86,
-       86,   86, 3627,   86,   86, 3356,   86, 3345, 3353, 3354,
-
-     3346,   86, 3347, 3348, 3355, 3349,   86, 3350, 3351,   86,
-       86, 3357, 3352, 3359, 3361,   86, 3358, 3362,   86,   86,
-     3364,   86, 3360, 3363,   86,   86, 3367,   86,   86, 3365,
-     3369,   86, 3370, 3371,   86,   86, 3372, 3373, 3377,   86,
-     3374,   86,   86, 3368, 3366, 3375, 3376, 3378,   86,   86,
-     3380,   86,   86,   86,   86, 3383,   86,   86, 3379,   86,
-     3387,   86,   86,   86, 3386,   86,   86, 3382,   86,   86,
-     3381,   86, 3390, 3391,   86, 3392, 3384, 3385,   86, 3395,
-     3396,   86, 3388, 3393,   86, 3398,   86, 3397, 3389, 3394,
-     3399,   86, 3400,   86,   86,   86,   86, 3405,   86, 3402,
-
-     3407, 3401, 3406,   86, 3403,   86,   86, 3404,   86,   86,
-       86, 3414,   86, 3409, 3411, 3412, 3415,   86, 3417,   86,
-       86, 3408,   86, 3416, 3418,   86, 3410, 3413,   86, 3421,
-       86, 3422,   86, 3420,   86, 3419,   86, 3425,   86, 3426,
-       86, 3427,   86, 3423, 3428,   86, 3429,   86, 3430,   86,
-     3431,   86, 3432,   86, 3424,   86,   86, 3435,   86, 3436,
-       86,   86,   86,   86,   86, 3434, 3440,   86,   86,   86,
-     3437, 3442,   86,   86, 3438,   86, 3446, 3447,   86, 3443,
-       86, 3433, 3444, 3439,   86, 3445,   86, 3441, 3449,   86,
-       86,   86, 3453, 3451,   86, 3448,   86, 3455, 3456,   86,
-
-       86,   86, 3450,   86,   86, 3458,   86,   86,   86,   86,
-       86,   86, 3452, 3457, 3454, 3462, 3463, 3471,   86,   86,
-     3459, 3460, 3461, 3464,   86, 3465,   86,   86,   86, 3468,
-     3469, 3467, 3472,   86, 3466, 3473,   86,   86,   86, 3470,
-       86,   86, 3476,   86,   86,   86, 3475,   86,   86, 3481,
-     3482, 3474,   86, 3484,   86, 3478, 3480,   86,   86,   86,
-     3477,   86, 3483,   86,   86,   86, 3479, 3485,   86,   86,
-     3493,   86,   86, 3491, 3488,   86, 3486, 3487, 3490,   86,
-     3492, 3497,   86,   86, 3495, 3500, 3489,   86, 3499,   86,
-     3494, 3496, 3502,   86,   86, 3498, 3504,   86, 3503,   86,
-
-     3505, 3506,   86, 3507,   86,   86,   86, 3501,   86, 3510,
-       86,   86,   86, 3508, 3515, 3511, 3512,   86,   86,   86,
-       86, 3519,   86,   86, 3518, 3509,   86, 3514, 3521,   86,
-     3517, 3516,   86, 3513, 3522,   86, 3523,   86, 3526,   86,
-       86, 3524,   86, 3520, 3529,   86,   86, 3530,   86,   86,
-       86, 3525, 3533, 3534,   86, 3527, 3531,   86,   86,   86,
-     3528,   86, 3539,   86, 3535,   86, 3538, 3536, 3532, 3540,
-       86,   86,   86,   86,   86,   86, 3537,   86, 3544,   86,
-     3546,   86,   86,   86,   86,   86, 3541, 3543, 3551, 3552,
-       86, 3542, 3545,   86, 3548, 3549, 3547, 3559, 3550, 3553,
-
-       86, 3557,   86,   86,   86, 3554,   86, 3560, 3555, 3558,
-       86,   86, 3556,   86,   86, 3561, 3562, 3565, 3563, 3566,
-       86,   86,   86,   86, 3568,   86, 3567,   86,   86,   86,
-       86, 3569, 3574, 3564,   86, 3571,   86,   86,   86,   86,
-     3577, 3570, 3578,   86,   86,   86,   86,   86, 3572, 3573,
-     3576, 3581,   86, 3575, 3579, 3582,   86, 3580,   86, 3585,
-     3584, 3586,   86, 3583,   86, 3587,   86, 3589,   86, 3591,
-       86, 3592,   86,   86,   86, 3596,   86, 3593, 3627,   86,
-     3594, 3599,   86, 3590, 3597,   86,   86, 3598, 3588,   86,
-       86,   86,   86, 3595,   86,   86, 3600, 3601,   86, 3603,
-
-     3605,   86,   86, 3607,   86, 3602,   86, 3608,   86, 3611,
-     3604, 3606, 3612,   86, 3609,   86,   86, 3615, 3616,   86,
-       86, 3618,   86, 3610,   86, 3613,   86, 3617, 3619,   86,
-       86, 3620,   86,   86, 3614, 3621, 3627, 3622, 3625,   86,
-     3626,   86, 3627, 3627, 3627, 3623, 3627, 3627, 3627, 3627,
-     3627, 3627, 3624,   47,   47,   47,   47,   47,   47,   47,
-       52,   52,   52,   52,   52,   52,   52,   57,   57,   57,
-       57,   57,   57,   57,   63,   63,   63,   63,   63,   63,
-       63,   68,   68,   68,   68,   68,   68,   68,   74,   74,
-       74,   74,   74,   74,   74,   80,   80,   80,   80,   80,
-
-       80,   80,   89,   89, 3627,   89,   89,   89,   89,  160,
-      160, 3627, 3627, 3627,  160,  160,  162,  162, 3627, 3627,
-      162, 3627,  162,  164, 3627, 3627, 3627, 3627, 3627,  164,
-      167,  167, 3627, 3627, 3627,  167,  167,  169, 3627, 3627,
-     3627, 3627, 3627,  169,  171,  171, 3627,  171,  171,  171,
-      171,  174, 3627, 3627, 3627, 3627, 3627,  174,  177,  177,
-     3627, 3627, 3627,  177,  177,   90,   90, 3627,   90,   90,
-       90,   90,   17, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-
-     3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3627
+       86,   86,  232,  236,   86,  238,   86,  242,  235,  239,
+       86,   86,   86,   86,  244,  240,  237,  178,   86,   86,
+       86,  241,   86,  245,  243,  250,  253,  254,   86,  246,
+      255,  249,   86,   86,   86,  256,  251,  248,  262,  259,
+
+      252,  263,   86,   86,  261,  265,   86,   86,   86,   86,
+      260,  269,  257,   86,  266,  258,   86,   86,  264,  268,
+      270,  272,  160,  160,   86,  162,  267,  271,  162,  275,
+      164,  273,  164,  164,  341,  164,  167,  167,  169,   86,
+      169,  169,   90,  169,   90,   90,  170,   90,  174,  274,
+      174,  174,  276,  174,  172,  177,  177,  278,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,  277,  280,   86,
+      283,  286,  282,   86,  279,  281,   86,  289,  288,  285,
+      176,  292,  284,   86,  290,  287,   86,  293,  294,   86,
+      295,  321,   86,  298,   86,  296,   86,  303,  299,   86,
+
+      305,   86,   86,  300,   86,  306,   86,  308,   86,  301,
+      302,  304,  297,  309,   86,  312,  310,   86,   86,   86,
+      307,   86,  314,   86,  315,   86,   86,   86,  175,   86,
+       86,   86,  322,  316,  311,  323,  329,  317,  319,   86,
+      318,  320,   86,  324,  313,  332,  325,   86,  326,  330,
+      336,   86,   86,  333,   86,  331,   86,  334,  338,  339,
+      327,  378,  328,   86,   86,   86,  342,  337,   86,  335,
+      344,   86,   86,  343,  340,  345,   86,  346,   86,   86,
+      347,  349,   86,   86,   86,  348,   86,   86,  351,   86,
+       86,   86,  350,   86,   86,  353,  359,   86,   86,  354,
+
+       86,  357,   86,   86,  352,  364,  360,  358,  355,   86,
+      365,   86,   86,  361,  356,   86,  362,  366,  370,  368,
+       86,  367,  363,  373,   86,   86,   86,   86,  376,   86,
+       86,  369,  375,   86,  379,  380,  382,   86,  371,  372,
+       86,   86,   86,   86,  387,  374,   86,  385,   86,  377,
+       86,  384,  381,  386,   86,  383,  389,   86,   86,  390,
+      170,   86,   86,  393,   86,   86,   86,   86,  388,   86,
+      412,  392,  394,  396,  398,  400,  391,  401,   86,   86,
+      395,   86,   86,   86,  397,   86,  404,  402,   86,  399,
+      403,   86,   86,  405,   86,   86,   86,  407,  411,   86,
+
+       86,  413,  406,  409,   86,  408,   86,  414,  415,   86,
+      417,   86,   86,  418,  416,   86,  419,   86,   86,  410,
+      421,   86,  422,   86,   86,  426,  170,   86,  428,   86,
+      420,   86,  423,  424,   86,   86,  430,  429,   86,   86,
+      425,  427,   86,  431,   86,  433,   86,  435,  436,  438,
+       86,  434,   86,   86,   86,   86,  439,   86,  442,   86,
+      432,   86,  443,   86,   86,  441,   86,  445,   86,  448,
+      168,  440,   86,  437,  446,  450,   86,  453,   86,  444,
+       86,  454,  447,   86,  449,   86,   86,   86,  452,  462,
+       86,   86,  451,   86,  465,  464,  466,  455,   86,   86,
+
+      470,  166,  469,   86,  463,  471,  476,  456,   86,  467,
+      457,   86,  468,  472,  473,  458,  459,  460,  461,  474,
+      477,   86,   86,  480,  475,   86,   86,   86,   86,   86,
+      486,   86,   86,  488,   86,   86,   86,  484,  485,  478,
+      487,  481,  479,   86,  482,  483,   86,  489,  492,   86,
+       86,  491,   86,   86,  497,   86,  498,   86,  499,  490,
+       86,  493,   86,   86,  516,   86,   86,  500,  496,  494,
+      503,  505,  495,  504,  501,   86,  510,  502,   86,   86,
+      506,  508,   86,  509,   86,  511,  507,   86,  517,  518,
+       86,   86,  519,  515,   86,   86,   86,   86,  512,   86,
+
+      533,  513,   86,  514,   86,  520,   86,  521,   86,   86,
+      535,  532,  538,  522,  536,   86,  537,  523,  534,  170,
+      540,  579,  524,  549,  550,  525,   86,  526,  539,  527,
+      551,   86,   86,   86,   86,  552,   86,  553,   86,   86,
+      555,   86,  528,  558,  554,  529,  165,  530,  557,  531,
+       86,  556,  541,  542,  560,   86,   86,  559,   86,  562,
+       86,   86,  543,  544,  545,  546,  547,  561,  564,  548,
+      563,   86,   86,  570,   86,  568,  566,  571,  565,  573,
+       86,  569,   86,  574,   86,   86,   86,   86,   86,   86,
+      578,   86,   86,  581,  567,  572,   86,   86,  576,  582,
+
+      583,  577,   86,   86,  575,  580,  163,   86,  585,  588,
+       86,  584,   86,  586,   86,  589,   86,  587,  590,  591,
+       86,   86,   86,  596,  593,  594,   86,   86,  612,  598,
+       86,  597,   86,   86,   86,   86,  592,  615,   86,  161,
+      595,  613,  599,   86,  601,  600,  602,  603,  614,  617,
+       86,   86,   86,   86,  624,   86,  618,  619,  604,  616,
+      605,   86,   86,   86,   86,  621,  606,  620,   86,  622,
+      626,   86,  623,   86,  607,  608,   86,  629,  609,  610,
+       86,  625,  611,  630,   86,  627,  628,   86,  631,   86,
+       86,   86,   86,   86,   86,  636,  634,  635,   86,   86,
+
+       86,   86,  632,  637,  642,  638,   86,   86,   86,   86,
+      644,  633,  641,  643,   86,  646,   86,  640,  639,  645,
+       86,  647,   86,  649,   86,  651,   86,   86,   86,   86,
+      648,   86,   86,   86,   86,  653,   86,  657,  655,   86,
+       86,   86,  650,   86,  664,  666,  659,  652,  669,  654,
+       86,   86,  656,  658,  660,  665,  661,  662,   86,  668,
+      663,   86,   86,   86,   86,   86,  673,  667,   86,   86,
+      671,   86,   86,  672,   86,  670,  677,  679,  674,  680,
+      676,   86,   86,  675,   86,   86,  682,   86,   86,  678,
+       86,   86,  683,  687,  686,   86,  689,   86,   86,   86,
+
+       86,   86,  685,  681,   86,   86,  684,  721,   86,  704,
+      688,   86,  692,  690,   86,   86,   86,  691,   86,  693,
+      701,  706,  702,  703,  694,   86,  695,   86,   86,  708,
+      705,  707,  696,  712,  697,   86,   86,  698,  699,   86,
+       86,  709,  711,   86,  700,  710,  717,   86,  716,   86,
+       86,  714,   86,  713,  715,  719,   86,  718,   86,  720,
+       86,  724,   86,  726,   86,   86,  730,   86,   86,  723,
+      722,  727,   86,  729,   86,  725,  728,  733,   86,   86,
+       86,   86,   86,  734,   86,   86,  731,  737,  739,  738,
+      732,  170,  741,   86,  736,  740,   86,  735,   86,   86,
+
+      743,  744,   86,   86,   86,  742,   86,  748,  750,   86,
+      745,   86,  753,   86,  746,  754,   86,  749,  756,  752,
+      747,   86,   86,   86,   86,   86,  758,   86,  755,   86,
+       86,   86,  762,  751,  757,  761,   86,  178,  767,  759,
+      763,   86,  760,  768,   86,  770,   86,  764,  771,   86,
+      765,  772,  766,   86,  769,  773,   86,   86,  774,   86,
+      775,   86,  776,   86,   86,   86,   86,  777,   86,   86,
+      782,  778,  781,   86,   86,  780,   86,  785,   86,   86,
+      790,  784,  779,  783,  786,   86,   86,   86,   86,  789,
+       86,   86,  792,   86,  796,   86,  794,  788,   86,  787,
+
+       86,   86,   86,   86,   86,  803,  799,  791,  793,  795,
+       86,   86,   86,  797,   86,  804,   86,   86,  801,   86,
+      806,  798,  800,   86,  802,  807,  805,   86,  808,  809,
+       86,  811,  810,   86,  812,  813,   86,  816,  814,  818,
+       86,  815,  817,   86,   86,   86,  820,   86,  821,  819,
+       86,   86,  823,  824,   86,   86,  825,   86,   86,   86,
+       86,  832,   86,  830,  828,   86,   86,   86,   86,   86,
+      822,  826,  827,  829,  833,   86,  839,   86,  837,  831,
+       86,  176,   86,  840,  836,  834,   86,  838,  835,  841,
+      842,  843,   86,   86,   86,  844,   86,   86,  846,  845,
+
+       86,   86,  851,   86,   86,  849,  853,   86,   86,  852,
+      847,  848,   86,   86,   86,   86,  854,   86,   86,  856,
+      850,  858,  175,  857,   86,   86,  859,   86,  855,  862,
+      860,  861,  865,   86,  866,   86,   86,  870,   86,   86,
+      868,   86,  867,  863,  864,  869,  871,   86,  872,  875,
+      873,   86,   86,  879,   86,   86,   86,  877,  880,   86,
+       86,  881,   86,  876,  883,  874,   86,  878,  885,   86,
+       86,   86,   86,   86,  891,  884,   86,   86,   86,  882,
+       86,  892,   86,   86,   86,  893,   86,  886,  887,  888,
+       86,  889,   86,  890,  901,  898,  896,  894,  895,   86,
+
+       86,  900,   86,  897,  899,   86,   86,   86,   86,   86,
+      902,   86,  908,  903,  904,   86,   86,   86,   86,   86,
+      918,   86,  170,   86,  905,  910,  907,  906,  916,  909,
+       86,   86,   86,  911,  912,  913,  914,  915,   86,   86,
+      921,   86,  919,  922,  917,  920,  924,   86,   86,   86,
+       86,   86,   86,  923,   86,   86,  929,  928,   86,  930,
+      932,   86,  927,  925,   86,   86,  933,  926,   86,   86,
+       86,  935,   86,   86,  936,  170,  934,  940,  931,  938,
+      941,  939,  937,   86,   86,   86,  944,  942,   86,  943,
+       86,   86,   86,   86,  948,  949,   86,  945,   86,  950,
+
+      952,   86,  954,   86,   86,  946,  947,  951,  953,  956,
+      955,   86,   86,   86,   86,   86,  958,   86,   86,  962,
+       86,   86,   86,  959,  957,   86,  963,  964,   86,   86,
+       86,   86,  961,   86,   86,  965,   86,   86,  960,  977,
+      978, 1029,  967,  975,   86,  981,  966,   86,  976,  968,
+      980,  979,  969,  982,   86,   86,  970,   86,  983,  971,
+       86,  984,   86,  985,   86,   86,  972,  973,  986,  974,
+      990,   86,   86,  987,   86,   86,   86,  999,  988,   86,
+       86,   86,   86,  168, 1002,  989,   86,  991,  992,   86,
+      993,  998,   86,  994, 1006, 1000, 1004, 1001,  995, 1003,
+
+     1007,   86,   86,   86,  996,  997, 1008, 1010,   86, 1012,
+     1014, 1011, 1005,   86, 1013,   86,   86, 1009,   86, 1015,
+       86, 1017,   86, 1018,   86, 1019,   86, 1020, 1016, 1022,
+       86, 1021,   86,   86, 1023,   86,   86,   86,   86,   86,
+     1026,   86, 1030,   86, 1033, 1024,   86,   86,   86,   86,
+     1037, 1039,   86, 1031, 1025,   86,   86, 1027, 1028,   86,
+     1032, 1035, 1040, 1043, 1038, 1034,   86, 1041,   86,   86,
+     1036, 1042, 1045, 1047, 1044,   86,   86,   86,   86,   86,
+     1046,   86, 1049,   86, 1048, 1050, 1051,   86, 1052,   86,
+       86, 1053,   86,   86,   86,   86,   86, 1055, 1056,   86,
+
+     1057, 1061,   86,   86, 1065,   86, 1064,   86, 1054,   86,
+       86, 1063, 1059, 1058, 1062,   86,   86,   86, 1060,   86,
+       86,   86,   86,   86, 1073, 1068, 1069, 1066, 1071, 1072,
+       86,   86,   86,   86, 1067, 1074, 1075,   86,   86, 1079,
+       86, 1077,   86, 1070, 1080,   86, 1078,   86, 1082,   86,
+       86, 1081,   86, 1083,   86, 1088, 1076,   86, 1085, 1084,
+       86,   86, 1090, 1089, 1091,   86, 1086,   86, 1087,   86,
+       86,   86, 1093,   86,   86, 1092,   86,   86, 1094,   86,
+     1101, 1095, 1099,  166, 1104,   86,   86,   86,   86, 1096,
+       86, 1098, 1097,   86, 1105, 1102,   86, 1100, 1103, 1106,
+
+       86, 1111, 1107,   86,   86,   86, 1110, 1108,   86, 1113,
+     1109, 1114,   86,   86,   86,   86,   86, 1112,   86,   86,
+     1125,   86, 1117, 1119, 1115,   86,   86, 1126, 1116,   86,
+       86, 1128,   86,   86, 1118,   86, 1120,   86, 1122, 1133,
+     1121, 1123, 1131, 1127, 1129, 1124,   86, 1132,   86,   86,
+       86,   86, 1130,   86, 1140, 1137,   86, 1139, 1141,   86,
+       86, 1135, 1142,   86,   86, 1134,   86, 1145,   86, 1136,
+     1147,   86, 1138,   86,   86,   86,   86,   86, 1153, 1144,
+     1149, 1143,   86, 1154,  170, 1150,   86,   86, 1146,   86,
+     1156, 1155, 1148,   86, 1157,   86,   86,   86, 1151, 1158,
+
+     1152, 1160,   86,   86,   86,   86, 1173, 1159, 1161,   86,
+       86, 1163,   86, 1174,   86, 1164, 1176,   86,   86, 1162,
+       86,   86, 1178, 1165, 1180, 1166,   86, 1175,   86, 1167,
+      165, 1168,   86, 1181, 1182, 1169, 1179, 1170, 1183, 1177,
+       86, 1185, 1171, 1184,   86,   86,   86, 1172,   86, 1187,
+       86,   86,   86,   86, 1186, 1190, 1193,   86, 1192,   86,
+      163, 1188,   86, 1189,   86, 1191, 1194, 1198, 1197, 1201,
+     1199, 1196,   86, 1202, 1195,   86, 1205, 1200, 1204,   86,
+     1203,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+       86,   86, 1220, 1217,   86,   86,   86,   86, 1216, 1221,
+
+       86,   86, 1219, 1218, 1207, 1208, 1206,   86, 1209, 1222,
+     1224, 1223,   86, 1210, 1228, 1211, 1225,   86,   86, 1226,
+       86, 1212, 1229,   86,   86,   86, 1213, 1214, 1227,   86,
+     1230, 1235,   86, 1215,   86,   86, 1238,   86, 1236,   86,
+     1232, 1231,   86, 1233, 1241,   86,   86, 1234, 1239,   86,
+       86, 1243,   86,   86, 1244, 1237, 1240,   86,   86, 1242,
+     1249, 1246, 1247,   86,   86,   86,   86,   86,   86, 1245,
+     1252,   86, 1250,   86, 1248,   86,   86,   86,   86,   86,
+       86,   86, 1254, 1251, 1257, 1256, 1258, 1253,   86, 1261,
+       86, 1255, 1263, 1260, 1259,   86, 1262,   86,   86, 1264,
+
+     1266,   86, 1265,   86, 1267,   86, 1270,   86,   86, 1275,
+     1271,   86, 1272,   86, 1274,   86, 1268, 1273, 1269, 1276,
+     1277,   86,   86,   86, 1281,   86,   86,   86, 1283, 1282,
+       86, 1284,   86,   86,   86, 1279, 1278, 1286,   86, 1280,
+       86, 1285,   86, 1293,   86,   86, 1287,   86,   86,   86,
+     1295, 1300,   86, 1288, 1289, 1291,   86, 1297, 1290, 1292,
+       86,   86, 1296,   86, 1299, 1294,   86,   86,   86,   86,
+       86, 1302, 1303,   86, 1298, 1306,   86,   86, 1305,   86,
+       86, 1307, 1301, 1309, 1304, 1308, 1311, 1312, 1313,   86,
+       86,   86,   86,   86,   86, 1310,   86, 1316,   86, 1314,
+
+       86, 1317,   86,   86,  161, 1321, 1323, 1324, 1325, 1315,
+     1318,   86,   86,   86,   86, 1319, 1322,   86, 1320,   86,
+     1328, 1330, 1326,   86, 1327,   86,   86,   86, 1329, 1332,
+     1331,   86, 1334,   86,   86, 1336,   86,   86,   86, 1335,
+       86,   86, 1337,   86,   86, 1339, 1338, 1342,   86,   86,
+       86, 1333, 1343, 1345,   86,   86,   86, 1349, 1350, 1340,
+       86, 1344, 1341,   86,   86,   86,   86, 1347, 1353,   86,
+       86, 1352, 1346,   86,   86, 1348,   86, 1358,   86, 1354,
+     1351,   86,   86,   86, 1355, 1356,   86, 1360, 1364,   86,
+       86,   86, 1357,  170, 1359,   86, 1366,   86, 1365,   86,
+
+     1367, 1361,   86,   86,   86, 1363, 1376, 1372, 1362,   86,
+       86, 1369,   86, 1368, 1370, 1371, 1374,   86, 1373, 1377,
+       86,   86,   86, 1380, 1375,   86, 1378, 1379,   86,   86,
+       86,   86,   86, 1381, 1382, 1384,   86,   86,   86, 1390,
+       86,   86,   86, 1383, 1387,   86, 1385,   86,   86,   86,
+     1401, 1386,   86, 1388, 1394, 1389, 1391, 1396,   86, 1392,
+     1393,   86, 1400,   86,   86,   86, 1397, 1395, 1398, 1402,
+     1404, 1399, 1403,   86,   86, 1405,   86, 1406,   86,   86,
+       86,   86, 1413,   86, 1407, 1410,   86, 1409,   86,   86,
+       86, 1414,   86, 1412, 1408, 1418,   86, 1415, 1411,   86,
+
+     1416,   86,   86,   86, 1419,   86, 1420, 1422,   86, 1417,
+       86,   86, 1421,   86, 1423,   86, 1428, 1424, 1425,   86,
+     1426,   86, 1431,   86,   86, 1429,   86,   86,   86,   86,
+     1427, 1438,   86, 1432, 1430, 1436,   86,   86,   86,   86,
+       86,   86, 1433, 1437, 1435, 1434,   86, 1439, 1441,   86,
+     1448, 1442, 1440, 1444,   86, 1450,   86, 1443,   86, 1445,
+       86,   86,   86,   86, 1447,   86,   86,   86, 1453,   86,
+       86, 1446, 1456, 1451, 1449,   86, 1452,   86, 1457, 1458,
+       86, 1455, 1526, 1454, 1459,   86,   86, 1463, 1460, 1461,
+     1462,   86, 1464, 1471,   86, 1473, 1465,   86, 1474, 1466,
+
+     1467,   86,   86, 1472, 1468, 1477,   86, 1475,   86,   86,
+     1469,   86,   86, 1478, 1470, 1476,   86, 1479,   86, 1480,
+       86, 1482,   86,   86,   86, 1483, 1487, 1484,   86,   86,
+     1481,   86,   86, 1488, 1490,   86, 1485, 1493, 1494,   86,
+       86, 1486,   86,   86,   86, 1491,   86, 1495, 1489, 1498,
+     1496,   86, 1497, 1492, 1499,   86, 1500,   86, 1501,   86,
+     1502,   86, 1503,   86, 1505, 1504, 1506, 1507,   86,   86,
+     1508,   86, 1509,   86, 1514, 1511, 1510,   86,   86, 1515,
+       86,   86, 1513,   86,   86,   86, 1516,   86, 1518, 1512,
+     1524,   86,   86, 1520,   86, 1519,   86,   86, 1525,   86,
+
+     1517,   86, 1527,   86, 1521, 1523, 1522,   86, 1529,   86,
+       86,   86,   86, 1528,   86, 1530, 1531, 1532,   86, 1535,
+     1536,   86, 1538,   86,   86,   86, 1539, 1533, 1540,   86,
+       86, 1542,   86, 1537, 1541,   86, 1534, 1544,   86, 1543,
+     1546,   86,   86, 1547,   86,   86,   86, 1552,   86, 1548,
+       86,   86, 1545,   86,   86, 1557, 1549, 1555,   86,   86,
+       86,   86,   86, 1558, 1560,   86, 1550, 1551, 1554, 1559,
+     1553,   86,   86, 1556, 1562,   86,   86, 1561,   86,   86,
+     1563, 1565,   86, 1567,   86, 1564,   86, 1568, 1629, 1566,
+       86, 1569,   86, 1570,   86, 1572,   86, 1571,   86,   86,
+
+     1574, 1573,   86, 1578, 1575, 1579, 1576,   86,   86,   86,
+     1582,   86, 1580, 1581,   86, 1577,   86,   86,   86, 1586,
+       86,   86,   86, 1583,   86,   86,   86, 1588,  170, 1585,
+       86, 1594, 1595,   86, 1597, 1590, 1584,   86,   86, 1596,
+       86, 1587, 1589, 1591,   86,   86, 1592,   86,   86,   86,
+       86,   86, 1605, 1593,   86,   86,   86,   86, 1598,   86,
+     1602, 1609,   86, 1603, 1599, 1600,   86, 1601, 1604, 1610,
+       86, 1612, 1614,   86, 1606, 1608,   86, 1615,   86,   86,
+     1607, 1613, 1611,   86,   86, 1617,   86, 1618,   86,   86,
+       86, 1616, 1626, 1623,   86,   86, 1624, 1619, 1625, 1620,
+
+     1628, 1621,   86,   86, 1622, 1631,   86,   86, 1627,   86,
+     1632,   86,   86, 1630, 1633,   86,   86, 1636,   86,   86,
+     1637, 1638,   86,   86, 1641, 1635,   86, 1639,   86, 1634,
+       86, 1646,   86,   86,   86, 1650, 1647, 1643, 1640,   86,
+       86,   86, 1642,   86, 1644,   86, 1645,   86,   86,   86,
+       86, 1648, 1651, 1649,   86, 1652,   86, 1659,   86, 1654,
+       86, 1658, 1653, 1655, 1656, 1660, 1657,   86,   86, 1664,
+       86,   86, 1661,   86,   86, 1668, 1663, 1669, 1670, 1662,
+     1666,   86,   86,   86,   86, 1665,   86, 1672, 1673,   86,
+       86,   86,   86, 1667, 1678, 1671, 1674, 1677, 1675, 1679,
+
+       86, 1680,   86, 1681,   86,   86,   86,   86,   86, 1682,
+     1685,   86, 1676,   86,   86, 1687,   86, 1686,   86,   86,
+       86,   86, 1688,   86, 1693,   86, 1689, 1692, 1683, 1695,
+     1684, 1691, 1690,   86,   86, 1699,   86, 1701, 1696, 1694,
+     1700,   86, 1702,   86, 1698,   86, 1704,   86, 1697,   86,
+       86,   86,   86,   86,   86, 1712, 1703, 1708,   86, 1707,
+       86,   86,   86, 1713,   86, 1716, 1705,   86, 1706,   86,
+     1709,   86, 1711, 1710,   86, 1718, 1719,   86,   86,   86,
+     1714,   86,   86, 1717,   86,   86, 1720,   86, 1715,   86,
+     1728,   86,   86, 1721, 1729, 1725, 1722, 1723, 1724,   86,
+
+     1727,   86, 1733,   86, 1735, 1726, 1730, 1734,   86,   86,
+       86, 1731,   86, 1732, 1736,   86,   86,   86,   86, 1741,
+       86,   86, 1737, 1742, 1739,   86, 1745, 1738,   86, 1740,
+     1749,   86,   86, 1746, 1751,   86, 1743, 1750, 1744,   86,
+       86, 1754,   86,   86, 1748, 1747, 1756,   86, 1755,   86,
+     1752,   86, 1753, 1757,   86,   86,   86, 1762, 1763,   86,
+       86,   86,   86,   86, 1760,   86, 1767, 1766, 1768,   86,
+       86, 1758, 1759, 1771,   86,   86, 1761,   86, 1764, 1770,
+       86,   86, 1765, 1772,   86,   86,   86,   86, 1776, 1769,
+       86, 1773,   86, 1774,   86, 1781, 1779, 1775,   86,   86,
+
+       86,   86,   86, 1787,   86, 1788, 1785, 1777,   86,   86,
+     1778,   86, 1780, 1782,   86,   86, 1786, 1789,   86, 1784,
+     1783,   86, 1794,   86,   86,   86,   86, 1799,   86, 1790,
+     1791, 1797,   86,   86,   86, 1802, 1800, 1795, 1793, 1792,
+     1798,   86, 1796,   86,   86,   86,   86,   86,   86, 1806,
+     1809,   86, 1808, 1801,   86, 1805,  170, 1810,   86,   86,
+       86, 1811, 1804, 1803, 1812, 1807,   86,   86,   86,   86,
+     1820,   86, 1813,   86, 1815,   86, 1814,   86, 1821, 1824,
+       86, 1818, 1826,   86,   86, 1816, 1817,   86,   86, 1828,
+     1830, 1822, 1825, 1819,   86, 1823,   86, 1832,   86, 1829,
+
+     1834,   86,   86,   86, 1827,   86,   86,   86, 1831,   86,
+       86, 1836, 1833,   86, 1837,   86, 1839,   86, 1840,   86,
+       86, 1835, 1844,   86, 1841, 1842,   86, 1845, 1843,   86,
+     1838, 1852,   86,   86,   86, 1847, 1849,   86, 1846, 1850,
+       86,   86,   86, 1856, 1854, 1853,   86, 1857,   86, 1848,
+       86, 1851, 1862, 1859, 1860,   86, 1863, 1858,   86,   86,
+     1855, 1869,   86, 1867, 1864,   86, 1865,   86, 1866,   86,
+     1861,   86,   86,   86,   86,   86, 1868, 1874, 1873, 1875,
+     1876,   86,   86,   86,   86,   86,   86, 1877,   86, 1878,
+     1870,   86, 1871, 1880, 1872,   86, 1881,   86,   86,   86,
+
+       86,   86, 1883, 1882, 1879,   86,   86,   86,   86,   86,
+       86, 1884, 1893, 1892,   86, 1887,   86,   86, 1885, 1888,
+     1886, 1889,   86,   86, 1890,   86, 1896,   86, 1899, 1895,
+     1898,   86,   86, 1891,   86, 1894,   86, 1897,   86, 1904,
+       86, 1903,   86, 1900,   86, 1906,   86, 1901,   86, 1907,
+     1908,   86, 1902, 1910, 1911,   86, 1912, 1905, 1909,   86,
+       86, 1913,   86,   86,   86,   86,   86,   86,   86,   86,
+     1927,   86, 1917, 1914, 1919, 1920, 1928,   86, 1921, 1918,
+     1916, 1922,   86, 1923, 1915, 1926,   86,   86, 1924,   86,
+     1932,   86, 1931,   86, 1925,   86,   86,   86, 1929,   86,
+
+     1936, 1935,   86,   86, 1937, 1930, 1933,   86,   86,   86,
+       86,   86, 1946,   86, 1934,   86, 1940, 1947, 1944, 1939,
+     1942, 1938, 1945, 1943,   86,   86,   86, 1941,   86,   86,
+       86,   86,   86, 1953,   86, 1948, 1955, 1949, 1954,   86,
+     1951,   86, 1956, 1950, 1960, 1952,   86, 1959,   86,   86,
+       86, 1963, 1958,   86, 1965, 1964,   86, 1957, 1962,   86,
+       86, 1969,   86,   86, 1961, 1973,   86,   86, 1966, 1967,
+     1974,   86, 1968,   86,   86,   86,   86, 1970, 1980, 1978,
+     1975, 1972, 1976, 1971,   86, 1982,   86, 1983,   86, 1979,
+       86,   86, 1986,   86, 1981, 1977, 1984,   86,   86,   86,
+
+     1990,   86, 1985, 1987,   86,   86,   86,   86,   86, 1994,
+     1988, 1992, 1995, 1989, 1991,   86,   86, 1993,   86,   86,
+       86,   86,   86, 2000, 1996,   86, 1997, 1999,   86, 2001,
+       86, 2003, 2007,   86, 2002, 1998,   86, 2009, 2004, 2010,
+       86,   86, 2005,   86, 2006,   86,   86, 2013,   86, 2011,
+       86, 2017,   86, 2012, 2008,   86, 2014, 2019,   86, 2015,
+       86,   86,   86,   86, 2023,   86,   86,   86, 2018, 2016,
+     2025,   86, 2026,   86,   86,   86, 2021,   86, 2028, 2022,
+     2020,   86, 2024, 2030,   86,  170, 2029,   86, 2032,   86,
+     2034, 2027,   86, 2033, 2037,   86,   86, 2035, 2031,   86,
+
+     2041,   86,   86,   86, 2036,   86,   86,   86, 2039,   86,
+     2043, 2038,   86,   86, 2048,   86, 2042, 2044, 2040, 2045,
+       86, 2051, 2052,   86, 2049, 2046,   86,   86,   86, 2047,
+     2053, 2050, 2054,   86,   86, 2056, 2057, 2058,   86, 2055,
+     2059,   86,   86, 2060,   86,   86,   86, 2061,   86,   86,
+       86,   86,   86,   86,   86, 2066, 2067,   86,   86, 2071,
+       86, 2068, 2072,   86, 2080, 2062, 2064, 2065, 2063, 2069,
+       86,   86,   86, 2070,   86, 2073, 2075, 2077, 2078,   86,
+     2074, 2079,   86, 2076,   86,   86,   86,   86,   86,   86,
+     2087,   86, 2090, 2091,   86, 2081, 2092,   86, 2083,   86,
+
+     2082,   86, 2085, 2088, 2084, 2089,   86, 2086, 2094,   86,
+       86, 2095,   86, 2099,   86, 2101,   86,   86, 2103, 2093,
+     2100,   86, 2096,   86,   86, 2105, 2102, 2097,   86,   86,
+       86,   86,   86, 2098, 2106, 2104,   86, 2109,   86, 2108,
+       86, 2112,   86,   86,   86, 2111,   86, 2113,   86, 2115,
+     2110, 2116,   86, 2107,   86, 2117, 2119, 2118,   86,   86,
+       86, 2127,   86,   86, 2114,   86,   86,   86, 2124,   86,
+     2120, 2121, 2122, 2130, 2131, 2132,   86, 2123, 2125, 2126,
+     2133,   86,   86, 2128,   86, 2129, 2136,   86,   86, 2139,
+     2134,   86,   86,   86,   86,   86,   86, 2135, 2137,   86,
+
+     2140, 2143,   86, 2138,   86, 2145,   86, 2148, 2149,   86,
+       86,   86, 2141,   86, 2142,   86, 2146, 2151,   86,   86,
+     2144, 2147, 2153, 2156, 2154,   86, 2158,   86,   86,   86,
+     2150,   86,   86,   86,   86,   86, 2152,   86, 2164, 2161,
+     2155, 2157, 2162,   86, 2167, 2169, 2160,   86,   86, 2159,
+       86,   86, 2168,   86,   86,   86, 2173, 2172, 2175, 2166,
+     2163, 2165, 2171,   86,   86, 2176,   86,   86, 2170,   86,
+       86,   86, 2174,   86, 2177,   86, 2178,   86, 2182,   86,
+       86,   86, 2184,   86, 2187, 2179,   86, 2188, 2189, 2183,
+       86, 2180, 2181,   86,   86,   86,   86,   86, 2185, 2192,
+
+     2197,   86,   86,   86,   86, 2191, 2190, 2186, 2196,   86,
+       86,   86, 2203,   86,   86, 2193, 2194, 2202,   86, 2195,
+     2204, 2206,   86, 2199, 2200,   86, 2198, 2205,   86, 2201,
+     2210,   86, 2207,   86,   86,   86, 2208,   86,   86,   86,
+     2214, 2209,   86, 2218,   86,   86,   86,   86, 2212,   86,
+     2223,   86, 2221,   86, 2211, 3645, 2213, 2222, 2215, 2216,
+       86, 2220, 2217, 2219,   86, 2224,   86,   86,   86, 2226,
+     2225,   86,   86, 2229, 2231,   86, 2230, 2238, 2227, 2232,
+       86, 2233, 2235, 2228, 2236,   86, 2234,   86,   86, 2240,
+       86,   86,   86,   86, 2237,   86, 2242, 2239,   86, 2244,
+
+       86, 2246,   86, 2241, 2248, 2243,   86,   86, 2249,   86,
+       86,   86,  170,   86,   86,   86,   86, 2252,   86, 2256,
+       86, 2257,   86, 2258, 2247, 2245, 2251, 2253, 2254, 3645,
+     2250, 2262, 2255, 2259,   86, 2260,   86,   86,   86,   86,
+     2261,   86,   86,   86, 2263, 2265, 2264,   86, 2267,   86,
+     2268, 2266,   86, 2270,   86,   86,   86,   86, 2274,   86,
+       86, 2269, 2273,   86,   86, 2275, 2271, 2272, 2276, 2277,
+       86, 2279,   86, 2278,   86,   86,   86,   86,   86,   86,
+     2280, 2284, 2286, 2281, 2285,   86,   86,   86,   86,   86,
+       86, 2291,   86, 2282, 2288, 2283, 2287,   86,   86,   86,
+
+       86, 2290, 2292,   86, 2289,   86, 2294, 2293, 2295,   86,
+     2297,   86, 2296, 2302, 2298, 2299, 2301, 2303,   86, 2300,
+       86,   86,   86, 2304,   86,   86,   86, 2310,   86,   86,
+     2312,   86,   86,   86, 2313, 2315,   86, 2305, 2306, 2309,
+     2307, 2308,   86, 2317,   86, 2311,   86, 2318,   86, 2314,
+     2316,   86, 2321,   86,   86,   86,   86, 2320,   86,   86,
+     2326, 2323,   86,   86, 2327,   86,   86, 2322,   86,   86,
+       86, 2319, 2328,   86,   86,   86, 2325, 2324, 2330,   86,
+     2331, 2337, 2333, 2329, 2332,   86, 2338,   86, 2335, 2336,
+       86, 2334,   86,   86, 2340, 2343, 2339,   86, 2341, 2346,
+
+       86,   86, 2345,   86, 2349,   86,   86,   86, 2344,   86,
+     2350, 2342, 2352, 2348,   86, 2347, 2353,   86,   86,   86,
+       86,   86, 2355, 2351, 2354, 2356,   86, 2358, 2357, 2359,
+       86, 2363, 2361, 2360,   86,   86, 2364,   86, 2366,   86,
+       86,   86,   86,   86, 2369, 2362, 2368,   86, 2370, 2365,
+       86,   86, 2371,   86, 2375,   86,   86,   86, 2379,   86,
+       86, 2376,   86, 2380,   86,   86, 2367, 2378, 2372, 2373,
+     2377,   86,   86, 2374, 2385,   86, 2383, 2384, 2382, 2381,
+       86, 2386,   86, 2387,   86, 2390,   86,   86, 2392,   86,
+       86,   86, 2391, 2396,   86,   86,   86, 2388, 2394,   86,
+
+     2398,   86, 2399,   86, 2389,   86, 2395, 2393, 2397,   86,
+     2401,   86, 2400, 2402,   86, 2403, 2406,   86, 2404, 2408,
+       86, 2405,   86,   86, 2409,   86,   86,   86,   86,   86,
+       86, 2411, 2410, 2414, 2415, 2412,   86,   86, 2407, 2413,
+     2419,   86,   86, 2416,   86, 2418, 2417,   86,   86,   86,
+       86,   86,   86,   86, 2427, 2420,   86,   86,   86,   86,
+     2421,   86, 2422, 2423, 2425, 2428, 2426, 2433, 2429,   86,
+       86,   86, 2430, 2424, 2431, 2432,   86, 2434,   86, 2440,
+     2438,   86, 2435,   86, 2437,   86, 2439, 2443,   86, 2445,
+       86,   86, 2442,   86, 2444, 2436,   86,   86,   86,   86,
+
+     2448, 2452, 2449,  170, 2456, 3645, 2441,   86, 2454, 2446,
+       86, 2450, 2447, 2455,   86, 2457,   86,   86, 2451, 2458,
+       86,   86, 2461,   86,   86, 2453,   86, 2462, 2459, 2466,
+       86,   86, 2467, 2465,   86,   86, 2470, 2460,   86,   86,
+     2472, 2463,   86, 2471, 2473,   86, 2468,   86,   86,   86,
+     2475, 2476, 2464, 2469, 2474,   86,   86,   86,   86, 2478,
+       86,   86,   86,   86,   86, 2481,   86, 2484, 2477,   86,
+       86,   86, 2490,   86,   86, 2488,   86, 2479, 2483,   86,
+     2491,   86, 2485, 2480, 2482, 2486, 2487,   86,   86, 2492,
+       86,   86, 2493, 2489,   86,   86,   86, 2494,   86, 2499,
+
+     2502,   86, 2497,   86,   86,   86, 2496, 2495, 2500,   86,
+     2498, 2503,   86,   86, 2501,   86,   86, 2504,   86,   86,
+     2513,   86,   86, 2505, 2506, 2511,   86,   86,   86, 3645,
+     2518,   86, 2507, 2516, 2509, 2515, 2508, 2510,   86, 2512,
+       86, 2519, 2514,   86, 2517, 2520,   86,   86, 2521,   86,
+     2522,   86,   86, 2523, 2529, 2524,   86, 2527, 2528,   86,
+     2530,   86,   86, 2525, 2526,   86,   86,   86, 2534, 2536,
+       86, 2535,   86, 2537,   86, 2538,   86, 2531,   86, 2533,
+     2532, 2541,   86, 2542,   86, 2539,   86,   86, 2540,   86,
+       86, 2543, 2544, 2548,   86, 2549,   86,   86, 2545, 2551,
+
+       86,   86, 2547, 2553,   86,   86,   86, 2556,   86, 2546,
+       86, 2555, 2557,   86,   86,   86, 2550,   86,   86, 2552,
+     2554,   86,   86, 2559, 2558,   86, 2563, 2564,   86, 2566,
+       86, 2561, 2560,   86,   86,   86,   86, 2562, 2568, 2570,
+     2569, 2565,   86, 2567,   86, 2571, 2573,   86,   86,   86,
+     2576,   86, 2579,   86, 2574, 2580,   86, 2575,   86,   86,
+     2572,   86,   86,   86, 2577, 2586,   86, 2585,   86,   86,
+     2578,   86,   86, 2582, 2588,   86, 2581, 2584, 2591,   86,
+       86,   86, 2583,   86,   86,   86, 2589, 2587, 2593,   86,
+     2590,   86, 2592, 2601, 2594,   86, 2599,   86,   86, 2605,
+
+     2597, 2595, 2596,   86,   86,   86, 2600, 2602, 2607,   86,
+     2606,   86,   86,   86, 2608, 2598,   86,   86,   86,   86,
+       86, 2612, 2603, 2614, 2604, 2610,   86,   86,   86, 3645,
+       86, 2615, 2616, 2618, 2611, 2617, 2609,   86, 2619,   86,
+     2620, 2622, 2623, 2613,   86, 2621,   86,   86,   86,   86,
+       86, 2624, 2627, 2625,   86,   86,   86,   86,   86,   86,
+       86, 2626, 2634, 2629, 2630, 2631, 2632, 2635,   86,   86,
+     2628,   86, 2633,   86,   86, 2636,   86, 2640, 2639, 2637,
+     2638, 2641,   86, 2642,   86,   86, 2645,   86,   86,  170,
+     2649, 2643,   86, 2644, 2646,   86, 2651,   86,   86,   86,
+
+       86,   86,   86,   86, 2659,   86,   86, 2652, 2647, 2653,
+     2648, 2650, 3645, 2654, 2655, 2657,   86, 2656, 2661, 2658,
+     2662,   86,   86, 2663,   86, 2660, 2664,   86,   86, 2666,
+     2667, 2665, 2668,   86, 2670,   86,   86,   86,   86,   86,
+     2672,   86, 2669,   86,   86,   86, 2676,   86, 2677,   86,
+       86, 2671,   86, 2673,   86, 2679, 2680, 2674, 2685,   86,
+       86, 2678, 2681, 2675, 2682,   86,   86,   86,   86, 2686,
+       86, 2683, 2684,   86, 2688, 2689,   86,   86,   86,   86,
+       86,   86, 2691,   86,   86,   86, 2690, 2696, 2687,   86,
+     2698, 2699,   86, 2701,   86, 2695,   86,   86, 2692, 2693,
+
+     2694,   86, 2700,   86, 2697,   86,   86, 2702, 2705, 2707,
+       86,   86,   86, 2703,   86, 2711, 2712, 2710, 2708, 2734,
+     2704,   86,   86,   86,   86,   86, 2706, 2709,   86,   86,
+     2714, 2713,   86, 2715,   86, 2718,   86,   86, 2769, 2716,
+     2719,   86, 2720, 2717,   86,   86, 2726, 2721, 2722,   86,
+     2724,   86,   86,   86,   86, 2725, 2728,   86, 2723, 2730,
+       86,   86,   86, 2729,   86, 2727,   86,   86,   86,   86,
+     2739,   86,   86, 2737, 2738, 2741, 2732, 2740,   86, 2731,
+     2733,   86,   86,   86, 2743,   86,   86,   86, 2736,   86,
+       86, 2746, 2735, 2748, 2745,   86,   86, 2751,   86,   86,
+
+       86, 2744, 2742,   86,   86, 2752, 2747, 2749, 2750, 2753,
+     2754, 2755, 2758,   86, 2757,   86,   86,   86, 2759,   86,
+       86, 2756,   86, 2762, 2763,   86,   86,   86,   86,   86,
+       86, 2764,   86,   86, 2768, 2760, 2766, 2761, 2765,   86,
+       86, 2767,   86,   86, 2770, 2772, 2771, 2773, 2776, 2777,
+       86, 2778,   86, 2779,   86, 2780,   86,   86,   86, 2774,
+     2775,   86,   86, 2784,   86, 2785, 2783,   86, 2786, 2781,
+       86,   86,   86,   86,   86, 3645, 2782,   86,   86, 2793,
+       86,   86, 2787,   86, 2789, 2795,   86, 2796,   86, 2798,
+       86, 2788, 2797, 2790, 2792, 2791, 2794,   86,   86,   86,
+
+       86,   86,   86, 2802,   86, 2800, 2803, 2806,   86, 2799,
+       86, 2801,   86, 2807, 2808,   86,   86,   86,   86,   86,
+     2804,   86, 2805, 2815,   86,  170,   86, 2817,   86, 2811,
+       86,   86, 2810, 2813,   86,   86, 2809, 2816,   86, 2818,
+     2814, 2812, 2821, 2819,   86,   86, 2820, 2824,   86,   86,
+     2826,   86, 2825, 2827, 2828,   86, 2822,   86, 2823, 2829,
+       86,   86, 2830,   86, 2831,   86, 2832, 2833, 2834,   86,
+     2835,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+     2843, 3645,   86,   86, 2836, 2841,   86, 2847,   86,   86,
+     2838, 2837, 2848, 2845, 2840, 2839,   86, 2842,   86, 2844,
+
+     2846, 2849,   86, 2850,   86, 2851,   86, 2852, 2853,   86,
+     2855,   86,   86, 2854, 2856,   86,   86,   86,   86,   86,
+       86,   86, 2859,   86, 2857, 2866,   86, 2865, 2867,   86,
+     2858, 2860,   86,   86,   86, 2861, 2862, 2863, 2864, 2870,
+     2871,   86, 2873, 2868, 2872,   86,   86,   86,   86,   86,
+     2869,   86, 2874,   86, 2880,   86,   86,   86, 2879,   86,
+       86,   86, 2876, 3645, 2875, 2878,   86,   86, 2877, 2888,
+       86, 2884, 2886,   86,   86, 2887, 2881, 2882,   86, 2883,
+     2889, 2885, 2890,   86,   86, 2891,   86,   86,   86,   86,
+       86,   86,   86, 2892, 2895, 2896, 2897,   86,   86, 2894,
+
+       86, 2902, 2903,   86,   86, 2893, 2906,   86, 2898, 2900,
+       86, 2899,   86,   86,   86, 2901,   86, 2909, 2905, 2904,
+       86, 2907, 2914,   86,   86,   86, 2912, 2908, 2913, 2910,
+       86, 2911,   86,   86, 2919,   86,   86,   86, 2915,   86,
+       86, 2923,   86, 2922,   86, 2916, 2921,   86, 2920, 2924,
+       86,   86, 2917, 2918, 2926,   86, 2927,   86,   86, 2930,
+     2929, 2925, 2932,   86,   86, 2933, 2928,   86, 2935,   86,
+       86,   86,   86,   86, 2942,   86,   86,   86, 2931,   86,
+       86,   86, 2939, 2936, 2937, 2938, 2940,   86, 2941, 2934,
+     2945,   86, 2946,   86,   86, 2944, 2943,   86, 2947,   86,
+
+     2951,   86, 2949,   86,   86,   86,   86, 2950, 2948,   86,
+     2952, 2953,   86,   86, 2955, 2958,   86, 2956, 2960, 2954,
+     2957, 2959,   86, 2962,  170, 2961,   86,   86,   86,   86,
+     2967, 3645, 2964, 2963,   86,   86,   86,   86, 2969, 2968,
+       86, 2972,   86, 2973,   86, 2971, 2965, 2966,   86, 2977,
+     2970, 2975,   86,   86, 2978,   86, 2976,   86,   86,   86,
+     2982, 2974, 2979, 2980,   86,   86,   86,   86, 2983,   86,
+     2984,   86,   86, 2981, 2989, 2990, 2985,   86,   86, 2987,
+       86,   86, 2991,   86, 2986, 2993,   86,   86, 2995,   86,
+     2992,   86, 2996, 2988, 2994,   86,   86,   86,   86,   86,
+
+     2998, 2999, 3000, 2997,   86,   86,   86, 3005,   86,   86,
+       86,   86, 3002, 3003, 3004, 3007, 3001, 3006, 3009,   86,
+       86,   86, 3645,   86,   86, 3010,   86, 3008, 3015,   86,
+     3011,   86,   86, 3016,   86,   86,   86, 3020,   86,   86,
+     3012, 3013, 3014, 3018, 3019, 3023,   86, 3021,   86,   86,
+     3017,   86,   86, 3022, 3030, 3027, 3028,   86, 3024, 3031,
+       86,   86, 3033, 3025,   86,   86, 3034,   86,   86, 3026,
+       86,   86, 3035,   86,   86, 3040, 3037, 3029,   86, 3032,
+       86,   86, 3038, 3041,   86,   86,   86, 3039, 3042, 3045,
+       86,   86, 3047,   86, 3645, 3036, 3043, 3049,   86, 3044,
+
+       86, 3046, 3050,   86, 3051,   86,   86,   86,   86, 3054,
+     3052, 3048, 3053, 3055,   86,   86, 3059,   86,   86,   86,
+     3057, 3060,   86,   86, 3063, 3064,   86,   86, 3056, 3058,
+     3061, 3065,   86, 3066,   86,   86,   86,   86, 3067, 3062,
+     3068, 3070,   86,   86, 3073,   86,   86, 3074,   86, 3069,
+     3075,   86,   86, 3077,   86, 3071,   86,   86, 3081, 3082,
+       86, 3078,   86, 3072,   86,   86, 3083, 3076,   86, 3084,
+     3085, 3080, 3086,   86, 3079,   86,   86, 3087,   86,   86,
+     3092,   86,   86,   86,   86, 3091,   86, 3094, 3095,   86,
+       86, 3088, 3097, 3089,   86, 3096, 3090, 3098,   86,   86,
+
+     3101, 3100,   86,   86,   86,   86, 3093, 3099, 3104,   86,
+     3108,   86,   86,   86,   86,   86, 3110, 3645,   86, 3102,
+     3103,   86, 3105, 3107, 3111, 3106, 3109, 3115, 3112, 3114,
+     3117,   86, 3116,   86, 3113, 3118,   86, 3119, 3120,   86,
+       86, 3121,   86, 3122,   86, 3123,   86, 3124,   86, 3125,
+       86,   86,   86,   86,   86,   86, 3127, 3129,   86, 3131,
+       86,   86,   86, 3133,   86,   86, 3126, 3130, 3140, 3134,
+     3138,   86, 3128,   86, 3132, 3139,   86, 3142,   86,   86,
+       86, 3135, 3136,   86, 3137, 3143, 3145,   86, 3141,   86,
+     3146, 3147,   86,   86, 3148, 3149,   86,   86, 3144,   86,
+
+       86,   86, 3150, 3155,   86,   86, 3151,   86, 3152, 3153,
+     3156,   86,   86,   86, 3158,   86, 3157,   86,   86, 3154,
+       86,   86, 3163,   86, 3160, 3167, 3159, 3164,   86, 3166,
+     3161, 3165,   86,   86, 3169,   86,   86, 3162, 3168, 3171,
+       86,   86, 3175,   86,   86,   86, 3170,   86, 3173,   86,
+     3172,   86, 3182, 3176, 3179,   86,   86, 3177,   86, 3174,
+     3180,   86,   86,   86,   86,   86, 3187, 3185, 3183, 3186,
+       86,   86, 3178,   86,   86, 3181, 3189, 3191,   86, 3188,
+       86, 3192, 3184, 3197, 3193,   86, 3190, 3194,   86, 3195,
+       86, 3196,   86,   86,   86, 3201,   86,   86, 3198, 3200,
+
+       86,   86, 3202,   86, 3199, 3203, 3204,   86, 3206,   86,
+       86, 3205, 3210,   86, 3208, 3212,   86,   86,   86,   86,
+       86, 3213,   86,   86, 3207, 3214,   86, 3215, 3209,   86,
+     3216,   86, 3221,   86, 3218,   86,   86,   86, 3211,   86,
+       86, 3219, 3217, 3225,   86,   86,   86,   86, 3222, 3223,
+     3224, 3220, 3230, 3226, 3229,   86, 3227,   86, 3232,   86,
+       86,   86, 3236,   86, 3228, 3237,   86,   86, 3233,   86,
+       86, 3239,   86,   86,   86, 3231, 3240,   86, 3234, 3242,
+     3243,   86,   86, 3241, 3245,   86, 3238, 3235, 3246,   86,
+     3247, 3244,   86,   86, 3248, 3251,   86, 3250, 3249,   86,
+
+     3254,   86, 3256,   86,   86,   86,   86,   86, 3253,   86,
+     3258, 3261,   86, 3252, 3262,   86, 3264,   86,   86, 3259,
+       86,   86,   86, 3257, 3255,   86, 3260, 3267,   86,   86,
+     3265, 3268,   86, 3269,   86, 3263, 3271,   86,   86, 3266,
+     3273, 3270, 3276, 3274,   86,   86,   86,   86,   86, 3280,
+       86,   86,   86,   86, 3282, 3283, 3272, 3278, 3275,   86,
+     3284,   86, 3281, 3277, 3287, 3285, 3279, 3288,   86,   86,
+       86, 3290, 3289,   86,   86, 3293,   86,   86,   86, 3292,
+       86, 3286, 3296, 3294,   86, 3299,   86,   86,   86,   86,
+       86, 3291,   86, 3304,   86,   86,   86,   86,   86, 3295,
+
+     3500, 3297, 3298, 3303, 3300, 3301, 3307, 3308,   86, 3309,
+       86, 3306, 3310,   86, 3302, 3305,   86,   86,   86, 3314,
+       86, 3311,   86, 3313, 3315,   86, 3316,   86, 3317,   86,
+       86, 3312, 3320,   86,   86, 3318, 3322,   86,   86, 3321,
+     3324,   86, 3325,   86,   86,   86,   86,   86,   86, 3323,
+       86, 3331, 3332,   86,   86,   86, 3319,   86,   86,   86,
+       86, 3338,   86, 3326, 3339,   86, 3329, 3327, 3328, 3337,
+     3330, 3335,   86, 3341, 3334,   86,   86, 3340, 3336,   86,
+     3333, 3344,   86, 3346,   86, 3347,   86,   86,   86, 3350,
+       86,   86, 3342, 3348, 3343,   86, 3353,   86,   86, 3352,
+
+       86, 3349, 3351, 3345,   86, 3354,   86,   86, 3355,   86,
+       86, 3356,   86,   86, 3359,   86,   86,   86, 3357, 3361,
+     3362,   86, 3360,   86,   86,   86,   86, 3358,   86,   86,
+       86, 3371, 3374, 3372, 3363, 3375, 3364, 3365,   86, 3366,
+     3367,   86, 3368, 3369, 3370,   86,   86,   86, 3377, 3373,
+     3379,   86, 3380,   86,   86, 3382,   86,   86, 3381, 3378,
+       86, 3376, 3383, 3385,   86, 3645, 3384, 3387,   86, 3388,
+     3389,   86,   86, 3390, 3391, 3386,   86, 3392,   86, 3393,
+     3394,   86,   86,   86,   86, 3395, 3398,   86, 3396, 3399,
+       86,   86, 3401, 3397,   86,   86,   86, 3405,   86,   86,
+
+       86, 3404,   86,   86, 3400,   86,   86, 3409,   86, 3408,
+     3645,   86, 3414,   86, 3402, 3403, 3413, 3410,   86, 3406,
+     3411,   86, 3416,   86, 3412, 3407,   86, 3415, 3417,   86,
+     3418,   86,   86,   86, 3423, 3425,   86, 3420, 3419, 3424,
+       86,   86, 3421,   86,   86, 3422,   86,   86, 3645, 3429,
+     3433, 3426, 3430, 3432,   86,   86,   86, 3428, 3427, 3435,
+       86, 3434, 3436,   86,   86, 3431,   86, 3439,   86, 3440,
+       86, 3438,   86,   86, 3443,   86, 3444,   86,   86, 3437,
+     3645, 3441, 3445,   86, 3446,   86, 3447,   86, 3448,   86,
+       86, 3442, 3449,   86, 3450,   86, 3453,   86,   86, 3452,
+
+     3454,   86,   86,   86, 3451, 3458,   86, 3455,   86, 3460,
+       86,   86,   86,   86, 3456,   86,   86,   86, 3464, 3465,
+       86, 3467,   86, 3457,   86, 3462, 3461, 3459, 3463,   86,
+     3466, 3468, 3469,   86, 3471,   86,   86, 3474,   86, 3473,
+       86,   86,   86,   86,   86, 3476,   86,   86,   86,   86,
+     3470, 3482, 3475, 3472, 3480, 3481,   86,   86, 3479,   86,
+     3477,   86, 3478,   86, 3483,   86, 3486,   86, 3487, 3489,
+       86,   86, 3488, 3490,   86, 3491,   86, 3485,   86,   86,
+     3493,   86, 3484, 3494,   86,   86, 3492, 3495,   86,   86,
+     3499,   86, 3496,   86, 3502, 3498,   86,   86,   86,   86,
+
+       86,   86, 3503, 3501, 3497,   86, 3511,   86, 3509,   86,
+     3504,   86,   86, 3506, 3505, 3508, 3513, 3510, 3515,   86,
+       86,   86,   86, 3507,   86, 3517, 3520,   86, 3512, 3516,
+       86, 3514,   86, 3521,   86, 3518, 3522,   86,   86, 3523,
+     3524,   86, 3519, 3525,   86,   86,   86,   86, 3528, 3526,
+       86, 3529, 3527,   86, 3533, 3530,   86,   86,   86, 3531,
+       86,   86, 3532, 3536, 3537,   86,   86, 3534, 3535, 3539,
+       86, 3540,   86, 3541,   86,   86, 3542, 3538, 3544,   86,
+       86, 3547,   86,   86, 3548, 3543,   86,   86,   86, 3551,
+     3545, 3552,   86,   86, 3549,   86,   86,   86, 3546, 3557,
+
+       86, 3556, 3553, 3558,   86, 3554, 3550,   86,   86,   86,
+       86,   86, 3555,   86, 3562,   86,   86,   86, 3564,   86,
+       86,   86, 3561, 3571,   86, 3569, 3570,   86, 3559, 3560,
+     3566, 3563, 3567,   86, 3565, 3568,   86, 3575,   86,   86,
+     3577,   86, 3578,   86, 3576,   86,   86, 3572, 3579,   86,
+     3580, 3573,   86, 3583, 3581, 3574, 3584,   86,   86,   86,
+     3586,   86,   86, 3585,   86,   86, 3587,   86,   86, 3592,
+       86, 3582, 3589,   86, 3595,   86,   86,   86, 3596,   86,
+       86,   86,   86, 3588,   86, 3597, 3590, 3591, 3598, 3593,
+     3594,   86,   86, 3603,   86, 3602, 3599,   86,   86, 3600,
+
+     3601,   86, 3604,   86, 3607,   86, 3609, 3605,   86, 3610,
+     3606,   86,   86, 3614,   86, 3645, 3611, 3608,   86, 3612,
+     3613,   86,   86, 3615, 3616, 3617,   86,   86, 3618,   86,
+       86,   86, 3623,   86, 3619, 3621,   86,   86,   86,   86,
+       86,   86, 3625, 3626,   86, 3629, 3630,   86, 3620,   86,
+     3622,   86, 3633, 3634,   86, 3624,   86,   86, 3627, 3628,
+     3631, 3636,   86, 3635, 3637,   86,   86,   86, 3632,   86,
+       86, 3645, 3639, 3638, 3640, 3645, 3641, 3643,   86, 3644,
+       86, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3642,
+       47,   47,   47,   47,   47,   47,   47,   52,   52,   52,
+
+       52,   52,   52,   52,   57,   57,   57,   57,   57,   57,
+       57,   63,   63,   63,   63,   63,   63,   63,   68,   68,
+       68,   68,   68,   68,   68,   74,   74,   74,   74,   74,
+       74,   74,   80,   80,   80,   80,   80,   80,   80,   89,
+       89, 3645,   89,   89,   89,   89,  160,  160, 3645, 3645,
+     3645,  160,  160,  162,  162, 3645, 3645,  162, 3645,  162,
+      164, 3645, 3645, 3645, 3645, 3645,  164,  167,  167, 3645,
+     3645, 3645,  167,  167,  169, 3645, 3645, 3645, 3645, 3645,
+      169,  171,  171, 3645,  171,  171,  171,  171,  174, 3645,
+     3645, 3645, 3645, 3645,  174,  177,  177, 3645, 3645, 3645,
+
+      177,  177,   90,   90, 3645,   90,   90,   90,   90,   17,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645
     } ;
 
-static const flex_int16_t yy_chk[7114] =
+static const flex_int16_t yy_chk[7151] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -2413,18 +2422,18 @@ static const flex_int16_t yy_chk[7114] =
         5,    3,    6,   24,    4,   24,   24,    5,   24,    6,
         7,    7,    7,    7,   24,    7,    8,    8,    8,    8,
        33,    8,    7,    9,    9,    9,   26,   26,    8,   10,
-       10,   10,   19,   29,    9,   33,   19,   29, 3635,   35,
+       10,   10,   19,   29,    9,   33,   19,   29, 3653,   35,
        10,   11,   11,   11,   11,   11,   11,   13,   13,   13,
 
        13,   34,   13,   11,   35,   99,   34,   29,   38,   13,
        51,   51,   11,   12,   12,   12,   12,   12,   12,   14,
        14,   14,   14,   99,   14,   12,   15,   15,   15,   38,
        23,   14,   23,   23,   12,   23,   46,   15,   16,   16,
-       16,   23,   23,   25,   27,   27,   25,   25, 2947,   16,
+       16,   23,   23,   25,   27,   27,   25,   25, 2962,   16,
        25,   46,   27,   30,   30,   25,   27,   56,   40,   27,
        56,   73,   31,   31,   25,   28,   67,   67,   30,   32,
        28,   31,   40,   32,   28,   73,   32,   28,   92,   28,
-       28,   92,   31,   32, 1148,   32,   36,   36,   37,   37,
+       28,   92,   31,   32, 1154,   32,   36,   36,   37,   37,
        28,   45,   45,   37,   97,   36,   45,   97,   41,   41,
 
        45,   36,   87,   41,   93,   36,   87,   37,   93,   37,
@@ -2445,7 +2454,7 @@ static const flex_int16_t yy_chk[7114] =
       127,  125,  123,  122,  126,  128,  118,  127,  122,  129,
       132,  120,  131,  121,  128,  130,  131,  126,  134,  133,
       135,  136,  129,  133,  138,  135,  137,  137,  132,  135,
-      139,  141,  142,  144,  139,  257,  134,  257,  146,  150,
+      139,  141,  142,  144,  139,  135,  134,  177,  146,  150,
       151,  136,  143,  139,  138,  143,  144,  145,  149,  139,
       146,  142,  148,  145,  147,  147,  143,  141,  150,  148,
 
@@ -2457,737 +2466,740 @@ static const flex_int16_t yy_chk[7114] =
       175,  175,  180,  175,  171,  178,  178,  181,  180,  182,
       183,  184,  185,  186,  187,  189,  188,  180,  183,  190,
       185,  188,  184,  213,  182,  183,  193,  191,  190,  187,
-      177,  193,  186,  191,  191,  189,  194,  194,  195,  197,
+      176,  193,  186,  191,  191,  189,  194,  194,  195,  197,
       196,  213,  196,  197,  195,  196,  198,  198,  197,  199,
 
       200,  201,  202,  197,  204,  200,  200,  202,  203,  197,
       197,  199,  196,  203,  205,  206,  204,  209,  207,  208,
-      201,  206,  207,  210,  208,  211,  212,  214,  176,  218,
+      201,  206,  207,  210,  208,  211,  212,  214,  174,  218,
       215,  217,  214,  209,  205,  215,  217,  210,  212,  219,
       211,  212,  216,  216,  206,  220,  216,  224,  216,  218,
-      223,  220,  221,  221,  259,  219,  223,  222,  225,  226,
-      216,  259,  216,  222,  225,  226,  228,  224,  229,  222,
+      223,  220,  221,  221,  260,  219,  223,  222,  225,  226,
+      216,  260,  216,  222,  225,  226,  228,  224,  229,  222,
       230,  231,  228,  229,  226,  231,  230,  232,  233,  235,
       233,  234,  236,  232,  237,  233,  239,  234,  236,  238,
-      240,  242,  235,  241,  243,  238,  242,  244,  240,  239,
-
-      245,  246,  248,  243,  237,  247,  241,  248,  239,  249,
-      247,  247,  244,  250,  251,  253,  245,  250,  252,  254,
-      255,  246,  258,  256,  252,  254,  260,  249,  256,  261,
-      262,  263,  260,  253,  253,  261,  251,  263,  264,  265,
-      255,  258,  266,  266,  267,  267,  268,  273,  269,  262,
-      264,  276,  268,  265,  269,  270,  271,  270,  272,  273,
-      275,  274,  277,  272,  278,  289,  279,  277,  275,  280,
-      268,  276,  279,  281,  270,  280,  282,  283,  281,  271,
-      274,  282,  284,  283,  285,  286,  287,  278,  288,  290,
-      289,  291,  293,  293,  291,  290,  288,  284,  285,  292,
-
-      287,  292,  294,  286,  295,  294,  296,  296,  297,  297,
-      298,  300,  299,  301,  300,  302,  303,  301,  304,  307,
-      312,  312,  295,  306,  302,  303,  298,  299,  308,  306,
-      309,  316,  309,  307,  308,  310,  311,  304,  313,  314,
-      311,  310,  315,  313,  317,  314,  319,  318,  315,  320,
-      320,  316,  321,  322,  323,  321,  324,  311,  323,  319,
-      325,  327,  317,  326,  326,  329,  328,  315,  318,  328,
-      330,  322,  332,  334,  335,  324,  330,  329,  325,  327,
-      331,  339,  334,  331,  332,  336,  328,  333,  338,  340,
-      336,  338,  335,  174,  339,  337,  333,  342,  337,  333,
-
-      337,  340,  342,  342,  333,  333,  333,  333,  341,  343,
-      341,  341,  343,  337,  344,  344,  337,  345,  346,  349,
-      347,  348,  350,  351,  351,  352,  353,  353,  349,  355,
-      352,  350,  358,  346,  345,  347,  357,  345,  348,  348,
-      354,  354,  356,  359,  355,  360,  361,  356,  357,  364,
-      365,  358,  361,  362,  362,  365,  362,  367,  366,  372,
-      360,  768,  367,  359,  366,  362,  368,  370,  372,  364,
-      369,  368,  362,  369,  374,  369,  371,  368,  768,  371,
-      374,  370,  373,  373,  375,  375,  376,  381,  379,  382,
-      388,  376,  371,  380,  392,  371,  380,  371,  377,  377,
-
-      411,  377,  381,  383,  382,  388,  385,  377,  379,  385,
-      386,  377,  411,  389,  380,  392,  377,  383,  393,  377,
-      378,  378,  389,  378,  386,  385,  390,  391,  398,  395,
-      394,  390,  390,  391,  396,  399,  378,  393,  395,  378,
-      391,  378,  397,  378,  387,  394,  387,  387,  397,  403,
-      400,  405,  404,  396,  398,  399,  387,  387,  387,  387,
-      387,  401,  407,  387,  400,  402,  405,  401,  406,  403,
-      402,  401,  404,  406,  408,  409,  409,  407,  410,  412,
-      408,  413,  414,  415,  416,  418,  419,  413,  402,  416,
-      420,  417,  417,  412,  417,  421,  425,  169,  410,  415,
-
-      425,  422,  419,  422,  428,  418,  420,  414,  423,  421,
-      427,  427,  424,  423,  424,  424,  426,  432,  429,  433,
-      426,  430,  431,  428,  435,  436,  167,  433,  433,  441,
-      435,  432,  424,  429,  436,  426,  439,  430,  437,  433,
-      431,  433,  434,  437,  438,  439,  440,  434,  438,  443,
-      441,  442,  440,  443,  446,  434,  434,  442,  444,  434,
-      434,  444,  445,  434,  447,  447,  448,  445,  449,  449,
-      450,  451,  452,  452,  446,  450,  453,  454,  455,  448,
-      456,  454,  453,  457,  451,  458,  459,  459,  457,  461,
-      458,  460,  462,  455,  463,  459,  464,  465,  470,  464,
-
-      466,  456,  465,  460,  466,  467,  463,  468,  468,  461,
-      462,  469,  471,  471,  472,  477,  469,  467,  476,  470,
-      474,  474,  478,  477,  479,  480,  481,  482,  483,  487,
-      485,  481,  489,  479,  486,  490,  472,  488,  489,  476,
-      483,  507,  493,  478,  490,  507,  480,  482,  485,  487,
-      485,  488,  486,  491,  494,  492,  493,  496,  495,  491,
-      492,  495,  494,  497,  498,  494,  499,  500,  503,  502,
-      505,  496,  499,  498,  501,  502,  504,  501,  497,  506,
-      508,  504,  503,  509,  510,  508,  511,  500,  512,  510,
-      513,  516,  505,  502,  517,  518,  528,  519,  509,  520,
-
-      506,  519,  511,  513,  522,  528,  166,  512,  514,  514,
-      518,  516,  521,  527,  514,  517,  514,  521,  520,  523,
-      522,  524,  514,  523,  514,  525,  524,  514,  514,  527,
-      524,  526,  527,  529,  514,  530,  526,  531,  532,  529,
-      525,  532,  533,  534,  529,  535,  535,  536,  537,  537,
-      530,  538,  539,  531,  540,  542,  526,  541,  541,  543,
-      546,  545,  544,  534,  539,  533,  538,  544,  547,  540,
-      545,  548,  536,  550,  542,  554,  551,  548,  555,  546,
-      551,  543,  550,  547,  552,  553,  556,  554,  552,  557,
-      559,  553,  558,  555,  560,  562,  561,  562,  560,  563,
-
-      565,  565,  564,  557,  567,  556,  566,  558,  559,  561,
-      564,  568,  566,  569,  571,  570,  567,  568,  570,  572,
-      575,  573,  576,  563,  574,  569,  573,  574,  571,  575,
-      578,  579,  579,  587,  572,  577,  575,  586,  576,  575,
-      577,  577,  581,  578,  580,  580,  582,  582,  581,  583,
-      583,  584,  588,  585,  587,  586,  590,  584,  585,  585,
-      589,  590,  591,  589,  588,  592,  593,  594,  595,  593,
-      596,  597,  594,  592,  598,  597,  599,  601,  600,  602,
-      598,  591,  600,  603,  602,  604,  604,  605,  606,  596,
-      609,  595,  608,  607,  610,  601,  599,  603,  607,  611,
-
-      164,  613,  605,  612,  618,  611,  609,  615,  612,  606,
-      614,  608,  617,  614,  610,  613,  616,  616,  614,  619,
-      618,  614,  614,  620,  619,  615,  621,  622,  620,  624,
-      617,  626,  625,  627,  626,  624,  629,  627,  628,  629,
-      621,  625,  622,  628,  630,  631,  632,  633,  635,  630,
-      634,  636,  640,  635,  633,  637,  637,  638,  639,  627,
-      641,  631,  644,  634,  632,  642,  638,  643,  644,  645,
-      650,  636,  162,  640,  642,  645,  641,  639,  646,  643,
-      651,  646,  647,  647,  648,  647,  649,  648,  650,  652,
-      653,  649,  654,  655,  651,  653,  656,  658,  657,  655,
-
-      658,  656,  659,  652,  657,  660,  662,  661,  663,  664,
-      660,  654,  661,  661,  664,  666,  665,  667,  668,  662,
-      669,  663,  665,  668,  670,  670,  667,  659,  664,  664,
-      671,  672,  673,  674,  666,  673,  675,  671,  672,  674,
-      669,  676,  678,  678,  679,  681,  676,  677,  675,  680,
-      673,  680,  677,  677,  683,  682,  676,  682,  684,  685,
-      686,  687,  688,  689,  681,  690,  693,  689,  688,  679,
-      691,  692,  683,  694,  690,  695,  684,  685,  695,  686,
-      696,  687,  697,  698,  693,  691,  692,  695,  697,  700,
-      699,  701,  694,  702,  703,  696,  704,  705,  707,  734,
-
-      704,  700,  706,  698,  699,  708,  709,  710,  712,  716,
-      701,  734,  711,  703,  702,  705,  707,  711,  706,  713,
-      713,  715,  712,  708,  708,  709,  710,  714,  716,  717,
-      718,  714,  719,  720,  721,  715,  723,  719,  722,  726,
-      717,  724,  727,  723,  718,  725,  724,  727,  729,  720,
-      728,  722,  725,  721,  730,  728,  731,  732,  733,  736,
-      743,  730,  735,  726,  736,  731,  729,  733,  735,  737,
-      738,  732,  737,  739,  738,  740,  741,  750,  742,  744,
-      744,  743,  746,  746,  740,  745,  745,  739,  747,  748,
-      752,  741,  742,  747,  745,  751,  750,  754,  748,  753,
-
-      755,  751,  756,  753,  758,  757,  759,  761,  760,  754,
-      752,  757,  758,  759,  762,  765,  772,  774,  771,  776,
-      756,  799,  772,  775,  799,  755,  760,  771,  776,  775,
-      765,  160,  761,  777,  762,  763,  784,  763,  778,  774,
-      763,  781,  778,  782,  763,  779,  779,  763,  783,  777,
-      780,  780,  781,  785,  763,  763,  784,  763,  787,  785,
-      792,  782,  783,  786,  786,  786,  788,  786,  789,  790,
-      786,  788,  791,  793,  794,  786,  791,  793,  787,  794,
-      795,  786,  786,  796,  792,  797,  798,  790,  796,  789,
-      800,  801,  803,  793,  807,  800,  800,  807,  801,  795,
-
-      797,  802,  802,  804,  805,  805,  812,  803,  804,  806,
-      808,  798,  809,  809,  806,  808,  810,  811,  810,  813,
-      814,  818,  815,  813,  816,  812,  817,  817,  819,  811,
-      820,  820,  816,  821,  822,  823,  818,  824,   85,  825,
-      814,  815,  819,  824,  825,  829,  822,  826,  826,  827,
-      829,  821,  830,  831,  827,  827,  832,  823,  830,  833,
-      834,  836,  832,  837,  833,  835,  834,  836,  835,  838,
-      838,  837,  831,  839,  839,  840,  841,  842,  844,  845,
-      843,  847,  842,  840,  843,  844,  846,  848,  848,  849,
-      852,  850,  851,  851,  841,  853,  852,  845,  849,  850,
-
-      847,  855,  846,  856,  857,  860,  858,  859,  860,  862,
-      855,  858,  856,  861,  853,  863,  859,  864,  861,  865,
-      867,  868,  868,  862,  866,  870,  864,  869,  857,  866,
-      866,  872,  865,  873,  867,  874,  871,  876,  874,  876,
-      863,  878,  869,  880,  870,  871,  874,  877,  877,  879,
-      881,  873,  882,  883,  879,  872,  884,  885,  886,  887,
-      888,  889,  878,  887,  880,  890,  885,  892,  891,  893,
-      881,  890,  882,  894,  895,  883,  884,  891,  888,  892,
-      889,  886,  897,  896,  898,  893,  899,  901,  895,  896,
-      897,  899,  894,  900,  900,  902,  903,  904,  898,  905,
-
-      906,  907,  908,  911,  909,  903,  901,  905,  910,  911,
-      912,  913,  914,  915,  916,  902,  912,  904,  914,  920,
-      906,  908,  923,  907,  909,  913,  917,  915,  910,  918,
-      921,  922,  917,  919,  916,  918,  922,  919,  920,  924,
-      924,  925,  921,  923,  928,  926,  927,  925,  929,  927,
-      921,  926,  930,  931,  932,  932,  933,  937,  930,  934,
-      935,  929,  928,  935,  934,  936,  939,  939,  940,  941,
-      936,  936,  937,  931,  933,  938,  935,  942,  935,  938,
-      943,  945,  942,  946,  949,  948,  950,  952,  952,  941,
-      940,  953,  955,  955,  954,  953,  956,  946,  948,  943,
-
-      958,  963,  957, 1013,  949,  945,  957,  950,  951,  954,
-      963,  951,  959,  951,  961,  958, 1013,  951,  960,  951,
-      964,  956,  966,  960,  951,  962,  959,  968,  961,  951,
-      962,  962,  965,  969,  964,  967,  965,  966,  969,  968,
-      967,  970,  971,  972,  973,  982,  974,   80,  965,  976,
-      967,  974,  975,  973,  976,  970,  977,  972,  975,  978,
-      979,  979,  977,  971,  980,  978,  981,  982,  983,  980,
-      984,  986,  981,  987,  989,  990,  990,  988,  987,  991,
-      993,  995,  996,  986,  991,  992,  989,  983,  984,  985,
-      985,  988,  994,  992,  997,  985,  993,  985,  998, 1000,
-
-      995,  996,  999,  985,  998, 1001,  994,  999,  985,  985,
-      997, 1000, 1002, 1003, 1004,  985, 1005, 1005, 1006, 1007,
-     1009, 1010, 1006, 1001, 1010, 1011, 1009, 1014, 1002, 1012,
-     1015, 1003, 1004, 1014, 1012, 1015, 1016, 1018, 1019, 1007,
-     1020, 1022, 1021, 1023, 1011, 1025, 1018, 1019, 1021, 1024,
-     1022, 1027, 1026, 1038, 1024, 1016, 1020, 1028, 1029, 1030,
-     1032, 1037, 1023, 1035, 1031, 1025, 1026, 1029, 1030, 1028,
-     1031, 1027, 1033, 1038, 1040, 1037, 1039, 1032, 1033, 1035,
-     1041, 1039, 1042, 1043, 1044, 1045, 1048, 1049,   75, 1044,
-     1045, 1048, 1054, 1040, 1041, 1053, 1049, 1051, 1043, 1052,
-
-     1042, 1050, 1050, 1051, 1053, 1052, 1055, 1054, 1057, 1058,
-     1063, 1062, 1060, 1060, 1058, 1058, 1060, 1061, 1064, 1055,
-     1061, 1065, 1066, 1067, 1057, 1062, 1068, 1069, 1071, 1077,
-     1063, 1070, 1068,   74, 1064, 1066, 1072, 1070, 1067, 1065,
-     1073, 1072, 1080, 1071, 1075, 1075, 1076, 1069, 1078, 1076,
-     1077, 1079, 1081, 1078, 1073, 1082, 1079, 1083, 1080, 1084,
-     1082, 1081, 1083, 1086, 1087, 1092, 1088, 1089, 1091, 1086,
-     1095, 1084, 1088, 1089, 1090, 1090, 1093, 1091, 1096, 1093,
-     1087, 1094, 1094, 1092, 1097, 1099, 1098, 1100, 1095, 1098,
-     1101, 1136, 1110, 1100, 1102, 1136, 1101, 1096, 1099, 1105,
-
-     1102, 1103, 1104, 1106, 1097, 1105, 1103, 1104, 1106, 1107,
-     1110, 1109, 1111, 1112, 1115, 1107, 1109, 1113, 1116, 1112,
-     1114, 1114, 1113, 1115, 1117, 1118, 1119, 1116, 1120, 1117,
-     1121, 1120, 1111, 1121, 1123, 1122, 1124, 1125, 1126, 1123,
-     1129, 1127, 1128, 1118, 1132, 1119, 1122, 1127, 1128, 1125,
-     1133, 1130, 1131, 1131, 1124, 1129, 1130, 1126, 1134, 1135,
-     1137, 1139, 1138, 1132, 1133, 1140, 1142, 1143, 1143, 1145,
-     1134, 1138, 1147, 1144, 1145, 1149, 1150, 1135, 1137, 1146,
-     1139, 1144, 1151, 1152, 1146, 1142, 1153, 1155, 1152, 1149,
-     1140, 1150, 1147, 1156, 1151, 1153, 1154, 1154, 1157, 1156,
-
-     1158, 1159, 1166, 1160, 1157, 1160, 1159, 1155, 1161, 1162,
-     1163, 1165, 1164, 1161, 1168, 1167, 1158, 1164, 1169, 1171,
-     1171, 1166, 1167, 1162, 1163, 1172, 1165, 1173, 1174, 1168,
-     1175, 1176,   68, 1177, 1180, 1180, 1175, 1169, 1177, 1172,
-     1179, 1181, 1184, 1174, 1179, 1173, 1181, 1177, 1183, 1177,
-     1186, 1176, 1177, 1182, 1182, 1183, 1184, 1185, 1187, 1188,
-     1185, 1189, 1190, 1191, 1192, 1194, 1189, 1193, 1188, 1186,
-     1192, 1195, 1193, 1196, 1201, 1191, 1187, 1198, 1198, 1194,
-     1199, 1190, 1195, 1200, 1202, 1199, 1203, 1204, 1200, 1202,
-     1203, 1205, 1196, 1206, 1201, 1207, 1204, 1208, 1209, 1211,
-
-     1208, 1212, 1213, 1210, 1214,   63, 1205, 1218, 1206, 1208,
-     1210, 1211, 1215, 1209, 1207, 1216, 1219, 1220, 1215, 1217,
-     1212, 1222, 1214, 1213, 1221, 1217, 1220, 1218, 1224, 1223,
-     1216, 1225, 1227, 1226, 1228, 1231, 1219, 1230, 1227, 1221,
-     1222, 1223, 1234, 1230, 1232, 1233, 1236, 1224, 1226, 1235,
-     1231, 1236, 1237, 1233, 1228, 1238, 1225, 1239, 1232, 1240,
-     1238, 1238, 1234, 1245, 1237, 1235, 1241, 1242, 1242, 1244,
-       58, 1246, 1245, 1240, 1247, 1247, 1239, 1246, 1248, 1241,
-     1243, 1243, 1244, 1248, 1250, 1243, 1249, 1251, 1243, 1243,
-     1250, 1252, 1251, 1243, 1254, 1249, 1252, 1253, 1253, 1243,
-
-     1255, 1255, 1256, 1243, 1257, 1256, 1259, 1256, 1258, 1260,
-     1261, 1262, 1259, 1263, 1264, 1254, 1262, 1265, 1260, 1266,
-     1305, 1269, 1305, 1265, 1257, 1266, 1258, 1263, 1267, 1270,
-     1261, 1268, 1264, 1267, 1269, 1268, 1271, 1272, 1270, 1273,
-     1273, 1271, 1279, 1270, 1277, 1270, 1275, 1270, 1277, 1270,
-     1278, 1272, 1274, 1274, 1280, 1274, 1281, 1275, 1282, 1283,
-     1279, 1281, 1281, 1280, 1284, 1278, 1285, 1282, 1286, 1284,
-     1287, 1288, 1289, 1290, 1291, 1291, 1292, 1286, 1294, 1290,
-     1285, 1283, 1295, 1293, 1296, 1297, 1289, 1295, 1292, 1287,
-     1288, 1293, 1294, 1298, 1297, 1299, 1300, 1301, 1296, 1303,
-
-     1298, 1309, 1301, 1302, 1302, 1304, 1304, 1307, 1310, 1312,
-     1307, 1308, 1316, 1299, 1303, 1317, 1308, 1310, 1311, 1311,
-     1309, 1300, 1313, 1313, 1314, 1314, 1315, 1318, 1321, 1312,
-     1320, 1315, 1323, 1316, 1319, 1319, 1317, 1322, 1324, 1328,
-     1322, 1325, 1326, 1331, 1324, 1321, 1325, 1327, 1318, 1327,
-     1320, 1326, 1323, 1330, 1332, 1333, 1330, 1328, 1331, 1334,
-     1333, 1335, 1336, 1337, 1340, 1340, 1335, 1332, 1337, 1338,
-     1336, 1339, 1338, 1334, 1341, 1342, 1339, 1343, 1344, 1341,
-     1347, 1345, 1348, 1343, 1349, 1344, 1347, 1350, 1348, 1349,
-     1351, 1352, 1350, 1342, 1345, 1353, 1351, 1354, 1355, 1355,
-
-     1352, 1356, 1358, 1360, 1359, 1361, 1362, 1358, 1354, 1363,
-     1364, 1365, 1366, 1360, 1353, 1369, 1364, 1365, 1366, 1368,
-     1361, 1356, 1359, 1370, 1371, 1368, 1362, 1372, 1373, 1369,
-     1374, 1376, 1363, 1375, 1375, 1369, 1377, 1378, 1384, 1372,
-     1379, 1381, 1373, 1370, 1371, 1379, 1380, 1380, 1374, 1382,
-     1386, 1376, 1388, 1385, 1382, 1378, 1387, 1384, 1385, 1385,
-     1388, 1377, 1389, 1390, 1381, 1387, 1391, 1392, 1386, 1394,
-     1393, 1394, 1392, 1395, 1397, 1392, 1389, 1399, 1390, 1393,
-     1397, 1391, 1398, 1401, 1391, 1400, 1398, 1395, 1399, 1402,
-     1400, 1400, 1403, 1404, 1405, 1406, 1407, 1408, 1404, 1405,
-
-     1406, 1409, 1401, 1410, 1412, 1416, 1409, 1413, 1414, 1416,
-     1403, 1415, 1415, 1417, 1407, 1402, 1418, 1408, 1412, 1423,
-     1420, 1419, 1421, 1410, 1422, 1413, 1414, 1419, 1426, 1424,
-     1425, 1417, 1420, 1423, 1427, 1418, 1430, 1429, 1421, 1427,
-     1431, 1428, 1429, 1422, 1424, 1425, 1432, 1426, 1428, 1433,
-     1433, 1434, 1436, 1435, 1430, 1432, 1437, 1437, 1438, 1439,
-     1440, 1431, 1435, 1444, 1438, 1439, 1434, 1441, 1441, 1442,
-     1442, 1443, 1436, 1445, 1440, 1446, 1447, 1443, 1448, 1444,
-     1446, 1449, 1447, 1456, 1448, 1450, 1450, 1449, 1451, 1451,
-     1453, 1453, 1454, 1455, 1445, 1457, 1454, 1458, 1459, 1460,
-
-     1462, 1456, 1455, 1461, 1461, 1466, 1460, 1457, 1451, 1463,
-     1451, 1458, 1465, 1459, 1464, 1469, 1467, 1463, 1471, 1464,
-     1462, 1467, 1467, 1468, 1466, 1472, 1465, 1473, 1468, 1468,
-     1470, 1470, 1475, 1474, 1476, 1469, 1473, 1471, 1474, 1477,
-     1478, 1480, 1479, 1481, 1472, 1483, 1478, 1479, 1486, 1482,
-     1484, 1475, 1485, 1487, 1476, 1482, 1484, 1477, 1485, 1488,
-     1489, 1480, 1490, 1491, 1483, 1492, 1496, 1486, 1493, 1481,
-     1494, 1494, 1487, 1495, 1497, 1498, 1495, 1491, 1488, 1489,
-     1502, 1490, 1503, 1493, 1502, 1496, 1492, 1498, 1499, 1499,
-     1500, 1500, 1501, 1497, 1504, 1503, 1505, 1501, 1506, 1510,
-
-     1506, 1508, 1509, 1504, 1506, 1511, 1512, 1509, 1514, 1505,
-     1513, 1513, 1515, 1514, 1510, 1516, 1517, 1506, 1515, 1508,
-     1518, 1522, 1512, 1519, 1523, 1511, 1518, 1520, 1519, 1517,
-     1516, 1520, 1521, 1525, 1524, 1531, 1521, 1529, 1526, 1527,
-     1527, 1522, 1523, 1524, 1526, 1532, 1533, 1533, 1534, 1535,
-     1532, 1537, 1537, 1525, 1534, 1529, 1531, 1539, 1540, 1540,
-     1539, 1541, 1542, 1543, 1545, 1546, 1548, 1545, 1547, 1535,
-     1549, 1550, 1550, 1552, 1551, 1548, 1553, 1541, 1542, 1543,
-     1554, 1556, 1555, 1557, 1557, 1554, 1546, 1556, 1547, 1551,
-     1549, 1558, 1559, 1560, 1552, 1553, 1555, 1561, 1562, 1564,
-
-     1558, 1563, 1563, 1565, 1566, 1567, 1568, 1568, 1560, 1566,
-     1559, 1569, 1570, 1564, 1572, 1569, 1571, 1571, 1562, 1573,
-     1567, 1565, 1561, 1574, 1575, 1576, 1577, 1583, 1575, 1579,
-     1579, 1577, 1570, 1581, 1574, 1584, 1572, 1580, 1573, 1586,
-     1580, 1585, 1582, 1583, 1576, 1588, 1581, 1582, 1587, 1589,
-     1589, 1590, 1591, 1584, 1592, 1585, 1590, 1594, 1586, 1586,
-     1593, 1593, 1587, 1595, 1596, 1597, 1594, 1597, 1595, 1599,
-     1588, 1598, 1591, 1600, 1592, 1599, 1598, 1601, 1603, 1604,
-     1604, 1605, 1606, 1601, 1596, 1608, 1609, 1612, 1606, 1613,
-     1608, 1614, 1603, 1600, 1610, 1610, 1611, 1611, 1617, 1615,
-
-     1605, 1612, 1615, 1616, 1616, 1618, 1614, 1613, 1619, 1620,
-     1609, 1623, 1620, 1621, 1623, 1620, 1617, 1618, 1622, 1621,
-     1625, 1626, 1627, 1622, 1629, 1629, 1626, 1620, 1619, 1625,
-     1623, 1628, 1630, 1631, 1628, 1632, 1638, 1633, 1640, 1631,
-     1639, 1632, 1633, 1634, 1634, 1635, 1635, 1627, 1636, 1638,
-     1637, 1641, 1648, 1653, 1636, 1637, 1630, 1640, 1639, 1642,
-     1643, 1644, 1642, 1645, 1652, 1646, 1643, 1644, 1647, 1645,
-     1646, 1641, 1649, 1653, 1647, 1648, 1651, 1649, 1650, 1650,
-     1654, 1651, 1652, 1655, 1656, 1660, 1657, 1658, 1659, 1661,
-     1662, 1668, 1662, 1661, 1663, 1664, 1666, 1667, 1656, 1654,
-
-     1657, 1658, 1664, 1655, 1668, 1669, 1659, 1670, 1666, 1667,
-     1660, 1669, 1671, 1663, 1672, 1673, 1674, 1675, 1675, 1674,
-     1679, 1676, 1678, 1678, 1681, 1684, 1680, 1670, 1671, 1673,
-     1676, 1680, 1682, 1682, 1672, 1683, 1681, 1674, 1685, 1684,
-     1679, 1686, 1687, 1688, 1690, 1689, 1693, 1691, 1695, 1714,
-     1683, 1687, 1689, 1690, 1696, 1714, 1690, 1696, 1688, 1686,
-     1699, 1693, 1685, 1691, 1697, 1697, 1693, 1698, 1698, 1700,
-     1703, 1701, 1699, 1695, 1701, 1702, 1702, 1704, 1706, 1705,
-     1707, 1706, 1708, 1703, 1705, 1707, 1709, 1700, 1710, 1711,
-     1713, 1712, 1715, 1715, 1717, 1719, 1704, 1710, 1716, 1713,
-
-     1712, 1708, 1709, 1712, 1718, 1716, 1720, 1721, 1711, 1724,
-     1722, 1727, 1728, 1719, 1717, 1722, 1722, 1718, 1730, 1723,
-     1720, 1724, 1731, 1721, 1723, 1729, 1729, 1732, 1732, 1736,
-     1728, 1731, 1732, 1734, 1730, 1735, 1727, 1733, 1733, 1737,
-     1735, 1738, 1734, 1739, 1741, 1734, 1742, 1736, 1739, 1739,
-     1743, 1744, 1733, 1745,   57, 1747, 1744, 1746, 1741, 1738,
-     1737, 1742, 1749, 1746, 1748, 1748, 1750, 1745, 1749, 1751,
-     1752, 1750, 1743, 1747, 1753, 1755, 1752, 1756, 1757, 1758,
-     1753, 1760, 1762, 1751, 1757, 1759, 1764, 1760, 1759, 1765,
-     1762, 1756, 1758, 1766, 1759, 1755, 1767, 1768, 1769,   52,
-
-     1770, 1771, 1768, 1772, 1767, 1764, 1773, 1769, 1765, 1774,
-     1771, 1776, 1766, 1770, 1775, 1775, 1772, 1776, 1777, 1778,
-     1773, 1779, 1778, 1774, 1777, 1780, 1780, 1781, 1782, 1783,
-     1784, 1784, 1785, 1786, 1779, 1787, 1775, 1788, 1789, 1786,
-     1791, 1791, 1792, 1795, 1794, 1785, 1782, 1781, 1783, 1794,
-     1793, 1799, 1798, 1788, 1793, 1796, 1789, 1787, 1801, 1797,
-     1796, 1798, 1792, 1795, 1797, 1803, 1802, 1804, 1803, 1801,
-     1805, 1806, 1806, 1807, 1799, 1802, 1808, 1809, 1813, 1804,
-     1810, 1810, 1812, 1811, 1816, 1805, 1814, 1817, 1808, 1812,
-     1813, 1820, 1807, 1818, 1819, 1821, 1809, 1811, 1814, 1818,
-
-     1831, 1821, 1831, 1816, 1822, 1822, 1819, 1817, 1823, 1820,
-     1826, 1823, 1824, 1824, 1827, 1826, 1828, 1829, 1829, 1830,
-     1833, 1832, 1828, 1827, 1832, 1834, 1835, 1836, 1837, 1838,
-     1839, 1830, 1842, 1837, 1838, 1841, 1840, 1842, 1844, 1839,
-     1833, 1845, 1843, 1853, 1835, 1836, 1845, 1834, 1840, 1846,
-     1841, 1843, 1847, 1845, 1846, 1848, 1848, 1849, 1844, 1850,
-     1852, 1855, 1853, 1849, 1843, 1854, 1856, 1847, 1857, 1858,
-     1857, 1859, 1859, 1860, 1860, 1862, 1852, 1855, 1861, 1861,
-     1850, 1863, 1863, 1858, 1854, 1858, 1856, 1864, 1864, 1865,
-     1866, 1867, 1868, 1868, 1869, 1862, 1870, 1871, 1869, 1873,
-
-     1871, 1874, 1870, 1875, 1877, 1873, 1879, 1879, 1876, 1875,
-     1865, 1866, 1867, 1876, 1878, 1880, 1881, 1878, 1883, 1874,
-     1884, 1881, 1882, 1882, 1891, 1885, 1886, 1887, 1887, 1877,
-     1885, 1886, 1888, 1883, 1889, 1880, 1890, 1888, 1892, 1893,
-     1889, 1884, 1895, 1896, 1891, 1894, 1897, 1898, 1890, 1890,
-     1890, 1894, 1898, 1897, 1901, 1890, 1892, 1902, 1905, 1893,
-     1900, 1908, 1895, 1896, 1904, 1900, 1900, 1903, 1901, 1903,
-     1906, 1907, 1902, 1905, 1909, 1904, 1906, 1910, 1910, 1911,
-     1907, 1908, 1912, 1912, 1913, 1914, 1915, 1915, 1916, 1916,
-     1917, 1920, 1920, 1921, 1922, 1909, 1925, 1924, 1927, 1928,
-
-     1928, 1929, 1926, 1922, 1913, 1911, 1924, 1914, 1926, 1930,
-     1917, 1932, 1931, 1933, 1927, 1934, 1934, 1925, 1921, 1931,
-     1932, 1935, 1929, 1938, 1930, 1936, 1939, 1940, 1941, 1938,
-     1942, 1939, 1943, 1940, 1944, 1946, 1944, 1942, 1943, 1933,
-     1947, 1936, 1948, 1948, 1949, 1951, 1947, 1935, 1941, 1949,
-     1950, 1952, 1953, 1956, 1946, 1953, 1954, 1955, 1957, 1950,
-     1955, 1958, 1958, 1959, 1962, 1951, 1960, 1961, 1954, 1959,
-     1952, 1956, 1960, 1963, 1965, 1966, 1967, 1963, 1969, 1962,
-     1970, 1967, 1968, 1968, 1957, 1971, 1973, 1961, 1974, 1975,
-     1975,   47, 1974, 1963, 1965, 1976, 1982, 1966, 1977, 1970,
-
-     1971, 1976, 1969, 1978, 1978, 1973, 1979, 1977, 1980, 1983,
-     1979, 1981, 1981, 1984, 1986, 1985, 1987, 1982, 1988, 1980,
-     1985, 1989, 1990, 1983, 1980, 1992, 1991, 1989, 1998, 1993,
-     1992, 1996, 1984, 2000, 1986, 1996, 1987, 1998, 1988, 1999,
-     1990, 1991, 1993, 1994, 1994, 1995, 1995, 2001, 2002, 2002,
-     1999, 2009, 2001, 2000, 2005, 1999, 2004, 2004, 2006, 2005,
-     2005, 2008, 2011, 2010, 2006, 2012, 2014, 2008, 2010, 2015,
-     2016, 2012, 2018, 2015, 2011, 2017, 2017, 2009, 2014, 2019,
-     2020, 2021, 2016, 2022, 2022, 2019, 2023, 2021, 2024, 2025,
-     2029, 2026, 2028, 2030, 2025, 2036, 2032, 2018, 2030, 2032,
-
-     2033, 2033, 2020, 2026, 2028, 2023, 2034, 2034, 2024, 2029,
-     2035, 2035, 2037, 2038, 2040, 2036, 2039, 2041, 2037, 2038,
-     2040, 2039, 2043, 2046, 2049, 2045, 2041, 2043, 2045, 2047,
-     2047, 2050, 2051, 2052, 2052, 2046, 2049, 2051, 2053, 2054,
-     2055, 2057, 2057, 2050, 2054, 2055, 2056, 2053, 2058, 2056,
-     2059, 2060, 2061, 2062, 2065, 2063, 2064, 2062, 2066, 2059,
-     2063, 2067, 2064, 2068, 2070, 2070, 2071, 2066, 2058, 2060,
-     2074, 2061, 2065, 2072, 2073, 2078, 2070, 2068, 2076, 2067,
-     2075, 2075, 2072, 2073, 2071, 2077, 2079, 2076, 2080, 2086,
-     2074, 2079, 2083, 2083, 2087, 2085, 2078, 2077, 2085, 2088,
-
-     2091, 2080, 2090, 2092, 2093, 2086, 2094, 2094, 2096, 2092,
-     2087, 2095, 2098, 2095, 2091, 2088, 2103, 2090, 2097, 2097,
-     2098, 2093, 2100, 2100, 2101, 2101, 2096, 2104, 2105, 2106,
-     2107, 2108, 2109, 2104, 2105, 2110, 2110, 2107, 2112, 2103,
-     2111, 2111, 2113, 2106, 2114, 2115, 2116, 2117, 2118, 2111,
-     2119, 2121, 2109, 2108, 2113, 2124, 2114, 2118, 2116, 2112,
-     2115, 2120, 2122, 2125, 2122, 2119, 2120, 2120, 2122, 2128,
-     2126, 2127, 2127, 2117, 2121, 2124, 2129, 2130, 2131, 2132,
-     2130, 2122, 2126, 2131, 2134, 2136, 2125, 2128, 2135, 2134,
-     2135, 2138, 2137, 2140, 2142, 2143, 2129, 2137, 2138, 2132,
-
-     2146, 2144, 2140, 2136, 2143, 2145, 2150, 2145, 2147, 2149,
-     2152, 2149, 2142, 2144, 2147, 2151, 2151, 2153, 2159, 2146,
-     2150, 2154, 2153, 2154, 2155, 2156, 2157, 2158, 2160, 2155,
-     2156, 2163, 2161, 2162, 2160, 2164, 2152, 2161, 2159, 2165,
-     2164, 2164, 2167, 2163, 2157, 2158, 2162, 2165, 2168, 2169,
-     2169, 2170, 2170, 2171, 2172, 2173, 2176, 2174, 2176, 2177,
-     2175, 2167, 2168, 2174, 2171, 2175, 2178, 2179, 2179, 2172,
-     2185, 2180, 2181, 2181, 2178, 2173, 2183, 2177, 2182, 2182,
-     2187, 2184, 2178, 2180, 2187, 2183, 2184, 2188, 2185, 2189,
-     2190, 2189, 2191, 2192, 2193, 2194, 2188, 2191, 2191, 2188,
-
-     2196, 2197, 2200, 2193, 2198, 2192, 2197, 2194, 2201, 2198,
-     2202, 2190, 2196, 2203, 2203, 2200, 2204, 2205, 2206, 2202,
-     2208, 2207, 2211, 2215, 2209, 2210, 2216, 2211, 2201, 2213,
-     2214, 2216, 2219, 2225, 2204, 2205, 2206, 2207, 2209, 2217,
-     2210, 2213, 2214, 2215, 2217, 2208, 2218, 2222, 2224, 2226,
-     2219, 2227, 2228, 2222, 2224, 2218, 2225, 2233, 2229, 2230,
-     2230, 2231, 2232, 2232, 2226, 2234, 2222, 2229, 2235, 2227,
-     2231, 2236, 2235, 2237, 2239, 2233, 2236, 2228, 2241, 2240,
-     2255, 2247, 2242, 2243, 2234, 2240, 2237, 2242, 2242, 2243,
-     2244, 2245, 2255, 2239, 2245, 2246, 2244, 2250, 2250, 2252,
-
-     2241, 2247, 2256, 2246, 2251, 2251, 2253, 2253, 2252, 2254,
-     2254, 2257, 2264, 2258, 2259, 2259, 2264, 2257, 2258, 2251,
-     2256, 2260, 2260, 2261, 2265, 2262, 2267, 2269, 2261, 2266,
-     2251, 2262, 2270, 2266, 2271, 2272, 2273, 2270, 2274, 2275,
-     2276, 2273, 2277, 2278, 2265, 2283, 2267, 2277, 2279, 2279,
-     2272, 2281, 2269, 2284, 2280, 2275, 2274, 2271, 2280, 2282,
-     2276, 2286, 2285, 2283, 2282, 2278, 2281, 2287, 2289, 2288,
-     2290, 2291, 2291, 2286, 2288, 2293, 2294, 2295, 2296, 2284,
-     2285, 2289, 2297, 2293, 2298, 2299, 2287, 2301, 2290, 2300,
-     2302, 2305, 2303,   18, 2307, 2294, 2295, 2296, 2303, 2301,
-
-     2308, 2311, 2316, 2309, 2299, 2297, 2305, 2307, 2298, 2309,
-     2300, 2302, 2315, 2310, 2308, 2310, 2312, 2312, 2313, 2314,
-     2317, 2311, 2314, 2313, 2318, 2315, 2316, 2319, 2319, 2320,
-     2320, 2321, 2323, 2321, 2317, 2322, 2322, 2318, 2324, 2325,
-     2326, 2326, 2328, 2328, 2326, 2329, 2329, 2323, 2330, 2330,
-     2331, 2337, 2325, 2324, 2332, 2332, 2333, 2333, 2334, 2331,
-     2336, 2338, 2331, 2334, 2339, 2336, 2340, 2340, 2341, 2341,
-     2342, 2337, 2343, 2343, 2344, 2346, 2339, 2345, 2345, 2347,
-     2350, 2338, 2348, 2348, 2347, 2349, 2349, 2351, 2352, 2342,
-     2346, 2354, 2344, 2353, 2350, 2356, 2351, 2357, 2357, 2358,
-
-     2356, 2359, 2359, 2360, 2361, 2352, 2362, 2353, 2363, 2361,
-     2354, 2363, 2362, 2364, 2364, 2365, 2365, 2366, 2358, 2367,
-     2368, 2360, 2368, 2370, 2371, 2372, 2372, 2374, 2376, 2364,
-     2375, 2377,   17, 2378, 2367, 2380, 2366, 2378, 2370, 2379,
-     2379, 2382, 2383, 2371, 2381, 2375, 2377, 2374, 2386, 2381,
-     2388, 2376, 2385, 2385, 2380, 2387, 2382, 2383, 2389, 2390,
-     2391, 2392, 2387, 2394, 2388, 2393, 2393, 2395, 2386, 2395,
-     2396, 2399, 2394, 2396, 2398, 2391, 2389, 2390, 2402, 2400,
-     2398, 2401, 2403, 2399, 2400, 2404, 2401, 2392, 2396, 2405,
-     2396, 2406, 2408, 2409, 2405, 2403, 2410, 2408, 2409, 2411,
-
-     2414, 2410, 2412, 2402, 2413, 2415, 2404, 2416, 2412, 2419,
-     2413, 2417, 2420, 2416, 2411, 2422, 2417, 2406, 2418, 2421,
-     2415, 2414, 2421, 2418, 2423, 2420, 2427, 2424, 2425, 2426,
-     2432, 2434, 2450, 2423, 2419, 2422, 2424, 2425, 2426, 2428,
-     2427, 2429, 2430, 2435, 2450, 2428, 2430, 2429, 2436, 2436,
-     2432, 2434, 2435, 2437, 2438, 2438, 2439, 2440, 2440, 2437,
-     2442, 2441, 2444, 2438, 2447, 2439, 2441, 2445, 2446, 2446,
-     2451, 2455, 2448, 2452, 2455, 2453, 2457,    0, 2444, 2447,
-     2442, 2448, 2442, 2445, 2456, 2458, 2451, 2453, 2452, 2456,
-     2459, 2459, 2460, 2460, 2462, 2462, 2457, 2458, 2463, 2464,
-
-     2465, 2463, 2466, 2467, 2464, 2469, 2465, 2472, 2466, 2468,
-     2468, 2471, 2467, 2470, 2470, 2473, 2474, 2474, 2475, 2469,
-     2477, 2472, 2476, 2471, 2475, 2477, 2479, 2486, 2480, 2484,
-     2479, 2480, 2481, 2481, 2473, 2482, 2476, 2483, 2484, 2485,
-     2482, 2487, 2483, 2488, 2488, 2487, 2489, 2486, 2485, 2491,
-     2492, 2493, 2494, 2495, 2491, 2497, 2496, 2498, 2499, 2489,
-     2496, 2502, 2498, 2500, 2499, 2501, 2501, 2495, 2503, 2500,
-     2492, 2493, 2494, 2504, 2506, 2497, 2505, 2507, 2507, 2502,
-     2510, 2505, 2509, 2511, 2512, 2513,    0, 2503, 2511, 2514,
-     2512, 2513, 2504, 2517, 2509, 2506, 2510, 2514, 2515, 2519,
-
-     2515, 2520, 2517, 2521, 2521, 2522, 2523, 2523, 2522, 2525,
-     2527, 2526, 2525, 2519, 2526, 2520, 2528, 2528, 2531, 2532,
-     2533, 2535, 2531, 2534, 2534, 2532, 2538, 2538, 2540, 2542,
-     2535, 2543, 2533, 2546, 2547, 2548, 2527, 2549, 2546, 2550,
-     2551, 2551, 2549, 2542, 2550, 2555, 2540, 2543, 2553, 2553,
-     2556, 2555, 2557, 2557, 2559, 2558, 2548, 2560, 2562,    0,
-     2547, 2563, 2560, 2564, 2563, 2568, 2565, 2566, 2566, 2571,
-     2556, 2558, 2576, 2569, 2568, 2564, 2559, 2562, 2565, 2569,
-     2570, 2572, 2574, 2574, 2577, 2575, 2570, 2571, 2575, 2579,
-     2579, 2576, 2580, 2580, 2581, 2582, 2572, 2583, 2584, 2581,
-
-     2585, 2586, 2577, 2586, 2587, 2585, 2583, 2588, 2589, 2590,
-     2591, 2584, 2592, 2582, 2590, 2594, 2594, 2593, 2587, 2598,
-     2589, 2588, 2593, 2595, 2595, 2596, 2596, 2597, 2597, 2599,
-     2591, 2598, 2592, 2600, 2601, 2601, 2602, 2602, 2600, 2603,
-     2603, 2604, 2605, 2606, 2607, 2608,    0, 2599, 2611, 2609,
-     2610, 2610, 2614, 2604, 2619, 2606, 2612, 2612, 2613, 2613,
-     2615, 2615, 2605, 2614, 2607, 2609, 2608, 2611, 2616, 2617,
-     2618, 2621, 2620, 2622, 2619, 2624, 2617, 2620, 2623, 2623,
-     2616, 2626, 2618, 2627, 2624, 2625, 2625, 2628, 2629, 2631,
-     2630, 2621, 2632, 2622, 2632, 2639, 2633, 2634, 2634, 2636,
-
-     2628, 2635, 2637, 2627, 2630, 2640, 2641, 2626, 2633, 2643,
-     2635, 2631, 2629, 2639, 2636, 2642, 2644, 2637, 2642, 2645,
-     2653, 2644, 2655, 2643, 2645, 2646, 2646, 2640, 2654, 2641,
-     2647, 2647, 2648, 2648, 2650, 2650, 2652, 2652, 2653, 2654,
-     2656, 2655, 2658, 2659, 2660, 2661, 2666, 2662, 2663, 2664,
-     2665, 2664,    0, 2667, 2673, 2656, 2662, 2668, 2668, 2670,
-     2672, 2659, 2658, 2670, 2666, 2661, 2660, 2679, 2663, 2674,
-     2665, 2667, 2671, 2671, 2672, 2677, 2673, 2680, 2674, 2675,
-     2675, 2678, 2678, 2681, 2677, 2679, 2682, 2683, 2684, 2685,
-     2687, 2688, 2686, 2682, 2691, 2680, 2689, 2689, 2688, 2690,
-
-     2690, 2681, 2683, 2692, 2693, 2698, 2684, 2685, 2686, 2687,
-     2693, 2695, 2695, 2697, 2691, 2696, 2696, 2699, 2700, 2697,
-     2701, 2692, 2702, 2698, 2703, 2704, 2704, 2705, 2706, 2703,
-     2707, 2708, 2709, 2700,    0, 2699, 2702, 2716, 2710, 2701,
-     2712, 2712, 2708, 2710, 2711, 2721, 2711, 2705, 2706, 2713,
-     2707, 2713, 2709, 2714, 2714, 2718, 2716, 2719, 2720, 2724,
-     2728, 2722, 2723, 2725, 2718, 2721, 2722, 2723, 2729, 2730,
-     2720, 2733, 2730, 2731, 2731, 2732, 2719, 2734, 2734, 2724,
-     2728, 2735, 2725, 2736, 2737, 2739, 2729, 2740, 2737, 2733,
-     2732, 2741, 2735, 2740, 2743, 2741, 2742, 2742, 2736, 2745,
-
-     2739, 2746, 2747, 2748, 2748, 2750, 2751, 2743, 2752, 2753,
-     2753, 2755, 2752, 2759, 2745, 2751, 2760, 2750, 2754, 2754,
-     2757, 2746, 2747, 2756, 2756, 2757, 2758, 2761, 2760, 2759,
-     2755, 2762, 2762, 2767, 2767, 2758, 2768, 2769, 2769, 2770,
-     2771, 2772, 2773, 2776, 2776, 2777, 2774, 2761, 2775, 2778,
-     2789, 2773, 2770, 2771, 2772, 2774, 2783, 2775, 2768, 2780,
-     2780, 2783, 2785, 2786, 2778, 2777, 2787, 2785, 2788, 2789,
-     2790, 2787, 2791, 2793, 2797, 2801, 2788, 2786, 2795, 2790,
-     2791, 2796, 2800, 2795, 2798, 2798, 2796, 2800, 2793, 2797,
-     2799, 2799, 2802, 2802, 2801, 2803, 2804, 2805, 2806, 2807,
-
-        0, 2804, 2803, 2808, 2810, 2807, 2809, 2809, 2808, 2811,
-     2812, 2812, 2813, 2813, 2811, 2805, 2806, 2816, 2819, 2810,
-     2817, 2817, 2818, 2819, 2819, 2818, 2820, 2821, 2822, 2823,
-     2816, 2820, 2821, 2824, 2825, 2823, 2826, 2824, 2827, 2825,
-     2828, 2829, 2822, 2830, 2831, 2826, 2832, 2833, 2828, 2830,
-     2831, 2832, 2837, 2827, 2834, 2834, 2836, 2837, 2838, 2833,
-     2840, 2838, 2829, 2836, 2842, 2843, 2844, 2845, 2846, 2842,
-     2843, 2844, 2840, 2847, 2848, 2849, 2849, 2850, 2854, 2851,
-     2859, 2846, 2847, 2848, 2851, 2845, 2850, 2855, 2856, 2860,
-     2861,    0, 2862, 2855, 2856, 2864, 2854, 2863, 2863, 2859,
-
-     2865, 2870, 2864, 2867, 2868, 2869, 2869, 2871, 2873, 2860,
-     2861, 2862, 2867, 2868, 2872, 2872, 2870, 2875, 2877, 2865,
-     2878, 2880, 2871, 2881, 2878, 2879, 2879, 2873, 2882, 2881,
-     2883, 2884, 2875, 2886, 2882, 2885, 2885, 2884, 2877, 2887,
-     2888, 2886, 2890, 2891, 2893, 2888, 2880, 2896, 2883, 2894,
-     2893, 2890, 2894, 2895, 2897, 2897, 2891, 2895, 2898, 2900,
-     2900, 2896, 2901, 2954, 2887, 2902, 2902, 2903, 2903, 2905,
-     2905, 2906, 2907, 2898, 2908, 2906, 2912, 2907, 2910, 2910,
-     2901, 2913, 2914, 2908, 2915, 2916, 2913, 2918, 2954, 2915,
-     2915, 2919, 2919, 2925, 2914, 2929, 2912, 2916, 2921, 2921,
-
-     2922, 2922, 2923, 2923, 2926, 2924, 2925, 2918, 2924, 2928,
-     2928, 2931, 2935, 2929, 2932, 2932, 2937, 2926, 2933, 2933,
-     2934, 2934, 2936, 2936, 2938, 2939, 2940, 2935, 2949, 2937,
-        0, 2931, 2940, 2941, 2941, 2945, 2942, 2950, 2946, 2939,
-     2942, 2945, 2938, 2946, 2948, 2951, 2952, 2953, 2964, 2948,
-     2948, 2949, 2952, 2953, 2955, 2956, 2956, 2950, 2955, 2959,
-     2961, 2966, 2966, 2962, 2959, 2951, 2962, 2965, 2961, 2967,
-     2965, 2968, 2969, 2964, 2970, 2971, 2968, 2972, 2972, 2973,
-     2974, 2975, 2976, 2974, 2977, 3004, 2967, 2967, 2981, 2971,
-     2969, 2974, 2977, 2973, 2970, 2975,    0, 2979, 2991, 2980,
-
-     3004, 2976, 2979, 2979, 2980, 2980, 2988, 2981, 2982, 2982,
-     2983, 2983, 2984, 2984, 2985, 2985, 2986, 2986, 2987, 2987,
-     2989, 2990, 2988, 2992, 2991, 2989, 2993, 2994, 2995, 2996,
-     2997, 2993, 2998, 2995, 2999, 3001, 3001, 2992, 2996, 3002,
-     3002, 2990, 3003, 3005, 3005, 3003, 2994, 3006, 3007,    0,
-     2997, 3010, 2998, 3006, 2999, 3009, 3009, 3012, 3010, 3011,
-     3011, 3015, 3012, 3014, 3014, 3016, 3007, 3017, 3018, 3020,
-     3015, 3021, 3021, 3024, 3016, 3025, 3017, 3018, 3022, 3022,
-     3023, 3026, 3024, 3027, 3023, 3028, 3030, 3020, 3031, 3032,
-     3028, 3028, 3026, 3032, 3025, 3036, 3038, 3031, 3027, 3030,
-
-     3036, 3037, 3037, 3040, 3040, 3041, 3042, 3043, 3045, 3045,
-     3038, 3046, 3047, 3051, 3053, 3055, 3052, 3058, 3060, 3041,
-     3046, 3052, 3056, 3053, 3047, 3043,    0, 3062, 3056, 3058,
-     3068, 3042, 3062, 3064, 3064, 3055, 3063, 3065, 3051, 3060,
-     3067, 3063, 3069, 3068, 3076, 3067, 3065, 3070, 3070, 3072,
-     3072, 3070, 3073, 3073, 3074, 3074, 3069, 3075, 3077,    0,
-     3078, 3080, 3084, 3081, 3076, 3078, 3075, 3080, 3081, 3082,
-     3083, 3083, 3085, 3086, 3082, 3088, 3087, 3077, 3090, 3089,
-     3084, 3087, 3091, 3091, 3085, 3089, 3093, 3094, 3096, 3096,
-     3093, 3095, 3094, 3088, 3086, 3097, 3095, 3098, 3099, 3101,
-
-     3103, 3103, 3105, 3090, 3106, 3107, 3108, 3109, 3110, 3111,
-     3108, 3114, 3098, 3099, 3097, 3105, 3109, 3106, 3107, 3101,
-     3113, 3112, 3115, 3115, 3110, 3113, 3116, 3117, 3111, 3112,
-     3118, 3114, 3119, 3119, 3121, 3116, 3120, 3120, 3124, 3130,
-     3125, 3127, 3134, 3124, 3124, 3117, 3135, 3127, 3128, 3128,
-     3132, 3132, 3136, 3121, 3125, 3137, 3118, 3136, 3134, 3138,
-     3130, 3142, 3135, 3143, 3138, 3141, 3141, 3144, 3145, 3146,
-     3149, 3137, 3143, 3144, 3148, 3148, 3150, 3151, 3151, 3153,
-     3155, 3142, 3157, 3156, 3149, 3153, 3159, 3157, 3146, 3156,
-     3162, 3145, 3160, 3160, 3163, 3150, 3161, 3161, 3164, 3164,
-
-     3155, 3165, 3166, 3167, 3168, 3162, 3169, 3170, 3159, 3171,
-     3168, 3166, 3165, 3173, 3163, 3172, 3172, 3174, 3164, 3170,
-     3174, 3175, 3180, 3167, 3175, 3169, 3176, 3176, 3173, 3171,
-     3181, 3182, 3183, 3183, 3180, 3184, 3185, 3182, 3184, 3186,
-     3188, 3190, 3185, 3189, 3189, 3188, 3190, 3191, 3192, 3196,
-     3181, 3193, 3194, 3194, 3192, 3197, 3198, 3186, 3199, 3200,
-     3200, 3196, 3202, 3201, 3217, 3203, 3191, 3208, 3193, 3193,
-     3217, 3199, 3208, 3197, 3203, 3205, 3205, 3209, 3202, 3206,
-     3206, 3198, 3201, 3207, 3207, 3210, 3211, 3211, 3212, 3212,
-     3210, 3209, 3213, 3213, 3214, 3214, 3215, 3216, 3218, 3221,
-
-     3221, 3222, 3227, 3218, 3224, 3224, 3225, 3225, 3229, 3215,
-     3230, 3232, 3231, 3233, 3233, 3235, 3235, 3222, 3236, 3237,
-     3238, 3227, 3239, 3216, 3241, 3241, 3240, 3242, 3242, 3244,
-     3229, 3231, 3230, 3232, 3238, 3240, 3246, 3245, 3237, 3247,
-     3248, 3251, 3239, 3245, 3236, 3248, 3256, 3244, 3252, 3252,
-     3254, 3254, 3255, 3257, 3258, 3259, 3246, 3255, 3247, 3257,
-     3256, 3265, 3251, 3259, 3260, 3260, 3258, 3261, 3266, 3263,
-     3264, 3267, 3261, 3263, 3268, 3264, 3267, 3269, 3272, 3271,
-     3273, 3265, 3274, 3269, 3283, 3276, 3268, 3271, 3266, 3277,
-     3278, 3279,    0, 3280, 3282, 3284, 3287, 3272, 3280, 3282,
-
-     3273, 3284, 3274, 3276, 3283, 3277, 3285, 3278, 3278, 3289,
-     3288, 3285, 3279, 3288, 3293, 3293, 3287, 3294, 3294, 3295,
-     3300, 3300, 3289, 3295, 3301, 3302, 3303, 3303, 3305, 3301,
-     3308, 3308, 3309, 3309, 3313, 3309, 3310, 3310, 3313, 3310,
-     3311, 3311, 3315, 3305, 3302, 3312, 3312, 3315, 3312, 3316,
-     3317, 3317, 3318, 3319, 3322, 3322, 3323, 3324, 3316, 3325,
-     3326, 3326, 3327, 3330, 3325, 3331, 3333, 3319, 3334, 3332,
-     3318, 3336, 3331, 3332, 3337, 3333, 3323, 3324, 3339, 3337,
-     3338, 3338, 3327, 3334, 3340, 3340, 3343, 3339, 3330, 3336,
-     3341, 3341, 3342, 3342, 3344, 3345, 3348, 3346, 3349, 3344,
-
-     3347, 3343, 3346, 3346, 3345, 3350, 3347, 3345, 3353, 3351,
-     3352, 3354, 3354, 3349, 3351, 3352, 3355, 3356, 3357, 3357,
-     3359, 3348, 3355, 3356, 3358, 3358, 3350, 3353, 3360, 3363,
-     3363, 3365, 3365, 3360, 3366, 3359, 3368, 3370, 3370, 3371,
-     3371, 3372, 3372, 3366, 3373, 3373, 3375, 3375, 3376, 3376,
-     3377, 3377, 3378, 3378, 3368, 3379, 3381, 3382, 3382, 3383,
-     3383, 3384, 3385, 3386, 3391, 3381, 3388, 3388, 3389, 3392,
-     3384, 3390, 3390, 3393, 3385, 3394, 3394, 3395, 3395, 3391,
-     3397, 3379, 3392, 3386, 3401, 3393, 3403, 3389, 3398, 3398,
-     3402, 3404, 3404, 3402, 3407, 3397, 3405, 3407, 3408, 3409,
-
-     3410, 3411, 3401, 3412, 3408, 3410, 3413, 3416, 3423, 3415,
-     3420, 3424, 3403, 3409, 3405, 3415, 3416, 3438, 3438, 3419,
-     3411, 3412, 3413, 3419, 3433, 3420, 3437, 3434, 3443, 3433,
-     3434, 3424, 3439, 3439, 3423, 3441, 3441, 3444, 3445, 3437,
-     3446, 3448, 3445, 3450, 3452, 3451, 3444, 3454, 3453, 3452,
-     3453, 3443, 3455, 3455, 3456, 3448, 3451, 3457, 3459, 3458,
-     3446, 3460, 3454, 3461, 3462, 3464, 3450, 3456, 3463, 3465,
-     3464, 3474, 3467, 3462, 3459, 3469, 3457, 3458, 3461, 3466,
-     3463, 3468, 3468, 3470, 3466, 3474, 3460, 3475, 3470, 3477,
-     3465, 3467, 3476, 3476, 3482, 3469, 3478, 3478, 3477, 3479,
-
-     3479, 3480, 3480, 3481, 3481, 3483, 3484, 3475, 3487, 3484,
-     3485, 3486, 3488, 3482, 3489, 3485, 3486, 3490, 3491, 3492,
-     3489, 3493, 3493, 3494, 3492, 3483, 3499, 3488, 3495, 3495,
-     3491, 3490, 3500, 3487, 3496, 3496, 3498, 3498, 3501, 3501,
-     3503, 3499, 3505, 3494, 3508, 3508, 3509, 3509, 3510, 3511,
-     3514, 3500, 3512, 3513, 3515, 3503, 3510, 3516, 3512, 3513,
-     3505, 3517, 3518, 3518, 3514, 3524, 3517, 3515, 3511, 3520,
-     3520, 3525, 3530, 3527, 3528, 3531, 3516, 3532, 3528, 3535,
-     3531, 3533, 3534, 3536, 3537, 3541, 3524, 3527, 3536, 3537,
-     3542, 3525, 3530, 3543, 3533, 3534, 3532, 3546, 3535, 3538,
-
-     3538, 3544, 3544, 3546, 3545, 3541, 3547, 3547, 3542, 3545,
-     3548, 3549, 3543, 3550, 3551, 3548, 3549, 3552, 3550, 3554,
-     3554, 3555, 3559, 3552, 3556, 3556, 3555, 3558, 3560, 3561,
-     3562, 3558, 3563, 3551, 3564, 3560, 3572, 3565, 3563, 3567,
-     3567, 3559, 3569, 3569, 3573, 3570, 3571, 3574, 3561, 3562,
-     3565, 3571, 3577, 3564, 3570, 3572, 3576, 3570, 3575, 3575,
-     3574, 3576, 3579, 3573, 3581, 3577, 3580, 3580, 3582, 3582,
-     3583, 3583, 3584, 3585, 3586, 3587, 3587, 3584,    0, 3588,
-     3585, 3590, 3590, 3581, 3588, 3589, 3593, 3589, 3579, 3591,
-     3592, 3595, 3598, 3586, 3594, 3602, 3591, 3592, 3600, 3594,
-
-     3597, 3597, 3601, 3600, 3603, 3593, 3607, 3601, 3604, 3604,
-     3595, 3598, 3606, 3606, 3602, 3608, 3609, 3609, 3610, 3610,
-     3611, 3613, 3613, 3603, 3615, 3607, 3621, 3611, 3614, 3614,
-     3617, 3615, 3620, 3622, 3608, 3617,    0, 3620, 3623, 3623,
-     3624, 3624,    0,    0,    0, 3621,    0,    0,    0,    0,
-        0,    0, 3622, 3628, 3628, 3628, 3628, 3628, 3628, 3628,
-     3629, 3629, 3629, 3629, 3629, 3629, 3629, 3630, 3630, 3630,
-     3630, 3630, 3630, 3630, 3631, 3631, 3631, 3631, 3631, 3631,
-     3631, 3632, 3632, 3632, 3632, 3632, 3632, 3632, 3633, 3633,
-     3633, 3633, 3633, 3633, 3633, 3634, 3634, 3634, 3634, 3634,
-
-     3634, 3634, 3636, 3636,    0, 3636, 3636, 3636, 3636, 3637,
-     3637,    0,    0,    0, 3637, 3637, 3638, 3638,    0,    0,
-     3638,    0, 3638, 3639,    0,    0,    0,    0,    0, 3639,
-     3640, 3640,    0,    0,    0, 3640, 3640, 3641,    0,    0,
-        0,    0,    0, 3641, 3642, 3642,    0, 3642, 3642, 3642,
-     3642, 3643,    0,    0,    0,    0,    0, 3643, 3644, 3644,
-        0,    0,    0, 3644, 3644, 3645, 3645,    0, 3645, 3645,
-     3645, 3645, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-
-     3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-     3627, 3627, 3627
+      240,  243,  235,  241,  242,  238,  243,  244,  245,  239,
+
+      246,  241,  247,  250,  237,  248,  244,  242,  239,  252,
+      248,  248,  249,  245,  240,  251,  246,  249,  253,  251,
+      254,  250,  247,  255,  253,  256,  258,  257,  258,  255,
+      259,  252,  257,  263,  261,  262,  264,  266,  254,  254,
+      261,  262,  264,  265,  269,  256,  267,  267,  272,  259,
+      269,  266,  263,  268,  268,  265,  270,  271,  273,  271,
+      274,  275,  270,  273,  277,  276,  279,  292,  269,  278,
+      292,  272,  274,  276,  278,  280,  271,  281,  285,  287,
+      275,  280,  282,  281,  277,  283,  284,  282,  286,  279,
+      283,  288,  284,  285,  290,  289,  296,  287,  291,  293,
+
+      299,  293,  286,  289,  291,  288,  294,  294,  295,  297,
+      297,  295,  298,  298,  296,  300,  299,  301,  302,  290,
+      301,  305,  302,  303,  304,  307,  169,  308,  309,  317,
+      300,  307,  303,  304,  309,  310,  311,  310,  318,  312,
+      305,  308,  311,  312,  313,  313,  314,  315,  316,  317,
+      319,  314,  320,  315,  316,  325,  318,  321,  321,  322,
+      312,  323,  322,  324,  326,  320,  328,  324,  327,  327,
+      167,  319,  329,  316,  325,  329,  330,  331,  332,  323,
+      335,  332,  326,  331,  328,  333,  336,  340,  330,  335,
+      337,  338,  329,  341,  338,  337,  338,  333,  334,  339,
+
+      340,  166,  339,  344,  336,  341,  344,  334,  347,  338,
+      334,  342,  338,  342,  342,  334,  334,  334,  334,  343,
+      345,  345,  346,  347,  343,  343,  348,  349,  350,  351,
+      352,  352,  354,  354,  356,  353,  357,  350,  351,  346,
+      353,  348,  346,  358,  349,  349,  355,  355,  358,  359,
+      360,  357,  361,  362,  363,  364,  364,  366,  364,  356,
+      363,  359,  372,  375,  375,  367,  369,  364,  362,  360,
+      367,  369,  361,  368,  364,  370,  372,  366,  371,  368,
+      370,  371,  373,  371,  374,  373,  370,  378,  376,  377,
+      377,  381,  378,  374,  376,  383,  416,  382,  373,  384,
+
+      382,  373,  385,  373,  379,  379,  388,  379,  390,  387,
+      383,  381,  387,  379,  384,  391,  385,  379,  382,  394,
+      388,  416,  379,  390,  391,  379,  380,  380,  387,  380,
+      392,  393,  395,  396,  397,  392,  392,  393,  398,  401,
+      394,  400,  380,  397,  393,  380,  164,  380,  396,  380,
+      389,  395,  389,  389,  399,  405,  402,  398,  407,  401,
+      399,  406,  389,  389,  389,  389,  389,  400,  403,  389,
+      402,  404,  408,  407,  403,  405,  404,  408,  403,  410,
+      409,  406,  411,  411,  412,  410,  413,  414,  418,  417,
+      415,  420,  421,  418,  404,  409,  415,  422,  413,  419,
+
+      419,  414,  419,  423,  412,  417,  162,  424,  421,  424,
+      425,  420,  430,  422,  431,  425,  426,  423,  426,  426,
+      427,  428,  429,  429,  427,  428,  432,  433,  437,  431,
+      434,  430,  438,  440,  437,  443,  426,  440,  435,  160,
+      428,  438,  432,  439,  434,  433,  435,  435,  439,  442,
+      441,  444,  448,  449,  449,  442,  443,  444,  435,  441,
+      435,  436,  446,  445,  447,  446,  436,  445,  450,  447,
+      451,  451,  448,  453,  436,  436,  454,  454,  436,  436,
+      452,  450,  436,  455,  456,  452,  453,  457,  456,  455,
+      458,  459,  460,  462,  461,  461,  459,  460,  463,  464,
+
+      465,  466,  457,  461,  466,  462,  468,  469,  467,  472,
+      468,  458,  465,  467,  470,  470,  471,  464,  463,  469,
+      474,  471,  473,  473,  476,  476,  478,  479,  480,  481,
+      472,  482,  483,  484,  485,  479,  487,  483,  481,  488,
+      489,  491,  474,  495,  490,  492,  485,  478,  495,  480,
+      490,  492,  482,  484,  487,  491,  487,  488,  493,  494,
+      489,  496,  497,  498,  499,  494,  498,  493,  500,  503,
+      497,  501,  506,  497,  504,  496,  502,  504,  499,  505,
+      501,  509,  502,  500,  508,  505,  506,  507,  511,  503,
+      510,  513,  507,  511,  510,  512,  513,  514,  515,  516,
+
+      519,  520,  509,  505,  535,  522,  508,  535,  521,  522,
+      512,  523,  516,  514,   85,  525,  524,  515,  517,  517,
+      519,  524,  520,  521,  517,  526,  517,  528,  529,  526,
+      523,  525,  517,  529,  517,  530,  527,  517,  517,  531,
+      533,  527,  528,  534,  517,  527,  532,  536,  531,  537,
+      539,  530,  532,  529,  530,  533,  541,  532,  543,  534,
+      538,  538,  540,  540,  542,  544,  544,  545,  546,  537,
+      536,  541,  547,  543,  548,  539,  542,  547,  549,  550,
+      553,  551,  559,  548,  554,  558,  545,  551,  554,  553,
+      546,  555,  556,  557,  550,  555,  560,  549,  556,  561,
+
+      558,  559,  562,  563,  564,  557,  565,  563,  565,  566,
+      560,  567,  568,  568,  561,  569,  570,  564,  571,  567,
+      562,  569,  572,  573,  571,  574,  573,  575,  570,  577,
+      576,  578,  577,  566,  572,  576,  579,   80,  580,  574,
+      578,  581,  575,  580,  580,  582,  582,  578,  583,  583,
+      578,  584,  579,  589,  581,  585,  585,  584,  586,  586,
+      587,  590,  588,  591,  594,  593,  587,  588,  588,  592,
+      593,  589,  592,  595,  596,  591,  598,  596,  599,  597,
+      601,  595,  590,  594,  597,  600,  601,  602,  603,  600,
+      604,  605,  603,  607,  607,  606,  605,  599,  608,  598,
+
+      609,  610,  612,  611,  613,  614,  610,  602,  604,  606,
+      615,  614,  616,  608,  618,  615,  620,  617,  612,  621,
+      617,  609,  611,  624,  613,  617,  616,  625,  617,  617,
+      619,  619,  618,  622,  620,  621,  623,  624,  622,  627,
+      628,  623,  625,  629,  630,  627,  629,  631,  630,  628,
+      632,  633,  631,  632,  635,  634,  633,  636,  638,  639,
+      637,  640,  640,  638,  636,  641,  642,  643,  644,  645,
+      630,  634,  635,  637,  641,  646,  647,  648,  645,  639,
+      653,   75,  647,  648,  644,  642,  649,  646,  643,  649,
+      650,  650,  651,  650,  652,  651,  654,  655,  653,  652,
+
+      656,  657,  658,  662,  659,  656,  660,  664,  658,  659,
+      654,  655,  660,  661,  663,  670,  661,  666,  667,  663,
+      657,  665,   74,  664,  668,  673,  665,  665,  662,  668,
+      666,  667,  669,  671,  670,  672,  674,  674,  669,  675,
+      672,  676,  671,  668,  668,  673,  675,  677,  676,  678,
+      677,  679,  680,  681,  683,  678,  685,  680,  681,  681,
+      682,  682,  684,  679,  684,  677,  686,  680,  686,  687,
+      688,  689,  690,  691,  692,  685,  694,  693,  697,  683,
+      692,  693,  695,  696,  698,  694,  700,  687,  688,  689,
+      702,  690,  699,  691,  701,  699,  697,  695,  696,  703,
+
+      701,  700,  704,  698,  699,  705,  706,  707,  708,  710,
+      702,  709,  708,  703,  704,  711,  712,  713,  714,  717,
+      717,  720,   68,  715,  705,  710,  707,  706,  715,  709,
+      716,  719,  721,  711,  712,  712,  713,  714,  718,  722,
+      720,  723,  718,  721,  716,  719,  723,  724,  725,  726,
+      727,  728,  729,  722,  730,  731,  728,  727,  733,  729,
+      731,  732,  726,  724,  734,  735,  732,  725,  736,  738,
+      737,  734,  743,  747,  735,  740,  733,  739,  730,  737,
+      740,  738,  736,  739,  741,  742,  743,  741,  744,  742,
+      745,  754,  746,  752,  747,  748,  748,  744,  749,  749,
+
+      750,  750,  752,  751,  756,  745,  746,  749,  751,  755,
+      754,  758,  757,  759,  760,  755,  757,  764,  762,  761,
+      763,  765,  766,  758,  756,  761,  762,  763,  769,  778,
+      775,  772,  760,  820,  776,  764,  780,  781,  759,  775,
+      776,  820,  766,  769,  779,  780,  765,  767,  772,  767,
+      779,  778,  767,  781,  782,  786,  767,  785,  782,  767,
+      783,  783,  784,  784,  787,  788,  767,  767,  785,  767,
+      789,  791,  792,  786,  793,  796,  789,  792,  787,  794,
+      795,  799,  802,   63,  795,  788,  790,  790,  790,  798,
+      790,  791,  797,  790,  798,  793,  797,  794,  790,  796,
+
+      799,  800,  801,  805,  790,  790,  800,  802,  803,  804,
+      805,  803,  797,  807,  804,  804,  808,  801,  806,  806,
+      810,  808,  809,  809,  811,  810,  812,  811,  807,  813,
+      813,  812,  814,  815,  814,  816,  817,  818,  822,  819,
+      817,  821,  821,  824,  824,  815,  823,  825,  827,  826,
+      828,  830,  830,  822,  816,  835,  828,  818,  819,  829,
+      823,  826,  831,  834,  829,  825,  833,  831,  831,  834,
+      827,  833,  836,  838,  835,  837,  840,  841,  836,  838,
+      837,  839,  840,  844,  839,  841,  842,  842,  843,  843,
+      845,  844,  846,  848,  847,  849,  850,  846,  847,  851,
+
+      848,  852,  852,  854,  856,  853,  855,  855,  845,  857,
+      856,  854,  850,  849,  853,  858,  860,  861,  851,  862,
+      864,  865,  867,  863,  865,  860,  861,  857,  863,  864,
+      866,  868,  869,  870,  858,  866,  867,  872,  874,  871,
+      875,  869,  877,  862,  871,  871,  870,  873,  873,  876,
+      878,  872,  879,  874,  883,  879,  868,  885,  876,  875,
+      881,  886,  881,  879,  882,  882,  877,  884,  878,  887,
+      888,  889,  884,  890,  891,  883,  892,  893,  885,  894,
+      892,  886,  890,   58,  895,  896,  898,  897,  899,  887,
+      895,  889,  888,  902,  896,  893,  900,  891,  894,  897,
+
+      901,  902,  898,  903,  904,  906,  901,  899,  907,  904,
+      900,  905,  905,  908,  909,  910,  911,  903,  912,  913,
+      916,  914,  908,  910,  906,  915,  916,  917,  907,  918,
+      920,  919,  921,  917,  909,  924,  911,  919,  913,  924,
+      912,  914,  922,  918,  920,  915,  925,  923,  922,  926,
+      927,  928,  921,  923,  930,  927,  929,  929,  931,  932,
+      930,  926,  932,  933,  931,  925,  934,  935,  936,  926,
+      937,  937,  928,  935,  938,  939,  942,  945,  941,  934,
+      939,  933,  940,  941,  941,  940,  943,  946,  936,  948,
+      943,  942,  938,  944,  944,  950,  947,  951,  940,  945,
+
+      940,  947,  953,  954,  955,  957,  957,  946,  948,  958,
+      964,  951,  959,  958,  961,  953,  960,  960,  962,  950,
+      966,  963,  962,  954,  964,  955,  956,  959,  965,  956,
+       57,  956,  968,  965,  966,  956,  963,  956,  967,  961,
+      969,  968,  956,  967,  967,  970,  973,  956,  971,  970,
+      972,  974,  975,  976,  969,  972,  974,  977,  973,  978,
+       52,  970,  979,  971,  980,  972,  975,  979,  978,  982,
+      980,  977,  981,  983,  976,  982,  986,  981,  985,  983,
+      984,  984,  986,  985,  987,  988,  991,  989,  992,  993,
+      994,  995,  995,  992,  996,  998,  999, 1000,  991,  996,
+
+     1001,  997,  994,  993,  988,  989,  987,  990,  990,  997,
+      999,  998, 1002,  990, 1003,  990, 1000, 1004, 1005, 1001,
+     1003,  990, 1004, 1006, 1007, 1008,  990,  990, 1002, 1009,
+     1005, 1010, 1010,  990, 1011, 1012, 1014, 1016, 1011, 1017,
+     1007, 1006, 1014, 1008, 1017, 1015, 1018, 1009, 1015, 1020,
+     1021, 1019, 1023, 1024, 1020, 1012, 1016, 1019, 1025, 1018,
+     1026, 1023, 1024, 1027, 1028, 1029, 1026, 1030, 1031, 1021,
+     1029, 1032, 1027, 1033, 1025, 1034, 1037, 1035, 1042, 1043,
+     1040, 1045, 1031, 1028, 1034, 1033, 1035, 1030, 1036, 1038,
+     1046, 1032, 1042, 1037, 1036, 1038, 1040, 1044, 1047, 1043,
+
+     1045, 1049, 1044, 1048, 1046, 1050, 1049, 1053, 1054, 1056,
+     1050, 1058, 1053, 1055, 1055, 1056, 1047, 1054, 1048, 1057,
+     1058, 1059, 1060, 1062, 1063, 1057, 1066, 1065, 1065, 1063,
+     1063, 1065, 1068, 1069, 1067, 1060, 1059, 1067, 1070, 1062,
+     1071, 1066, 1072, 1074, 1073, 1075, 1068, 1077, 1082, 1074,
+     1076, 1082, 1078, 1069, 1070, 1072, 1076, 1078, 1071, 1073,
+     1079, 1083, 1077, 1081, 1081, 1075, 1084, 1085, 1086, 1087,
+     1088, 1084, 1085, 1090, 1079, 1088, 1089, 1092, 1087, 1093,
+     1094, 1089, 1083, 1092, 1086, 1090, 1094, 1095, 1096, 1096,
+     1097, 1098, 1101, 1095, 1099, 1093, 1102, 1099, 1103, 1097,
+
+     1100, 1100, 1104, 1105,   47, 1104, 1106, 1107, 1108, 1098,
+     1101, 1116, 1106, 1107, 1108, 1102, 1105, 1109, 1103, 1110,
+     1111, 1113, 1109, 1112, 1110, 1115, 1111, 1113, 1112, 1116,
+     1115, 1117, 1118, 1121, 1119, 1120, 1120, 1122, 1118, 1119,
+     1123, 1124, 1121, 1125, 1126, 1123, 1122, 1126, 1129, 1127,
+     1128, 1117, 1127, 1129, 1130, 1131, 1132, 1133, 1134, 1124,
+     1138, 1128, 1125, 1133, 1134, 1135, 1136, 1131, 1137, 1137,
+     1139, 1136, 1130, 1140, 1141, 1132, 1143, 1142, 1144, 1138,
+     1135, 1142, 1145, 1146, 1139, 1140, 1148, 1144, 1149, 1149,
+     1150, 1151, 1141, 1153, 1143, 1152, 1151, 1155, 1150, 1156,
+
+     1152, 1145, 1158, 1157, 1161, 1148, 1162, 1158, 1146, 1159,
+     1164, 1155, 1162, 1153, 1156, 1157, 1160, 1160, 1159, 1163,
+     1168, 1166, 1165, 1166, 1161, 1163, 1164, 1165, 1167, 1169,
+     1170, 1171, 1172, 1167, 1168, 1170, 1175, 1173, 1174, 1177,
+     1177, 1179, 1178, 1169, 1173, 1180, 1171, 1182, 1181, 1186,
+     1186, 1172, 1183, 1174, 1181, 1175, 1178, 1183, 1185, 1179,
+     1180, 1190, 1185, 1189, 1187, 1192, 1183, 1182, 1183, 1187,
+     1189, 1183, 1188, 1188, 1191, 1190, 1193, 1191, 1194, 1196,
+     1195, 1197, 1198, 1200, 1192, 1195, 1199, 1194, 1198, 1201,
+     1202, 1199, 1207, 1197, 1193, 1204, 1204, 1200, 1196, 1205,
+
+     1201, 1206, 1208, 1211, 1205, 1212, 1206, 1208, 1210, 1202,
+     1209, 1213, 1207, 1214, 1209, 1216, 1214, 1210, 1211, 1215,
+     1212, 1217, 1216, 1218, 1219, 1214, 1220, 1224, 1222, 1221,
+     1213, 1223, 1225, 1217, 1215, 1221, 1227, 1223, 1228, 1226,
+     1230, 1229, 1218, 1222, 1220, 1219, 1231, 1224, 1226, 1232,
+     1233, 1227, 1225, 1229, 1234, 1236, 1233, 1228, 1237, 1230,
+     1239, 1236, 1238, 1240, 1232, 1241, 1243, 1242, 1239, 1245,
+     1299, 1231, 1242, 1237, 1234, 1246, 1238, 1247, 1243, 1244,
+     1250, 1241, 1299, 1240, 1244, 1244, 1248, 1248, 1245, 1246,
+     1247, 1249, 1249, 1250, 1251, 1252, 1249, 1253, 1253, 1249,
+
+     1249, 1252, 1254, 1251, 1249, 1256, 1255, 1254, 1257, 1260,
+     1249, 1256, 1258, 1257, 1249, 1255, 1263, 1258, 1259, 1259,
+     1261, 1261, 1262, 1264, 1266, 1262, 1265, 1262, 1267, 1268,
+     1260, 1269, 1265, 1266, 1268, 1270, 1263, 1271, 1272, 1275,
+     1276, 1264, 1273, 1271, 1272, 1269, 1274, 1273, 1267, 1276,
+     1274, 1278, 1275, 1270, 1276, 1285, 1276, 1277, 1276, 1281,
+     1276, 1284, 1277, 1279, 1279, 1278, 1280, 1280, 1283, 1280,
+     1281, 1286, 1283, 1287, 1288, 1285, 1284, 1289, 1290, 1288,
+     1288, 1292, 1287, 1291, 1293, 1294, 1289, 1295, 1291, 1286,
+     1297, 1296,   18, 1293, 1300, 1292, 1297, 1298, 1298, 1301,
+
+     1290, 1303, 1300, 1302, 1294, 1296, 1295, 1304, 1302, 1306,
+     1305, 1307, 1316, 1301, 1308, 1303, 1304, 1305, 1310, 1308,
+     1309, 1309, 1311, 1311, 1312, 1314, 1312, 1306, 1314, 1315,
+     1317, 1316, 1319, 1310, 1315, 1323, 1307, 1318, 1318, 1317,
+     1320, 1320, 1321, 1321, 1322, 1324, 1325, 1326, 1326, 1322,
+     1327, 1328, 1319, 1330, 1329, 1331, 1323, 1329, 1332, 1335,
+     1333, 1331, 1334, 1332, 1334, 1338, 1324, 1325, 1328, 1333,
+     1327, 1337, 1339, 1330, 1337, 1341, 1340, 1335, 1342, 1343,
+     1338, 1340, 1349, 1342, 1405, 1339, 1344, 1343, 1405, 1341,
+     1345, 1344, 1346, 1345, 1347, 1347, 1348, 1346, 1350, 1351,
+
+     1349, 1348, 1352, 1354, 1350, 1355, 1351, 1356, 1357, 1354,
+     1358, 1355, 1356, 1357, 1359, 1352, 1358, 1360, 1361, 1362,
+     1362, 1363, 1365, 1359, 1366, 1367, 1369, 1365, 1368, 1361,
+     1370, 1371, 1372, 1373, 1375, 1367, 1360, 1371, 1372, 1373,
+     1375, 1363, 1366, 1368, 1376, 1377, 1369, 1378, 1379, 1380,
+     1381, 1382, 1382, 1370, 1383, 1384, 1386, 1385, 1376, 1388,
+     1379, 1386, 1391, 1380, 1376, 1377, 1389, 1378, 1381, 1387,
+     1387, 1389, 1392, 1393, 1383, 1385, 1394, 1392, 1392, 1395,
+     1384, 1391, 1388, 1396, 1397, 1394, 1398, 1395, 1399, 1400,
+     1401, 1393, 1401, 1399, 1402, 1408, 1399, 1396, 1400, 1397,
+
+     1404, 1398, 1406, 1409, 1398, 1407, 1404, 1410, 1402, 1414,
+     1407, 1407, 1411, 1406, 1408, 1412, 1413, 1411, 1415, 1416,
+     1412, 1413, 1417, 1419, 1416, 1410, 1420, 1414, 1421, 1409,
+     1422, 1422, 1423, 1424, 1425, 1426, 1423, 1419, 1415, 1428,
+     1427, 1426, 1417, 1429, 1420, 1430, 1421, 1433, 1431, 1432,
+     1435, 1424, 1427, 1425, 1437, 1428, 1434, 1435, 1438, 1430,
+     1436, 1434, 1429, 1431, 1432, 1436, 1433, 1439, 1440, 1440,
+     1441, 1442, 1437, 1443, 1444, 1444, 1439, 1445, 1446, 1438,
+     1442, 1447, 1451, 1445, 1446, 1441, 1448, 1448, 1449, 1449,
+     1450, 1452, 1453, 1443, 1454, 1447, 1450, 1453, 1451, 1455,
+
+     1454, 1456, 1457, 1457, 1463, 1455, 1462, 1456, 1458, 1458,
+     1460, 1460, 1452, 1461, 1464, 1462, 1466, 1461, 1465, 1469,
+     1467, 1470, 1463, 1468, 1468, 1473, 1464, 1467, 1458, 1470,
+     1458, 1466, 1465, 1471, 1472, 1474, 1476, 1475, 1471, 1469,
+     1474, 1474, 1475, 1475, 1473, 1477, 1477, 1478, 1472, 1479,
+     1480, 1482, 1481, 1483, 1484, 1485, 1476, 1481, 1486, 1480,
+     1487, 1485, 1488, 1486, 1490, 1489, 1478, 1493, 1479, 1491,
+     1482, 1489, 1484, 1483, 1494, 1491, 1492, 1495, 1496, 1497,
+     1487, 1498, 1492, 1490, 1499, 1500, 1493, 1503, 1488, 1501,
+     1501, 1502, 1504, 1494, 1502, 1498, 1495, 1496, 1497, 1508,
+
+     1500, 1505, 1506, 1506, 1508, 1499, 1503, 1507, 1507, 1510,
+     1509, 1504, 1511, 1505, 1509, 1512, 1513, 1514, 1518, 1514,
+     1516, 1517, 1510, 1514, 1512, 1519, 1517, 1511, 1520, 1513,
+     1521, 1521, 1522, 1518, 1523, 1524, 1514, 1522, 1516, 1525,
+     1523, 1526, 1528, 1527, 1520, 1519, 1528, 1526, 1527, 1529,
+     1524, 1530, 1525, 1529, 1531, 1532, 1533, 1534, 1535, 1535,
+     1537, 1539, 1540, 1534, 1532, 1541, 1541, 1540, 1542, 1543,
+     1547, 1530, 1531, 1547, 1542, 1549, 1533, 1550, 1537, 1545,
+     1545, 1551, 1539, 1548, 1548, 1553, 1554, 1556, 1553, 1543,
+     1555, 1549, 1557, 1550, 1558, 1558, 1556, 1551, 1559, 1560,
+
+     1561, 1562, 1563, 1564, 1565, 1565, 1562, 1554, 1566, 1564,
+     1555, 1567, 1557, 1559, 1569, 1568, 1563, 1566, 1570, 1561,
+     1560, 1571, 1571, 1572, 1573, 1575, 1574, 1576, 1576, 1567,
+     1568, 1574, 1577, 1578, 1579, 1579, 1577, 1572, 1570, 1569,
+     1575, 1580, 1573, 1581, 1582, 1583, 1584, 1585, 1589, 1583,
+     1587, 1587, 1585, 1578, 1588, 1582, 1591, 1588, 1592, 1590,
+     1593, 1589, 1581, 1580, 1590, 1584, 1594, 1595, 1596, 1597,
+     1597, 1599, 1591, 1598, 1593, 1600, 1592, 1603, 1598, 1601,
+     1601, 1595, 1603, 1602, 1604, 1594, 1594, 1605, 1608, 1605,
+     1607, 1599, 1602, 1596, 1606, 1600, 1607, 1609, 1611, 1606,
+
+     1612, 1612, 1613, 1609, 1604, 1614, 1617, 1621, 1608, 1616,
+     1620, 1614, 1611, 1622, 1616, 1618, 1618, 1619, 1619, 1623,
+     1625, 1613, 1623, 1626, 1620, 1621, 1624, 1624, 1622, 1627,
+     1617, 1629, 1635, 1628, 1633, 1626, 1628, 1629, 1625, 1628,
+     1630, 1631, 1634, 1633, 1631, 1630, 1638, 1634, 1646, 1627,
+     1636, 1628, 1639, 1636, 1637, 1637, 1640, 1635, 1639, 1641,
+     1631, 1646, 1640, 1644, 1641, 1642, 1642, 1643, 1643, 1644,
+     1638, 1645, 1647, 1648, 1649, 1650, 1645, 1651, 1650, 1652,
+     1653, 1656, 1654, 1651, 1660, 1652, 1653, 1654, 1657, 1655,
+     1647, 1661, 1648, 1657, 1649, 1655, 1658, 1658, 1659, 1662,
+
+     1663, 1664, 1660, 1659, 1656, 1665, 1667, 1666, 1668, 1669,
+     1670, 1661, 1670, 1669, 1674, 1664, 1671, 1676, 1662, 1665,
+     1663, 1666, 1672, 1678, 1667, 1675, 1674, 1681, 1677, 1672,
+     1676, 1679, 1680, 1668, 1677, 1671, 1682, 1675, 1687, 1682,
+     1684, 1681, 1689, 1678, 1683, 1683, 1691, 1679, 1688, 1684,
+     1686, 1686, 1680, 1688, 1689, 1690, 1690, 1682, 1687, 1692,
+     1693, 1691, 1694, 1695, 1696, 1699, 1698, 1697, 1701, 1703,
+     1705, 1705, 1695, 1692, 1697, 1698, 1706, 1706, 1698, 1696,
+     1694, 1699, 1704, 1701, 1693, 1704, 1707, 1708, 1701, 1709,
+     1710, 1710, 1709, 1711, 1703, 1712, 1713, 1714, 1707, 1715,
+
+     1714, 1713, 1716, 1717, 1715, 1708, 1711, 1718, 1719, 1721,
+     1724, 1720, 1723, 1723, 1712, 1725, 1718, 1724, 1721, 1717,
+     1720, 1716, 1722, 1720, 1726, 1727, 1728, 1719, 1722, 1729,
+     1732, 1731, 1735, 1730, 1736, 1725, 1731, 1726, 1730, 1730,
+     1728, 1738, 1732, 1727, 1738, 1729, 1737, 1737, 1739, 1740,
+     1741, 1741, 1736, 1742, 1742, 1741, 1744, 1735, 1740, 1745,
+     1743, 1744, 1746, 1747, 1739, 1748, 1750, 1751, 1742, 1743,
+     1748, 1748, 1743, 1752, 1753, 1754, 1756, 1745, 1755, 1753,
+     1750, 1747, 1751, 1746, 1755, 1757, 1757, 1758, 1760, 1754,
+     1764, 1759, 1761, 1758, 1756, 1752, 1759, 1762, 1761, 1765,
+
+     1766, 1767, 1760, 1762, 1771, 1773, 1766, 1774, 1768, 1769,
+     1764, 1768, 1771, 1765, 1767, 1769, 1775, 1768, 1777, 1776,
+     1778, 1779, 1780, 1777, 1773, 1781, 1774, 1776, 1782, 1778,
+     1783, 1780, 1784, 1784, 1779, 1775, 1790, 1785, 1781, 1786,
+     1788, 1791, 1782, 1785, 1783, 1786, 1787, 1789, 1789, 1787,
+     1792, 1793, 1793, 1788, 1784, 1794, 1790, 1795, 1796, 1791,
+     1797, 1798, 1801, 1795, 1800, 1800, 1802, 1803, 1794, 1792,
+     1802, 1804, 1803, 1805, 1807, 1808, 1797, 1810, 1805, 1798,
+     1796, 1806, 1801, 1807, 1811, 1813, 1806, 1812, 1810, 1814,
+     1812, 1804, 1816, 1811, 1815, 1815, 1817, 1813, 1808, 1818,
+
+     1819, 1819, 1820, 1821, 1814, 1822, 1825, 1823, 1817, 1826,
+     1821, 1816, 1828, 1829, 1827, 1830, 1820, 1822, 1818, 1823,
+     1827, 1830, 1831, 1831, 1828, 1825, 1836, 1832, 1839, 1826,
+     1832, 1829, 1833, 1833, 1835, 1836, 1837, 1838, 1838, 1835,
+     1839, 1840, 1837, 1840, 1841, 1842, 1843, 1841, 1844, 1845,
+     1846, 1847, 1848, 1852, 1851, 1846, 1847, 1849, 1850, 1851,
+     1853, 1848, 1852, 1856, 1858, 1842, 1844, 1845, 1843, 1849,
+     1858, 1854, 1855, 1850, 1859, 1852, 1854, 1855, 1856, 1862,
+     1853, 1857, 1857, 1854, 1861, 1863, 1864, 1865, 1866, 1867,
+     1866, 1868, 1868, 1869, 1869, 1859, 1870, 1870, 1862, 1871,
+
+     1861, 1874, 1864, 1867, 1863, 1867, 1875, 1865, 1872, 1872,
+     1873, 1873, 1876, 1877, 1877, 1879, 1878, 1883, 1882, 1871,
+     1878, 1879, 1874, 1880, 1882, 1884, 1880, 1875, 1886, 1885,
+     1889, 1884, 1892, 1876, 1885, 1883, 1887, 1888, 1888, 1887,
+     1890, 1891, 1891, 1893, 1894, 1890, 1895, 1892, 1900, 1894,
+     1889, 1895, 1897, 1886, 1896, 1896, 1898, 1897, 1899, 1902,
+     1901, 1903, 1898, 1904, 1893, 1905, 1906, 1903, 1900, 1907,
+     1899, 1899, 1899, 1906, 1907, 1909, 1910, 1899, 1901, 1902,
+     1909, 1909, 1911, 1904, 1912, 1905, 1912, 1913, 1914, 1915,
+     1910, 1916, 1917, 1918, 1920, 1915, 1922, 1911, 1913, 1923,
+
+     1916, 1919, 1919, 1914, 1921, 1921, 1924, 1924, 1925, 1925,
+     1926, 1930, 1917, 1931, 1918, 1933, 1922, 1929, 1929, 1934,
+     1920, 1923, 1931, 1935, 1933, 1936, 1937, 1937, 1938, 1935,
+     1926, 1939, 1940, 1941, 1942, 1944, 1930, 1943, 1943, 1940,
+     1934, 1936, 1941, 1945, 1947, 1949, 1939, 1948, 1950, 1938,
+     1947, 1949, 1948, 1955, 1953, 1951, 1953, 1952, 1956, 1945,
+     1942, 1944, 1951, 1952, 1956, 1957, 1957, 1959, 1950, 1958,
+     1960, 1961, 1955, 1962, 1958, 1963, 1959, 1964, 1963, 1965,
+     1966, 1967, 1965, 1968, 1968, 1960, 1971, 1969, 1970, 1964,
+     1972, 1961, 1962, 1969, 1970, 1973, 1975, 1976, 1966, 1973,
+
+     1978, 1978, 1979, 1977, 1980, 1972, 1971, 1967, 1977, 1981,
+     1983, 1985, 1985, 1984, 1986, 1973, 1975, 1984, 1987, 1976,
+     1986, 1988, 1988, 1980, 1981, 1990, 1979, 1987, 1989, 1983,
+     1991, 1991, 1989, 1992, 1993, 1995, 1990, 1994, 1996, 1997,
+     1995, 1990, 1998, 1999, 2003, 2000, 2001, 2002, 1993, 1999,
+     2004, 2004, 2002, 2010, 1992,   17, 1994, 2003, 1996, 1997,
+     2008, 2001, 1998, 2000, 2005, 2005, 2006, 2009, 2019, 2008,
+     2006, 2011, 2020, 2010, 2012, 2012, 2011, 2020, 2009, 2014,
+     2014, 2015, 2016, 2009, 2018, 2021, 2015, 2015, 2016, 2022,
+     2018, 2024, 2025, 2026, 2019, 2022, 2025, 2021, 2027, 2027,
+
+     2028, 2029, 2030, 2024, 2031, 2026, 2034, 2029, 2032, 2032,
+     2031, 2033, 2035, 2039, 2040, 2036, 2038, 2035, 2042, 2040,
+     2046, 2042, 2043, 2043, 2030, 2028, 2034, 2036, 2038,    0,
+     2033, 2047, 2039, 2044, 2044, 2045, 2045, 2047, 2048, 2050,
+     2046, 2049, 2051, 2053, 2048, 2050, 2049, 2055, 2053, 2056,
+     2055, 2051, 2057, 2057, 2059, 2060, 2063, 2061, 2062, 2062,
+     2068, 2056, 2061, 2064, 2065, 2063, 2059, 2060, 2064, 2065,
+     2066, 2067, 2067, 2066, 2069, 2070, 2071, 2072, 2075, 2073,
+     2068, 2072, 2074, 2069, 2073, 2076, 2077, 2078, 2074, 2081,
+     2080, 2080, 2084, 2070, 2076, 2071, 2075, 2082, 2088, 2083,
+
+     2090, 2078, 2080, 2087, 2077, 2086, 2082, 2081, 2083, 2085,
+     2085, 2089, 2084, 2090, 2086, 2087, 2089, 2093, 2093, 2088,
+     2095, 2096, 2097, 2095, 2098, 2101, 2100, 2102, 2103, 2104,
+     2104, 2106, 2105, 2102, 2105, 2107, 2107, 2096, 2097, 2101,
+     2098, 2100, 2108, 2110, 2110, 2103, 2111, 2111, 2113, 2106,
+     2108, 2114, 2115, 2116, 2117, 2118, 2119, 2114, 2115, 2120,
+     2120, 2117, 2122, 2121, 2121, 2127, 2123, 2116, 2124, 2125,
+     2126, 2113, 2121, 2131, 2129, 2134, 2119, 2118, 2123, 2128,
+     2124, 2130, 2126, 2122, 2125, 2135, 2130, 2130, 2128, 2129,
+     2136, 2127, 2132, 2139, 2132, 2134, 2131, 2138, 2132, 2137,
+
+     2137, 2140, 2136, 2142, 2140, 2141, 2146, 2144, 2135, 2152,
+     2141, 2132, 2144, 2139, 2145, 2138, 2145, 2147, 2148, 2150,
+     2153, 2154, 2147, 2142, 2146, 2148, 2156, 2152, 2150, 2153,
+     2155, 2157, 2155, 2154, 2159, 2160, 2159, 2157, 2161, 2161,
+     2162, 2163, 2164, 2165, 2164, 2156, 2163, 2166, 2165, 2160,
+     2167, 2168, 2166, 2169, 2170, 2173, 2171, 2172, 2174, 2177,
+     2170, 2171, 2178, 2174, 2174, 2179, 2162, 2173, 2167, 2168,
+     2172, 2175, 2182, 2169, 2180, 2180, 2178, 2179, 2177, 2175,
+     2181, 2181, 2183, 2182, 2184, 2185, 2187, 2186, 2187, 2188,
+     2189, 2185, 2186, 2190, 2190, 2196, 2191, 2183, 2189, 2192,
+
+     2192, 2193, 2193, 2194, 2184, 2195, 2189, 2188, 2191, 2199,
+     2195, 2198, 2194, 2196, 2200, 2198, 2200, 2201, 2199, 2202,
+     2203, 2199, 2204, 2205, 2202, 2202, 2212, 2207, 2208, 2209,
+     2211, 2204, 2203, 2208, 2209, 2205, 2213, 2215, 2201, 2207,
+     2214, 2214, 2216, 2211, 2217, 2213, 2212, 2218, 2219, 2222,
+     2220, 2221, 2226, 2224, 2222, 2215, 2225, 2236, 2229, 2230,
+     2216, 2238, 2217, 2218, 2220, 2224, 2221, 2229, 2225, 2227,
+     2228, 2237, 2226, 2219, 2227, 2228, 2233, 2230, 2235, 2238,
+     2236, 2239, 2233, 2240, 2235, 2242, 2237, 2241, 2241, 2243,
+     2243, 2244, 2240, 2245, 2242, 2233, 2246, 2247, 2248, 2250,
+
+     2246, 2251, 2247, 2252, 2254,    0, 2239, 2251, 2253, 2244,
+     2254, 2248, 2245, 2253, 2253, 2255, 2256, 2258, 2250, 2256,
+     2257, 2255, 2261, 2261, 2263, 2252, 2262, 2262, 2257, 2264,
+     2264, 2265, 2265, 2263, 2266, 2267, 2268, 2258, 2269, 2270,
+     2270, 2262, 2268, 2269, 2271, 2271, 2266, 2275, 2276, 2272,
+     2273, 2275, 2262, 2267, 2272, 2277, 2273, 2278, 2280, 2277,
+     2281, 2282, 2284, 2283, 2285, 2281, 2287, 2284, 2276, 2286,
+     2288, 2289, 2290, 2290, 2292, 2288, 2291, 2278, 2283, 2294,
+     2291, 2295, 2285, 2280, 2282, 2286, 2287, 2293, 2296, 2292,
+     2297, 2298, 2293, 2289, 2299, 2300, 2301, 2294, 2305, 2299,
+
+     2302, 2302, 2297, 2304, 2306, 2307, 2296, 2295, 2300, 2308,
+     2298, 2304, 2309, 2312, 2301, 2310, 2311, 2305, 2313, 2319,
+     2314, 2322, 2318, 2306, 2307, 2312, 2314, 2316, 2321,    0,
+     2321, 2327, 2308, 2319, 2310, 2318, 2309, 2311, 2320, 2313,
+     2326, 2322, 2316, 2324, 2320, 2323, 2323, 2325, 2324, 2328,
+     2325, 2329, 2332, 2326, 2332, 2327, 2330, 2330, 2331, 2331,
+     2333, 2333, 2334, 2328, 2329, 2335, 2336, 2337, 2337, 2339,
+     2339, 2337, 2340, 2340, 2341, 2341, 2342, 2334, 2348, 2336,
+     2335, 2343, 2343, 2344, 2344, 2342, 2345, 2347, 2342, 2349,
+     2350, 2345, 2347, 2351, 2351, 2352, 2352, 2353, 2348, 2354,
+
+     2354, 2355, 2350, 2356, 2356, 2357, 2358, 2359, 2359, 2349,
+     2361, 2358, 2360, 2360, 2362, 2363, 2353, 2364, 2365, 2355,
+     2357, 2367, 2369, 2362, 2361, 2371, 2367, 2368, 2368, 2370,
+     2370, 2364, 2363, 2372, 2373, 2377, 2374, 2365, 2372, 2374,
+     2373, 2369, 2378, 2371, 2375, 2375, 2376, 2376, 2379, 2381,
+     2379, 2382, 2383, 2383, 2377, 2384, 2386, 2378, 2387, 2388,
+     2375, 2384, 2389, 2390, 2381, 2391, 2391, 2390, 2392, 2393,
+     2382, 2394, 2398, 2387, 2393, 2395, 2386, 2389, 2397, 2397,
+     2400, 2399, 2388, 2401, 2402, 2403, 2394, 2392, 2399, 2404,
+     2395, 2407, 2398, 2407, 2400, 2405, 2405, 2406, 2411, 2410,
+
+     2403, 2401, 2402, 2412, 2408, 2410, 2406, 2408, 2412, 2413,
+     2411, 2414, 2415, 2416, 2413, 2404, 2417, 2418, 2420, 2426,
+     2423, 2417, 2408, 2420, 2408, 2415, 2421, 2422, 2431,    0,
+     2427, 2421, 2422, 2424, 2416, 2423, 2414, 2429, 2425, 2424,
+     2426, 2428, 2429, 2418, 2425, 2427, 2430, 2428, 2432, 2433,
+     2434, 2430, 2433, 2431, 2435, 2436, 2437, 2438, 2439, 2444,
+     2446, 2432, 2440, 2435, 2436, 2437, 2438, 2441, 2440, 2447,
+     2434, 2442, 2439, 2441, 2456, 2442, 2448, 2448, 2447, 2444,
+     2446, 2449, 2450, 2450, 2451, 2452, 2452, 2449, 2454, 2453,
+     2456, 2450, 2459, 2451, 2453, 2457, 2458, 2458, 2463, 2468,
+
+     2460, 2462, 2464, 2465, 2468, 2469, 2470, 2459, 2454, 2460,
+     2454, 2457,    0, 2462, 2463, 2465, 2467, 2464, 2470, 2467,
+     2471, 2471, 2472, 2472, 2476, 2469, 2474, 2474, 2475, 2476,
+     2477, 2475, 2478, 2479, 2480, 2480, 2477, 2481, 2478, 2482,
+     2482, 2483, 2479, 2484, 2485, 2486, 2486, 2488, 2487, 2496,
+     2489, 2481, 2491, 2483, 2487, 2489, 2491, 2484, 2496, 2492,
+     2497, 2488, 2492, 2485, 2493, 2493, 2494, 2495, 2498, 2497,
+     2499, 2494, 2495, 2501, 2499, 2500, 2500, 2503, 2504, 2505,
+     2506, 2507, 2503, 2508, 2509, 2510, 2501, 2508, 2498, 2514,
+     2510, 2511, 2513, 2513, 2515, 2507, 2512, 2511, 2504, 2505,
+
+     2506, 2516, 2512, 2517, 2509, 2518, 2521, 2514, 2517, 2519,
+     2519, 2522, 2523, 2515, 2558, 2524, 2525, 2523, 2521, 2558,
+     2516, 2524, 2525, 2526, 2529, 2531, 2518, 2522, 2527, 2532,
+     2527, 2526, 2539, 2529, 2533, 2533, 2599, 2534, 2599, 2531,
+     2534, 2535, 2535, 2532, 2537, 2538, 2544, 2537, 2538, 2540,
+     2540, 2543, 2544, 2545, 2547, 2543, 2546, 2546, 2539, 2550,
+     2550, 2552, 2554, 2547, 2555, 2545, 2559, 2560, 2561, 2562,
+     2563, 2563, 2571, 2561, 2562, 2567, 2554, 2565, 2565, 2552,
+     2555, 2567, 2568, 2569, 2569, 2570, 2572, 2574, 2560, 2580,
+     2575, 2572, 2559, 2575, 2571, 2576, 2577, 2578, 2578, 2585,
+
+     2581, 2570, 2568, 2584, 2582, 2580, 2574, 2576, 2577, 2581,
+     2582, 2583, 2587, 2587, 2585, 2588, 2589, 2583, 2588, 2590,
+     2595, 2584, 2592, 2592, 2593, 2593, 2594, 2596, 2597, 2598,
+     2600, 2594, 2601, 2602, 2598, 2589, 2596, 2590, 2595, 2604,
+     2605, 2597, 2603, 2606, 2600, 2602, 2601, 2603, 2606, 2607,
+     2607, 2608, 2608, 2609, 2609, 2610, 2610, 2611, 2612, 2604,
+     2605, 2613, 2614, 2614, 2615, 2615, 2613, 2616, 2616, 2611,
+     2617, 2618, 2619, 2620, 2621,    0, 2612, 2624, 2622, 2623,
+     2623, 2627, 2617, 2632, 2619, 2625, 2625, 2626, 2626, 2628,
+     2628, 2618, 2627, 2620, 2622, 2621, 2624, 2629, 2630, 2631,
+
+     2634, 2633, 2635, 2632, 2637, 2630, 2633, 2636, 2636, 2629,
+     2639, 2631, 2640, 2637, 2638, 2638, 2641, 2642, 2644, 2643,
+     2634, 2645, 2635, 2645, 2652, 2646, 2647, 2647, 2649, 2641,
+     2648, 2650, 2640, 2643, 2653, 2654, 2639, 2646, 2656, 2648,
+     2644, 2642, 2652, 2649, 2655, 2657, 2650, 2655, 2658, 2666,
+     2657, 2668, 2656, 2658, 2659, 2659, 2653, 2667, 2654, 2660,
+     2660, 2661, 2661, 2663, 2663, 2665, 2665, 2666, 2667, 2669,
+     2668, 2671, 2672, 2673, 2674, 2679, 2675, 2676, 2677, 2678,
+     2677,    0, 2680, 2686, 2669, 2675, 2681, 2681, 2683, 2685,
+     2672, 2671, 2683, 2679, 2674, 2673, 2692, 2676, 2687, 2678,
+
+     2680, 2684, 2684, 2685, 2690, 2686, 2693, 2687, 2688, 2688,
+     2691, 2691, 2694, 2690, 2692, 2695, 2696, 2697, 2698, 2700,
+     2701, 2699, 2695, 2704, 2693, 2702, 2702, 2701, 2703, 2703,
+     2694, 2696, 2705, 2706, 2711, 2697, 2698, 2699, 2700, 2706,
+     2708, 2708, 2710, 2704, 2709, 2709, 2712, 2713, 2710, 2714,
+     2705, 2715, 2711, 2716, 2717, 2717, 2718, 2719, 2716, 2720,
+     2721, 2722, 2713,    0, 2712, 2715, 2729, 2723, 2714, 2725,
+     2725, 2721, 2723, 2724, 2734, 2724, 2718, 2719, 2726, 2720,
+     2726, 2722, 2727, 2727, 2731, 2729, 2732, 2733, 2737, 2741,
+     2735, 2736, 2738, 2731, 2734, 2735, 2736, 2742, 2743, 2733,
+
+     2746, 2743, 2744, 2744, 2745, 2732, 2747, 2747, 2737, 2741,
+     2748, 2738, 2749, 2750, 2752, 2742, 2753, 2750, 2746, 2745,
+     2754, 2748, 2756, 2756, 2755, 2757, 2754, 2749, 2755, 2752,
+     2759, 2753, 2760, 2761, 2762, 2762, 2764, 2765, 2757, 2766,
+     2767, 2767, 2769, 2766, 2773, 2759, 2765, 2774, 2764, 2768,
+     2768, 2771, 2760, 2761, 2770, 2770, 2771, 2772, 2775, 2774,
+     2773, 2769, 2776, 2776, 2781, 2781, 2772, 2782, 2783, 2783,
+     2784, 2785, 2786, 2787, 2790, 2790, 2791, 2788, 2775, 2789,
+     2792, 2803, 2787, 2784, 2785, 2786, 2788, 2797, 2789, 2782,
+     2794, 2794, 2797, 2799, 2800, 2792, 2791, 2801, 2799, 2802,
+
+     2803, 2804, 2801, 2805, 2807, 2811, 2815, 2802, 2800, 2809,
+     2804, 2805, 2810, 2814, 2809, 2812, 2812, 2810, 2814, 2807,
+     2811, 2813, 2813, 2816, 2816, 2815, 2817, 2818, 2819, 2820,
+     2821,    0, 2818, 2817, 2822, 2824, 2821, 2823, 2823, 2822,
+     2825, 2826, 2826, 2827, 2827, 2825, 2819, 2820, 2830, 2833,
+     2824, 2831, 2831, 2832, 2833, 2833, 2832, 2834, 2835, 2836,
+     2837, 2830, 2834, 2835, 2838, 2839, 2837, 2840, 2838, 2841,
+     2839, 2842, 2843, 2836, 2844, 2845, 2840, 2846, 2847, 2842,
+     2844, 2845, 2846, 2851, 2841, 2848, 2848, 2850, 2851, 2852,
+     2847, 2854, 2852, 2843, 2850, 2856, 2857, 2858, 2859, 2860,
+
+     2856, 2857, 2858, 2854, 2861, 2862, 2863, 2863, 2864, 2868,
+     2865, 2873, 2860, 2861, 2862, 2865, 2859, 2864, 2869, 2870,
+     2874, 2875,    0, 2876, 2869, 2870, 2878, 2868, 2877, 2877,
+     2873, 2879, 2884, 2878, 2881, 2882, 2883, 2883, 2885, 2887,
+     2874, 2875, 2876, 2881, 2882, 2886, 2886, 2884, 2889, 2891,
+     2879, 2892, 2894, 2885, 2895, 2892, 2893, 2893, 2887, 2896,
+     2895, 2897, 2898, 2889, 2900, 2896, 2899, 2899, 2898, 2891,
+     2901, 2902, 2900, 2904, 2905, 2907, 2902, 2894, 2910, 2897,
+     2908, 2907, 2904, 2908, 2909, 2911, 2913, 2905, 2909, 2912,
+     2912, 2915, 2915, 2916,    0, 2901, 2910, 2917, 2917, 2911,
+
+     2923, 2913, 2918, 2918, 2920, 2920, 2921, 2922, 2927, 2923,
+     2921, 2916, 2922, 2925, 2925, 2928, 2930, 2929, 2931, 2933,
+     2928, 2930, 2930, 2934, 2934, 2936, 2936, 2940, 2927, 2929,
+     2931, 2937, 2937, 2938, 2938, 2939, 2941, 2944, 2939, 2933,
+     2940, 2943, 2943, 2946, 2947, 2947, 2948, 2948, 2952, 2941,
+     2949, 2949, 2950, 2951, 2951, 2944, 2953, 2954, 2955, 2956,
+     2956, 2952, 2957, 2946, 2955, 2961, 2957, 2950, 2964, 2960,
+     2961, 2954, 2963, 2965, 2953, 2960, 2966, 2963, 2963, 2967,
+     2968, 2969, 2979, 2970, 2976, 2967, 2968, 2970, 2971, 2971,
+     2974, 2964, 2976, 2965, 2977, 2974, 2966, 2977, 2980, 2981,
+
+     2981, 2980, 2982, 2983, 2984, 2985, 2969, 2979, 2983, 2986,
+     2987, 2987, 2988, 2989, 2990, 2991, 2989,    0, 2996, 2982,
+     2982, 2992, 2984, 2986, 2989, 2985, 2988, 2994, 2990, 2992,
+     2995, 3006, 2994, 2994, 2991, 2995, 2995, 2996, 2997, 2997,
+     2998, 2998, 2999, 2999, 3000, 3000, 3001, 3001, 3002, 3002,
+     3003, 3004, 3005, 3007, 3008, 3009, 3004, 3006, 3010, 3008,
+     3011, 3012, 3013, 3010, 3014, 3018, 3003, 3007, 3018, 3011,
+     3016, 3016, 3005, 3019, 3009, 3017, 3017, 3020, 3020, 3021,
+     3022, 3012, 3013, 3025, 3014, 3021, 3024, 3024, 3019, 3027,
+     3025, 3026, 3026, 3030, 3027, 3029, 3029, 3031, 3022, 3032,
+
+     3033, 3035, 3030, 3036, 3036, 3039, 3031, 3040, 3032, 3033,
+     3037, 3037, 3038, 3041, 3039, 3042, 3038, 3043, 3046, 3035,
+     3047, 3048, 3044, 3058, 3041, 3048, 3040, 3044, 3044, 3047,
+     3042, 3046, 3054, 3052, 3053, 3053, 3057, 3043, 3052, 3056,
+     3056, 3059, 3061, 3061, 3062, 3063, 3054, 3067, 3058, 3068,
+     3057, 3069, 3072, 3062, 3068, 3071, 3074, 3063, 3072, 3059,
+     3069, 3076, 3078, 3085, 3079, 3080, 3080, 3078, 3074, 3079,
+     3081, 3083, 3067, 3084, 3091, 3071, 3083, 3085, 3092, 3081,
+     3086, 3086, 3076, 3091, 3086, 3093, 3084, 3088, 3088, 3089,
+     3089, 3090, 3090, 3100, 3094, 3096, 3101, 3097, 3092, 3094,
+
+     3098, 3096, 3097, 3102, 3093, 3098, 3099, 3099, 3101, 3103,
+     3104, 3100, 3105, 3106, 3103, 3107, 3107, 3109, 3105, 3114,
+     3110, 3109, 3111, 3113, 3102, 3110, 3115, 3111, 3104, 3112,
+     3112, 3117, 3119, 3119, 3114, 3121, 3122, 3123, 3106, 3124,
+     3126, 3115, 3113, 3124, 3125, 3127, 3128, 3129, 3121, 3122,
+     3123, 3117, 3129, 3125, 3128, 3130, 3126, 3131, 3131, 3132,
+     3133, 3134, 3135, 3135, 3127, 3136, 3136, 3137, 3132, 3141,
+     3146, 3140, 3150, 3143, 3151, 3130, 3140, 3140, 3133, 3143,
+     3144, 3144, 3153, 3141, 3148, 3148, 3137, 3134, 3150, 3152,
+     3151, 3146, 3154, 3158, 3152, 3157, 3157, 3154, 3153, 3159,
+
+     3160, 3161, 3162, 3162, 3163, 3166, 3160, 3167, 3159, 3165,
+     3165, 3168, 3168, 3158, 3170, 3172, 3173, 3176, 3179, 3166,
+     3170, 3180, 3173, 3163, 3161, 3174, 3167, 3177, 3177, 3182,
+     3174, 3178, 3178, 3179, 3183, 3172, 3181, 3181, 3184, 3176,
+     3182, 3180, 3185, 3183, 3186, 3187, 3188, 3190, 3185, 3189,
+     3189, 3191, 3192, 3197, 3191, 3192, 3181, 3187, 3184, 3193,
+     3193, 3198, 3190, 3186, 3199, 3197, 3188, 3200, 3200, 3201,
+     3199, 3202, 3201, 3203, 3205, 3206, 3206, 3202, 3207, 3205,
+     3208, 3198, 3209, 3207, 3210, 3211, 3211, 3214, 3209, 3215,
+     3216, 3203, 3213, 3217, 3217, 3219, 3218, 3220, 3471, 3208,
+
+     3471, 3210, 3210, 3216, 3213, 3214, 3220, 3222, 3222, 3223,
+     3223, 3219, 3224, 3224, 3215, 3218, 3225, 3226, 3227, 3228,
+     3228, 3225, 3232, 3227, 3229, 3229, 3230, 3230, 3231, 3231,
+     3233, 3226, 3234, 3239, 3235, 3232, 3238, 3238, 3234, 3235,
+     3241, 3241, 3242, 3242, 3244, 3246, 3247, 3248, 3249, 3239,
+     3250, 3250, 3252, 3252, 3253, 3254, 3233, 3255, 3257, 3262,
+     3258, 3259, 3259, 3244, 3260, 3260, 3248, 3246, 3247, 3258,
+     3249, 3255, 3264, 3263, 3254, 3265, 3266, 3262, 3257, 3263,
+     3253, 3266, 3269, 3270, 3270, 3272, 3272, 3274, 3273, 3275,
+     3276, 3277, 3264, 3273, 3265, 3275, 3278, 3278, 3283, 3277,
+
+     3279, 3274, 3276, 3269, 3281, 3279, 3282, 3284, 3281, 3285,
+     3286, 3282, 3289, 3287, 3285, 3290, 3291, 3292, 3283, 3287,
+     3289, 3294, 3286, 3297, 3295, 3296, 3298, 3284, 3300, 3301,
+     3303, 3298, 3302, 3300, 3290, 3303, 3291, 3292, 3302, 3294,
+     3295, 3305, 3296, 3296, 3297, 3306, 3307, 3320, 3306, 3301,
+     3311, 3311, 3312, 3312, 3313, 3318, 3318, 3319, 3313, 3307,
+     3323, 3305, 3319, 3321, 3321,    0, 3320, 3326, 3326, 3327,
+     3327, 3336, 3327, 3328, 3328, 3323, 3328, 3329, 3329, 3330,
+     3330, 3331, 3330, 3333, 3334, 3331, 3335, 3335, 3333, 3336,
+     3337, 3340, 3340, 3334, 3341, 3342, 3343, 3344, 3344, 3345,
+
+     3348, 3343, 3349, 3350, 3337, 3352, 3354, 3350, 3351, 3349,
+        0, 3355, 3356, 3356, 3341, 3342, 3355, 3351, 3357, 3345,
+     3352, 3358, 3358, 3361, 3354, 3348, 3366, 3357, 3359, 3359,
+     3360, 3360, 3362, 3363, 3364, 3365, 3368, 3362, 3361, 3364,
+     3364, 3365, 3363, 3367, 3369, 3363, 3371, 3370,    0, 3369,
+     3373, 3366, 3370, 3372, 3372, 3374, 3373, 3368, 3367, 3375,
+     3375, 3374, 3376, 3376, 3377, 3371, 3378, 3381, 3381, 3383,
+     3383, 3378, 3384, 3386, 3388, 3388, 3389, 3389, 3397, 3377,
+        0, 3384, 3390, 3390, 3391, 3391, 3393, 3393, 3394, 3394,
+     3399, 3386, 3395, 3395, 3396, 3396, 3400, 3400, 3402, 3399,
+
+     3401, 3401, 3403, 3404, 3397, 3406, 3406, 3402, 3407, 3408,
+     3408, 3409, 3410, 3419, 3403, 3415, 3411, 3412, 3412, 3413,
+     3413, 3416, 3416, 3404, 3421, 3410, 3409, 3407, 3411, 3420,
+     3415, 3419, 3420, 3422, 3422, 3423, 3425, 3426, 3427, 3425,
+     3428, 3429, 3431, 3426, 3430, 3428, 3434, 3437, 3433, 3438,
+     3421, 3437, 3427, 3423, 3433, 3434, 3441, 3442, 3431, 3455,
+     3429, 3451, 3430, 3461, 3438, 3452, 3451, 3464, 3452, 3456,
+     3456, 3462, 3455, 3457, 3457, 3459, 3459, 3442, 3466, 3463,
+     3462, 3468, 3441, 3463, 3469, 3470, 3461, 3464, 3472, 3474,
+     3470, 3475, 3466, 3473, 3473, 3469, 3476, 3477, 3478, 3480,
+
+     3479, 3482, 3474, 3472, 3468, 3481, 3482, 3483, 3480, 3487,
+     3475, 3484, 3485, 3477, 3476, 3479, 3484, 3481, 3486, 3486,
+     3488, 3492, 3493, 3478, 3495, 3488, 3494, 3494, 3483, 3487,
+     3500, 3485, 3501, 3495, 3505, 3492, 3496, 3496, 3497, 3497,
+     3498, 3498, 3493, 3499, 3499, 3502, 3503, 3506, 3502, 3500,
+     3504, 3503, 3501, 3508, 3507, 3504, 3509, 3512, 3510, 3505,
+     3507, 3517, 3506, 3510, 3511, 3511, 3518, 3508, 3509, 3513,
+     3513, 3514, 3514, 3516, 3516, 3521, 3517, 3512, 3519, 3519,
+     3523, 3526, 3526, 3527, 3527, 3518, 3528, 3529, 3532, 3530,
+     3521, 3531, 3533, 3534, 3528, 3530, 3535, 3531, 3523, 3536,
+
+     3536, 3535, 3532, 3538, 3538, 3533, 3529, 3542, 3545, 3543,
+     3546, 3548, 3534, 3549, 3546, 3550, 3553, 3551, 3549, 3552,
+     3554, 3555, 3545, 3556, 3556, 3554, 3555, 3559, 3542, 3543,
+     3551, 3548, 3552, 3560, 3550, 3553, 3561, 3562, 3562, 3563,
+     3564, 3565, 3565, 3566, 3563, 3567, 3564, 3559, 3566, 3568,
+     3567, 3560, 3569, 3570, 3568, 3561, 3572, 3572, 3573, 3570,
+     3574, 3574, 3576, 3573, 3577, 3578, 3576, 3579, 3580, 3581,
+     3582, 3569, 3578, 3585, 3585, 3581, 3588, 3583, 3587, 3587,
+     3590, 3591, 3592, 3577, 3597, 3588, 3579, 3580, 3588, 3582,
+     3583, 3589, 3593, 3593, 3595, 3592, 3589, 3594, 3599, 3590,
+
+     3591, 3604, 3594, 3598, 3598, 3600, 3600, 3595, 3601, 3601,
+     3597, 3602, 3603, 3605, 3605,    0, 3602, 3599, 3606, 3603,
+     3604, 3609, 3607, 3606, 3607, 3608, 3608, 3610, 3609, 3611,
+     3612, 3613, 3615, 3615, 3610, 3612, 3616, 3618, 3619, 3620,
+     3621, 3625, 3618, 3619, 3622, 3622, 3624, 3624, 3611, 3626,
+     3613, 3627, 3627, 3628, 3628, 3616, 3629, 3639, 3620, 3621,
+     3625, 3631, 3631, 3629, 3632, 3632, 3633, 3635, 3626, 3638,
+     3640,    0, 3635, 3633, 3638,    0, 3639, 3641, 3641, 3642,
+     3642,    0,    0,    0,    0,    0,    0,    0,    0, 3640,
+     3646, 3646, 3646, 3646, 3646, 3646, 3646, 3647, 3647, 3647,
+
+     3647, 3647, 3647, 3647, 3648, 3648, 3648, 3648, 3648, 3648,
+     3648, 3649, 3649, 3649, 3649, 3649, 3649, 3649, 3650, 3650,
+     3650, 3650, 3650, 3650, 3650, 3651, 3651, 3651, 3651, 3651,
+     3651, 3651, 3652, 3652, 3652, 3652, 3652, 3652, 3652, 3654,
+     3654,    0, 3654, 3654, 3654, 3654, 3655, 3655,    0,    0,
+        0, 3655, 3655, 3656, 3656,    0,    0, 3656,    0, 3656,
+     3657,    0,    0,    0,    0,    0, 3657, 3658, 3658,    0,
+        0,    0, 3658, 3658, 3659,    0,    0,    0,    0,    0,
+     3659, 3660, 3660,    0, 3660, 3660, 3660, 3660, 3661,    0,
+        0,    0,    0,    0, 3661, 3662, 3662,    0,    0,    0,
+
+     3662, 3662, 3663, 3663,    0, 3663, 3663, 3663, 3663, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645,
+     3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645, 3645
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -3393,7 +3405,7 @@ static void config_end_include(void)
         }
 #endif
 
-#line 3394 "<stdout>"
+#line 3406 "<stdout>"
 #define YY_NO_INPUT 1
 #line 191 "./util/configlexer.lex"
 #ifndef YY_NO_UNPUT
@@ -3402,9 +3414,9 @@ static void config_end_include(void)
 #ifndef YY_NO_INPUT
 #define YY_NO_INPUT 1
 #endif
-#line 3403 "<stdout>"
+#line 3415 "<stdout>"
 
-#line 3405 "<stdout>"
+#line 3417 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -3628,7 +3640,7 @@ YY_DECL
 	{
 #line 211 "./util/configlexer.lex"
 
-#line 3629 "<stdout>"
+#line 3641 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -3661,13 +3673,13 @@ YY_DECL
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 3628 )
+				if ( yy_current_state >= 3646 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 7073 );
+		while ( yy_base[yy_current_state] != 7110 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -5401,40 +5413,45 @@ YY_RULE_SETUP
 { YDVAR(1, VAR_EDE ) }
 	YY_BREAK
 case 340:
-/* rule 340 can match eol */
 YY_RULE_SETUP
 #line 565 "./util/configlexer.lex"
+{ YDVAR(1, VAR_PROXY_PROTOCOL_PORT) }
+	YY_BREAK
+case 341:
+/* rule 341 can match eol */
+YY_RULE_SETUP
+#line 566 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 341:
+case 342:
 YY_RULE_SETUP
-#line 568 "./util/configlexer.lex"
+#line 569 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 569 "./util/configlexer.lex"
+#line 570 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 342:
+case 343:
 YY_RULE_SETUP
-#line 574 "./util/configlexer.lex"
+#line 575 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 343:
-/* rule 343 can match eol */
+case 344:
+/* rule 344 can match eol */
 YY_RULE_SETUP
-#line 575 "./util/configlexer.lex"
+#line 576 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 344:
+case 345:
 YY_RULE_SETUP
-#line 577 "./util/configlexer.lex"
+#line 578 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5447,34 +5464,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 345:
+case 346:
 YY_RULE_SETUP
-#line 589 "./util/configlexer.lex"
+#line 590 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 590 "./util/configlexer.lex"
+#line 591 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 346:
+case 347:
 YY_RULE_SETUP
-#line 595 "./util/configlexer.lex"
+#line 596 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 347:
-/* rule 347 can match eol */
+case 348:
+/* rule 348 can match eol */
 YY_RULE_SETUP
-#line 596 "./util/configlexer.lex"
+#line 597 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 348:
+case 349:
 YY_RULE_SETUP
-#line 598 "./util/configlexer.lex"
+#line 599 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -5487,38 +5504,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 349:
+case 350:
 YY_RULE_SETUP
-#line 610 "./util/configlexer.lex"
+#line 611 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 612 "./util/configlexer.lex"
+#line 613 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 350:
-YY_RULE_SETUP
-#line 616 "./util/configlexer.lex"
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
 case 351:
-/* rule 351 can match eol */
 YY_RULE_SETUP
 #line 617 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
+{ LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
 case 352:
+/* rule 352 can match eol */
 YY_RULE_SETUP
 #line 618 "./util/configlexer.lex"
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
 case 353:
 YY_RULE_SETUP
 #line 619 "./util/configlexer.lex"
+{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
+	YY_BREAK
+case 354:
+YY_RULE_SETUP
+#line 620 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 0);
@@ -5526,27 +5543,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 624 "./util/configlexer.lex"
+#line 625 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 354:
+case 355:
 YY_RULE_SETUP
-#line 628 "./util/configlexer.lex"
+#line 629 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 355:
-/* rule 355 can match eol */
+case 356:
+/* rule 356 can match eol */
 YY_RULE_SETUP
-#line 629 "./util/configlexer.lex"
+#line 630 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 356:
+case 357:
 YY_RULE_SETUP
-#line 631 "./util/configlexer.lex"
+#line 632 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5556,7 +5573,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 637 "./util/configlexer.lex"
+#line 638 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -5571,39 +5588,39 @@ case YY_STATE_EOF(val):
 }
 	YY_BREAK
 /* include-toplevel: directive */
-case 357:
+case 358:
 YY_RULE_SETUP
-#line 651 "./util/configlexer.lex"
+#line 652 "./util/configlexer.lex"
 {
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel);
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel):
-#line 654 "./util/configlexer.lex"
+#line 655 "./util/configlexer.lex"
 {
 	yyerror("EOF inside include_toplevel directive");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 358:
-YY_RULE_SETUP
-#line 658 "./util/configlexer.lex"
-{ LEXOUT(("ITSP ")); /* ignore */ }
-	YY_BREAK
 case 359:
-/* rule 359 can match eol */
 YY_RULE_SETUP
 #line 659 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ LEXOUT(("ITSP ")); /* ignore */ }
 	YY_BREAK
 case 360:
+/* rule 360 can match eol */
 YY_RULE_SETUP
 #line 660 "./util/configlexer.lex"
-{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 case 361:
 YY_RULE_SETUP
 #line 661 "./util/configlexer.lex"
+{ LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); }
+	YY_BREAK
+case 362:
+YY_RULE_SETUP
+#line 662 "./util/configlexer.lex"
 {
 	LEXOUT(("ITunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext, 1);
@@ -5612,29 +5629,29 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_toplevel_quoted):
-#line 667 "./util/configlexer.lex"
+#line 668 "./util/configlexer.lex"
 {
 	yyerror("EOF inside quoted string");
 	BEGIN(inc_prev);
 }
 	YY_BREAK
-case 362:
+case 363:
 YY_RULE_SETUP
-#line 671 "./util/configlexer.lex"
+#line 672 "./util/configlexer.lex"
 { LEXOUT(("ITSTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 363:
-/* rule 363 can match eol */
+case 364:
+/* rule 364 can match eol */
 YY_RULE_SETUP
-#line 672 "./util/configlexer.lex"
+#line 673 "./util/configlexer.lex"
 {
 	yyerror("newline before \" in include name");
 	cfg_parser->line++; BEGIN(inc_prev);
 }
 	YY_BREAK
-case 364:
+case 365:
 YY_RULE_SETUP
-#line 676 "./util/configlexer.lex"
+#line 677 "./util/configlexer.lex"
 {
 	LEXOUT(("ITQE "));
 	yytext[yyleng - 1] = '\0';
@@ -5643,33 +5660,33 @@ YY_RULE_SETUP
 	return (VAR_FORCE_TOPLEVEL);
 }
 	YY_BREAK
-case 365:
+case 366:
 YY_RULE_SETUP
-#line 684 "./util/configlexer.lex"
+#line 685 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 366:
+case 367:
 YY_RULE_SETUP
-#line 688 "./util/configlexer.lex"
+#line 689 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 367:
+case 368:
 YY_RULE_SETUP
-#line 692 "./util/configlexer.lex"
+#line 693 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 368:
+case 369:
 YY_RULE_SETUP
-#line 696 "./util/configlexer.lex"
+#line 697 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 5670 "<stdout>"
+#line 5687 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -5964,7 +5981,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 3628 )
+			if ( yy_current_state >= 3646 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -5992,11 +6009,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 3628 )
+		if ( yy_current_state >= 3646 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 3627);
+	yy_is_jam = (yy_current_state == 3645);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -6635,6 +6652,6 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 696 "./util/configlexer.lex"
+#line 697 "./util/configlexer.lex"
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index fc9aa7266..09e314b21 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -562,6 +562,7 @@ edns-client-string{COLON}	{ YDVAR(2, VAR_EDNS_CLIENT_STRING) }
 edns-client-string-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) }
 nsid{COLON}			{ YDVAR(1, VAR_NSID ) }
 ede{COLON}			{ YDVAR(1, VAR_EDE ) }
+proxy-protocol-port{COLON}	{ YDVAR(1, VAR_PROXY_PROTOCOL_PORT) }
 <INITIAL,val>{NEWLINE}		{ LEXOUT(("NL\n")); cfg_parser->line++; }
 
 	/* Quoted strings. Strip leading and ending quotes */
diff --git a/util/configparser.c b/util/configparser.c
index 7f3cd99e1..4670d36e7 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -458,364 +458,366 @@ enum yysymbol_kind_t
   YYSYMBOL_VAR_INTERFACE_TAG = 330,        /* VAR_INTERFACE_TAG  */
   YYSYMBOL_VAR_INTERFACE_TAG_ACTION = 331, /* VAR_INTERFACE_TAG_ACTION  */
   YYSYMBOL_VAR_INTERFACE_TAG_DATA = 332,   /* VAR_INTERFACE_TAG_DATA  */
-  YYSYMBOL_YYACCEPT = 333,                 /* $accept  */
-  YYSYMBOL_toplevelvars = 334,             /* toplevelvars  */
-  YYSYMBOL_toplevelvar = 335,              /* toplevelvar  */
-  YYSYMBOL_force_toplevel = 336,           /* force_toplevel  */
-  YYSYMBOL_serverstart = 337,              /* serverstart  */
-  YYSYMBOL_contents_server = 338,          /* contents_server  */
-  YYSYMBOL_content_server = 339,           /* content_server  */
-  YYSYMBOL_stubstart = 340,                /* stubstart  */
-  YYSYMBOL_contents_stub = 341,            /* contents_stub  */
-  YYSYMBOL_content_stub = 342,             /* content_stub  */
-  YYSYMBOL_forwardstart = 343,             /* forwardstart  */
-  YYSYMBOL_contents_forward = 344,         /* contents_forward  */
-  YYSYMBOL_content_forward = 345,          /* content_forward  */
-  YYSYMBOL_viewstart = 346,                /* viewstart  */
-  YYSYMBOL_contents_view = 347,            /* contents_view  */
-  YYSYMBOL_content_view = 348,             /* content_view  */
-  YYSYMBOL_authstart = 349,                /* authstart  */
-  YYSYMBOL_contents_auth = 350,            /* contents_auth  */
-  YYSYMBOL_content_auth = 351,             /* content_auth  */
-  YYSYMBOL_rpz_tag = 352,                  /* rpz_tag  */
-  YYSYMBOL_rpz_action_override = 353,      /* rpz_action_override  */
-  YYSYMBOL_rpz_cname_override = 354,       /* rpz_cname_override  */
-  YYSYMBOL_rpz_log = 355,                  /* rpz_log  */
-  YYSYMBOL_rpz_log_name = 356,             /* rpz_log_name  */
-  YYSYMBOL_rpz_signal_nxdomain_ra = 357,   /* rpz_signal_nxdomain_ra  */
-  YYSYMBOL_rpzstart = 358,                 /* rpzstart  */
-  YYSYMBOL_contents_rpz = 359,             /* contents_rpz  */
-  YYSYMBOL_content_rpz = 360,              /* content_rpz  */
-  YYSYMBOL_server_num_threads = 361,       /* server_num_threads  */
-  YYSYMBOL_server_verbosity = 362,         /* server_verbosity  */
-  YYSYMBOL_server_statistics_interval = 363, /* server_statistics_interval  */
-  YYSYMBOL_server_statistics_cumulative = 364, /* server_statistics_cumulative  */
-  YYSYMBOL_server_extended_statistics = 365, /* server_extended_statistics  */
-  YYSYMBOL_server_shm_enable = 366,        /* server_shm_enable  */
-  YYSYMBOL_server_shm_key = 367,           /* server_shm_key  */
-  YYSYMBOL_server_port = 368,              /* server_port  */
-  YYSYMBOL_server_send_client_subnet = 369, /* server_send_client_subnet  */
-  YYSYMBOL_server_client_subnet_zone = 370, /* server_client_subnet_zone  */
-  YYSYMBOL_server_client_subnet_always_forward = 371, /* server_client_subnet_always_forward  */
-  YYSYMBOL_server_client_subnet_opcode = 372, /* server_client_subnet_opcode  */
-  YYSYMBOL_server_max_client_subnet_ipv4 = 373, /* server_max_client_subnet_ipv4  */
-  YYSYMBOL_server_max_client_subnet_ipv6 = 374, /* server_max_client_subnet_ipv6  */
-  YYSYMBOL_server_min_client_subnet_ipv4 = 375, /* server_min_client_subnet_ipv4  */
-  YYSYMBOL_server_min_client_subnet_ipv6 = 376, /* server_min_client_subnet_ipv6  */
-  YYSYMBOL_server_max_ecs_tree_size_ipv4 = 377, /* server_max_ecs_tree_size_ipv4  */
-  YYSYMBOL_server_max_ecs_tree_size_ipv6 = 378, /* server_max_ecs_tree_size_ipv6  */
-  YYSYMBOL_server_interface = 379,         /* server_interface  */
-  YYSYMBOL_server_outgoing_interface = 380, /* server_outgoing_interface  */
-  YYSYMBOL_server_outgoing_range = 381,    /* server_outgoing_range  */
-  YYSYMBOL_server_outgoing_port_permit = 382, /* server_outgoing_port_permit  */
-  YYSYMBOL_server_outgoing_port_avoid = 383, /* server_outgoing_port_avoid  */
-  YYSYMBOL_server_outgoing_num_tcp = 384,  /* server_outgoing_num_tcp  */
-  YYSYMBOL_server_incoming_num_tcp = 385,  /* server_incoming_num_tcp  */
-  YYSYMBOL_server_interface_automatic = 386, /* server_interface_automatic  */
-  YYSYMBOL_server_interface_automatic_ports = 387, /* server_interface_automatic_ports  */
-  YYSYMBOL_server_do_ip4 = 388,            /* server_do_ip4  */
-  YYSYMBOL_server_do_ip6 = 389,            /* server_do_ip6  */
-  YYSYMBOL_server_do_udp = 390,            /* server_do_udp  */
-  YYSYMBOL_server_do_tcp = 391,            /* server_do_tcp  */
-  YYSYMBOL_server_prefer_ip4 = 392,        /* server_prefer_ip4  */
-  YYSYMBOL_server_prefer_ip6 = 393,        /* server_prefer_ip6  */
-  YYSYMBOL_server_tcp_mss = 394,           /* server_tcp_mss  */
-  YYSYMBOL_server_outgoing_tcp_mss = 395,  /* server_outgoing_tcp_mss  */
-  YYSYMBOL_server_tcp_idle_timeout = 396,  /* server_tcp_idle_timeout  */
-  YYSYMBOL_server_max_reuse_tcp_queries = 397, /* server_max_reuse_tcp_queries  */
-  YYSYMBOL_server_tcp_reuse_timeout = 398, /* server_tcp_reuse_timeout  */
-  YYSYMBOL_server_tcp_auth_query_timeout = 399, /* server_tcp_auth_query_timeout  */
-  YYSYMBOL_server_tcp_keepalive = 400,     /* server_tcp_keepalive  */
-  YYSYMBOL_server_tcp_keepalive_timeout = 401, /* server_tcp_keepalive_timeout  */
-  YYSYMBOL_server_tcp_upstream = 402,      /* server_tcp_upstream  */
-  YYSYMBOL_server_udp_upstream_without_downstream = 403, /* server_udp_upstream_without_downstream  */
-  YYSYMBOL_server_ssl_upstream = 404,      /* server_ssl_upstream  */
-  YYSYMBOL_server_ssl_service_key = 405,   /* server_ssl_service_key  */
-  YYSYMBOL_server_ssl_service_pem = 406,   /* server_ssl_service_pem  */
-  YYSYMBOL_server_ssl_port = 407,          /* server_ssl_port  */
-  YYSYMBOL_server_tls_cert_bundle = 408,   /* server_tls_cert_bundle  */
-  YYSYMBOL_server_tls_win_cert = 409,      /* server_tls_win_cert  */
-  YYSYMBOL_server_tls_additional_port = 410, /* server_tls_additional_port  */
-  YYSYMBOL_server_tls_ciphers = 411,       /* server_tls_ciphers  */
-  YYSYMBOL_server_tls_ciphersuites = 412,  /* server_tls_ciphersuites  */
-  YYSYMBOL_server_tls_session_ticket_keys = 413, /* server_tls_session_ticket_keys  */
-  YYSYMBOL_server_tls_use_sni = 414,       /* server_tls_use_sni  */
-  YYSYMBOL_server_https_port = 415,        /* server_https_port  */
-  YYSYMBOL_server_http_endpoint = 416,     /* server_http_endpoint  */
-  YYSYMBOL_server_http_max_streams = 417,  /* server_http_max_streams  */
-  YYSYMBOL_server_http_query_buffer_size = 418, /* server_http_query_buffer_size  */
-  YYSYMBOL_server_http_response_buffer_size = 419, /* server_http_response_buffer_size  */
-  YYSYMBOL_server_http_nodelay = 420,      /* server_http_nodelay  */
-  YYSYMBOL_server_http_notls_downstream = 421, /* server_http_notls_downstream  */
-  YYSYMBOL_server_use_systemd = 422,       /* server_use_systemd  */
-  YYSYMBOL_server_do_daemonize = 423,      /* server_do_daemonize  */
-  YYSYMBOL_server_use_syslog = 424,        /* server_use_syslog  */
-  YYSYMBOL_server_log_time_ascii = 425,    /* server_log_time_ascii  */
-  YYSYMBOL_server_log_queries = 426,       /* server_log_queries  */
-  YYSYMBOL_server_log_replies = 427,       /* server_log_replies  */
-  YYSYMBOL_server_log_tag_queryreply = 428, /* server_log_tag_queryreply  */
-  YYSYMBOL_server_log_servfail = 429,      /* server_log_servfail  */
-  YYSYMBOL_server_log_local_actions = 430, /* server_log_local_actions  */
-  YYSYMBOL_server_chroot = 431,            /* server_chroot  */
-  YYSYMBOL_server_username = 432,          /* server_username  */
-  YYSYMBOL_server_directory = 433,         /* server_directory  */
-  YYSYMBOL_server_logfile = 434,           /* server_logfile  */
-  YYSYMBOL_server_pidfile = 435,           /* server_pidfile  */
-  YYSYMBOL_server_root_hints = 436,        /* server_root_hints  */
-  YYSYMBOL_server_dlv_anchor_file = 437,   /* server_dlv_anchor_file  */
-  YYSYMBOL_server_dlv_anchor = 438,        /* server_dlv_anchor  */
-  YYSYMBOL_server_auto_trust_anchor_file = 439, /* server_auto_trust_anchor_file  */
-  YYSYMBOL_server_trust_anchor_file = 440, /* server_trust_anchor_file  */
-  YYSYMBOL_server_trusted_keys_file = 441, /* server_trusted_keys_file  */
-  YYSYMBOL_server_trust_anchor = 442,      /* server_trust_anchor  */
-  YYSYMBOL_server_trust_anchor_signaling = 443, /* server_trust_anchor_signaling  */
-  YYSYMBOL_server_root_key_sentinel = 444, /* server_root_key_sentinel  */
-  YYSYMBOL_server_domain_insecure = 445,   /* server_domain_insecure  */
-  YYSYMBOL_server_hide_identity = 446,     /* server_hide_identity  */
-  YYSYMBOL_server_hide_version = 447,      /* server_hide_version  */
-  YYSYMBOL_server_hide_trustanchor = 448,  /* server_hide_trustanchor  */
-  YYSYMBOL_server_hide_http_user_agent = 449, /* server_hide_http_user_agent  */
-  YYSYMBOL_server_identity = 450,          /* server_identity  */
-  YYSYMBOL_server_version = 451,           /* server_version  */
-  YYSYMBOL_server_http_user_agent = 452,   /* server_http_user_agent  */
-  YYSYMBOL_server_nsid = 453,              /* server_nsid  */
-  YYSYMBOL_server_so_rcvbuf = 454,         /* server_so_rcvbuf  */
-  YYSYMBOL_server_so_sndbuf = 455,         /* server_so_sndbuf  */
-  YYSYMBOL_server_so_reuseport = 456,      /* server_so_reuseport  */
-  YYSYMBOL_server_ip_transparent = 457,    /* server_ip_transparent  */
-  YYSYMBOL_server_ip_freebind = 458,       /* server_ip_freebind  */
-  YYSYMBOL_server_ip_dscp = 459,           /* server_ip_dscp  */
-  YYSYMBOL_server_stream_wait_size = 460,  /* server_stream_wait_size  */
-  YYSYMBOL_server_edns_buffer_size = 461,  /* server_edns_buffer_size  */
-  YYSYMBOL_server_msg_buffer_size = 462,   /* server_msg_buffer_size  */
-  YYSYMBOL_server_msg_cache_size = 463,    /* server_msg_cache_size  */
-  YYSYMBOL_server_msg_cache_slabs = 464,   /* server_msg_cache_slabs  */
-  YYSYMBOL_server_num_queries_per_thread = 465, /* server_num_queries_per_thread  */
-  YYSYMBOL_server_jostle_timeout = 466,    /* server_jostle_timeout  */
-  YYSYMBOL_server_delay_close = 467,       /* server_delay_close  */
-  YYSYMBOL_server_udp_connect = 468,       /* server_udp_connect  */
-  YYSYMBOL_server_unblock_lan_zones = 469, /* server_unblock_lan_zones  */
-  YYSYMBOL_server_insecure_lan_zones = 470, /* server_insecure_lan_zones  */
-  YYSYMBOL_server_rrset_cache_size = 471,  /* server_rrset_cache_size  */
-  YYSYMBOL_server_rrset_cache_slabs = 472, /* server_rrset_cache_slabs  */
-  YYSYMBOL_server_infra_host_ttl = 473,    /* server_infra_host_ttl  */
-  YYSYMBOL_server_infra_lame_ttl = 474,    /* server_infra_lame_ttl  */
-  YYSYMBOL_server_infra_cache_numhosts = 475, /* server_infra_cache_numhosts  */
-  YYSYMBOL_server_infra_cache_lame_size = 476, /* server_infra_cache_lame_size  */
-  YYSYMBOL_server_infra_cache_slabs = 477, /* server_infra_cache_slabs  */
-  YYSYMBOL_server_infra_cache_min_rtt = 478, /* server_infra_cache_min_rtt  */
-  YYSYMBOL_server_infra_cache_max_rtt = 479, /* server_infra_cache_max_rtt  */
-  YYSYMBOL_server_infra_keep_probing = 480, /* server_infra_keep_probing  */
-  YYSYMBOL_server_target_fetch_policy = 481, /* server_target_fetch_policy  */
-  YYSYMBOL_server_harden_short_bufsize = 482, /* server_harden_short_bufsize  */
-  YYSYMBOL_server_harden_large_queries = 483, /* server_harden_large_queries  */
-  YYSYMBOL_server_harden_glue = 484,       /* server_harden_glue  */
-  YYSYMBOL_server_harden_dnssec_stripped = 485, /* server_harden_dnssec_stripped  */
-  YYSYMBOL_server_harden_below_nxdomain = 486, /* server_harden_below_nxdomain  */
-  YYSYMBOL_server_harden_referral_path = 487, /* server_harden_referral_path  */
-  YYSYMBOL_server_harden_algo_downgrade = 488, /* server_harden_algo_downgrade  */
-  YYSYMBOL_server_use_caps_for_id = 489,   /* server_use_caps_for_id  */
-  YYSYMBOL_server_caps_whitelist = 490,    /* server_caps_whitelist  */
-  YYSYMBOL_server_private_address = 491,   /* server_private_address  */
-  YYSYMBOL_server_private_domain = 492,    /* server_private_domain  */
-  YYSYMBOL_server_prefetch = 493,          /* server_prefetch  */
-  YYSYMBOL_server_prefetch_key = 494,      /* server_prefetch_key  */
-  YYSYMBOL_server_deny_any = 495,          /* server_deny_any  */
-  YYSYMBOL_server_unwanted_reply_threshold = 496, /* server_unwanted_reply_threshold  */
-  YYSYMBOL_server_do_not_query_address = 497, /* server_do_not_query_address  */
-  YYSYMBOL_server_do_not_query_localhost = 498, /* server_do_not_query_localhost  */
-  YYSYMBOL_server_access_control = 499,    /* server_access_control  */
-  YYSYMBOL_server_interface_action = 500,  /* server_interface_action  */
-  YYSYMBOL_server_module_conf = 501,       /* server_module_conf  */
-  YYSYMBOL_server_val_override_date = 502, /* server_val_override_date  */
-  YYSYMBOL_server_val_sig_skew_min = 503,  /* server_val_sig_skew_min  */
-  YYSYMBOL_server_val_sig_skew_max = 504,  /* server_val_sig_skew_max  */
-  YYSYMBOL_server_val_max_restart = 505,   /* server_val_max_restart  */
-  YYSYMBOL_server_cache_max_ttl = 506,     /* server_cache_max_ttl  */
-  YYSYMBOL_server_cache_max_negative_ttl = 507, /* server_cache_max_negative_ttl  */
-  YYSYMBOL_server_cache_min_ttl = 508,     /* server_cache_min_ttl  */
-  YYSYMBOL_server_bogus_ttl = 509,         /* server_bogus_ttl  */
-  YYSYMBOL_server_val_clean_additional = 510, /* server_val_clean_additional  */
-  YYSYMBOL_server_val_permissive_mode = 511, /* server_val_permissive_mode  */
-  YYSYMBOL_server_aggressive_nsec = 512,   /* server_aggressive_nsec  */
-  YYSYMBOL_server_ignore_cd_flag = 513,    /* server_ignore_cd_flag  */
-  YYSYMBOL_server_serve_expired = 514,     /* server_serve_expired  */
-  YYSYMBOL_server_serve_expired_ttl = 515, /* server_serve_expired_ttl  */
-  YYSYMBOL_server_serve_expired_ttl_reset = 516, /* server_serve_expired_ttl_reset  */
-  YYSYMBOL_server_serve_expired_reply_ttl = 517, /* server_serve_expired_reply_ttl  */
-  YYSYMBOL_server_serve_expired_client_timeout = 518, /* server_serve_expired_client_timeout  */
-  YYSYMBOL_server_ede_serve_expired = 519, /* server_ede_serve_expired  */
-  YYSYMBOL_server_serve_original_ttl = 520, /* server_serve_original_ttl  */
-  YYSYMBOL_server_fake_dsa = 521,          /* server_fake_dsa  */
-  YYSYMBOL_server_fake_sha1 = 522,         /* server_fake_sha1  */
-  YYSYMBOL_server_val_log_level = 523,     /* server_val_log_level  */
-  YYSYMBOL_server_val_nsec3_keysize_iterations = 524, /* server_val_nsec3_keysize_iterations  */
-  YYSYMBOL_server_zonemd_permissive_mode = 525, /* server_zonemd_permissive_mode  */
-  YYSYMBOL_server_add_holddown = 526,      /* server_add_holddown  */
-  YYSYMBOL_server_del_holddown = 527,      /* server_del_holddown  */
-  YYSYMBOL_server_keep_missing = 528,      /* server_keep_missing  */
-  YYSYMBOL_server_permit_small_holddown = 529, /* server_permit_small_holddown  */
-  YYSYMBOL_server_key_cache_size = 530,    /* server_key_cache_size  */
-  YYSYMBOL_server_key_cache_slabs = 531,   /* server_key_cache_slabs  */
-  YYSYMBOL_server_neg_cache_size = 532,    /* server_neg_cache_size  */
-  YYSYMBOL_server_local_zone = 533,        /* server_local_zone  */
-  YYSYMBOL_server_local_data = 534,        /* server_local_data  */
-  YYSYMBOL_server_local_data_ptr = 535,    /* server_local_data_ptr  */
-  YYSYMBOL_server_minimal_responses = 536, /* server_minimal_responses  */
-  YYSYMBOL_server_rrset_roundrobin = 537,  /* server_rrset_roundrobin  */
-  YYSYMBOL_server_unknown_server_time_limit = 538, /* server_unknown_server_time_limit  */
-  YYSYMBOL_server_max_udp_size = 539,      /* server_max_udp_size  */
-  YYSYMBOL_server_dns64_prefix = 540,      /* server_dns64_prefix  */
-  YYSYMBOL_server_dns64_synthall = 541,    /* server_dns64_synthall  */
-  YYSYMBOL_server_dns64_ignore_aaaa = 542, /* server_dns64_ignore_aaaa  */
-  YYSYMBOL_server_define_tag = 543,        /* server_define_tag  */
-  YYSYMBOL_server_local_zone_tag = 544,    /* server_local_zone_tag  */
-  YYSYMBOL_server_access_control_tag = 545, /* server_access_control_tag  */
-  YYSYMBOL_server_access_control_tag_action = 546, /* server_access_control_tag_action  */
-  YYSYMBOL_server_access_control_tag_data = 547, /* server_access_control_tag_data  */
-  YYSYMBOL_server_local_zone_override = 548, /* server_local_zone_override  */
-  YYSYMBOL_server_access_control_view = 549, /* server_access_control_view  */
-  YYSYMBOL_server_interface_tag = 550,     /* server_interface_tag  */
-  YYSYMBOL_server_interface_tag_action = 551, /* server_interface_tag_action  */
-  YYSYMBOL_server_interface_tag_data = 552, /* server_interface_tag_data  */
-  YYSYMBOL_server_interface_view = 553,    /* server_interface_view  */
-  YYSYMBOL_server_response_ip_tag = 554,   /* server_response_ip_tag  */
-  YYSYMBOL_server_ip_ratelimit = 555,      /* server_ip_ratelimit  */
-  YYSYMBOL_server_ratelimit = 556,         /* server_ratelimit  */
-  YYSYMBOL_server_ip_ratelimit_size = 557, /* server_ip_ratelimit_size  */
-  YYSYMBOL_server_ratelimit_size = 558,    /* server_ratelimit_size  */
-  YYSYMBOL_server_ip_ratelimit_slabs = 559, /* server_ip_ratelimit_slabs  */
-  YYSYMBOL_server_ratelimit_slabs = 560,   /* server_ratelimit_slabs  */
-  YYSYMBOL_server_ratelimit_for_domain = 561, /* server_ratelimit_for_domain  */
-  YYSYMBOL_server_ratelimit_below_domain = 562, /* server_ratelimit_below_domain  */
-  YYSYMBOL_server_ip_ratelimit_factor = 563, /* server_ip_ratelimit_factor  */
-  YYSYMBOL_server_ratelimit_factor = 564,  /* server_ratelimit_factor  */
-  YYSYMBOL_server_ip_ratelimit_backoff = 565, /* server_ip_ratelimit_backoff  */
-  YYSYMBOL_server_ratelimit_backoff = 566, /* server_ratelimit_backoff  */
-  YYSYMBOL_server_outbound_msg_retry = 567, /* server_outbound_msg_retry  */
-  YYSYMBOL_server_low_rtt = 568,           /* server_low_rtt  */
-  YYSYMBOL_server_fast_server_num = 569,   /* server_fast_server_num  */
-  YYSYMBOL_server_fast_server_permil = 570, /* server_fast_server_permil  */
-  YYSYMBOL_server_qname_minimisation = 571, /* server_qname_minimisation  */
-  YYSYMBOL_server_qname_minimisation_strict = 572, /* server_qname_minimisation_strict  */
-  YYSYMBOL_server_pad_responses = 573,     /* server_pad_responses  */
-  YYSYMBOL_server_pad_responses_block_size = 574, /* server_pad_responses_block_size  */
-  YYSYMBOL_server_pad_queries = 575,       /* server_pad_queries  */
-  YYSYMBOL_server_pad_queries_block_size = 576, /* server_pad_queries_block_size  */
-  YYSYMBOL_server_ipsecmod_enabled = 577,  /* server_ipsecmod_enabled  */
-  YYSYMBOL_server_ipsecmod_ignore_bogus = 578, /* server_ipsecmod_ignore_bogus  */
-  YYSYMBOL_server_ipsecmod_hook = 579,     /* server_ipsecmod_hook  */
-  YYSYMBOL_server_ipsecmod_max_ttl = 580,  /* server_ipsecmod_max_ttl  */
-  YYSYMBOL_server_ipsecmod_whitelist = 581, /* server_ipsecmod_whitelist  */
-  YYSYMBOL_server_ipsecmod_strict = 582,   /* server_ipsecmod_strict  */
-  YYSYMBOL_server_edns_client_string = 583, /* server_edns_client_string  */
-  YYSYMBOL_server_edns_client_string_opcode = 584, /* server_edns_client_string_opcode  */
-  YYSYMBOL_server_ede = 585,               /* server_ede  */
-  YYSYMBOL_stub_name = 586,                /* stub_name  */
-  YYSYMBOL_stub_host = 587,                /* stub_host  */
-  YYSYMBOL_stub_addr = 588,                /* stub_addr  */
-  YYSYMBOL_stub_first = 589,               /* stub_first  */
-  YYSYMBOL_stub_no_cache = 590,            /* stub_no_cache  */
-  YYSYMBOL_stub_ssl_upstream = 591,        /* stub_ssl_upstream  */
-  YYSYMBOL_stub_tcp_upstream = 592,        /* stub_tcp_upstream  */
-  YYSYMBOL_stub_prime = 593,               /* stub_prime  */
-  YYSYMBOL_forward_name = 594,             /* forward_name  */
-  YYSYMBOL_forward_host = 595,             /* forward_host  */
-  YYSYMBOL_forward_addr = 596,             /* forward_addr  */
-  YYSYMBOL_forward_first = 597,            /* forward_first  */
-  YYSYMBOL_forward_no_cache = 598,         /* forward_no_cache  */
-  YYSYMBOL_forward_ssl_upstream = 599,     /* forward_ssl_upstream  */
-  YYSYMBOL_forward_tcp_upstream = 600,     /* forward_tcp_upstream  */
-  YYSYMBOL_auth_name = 601,                /* auth_name  */
-  YYSYMBOL_auth_zonefile = 602,            /* auth_zonefile  */
-  YYSYMBOL_auth_master = 603,              /* auth_master  */
-  YYSYMBOL_auth_url = 604,                 /* auth_url  */
-  YYSYMBOL_auth_allow_notify = 605,        /* auth_allow_notify  */
-  YYSYMBOL_auth_zonemd_check = 606,        /* auth_zonemd_check  */
-  YYSYMBOL_auth_zonemd_reject_absence = 607, /* auth_zonemd_reject_absence  */
-  YYSYMBOL_auth_for_downstream = 608,      /* auth_for_downstream  */
-  YYSYMBOL_auth_for_upstream = 609,        /* auth_for_upstream  */
-  YYSYMBOL_auth_fallback_enabled = 610,    /* auth_fallback_enabled  */
-  YYSYMBOL_view_name = 611,                /* view_name  */
-  YYSYMBOL_view_local_zone = 612,          /* view_local_zone  */
-  YYSYMBOL_view_response_ip = 613,         /* view_response_ip  */
-  YYSYMBOL_view_response_ip_data = 614,    /* view_response_ip_data  */
-  YYSYMBOL_view_local_data = 615,          /* view_local_data  */
-  YYSYMBOL_view_local_data_ptr = 616,      /* view_local_data_ptr  */
-  YYSYMBOL_view_first = 617,               /* view_first  */
-  YYSYMBOL_rcstart = 618,                  /* rcstart  */
-  YYSYMBOL_contents_rc = 619,              /* contents_rc  */
-  YYSYMBOL_content_rc = 620,               /* content_rc  */
-  YYSYMBOL_rc_control_enable = 621,        /* rc_control_enable  */
-  YYSYMBOL_rc_control_port = 622,          /* rc_control_port  */
-  YYSYMBOL_rc_control_interface = 623,     /* rc_control_interface  */
-  YYSYMBOL_rc_control_use_cert = 624,      /* rc_control_use_cert  */
-  YYSYMBOL_rc_server_key_file = 625,       /* rc_server_key_file  */
-  YYSYMBOL_rc_server_cert_file = 626,      /* rc_server_cert_file  */
-  YYSYMBOL_rc_control_key_file = 627,      /* rc_control_key_file  */
-  YYSYMBOL_rc_control_cert_file = 628,     /* rc_control_cert_file  */
-  YYSYMBOL_dtstart = 629,                  /* dtstart  */
-  YYSYMBOL_contents_dt = 630,              /* contents_dt  */
-  YYSYMBOL_content_dt = 631,               /* content_dt  */
-  YYSYMBOL_dt_dnstap_enable = 632,         /* dt_dnstap_enable  */
-  YYSYMBOL_dt_dnstap_bidirectional = 633,  /* dt_dnstap_bidirectional  */
-  YYSYMBOL_dt_dnstap_socket_path = 634,    /* dt_dnstap_socket_path  */
-  YYSYMBOL_dt_dnstap_ip = 635,             /* dt_dnstap_ip  */
-  YYSYMBOL_dt_dnstap_tls = 636,            /* dt_dnstap_tls  */
-  YYSYMBOL_dt_dnstap_tls_server_name = 637, /* dt_dnstap_tls_server_name  */
-  YYSYMBOL_dt_dnstap_tls_cert_bundle = 638, /* dt_dnstap_tls_cert_bundle  */
-  YYSYMBOL_dt_dnstap_tls_client_key_file = 639, /* dt_dnstap_tls_client_key_file  */
-  YYSYMBOL_dt_dnstap_tls_client_cert_file = 640, /* dt_dnstap_tls_client_cert_file  */
-  YYSYMBOL_dt_dnstap_send_identity = 641,  /* dt_dnstap_send_identity  */
-  YYSYMBOL_dt_dnstap_send_version = 642,   /* dt_dnstap_send_version  */
-  YYSYMBOL_dt_dnstap_identity = 643,       /* dt_dnstap_identity  */
-  YYSYMBOL_dt_dnstap_version = 644,        /* dt_dnstap_version  */
-  YYSYMBOL_dt_dnstap_log_resolver_query_messages = 645, /* dt_dnstap_log_resolver_query_messages  */
-  YYSYMBOL_dt_dnstap_log_resolver_response_messages = 646, /* dt_dnstap_log_resolver_response_messages  */
-  YYSYMBOL_dt_dnstap_log_client_query_messages = 647, /* dt_dnstap_log_client_query_messages  */
-  YYSYMBOL_dt_dnstap_log_client_response_messages = 648, /* dt_dnstap_log_client_response_messages  */
-  YYSYMBOL_dt_dnstap_log_forwarder_query_messages = 649, /* dt_dnstap_log_forwarder_query_messages  */
-  YYSYMBOL_dt_dnstap_log_forwarder_response_messages = 650, /* dt_dnstap_log_forwarder_response_messages  */
-  YYSYMBOL_pythonstart = 651,              /* pythonstart  */
-  YYSYMBOL_contents_py = 652,              /* contents_py  */
-  YYSYMBOL_content_py = 653,               /* content_py  */
-  YYSYMBOL_py_script = 654,                /* py_script  */
-  YYSYMBOL_dynlibstart = 655,              /* dynlibstart  */
-  YYSYMBOL_contents_dl = 656,              /* contents_dl  */
-  YYSYMBOL_content_dl = 657,               /* content_dl  */
-  YYSYMBOL_dl_file = 658,                  /* dl_file  */
-  YYSYMBOL_server_disable_dnssec_lame_check = 659, /* server_disable_dnssec_lame_check  */
-  YYSYMBOL_server_log_identity = 660,      /* server_log_identity  */
-  YYSYMBOL_server_response_ip = 661,       /* server_response_ip  */
-  YYSYMBOL_server_response_ip_data = 662,  /* server_response_ip_data  */
-  YYSYMBOL_dnscstart = 663,                /* dnscstart  */
-  YYSYMBOL_contents_dnsc = 664,            /* contents_dnsc  */
-  YYSYMBOL_content_dnsc = 665,             /* content_dnsc  */
-  YYSYMBOL_dnsc_dnscrypt_enable = 666,     /* dnsc_dnscrypt_enable  */
-  YYSYMBOL_dnsc_dnscrypt_port = 667,       /* dnsc_dnscrypt_port  */
-  YYSYMBOL_dnsc_dnscrypt_provider = 668,   /* dnsc_dnscrypt_provider  */
-  YYSYMBOL_dnsc_dnscrypt_provider_cert = 669, /* dnsc_dnscrypt_provider_cert  */
-  YYSYMBOL_dnsc_dnscrypt_provider_cert_rotated = 670, /* dnsc_dnscrypt_provider_cert_rotated  */
-  YYSYMBOL_dnsc_dnscrypt_secret_key = 671, /* dnsc_dnscrypt_secret_key  */
-  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_size = 672, /* dnsc_dnscrypt_shared_secret_cache_size  */
-  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_slabs = 673, /* dnsc_dnscrypt_shared_secret_cache_slabs  */
-  YYSYMBOL_dnsc_dnscrypt_nonce_cache_size = 674, /* dnsc_dnscrypt_nonce_cache_size  */
-  YYSYMBOL_dnsc_dnscrypt_nonce_cache_slabs = 675, /* dnsc_dnscrypt_nonce_cache_slabs  */
-  YYSYMBOL_cachedbstart = 676,             /* cachedbstart  */
-  YYSYMBOL_contents_cachedb = 677,         /* contents_cachedb  */
-  YYSYMBOL_content_cachedb = 678,          /* content_cachedb  */
-  YYSYMBOL_cachedb_backend_name = 679,     /* cachedb_backend_name  */
-  YYSYMBOL_cachedb_secret_seed = 680,      /* cachedb_secret_seed  */
-  YYSYMBOL_redis_server_host = 681,        /* redis_server_host  */
-  YYSYMBOL_redis_server_port = 682,        /* redis_server_port  */
-  YYSYMBOL_redis_timeout = 683,            /* redis_timeout  */
-  YYSYMBOL_redis_expire_records = 684,     /* redis_expire_records  */
-  YYSYMBOL_server_tcp_connection_limit = 685, /* server_tcp_connection_limit  */
-  YYSYMBOL_ipsetstart = 686,               /* ipsetstart  */
-  YYSYMBOL_contents_ipset = 687,           /* contents_ipset  */
-  YYSYMBOL_content_ipset = 688,            /* content_ipset  */
-  YYSYMBOL_ipset_name_v4 = 689,            /* ipset_name_v4  */
-  YYSYMBOL_ipset_name_v6 = 690             /* ipset_name_v6  */
+  YYSYMBOL_VAR_PROXY_PROTOCOL_PORT = 333,  /* VAR_PROXY_PROTOCOL_PORT  */
+  YYSYMBOL_YYACCEPT = 334,                 /* $accept  */
+  YYSYMBOL_toplevelvars = 335,             /* toplevelvars  */
+  YYSYMBOL_toplevelvar = 336,              /* toplevelvar  */
+  YYSYMBOL_force_toplevel = 337,           /* force_toplevel  */
+  YYSYMBOL_serverstart = 338,              /* serverstart  */
+  YYSYMBOL_contents_server = 339,          /* contents_server  */
+  YYSYMBOL_content_server = 340,           /* content_server  */
+  YYSYMBOL_stubstart = 341,                /* stubstart  */
+  YYSYMBOL_contents_stub = 342,            /* contents_stub  */
+  YYSYMBOL_content_stub = 343,             /* content_stub  */
+  YYSYMBOL_forwardstart = 344,             /* forwardstart  */
+  YYSYMBOL_contents_forward = 345,         /* contents_forward  */
+  YYSYMBOL_content_forward = 346,          /* content_forward  */
+  YYSYMBOL_viewstart = 347,                /* viewstart  */
+  YYSYMBOL_contents_view = 348,            /* contents_view  */
+  YYSYMBOL_content_view = 349,             /* content_view  */
+  YYSYMBOL_authstart = 350,                /* authstart  */
+  YYSYMBOL_contents_auth = 351,            /* contents_auth  */
+  YYSYMBOL_content_auth = 352,             /* content_auth  */
+  YYSYMBOL_rpz_tag = 353,                  /* rpz_tag  */
+  YYSYMBOL_rpz_action_override = 354,      /* rpz_action_override  */
+  YYSYMBOL_rpz_cname_override = 355,       /* rpz_cname_override  */
+  YYSYMBOL_rpz_log = 356,                  /* rpz_log  */
+  YYSYMBOL_rpz_log_name = 357,             /* rpz_log_name  */
+  YYSYMBOL_rpz_signal_nxdomain_ra = 358,   /* rpz_signal_nxdomain_ra  */
+  YYSYMBOL_rpzstart = 359,                 /* rpzstart  */
+  YYSYMBOL_contents_rpz = 360,             /* contents_rpz  */
+  YYSYMBOL_content_rpz = 361,              /* content_rpz  */
+  YYSYMBOL_server_num_threads = 362,       /* server_num_threads  */
+  YYSYMBOL_server_verbosity = 363,         /* server_verbosity  */
+  YYSYMBOL_server_statistics_interval = 364, /* server_statistics_interval  */
+  YYSYMBOL_server_statistics_cumulative = 365, /* server_statistics_cumulative  */
+  YYSYMBOL_server_extended_statistics = 366, /* server_extended_statistics  */
+  YYSYMBOL_server_shm_enable = 367,        /* server_shm_enable  */
+  YYSYMBOL_server_shm_key = 368,           /* server_shm_key  */
+  YYSYMBOL_server_port = 369,              /* server_port  */
+  YYSYMBOL_server_send_client_subnet = 370, /* server_send_client_subnet  */
+  YYSYMBOL_server_client_subnet_zone = 371, /* server_client_subnet_zone  */
+  YYSYMBOL_server_client_subnet_always_forward = 372, /* server_client_subnet_always_forward  */
+  YYSYMBOL_server_client_subnet_opcode = 373, /* server_client_subnet_opcode  */
+  YYSYMBOL_server_max_client_subnet_ipv4 = 374, /* server_max_client_subnet_ipv4  */
+  YYSYMBOL_server_max_client_subnet_ipv6 = 375, /* server_max_client_subnet_ipv6  */
+  YYSYMBOL_server_min_client_subnet_ipv4 = 376, /* server_min_client_subnet_ipv4  */
+  YYSYMBOL_server_min_client_subnet_ipv6 = 377, /* server_min_client_subnet_ipv6  */
+  YYSYMBOL_server_max_ecs_tree_size_ipv4 = 378, /* server_max_ecs_tree_size_ipv4  */
+  YYSYMBOL_server_max_ecs_tree_size_ipv6 = 379, /* server_max_ecs_tree_size_ipv6  */
+  YYSYMBOL_server_interface = 380,         /* server_interface  */
+  YYSYMBOL_server_outgoing_interface = 381, /* server_outgoing_interface  */
+  YYSYMBOL_server_outgoing_range = 382,    /* server_outgoing_range  */
+  YYSYMBOL_server_outgoing_port_permit = 383, /* server_outgoing_port_permit  */
+  YYSYMBOL_server_outgoing_port_avoid = 384, /* server_outgoing_port_avoid  */
+  YYSYMBOL_server_outgoing_num_tcp = 385,  /* server_outgoing_num_tcp  */
+  YYSYMBOL_server_incoming_num_tcp = 386,  /* server_incoming_num_tcp  */
+  YYSYMBOL_server_interface_automatic = 387, /* server_interface_automatic  */
+  YYSYMBOL_server_interface_automatic_ports = 388, /* server_interface_automatic_ports  */
+  YYSYMBOL_server_do_ip4 = 389,            /* server_do_ip4  */
+  YYSYMBOL_server_do_ip6 = 390,            /* server_do_ip6  */
+  YYSYMBOL_server_do_udp = 391,            /* server_do_udp  */
+  YYSYMBOL_server_do_tcp = 392,            /* server_do_tcp  */
+  YYSYMBOL_server_prefer_ip4 = 393,        /* server_prefer_ip4  */
+  YYSYMBOL_server_prefer_ip6 = 394,        /* server_prefer_ip6  */
+  YYSYMBOL_server_tcp_mss = 395,           /* server_tcp_mss  */
+  YYSYMBOL_server_outgoing_tcp_mss = 396,  /* server_outgoing_tcp_mss  */
+  YYSYMBOL_server_tcp_idle_timeout = 397,  /* server_tcp_idle_timeout  */
+  YYSYMBOL_server_max_reuse_tcp_queries = 398, /* server_max_reuse_tcp_queries  */
+  YYSYMBOL_server_tcp_reuse_timeout = 399, /* server_tcp_reuse_timeout  */
+  YYSYMBOL_server_tcp_auth_query_timeout = 400, /* server_tcp_auth_query_timeout  */
+  YYSYMBOL_server_tcp_keepalive = 401,     /* server_tcp_keepalive  */
+  YYSYMBOL_server_tcp_keepalive_timeout = 402, /* server_tcp_keepalive_timeout  */
+  YYSYMBOL_server_tcp_upstream = 403,      /* server_tcp_upstream  */
+  YYSYMBOL_server_udp_upstream_without_downstream = 404, /* server_udp_upstream_without_downstream  */
+  YYSYMBOL_server_ssl_upstream = 405,      /* server_ssl_upstream  */
+  YYSYMBOL_server_ssl_service_key = 406,   /* server_ssl_service_key  */
+  YYSYMBOL_server_ssl_service_pem = 407,   /* server_ssl_service_pem  */
+  YYSYMBOL_server_ssl_port = 408,          /* server_ssl_port  */
+  YYSYMBOL_server_tls_cert_bundle = 409,   /* server_tls_cert_bundle  */
+  YYSYMBOL_server_tls_win_cert = 410,      /* server_tls_win_cert  */
+  YYSYMBOL_server_tls_additional_port = 411, /* server_tls_additional_port  */
+  YYSYMBOL_server_tls_ciphers = 412,       /* server_tls_ciphers  */
+  YYSYMBOL_server_tls_ciphersuites = 413,  /* server_tls_ciphersuites  */
+  YYSYMBOL_server_tls_session_ticket_keys = 414, /* server_tls_session_ticket_keys  */
+  YYSYMBOL_server_tls_use_sni = 415,       /* server_tls_use_sni  */
+  YYSYMBOL_server_https_port = 416,        /* server_https_port  */
+  YYSYMBOL_server_http_endpoint = 417,     /* server_http_endpoint  */
+  YYSYMBOL_server_http_max_streams = 418,  /* server_http_max_streams  */
+  YYSYMBOL_server_http_query_buffer_size = 419, /* server_http_query_buffer_size  */
+  YYSYMBOL_server_http_response_buffer_size = 420, /* server_http_response_buffer_size  */
+  YYSYMBOL_server_http_nodelay = 421,      /* server_http_nodelay  */
+  YYSYMBOL_server_http_notls_downstream = 422, /* server_http_notls_downstream  */
+  YYSYMBOL_server_use_systemd = 423,       /* server_use_systemd  */
+  YYSYMBOL_server_do_daemonize = 424,      /* server_do_daemonize  */
+  YYSYMBOL_server_use_syslog = 425,        /* server_use_syslog  */
+  YYSYMBOL_server_log_time_ascii = 426,    /* server_log_time_ascii  */
+  YYSYMBOL_server_log_queries = 427,       /* server_log_queries  */
+  YYSYMBOL_server_log_replies = 428,       /* server_log_replies  */
+  YYSYMBOL_server_log_tag_queryreply = 429, /* server_log_tag_queryreply  */
+  YYSYMBOL_server_log_servfail = 430,      /* server_log_servfail  */
+  YYSYMBOL_server_log_local_actions = 431, /* server_log_local_actions  */
+  YYSYMBOL_server_chroot = 432,            /* server_chroot  */
+  YYSYMBOL_server_username = 433,          /* server_username  */
+  YYSYMBOL_server_directory = 434,         /* server_directory  */
+  YYSYMBOL_server_logfile = 435,           /* server_logfile  */
+  YYSYMBOL_server_pidfile = 436,           /* server_pidfile  */
+  YYSYMBOL_server_root_hints = 437,        /* server_root_hints  */
+  YYSYMBOL_server_dlv_anchor_file = 438,   /* server_dlv_anchor_file  */
+  YYSYMBOL_server_dlv_anchor = 439,        /* server_dlv_anchor  */
+  YYSYMBOL_server_auto_trust_anchor_file = 440, /* server_auto_trust_anchor_file  */
+  YYSYMBOL_server_trust_anchor_file = 441, /* server_trust_anchor_file  */
+  YYSYMBOL_server_trusted_keys_file = 442, /* server_trusted_keys_file  */
+  YYSYMBOL_server_trust_anchor = 443,      /* server_trust_anchor  */
+  YYSYMBOL_server_trust_anchor_signaling = 444, /* server_trust_anchor_signaling  */
+  YYSYMBOL_server_root_key_sentinel = 445, /* server_root_key_sentinel  */
+  YYSYMBOL_server_domain_insecure = 446,   /* server_domain_insecure  */
+  YYSYMBOL_server_hide_identity = 447,     /* server_hide_identity  */
+  YYSYMBOL_server_hide_version = 448,      /* server_hide_version  */
+  YYSYMBOL_server_hide_trustanchor = 449,  /* server_hide_trustanchor  */
+  YYSYMBOL_server_hide_http_user_agent = 450, /* server_hide_http_user_agent  */
+  YYSYMBOL_server_identity = 451,          /* server_identity  */
+  YYSYMBOL_server_version = 452,           /* server_version  */
+  YYSYMBOL_server_http_user_agent = 453,   /* server_http_user_agent  */
+  YYSYMBOL_server_nsid = 454,              /* server_nsid  */
+  YYSYMBOL_server_so_rcvbuf = 455,         /* server_so_rcvbuf  */
+  YYSYMBOL_server_so_sndbuf = 456,         /* server_so_sndbuf  */
+  YYSYMBOL_server_so_reuseport = 457,      /* server_so_reuseport  */
+  YYSYMBOL_server_ip_transparent = 458,    /* server_ip_transparent  */
+  YYSYMBOL_server_ip_freebind = 459,       /* server_ip_freebind  */
+  YYSYMBOL_server_ip_dscp = 460,           /* server_ip_dscp  */
+  YYSYMBOL_server_stream_wait_size = 461,  /* server_stream_wait_size  */
+  YYSYMBOL_server_edns_buffer_size = 462,  /* server_edns_buffer_size  */
+  YYSYMBOL_server_msg_buffer_size = 463,   /* server_msg_buffer_size  */
+  YYSYMBOL_server_msg_cache_size = 464,    /* server_msg_cache_size  */
+  YYSYMBOL_server_msg_cache_slabs = 465,   /* server_msg_cache_slabs  */
+  YYSYMBOL_server_num_queries_per_thread = 466, /* server_num_queries_per_thread  */
+  YYSYMBOL_server_jostle_timeout = 467,    /* server_jostle_timeout  */
+  YYSYMBOL_server_delay_close = 468,       /* server_delay_close  */
+  YYSYMBOL_server_udp_connect = 469,       /* server_udp_connect  */
+  YYSYMBOL_server_unblock_lan_zones = 470, /* server_unblock_lan_zones  */
+  YYSYMBOL_server_insecure_lan_zones = 471, /* server_insecure_lan_zones  */
+  YYSYMBOL_server_rrset_cache_size = 472,  /* server_rrset_cache_size  */
+  YYSYMBOL_server_rrset_cache_slabs = 473, /* server_rrset_cache_slabs  */
+  YYSYMBOL_server_infra_host_ttl = 474,    /* server_infra_host_ttl  */
+  YYSYMBOL_server_infra_lame_ttl = 475,    /* server_infra_lame_ttl  */
+  YYSYMBOL_server_infra_cache_numhosts = 476, /* server_infra_cache_numhosts  */
+  YYSYMBOL_server_infra_cache_lame_size = 477, /* server_infra_cache_lame_size  */
+  YYSYMBOL_server_infra_cache_slabs = 478, /* server_infra_cache_slabs  */
+  YYSYMBOL_server_infra_cache_min_rtt = 479, /* server_infra_cache_min_rtt  */
+  YYSYMBOL_server_infra_cache_max_rtt = 480, /* server_infra_cache_max_rtt  */
+  YYSYMBOL_server_infra_keep_probing = 481, /* server_infra_keep_probing  */
+  YYSYMBOL_server_target_fetch_policy = 482, /* server_target_fetch_policy  */
+  YYSYMBOL_server_harden_short_bufsize = 483, /* server_harden_short_bufsize  */
+  YYSYMBOL_server_harden_large_queries = 484, /* server_harden_large_queries  */
+  YYSYMBOL_server_harden_glue = 485,       /* server_harden_glue  */
+  YYSYMBOL_server_harden_dnssec_stripped = 486, /* server_harden_dnssec_stripped  */
+  YYSYMBOL_server_harden_below_nxdomain = 487, /* server_harden_below_nxdomain  */
+  YYSYMBOL_server_harden_referral_path = 488, /* server_harden_referral_path  */
+  YYSYMBOL_server_harden_algo_downgrade = 489, /* server_harden_algo_downgrade  */
+  YYSYMBOL_server_use_caps_for_id = 490,   /* server_use_caps_for_id  */
+  YYSYMBOL_server_caps_whitelist = 491,    /* server_caps_whitelist  */
+  YYSYMBOL_server_private_address = 492,   /* server_private_address  */
+  YYSYMBOL_server_private_domain = 493,    /* server_private_domain  */
+  YYSYMBOL_server_prefetch = 494,          /* server_prefetch  */
+  YYSYMBOL_server_prefetch_key = 495,      /* server_prefetch_key  */
+  YYSYMBOL_server_deny_any = 496,          /* server_deny_any  */
+  YYSYMBOL_server_unwanted_reply_threshold = 497, /* server_unwanted_reply_threshold  */
+  YYSYMBOL_server_do_not_query_address = 498, /* server_do_not_query_address  */
+  YYSYMBOL_server_do_not_query_localhost = 499, /* server_do_not_query_localhost  */
+  YYSYMBOL_server_access_control = 500,    /* server_access_control  */
+  YYSYMBOL_server_interface_action = 501,  /* server_interface_action  */
+  YYSYMBOL_server_module_conf = 502,       /* server_module_conf  */
+  YYSYMBOL_server_val_override_date = 503, /* server_val_override_date  */
+  YYSYMBOL_server_val_sig_skew_min = 504,  /* server_val_sig_skew_min  */
+  YYSYMBOL_server_val_sig_skew_max = 505,  /* server_val_sig_skew_max  */
+  YYSYMBOL_server_val_max_restart = 506,   /* server_val_max_restart  */
+  YYSYMBOL_server_cache_max_ttl = 507,     /* server_cache_max_ttl  */
+  YYSYMBOL_server_cache_max_negative_ttl = 508, /* server_cache_max_negative_ttl  */
+  YYSYMBOL_server_cache_min_ttl = 509,     /* server_cache_min_ttl  */
+  YYSYMBOL_server_bogus_ttl = 510,         /* server_bogus_ttl  */
+  YYSYMBOL_server_val_clean_additional = 511, /* server_val_clean_additional  */
+  YYSYMBOL_server_val_permissive_mode = 512, /* server_val_permissive_mode  */
+  YYSYMBOL_server_aggressive_nsec = 513,   /* server_aggressive_nsec  */
+  YYSYMBOL_server_ignore_cd_flag = 514,    /* server_ignore_cd_flag  */
+  YYSYMBOL_server_serve_expired = 515,     /* server_serve_expired  */
+  YYSYMBOL_server_serve_expired_ttl = 516, /* server_serve_expired_ttl  */
+  YYSYMBOL_server_serve_expired_ttl_reset = 517, /* server_serve_expired_ttl_reset  */
+  YYSYMBOL_server_serve_expired_reply_ttl = 518, /* server_serve_expired_reply_ttl  */
+  YYSYMBOL_server_serve_expired_client_timeout = 519, /* server_serve_expired_client_timeout  */
+  YYSYMBOL_server_ede_serve_expired = 520, /* server_ede_serve_expired  */
+  YYSYMBOL_server_serve_original_ttl = 521, /* server_serve_original_ttl  */
+  YYSYMBOL_server_fake_dsa = 522,          /* server_fake_dsa  */
+  YYSYMBOL_server_fake_sha1 = 523,         /* server_fake_sha1  */
+  YYSYMBOL_server_val_log_level = 524,     /* server_val_log_level  */
+  YYSYMBOL_server_val_nsec3_keysize_iterations = 525, /* server_val_nsec3_keysize_iterations  */
+  YYSYMBOL_server_zonemd_permissive_mode = 526, /* server_zonemd_permissive_mode  */
+  YYSYMBOL_server_add_holddown = 527,      /* server_add_holddown  */
+  YYSYMBOL_server_del_holddown = 528,      /* server_del_holddown  */
+  YYSYMBOL_server_keep_missing = 529,      /* server_keep_missing  */
+  YYSYMBOL_server_permit_small_holddown = 530, /* server_permit_small_holddown  */
+  YYSYMBOL_server_key_cache_size = 531,    /* server_key_cache_size  */
+  YYSYMBOL_server_key_cache_slabs = 532,   /* server_key_cache_slabs  */
+  YYSYMBOL_server_neg_cache_size = 533,    /* server_neg_cache_size  */
+  YYSYMBOL_server_local_zone = 534,        /* server_local_zone  */
+  YYSYMBOL_server_local_data = 535,        /* server_local_data  */
+  YYSYMBOL_server_local_data_ptr = 536,    /* server_local_data_ptr  */
+  YYSYMBOL_server_minimal_responses = 537, /* server_minimal_responses  */
+  YYSYMBOL_server_rrset_roundrobin = 538,  /* server_rrset_roundrobin  */
+  YYSYMBOL_server_unknown_server_time_limit = 539, /* server_unknown_server_time_limit  */
+  YYSYMBOL_server_max_udp_size = 540,      /* server_max_udp_size  */
+  YYSYMBOL_server_dns64_prefix = 541,      /* server_dns64_prefix  */
+  YYSYMBOL_server_dns64_synthall = 542,    /* server_dns64_synthall  */
+  YYSYMBOL_server_dns64_ignore_aaaa = 543, /* server_dns64_ignore_aaaa  */
+  YYSYMBOL_server_define_tag = 544,        /* server_define_tag  */
+  YYSYMBOL_server_local_zone_tag = 545,    /* server_local_zone_tag  */
+  YYSYMBOL_server_access_control_tag = 546, /* server_access_control_tag  */
+  YYSYMBOL_server_access_control_tag_action = 547, /* server_access_control_tag_action  */
+  YYSYMBOL_server_access_control_tag_data = 548, /* server_access_control_tag_data  */
+  YYSYMBOL_server_local_zone_override = 549, /* server_local_zone_override  */
+  YYSYMBOL_server_access_control_view = 550, /* server_access_control_view  */
+  YYSYMBOL_server_interface_tag = 551,     /* server_interface_tag  */
+  YYSYMBOL_server_interface_tag_action = 552, /* server_interface_tag_action  */
+  YYSYMBOL_server_interface_tag_data = 553, /* server_interface_tag_data  */
+  YYSYMBOL_server_interface_view = 554,    /* server_interface_view  */
+  YYSYMBOL_server_response_ip_tag = 555,   /* server_response_ip_tag  */
+  YYSYMBOL_server_ip_ratelimit = 556,      /* server_ip_ratelimit  */
+  YYSYMBOL_server_ratelimit = 557,         /* server_ratelimit  */
+  YYSYMBOL_server_ip_ratelimit_size = 558, /* server_ip_ratelimit_size  */
+  YYSYMBOL_server_ratelimit_size = 559,    /* server_ratelimit_size  */
+  YYSYMBOL_server_ip_ratelimit_slabs = 560, /* server_ip_ratelimit_slabs  */
+  YYSYMBOL_server_ratelimit_slabs = 561,   /* server_ratelimit_slabs  */
+  YYSYMBOL_server_ratelimit_for_domain = 562, /* server_ratelimit_for_domain  */
+  YYSYMBOL_server_ratelimit_below_domain = 563, /* server_ratelimit_below_domain  */
+  YYSYMBOL_server_ip_ratelimit_factor = 564, /* server_ip_ratelimit_factor  */
+  YYSYMBOL_server_ratelimit_factor = 565,  /* server_ratelimit_factor  */
+  YYSYMBOL_server_ip_ratelimit_backoff = 566, /* server_ip_ratelimit_backoff  */
+  YYSYMBOL_server_ratelimit_backoff = 567, /* server_ratelimit_backoff  */
+  YYSYMBOL_server_outbound_msg_retry = 568, /* server_outbound_msg_retry  */
+  YYSYMBOL_server_low_rtt = 569,           /* server_low_rtt  */
+  YYSYMBOL_server_fast_server_num = 570,   /* server_fast_server_num  */
+  YYSYMBOL_server_fast_server_permil = 571, /* server_fast_server_permil  */
+  YYSYMBOL_server_qname_minimisation = 572, /* server_qname_minimisation  */
+  YYSYMBOL_server_qname_minimisation_strict = 573, /* server_qname_minimisation_strict  */
+  YYSYMBOL_server_pad_responses = 574,     /* server_pad_responses  */
+  YYSYMBOL_server_pad_responses_block_size = 575, /* server_pad_responses_block_size  */
+  YYSYMBOL_server_pad_queries = 576,       /* server_pad_queries  */
+  YYSYMBOL_server_pad_queries_block_size = 577, /* server_pad_queries_block_size  */
+  YYSYMBOL_server_ipsecmod_enabled = 578,  /* server_ipsecmod_enabled  */
+  YYSYMBOL_server_ipsecmod_ignore_bogus = 579, /* server_ipsecmod_ignore_bogus  */
+  YYSYMBOL_server_ipsecmod_hook = 580,     /* server_ipsecmod_hook  */
+  YYSYMBOL_server_ipsecmod_max_ttl = 581,  /* server_ipsecmod_max_ttl  */
+  YYSYMBOL_server_ipsecmod_whitelist = 582, /* server_ipsecmod_whitelist  */
+  YYSYMBOL_server_ipsecmod_strict = 583,   /* server_ipsecmod_strict  */
+  YYSYMBOL_server_edns_client_string = 584, /* server_edns_client_string  */
+  YYSYMBOL_server_edns_client_string_opcode = 585, /* server_edns_client_string_opcode  */
+  YYSYMBOL_server_ede = 586,               /* server_ede  */
+  YYSYMBOL_server_proxy_protocol_port = 587, /* server_proxy_protocol_port  */
+  YYSYMBOL_stub_name = 588,                /* stub_name  */
+  YYSYMBOL_stub_host = 589,                /* stub_host  */
+  YYSYMBOL_stub_addr = 590,                /* stub_addr  */
+  YYSYMBOL_stub_first = 591,               /* stub_first  */
+  YYSYMBOL_stub_no_cache = 592,            /* stub_no_cache  */
+  YYSYMBOL_stub_ssl_upstream = 593,        /* stub_ssl_upstream  */
+  YYSYMBOL_stub_tcp_upstream = 594,        /* stub_tcp_upstream  */
+  YYSYMBOL_stub_prime = 595,               /* stub_prime  */
+  YYSYMBOL_forward_name = 596,             /* forward_name  */
+  YYSYMBOL_forward_host = 597,             /* forward_host  */
+  YYSYMBOL_forward_addr = 598,             /* forward_addr  */
+  YYSYMBOL_forward_first = 599,            /* forward_first  */
+  YYSYMBOL_forward_no_cache = 600,         /* forward_no_cache  */
+  YYSYMBOL_forward_ssl_upstream = 601,     /* forward_ssl_upstream  */
+  YYSYMBOL_forward_tcp_upstream = 602,     /* forward_tcp_upstream  */
+  YYSYMBOL_auth_name = 603,                /* auth_name  */
+  YYSYMBOL_auth_zonefile = 604,            /* auth_zonefile  */
+  YYSYMBOL_auth_master = 605,              /* auth_master  */
+  YYSYMBOL_auth_url = 606,                 /* auth_url  */
+  YYSYMBOL_auth_allow_notify = 607,        /* auth_allow_notify  */
+  YYSYMBOL_auth_zonemd_check = 608,        /* auth_zonemd_check  */
+  YYSYMBOL_auth_zonemd_reject_absence = 609, /* auth_zonemd_reject_absence  */
+  YYSYMBOL_auth_for_downstream = 610,      /* auth_for_downstream  */
+  YYSYMBOL_auth_for_upstream = 611,        /* auth_for_upstream  */
+  YYSYMBOL_auth_fallback_enabled = 612,    /* auth_fallback_enabled  */
+  YYSYMBOL_view_name = 613,                /* view_name  */
+  YYSYMBOL_view_local_zone = 614,          /* view_local_zone  */
+  YYSYMBOL_view_response_ip = 615,         /* view_response_ip  */
+  YYSYMBOL_view_response_ip_data = 616,    /* view_response_ip_data  */
+  YYSYMBOL_view_local_data = 617,          /* view_local_data  */
+  YYSYMBOL_view_local_data_ptr = 618,      /* view_local_data_ptr  */
+  YYSYMBOL_view_first = 619,               /* view_first  */
+  YYSYMBOL_rcstart = 620,                  /* rcstart  */
+  YYSYMBOL_contents_rc = 621,              /* contents_rc  */
+  YYSYMBOL_content_rc = 622,               /* content_rc  */
+  YYSYMBOL_rc_control_enable = 623,        /* rc_control_enable  */
+  YYSYMBOL_rc_control_port = 624,          /* rc_control_port  */
+  YYSYMBOL_rc_control_interface = 625,     /* rc_control_interface  */
+  YYSYMBOL_rc_control_use_cert = 626,      /* rc_control_use_cert  */
+  YYSYMBOL_rc_server_key_file = 627,       /* rc_server_key_file  */
+  YYSYMBOL_rc_server_cert_file = 628,      /* rc_server_cert_file  */
+  YYSYMBOL_rc_control_key_file = 629,      /* rc_control_key_file  */
+  YYSYMBOL_rc_control_cert_file = 630,     /* rc_control_cert_file  */
+  YYSYMBOL_dtstart = 631,                  /* dtstart  */
+  YYSYMBOL_contents_dt = 632,              /* contents_dt  */
+  YYSYMBOL_content_dt = 633,               /* content_dt  */
+  YYSYMBOL_dt_dnstap_enable = 634,         /* dt_dnstap_enable  */
+  YYSYMBOL_dt_dnstap_bidirectional = 635,  /* dt_dnstap_bidirectional  */
+  YYSYMBOL_dt_dnstap_socket_path = 636,    /* dt_dnstap_socket_path  */
+  YYSYMBOL_dt_dnstap_ip = 637,             /* dt_dnstap_ip  */
+  YYSYMBOL_dt_dnstap_tls = 638,            /* dt_dnstap_tls  */
+  YYSYMBOL_dt_dnstap_tls_server_name = 639, /* dt_dnstap_tls_server_name  */
+  YYSYMBOL_dt_dnstap_tls_cert_bundle = 640, /* dt_dnstap_tls_cert_bundle  */
+  YYSYMBOL_dt_dnstap_tls_client_key_file = 641, /* dt_dnstap_tls_client_key_file  */
+  YYSYMBOL_dt_dnstap_tls_client_cert_file = 642, /* dt_dnstap_tls_client_cert_file  */
+  YYSYMBOL_dt_dnstap_send_identity = 643,  /* dt_dnstap_send_identity  */
+  YYSYMBOL_dt_dnstap_send_version = 644,   /* dt_dnstap_send_version  */
+  YYSYMBOL_dt_dnstap_identity = 645,       /* dt_dnstap_identity  */
+  YYSYMBOL_dt_dnstap_version = 646,        /* dt_dnstap_version  */
+  YYSYMBOL_dt_dnstap_log_resolver_query_messages = 647, /* dt_dnstap_log_resolver_query_messages  */
+  YYSYMBOL_dt_dnstap_log_resolver_response_messages = 648, /* dt_dnstap_log_resolver_response_messages  */
+  YYSYMBOL_dt_dnstap_log_client_query_messages = 649, /* dt_dnstap_log_client_query_messages  */
+  YYSYMBOL_dt_dnstap_log_client_response_messages = 650, /* dt_dnstap_log_client_response_messages  */
+  YYSYMBOL_dt_dnstap_log_forwarder_query_messages = 651, /* dt_dnstap_log_forwarder_query_messages  */
+  YYSYMBOL_dt_dnstap_log_forwarder_response_messages = 652, /* dt_dnstap_log_forwarder_response_messages  */
+  YYSYMBOL_pythonstart = 653,              /* pythonstart  */
+  YYSYMBOL_contents_py = 654,              /* contents_py  */
+  YYSYMBOL_content_py = 655,               /* content_py  */
+  YYSYMBOL_py_script = 656,                /* py_script  */
+  YYSYMBOL_dynlibstart = 657,              /* dynlibstart  */
+  YYSYMBOL_contents_dl = 658,              /* contents_dl  */
+  YYSYMBOL_content_dl = 659,               /* content_dl  */
+  YYSYMBOL_dl_file = 660,                  /* dl_file  */
+  YYSYMBOL_server_disable_dnssec_lame_check = 661, /* server_disable_dnssec_lame_check  */
+  YYSYMBOL_server_log_identity = 662,      /* server_log_identity  */
+  YYSYMBOL_server_response_ip = 663,       /* server_response_ip  */
+  YYSYMBOL_server_response_ip_data = 664,  /* server_response_ip_data  */
+  YYSYMBOL_dnscstart = 665,                /* dnscstart  */
+  YYSYMBOL_contents_dnsc = 666,            /* contents_dnsc  */
+  YYSYMBOL_content_dnsc = 667,             /* content_dnsc  */
+  YYSYMBOL_dnsc_dnscrypt_enable = 668,     /* dnsc_dnscrypt_enable  */
+  YYSYMBOL_dnsc_dnscrypt_port = 669,       /* dnsc_dnscrypt_port  */
+  YYSYMBOL_dnsc_dnscrypt_provider = 670,   /* dnsc_dnscrypt_provider  */
+  YYSYMBOL_dnsc_dnscrypt_provider_cert = 671, /* dnsc_dnscrypt_provider_cert  */
+  YYSYMBOL_dnsc_dnscrypt_provider_cert_rotated = 672, /* dnsc_dnscrypt_provider_cert_rotated  */
+  YYSYMBOL_dnsc_dnscrypt_secret_key = 673, /* dnsc_dnscrypt_secret_key  */
+  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_size = 674, /* dnsc_dnscrypt_shared_secret_cache_size  */
+  YYSYMBOL_dnsc_dnscrypt_shared_secret_cache_slabs = 675, /* dnsc_dnscrypt_shared_secret_cache_slabs  */
+  YYSYMBOL_dnsc_dnscrypt_nonce_cache_size = 676, /* dnsc_dnscrypt_nonce_cache_size  */
+  YYSYMBOL_dnsc_dnscrypt_nonce_cache_slabs = 677, /* dnsc_dnscrypt_nonce_cache_slabs  */
+  YYSYMBOL_cachedbstart = 678,             /* cachedbstart  */
+  YYSYMBOL_contents_cachedb = 679,         /* contents_cachedb  */
+  YYSYMBOL_content_cachedb = 680,          /* content_cachedb  */
+  YYSYMBOL_cachedb_backend_name = 681,     /* cachedb_backend_name  */
+  YYSYMBOL_cachedb_secret_seed = 682,      /* cachedb_secret_seed  */
+  YYSYMBOL_redis_server_host = 683,        /* redis_server_host  */
+  YYSYMBOL_redis_server_port = 684,        /* redis_server_port  */
+  YYSYMBOL_redis_timeout = 685,            /* redis_timeout  */
+  YYSYMBOL_redis_expire_records = 686,     /* redis_expire_records  */
+  YYSYMBOL_server_tcp_connection_limit = 687, /* server_tcp_connection_limit  */
+  YYSYMBOL_ipsetstart = 688,               /* ipsetstart  */
+  YYSYMBOL_contents_ipset = 689,           /* contents_ipset  */
+  YYSYMBOL_content_ipset = 690,            /* content_ipset  */
+  YYSYMBOL_ipset_name_v4 = 691,            /* ipset_name_v4  */
+  YYSYMBOL_ipset_name_v6 = 692             /* ipset_name_v6  */
 };
 typedef enum yysymbol_kind_t yysymbol_kind_t;
 
@@ -1143,19 +1145,19 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   711
+#define YYLAST   713
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  333
+#define YYNTOKENS  334
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  358
+#define YYNNTS  359
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  693
+#define YYNRULES  695
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  1037
+#define YYNSTATES  1040
 
 /* YYMAXUTOK -- Last valid token kind.  */
-#define YYMAXUTOK   587
+#define YYMAXUTOK   588
 
 
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -1227,83 +1229,83 @@ static const yytype_int16 yytranslate[] =
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332
+     325,   326,   327,   328,   329,   330,   331,   332,   333
 };
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   198,   198,   198,   199,   199,   200,   200,   201,   201,
-     201,   202,   202,   203,   203,   204,   204,   205,   207,   214,
-     220,   221,   222,   222,   222,   223,   223,   224,   224,   224,
-     225,   225,   226,   226,   226,   227,   227,   228,   228,   228,
-     229,   229,   229,   230,   230,   231,   231,   232,   232,   233,
-     233,   234,   234,   235,   235,   236,   236,   237,   237,   238,
-     238,   238,   239,   239,   240,   240,   240,   241,   241,   241,
-     242,   242,   243,   243,   244,   244,   245,   245,   246,   246,
-     246,   247,   247,   248,   248,   249,   249,   249,   250,   250,
-     251,   251,   252,   252,   253,   253,   253,   254,   254,   255,
-     255,   256,   256,   257,   257,   258,   258,   259,   259,   260,
-     260,   261,   261,   262,   262,   262,   263,   263,   263,   264,
-     264,   264,   265,   265,   265,   265,   266,   267,   267,   267,
-     268,   268,   268,   269,   269,   270,   270,   271,   271,   271,
-     272,   272,   272,   273,   273,   274,   274,   274,   275,   275,
-     275,   276,   276,   276,   277,   277,   278,   278,   279,   279,
-     280,   281,   281,   282,   282,   283,   283,   284,   284,   285,
-     285,   286,   286,   287,   287,   288,   288,   289,   289,   290,
-     290,   291,   291,   291,   292,   292,   293,   293,   294,   294,
-     295,   295,   295,   296,   296,   297,   298,   298,   299,   299,
-     300,   301,   301,   302,   302,   303,   303,   303,   304,   304,
-     305,   305,   305,   306,   306,   306,   307,   307,   308,   309,
-     309,   310,   310,   311,   311,   312,   312,   313,   313,   313,
-     314,   314,   314,   315,   315,   315,   316,   316,   317,   317,
-     318,   318,   319,   319,   320,   320,   321,   321,   322,   322,
-     323,   323,   326,   340,   341,   342,   342,   342,   342,   342,
-     343,   343,   343,   345,   359,   360,   361,   361,   361,   361,
-     362,   362,   362,   364,   380,   381,   382,   382,   382,   382,
-     383,   383,   383,   385,   406,   407,   408,   408,   408,   408,
-     409,   409,   409,   410,   410,   410,   413,   432,   449,   457,
-     467,   474,   484,   503,   504,   505,   505,   505,   505,   505,
-     506,   506,   506,   507,   507,   507,   507,   509,   518,   527,
-     538,   547,   556,   565,   576,   585,   597,   611,   626,   637,
-     654,   671,   688,   705,   720,   735,   748,   763,   772,   781,
-     790,   799,   808,   817,   824,   833,   842,   851,   860,   869,
-     878,   887,   896,   909,   920,   931,   942,   951,   964,   973,
-     982,   991,   998,  1005,  1014,  1021,  1030,  1038,  1045,  1052,
-    1060,  1069,  1077,  1093,  1101,  1109,  1117,  1125,  1133,  1142,
-    1151,  1165,  1174,  1183,  1192,  1201,  1210,  1219,  1226,  1233,
-    1259,  1267,  1274,  1281,  1288,  1295,  1303,  1311,  1319,  1326,
-    1337,  1348,  1355,  1364,  1373,  1382,  1391,  1398,  1405,  1412,
-    1428,  1436,  1444,  1454,  1464,  1474,  1488,  1496,  1509,  1520,
-    1528,  1541,  1550,  1559,  1568,  1577,  1587,  1597,  1605,  1618,
-    1627,  1635,  1644,  1652,  1665,  1674,  1683,  1693,  1700,  1710,
-    1720,  1730,  1740,  1750,  1760,  1770,  1780,  1787,  1794,  1801,
-    1810,  1819,  1828,  1837,  1844,  1854,  1862,  1871,  1878,  1896,
-    1909,  1922,  1935,  1944,  1953,  1962,  1971,  1981,  1991,  2002,
-    2011,  2020,  2029,  2038,  2047,  2056,  2065,  2074,  2087,  2100,
-    2109,  2116,  2125,  2134,  2143,  2152,  2161,  2169,  2182,  2190,
-    2245,  2252,  2267,  2277,  2287,  2294,  2301,  2308,  2317,  2325,
-    2339,  2360,  2381,  2393,  2405,  2417,  2426,  2447,  2459,  2471,
-    2480,  2501,  2510,  2519,  2527,  2535,  2548,  2561,  2576,  2591,
-    2600,  2609,  2619,  2629,  2638,  2644,  2653,  2662,  2672,  2682,
-    2692,  2701,  2711,  2720,  2733,  2746,  2758,  2772,  2784,  2798,
-    2807,  2818,  2827,  2837,  2844,  2851,  2860,  2869,  2879,  2889,
-    2899,  2909,  2916,  2923,  2932,  2941,  2951,  2961,  2971,  2978,
-    2985,  2992,  3000,  3010,  3020,  3030,  3040,  3050,  3060,  3116,
-    3126,  3134,  3142,  3157,  3166,  3172,  3173,  3174,  3174,  3174,
-    3175,  3175,  3175,  3176,  3176,  3178,  3188,  3197,  3204,  3211,
-    3218,  3225,  3232,  3239,  3245,  3246,  3247,  3247,  3247,  3248,
-    3248,  3248,  3249,  3250,  3250,  3251,  3251,  3252,  3252,  3253,
-    3254,  3255,  3256,  3257,  3258,  3260,  3269,  3279,  3286,  3293,
-    3302,  3309,  3316,  3323,  3330,  3339,  3348,  3355,  3362,  3372,
-    3382,  3392,  3402,  3412,  3422,  3428,  3429,  3430,  3432,  3438,
-    3444,  3445,  3446,  3448,  3454,  3464,  3471,  3480,  3488,  3494,
-    3495,  3497,  3497,  3497,  3498,  3498,  3499,  3500,  3501,  3502,
-    3503,  3505,  3515,  3524,  3531,  3540,  3547,  3556,  3564,  3577,
-    3585,  3598,  3604,  3605,  3606,  3606,  3607,  3607,  3607,  3608,
-    3610,  3622,  3634,  3646,  3661,  3674,  3687,  3698,  3704,  3705,
-    3706,  3706,  3708,  3723
+       0,   199,   199,   199,   200,   200,   201,   201,   202,   202,
+     202,   203,   203,   204,   204,   205,   205,   206,   208,   215,
+     221,   222,   223,   223,   223,   224,   224,   225,   225,   225,
+     226,   226,   227,   227,   227,   228,   228,   229,   229,   229,
+     230,   230,   230,   231,   231,   232,   232,   233,   233,   234,
+     234,   235,   235,   236,   236,   237,   237,   238,   238,   239,
+     239,   239,   240,   240,   241,   241,   241,   242,   242,   242,
+     243,   243,   244,   244,   245,   245,   246,   246,   247,   247,
+     247,   248,   248,   249,   249,   250,   250,   250,   251,   251,
+     252,   252,   253,   253,   254,   254,   254,   255,   255,   256,
+     256,   257,   257,   258,   258,   259,   259,   260,   260,   261,
+     261,   262,   262,   263,   263,   263,   264,   264,   264,   265,
+     265,   265,   266,   266,   266,   266,   267,   268,   268,   268,
+     269,   269,   269,   270,   270,   271,   271,   272,   272,   272,
+     273,   273,   273,   274,   274,   275,   275,   275,   276,   276,
+     276,   277,   277,   277,   278,   278,   279,   279,   280,   280,
+     281,   282,   282,   283,   283,   284,   284,   285,   285,   286,
+     286,   287,   287,   288,   288,   289,   289,   290,   290,   291,
+     291,   292,   292,   292,   293,   293,   294,   294,   295,   295,
+     296,   296,   296,   297,   297,   298,   299,   299,   300,   300,
+     301,   302,   302,   303,   303,   304,   304,   304,   305,   305,
+     306,   306,   306,   307,   307,   307,   308,   308,   309,   310,
+     310,   311,   311,   312,   312,   313,   313,   314,   314,   314,
+     315,   315,   315,   316,   316,   316,   317,   317,   318,   318,
+     319,   319,   320,   320,   321,   321,   322,   322,   323,   323,
+     324,   324,   325,   327,   341,   342,   343,   343,   343,   343,
+     343,   344,   344,   344,   346,   360,   361,   362,   362,   362,
+     362,   363,   363,   363,   365,   381,   382,   383,   383,   383,
+     383,   384,   384,   384,   386,   407,   408,   409,   409,   409,
+     409,   410,   410,   410,   411,   411,   411,   414,   433,   450,
+     458,   468,   475,   485,   504,   505,   506,   506,   506,   506,
+     506,   507,   507,   507,   508,   508,   508,   508,   510,   519,
+     528,   539,   548,   557,   566,   577,   586,   598,   612,   627,
+     638,   655,   672,   689,   706,   721,   736,   749,   764,   773,
+     782,   791,   800,   809,   818,   825,   834,   843,   852,   861,
+     870,   879,   888,   897,   910,   921,   932,   943,   952,   965,
+     974,   983,   992,   999,  1006,  1015,  1022,  1031,  1039,  1046,
+    1053,  1061,  1070,  1078,  1094,  1102,  1110,  1118,  1126,  1134,
+    1143,  1152,  1166,  1175,  1184,  1193,  1202,  1211,  1220,  1227,
+    1234,  1260,  1268,  1275,  1282,  1289,  1296,  1304,  1312,  1320,
+    1327,  1338,  1349,  1356,  1365,  1374,  1383,  1392,  1399,  1406,
+    1413,  1429,  1437,  1445,  1455,  1465,  1475,  1489,  1497,  1510,
+    1521,  1529,  1542,  1551,  1560,  1569,  1578,  1588,  1598,  1606,
+    1619,  1628,  1636,  1645,  1653,  1666,  1675,  1684,  1694,  1701,
+    1711,  1721,  1731,  1741,  1751,  1761,  1771,  1781,  1788,  1795,
+    1802,  1811,  1820,  1829,  1838,  1845,  1855,  1863,  1872,  1879,
+    1897,  1910,  1923,  1936,  1945,  1954,  1963,  1972,  1982,  1992,
+    2003,  2012,  2021,  2030,  2039,  2048,  2057,  2066,  2075,  2088,
+    2101,  2110,  2117,  2126,  2135,  2144,  2153,  2162,  2170,  2183,
+    2191,  2246,  2253,  2268,  2278,  2288,  2295,  2302,  2309,  2318,
+    2326,  2340,  2361,  2382,  2394,  2406,  2418,  2427,  2448,  2460,
+    2472,  2481,  2502,  2511,  2520,  2528,  2536,  2549,  2562,  2577,
+    2592,  2601,  2610,  2620,  2630,  2639,  2645,  2654,  2663,  2673,
+    2683,  2693,  2702,  2712,  2721,  2734,  2747,  2759,  2773,  2785,
+    2799,  2808,  2819,  2828,  2835,  2845,  2852,  2859,  2868,  2877,
+    2887,  2897,  2907,  2917,  2924,  2931,  2940,  2949,  2959,  2969,
+    2979,  2986,  2993,  3000,  3008,  3018,  3028,  3038,  3048,  3058,
+    3068,  3124,  3134,  3142,  3150,  3165,  3174,  3180,  3181,  3182,
+    3182,  3182,  3183,  3183,  3183,  3184,  3184,  3186,  3196,  3205,
+    3212,  3219,  3226,  3233,  3240,  3247,  3253,  3254,  3255,  3255,
+    3255,  3256,  3256,  3256,  3257,  3258,  3258,  3259,  3259,  3260,
+    3260,  3261,  3262,  3263,  3264,  3265,  3266,  3268,  3277,  3287,
+    3294,  3301,  3310,  3317,  3324,  3331,  3338,  3347,  3356,  3363,
+    3370,  3380,  3390,  3400,  3410,  3420,  3430,  3436,  3437,  3438,
+    3440,  3446,  3452,  3453,  3454,  3456,  3462,  3472,  3479,  3488,
+    3496,  3502,  3503,  3505,  3505,  3505,  3506,  3506,  3507,  3508,
+    3509,  3510,  3511,  3513,  3523,  3532,  3539,  3548,  3555,  3564,
+    3572,  3585,  3593,  3606,  3612,  3613,  3614,  3614,  3615,  3615,
+    3615,  3616,  3618,  3630,  3642,  3654,  3669,  3682,  3695,  3706,
+    3712,  3713,  3714,  3714,  3716,  3731
 };
 #endif
 
@@ -1445,12 +1447,13 @@ static const char *const yytname[] =
   "VAR_ZONEMD_REJECT_ABSENCE", "VAR_RPZ_SIGNAL_NXDOMAIN_RA",
   "VAR_INTERFACE_AUTOMATIC_PORTS", "VAR_EDE", "VAR_INTERFACE_ACTION",
   "VAR_INTERFACE_VIEW", "VAR_INTERFACE_TAG", "VAR_INTERFACE_TAG_ACTION",
-  "VAR_INTERFACE_TAG_DATA", "$accept", "toplevelvars", "toplevelvar",
-  "force_toplevel", "serverstart", "contents_server", "content_server",
-  "stubstart", "contents_stub", "content_stub", "forwardstart",
-  "contents_forward", "content_forward", "viewstart", "contents_view",
-  "content_view", "authstart", "contents_auth", "content_auth", "rpz_tag",
-  "rpz_action_override", "rpz_cname_override", "rpz_log", "rpz_log_name",
+  "VAR_INTERFACE_TAG_DATA", "VAR_PROXY_PROTOCOL_PORT", "$accept",
+  "toplevelvars", "toplevelvar", "force_toplevel", "serverstart",
+  "contents_server", "content_server", "stubstart", "contents_stub",
+  "content_stub", "forwardstart", "contents_forward", "content_forward",
+  "viewstart", "contents_view", "content_view", "authstart",
+  "contents_auth", "content_auth", "rpz_tag", "rpz_action_override",
+  "rpz_cname_override", "rpz_log", "rpz_log_name",
   "rpz_signal_nxdomain_ra", "rpzstart", "contents_rpz", "content_rpz",
   "server_num_threads", "server_verbosity", "server_statistics_interval",
   "server_statistics_cumulative", "server_extended_statistics",
@@ -1549,17 +1552,18 @@ static const char *const yytname[] =
   "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook",
   "server_ipsecmod_max_ttl", "server_ipsecmod_whitelist",
   "server_ipsecmod_strict", "server_edns_client_string",
-  "server_edns_client_string_opcode", "server_ede", "stub_name",
-  "stub_host", "stub_addr", "stub_first", "stub_no_cache",
-  "stub_ssl_upstream", "stub_tcp_upstream", "stub_prime", "forward_name",
-  "forward_host", "forward_addr", "forward_first", "forward_no_cache",
-  "forward_ssl_upstream", "forward_tcp_upstream", "auth_name",
-  "auth_zonefile", "auth_master", "auth_url", "auth_allow_notify",
-  "auth_zonemd_check", "auth_zonemd_reject_absence", "auth_for_downstream",
-  "auth_for_upstream", "auth_fallback_enabled", "view_name",
-  "view_local_zone", "view_response_ip", "view_response_ip_data",
-  "view_local_data", "view_local_data_ptr", "view_first", "rcstart",
-  "contents_rc", "content_rc", "rc_control_enable", "rc_control_port",
+  "server_edns_client_string_opcode", "server_ede",
+  "server_proxy_protocol_port", "stub_name", "stub_host", "stub_addr",
+  "stub_first", "stub_no_cache", "stub_ssl_upstream", "stub_tcp_upstream",
+  "stub_prime", "forward_name", "forward_host", "forward_addr",
+  "forward_first", "forward_no_cache", "forward_ssl_upstream",
+  "forward_tcp_upstream", "auth_name", "auth_zonefile", "auth_master",
+  "auth_url", "auth_allow_notify", "auth_zonemd_check",
+  "auth_zonemd_reject_absence", "auth_for_downstream", "auth_for_upstream",
+  "auth_fallback_enabled", "view_name", "view_local_zone",
+  "view_response_ip", "view_response_ip_data", "view_local_data",
+  "view_local_data_ptr", "view_first", "rcstart", "contents_rc",
+  "content_rc", "rc_control_enable", "rc_control_port",
   "rc_control_interface", "rc_control_use_cert", "rc_server_key_file",
   "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file",
   "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable",
@@ -1620,25 +1624,26 @@ static const yytype_int16 yypact[] =
      162,   163,   164,   165,   208,   210,   230,   231,   234,   235,
      237,   254,   255,   256,   257,   259,   260,   263,   264,   265,
      268,   271,   274,   284,   285,   288,   289,   290,   291,   293,
-     294,   295,   300,   302,   310,   311,   316,   317,   318,   319,
-     320,   321,   331,   332,   333,   335,   338,   339,   345,   347,
-     348,   349,   351,   357,   363,   364,   365,   366,   367,   388,
-     389,   390,   391,   392,   393,   394,   395,   396,   399,   400,
-     401,   402,   403,   404,   405,   406,   407,   408,   410,   411,
-     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
-     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,   464,   465,   466,   467,   468,   469,   470,   472,
-     473,   474,   475,   476,   477,   478,   479,   480,   481,   482,
-     483,   484,   485,   486,   487,   488,   490,   491,   492,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     506,   507,   508,   509,   510,   511,   512,   513,   515,   516,
-     517,   518,   519,   520,   521,   522,   524,   525,   526,   527,
-     528,   529,   530,   531,   532,   533,   534,   535,   536,   537,
-     538,   539,   540,   541,   542,   543,   544,   545,   546,   548,
-     549,   550,   552,   553,   554,  -284,  -284,  -284,  -284,  -284,
+     294,   295,   300,   302,   311,   316,   317,   318,   319,   320,
+     321,   331,   332,   333,   335,   338,   339,   345,   347,   348,
+     349,   351,   357,   363,   364,   365,   366,   367,   388,   389,
+     390,   391,   392,   393,   394,   395,   396,   399,   400,   401,
+     402,   403,   404,   405,   406,   407,   408,   410,   411,   412,
+     413,   414,   415,   416,   417,   418,   419,   420,   421,   422,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
+     443,   444,   445,   446,   447,   448,   449,   450,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,   464,   465,   466,   467,   468,   469,   470,   472,   473,
+     474,   475,   476,   477,   478,   479,   480,   481,   482,   483,
+     484,   485,   486,   487,   488,   490,   491,   492,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   506,
+     507,   508,   509,   510,   511,   512,   513,   515,   516,   517,
+     518,   519,   520,   521,   522,   524,   525,   526,   527,   528,
+     529,   530,   531,   532,   533,   534,   535,   536,   537,   538,
+     539,   540,   541,   542,   543,   544,   545,   546,   548,   549,
+     550,   552,   553,   554,   555,   556,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
@@ -1660,61 +1665,60 @@ static const yytype_int16 yypact[] =
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   558,   559,
+     560,   561,   562,   563,   564,   565,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,   566,   567,   568,   569,   570,
+     571,   572,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+     573,   574,   575,   576,   577,   578,   579,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,   580,   581,   582,   583,   584,
+     585,   586,   587,   588,   589,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,  -284,   590,   591,   592,   593,
+     594,   595,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,   596,   597,   598,   599,   600,
+     601,   602,   603,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,   604,   605,   606,   607,   608,   609,   610,   611,
+     612,   613,   614,   615,   616,   617,   618,   619,   620,   621,
+     622,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,   555,   556,   558,   559,
-     560,   561,   562,   563,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,   564,   565,   566,   567,   568,   569,   570,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   571,   572,
-     573,   574,   575,   576,   577,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,   578,   579,   580,   581,   582,   583,   584,
-     585,   586,   587,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,   588,   589,   590,   591,   592,   593,
+    -284,   623,  -284,  -284,   624,  -284,  -284,   625,   626,   627,
+     628,   629,   630,   631,   632,   633,   634,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   635,   636,
+     637,   638,   639,   640,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,   641,   642,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,   594,   595,   596,   597,   598,   599,   600,
-     601,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-     602,   603,   604,   605,   606,   607,   608,   609,   610,   611,
-     612,   613,   614,   615,   616,   617,   618,   619,   620,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   621,
-    -284,  -284,   622,  -284,  -284,   623,   624,   625,   626,   627,
-     628,   629,   630,   631,   632,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,   633,   634,   635,   636,
-     637,   638,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   639,
-     640,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,  -284,   643,   644,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,   641,   642,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,  -284,  -284,   645,   646,   647,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,   648,   649,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,   643,   644,   645,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   646,
-     647,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,   650,   651,   652,   653,   654,   655,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,   648,   649,   650,   651,   652,   653,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,   656,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,   657,  -284,  -284,  -284,  -284,
+    -284,   658,   659,   660,   661,   662,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,   654,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,   655,  -284,  -284,  -284,  -284,  -284,   656,
-     657,   658,   659,   660,  -284,  -284,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,   663,  -284,  -284,   664,   665,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-     661,  -284,  -284,   662,   663,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   664,   665,
-     666,  -284,  -284,  -284,  -284,  -284,  -284,   667,   668,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284
+    -284,   666,   667,   668,  -284,  -284,  -284,  -284,  -284,  -284,
+     669,   670,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284
 };
 
 /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1722,10 +1726,10 @@ static const yytype_int16 yypact[] =
    means the default is an error.  */
 static const yytype_int16 yydefact[] =
 {
-       2,     0,     1,    18,    19,   252,   263,   574,   634,   593,
-     273,   648,   671,   283,   687,   302,   639,     3,    17,    21,
-     254,   265,   275,   285,   304,   576,   595,   636,   641,   650,
-     673,   689,     4,     5,     6,    10,    14,    15,     8,     9,
+       2,     0,     1,    18,    19,   253,   264,   576,   636,   595,
+     274,   650,   673,   284,   689,   303,   641,     3,    17,    21,
+     255,   266,   276,   286,   305,   578,   597,   638,   643,   652,
+     675,   691,     4,     5,     6,    10,    14,    15,     8,     9,
        7,    16,    11,    12,    13,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1749,83 +1753,83 @@ static const yytype_int16 yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    20,    22,    23,    88,    91,
-     100,   213,   214,    24,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,    37,    79,    25,    92,    93,    48,
-      72,    87,   250,    26,    27,    30,    31,    28,    29,    32,
-      33,    34,   247,   248,   249,    35,    36,   124,   225,   125,
-     127,   128,   129,   227,   232,   228,   239,   240,   241,   242,
-     130,   131,   132,   133,   134,   135,   136,   209,    89,    78,
-     104,   122,   123,   237,   234,   126,    38,    39,    40,    41,
-      42,    80,    94,    95,   111,    66,    76,    67,   217,   218,
-     105,    58,    59,   216,    62,    60,    61,    63,   245,   115,
-     119,   140,   151,   181,   154,   238,   116,    73,    43,    44,
-      45,   102,   141,   142,   143,   144,    46,    47,    49,    50,
-      52,    53,    51,   148,   149,   155,    54,    55,    56,    64,
-      83,   120,    97,   150,    90,   177,    98,    99,   117,   118,
-     235,   103,    57,    81,    84,   190,    65,    68,   106,   107,
-     108,    82,   178,   109,    69,    70,    71,   226,   121,   200,
-     201,   202,   203,   204,   205,   206,   207,   215,   110,    77,
-     246,   112,   113,   114,   179,    74,    75,    96,    85,    86,
-     101,   137,   138,   236,   139,   145,   146,   147,   182,   183,
-     185,   187,   188,   186,   189,   192,   193,   194,   191,   210,
-     152,   153,   158,   159,   156,   157,   160,   161,   163,   162,
-     165,   164,   166,   229,   231,   230,   180,   195,   196,   197,
-     198,   199,   219,   221,   220,   222,   223,   224,   243,   244,
-     251,   184,   208,   211,   212,   233,     0,     0,     0,     0,
-       0,     0,     0,     0,   253,   255,   256,   257,   259,   260,
-     261,   262,   258,     0,     0,     0,     0,     0,     0,     0,
-     264,   266,   267,   268,   269,   270,   271,   272,     0,     0,
-       0,     0,     0,     0,     0,   274,   276,   277,   280,   281,
-     278,   282,   279,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   284,   286,   287,   288,   289,   293,   294,
-     295,   290,   291,   292,     0,     0,     0,     0,     0,     0,
-     307,   311,   312,   313,   314,   315,   303,   305,   306,   308,
-     309,   310,   316,     0,     0,     0,     0,     0,     0,     0,
-       0,   575,   577,   579,   578,   584,   580,   581,   582,   583,
+       0,     0,     0,     0,     0,     0,    20,    22,    23,    88,
+      91,   100,   213,   214,    24,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,    37,    79,    25,    92,    93,
+      48,    72,    87,   250,    26,    27,    30,    31,    28,    29,
+      32,    33,    34,   247,   248,   249,    35,    36,   124,   225,
+     125,   127,   128,   129,   227,   232,   228,   239,   240,   241,
+     242,   130,   131,   132,   133,   134,   135,   136,   209,    89,
+      78,   104,   122,   123,   237,   234,   126,    38,    39,    40,
+      41,    42,    80,    94,    95,   111,    66,    76,    67,   217,
+     218,   105,    58,    59,   216,    62,    60,    61,    63,   245,
+     115,   119,   140,   151,   181,   154,   238,   116,    73,    43,
+      44,    45,   102,   141,   142,   143,   144,    46,    47,    49,
+      50,    52,    53,    51,   148,   149,   155,    54,    55,    56,
+      64,    83,   120,    97,   150,    90,   177,    98,    99,   117,
+     118,   235,   103,    57,    81,    84,   190,    65,    68,   106,
+     107,   108,    82,   178,   109,    69,    70,    71,   226,   121,
+     200,   201,   202,   203,   204,   205,   206,   207,   215,   110,
+      77,   246,   112,   113,   114,   179,    74,    75,    96,    85,
+      86,   101,   137,   138,   236,   139,   145,   146,   147,   182,
+     183,   185,   187,   188,   186,   189,   192,   193,   194,   191,
+     210,   152,   153,   158,   159,   156,   157,   160,   161,   163,
+     162,   165,   164,   166,   229,   231,   230,   180,   195,   196,
+     197,   198,   199,   219,   221,   220,   222,   223,   224,   243,
+     244,   251,   252,   184,   208,   211,   212,   233,     0,     0,
+       0,     0,     0,     0,     0,     0,   254,   256,   257,   258,
+     260,   261,   262,   263,   259,     0,     0,     0,     0,     0,
+       0,     0,   265,   267,   268,   269,   270,   271,   272,   273,
+       0,     0,     0,     0,     0,     0,     0,   275,   277,   278,
+     281,   282,   279,   283,   280,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   285,   287,   288,   289,   290,
+     294,   295,   296,   291,   292,   293,     0,     0,     0,     0,
+       0,     0,   308,   312,   313,   314,   315,   316,   304,   306,
+     307,   309,   310,   311,   317,     0,     0,     0,     0,     0,
+       0,     0,     0,   577,   579,   581,   580,   586,   582,   583,
+     584,   585,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   594,
-     596,   598,   597,   599,   600,   601,   602,   603,   604,   605,
-     606,   607,   608,   609,   610,   611,   612,   613,   614,     0,
-     635,   637,     0,   640,   642,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   649,   651,   652,   653,   655,
-     656,   654,   657,   658,   659,   660,     0,     0,     0,     0,
-       0,     0,   672,   674,   675,   676,   677,   678,   679,     0,
-       0,   688,   690,   691,   318,   317,   324,   337,   335,   348,
-     344,   345,   349,   346,   347,   350,   351,   352,   356,   357,
-     387,   388,   389,   390,   391,   419,   420,   421,   427,   428,
-     340,   429,   430,   433,   431,   432,   437,   438,   439,   453,
-     402,   403,   406,   407,   440,   457,   396,   398,   458,   465,
-     466,   467,   341,   418,   486,   487,   397,   480,   380,   336,
-     392,   454,   462,   441,     0,     0,   490,   342,   319,   379,
-     445,   320,   338,   339,   393,   394,   488,   443,   447,   448,
-     354,   353,   321,   491,   422,   452,   381,   401,   459,   460,
-     461,   464,   479,   395,   484,   482,   483,   410,   417,   449,
-     450,   411,   412,   442,   469,   382,   383,   386,   358,   360,
-     355,   361,   362,   363,   364,   371,   372,   373,   374,   375,
-     376,   377,   492,   493,   495,   423,   424,   425,   426,   434,
-     435,   436,   496,   497,   498,     0,     0,     0,   444,   413,
-     415,   644,   511,   515,   513,   512,   516,   514,   523,     0,
-       0,   519,   520,   521,   522,   325,   326,   327,   328,   329,
-     330,   331,   332,   333,   334,   446,   463,   485,   527,   528,
-     414,   499,     0,     0,     0,     0,     0,     0,   470,   471,
-     472,   473,   474,   475,   476,   477,   478,   645,   404,   405,
-     408,   399,   468,   378,   322,   323,   400,   529,   530,   531,
-     532,   533,   535,   534,   536,   537,   538,   359,   366,   524,
-     526,   525,   365,     0,   385,   451,   494,   384,   416,   367,
-     368,   370,   369,     0,   540,   409,   481,   343,   541,     0,
-       0,     0,     0,     0,   542,   543,   544,   549,   547,   548,
-     545,   546,   550,   551,   552,   553,   555,   556,   554,   567,
-       0,   571,   572,     0,     0,   573,   557,   565,   558,   559,
-     560,   564,   566,   561,   562,   563,   296,   297,   298,   299,
-     300,   301,   585,   587,   586,   589,   590,   591,   592,   588,
-     615,   617,   618,   619,   620,   621,   622,   623,   624,   625,
-     616,   626,   627,   628,   629,   630,   631,   632,   633,   638,
-     643,   661,   662,   663,   666,   664,   665,   667,   668,   669,
-     670,   680,   681,   682,   683,   684,   685,   692,   693,   455,
-     489,   510,   646,   647,   517,   518,   500,   501,     0,     0,
-       0,   505,   686,   539,   456,   509,   506,     0,     0,   568,
-     569,   570,   504,   502,   503,   507,   508
+       0,   596,   598,   600,   599,   601,   602,   603,   604,   605,
+     606,   607,   608,   609,   610,   611,   612,   613,   614,   615,
+     616,     0,   637,   639,     0,   642,   644,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   651,   653,   654,
+     655,   657,   658,   656,   659,   660,   661,   662,     0,     0,
+       0,     0,     0,     0,   674,   676,   677,   678,   679,   680,
+     681,     0,     0,   690,   692,   693,   319,   318,   325,   338,
+     336,   349,   345,   346,   350,   347,   348,   351,   352,   353,
+     357,   358,   388,   389,   390,   391,   392,   420,   421,   422,
+     428,   429,   341,   430,   431,   434,   432,   433,   438,   439,
+     440,   454,   403,   404,   407,   408,   441,   458,   397,   399,
+     459,   466,   467,   468,   342,   419,   487,   488,   398,   481,
+     381,   337,   393,   455,   463,   442,     0,     0,   491,   343,
+     320,   380,   446,   321,   339,   340,   394,   395,   489,   444,
+     448,   449,   355,   354,   322,   492,   423,   453,   382,   402,
+     460,   461,   462,   465,   480,   396,   485,   483,   484,   411,
+     418,   450,   451,   412,   413,   443,   470,   383,   384,   387,
+     359,   361,   356,   362,   363,   364,   365,   372,   373,   374,
+     375,   376,   377,   378,   493,   494,   496,   424,   425,   426,
+     427,   435,   436,   437,   497,   498,   499,     0,     0,     0,
+     445,   414,   416,   646,   512,   516,   514,   513,   517,   515,
+     524,     0,     0,   520,   521,   522,   523,   326,   327,   328,
+     329,   330,   331,   332,   333,   334,   335,   447,   464,   486,
+     528,   529,   415,   500,     0,     0,     0,     0,     0,     0,
+     471,   472,   473,   474,   475,   476,   477,   478,   479,   647,
+     405,   406,   409,   400,   469,   379,   323,   324,   401,   530,
+     531,   532,   533,   534,   536,   535,   537,   538,   539,   360,
+     367,   525,   527,   526,   366,     0,   386,   452,   495,   385,
+     417,   368,   369,   371,   370,     0,   541,   410,   482,   344,
+     542,     0,     0,     0,     0,     0,   543,   544,   545,   546,
+     551,   549,   550,   547,   548,   552,   553,   554,   555,   557,
+     558,   556,   569,     0,   573,   574,     0,     0,   575,   559,
+     567,   560,   561,   562,   566,   568,   563,   564,   565,   297,
+     298,   299,   300,   301,   302,   587,   589,   588,   591,   592,
+     593,   594,   590,   617,   619,   620,   621,   622,   623,   624,
+     625,   626,   627,   618,   628,   629,   630,   631,   632,   633,
+     634,   635,   640,   645,   663,   664,   665,   668,   666,   667,
+     669,   670,   671,   672,   682,   683,   684,   685,   686,   687,
+     694,   695,   456,   490,   511,   648,   649,   518,   519,   501,
+     502,     0,     0,     0,   506,   688,   540,   457,   510,   507,
+       0,     0,   570,   571,   572,   505,   503,   504,   508,   509
 };
 
 /* YYPGOTO[NTERM-NUM].  */
@@ -1857,8 +1861,8 @@ static const yytype_int16 yypgoto[] =
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   669,   670,
-     671,   672,   673,  -284,  -284,   674,  -284,  -284,  -284,  -284,
+    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,   671,
+     672,   673,   674,   675,  -284,  -284,   676,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
@@ -1866,48 +1870,48 @@ static const yytype_int16 yypgoto[] =
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
     -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,
-    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284
+    -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284,  -284
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-       0,     1,    17,    18,    19,    32,   275,    20,    33,   514,
-      21,    34,   530,    22,    35,   545,    23,    36,   563,   580,
-     581,   582,   583,   584,   585,    24,    37,   586,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
-     338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-     358,   359,   360,   361,   362,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-     378,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
-     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
-     458,   459,   460,   461,   462,   463,   464,   465,   466,   467,
-     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
-     478,   479,   480,   481,   482,   483,   484,   485,   486,   487,
-     488,   489,   490,   491,   492,   493,   494,   495,   496,   497,
-     498,   499,   500,   515,   516,   517,   518,   519,   520,   521,
-     522,   531,   532,   533,   534,   535,   536,   537,   564,   565,
-     566,   567,   568,   569,   570,   571,   572,   573,   546,   547,
-     548,   549,   550,   551,   552,    25,    38,   601,   602,   603,
-     604,   605,   606,   607,   608,   609,    26,    39,   629,   630,
-     631,   632,   633,   634,   635,   636,   637,   638,   639,   640,
-     641,   642,   643,   644,   645,   646,   647,   648,    27,    40,
-     650,   651,    28,    41,   653,   654,   501,   502,   503,   504,
-      29,    42,   665,   666,   667,   668,   669,   670,   671,   672,
-     673,   674,   675,    30,    43,   682,   683,   684,   685,   686,
-     687,   688,   505,    31,    44,   691,   692,   693
+       0,     1,    17,    18,    19,    32,   276,    20,    33,   516,
+      21,    34,   532,    22,    35,   547,    23,    36,   565,   582,
+     583,   584,   585,   586,   587,    24,    37,   588,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
+     409,   410,   411,   412,   413,   414,   415,   416,   417,   418,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,   440,   441,   442,   443,   444,   445,   446,   447,   448,
+     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,   464,   465,   466,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
+     479,   480,   481,   482,   483,   484,   485,   486,   487,   488,
+     489,   490,   491,   492,   493,   494,   495,   496,   497,   498,
+     499,   500,   501,   502,   517,   518,   519,   520,   521,   522,
+     523,   524,   533,   534,   535,   536,   537,   538,   539,   566,
+     567,   568,   569,   570,   571,   572,   573,   574,   575,   548,
+     549,   550,   551,   552,   553,   554,    25,    38,   603,   604,
+     605,   606,   607,   608,   609,   610,   611,    26,    39,   631,
+     632,   633,   634,   635,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,   647,   648,   649,   650,    27,
+      40,   652,   653,    28,    41,   655,   656,   503,   504,   505,
+     506,    29,    42,   667,   668,   669,   670,   671,   672,   673,
+     674,   675,   676,   677,    30,    43,   684,   685,   686,   687,
+     688,   689,   690,   507,    31,    44,   693,   694,   695
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1918,75 +1922,75 @@ static const yytype_int16 yytable[] =
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,   689,   690,   649,   652,    77,    78,    79,   694,
-     695,   696,    80,    81,    82,    83,    84,    85,    86,    87,
+      75,    76,   691,   692,   651,   654,    77,    78,    79,   696,
+     697,   698,    80,    81,    82,    83,    84,    85,    86,    87,
       88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
       98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
      108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   553,   676,   677,   678,   679,   680,   681,
-     697,   698,   121,   122,   123,   124,   125,   538,   126,   127,
-     128,   699,   700,   129,   130,   131,   132,   133,   134,   135,
+     118,   119,   120,   555,   678,   679,   680,   681,   682,   683,
+     699,   700,   121,   122,   123,   124,   125,   540,   126,   127,
+     128,   701,   702,   129,   130,   131,   132,   133,   134,   135,
      136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   553,
-     701,   702,   155,   539,   540,   156,   157,   158,   159,   160,
-     161,   162,   703,   163,   164,   165,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,   175,   704,   705,   706,   707,
-     541,   655,   656,   657,   658,   659,   660,   661,   662,   663,
-     664,   708,   709,   710,   711,   712,   176,   177,   178,   179,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   555,
+     703,   704,   155,   541,   542,   156,   157,   158,   159,   160,
+     161,   162,   705,   163,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   706,   707,   708,   709,
+     543,   657,   658,   659,   660,   661,   662,   663,   664,   665,
+     666,   710,   711,   712,   713,   714,   176,   177,   178,   179,
      180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
      190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
      200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   713,   218,
-     714,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     210,   211,   212,   213,   214,   215,   216,   217,   715,   218,
+     716,   219,   220,   221,   222,   223,   224,   225,   226,   227,
      228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     715,   716,   542,   543,   717,   718,   506,   719,   507,   508,
+     717,   718,   544,   545,   719,   720,   508,   721,   509,   510,
        2,   238,   239,   240,   241,   242,   243,   244,   245,   246,
-     247,     3,     4,   523,   720,   721,   722,   723,   248,   724,
-     725,   524,   525,   726,   727,   728,   249,   250,   729,   251,
-     252,   730,   253,   254,   731,   544,   255,   256,   257,   258,
-     259,   260,   261,   262,   732,   733,     5,   263,   734,   735,
-     736,   737,     6,   738,   739,   740,   264,   265,   266,   267,
-     741,   509,   742,   268,   269,   270,   271,   272,   273,   274,
-     743,   744,   555,   556,   557,   558,   745,   746,   747,   748,
-     749,   750,   560,   593,   594,   595,   596,   597,   598,   599,
-     600,   751,   752,   753,   510,   754,     7,   511,   755,   756,
-     574,   575,   576,   577,   578,   757,   512,   758,   759,   760,
-     526,   761,   527,   579,     8,   528,   554,   762,   555,   556,
-     557,   558,   559,   763,   764,   765,   766,   767,   560,   610,
-     611,   612,   613,   614,   615,   616,   617,   618,   619,   620,
-     621,   622,   623,   624,   625,   626,   627,   628,   768,   769,
-     770,   771,   772,   773,   774,   775,   776,   561,   562,   777,
-     778,   779,   780,   781,   782,   783,   784,   785,   786,     9,
-     787,   788,   789,   790,   791,   792,   793,   794,   795,   796,
-     797,   798,   799,   800,   801,   802,   803,   804,   805,   806,
-     807,   808,   809,   810,   811,   812,   813,   814,   815,   816,
-     817,   818,   819,   820,   821,   822,   823,   824,   825,   826,
-     827,   828,   829,   830,   831,   832,   833,   834,   835,   836,
-     837,   838,   839,   840,   841,   842,   843,   844,   845,   846,
-     847,    10,   848,   849,   850,   851,   852,   853,   854,   855,
-     856,   857,   858,   859,   860,   861,   862,   863,   864,   513,
-     865,   866,   867,    11,   868,   869,   870,   871,   872,   873,
-     874,   875,   876,   877,   878,   529,   879,   880,   881,   882,
-     883,   884,   885,   886,    12,   887,   888,   889,   890,   891,
-     892,   893,   894,    13,   895,   896,   897,   898,   899,   900,
-     901,   902,   903,   904,   905,   906,   907,   908,   909,   910,
-     911,   912,   913,   914,   915,   916,   917,    14,   918,   919,
-     920,    15,   921,   922,   923,   924,   925,    16,   926,   927,
-     928,   929,   930,   931,   932,   933,   934,   935,   936,   937,
-     938,   939,   940,   941,   942,   943,   944,   945,   946,   947,
-     948,   949,   950,   951,   952,   953,   954,   955,   956,   957,
-     958,   959,   960,   961,   962,   963,   964,   965,   966,   967,
-     968,   969,   970,   971,   972,   973,   974,   975,   976,   977,
-     978,   979,   980,   981,   982,   983,   984,   985,   986,   987,
-     988,   989,   990,   991,   992,   993,   994,   995,   996,   997,
-     998,   999,  1000,  1001,  1002,  1003,  1004,  1005,  1006,  1007,
-    1008,  1009,  1010,  1011,  1012,  1013,  1014,  1015,  1016,  1017,
-    1018,  1019,  1020,  1021,  1022,  1023,  1024,  1025,  1026,  1027,
-    1028,  1029,  1030,  1031,  1032,  1033,  1034,  1035,  1036,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     247,     3,     4,   525,   722,   723,   724,   725,   248,   726,
+     727,   526,   527,   728,   729,   730,   249,   250,   731,   251,
+     252,   732,   253,   254,   733,   546,   255,   256,   257,   258,
+     259,   260,   261,   262,   734,   735,     5,   263,   736,   737,
+     738,   739,     6,   740,   741,   742,   264,   265,   266,   267,
+     743,   511,   744,   268,   269,   270,   271,   272,   273,   274,
+     275,   745,   557,   558,   559,   560,   746,   747,   748,   749,
+     750,   751,   562,   595,   596,   597,   598,   599,   600,   601,
+     602,   752,   753,   754,   512,   755,     7,   513,   756,   757,
+     576,   577,   578,   579,   580,   758,   514,   759,   760,   761,
+     528,   762,   529,   581,     8,   530,   556,   763,   557,   558,
+     559,   560,   561,   764,   765,   766,   767,   768,   562,   612,
+     613,   614,   615,   616,   617,   618,   619,   620,   621,   622,
+     623,   624,   625,   626,   627,   628,   629,   630,   769,   770,
+     771,   772,   773,   774,   775,   776,   777,   563,   564,   778,
+     779,   780,   781,   782,   783,   784,   785,   786,   787,     9,
+     788,   789,   790,   791,   792,   793,   794,   795,   796,   797,
+     798,   799,   800,   801,   802,   803,   804,   805,   806,   807,
+     808,   809,   810,   811,   812,   813,   814,   815,   816,   817,
+     818,   819,   820,   821,   822,   823,   824,   825,   826,   827,
+     828,   829,   830,   831,   832,   833,   834,   835,   836,   837,
+     838,   839,   840,   841,   842,   843,   844,   845,   846,   847,
+     848,    10,   849,   850,   851,   852,   853,   854,   855,   856,
+     857,   858,   859,   860,   861,   862,   863,   864,   865,   515,
+     866,   867,   868,    11,   869,   870,   871,   872,   873,   874,
+     875,   876,   877,   878,   879,   531,   880,   881,   882,   883,
+     884,   885,   886,   887,    12,   888,   889,   890,   891,   892,
+     893,   894,   895,    13,   896,   897,   898,   899,   900,   901,
+     902,   903,   904,   905,   906,   907,   908,   909,   910,   911,
+     912,   913,   914,   915,   916,   917,   918,    14,   919,   920,
+     921,    15,   922,   923,   924,   925,   926,    16,   927,   928,
+     929,   930,   931,   932,   933,   934,   935,   936,   937,   938,
+     939,   940,   941,   942,   943,   944,   945,   946,   947,   948,
+     949,   950,   951,   952,   953,   954,   955,   956,   957,   958,
+     959,   960,   961,   962,   963,   964,   965,   966,   967,   968,
+     969,   970,   971,   972,   973,   974,   975,   976,   977,   978,
+     979,   980,   981,   982,   983,   984,   985,   986,   987,   988,
+     989,   990,   991,   992,   993,   994,   995,   996,   997,   998,
+     999,  1000,  1001,  1002,  1003,  1004,  1005,  1006,  1007,  1008,
+    1009,  1010,  1011,  1012,  1013,  1014,  1015,  1016,  1017,  1018,
+    1019,  1020,  1021,  1022,  1023,  1024,  1025,  1026,  1027,  1028,
+    1029,  1030,  1031,  1032,  1033,  1034,  1035,  1036,  1037,  1038,
+    1039,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   587,   588,   589,   590,
-     591,   592
+       0,     0,     0,     0,     0,     0,     0,     0,   589,   590,
+     591,   592,   593,   594
 };
 
 static const yytype_int16 yycheck[] =
@@ -2023,7 +2027,7 @@ static const yytype_int16 yycheck[] =
      303,   304,   305,   306,    10,    10,    46,   310,    10,    10,
       10,    10,    52,    10,    10,    10,   319,   320,   321,   322,
       10,   110,    10,   326,   327,   328,   329,   330,   331,   332,
-      10,    10,   284,   285,   286,   287,    10,    10,    10,    10,
+     333,    10,   284,   285,   286,   287,    10,    10,    10,    10,
       10,    10,   294,    97,    98,    99,   100,   101,   102,   103,
      104,    10,    10,    10,   143,    10,    96,   146,    10,    10,
      312,   313,   314,   315,   316,    10,   155,    10,    10,    10,
@@ -2058,22 +2062,22 @@ static const yytype_int16 yycheck[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    37,    37,    37,
-      37,    37
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    37,
+      37,    37,    37,    37
 };
 
 /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
    state STATE-NUM.  */
 static const yytype_int16 yystos[] =
 {
-       0,   334,     0,    11,    12,    46,    52,    96,   114,   169,
-     231,   253,   274,   283,   307,   311,   317,   335,   336,   337,
-     340,   343,   346,   349,   358,   618,   629,   651,   655,   663,
-     676,   686,   338,   341,   344,   347,   350,   359,   619,   630,
-     652,   656,   664,   677,   687,    13,    14,    15,    16,    17,
+       0,   335,     0,    11,    12,    46,    52,    96,   114,   169,
+     231,   253,   274,   283,   307,   311,   317,   336,   337,   338,
+     341,   344,   347,   350,   359,   620,   631,   653,   657,   665,
+     678,   688,   339,   342,   345,   348,   351,   360,   621,   632,
+     654,   658,   666,   679,   689,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
       38,    39,    40,    41,    42,    43,    44,    49,    50,    51,
@@ -2096,7 +2100,7 @@ static const yytype_int16 yystos[] =
      266,   267,   268,   269,   270,   271,   272,   273,   281,   289,
      290,   292,   293,   295,   296,   299,   300,   301,   302,   303,
      304,   305,   306,   310,   319,   320,   321,   322,   326,   327,
-     328,   329,   330,   331,   332,   339,   361,   362,   363,   364,
+     328,   329,   330,   331,   332,   333,   340,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
@@ -2119,26 +2123,26 @@ static const yytype_int16 yystos[] =
      555,   556,   557,   558,   559,   560,   561,   562,   563,   564,
      565,   566,   567,   568,   569,   570,   571,   572,   573,   574,
      575,   576,   577,   578,   579,   580,   581,   582,   583,   584,
-     585,   659,   660,   661,   662,   685,    45,    47,    48,   110,
-     143,   146,   155,   298,   342,   586,   587,   588,   589,   590,
-     591,   592,   593,    45,    53,    54,   142,   144,   147,   297,
-     345,   594,   595,   596,   597,   598,   599,   600,    45,    81,
-      82,   108,   190,   191,   233,   348,   611,   612,   613,   614,
-     615,   616,   617,    45,   282,   284,   285,   286,   287,   288,
-     294,   323,   324,   351,   601,   602,   603,   604,   605,   606,
-     607,   608,   609,   610,   312,   313,   314,   315,   316,   325,
-     352,   353,   354,   355,   356,   357,   360,   601,   602,   603,
-     604,   605,   608,    97,    98,    99,   100,   101,   102,   103,
-     104,   620,   621,   622,   623,   624,   625,   626,   627,   628,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,   186,   187,   188,   631,
-     632,   633,   634,   635,   636,   637,   638,   639,   640,   641,
-     642,   643,   644,   645,   646,   647,   648,   649,   650,   115,
-     653,   654,   318,   657,   658,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   665,   666,   667,   668,   669,
-     670,   671,   672,   673,   674,   675,   275,   276,   277,   278,
-     279,   280,   678,   679,   680,   681,   682,   683,   684,   308,
-     309,   688,   689,   690,    10,    10,    10,    10,    10,    10,
+     585,   586,   587,   661,   662,   663,   664,   687,    45,    47,
+      48,   110,   143,   146,   155,   298,   343,   588,   589,   590,
+     591,   592,   593,   594,   595,    45,    53,    54,   142,   144,
+     147,   297,   346,   596,   597,   598,   599,   600,   601,   602,
+      45,    81,    82,   108,   190,   191,   233,   349,   613,   614,
+     615,   616,   617,   618,   619,    45,   282,   284,   285,   286,
+     287,   288,   294,   323,   324,   352,   603,   604,   605,   606,
+     607,   608,   609,   610,   611,   612,   312,   313,   314,   315,
+     316,   325,   353,   354,   355,   356,   357,   358,   361,   603,
+     604,   605,   606,   607,   610,    97,    98,    99,   100,   101,
+     102,   103,   104,   622,   623,   624,   625,   626,   627,   628,
+     629,   630,   170,   171,   172,   173,   174,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   633,   634,   635,   636,   637,   638,   639,   640,   641,
+     642,   643,   644,   645,   646,   647,   648,   649,   650,   651,
+     652,   115,   655,   656,   318,   659,   660,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   667,   668,   669,
+     670,   671,   672,   673,   674,   675,   676,   677,   275,   276,
+     277,   278,   279,   280,   680,   681,   682,   683,   684,   685,
+     686,   308,   309,   690,   691,   692,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -2172,44 +2176,44 @@ static const yytype_int16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10
 };
 
 /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
 static const yytype_int16 yyr1[] =
 {
-       0,   333,   334,   334,   335,   335,   335,   335,   335,   335,
-     335,   335,   335,   335,   335,   335,   335,   335,   336,   337,
-     338,   338,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
-     339,   339,   340,   341,   341,   342,   342,   342,   342,   342,
-     342,   342,   342,   343,   344,   344,   345,   345,   345,   345,
-     345,   345,   345,   346,   347,   347,   348,   348,   348,   348,
-     348,   348,   348,   349,   350,   350,   351,   351,   351,   351,
-     351,   351,   351,   351,   351,   351,   352,   353,   354,   355,
-     356,   357,   358,   359,   359,   360,   360,   360,   360,   360,
-     360,   360,   360,   360,   360,   360,   360,   361,   362,   363,
+       0,   334,   335,   335,   336,   336,   336,   336,   336,   336,
+     336,   336,   336,   336,   336,   336,   336,   336,   337,   338,
+     339,   339,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   340,   340,   340,   340,   340,   340,   340,
+     340,   340,   340,   341,   342,   342,   343,   343,   343,   343,
+     343,   343,   343,   343,   344,   345,   345,   346,   346,   346,
+     346,   346,   346,   346,   347,   348,   348,   349,   349,   349,
+     349,   349,   349,   349,   350,   351,   351,   352,   352,   352,
+     352,   352,   352,   352,   352,   352,   352,   353,   354,   355,
+     356,   357,   358,   359,   360,   360,   361,   361,   361,   361,
+     361,   361,   361,   361,   361,   361,   361,   361,   362,   363,
      364,   365,   366,   367,   368,   369,   370,   371,   372,   373,
      374,   375,   376,   377,   378,   379,   380,   381,   382,   383,
      384,   385,   386,   387,   388,   389,   390,   391,   392,   393,
@@ -2235,19 +2239,19 @@ static const yytype_int16 yyr1[] =
      584,   585,   586,   587,   588,   589,   590,   591,   592,   593,
      594,   595,   596,   597,   598,   599,   600,   601,   602,   603,
      604,   605,   606,   607,   608,   609,   610,   611,   612,   613,
-     614,   615,   616,   617,   618,   619,   619,   620,   620,   620,
-     620,   620,   620,   620,   620,   621,   622,   623,   624,   625,
-     626,   627,   628,   629,   630,   630,   631,   631,   631,   631,
-     631,   631,   631,   631,   631,   631,   631,   631,   631,   631,
-     631,   631,   631,   631,   631,   632,   633,   634,   635,   636,
+     614,   615,   616,   617,   618,   619,   620,   621,   621,   622,
+     622,   622,   622,   622,   622,   622,   622,   623,   624,   625,
+     626,   627,   628,   629,   630,   631,   632,   632,   633,   633,
+     633,   633,   633,   633,   633,   633,   633,   633,   633,   633,
+     633,   633,   633,   633,   633,   633,   633,   634,   635,   636,
      637,   638,   639,   640,   641,   642,   643,   644,   645,   646,
-     647,   648,   649,   650,   651,   652,   652,   653,   654,   655,
-     656,   656,   657,   658,   659,   660,   661,   662,   663,   664,
-     664,   665,   665,   665,   665,   665,   665,   665,   665,   665,
-     665,   666,   667,   668,   669,   670,   671,   672,   673,   674,
-     675,   676,   677,   677,   678,   678,   678,   678,   678,   678,
-     679,   680,   681,   682,   683,   684,   685,   686,   687,   687,
-     688,   688,   689,   690
+     647,   648,   649,   650,   651,   652,   653,   654,   654,   655,
+     656,   657,   658,   658,   659,   660,   661,   662,   663,   664,
+     665,   666,   666,   667,   667,   667,   667,   667,   667,   667,
+     667,   667,   667,   668,   669,   670,   671,   672,   673,   674,
+     675,   676,   677,   678,   679,   679,   680,   680,   680,   680,
+     680,   680,   681,   682,   683,   684,   685,   686,   687,   688,
+     689,   689,   690,   690,   691,   692
 };
 
 /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
@@ -2278,13 +2282,13 @@ static const yytype_int8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
        1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
-       2,     2,     1,     2,     0,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       2,     2,     2,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -2298,31 +2302,31 @@ static const yytype_int8 yyr2[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     3,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     3,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       3,     3,     4,     4,     4,     3,     3,     4,     4,     3,
-       3,     2,     2,     2,     2,     2,     2,     3,     3,     2,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     3,     3,     4,     4,     4,     3,     3,     4,     4,
+       3,     3,     2,     2,     2,     2,     2,     2,     3,     3,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     3,     3,
-       3,     2,     2,     2,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
-       2,     2,     2,     1,     2,     0,     1,     1,     1,     1,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     3,     3,     2,     2,     2,     1,     2,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     1,     2,     0,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     1,     2,     0,     1,     2,     1,
-       2,     0,     1,     2,     2,     2,     3,     3,     1,     2,
-       0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     1,     2,     0,     1,     1,     1,     1,     1,     1,
-       2,     2,     2,     2,     2,     2,     3,     1,     2,     0,
-       1,     1,     2,     2
+       2,     2,     2,     2,     2,     2,     1,     2,     0,     1,
+       2,     1,     2,     0,     1,     2,     2,     2,     3,     3,
+       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     1,     2,     0,     1,     1,     1,     1,
+       1,     1,     2,     2,     2,     2,     2,     2,     3,     1,
+       2,     0,     1,     1,     2,     2
 };
 
 
@@ -2786,25 +2790,25 @@ yyparse (void)
   switch (yyn)
     {
   case 18: /* force_toplevel: VAR_FORCE_TOPLEVEL  */
-#line 208 "./util/configparser.y"
+#line 209 "./util/configparser.y"
         {
 		OUTYY(("\nP(force-toplevel)\n"));
 		cfg_parser->started_toplevel = 0;
 	}
-#line 2795 "util/configparser.c"
+#line 2799 "util/configparser.c"
     break;
 
   case 19: /* serverstart: VAR_SERVER  */
-#line 215 "./util/configparser.y"
+#line 216 "./util/configparser.y"
         {
 		OUTYY(("\nP(server:)\n"));
 		cfg_parser->started_toplevel = 1;
 	}
-#line 2804 "util/configparser.c"
+#line 2808 "util/configparser.c"
     break;
 
-  case 252: /* stubstart: VAR_STUB_ZONE  */
-#line 327 "./util/configparser.y"
+  case 253: /* stubstart: VAR_STUB_ZONE  */
+#line 328 "./util/configparser.y"
         {
 		struct config_stub* s;
 		OUTYY(("\nP(stub_zone:)\n"));
@@ -2817,11 +2821,11 @@ yyparse (void)
 			yyerror("out of memory");
 		}
 	}
-#line 2821 "util/configparser.c"
+#line 2825 "util/configparser.c"
     break;
 
-  case 263: /* forwardstart: VAR_FORWARD_ZONE  */
-#line 346 "./util/configparser.y"
+  case 264: /* forwardstart: VAR_FORWARD_ZONE  */
+#line 347 "./util/configparser.y"
         {
 		struct config_stub* s;
 		OUTYY(("\nP(forward_zone:)\n"));
@@ -2834,11 +2838,11 @@ yyparse (void)
 			yyerror("out of memory");
 		}
 	}
-#line 2838 "util/configparser.c"
+#line 2842 "util/configparser.c"
     break;
 
-  case 273: /* viewstart: VAR_VIEW  */
-#line 365 "./util/configparser.y"
+  case 274: /* viewstart: VAR_VIEW  */
+#line 366 "./util/configparser.y"
         {
 		struct config_view* s;
 		OUTYY(("\nP(view:)\n"));
@@ -2853,11 +2857,11 @@ yyparse (void)
 			yyerror("out of memory");
 		}
 	}
-#line 2857 "util/configparser.c"
+#line 2861 "util/configparser.c"
     break;
 
-  case 283: /* authstart: VAR_AUTH_ZONE  */
-#line 386 "./util/configparser.y"
+  case 284: /* authstart: VAR_AUTH_ZONE  */
+#line 387 "./util/configparser.y"
         {
 		struct config_auth* s;
 		OUTYY(("\nP(auth_zone:)\n"));
@@ -2877,11 +2881,11 @@ yyparse (void)
 			yyerror("out of memory");
 		}
 	}
-#line 2881 "util/configparser.c"
+#line 2885 "util/configparser.c"
     break;
 
-  case 296: /* rpz_tag: VAR_TAGS STRING_ARG  */
-#line 414 "./util/configparser.y"
+  case 297: /* rpz_tag: VAR_TAGS STRING_ARG  */
+#line 415 "./util/configparser.y"
         {
 		uint8_t* bitlist;
 		size_t len = 0;
@@ -2898,11 +2902,11 @@ yyparse (void)
 
 		}
 	}
-#line 2902 "util/configparser.c"
+#line 2906 "util/configparser.c"
     break;
 
-  case 297: /* rpz_action_override: VAR_RPZ_ACTION_OVERRIDE STRING_ARG  */
-#line 433 "./util/configparser.y"
+  case 298: /* rpz_action_override: VAR_RPZ_ACTION_OVERRIDE STRING_ARG  */
+#line 434 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_action_override:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "nxdomain")!=0 && strcmp((yyvsp[0].str), "nodata")!=0 &&
@@ -2917,21 +2921,21 @@ yyparse (void)
 			cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str);
 		}
 	}
-#line 2921 "util/configparser.c"
+#line 2925 "util/configparser.c"
     break;
 
-  case 298: /* rpz_cname_override: VAR_RPZ_CNAME_OVERRIDE STRING_ARG  */
-#line 450 "./util/configparser.y"
+  case 299: /* rpz_cname_override: VAR_RPZ_CNAME_OVERRIDE STRING_ARG  */
+#line 451 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_cname_override:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_cname);
 		cfg_parser->cfg->auths->rpz_cname = (yyvsp[0].str);
 	}
-#line 2931 "util/configparser.c"
+#line 2935 "util/configparser.c"
     break;
 
-  case 299: /* rpz_log: VAR_RPZ_LOG STRING_ARG  */
-#line 458 "./util/configparser.y"
+  case 300: /* rpz_log: VAR_RPZ_LOG STRING_ARG  */
+#line 459 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_log:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2939,21 +2943,21 @@ yyparse (void)
 		else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2943 "util/configparser.c"
+#line 2947 "util/configparser.c"
     break;
 
-  case 300: /* rpz_log_name: VAR_RPZ_LOG_NAME STRING_ARG  */
-#line 468 "./util/configparser.y"
+  case 301: /* rpz_log_name: VAR_RPZ_LOG_NAME STRING_ARG  */
+#line 469 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_log_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->rpz_log_name);
 		cfg_parser->cfg->auths->rpz_log_name = (yyvsp[0].str);
 	}
-#line 2953 "util/configparser.c"
+#line 2957 "util/configparser.c"
     break;
 
-  case 301: /* rpz_signal_nxdomain_ra: VAR_RPZ_SIGNAL_NXDOMAIN_RA STRING_ARG  */
-#line 475 "./util/configparser.y"
+  case 302: /* rpz_signal_nxdomain_ra: VAR_RPZ_SIGNAL_NXDOMAIN_RA STRING_ARG  */
+#line 476 "./util/configparser.y"
         {
 		OUTYY(("P(rpz_signal_nxdomain_ra:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2961,11 +2965,11 @@ yyparse (void)
 		else cfg_parser->cfg->auths->rpz_signal_nxdomain_ra = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2965 "util/configparser.c"
+#line 2969 "util/configparser.c"
     break;
 
-  case 302: /* rpzstart: VAR_RPZ  */
-#line 485 "./util/configparser.y"
+  case 303: /* rpzstart: VAR_RPZ  */
+#line 486 "./util/configparser.y"
         {
 		struct config_auth* s;
 		OUTYY(("\nP(rpz:)\n")); 
@@ -2983,11 +2987,11 @@ yyparse (void)
 			yyerror("out of memory");
 		}
 	}
-#line 2987 "util/configparser.c"
+#line 2991 "util/configparser.c"
     break;
 
-  case 317: /* server_num_threads: VAR_NUM_THREADS STRING_ARG  */
-#line 510 "./util/configparser.y"
+  case 318: /* server_num_threads: VAR_NUM_THREADS STRING_ARG  */
+#line 511 "./util/configparser.y"
         {
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2995,11 +2999,11 @@ yyparse (void)
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2999 "util/configparser.c"
+#line 3003 "util/configparser.c"
     break;
 
-  case 318: /* server_verbosity: VAR_VERBOSITY STRING_ARG  */
-#line 519 "./util/configparser.y"
+  case 319: /* server_verbosity: VAR_VERBOSITY STRING_ARG  */
+#line 520 "./util/configparser.y"
         {
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3007,11 +3011,11 @@ yyparse (void)
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3011 "util/configparser.c"
+#line 3015 "util/configparser.c"
     break;
 
-  case 319: /* server_statistics_interval: VAR_STATISTICS_INTERVAL STRING_ARG  */
-#line 528 "./util/configparser.y"
+  case 320: /* server_statistics_interval: VAR_STATISTICS_INTERVAL STRING_ARG  */
+#line 529 "./util/configparser.y"
         {
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -3021,11 +3025,11 @@ yyparse (void)
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3025 "util/configparser.c"
+#line 3029 "util/configparser.c"
     break;
 
-  case 320: /* server_statistics_cumulative: VAR_STATISTICS_CUMULATIVE STRING_ARG  */
-#line 539 "./util/configparser.y"
+  case 321: /* server_statistics_cumulative: VAR_STATISTICS_CUMULATIVE STRING_ARG  */
+#line 540 "./util/configparser.y"
         {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3033,11 +3037,11 @@ yyparse (void)
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3037 "util/configparser.c"
+#line 3041 "util/configparser.c"
     break;
 
-  case 321: /* server_extended_statistics: VAR_EXTENDED_STATISTICS STRING_ARG  */
-#line 548 "./util/configparser.y"
+  case 322: /* server_extended_statistics: VAR_EXTENDED_STATISTICS STRING_ARG  */
+#line 549 "./util/configparser.y"
         {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3045,11 +3049,11 @@ yyparse (void)
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3049 "util/configparser.c"
+#line 3053 "util/configparser.c"
     break;
 
-  case 322: /* server_shm_enable: VAR_SHM_ENABLE STRING_ARG  */
-#line 557 "./util/configparser.y"
+  case 323: /* server_shm_enable: VAR_SHM_ENABLE STRING_ARG  */
+#line 558 "./util/configparser.y"
         {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3057,11 +3061,11 @@ yyparse (void)
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3061 "util/configparser.c"
+#line 3065 "util/configparser.c"
     break;
 
-  case 323: /* server_shm_key: VAR_SHM_KEY STRING_ARG  */
-#line 566 "./util/configparser.y"
+  case 324: /* server_shm_key: VAR_SHM_KEY STRING_ARG  */
+#line 567 "./util/configparser.y"
         {
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -3071,11 +3075,11 @@ yyparse (void)
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3075 "util/configparser.c"
+#line 3079 "util/configparser.c"
     break;
 
-  case 324: /* server_port: VAR_PORT STRING_ARG  */
-#line 577 "./util/configparser.y"
+  case 325: /* server_port: VAR_PORT STRING_ARG  */
+#line 578 "./util/configparser.y"
         {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3083,11 +3087,11 @@ yyparse (void)
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3087 "util/configparser.c"
+#line 3091 "util/configparser.c"
     break;
 
-  case 325: /* server_send_client_subnet: VAR_SEND_CLIENT_SUBNET STRING_ARG  */
-#line 586 "./util/configparser.y"
+  case 326: /* server_send_client_subnet: VAR_SEND_CLIENT_SUBNET STRING_ARG  */
+#line 587 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
@@ -3098,11 +3102,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3102 "util/configparser.c"
+#line 3106 "util/configparser.c"
     break;
 
-  case 326: /* server_client_subnet_zone: VAR_CLIENT_SUBNET_ZONE STRING_ARG  */
-#line 598 "./util/configparser.y"
+  case 327: /* server_client_subnet_zone: VAR_CLIENT_SUBNET_ZONE STRING_ARG  */
+#line 599 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
@@ -3114,11 +3118,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 3118 "util/configparser.c"
+#line 3122 "util/configparser.c"
     break;
 
-  case 327: /* server_client_subnet_always_forward: VAR_CLIENT_SUBNET_ALWAYS_FORWARD STRING_ARG  */
-#line 612 "./util/configparser.y"
+  case 328: /* server_client_subnet_always_forward: VAR_CLIENT_SUBNET_ALWAYS_FORWARD STRING_ARG  */
+#line 613 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
@@ -3132,11 +3136,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3136 "util/configparser.c"
+#line 3140 "util/configparser.c"
     break;
 
-  case 328: /* server_client_subnet_opcode: VAR_CLIENT_SUBNET_OPCODE STRING_ARG  */
-#line 627 "./util/configparser.y"
+  case 329: /* server_client_subnet_opcode: VAR_CLIENT_SUBNET_OPCODE STRING_ARG  */
+#line 628 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
@@ -3146,11 +3150,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3150 "util/configparser.c"
+#line 3154 "util/configparser.c"
     break;
 
-  case 329: /* server_max_client_subnet_ipv4: VAR_MAX_CLIENT_SUBNET_IPV4 STRING_ARG  */
-#line 638 "./util/configparser.y"
+  case 330: /* server_max_client_subnet_ipv4: VAR_MAX_CLIENT_SUBNET_IPV4 STRING_ARG  */
+#line 639 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3166,11 +3170,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3170 "util/configparser.c"
+#line 3174 "util/configparser.c"
     break;
 
-  case 330: /* server_max_client_subnet_ipv6: VAR_MAX_CLIENT_SUBNET_IPV6 STRING_ARG  */
-#line 655 "./util/configparser.y"
+  case 331: /* server_max_client_subnet_ipv6: VAR_MAX_CLIENT_SUBNET_IPV6 STRING_ARG  */
+#line 656 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3186,11 +3190,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3190 "util/configparser.c"
+#line 3194 "util/configparser.c"
     break;
 
-  case 331: /* server_min_client_subnet_ipv4: VAR_MIN_CLIENT_SUBNET_IPV4 STRING_ARG  */
-#line 672 "./util/configparser.y"
+  case 332: /* server_min_client_subnet_ipv4: VAR_MIN_CLIENT_SUBNET_IPV4 STRING_ARG  */
+#line 673 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3206,11 +3210,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3210 "util/configparser.c"
+#line 3214 "util/configparser.c"
     break;
 
-  case 332: /* server_min_client_subnet_ipv6: VAR_MIN_CLIENT_SUBNET_IPV6 STRING_ARG  */
-#line 689 "./util/configparser.y"
+  case 333: /* server_min_client_subnet_ipv6: VAR_MIN_CLIENT_SUBNET_IPV6 STRING_ARG  */
+#line 690 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3226,11 +3230,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3230 "util/configparser.c"
+#line 3234 "util/configparser.c"
     break;
 
-  case 333: /* server_max_ecs_tree_size_ipv4: VAR_MAX_ECS_TREE_SIZE_IPV4 STRING_ARG  */
-#line 706 "./util/configparser.y"
+  case 334: /* server_max_ecs_tree_size_ipv4: VAR_MAX_ECS_TREE_SIZE_IPV4 STRING_ARG  */
+#line 707 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str)));
@@ -3244,11 +3248,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3248 "util/configparser.c"
+#line 3252 "util/configparser.c"
     break;
 
-  case 334: /* server_max_ecs_tree_size_ipv6: VAR_MAX_ECS_TREE_SIZE_IPV6 STRING_ARG  */
-#line 721 "./util/configparser.y"
+  case 335: /* server_max_ecs_tree_size_ipv6: VAR_MAX_ECS_TREE_SIZE_IPV6 STRING_ARG  */
+#line 722 "./util/configparser.y"
         {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str)));
@@ -3262,11 +3266,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 3266 "util/configparser.c"
+#line 3270 "util/configparser.c"
     break;
 
-  case 335: /* server_interface: VAR_INTERFACE STRING_ARG  */
-#line 736 "./util/configparser.y"
+  case 336: /* server_interface: VAR_INTERFACE STRING_ARG  */
+#line 737 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -3278,11 +3282,11 @@ yyparse (void)
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 3282 "util/configparser.c"
+#line 3286 "util/configparser.c"
     break;
 
-  case 336: /* server_outgoing_interface: VAR_OUTGOING_INTERFACE STRING_ARG  */
-#line 749 "./util/configparser.y"
+  case 337: /* server_outgoing_interface: VAR_OUTGOING_INTERFACE STRING_ARG  */
+#line 750 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -3296,11 +3300,11 @@ yyparse (void)
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 3300 "util/configparser.c"
+#line 3304 "util/configparser.c"
     break;
 
-  case 337: /* server_outgoing_range: VAR_OUTGOING_RANGE STRING_ARG  */
-#line 764 "./util/configparser.y"
+  case 338: /* server_outgoing_range: VAR_OUTGOING_RANGE STRING_ARG  */
+#line 765 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3308,11 +3312,11 @@ yyparse (void)
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3312 "util/configparser.c"
+#line 3316 "util/configparser.c"
     break;
 
-  case 338: /* server_outgoing_port_permit: VAR_OUTGOING_PORT_PERMIT STRING_ARG  */
-#line 773 "./util/configparser.y"
+  case 339: /* server_outgoing_port_permit: VAR_OUTGOING_PORT_PERMIT STRING_ARG  */
+#line 774 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1,
@@ -3320,11 +3324,11 @@ yyparse (void)
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3324 "util/configparser.c"
+#line 3328 "util/configparser.c"
     break;
 
-  case 339: /* server_outgoing_port_avoid: VAR_OUTGOING_PORT_AVOID STRING_ARG  */
-#line 782 "./util/configparser.y"
+  case 340: /* server_outgoing_port_avoid: VAR_OUTGOING_PORT_AVOID STRING_ARG  */
+#line 783 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0,
@@ -3332,11 +3336,11 @@ yyparse (void)
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 3336 "util/configparser.c"
+#line 3340 "util/configparser.c"
     break;
 
-  case 340: /* server_outgoing_num_tcp: VAR_OUTGOING_NUM_TCP STRING_ARG  */
-#line 791 "./util/configparser.y"
+  case 341: /* server_outgoing_num_tcp: VAR_OUTGOING_NUM_TCP STRING_ARG  */
+#line 792 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3344,11 +3348,11 @@ yyparse (void)
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3348 "util/configparser.c"
+#line 3352 "util/configparser.c"
     break;
 
-  case 341: /* server_incoming_num_tcp: VAR_INCOMING_NUM_TCP STRING_ARG  */
-#line 800 "./util/configparser.y"
+  case 342: /* server_incoming_num_tcp: VAR_INCOMING_NUM_TCP STRING_ARG  */
+#line 801 "./util/configparser.y"
         {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3356,11 +3360,11 @@ yyparse (void)
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3360 "util/configparser.c"
+#line 3364 "util/configparser.c"
     break;
 
-  case 342: /* server_interface_automatic: VAR_INTERFACE_AUTOMATIC STRING_ARG  */
-#line 809 "./util/configparser.y"
+  case 343: /* server_interface_automatic: VAR_INTERFACE_AUTOMATIC STRING_ARG  */
+#line 810 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3368,21 +3372,21 @@ yyparse (void)
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3372 "util/configparser.c"
+#line 3376 "util/configparser.c"
     break;
 
-  case 343: /* server_interface_automatic_ports: VAR_INTERFACE_AUTOMATIC_PORTS STRING_ARG  */
-#line 818 "./util/configparser.y"
+  case 344: /* server_interface_automatic_ports: VAR_INTERFACE_AUTOMATIC_PORTS STRING_ARG  */
+#line 819 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_automatic_ports:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->if_automatic_ports);
 		cfg_parser->cfg->if_automatic_ports = (yyvsp[0].str);
 	}
-#line 3382 "util/configparser.c"
+#line 3386 "util/configparser.c"
     break;
 
-  case 344: /* server_do_ip4: VAR_DO_IP4 STRING_ARG  */
-#line 825 "./util/configparser.y"
+  case 345: /* server_do_ip4: VAR_DO_IP4 STRING_ARG  */
+#line 826 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3390,11 +3394,11 @@ yyparse (void)
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3394 "util/configparser.c"
+#line 3398 "util/configparser.c"
     break;
 
-  case 345: /* server_do_ip6: VAR_DO_IP6 STRING_ARG  */
-#line 834 "./util/configparser.y"
+  case 346: /* server_do_ip6: VAR_DO_IP6 STRING_ARG  */
+#line 835 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3402,11 +3406,11 @@ yyparse (void)
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3406 "util/configparser.c"
+#line 3410 "util/configparser.c"
     break;
 
-  case 346: /* server_do_udp: VAR_DO_UDP STRING_ARG  */
-#line 843 "./util/configparser.y"
+  case 347: /* server_do_udp: VAR_DO_UDP STRING_ARG  */
+#line 844 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3414,11 +3418,11 @@ yyparse (void)
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3418 "util/configparser.c"
+#line 3422 "util/configparser.c"
     break;
 
-  case 347: /* server_do_tcp: VAR_DO_TCP STRING_ARG  */
-#line 852 "./util/configparser.y"
+  case 348: /* server_do_tcp: VAR_DO_TCP STRING_ARG  */
+#line 853 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3426,11 +3430,11 @@ yyparse (void)
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3430 "util/configparser.c"
+#line 3434 "util/configparser.c"
     break;
 
-  case 348: /* server_prefer_ip4: VAR_PREFER_IP4 STRING_ARG  */
-#line 861 "./util/configparser.y"
+  case 349: /* server_prefer_ip4: VAR_PREFER_IP4 STRING_ARG  */
+#line 862 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefer_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3438,11 +3442,11 @@ yyparse (void)
 		else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3442 "util/configparser.c"
+#line 3446 "util/configparser.c"
     break;
 
-  case 349: /* server_prefer_ip6: VAR_PREFER_IP6 STRING_ARG  */
-#line 870 "./util/configparser.y"
+  case 350: /* server_prefer_ip6: VAR_PREFER_IP6 STRING_ARG  */
+#line 871 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3450,11 +3454,11 @@ yyparse (void)
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3454 "util/configparser.c"
+#line 3458 "util/configparser.c"
     break;
 
-  case 350: /* server_tcp_mss: VAR_TCP_MSS STRING_ARG  */
-#line 879 "./util/configparser.y"
+  case 351: /* server_tcp_mss: VAR_TCP_MSS STRING_ARG  */
+#line 880 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3462,11 +3466,11 @@ yyparse (void)
 		else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3466 "util/configparser.c"
+#line 3470 "util/configparser.c"
     break;
 
-  case 351: /* server_outgoing_tcp_mss: VAR_OUTGOING_TCP_MSS STRING_ARG  */
-#line 888 "./util/configparser.y"
+  case 352: /* server_outgoing_tcp_mss: VAR_OUTGOING_TCP_MSS STRING_ARG  */
+#line 889 "./util/configparser.y"
         {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3474,11 +3478,11 @@ yyparse (void)
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3478 "util/configparser.c"
+#line 3482 "util/configparser.c"
     break;
 
-  case 352: /* server_tcp_idle_timeout: VAR_TCP_IDLE_TIMEOUT STRING_ARG  */
-#line 897 "./util/configparser.y"
+  case 353: /* server_tcp_idle_timeout: VAR_TCP_IDLE_TIMEOUT STRING_ARG  */
+#line 898 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3490,11 +3494,11 @@ yyparse (void)
 		else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3494 "util/configparser.c"
+#line 3498 "util/configparser.c"
     break;
 
-  case 353: /* server_max_reuse_tcp_queries: VAR_MAX_REUSE_TCP_QUERIES STRING_ARG  */
-#line 910 "./util/configparser.y"
+  case 354: /* server_max_reuse_tcp_queries: VAR_MAX_REUSE_TCP_QUERIES STRING_ARG  */
+#line 911 "./util/configparser.y"
         {
 		OUTYY(("P(server_max_reuse_tcp_queries:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3504,11 +3508,11 @@ yyparse (void)
 		else cfg_parser->cfg->max_reuse_tcp_queries = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3508 "util/configparser.c"
+#line 3512 "util/configparser.c"
     break;
 
-  case 354: /* server_tcp_reuse_timeout: VAR_TCP_REUSE_TIMEOUT STRING_ARG  */
-#line 921 "./util/configparser.y"
+  case 355: /* server_tcp_reuse_timeout: VAR_TCP_REUSE_TIMEOUT STRING_ARG  */
+#line 922 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_reuse_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3518,11 +3522,11 @@ yyparse (void)
 		else cfg_parser->cfg->tcp_reuse_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3522 "util/configparser.c"
+#line 3526 "util/configparser.c"
     break;
 
-  case 355: /* server_tcp_auth_query_timeout: VAR_TCP_AUTH_QUERY_TIMEOUT STRING_ARG  */
-#line 932 "./util/configparser.y"
+  case 356: /* server_tcp_auth_query_timeout: VAR_TCP_AUTH_QUERY_TIMEOUT STRING_ARG  */
+#line 933 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_auth_query_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3532,11 +3536,11 @@ yyparse (void)
 		else cfg_parser->cfg->tcp_auth_query_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3536 "util/configparser.c"
+#line 3540 "util/configparser.c"
     break;
 
-  case 356: /* server_tcp_keepalive: VAR_EDNS_TCP_KEEPALIVE STRING_ARG  */
-#line 943 "./util/configparser.y"
+  case 357: /* server_tcp_keepalive: VAR_EDNS_TCP_KEEPALIVE STRING_ARG  */
+#line 944 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3544,11 +3548,11 @@ yyparse (void)
 		else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3548 "util/configparser.c"
+#line 3552 "util/configparser.c"
     break;
 
-  case 357: /* server_tcp_keepalive_timeout: VAR_EDNS_TCP_KEEPALIVE_TIMEOUT STRING_ARG  */
-#line 952 "./util/configparser.y"
+  case 358: /* server_tcp_keepalive_timeout: VAR_EDNS_TCP_KEEPALIVE_TIMEOUT STRING_ARG  */
+#line 953 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3560,11 +3564,11 @@ yyparse (void)
 		else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3564 "util/configparser.c"
+#line 3568 "util/configparser.c"
     break;
 
-  case 358: /* server_tcp_upstream: VAR_TCP_UPSTREAM STRING_ARG  */
-#line 965 "./util/configparser.y"
+  case 359: /* server_tcp_upstream: VAR_TCP_UPSTREAM STRING_ARG  */
+#line 966 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3572,11 +3576,11 @@ yyparse (void)
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3576 "util/configparser.c"
+#line 3580 "util/configparser.c"
     break;
 
-  case 359: /* server_udp_upstream_without_downstream: VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM STRING_ARG  */
-#line 974 "./util/configparser.y"
+  case 360: /* server_udp_upstream_without_downstream: VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM STRING_ARG  */
+#line 975 "./util/configparser.y"
         {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3584,11 +3588,11 @@ yyparse (void)
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3588 "util/configparser.c"
+#line 3592 "util/configparser.c"
     break;
 
-  case 360: /* server_ssl_upstream: VAR_SSL_UPSTREAM STRING_ARG  */
-#line 983 "./util/configparser.y"
+  case 361: /* server_ssl_upstream: VAR_SSL_UPSTREAM STRING_ARG  */
+#line 984 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3596,31 +3600,31 @@ yyparse (void)
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3600 "util/configparser.c"
+#line 3604 "util/configparser.c"
     break;
 
-  case 361: /* server_ssl_service_key: VAR_SSL_SERVICE_KEY STRING_ARG  */
-#line 992 "./util/configparser.y"
+  case 362: /* server_ssl_service_key: VAR_SSL_SERVICE_KEY STRING_ARG  */
+#line 993 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 3610 "util/configparser.c"
+#line 3614 "util/configparser.c"
     break;
 
-  case 362: /* server_ssl_service_pem: VAR_SSL_SERVICE_PEM STRING_ARG  */
-#line 999 "./util/configparser.y"
+  case 363: /* server_ssl_service_pem: VAR_SSL_SERVICE_PEM STRING_ARG  */
+#line 1000 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 3620 "util/configparser.c"
+#line 3624 "util/configparser.c"
     break;
 
-  case 363: /* server_ssl_port: VAR_SSL_PORT STRING_ARG  */
-#line 1006 "./util/configparser.y"
+  case 364: /* server_ssl_port: VAR_SSL_PORT STRING_ARG  */
+#line 1007 "./util/configparser.y"
         {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3628,21 +3632,21 @@ yyparse (void)
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3632 "util/configparser.c"
+#line 3636 "util/configparser.c"
     break;
 
-  case 364: /* server_tls_cert_bundle: VAR_TLS_CERT_BUNDLE STRING_ARG  */
-#line 1015 "./util/configparser.y"
+  case 365: /* server_tls_cert_bundle: VAR_TLS_CERT_BUNDLE STRING_ARG  */
+#line 1016 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_cert_bundle);
 		cfg_parser->cfg->tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 3642 "util/configparser.c"
+#line 3646 "util/configparser.c"
     break;
 
-  case 365: /* server_tls_win_cert: VAR_TLS_WIN_CERT STRING_ARG  */
-#line 1022 "./util/configparser.y"
+  case 366: /* server_tls_win_cert: VAR_TLS_WIN_CERT STRING_ARG  */
+#line 1023 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3650,53 +3654,53 @@ yyparse (void)
 		else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3654 "util/configparser.c"
+#line 3658 "util/configparser.c"
     break;
 
-  case 366: /* server_tls_additional_port: VAR_TLS_ADDITIONAL_PORT STRING_ARG  */
-#line 1031 "./util/configparser.y"
+  case 367: /* server_tls_additional_port: VAR_TLS_ADDITIONAL_PORT STRING_ARG  */
+#line 1032 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_additional_port:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->tls_additional_port,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3665 "util/configparser.c"
+#line 3669 "util/configparser.c"
     break;
 
-  case 367: /* server_tls_ciphers: VAR_TLS_CIPHERS STRING_ARG  */
-#line 1039 "./util/configparser.y"
+  case 368: /* server_tls_ciphers: VAR_TLS_CIPHERS STRING_ARG  */
+#line 1040 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_ciphers:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphers);
 		cfg_parser->cfg->tls_ciphers = (yyvsp[0].str);
 	}
-#line 3675 "util/configparser.c"
+#line 3679 "util/configparser.c"
     break;
 
-  case 368: /* server_tls_ciphersuites: VAR_TLS_CIPHERSUITES STRING_ARG  */
-#line 1046 "./util/configparser.y"
+  case 369: /* server_tls_ciphersuites: VAR_TLS_CIPHERSUITES STRING_ARG  */
+#line 1047 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_ciphersuites:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->tls_ciphersuites);
 		cfg_parser->cfg->tls_ciphersuites = (yyvsp[0].str);
 	}
-#line 3685 "util/configparser.c"
+#line 3689 "util/configparser.c"
     break;
 
-  case 369: /* server_tls_session_ticket_keys: VAR_TLS_SESSION_TICKET_KEYS STRING_ARG  */
-#line 1053 "./util/configparser.y"
+  case 370: /* server_tls_session_ticket_keys: VAR_TLS_SESSION_TICKET_KEYS STRING_ARG  */
+#line 1054 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_session_ticket_keys:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3696 "util/configparser.c"
+#line 3700 "util/configparser.c"
     break;
 
-  case 370: /* server_tls_use_sni: VAR_TLS_USE_SNI STRING_ARG  */
-#line 1061 "./util/configparser.y"
+  case 371: /* server_tls_use_sni: VAR_TLS_USE_SNI STRING_ARG  */
+#line 1062 "./util/configparser.y"
         {
 		OUTYY(("P(server_tls_use_sni:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3704,11 +3708,11 @@ yyparse (void)
 		else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3708 "util/configparser.c"
+#line 3712 "util/configparser.c"
     break;
 
-  case 371: /* server_https_port: VAR_HTTPS_PORT STRING_ARG  */
-#line 1070 "./util/configparser.y"
+  case 372: /* server_https_port: VAR_HTTPS_PORT STRING_ARG  */
+#line 1071 "./util/configparser.y"
         {
 		OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3716,11 +3720,11 @@ yyparse (void)
 		else cfg_parser->cfg->https_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3720 "util/configparser.c"
+#line 3724 "util/configparser.c"
     break;
 
-  case 372: /* server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG  */
-#line 1078 "./util/configparser.y"
+  case 373: /* server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG  */
+#line 1079 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->http_endpoint);
@@ -3736,11 +3740,11 @@ yyparse (void)
 			cfg_parser->cfg->http_endpoint = (yyvsp[0].str);
 		}
 	}
-#line 3740 "util/configparser.c"
+#line 3744 "util/configparser.c"
     break;
 
-  case 373: /* server_http_max_streams: VAR_HTTP_MAX_STREAMS STRING_ARG  */
-#line 1094 "./util/configparser.y"
+  case 374: /* server_http_max_streams: VAR_HTTP_MAX_STREAMS STRING_ARG  */
+#line 1095 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_max_streams:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3748,11 +3752,11 @@ yyparse (void)
 		else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3752 "util/configparser.c"
+#line 3756 "util/configparser.c"
     break;
 
-  case 374: /* server_http_query_buffer_size: VAR_HTTP_QUERY_BUFFER_SIZE STRING_ARG  */
-#line 1102 "./util/configparser.y"
+  case 375: /* server_http_query_buffer_size: VAR_HTTP_QUERY_BUFFER_SIZE STRING_ARG  */
+#line 1103 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str),
@@ -3760,11 +3764,11 @@ yyparse (void)
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3764 "util/configparser.c"
+#line 3768 "util/configparser.c"
     break;
 
-  case 375: /* server_http_response_buffer_size: VAR_HTTP_RESPONSE_BUFFER_SIZE STRING_ARG  */
-#line 1110 "./util/configparser.y"
+  case 376: /* server_http_response_buffer_size: VAR_HTTP_RESPONSE_BUFFER_SIZE STRING_ARG  */
+#line 1111 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str),
@@ -3772,11 +3776,11 @@ yyparse (void)
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3776 "util/configparser.c"
+#line 3780 "util/configparser.c"
     break;
 
-  case 376: /* server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG  */
-#line 1118 "./util/configparser.y"
+  case 377: /* server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG  */
+#line 1119 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_nodelay:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3784,11 +3788,11 @@ yyparse (void)
 		else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3788 "util/configparser.c"
+#line 3792 "util/configparser.c"
     break;
 
-  case 377: /* server_http_notls_downstream: VAR_HTTP_NOTLS_DOWNSTREAM STRING_ARG  */
-#line 1126 "./util/configparser.y"
+  case 378: /* server_http_notls_downstream: VAR_HTTP_NOTLS_DOWNSTREAM STRING_ARG  */
+#line 1127 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_notls_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3796,11 +3800,11 @@ yyparse (void)
 		else cfg_parser->cfg->http_notls_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3800 "util/configparser.c"
+#line 3804 "util/configparser.c"
     break;
 
-  case 378: /* server_use_systemd: VAR_USE_SYSTEMD STRING_ARG  */
-#line 1134 "./util/configparser.y"
+  case 379: /* server_use_systemd: VAR_USE_SYSTEMD STRING_ARG  */
+#line 1135 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3808,11 +3812,11 @@ yyparse (void)
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3812 "util/configparser.c"
+#line 3816 "util/configparser.c"
     break;
 
-  case 379: /* server_do_daemonize: VAR_DO_DAEMONIZE STRING_ARG  */
-#line 1143 "./util/configparser.y"
+  case 380: /* server_do_daemonize: VAR_DO_DAEMONIZE STRING_ARG  */
+#line 1144 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3820,11 +3824,11 @@ yyparse (void)
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3824 "util/configparser.c"
+#line 3828 "util/configparser.c"
     break;
 
-  case 380: /* server_use_syslog: VAR_USE_SYSLOG STRING_ARG  */
-#line 1152 "./util/configparser.y"
+  case 381: /* server_use_syslog: VAR_USE_SYSLOG STRING_ARG  */
+#line 1153 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3837,11 +3841,11 @@ yyparse (void)
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3841 "util/configparser.c"
+#line 3845 "util/configparser.c"
     break;
 
-  case 381: /* server_log_time_ascii: VAR_LOG_TIME_ASCII STRING_ARG  */
-#line 1166 "./util/configparser.y"
+  case 382: /* server_log_time_ascii: VAR_LOG_TIME_ASCII STRING_ARG  */
+#line 1167 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3849,11 +3853,11 @@ yyparse (void)
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3853 "util/configparser.c"
+#line 3857 "util/configparser.c"
     break;
 
-  case 382: /* server_log_queries: VAR_LOG_QUERIES STRING_ARG  */
-#line 1175 "./util/configparser.y"
+  case 383: /* server_log_queries: VAR_LOG_QUERIES STRING_ARG  */
+#line 1176 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3861,11 +3865,11 @@ yyparse (void)
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3865 "util/configparser.c"
+#line 3869 "util/configparser.c"
     break;
 
-  case 383: /* server_log_replies: VAR_LOG_REPLIES STRING_ARG  */
-#line 1184 "./util/configparser.y"
+  case 384: /* server_log_replies: VAR_LOG_REPLIES STRING_ARG  */
+#line 1185 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3873,11 +3877,11 @@ yyparse (void)
 		else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3877 "util/configparser.c"
+#line 3881 "util/configparser.c"
     break;
 
-  case 384: /* server_log_tag_queryreply: VAR_LOG_TAG_QUERYREPLY STRING_ARG  */
-#line 1193 "./util/configparser.y"
+  case 385: /* server_log_tag_queryreply: VAR_LOG_TAG_QUERYREPLY STRING_ARG  */
+#line 1194 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3885,11 +3889,11 @@ yyparse (void)
 		else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3889 "util/configparser.c"
+#line 3893 "util/configparser.c"
     break;
 
-  case 385: /* server_log_servfail: VAR_LOG_SERVFAIL STRING_ARG  */
-#line 1202 "./util/configparser.y"
+  case 386: /* server_log_servfail: VAR_LOG_SERVFAIL STRING_ARG  */
+#line 1203 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3897,11 +3901,11 @@ yyparse (void)
 		else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3901 "util/configparser.c"
+#line 3905 "util/configparser.c"
     break;
 
-  case 386: /* server_log_local_actions: VAR_LOG_LOCAL_ACTIONS STRING_ARG  */
-#line 1211 "./util/configparser.y"
+  case 387: /* server_log_local_actions: VAR_LOG_LOCAL_ACTIONS STRING_ARG  */
+#line 1212 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3909,31 +3913,31 @@ yyparse (void)
 		else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3913 "util/configparser.c"
+#line 3917 "util/configparser.c"
     break;
 
-  case 387: /* server_chroot: VAR_CHROOT STRING_ARG  */
-#line 1220 "./util/configparser.y"
+  case 388: /* server_chroot: VAR_CHROOT STRING_ARG  */
+#line 1221 "./util/configparser.y"
         {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 3923 "util/configparser.c"
+#line 3927 "util/configparser.c"
     break;
 
-  case 388: /* server_username: VAR_USERNAME STRING_ARG  */
-#line 1227 "./util/configparser.y"
+  case 389: /* server_username: VAR_USERNAME STRING_ARG  */
+#line 1228 "./util/configparser.y"
         {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 3933 "util/configparser.c"
+#line 3937 "util/configparser.c"
     break;
 
-  case 389: /* server_directory: VAR_DIRECTORY STRING_ARG  */
-#line 1234 "./util/configparser.y"
+  case 390: /* server_directory: VAR_DIRECTORY STRING_ARG  */
+#line 1235 "./util/configparser.y"
         {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -3958,105 +3962,105 @@ yyparse (void)
 			}
 		}
 	}
-#line 3962 "util/configparser.c"
+#line 3966 "util/configparser.c"
     break;
 
-  case 390: /* server_logfile: VAR_LOGFILE STRING_ARG  */
-#line 1260 "./util/configparser.y"
+  case 391: /* server_logfile: VAR_LOGFILE STRING_ARG  */
+#line 1261 "./util/configparser.y"
         {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3973 "util/configparser.c"
+#line 3977 "util/configparser.c"
     break;
 
-  case 391: /* server_pidfile: VAR_PIDFILE STRING_ARG  */
-#line 1268 "./util/configparser.y"
+  case 392: /* server_pidfile: VAR_PIDFILE STRING_ARG  */
+#line 1269 "./util/configparser.y"
         {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3983 "util/configparser.c"
+#line 3987 "util/configparser.c"
     break;
 
-  case 392: /* server_root_hints: VAR_ROOT_HINTS STRING_ARG  */
-#line 1275 "./util/configparser.y"
+  case 393: /* server_root_hints: VAR_ROOT_HINTS STRING_ARG  */
+#line 1276 "./util/configparser.y"
         {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3993 "util/configparser.c"
+#line 3997 "util/configparser.c"
     break;
 
-  case 393: /* server_dlv_anchor_file: VAR_DLV_ANCHOR_FILE STRING_ARG  */
-#line 1282 "./util/configparser.y"
+  case 394: /* server_dlv_anchor_file: VAR_DLV_ANCHOR_FILE STRING_ARG  */
+#line 1283 "./util/configparser.y"
         {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor-file ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 4003 "util/configparser.c"
+#line 4007 "util/configparser.c"
     break;
 
-  case 394: /* server_dlv_anchor: VAR_DLV_ANCHOR STRING_ARG  */
-#line 1289 "./util/configparser.y"
+  case 395: /* server_dlv_anchor: VAR_DLV_ANCHOR STRING_ARG  */
+#line 1290 "./util/configparser.y"
         {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		log_warn("option dlv-anchor ignored: DLV is decommissioned");
 		free((yyvsp[0].str));
 	}
-#line 4013 "util/configparser.c"
+#line 4017 "util/configparser.c"
     break;
 
-  case 395: /* server_auto_trust_anchor_file: VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG  */
-#line 1296 "./util/configparser.y"
+  case 396: /* server_auto_trust_anchor_file: VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG  */
+#line 1297 "./util/configparser.y"
         {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4024 "util/configparser.c"
+#line 4028 "util/configparser.c"
     break;
 
-  case 396: /* server_trust_anchor_file: VAR_TRUST_ANCHOR_FILE STRING_ARG  */
-#line 1304 "./util/configparser.y"
+  case 397: /* server_trust_anchor_file: VAR_TRUST_ANCHOR_FILE STRING_ARG  */
+#line 1305 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4035 "util/configparser.c"
+#line 4039 "util/configparser.c"
     break;
 
-  case 397: /* server_trusted_keys_file: VAR_TRUSTED_KEYS_FILE STRING_ARG  */
-#line 1312 "./util/configparser.y"
+  case 398: /* server_trusted_keys_file: VAR_TRUSTED_KEYS_FILE STRING_ARG  */
+#line 1313 "./util/configparser.y"
         {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4046 "util/configparser.c"
+#line 4050 "util/configparser.c"
     break;
 
-  case 398: /* server_trust_anchor: VAR_TRUST_ANCHOR STRING_ARG  */
-#line 1320 "./util/configparser.y"
+  case 399: /* server_trust_anchor: VAR_TRUST_ANCHOR STRING_ARG  */
+#line 1321 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4056 "util/configparser.c"
+#line 4060 "util/configparser.c"
     break;
 
-  case 399: /* server_trust_anchor_signaling: VAR_TRUST_ANCHOR_SIGNALING STRING_ARG  */
-#line 1327 "./util/configparser.y"
+  case 400: /* server_trust_anchor_signaling: VAR_TRUST_ANCHOR_SIGNALING STRING_ARG  */
+#line 1328 "./util/configparser.y"
         {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4066,11 +4070,11 @@ yyparse (void)
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4070 "util/configparser.c"
+#line 4074 "util/configparser.c"
     break;
 
-  case 400: /* server_root_key_sentinel: VAR_ROOT_KEY_SENTINEL STRING_ARG  */
-#line 1338 "./util/configparser.y"
+  case 401: /* server_root_key_sentinel: VAR_ROOT_KEY_SENTINEL STRING_ARG  */
+#line 1339 "./util/configparser.y"
         {
 		OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4080,21 +4084,21 @@ yyparse (void)
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4084 "util/configparser.c"
+#line 4088 "util/configparser.c"
     break;
 
-  case 401: /* server_domain_insecure: VAR_DOMAIN_INSECURE STRING_ARG  */
-#line 1349 "./util/configparser.y"
+  case 402: /* server_domain_insecure: VAR_DOMAIN_INSECURE STRING_ARG  */
+#line 1350 "./util/configparser.y"
         {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4094 "util/configparser.c"
+#line 4098 "util/configparser.c"
     break;
 
-  case 402: /* server_hide_identity: VAR_HIDE_IDENTITY STRING_ARG  */
-#line 1356 "./util/configparser.y"
+  case 403: /* server_hide_identity: VAR_HIDE_IDENTITY STRING_ARG  */
+#line 1357 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4102,11 +4106,11 @@ yyparse (void)
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4106 "util/configparser.c"
+#line 4110 "util/configparser.c"
     break;
 
-  case 403: /* server_hide_version: VAR_HIDE_VERSION STRING_ARG  */
-#line 1365 "./util/configparser.y"
+  case 404: /* server_hide_version: VAR_HIDE_VERSION STRING_ARG  */
+#line 1366 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4114,11 +4118,11 @@ yyparse (void)
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4118 "util/configparser.c"
+#line 4122 "util/configparser.c"
     break;
 
-  case 404: /* server_hide_trustanchor: VAR_HIDE_TRUSTANCHOR STRING_ARG  */
-#line 1374 "./util/configparser.y"
+  case 405: /* server_hide_trustanchor: VAR_HIDE_TRUSTANCHOR STRING_ARG  */
+#line 1375 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4126,11 +4130,11 @@ yyparse (void)
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4130 "util/configparser.c"
+#line 4134 "util/configparser.c"
     break;
 
-  case 405: /* server_hide_http_user_agent: VAR_HIDE_HTTP_USER_AGENT STRING_ARG  */
-#line 1383 "./util/configparser.y"
+  case 406: /* server_hide_http_user_agent: VAR_HIDE_HTTP_USER_AGENT STRING_ARG  */
+#line 1384 "./util/configparser.y"
         {
 		OUTYY(("P(server_hide_user_agent:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4138,41 +4142,41 @@ yyparse (void)
 		else cfg_parser->cfg->hide_http_user_agent = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4142 "util/configparser.c"
+#line 4146 "util/configparser.c"
     break;
 
-  case 406: /* server_identity: VAR_IDENTITY STRING_ARG  */
-#line 1392 "./util/configparser.y"
+  case 407: /* server_identity: VAR_IDENTITY STRING_ARG  */
+#line 1393 "./util/configparser.y"
         {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 4152 "util/configparser.c"
+#line 4156 "util/configparser.c"
     break;
 
-  case 407: /* server_version: VAR_VERSION STRING_ARG  */
-#line 1399 "./util/configparser.y"
+  case 408: /* server_version: VAR_VERSION STRING_ARG  */
+#line 1400 "./util/configparser.y"
         {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 4162 "util/configparser.c"
+#line 4166 "util/configparser.c"
     break;
 
-  case 408: /* server_http_user_agent: VAR_HTTP_USER_AGENT STRING_ARG  */
-#line 1406 "./util/configparser.y"
+  case 409: /* server_http_user_agent: VAR_HTTP_USER_AGENT STRING_ARG  */
+#line 1407 "./util/configparser.y"
         {
 		OUTYY(("P(server_http_user_agent:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->http_user_agent);
 		cfg_parser->cfg->http_user_agent = (yyvsp[0].str);
 	}
-#line 4172 "util/configparser.c"
+#line 4176 "util/configparser.c"
     break;
 
-  case 409: /* server_nsid: VAR_NSID STRING_ARG  */
-#line 1413 "./util/configparser.y"
+  case 410: /* server_nsid: VAR_NSID STRING_ARG  */
+#line 1414 "./util/configparser.y"
         {
 		OUTYY(("P(server_nsid:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->nsid_cfg_str);
@@ -4187,33 +4191,33 @@ yyparse (void)
 			yyerror("the NSID must be either a hex string or an "
 			    "ascii character string prepended with ascii_.");
 	}
-#line 4191 "util/configparser.c"
+#line 4195 "util/configparser.c"
     break;
 
-  case 410: /* server_so_rcvbuf: VAR_SO_RCVBUF STRING_ARG  */
-#line 1429 "./util/configparser.y"
+  case 411: /* server_so_rcvbuf: VAR_SO_RCVBUF STRING_ARG  */
+#line 1430 "./util/configparser.y"
         {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4202 "util/configparser.c"
+#line 4206 "util/configparser.c"
     break;
 
-  case 411: /* server_so_sndbuf: VAR_SO_SNDBUF STRING_ARG  */
-#line 1437 "./util/configparser.y"
+  case 412: /* server_so_sndbuf: VAR_SO_SNDBUF STRING_ARG  */
+#line 1438 "./util/configparser.y"
         {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 4213 "util/configparser.c"
+#line 4217 "util/configparser.c"
     break;
 
-  case 412: /* server_so_reuseport: VAR_SO_REUSEPORT STRING_ARG  */
-#line 1445 "./util/configparser.y"
+  case 413: /* server_so_reuseport: VAR_SO_REUSEPORT STRING_ARG  */
+#line 1446 "./util/configparser.y"
         {
 		OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4222,11 +4226,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4226 "util/configparser.c"
+#line 4230 "util/configparser.c"
     break;
 
-  case 413: /* server_ip_transparent: VAR_IP_TRANSPARENT STRING_ARG  */
-#line 1455 "./util/configparser.y"
+  case 414: /* server_ip_transparent: VAR_IP_TRANSPARENT STRING_ARG  */
+#line 1456 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4235,11 +4239,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4239 "util/configparser.c"
+#line 4243 "util/configparser.c"
     break;
 
-  case 414: /* server_ip_freebind: VAR_IP_FREEBIND STRING_ARG  */
-#line 1465 "./util/configparser.y"
+  case 415: /* server_ip_freebind: VAR_IP_FREEBIND STRING_ARG  */
+#line 1466 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4248,11 +4252,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4252 "util/configparser.c"
+#line 4256 "util/configparser.c"
     break;
 
-  case 415: /* server_ip_dscp: VAR_IP_DSCP STRING_ARG  */
-#line 1475 "./util/configparser.y"
+  case 416: /* server_ip_dscp: VAR_IP_DSCP STRING_ARG  */
+#line 1476 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_dscp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4265,22 +4269,22 @@ yyparse (void)
 			cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4269 "util/configparser.c"
+#line 4273 "util/configparser.c"
     break;
 
-  case 416: /* server_stream_wait_size: VAR_STREAM_WAIT_SIZE STRING_ARG  */
-#line 1489 "./util/configparser.y"
+  case 417: /* server_stream_wait_size: VAR_STREAM_WAIT_SIZE STRING_ARG  */
+#line 1490 "./util/configparser.y"
         {
 		OUTYY(("P(server_stream_wait_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->stream_wait_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4280 "util/configparser.c"
+#line 4284 "util/configparser.c"
     break;
 
-  case 417: /* server_edns_buffer_size: VAR_EDNS_BUFFER_SIZE STRING_ARG  */
-#line 1497 "./util/configparser.y"
+  case 418: /* server_edns_buffer_size: VAR_EDNS_BUFFER_SIZE STRING_ARG  */
+#line 1498 "./util/configparser.y"
         {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4292,11 +4296,11 @@ yyparse (void)
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4296 "util/configparser.c"
+#line 4300 "util/configparser.c"
     break;
 
-  case 418: /* server_msg_buffer_size: VAR_MSG_BUFFER_SIZE STRING_ARG  */
-#line 1510 "./util/configparser.y"
+  case 419: /* server_msg_buffer_size: VAR_MSG_BUFFER_SIZE STRING_ARG  */
+#line 1511 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4306,22 +4310,22 @@ yyparse (void)
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4310 "util/configparser.c"
+#line 4314 "util/configparser.c"
     break;
 
-  case 419: /* server_msg_cache_size: VAR_MSG_CACHE_SIZE STRING_ARG  */
-#line 1521 "./util/configparser.y"
+  case 420: /* server_msg_cache_size: VAR_MSG_CACHE_SIZE STRING_ARG  */
+#line 1522 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4321 "util/configparser.c"
+#line 4325 "util/configparser.c"
     break;
 
-  case 420: /* server_msg_cache_slabs: VAR_MSG_CACHE_SLABS STRING_ARG  */
-#line 1529 "./util/configparser.y"
+  case 421: /* server_msg_cache_slabs: VAR_MSG_CACHE_SLABS STRING_ARG  */
+#line 1530 "./util/configparser.y"
         {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0) {
@@ -4333,11 +4337,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 4337 "util/configparser.c"
+#line 4341 "util/configparser.c"
     break;
 
-  case 421: /* server_num_queries_per_thread: VAR_NUM_QUERIES_PER_THREAD STRING_ARG  */
-#line 1542 "./util/configparser.y"
+  case 422: /* server_num_queries_per_thread: VAR_NUM_QUERIES_PER_THREAD STRING_ARG  */
+#line 1543 "./util/configparser.y"
         {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4345,11 +4349,11 @@ yyparse (void)
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4349 "util/configparser.c"
+#line 4353 "util/configparser.c"
     break;
 
-  case 422: /* server_jostle_timeout: VAR_JOSTLE_TIMEOUT STRING_ARG  */
-#line 1551 "./util/configparser.y"
+  case 423: /* server_jostle_timeout: VAR_JOSTLE_TIMEOUT STRING_ARG  */
+#line 1552 "./util/configparser.y"
         {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4357,11 +4361,11 @@ yyparse (void)
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4361 "util/configparser.c"
+#line 4365 "util/configparser.c"
     break;
 
-  case 423: /* server_delay_close: VAR_DELAY_CLOSE STRING_ARG  */
-#line 1560 "./util/configparser.y"
+  case 424: /* server_delay_close: VAR_DELAY_CLOSE STRING_ARG  */
+#line 1561 "./util/configparser.y"
         {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4369,11 +4373,11 @@ yyparse (void)
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4373 "util/configparser.c"
+#line 4377 "util/configparser.c"
     break;
 
-  case 424: /* server_udp_connect: VAR_UDP_CONNECT STRING_ARG  */
-#line 1569 "./util/configparser.y"
+  case 425: /* server_udp_connect: VAR_UDP_CONNECT STRING_ARG  */
+#line 1570 "./util/configparser.y"
         {
 		OUTYY(("P(server_udp_connect:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4381,11 +4385,11 @@ yyparse (void)
 		else cfg_parser->cfg->udp_connect = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4385 "util/configparser.c"
+#line 4389 "util/configparser.c"
     break;
 
-  case 425: /* server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG  */
-#line 1578 "./util/configparser.y"
+  case 426: /* server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG  */
+#line 1579 "./util/configparser.y"
         {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4394,11 +4398,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4398 "util/configparser.c"
+#line 4402 "util/configparser.c"
     break;
 
-  case 426: /* server_insecure_lan_zones: VAR_INSECURE_LAN_ZONES STRING_ARG  */
-#line 1588 "./util/configparser.y"
+  case 427: /* server_insecure_lan_zones: VAR_INSECURE_LAN_ZONES STRING_ARG  */
+#line 1589 "./util/configparser.y"
         {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4407,22 +4411,22 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4411 "util/configparser.c"
+#line 4415 "util/configparser.c"
     break;
 
-  case 427: /* server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG  */
-#line 1598 "./util/configparser.y"
+  case 428: /* server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG  */
+#line 1599 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4422 "util/configparser.c"
+#line 4426 "util/configparser.c"
     break;
 
-  case 428: /* server_rrset_cache_slabs: VAR_RRSET_CACHE_SLABS STRING_ARG  */
-#line 1606 "./util/configparser.y"
+  case 429: /* server_rrset_cache_slabs: VAR_RRSET_CACHE_SLABS STRING_ARG  */
+#line 1607 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0) {
@@ -4434,11 +4438,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 4438 "util/configparser.c"
+#line 4442 "util/configparser.c"
     break;
 
-  case 429: /* server_infra_host_ttl: VAR_INFRA_HOST_TTL STRING_ARG  */
-#line 1619 "./util/configparser.y"
+  case 430: /* server_infra_host_ttl: VAR_INFRA_HOST_TTL STRING_ARG  */
+#line 1620 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4446,22 +4450,22 @@ yyparse (void)
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4450 "util/configparser.c"
+#line 4454 "util/configparser.c"
     break;
 
-  case 430: /* server_infra_lame_ttl: VAR_INFRA_LAME_TTL STRING_ARG  */
-#line 1628 "./util/configparser.y"
+  case 431: /* server_infra_lame_ttl: VAR_INFRA_LAME_TTL STRING_ARG  */
+#line 1629 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4461 "util/configparser.c"
+#line 4465 "util/configparser.c"
     break;
 
-  case 431: /* server_infra_cache_numhosts: VAR_INFRA_CACHE_NUMHOSTS STRING_ARG  */
-#line 1636 "./util/configparser.y"
+  case 432: /* server_infra_cache_numhosts: VAR_INFRA_CACHE_NUMHOSTS STRING_ARG  */
+#line 1637 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4469,22 +4473,22 @@ yyparse (void)
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4473 "util/configparser.c"
+#line 4477 "util/configparser.c"
     break;
 
-  case 432: /* server_infra_cache_lame_size: VAR_INFRA_CACHE_LAME_SIZE STRING_ARG  */
-#line 1645 "./util/configparser.y"
+  case 433: /* server_infra_cache_lame_size: VAR_INFRA_CACHE_LAME_SIZE STRING_ARG  */
+#line 1646 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4484 "util/configparser.c"
+#line 4488 "util/configparser.c"
     break;
 
-  case 433: /* server_infra_cache_slabs: VAR_INFRA_CACHE_SLABS STRING_ARG  */
-#line 1653 "./util/configparser.y"
+  case 434: /* server_infra_cache_slabs: VAR_INFRA_CACHE_SLABS STRING_ARG  */
+#line 1654 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0) {
@@ -4496,11 +4500,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 4500 "util/configparser.c"
+#line 4504 "util/configparser.c"
     break;
 
-  case 434: /* server_infra_cache_min_rtt: VAR_INFRA_CACHE_MIN_RTT STRING_ARG  */
-#line 1666 "./util/configparser.y"
+  case 435: /* server_infra_cache_min_rtt: VAR_INFRA_CACHE_MIN_RTT STRING_ARG  */
+#line 1667 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4508,11 +4512,11 @@ yyparse (void)
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4512 "util/configparser.c"
+#line 4516 "util/configparser.c"
     break;
 
-  case 435: /* server_infra_cache_max_rtt: VAR_INFRA_CACHE_MAX_RTT STRING_ARG  */
-#line 1675 "./util/configparser.y"
+  case 436: /* server_infra_cache_max_rtt: VAR_INFRA_CACHE_MAX_RTT STRING_ARG  */
+#line 1676 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_cache_max_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4520,11 +4524,11 @@ yyparse (void)
 		else cfg_parser->cfg->infra_cache_max_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4524 "util/configparser.c"
+#line 4528 "util/configparser.c"
     break;
 
-  case 436: /* server_infra_keep_probing: VAR_INFRA_KEEP_PROBING STRING_ARG  */
-#line 1684 "./util/configparser.y"
+  case 437: /* server_infra_keep_probing: VAR_INFRA_KEEP_PROBING STRING_ARG  */
+#line 1685 "./util/configparser.y"
         {
 		OUTYY(("P(server_infra_keep_probing:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4533,21 +4537,21 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4537 "util/configparser.c"
+#line 4541 "util/configparser.c"
     break;
 
-  case 437: /* server_target_fetch_policy: VAR_TARGET_FETCH_POLICY STRING_ARG  */
-#line 1694 "./util/configparser.y"
+  case 438: /* server_target_fetch_policy: VAR_TARGET_FETCH_POLICY STRING_ARG  */
+#line 1695 "./util/configparser.y"
         {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 4547 "util/configparser.c"
+#line 4551 "util/configparser.c"
     break;
 
-  case 438: /* server_harden_short_bufsize: VAR_HARDEN_SHORT_BUFSIZE STRING_ARG  */
-#line 1701 "./util/configparser.y"
+  case 439: /* server_harden_short_bufsize: VAR_HARDEN_SHORT_BUFSIZE STRING_ARG  */
+#line 1702 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4556,11 +4560,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4560 "util/configparser.c"
+#line 4564 "util/configparser.c"
     break;
 
-  case 439: /* server_harden_large_queries: VAR_HARDEN_LARGE_QUERIES STRING_ARG  */
-#line 1711 "./util/configparser.y"
+  case 440: /* server_harden_large_queries: VAR_HARDEN_LARGE_QUERIES STRING_ARG  */
+#line 1712 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4569,11 +4573,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4573 "util/configparser.c"
+#line 4577 "util/configparser.c"
     break;
 
-  case 440: /* server_harden_glue: VAR_HARDEN_GLUE STRING_ARG  */
-#line 1721 "./util/configparser.y"
+  case 441: /* server_harden_glue: VAR_HARDEN_GLUE STRING_ARG  */
+#line 1722 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4582,11 +4586,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4586 "util/configparser.c"
+#line 4590 "util/configparser.c"
     break;
 
-  case 441: /* server_harden_dnssec_stripped: VAR_HARDEN_DNSSEC_STRIPPED STRING_ARG  */
-#line 1731 "./util/configparser.y"
+  case 442: /* server_harden_dnssec_stripped: VAR_HARDEN_DNSSEC_STRIPPED STRING_ARG  */
+#line 1732 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4595,11 +4599,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4599 "util/configparser.c"
+#line 4603 "util/configparser.c"
     break;
 
-  case 442: /* server_harden_below_nxdomain: VAR_HARDEN_BELOW_NXDOMAIN STRING_ARG  */
-#line 1741 "./util/configparser.y"
+  case 443: /* server_harden_below_nxdomain: VAR_HARDEN_BELOW_NXDOMAIN STRING_ARG  */
+#line 1742 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4608,11 +4612,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4612 "util/configparser.c"
+#line 4616 "util/configparser.c"
     break;
 
-  case 443: /* server_harden_referral_path: VAR_HARDEN_REFERRAL_PATH STRING_ARG  */
-#line 1751 "./util/configparser.y"
+  case 444: /* server_harden_referral_path: VAR_HARDEN_REFERRAL_PATH STRING_ARG  */
+#line 1752 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4621,11 +4625,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4625 "util/configparser.c"
+#line 4629 "util/configparser.c"
     break;
 
-  case 444: /* server_harden_algo_downgrade: VAR_HARDEN_ALGO_DOWNGRADE STRING_ARG  */
-#line 1761 "./util/configparser.y"
+  case 445: /* server_harden_algo_downgrade: VAR_HARDEN_ALGO_DOWNGRADE STRING_ARG  */
+#line 1762 "./util/configparser.y"
         {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4634,11 +4638,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4638 "util/configparser.c"
+#line 4642 "util/configparser.c"
     break;
 
-  case 445: /* server_use_caps_for_id: VAR_USE_CAPS_FOR_ID STRING_ARG  */
-#line 1771 "./util/configparser.y"
+  case 446: /* server_use_caps_for_id: VAR_USE_CAPS_FOR_ID STRING_ARG  */
+#line 1772 "./util/configparser.y"
         {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4647,41 +4651,41 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4651 "util/configparser.c"
+#line 4655 "util/configparser.c"
     break;
 
-  case 446: /* server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG  */
-#line 1781 "./util/configparser.y"
+  case 447: /* server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG  */
+#line 1782 "./util/configparser.y"
         {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4661 "util/configparser.c"
+#line 4665 "util/configparser.c"
     break;
 
-  case 447: /* server_private_address: VAR_PRIVATE_ADDRESS STRING_ARG  */
-#line 1788 "./util/configparser.y"
+  case 448: /* server_private_address: VAR_PRIVATE_ADDRESS STRING_ARG  */
+#line 1789 "./util/configparser.y"
         {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4671 "util/configparser.c"
+#line 4675 "util/configparser.c"
     break;
 
-  case 448: /* server_private_domain: VAR_PRIVATE_DOMAIN STRING_ARG  */
-#line 1795 "./util/configparser.y"
+  case 449: /* server_private_domain: VAR_PRIVATE_DOMAIN STRING_ARG  */
+#line 1796 "./util/configparser.y"
         {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4681 "util/configparser.c"
+#line 4685 "util/configparser.c"
     break;
 
-  case 449: /* server_prefetch: VAR_PREFETCH STRING_ARG  */
-#line 1802 "./util/configparser.y"
+  case 450: /* server_prefetch: VAR_PREFETCH STRING_ARG  */
+#line 1803 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4689,11 +4693,11 @@ yyparse (void)
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4693 "util/configparser.c"
+#line 4697 "util/configparser.c"
     break;
 
-  case 450: /* server_prefetch_key: VAR_PREFETCH_KEY STRING_ARG  */
-#line 1811 "./util/configparser.y"
+  case 451: /* server_prefetch_key: VAR_PREFETCH_KEY STRING_ARG  */
+#line 1812 "./util/configparser.y"
         {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4701,11 +4705,11 @@ yyparse (void)
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4705 "util/configparser.c"
+#line 4709 "util/configparser.c"
     break;
 
-  case 451: /* server_deny_any: VAR_DENY_ANY STRING_ARG  */
-#line 1820 "./util/configparser.y"
+  case 452: /* server_deny_any: VAR_DENY_ANY STRING_ARG  */
+#line 1821 "./util/configparser.y"
         {
 		OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4713,11 +4717,11 @@ yyparse (void)
 		else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4717 "util/configparser.c"
+#line 4721 "util/configparser.c"
     break;
 
-  case 452: /* server_unwanted_reply_threshold: VAR_UNWANTED_REPLY_THRESHOLD STRING_ARG  */
-#line 1829 "./util/configparser.y"
+  case 453: /* server_unwanted_reply_threshold: VAR_UNWANTED_REPLY_THRESHOLD STRING_ARG  */
+#line 1830 "./util/configparser.y"
         {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4725,21 +4729,21 @@ yyparse (void)
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4729 "util/configparser.c"
+#line 4733 "util/configparser.c"
     break;
 
-  case 453: /* server_do_not_query_address: VAR_DO_NOT_QUERY_ADDRESS STRING_ARG  */
-#line 1838 "./util/configparser.y"
+  case 454: /* server_do_not_query_address: VAR_DO_NOT_QUERY_ADDRESS STRING_ARG  */
+#line 1839 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4739 "util/configparser.c"
+#line 4743 "util/configparser.c"
     break;
 
-  case 454: /* server_do_not_query_localhost: VAR_DO_NOT_QUERY_LOCALHOST STRING_ARG  */
-#line 1845 "./util/configparser.y"
+  case 455: /* server_do_not_query_localhost: VAR_DO_NOT_QUERY_LOCALHOST STRING_ARG  */
+#line 1846 "./util/configparser.y"
         {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4748,22 +4752,22 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4752 "util/configparser.c"
+#line 4756 "util/configparser.c"
     break;
 
-  case 455: /* server_access_control: VAR_ACCESS_CONTROL STRING_ARG STRING_ARG  */
-#line 1855 "./util/configparser.y"
+  case 456: /* server_access_control: VAR_ACCESS_CONTROL STRING_ARG STRING_ARG  */
+#line 1856 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_acl_action((yyvsp[0].str));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acls, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding acl");
 	}
-#line 4763 "util/configparser.c"
+#line 4767 "util/configparser.c"
     break;
 
-  case 456: /* server_interface_action: VAR_INTERFACE_ACTION STRING_ARG STRING_ARG  */
-#line 1863 "./util/configparser.y"
+  case 457: /* server_interface_action: VAR_INTERFACE_ACTION STRING_ARG STRING_ARG  */
+#line 1864 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_action:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_acl_action((yyvsp[0].str));
@@ -4771,21 +4775,21 @@ yyparse (void)
 			&cfg_parser->cfg->interface_actions, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding acl");
 	}
-#line 4775 "util/configparser.c"
+#line 4779 "util/configparser.c"
     break;
 
-  case 457: /* server_module_conf: VAR_MODULE_CONF STRING_ARG  */
-#line 1872 "./util/configparser.y"
+  case 458: /* server_module_conf: VAR_MODULE_CONF STRING_ARG  */
+#line 1873 "./util/configparser.y"
         {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 4785 "util/configparser.c"
+#line 4789 "util/configparser.c"
     break;
 
-  case 458: /* server_val_override_date: VAR_VAL_OVERRIDE_DATE STRING_ARG  */
-#line 1879 "./util/configparser.y"
+  case 459: /* server_val_override_date: VAR_VAL_OVERRIDE_DATE STRING_ARG  */
+#line 1880 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4802,11 +4806,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 4806 "util/configparser.c"
+#line 4810 "util/configparser.c"
     break;
 
-  case 459: /* server_val_sig_skew_min: VAR_VAL_SIG_SKEW_MIN STRING_ARG  */
-#line 1897 "./util/configparser.y"
+  case 460: /* server_val_sig_skew_min: VAR_VAL_SIG_SKEW_MIN STRING_ARG  */
+#line 1898 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4818,11 +4822,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 4822 "util/configparser.c"
+#line 4826 "util/configparser.c"
     break;
 
-  case 460: /* server_val_sig_skew_max: VAR_VAL_SIG_SKEW_MAX STRING_ARG  */
-#line 1910 "./util/configparser.y"
+  case 461: /* server_val_sig_skew_max: VAR_VAL_SIG_SKEW_MAX STRING_ARG  */
+#line 1911 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4834,11 +4838,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 4838 "util/configparser.c"
+#line 4842 "util/configparser.c"
     break;
 
-  case 461: /* server_val_max_restart: VAR_VAL_MAX_RESTART STRING_ARG  */
-#line 1923 "./util/configparser.y"
+  case 462: /* server_val_max_restart: VAR_VAL_MAX_RESTART STRING_ARG  */
+#line 1924 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_max_restart:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -4850,11 +4854,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 4854 "util/configparser.c"
+#line 4858 "util/configparser.c"
     break;
 
-  case 462: /* server_cache_max_ttl: VAR_CACHE_MAX_TTL STRING_ARG  */
-#line 1936 "./util/configparser.y"
+  case 463: /* server_cache_max_ttl: VAR_CACHE_MAX_TTL STRING_ARG  */
+#line 1937 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4862,11 +4866,11 @@ yyparse (void)
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4866 "util/configparser.c"
+#line 4870 "util/configparser.c"
     break;
 
-  case 463: /* server_cache_max_negative_ttl: VAR_CACHE_MAX_NEGATIVE_TTL STRING_ARG  */
-#line 1945 "./util/configparser.y"
+  case 464: /* server_cache_max_negative_ttl: VAR_CACHE_MAX_NEGATIVE_TTL STRING_ARG  */
+#line 1946 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4874,11 +4878,11 @@ yyparse (void)
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4878 "util/configparser.c"
+#line 4882 "util/configparser.c"
     break;
 
-  case 464: /* server_cache_min_ttl: VAR_CACHE_MIN_TTL STRING_ARG  */
-#line 1954 "./util/configparser.y"
+  case 465: /* server_cache_min_ttl: VAR_CACHE_MIN_TTL STRING_ARG  */
+#line 1955 "./util/configparser.y"
         {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4886,11 +4890,11 @@ yyparse (void)
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4890 "util/configparser.c"
+#line 4894 "util/configparser.c"
     break;
 
-  case 465: /* server_bogus_ttl: VAR_BOGUS_TTL STRING_ARG  */
-#line 1963 "./util/configparser.y"
+  case 466: /* server_bogus_ttl: VAR_BOGUS_TTL STRING_ARG  */
+#line 1964 "./util/configparser.y"
         {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4898,11 +4902,11 @@ yyparse (void)
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4902 "util/configparser.c"
+#line 4906 "util/configparser.c"
     break;
 
-  case 466: /* server_val_clean_additional: VAR_VAL_CLEAN_ADDITIONAL STRING_ARG  */
-#line 1972 "./util/configparser.y"
+  case 467: /* server_val_clean_additional: VAR_VAL_CLEAN_ADDITIONAL STRING_ARG  */
+#line 1973 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4911,11 +4915,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4915 "util/configparser.c"
+#line 4919 "util/configparser.c"
     break;
 
-  case 467: /* server_val_permissive_mode: VAR_VAL_PERMISSIVE_MODE STRING_ARG  */
-#line 1982 "./util/configparser.y"
+  case 468: /* server_val_permissive_mode: VAR_VAL_PERMISSIVE_MODE STRING_ARG  */
+#line 1983 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4924,11 +4928,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4928 "util/configparser.c"
+#line 4932 "util/configparser.c"
     break;
 
-  case 468: /* server_aggressive_nsec: VAR_AGGRESSIVE_NSEC STRING_ARG  */
-#line 1992 "./util/configparser.y"
+  case 469: /* server_aggressive_nsec: VAR_AGGRESSIVE_NSEC STRING_ARG  */
+#line 1993 "./util/configparser.y"
         {
 		OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4938,11 +4942,11 @@ yyparse (void)
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4942 "util/configparser.c"
+#line 4946 "util/configparser.c"
     break;
 
-  case 469: /* server_ignore_cd_flag: VAR_IGNORE_CD_FLAG STRING_ARG  */
-#line 2003 "./util/configparser.y"
+  case 470: /* server_ignore_cd_flag: VAR_IGNORE_CD_FLAG STRING_ARG  */
+#line 2004 "./util/configparser.y"
         {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4950,11 +4954,11 @@ yyparse (void)
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4954 "util/configparser.c"
+#line 4958 "util/configparser.c"
     break;
 
-  case 470: /* server_serve_expired: VAR_SERVE_EXPIRED STRING_ARG  */
-#line 2012 "./util/configparser.y"
+  case 471: /* server_serve_expired: VAR_SERVE_EXPIRED STRING_ARG  */
+#line 2013 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4962,11 +4966,11 @@ yyparse (void)
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4966 "util/configparser.c"
+#line 4970 "util/configparser.c"
     break;
 
-  case 471: /* server_serve_expired_ttl: VAR_SERVE_EXPIRED_TTL STRING_ARG  */
-#line 2021 "./util/configparser.y"
+  case 472: /* server_serve_expired_ttl: VAR_SERVE_EXPIRED_TTL STRING_ARG  */
+#line 2022 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4974,11 +4978,11 @@ yyparse (void)
 		else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4978 "util/configparser.c"
+#line 4982 "util/configparser.c"
     break;
 
-  case 472: /* server_serve_expired_ttl_reset: VAR_SERVE_EXPIRED_TTL_RESET STRING_ARG  */
-#line 2030 "./util/configparser.y"
+  case 473: /* server_serve_expired_ttl_reset: VAR_SERVE_EXPIRED_TTL_RESET STRING_ARG  */
+#line 2031 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_ttl_reset:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4986,11 +4990,11 @@ yyparse (void)
 		else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4990 "util/configparser.c"
+#line 4994 "util/configparser.c"
     break;
 
-  case 473: /* server_serve_expired_reply_ttl: VAR_SERVE_EXPIRED_REPLY_TTL STRING_ARG  */
-#line 2039 "./util/configparser.y"
+  case 474: /* server_serve_expired_reply_ttl: VAR_SERVE_EXPIRED_REPLY_TTL STRING_ARG  */
+#line 2040 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_reply_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4998,11 +5002,11 @@ yyparse (void)
 		else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5002 "util/configparser.c"
+#line 5006 "util/configparser.c"
     break;
 
-  case 474: /* server_serve_expired_client_timeout: VAR_SERVE_EXPIRED_CLIENT_TIMEOUT STRING_ARG  */
-#line 2048 "./util/configparser.y"
+  case 475: /* server_serve_expired_client_timeout: VAR_SERVE_EXPIRED_CLIENT_TIMEOUT STRING_ARG  */
+#line 2049 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_expired_client_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5010,11 +5014,11 @@ yyparse (void)
 		else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5014 "util/configparser.c"
+#line 5018 "util/configparser.c"
     break;
 
-  case 475: /* server_ede_serve_expired: VAR_EDE_SERVE_EXPIRED STRING_ARG  */
-#line 2057 "./util/configparser.y"
+  case 476: /* server_ede_serve_expired: VAR_EDE_SERVE_EXPIRED STRING_ARG  */
+#line 2058 "./util/configparser.y"
         {
 		OUTYY(("P(server_ede_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5022,11 +5026,11 @@ yyparse (void)
 		else cfg_parser->cfg->ede_serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5026 "util/configparser.c"
+#line 5030 "util/configparser.c"
     break;
 
-  case 476: /* server_serve_original_ttl: VAR_SERVE_ORIGINAL_TTL STRING_ARG  */
-#line 2066 "./util/configparser.y"
+  case 477: /* server_serve_original_ttl: VAR_SERVE_ORIGINAL_TTL STRING_ARG  */
+#line 2067 "./util/configparser.y"
         {
 		OUTYY(("P(server_serve_original_ttl:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5034,11 +5038,11 @@ yyparse (void)
 		else cfg_parser->cfg->serve_original_ttl = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5038 "util/configparser.c"
+#line 5042 "util/configparser.c"
     break;
 
-  case 477: /* server_fake_dsa: VAR_FAKE_DSA STRING_ARG  */
-#line 2075 "./util/configparser.y"
+  case 478: /* server_fake_dsa: VAR_FAKE_DSA STRING_ARG  */
+#line 2076 "./util/configparser.y"
         {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5050,11 +5054,11 @@ yyparse (void)
 #endif
 		free((yyvsp[0].str));
 	}
-#line 5054 "util/configparser.c"
+#line 5058 "util/configparser.c"
     break;
 
-  case 478: /* server_fake_sha1: VAR_FAKE_SHA1 STRING_ARG  */
-#line 2088 "./util/configparser.y"
+  case 479: /* server_fake_sha1: VAR_FAKE_SHA1 STRING_ARG  */
+#line 2089 "./util/configparser.y"
         {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5066,11 +5070,11 @@ yyparse (void)
 #endif
 		free((yyvsp[0].str));
 	}
-#line 5070 "util/configparser.c"
+#line 5074 "util/configparser.c"
     break;
 
-  case 479: /* server_val_log_level: VAR_VAL_LOG_LEVEL STRING_ARG  */
-#line 2101 "./util/configparser.y"
+  case 480: /* server_val_log_level: VAR_VAL_LOG_LEVEL STRING_ARG  */
+#line 2102 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5078,21 +5082,21 @@ yyparse (void)
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5082 "util/configparser.c"
+#line 5086 "util/configparser.c"
     break;
 
-  case 480: /* server_val_nsec3_keysize_iterations: VAR_VAL_NSEC3_KEYSIZE_ITERATIONS STRING_ARG  */
-#line 2110 "./util/configparser.y"
+  case 481: /* server_val_nsec3_keysize_iterations: VAR_VAL_NSEC3_KEYSIZE_ITERATIONS STRING_ARG  */
+#line 2111 "./util/configparser.y"
         {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 5092 "util/configparser.c"
+#line 5096 "util/configparser.c"
     break;
 
-  case 481: /* server_zonemd_permissive_mode: VAR_ZONEMD_PERMISSIVE_MODE STRING_ARG  */
-#line 2117 "./util/configparser.y"
+  case 482: /* server_zonemd_permissive_mode: VAR_ZONEMD_PERMISSIVE_MODE STRING_ARG  */
+#line 2118 "./util/configparser.y"
         {
 		OUTYY(("P(server_zonemd_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5100,11 +5104,11 @@ yyparse (void)
 		else	cfg_parser->cfg->zonemd_permissive_mode = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5104 "util/configparser.c"
+#line 5108 "util/configparser.c"
     break;
 
-  case 482: /* server_add_holddown: VAR_ADD_HOLDDOWN STRING_ARG  */
-#line 2126 "./util/configparser.y"
+  case 483: /* server_add_holddown: VAR_ADD_HOLDDOWN STRING_ARG  */
+#line 2127 "./util/configparser.y"
         {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5112,11 +5116,11 @@ yyparse (void)
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5116 "util/configparser.c"
+#line 5120 "util/configparser.c"
     break;
 
-  case 483: /* server_del_holddown: VAR_DEL_HOLDDOWN STRING_ARG  */
-#line 2135 "./util/configparser.y"
+  case 484: /* server_del_holddown: VAR_DEL_HOLDDOWN STRING_ARG  */
+#line 2136 "./util/configparser.y"
         {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5124,11 +5128,11 @@ yyparse (void)
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5128 "util/configparser.c"
+#line 5132 "util/configparser.c"
     break;
 
-  case 484: /* server_keep_missing: VAR_KEEP_MISSING STRING_ARG  */
-#line 2144 "./util/configparser.y"
+  case 485: /* server_keep_missing: VAR_KEEP_MISSING STRING_ARG  */
+#line 2145 "./util/configparser.y"
         {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5136,11 +5140,11 @@ yyparse (void)
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5140 "util/configparser.c"
+#line 5144 "util/configparser.c"
     break;
 
-  case 485: /* server_permit_small_holddown: VAR_PERMIT_SMALL_HOLDDOWN STRING_ARG  */
-#line 2153 "./util/configparser.y"
+  case 486: /* server_permit_small_holddown: VAR_PERMIT_SMALL_HOLDDOWN STRING_ARG  */
+#line 2154 "./util/configparser.y"
         {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5149,22 +5153,22 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5153 "util/configparser.c"
+#line 5157 "util/configparser.c"
     break;
 
-  case 486: /* server_key_cache_size: VAR_KEY_CACHE_SIZE STRING_ARG  */
-#line 2162 "./util/configparser.y"
+  case 487: /* server_key_cache_size: VAR_KEY_CACHE_SIZE STRING_ARG  */
+#line 2163 "./util/configparser.y"
         {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5164 "util/configparser.c"
+#line 5168 "util/configparser.c"
     break;
 
-  case 487: /* server_key_cache_slabs: VAR_KEY_CACHE_SLABS STRING_ARG  */
-#line 2170 "./util/configparser.y"
+  case 488: /* server_key_cache_slabs: VAR_KEY_CACHE_SLABS STRING_ARG  */
+#line 2171 "./util/configparser.y"
         {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0) {
@@ -5176,22 +5180,22 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 5180 "util/configparser.c"
+#line 5184 "util/configparser.c"
     break;
 
-  case 488: /* server_neg_cache_size: VAR_NEG_CACHE_SIZE STRING_ARG  */
-#line 2183 "./util/configparser.y"
+  case 489: /* server_neg_cache_size: VAR_NEG_CACHE_SIZE STRING_ARG  */
+#line 2184 "./util/configparser.y"
         {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5191 "util/configparser.c"
+#line 5195 "util/configparser.c"
     break;
 
-  case 489: /* server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG  */
-#line 2191 "./util/configparser.y"
+  case 490: /* server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG  */
+#line 2192 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -5245,21 +5249,21 @@ yyparse (void)
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 5249 "util/configparser.c"
+#line 5253 "util/configparser.c"
     break;
 
-  case 490: /* server_local_data: VAR_LOCAL_DATA STRING_ARG  */
-#line 2246 "./util/configparser.y"
+  case 491: /* server_local_data: VAR_LOCAL_DATA STRING_ARG  */
+#line 2247 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 5259 "util/configparser.c"
+#line 5263 "util/configparser.c"
     break;
 
-  case 491: /* server_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG  */
-#line 2253 "./util/configparser.y"
+  case 492: /* server_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG  */
+#line 2254 "./util/configparser.y"
         {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -5273,11 +5277,11 @@ yyparse (void)
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 5277 "util/configparser.c"
+#line 5281 "util/configparser.c"
     break;
 
-  case 492: /* server_minimal_responses: VAR_MINIMAL_RESPONSES STRING_ARG  */
-#line 2268 "./util/configparser.y"
+  case 493: /* server_minimal_responses: VAR_MINIMAL_RESPONSES STRING_ARG  */
+#line 2269 "./util/configparser.y"
         {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5286,11 +5290,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5290 "util/configparser.c"
+#line 5294 "util/configparser.c"
     break;
 
-  case 493: /* server_rrset_roundrobin: VAR_RRSET_ROUNDROBIN STRING_ARG  */
-#line 2278 "./util/configparser.y"
+  case 494: /* server_rrset_roundrobin: VAR_RRSET_ROUNDROBIN STRING_ARG  */
+#line 2279 "./util/configparser.y"
         {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5299,41 +5303,41 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5303 "util/configparser.c"
+#line 5307 "util/configparser.c"
     break;
 
-  case 494: /* server_unknown_server_time_limit: VAR_UNKNOWN_SERVER_TIME_LIMIT STRING_ARG  */
-#line 2288 "./util/configparser.y"
+  case 495: /* server_unknown_server_time_limit: VAR_UNKNOWN_SERVER_TIME_LIMIT STRING_ARG  */
+#line 2289 "./util/configparser.y"
         {
 		OUTYY(("P(server_unknown_server_time_limit:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->unknown_server_time_limit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5313 "util/configparser.c"
+#line 5317 "util/configparser.c"
     break;
 
-  case 495: /* server_max_udp_size: VAR_MAX_UDP_SIZE STRING_ARG  */
-#line 2295 "./util/configparser.y"
+  case 496: /* server_max_udp_size: VAR_MAX_UDP_SIZE STRING_ARG  */
+#line 2296 "./util/configparser.y"
         {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5323 "util/configparser.c"
+#line 5327 "util/configparser.c"
     break;
 
-  case 496: /* server_dns64_prefix: VAR_DNS64_PREFIX STRING_ARG  */
-#line 2302 "./util/configparser.y"
+  case 497: /* server_dns64_prefix: VAR_DNS64_PREFIX STRING_ARG  */
+#line 2303 "./util/configparser.y"
         {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 5333 "util/configparser.c"
+#line 5337 "util/configparser.c"
     break;
 
-  case 497: /* server_dns64_synthall: VAR_DNS64_SYNTHALL STRING_ARG  */
-#line 2309 "./util/configparser.y"
+  case 498: /* server_dns64_synthall: VAR_DNS64_SYNTHALL STRING_ARG  */
+#line 2310 "./util/configparser.y"
         {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5341,22 +5345,22 @@ yyparse (void)
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5345 "util/configparser.c"
+#line 5349 "util/configparser.c"
     break;
 
-  case 498: /* server_dns64_ignore_aaaa: VAR_DNS64_IGNORE_AAAA STRING_ARG  */
-#line 2318 "./util/configparser.y"
+  case 499: /* server_dns64_ignore_aaaa: VAR_DNS64_IGNORE_AAAA STRING_ARG  */
+#line 2319 "./util/configparser.y"
         {
 		OUTYY(("P(dns64_ignore_aaaa:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dns64_ignore_aaaa,
 			(yyvsp[0].str)))
 			fatal_exit("out of memory adding dns64-ignore-aaaa");
 	}
-#line 5356 "util/configparser.c"
+#line 5360 "util/configparser.c"
     break;
 
-  case 499: /* server_define_tag: VAR_DEFINE_TAG STRING_ARG  */
-#line 2326 "./util/configparser.y"
+  case 500: /* server_define_tag: VAR_DEFINE_TAG STRING_ARG  */
+#line 2327 "./util/configparser.y"
         {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -5369,11 +5373,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 5373 "util/configparser.c"
+#line 5377 "util/configparser.c"
     break;
 
-  case 500: /* server_local_zone_tag: VAR_LOCAL_ZONE_TAG STRING_ARG STRING_ARG  */
-#line 2340 "./util/configparser.y"
+  case 501: /* server_local_zone_tag: VAR_LOCAL_ZONE_TAG STRING_ARG STRING_ARG  */
+#line 2341 "./util/configparser.y"
         {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5393,11 +5397,11 @@ yyparse (void)
 			}
 		}
 	}
-#line 5397 "util/configparser.c"
+#line 5401 "util/configparser.c"
     break;
 
-  case 501: /* server_access_control_tag: VAR_ACCESS_CONTROL_TAG STRING_ARG STRING_ARG  */
-#line 2361 "./util/configparser.y"
+  case 502: /* server_access_control_tag: VAR_ACCESS_CONTROL_TAG STRING_ARG STRING_ARG  */
+#line 2362 "./util/configparser.y"
         {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5417,11 +5421,11 @@ yyparse (void)
 			}
 		}
 	}
-#line 5421 "util/configparser.c"
+#line 5425 "util/configparser.c"
     break;
 
-  case 502: /* server_access_control_tag_action: VAR_ACCESS_CONTROL_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG  */
-#line 2382 "./util/configparser.y"
+  case 503: /* server_access_control_tag_action: VAR_ACCESS_CONTROL_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG  */
+#line 2383 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -5432,11 +5436,11 @@ yyparse (void)
 			free((yyvsp[0].str));
 		}
 	}
-#line 5436 "util/configparser.c"
+#line 5440 "util/configparser.c"
     break;
 
-  case 503: /* server_access_control_tag_data: VAR_ACCESS_CONTROL_TAG_DATA STRING_ARG STRING_ARG STRING_ARG  */
-#line 2394 "./util/configparser.y"
+  case 504: /* server_access_control_tag_data: VAR_ACCESS_CONTROL_TAG_DATA STRING_ARG STRING_ARG STRING_ARG  */
+#line 2395 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -5447,11 +5451,11 @@ yyparse (void)
 			free((yyvsp[0].str));
 		}
 	}
-#line 5451 "util/configparser.c"
+#line 5455 "util/configparser.c"
     break;
 
-  case 504: /* server_local_zone_override: VAR_LOCAL_ZONE_OVERRIDE STRING_ARG STRING_ARG STRING_ARG  */
-#line 2406 "./util/configparser.y"
+  case 505: /* server_local_zone_override: VAR_LOCAL_ZONE_OVERRIDE STRING_ARG STRING_ARG STRING_ARG  */
+#line 2407 "./util/configparser.y"
         {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -5462,11 +5466,11 @@ yyparse (void)
 			free((yyvsp[0].str));
 		}
 	}
-#line 5466 "util/configparser.c"
+#line 5470 "util/configparser.c"
     break;
 
-  case 505: /* server_access_control_view: VAR_ACCESS_CONTROL_VIEW STRING_ARG STRING_ARG  */
-#line 2418 "./util/configparser.y"
+  case 506: /* server_access_control_view: VAR_ACCESS_CONTROL_VIEW STRING_ARG STRING_ARG  */
+#line 2419 "./util/configparser.y"
         {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -5474,11 +5478,11 @@ yyparse (void)
 			yyerror("out of memory");
 		}
 	}
-#line 5478 "util/configparser.c"
+#line 5482 "util/configparser.c"
     break;
 
-  case 506: /* server_interface_tag: VAR_INTERFACE_TAG STRING_ARG STRING_ARG  */
-#line 2427 "./util/configparser.y"
+  case 507: /* server_interface_tag: VAR_INTERFACE_TAG STRING_ARG STRING_ARG  */
+#line 2428 "./util/configparser.y"
         {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5498,11 +5502,11 @@ yyparse (void)
 			}
 		}
 	}
-#line 5502 "util/configparser.c"
+#line 5506 "util/configparser.c"
     break;
 
-  case 507: /* server_interface_tag_action: VAR_INTERFACE_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG  */
-#line 2448 "./util/configparser.y"
+  case 508: /* server_interface_tag_action: VAR_INTERFACE_TAG_ACTION STRING_ARG STRING_ARG STRING_ARG  */
+#line 2449 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->interface_tag_actions,
@@ -5513,11 +5517,11 @@ yyparse (void)
 			free((yyvsp[0].str));
 		}
 	}
-#line 5517 "util/configparser.c"
+#line 5521 "util/configparser.c"
     break;
 
-  case 508: /* server_interface_tag_data: VAR_INTERFACE_TAG_DATA STRING_ARG STRING_ARG STRING_ARG  */
-#line 2460 "./util/configparser.y"
+  case 509: /* server_interface_tag_data: VAR_INTERFACE_TAG_DATA STRING_ARG STRING_ARG STRING_ARG  */
+#line 2461 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->interface_tag_datas,
@@ -5528,11 +5532,11 @@ yyparse (void)
 			free((yyvsp[0].str));
 		}
 	}
-#line 5532 "util/configparser.c"
+#line 5536 "util/configparser.c"
     break;
 
-  case 509: /* server_interface_view: VAR_INTERFACE_VIEW STRING_ARG STRING_ARG  */
-#line 2472 "./util/configparser.y"
+  case 510: /* server_interface_view: VAR_INTERFACE_VIEW STRING_ARG STRING_ARG  */
+#line 2473 "./util/configparser.y"
         {
 		OUTYY(("P(server_interface_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->interface_view,
@@ -5540,11 +5544,11 @@ yyparse (void)
 			yyerror("out of memory");
 		}
 	}
-#line 5544 "util/configparser.c"
+#line 5548 "util/configparser.c"
     break;
 
-  case 510: /* server_response_ip_tag: VAR_RESPONSE_IP_TAG STRING_ARG STRING_ARG  */
-#line 2481 "./util/configparser.y"
+  case 511: /* server_response_ip_tag: VAR_RESPONSE_IP_TAG STRING_ARG STRING_ARG  */
+#line 2482 "./util/configparser.y"
         {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -5564,11 +5568,11 @@ yyparse (void)
 			}
 		}
 	}
-#line 5568 "util/configparser.c"
+#line 5572 "util/configparser.c"
     break;
 
-  case 511: /* server_ip_ratelimit: VAR_IP_RATELIMIT STRING_ARG  */
-#line 2502 "./util/configparser.y"
+  case 512: /* server_ip_ratelimit: VAR_IP_RATELIMIT STRING_ARG  */
+#line 2503 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5576,11 +5580,11 @@ yyparse (void)
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5580 "util/configparser.c"
+#line 5584 "util/configparser.c"
     break;
 
-  case 512: /* server_ratelimit: VAR_RATELIMIT STRING_ARG  */
-#line 2511 "./util/configparser.y"
+  case 513: /* server_ratelimit: VAR_RATELIMIT STRING_ARG  */
+#line 2512 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5588,33 +5592,33 @@ yyparse (void)
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5592 "util/configparser.c"
+#line 5596 "util/configparser.c"
     break;
 
-  case 513: /* server_ip_ratelimit_size: VAR_IP_RATELIMIT_SIZE STRING_ARG  */
-#line 2520 "./util/configparser.y"
+  case 514: /* server_ip_ratelimit_size: VAR_IP_RATELIMIT_SIZE STRING_ARG  */
+#line 2521 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5603 "util/configparser.c"
+#line 5607 "util/configparser.c"
     break;
 
-  case 514: /* server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG  */
-#line 2528 "./util/configparser.y"
+  case 515: /* server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG  */
+#line 2529 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 5614 "util/configparser.c"
+#line 5618 "util/configparser.c"
     break;
 
-  case 515: /* server_ip_ratelimit_slabs: VAR_IP_RATELIMIT_SLABS STRING_ARG  */
-#line 2536 "./util/configparser.y"
+  case 516: /* server_ip_ratelimit_slabs: VAR_IP_RATELIMIT_SLABS STRING_ARG  */
+#line 2537 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0) {
@@ -5626,11 +5630,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 5630 "util/configparser.c"
+#line 5634 "util/configparser.c"
     break;
 
-  case 516: /* server_ratelimit_slabs: VAR_RATELIMIT_SLABS STRING_ARG  */
-#line 2549 "./util/configparser.y"
+  case 517: /* server_ratelimit_slabs: VAR_RATELIMIT_SLABS STRING_ARG  */
+#line 2550 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0) {
@@ -5642,11 +5646,11 @@ yyparse (void)
 		}
 		free((yyvsp[0].str));
 	}
-#line 5646 "util/configparser.c"
+#line 5650 "util/configparser.c"
     break;
 
-  case 517: /* server_ratelimit_for_domain: VAR_RATELIMIT_FOR_DOMAIN STRING_ARG STRING_ARG  */
-#line 2562 "./util/configparser.y"
+  case 518: /* server_ratelimit_for_domain: VAR_RATELIMIT_FOR_DOMAIN STRING_ARG STRING_ARG  */
+#line 2563 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5660,11 +5664,11 @@ yyparse (void)
 					"ratelimit-for-domain");
 		}
 	}
-#line 5664 "util/configparser.c"
+#line 5668 "util/configparser.c"
     break;
 
-  case 518: /* server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG  */
-#line 2577 "./util/configparser.y"
+  case 519: /* server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG  */
+#line 2578 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -5678,11 +5682,11 @@ yyparse (void)
 					"ratelimit-below-domain");
 		}
 	}
-#line 5682 "util/configparser.c"
+#line 5686 "util/configparser.c"
     break;
 
-  case 519: /* server_ip_ratelimit_factor: VAR_IP_RATELIMIT_FACTOR STRING_ARG  */
-#line 2592 "./util/configparser.y"
+  case 520: /* server_ip_ratelimit_factor: VAR_IP_RATELIMIT_FACTOR STRING_ARG  */
+#line 2593 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5690,11 +5694,11 @@ yyparse (void)
 		else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5694 "util/configparser.c"
+#line 5698 "util/configparser.c"
     break;
 
-  case 520: /* server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG  */
-#line 2601 "./util/configparser.y"
+  case 521: /* server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG  */
+#line 2602 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5702,11 +5706,11 @@ yyparse (void)
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5706 "util/configparser.c"
+#line 5710 "util/configparser.c"
     break;
 
-  case 521: /* server_ip_ratelimit_backoff: VAR_IP_RATELIMIT_BACKOFF STRING_ARG  */
-#line 2610 "./util/configparser.y"
+  case 522: /* server_ip_ratelimit_backoff: VAR_IP_RATELIMIT_BACKOFF STRING_ARG  */
+#line 2611 "./util/configparser.y"
         {
 		OUTYY(("P(server_ip_ratelimit_backoff:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5715,11 +5719,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5719 "util/configparser.c"
+#line 5723 "util/configparser.c"
     break;
 
-  case 522: /* server_ratelimit_backoff: VAR_RATELIMIT_BACKOFF STRING_ARG  */
-#line 2620 "./util/configparser.y"
+  case 523: /* server_ratelimit_backoff: VAR_RATELIMIT_BACKOFF STRING_ARG  */
+#line 2621 "./util/configparser.y"
         {
 		OUTYY(("P(server_ratelimit_backoff:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5728,11 +5732,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5732 "util/configparser.c"
+#line 5736 "util/configparser.c"
     break;
 
-  case 523: /* server_outbound_msg_retry: VAR_OUTBOUND_MSG_RETRY STRING_ARG  */
-#line 2630 "./util/configparser.y"
+  case 524: /* server_outbound_msg_retry: VAR_OUTBOUND_MSG_RETRY STRING_ARG  */
+#line 2631 "./util/configparser.y"
         {
 		OUTYY(("P(server_outbound_msg_retry:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5740,20 +5744,20 @@ yyparse (void)
 		else cfg_parser->cfg->outbound_msg_retry = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5744 "util/configparser.c"
+#line 5748 "util/configparser.c"
     break;
 
-  case 524: /* server_low_rtt: VAR_LOW_RTT STRING_ARG  */
-#line 2639 "./util/configparser.y"
+  case 525: /* server_low_rtt: VAR_LOW_RTT STRING_ARG  */
+#line 2640 "./util/configparser.y"
         {
 		OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
 		free((yyvsp[0].str));
 	}
-#line 5753 "util/configparser.c"
+#line 5757 "util/configparser.c"
     break;
 
-  case 525: /* server_fast_server_num: VAR_FAST_SERVER_NUM STRING_ARG  */
-#line 2645 "./util/configparser.y"
+  case 526: /* server_fast_server_num: VAR_FAST_SERVER_NUM STRING_ARG  */
+#line 2646 "./util/configparser.y"
         {
 		OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) <= 0)
@@ -5761,11 +5765,11 @@ yyparse (void)
 		else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5765 "util/configparser.c"
+#line 5769 "util/configparser.c"
     break;
 
-  case 526: /* server_fast_server_permil: VAR_FAST_SERVER_PERMIL STRING_ARG  */
-#line 2654 "./util/configparser.y"
+  case 527: /* server_fast_server_permil: VAR_FAST_SERVER_PERMIL STRING_ARG  */
+#line 2655 "./util/configparser.y"
         {
 		OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5773,11 +5777,11 @@ yyparse (void)
 		else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5777 "util/configparser.c"
+#line 5781 "util/configparser.c"
     break;
 
-  case 527: /* server_qname_minimisation: VAR_QNAME_MINIMISATION STRING_ARG  */
-#line 2663 "./util/configparser.y"
+  case 528: /* server_qname_minimisation: VAR_QNAME_MINIMISATION STRING_ARG  */
+#line 2664 "./util/configparser.y"
         {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5786,11 +5790,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5790 "util/configparser.c"
+#line 5794 "util/configparser.c"
     break;
 
-  case 528: /* server_qname_minimisation_strict: VAR_QNAME_MINIMISATION_STRICT STRING_ARG  */
-#line 2673 "./util/configparser.y"
+  case 529: /* server_qname_minimisation_strict: VAR_QNAME_MINIMISATION_STRICT STRING_ARG  */
+#line 2674 "./util/configparser.y"
         {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5799,11 +5803,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5803 "util/configparser.c"
+#line 5807 "util/configparser.c"
     break;
 
-  case 529: /* server_pad_responses: VAR_PAD_RESPONSES STRING_ARG  */
-#line 2683 "./util/configparser.y"
+  case 530: /* server_pad_responses: VAR_PAD_RESPONSES STRING_ARG  */
+#line 2684 "./util/configparser.y"
         {
 		OUTYY(("P(server_pad_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5812,11 +5816,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5816 "util/configparser.c"
+#line 5820 "util/configparser.c"
     break;
 
-  case 530: /* server_pad_responses_block_size: VAR_PAD_RESPONSES_BLOCK_SIZE STRING_ARG  */
-#line 2693 "./util/configparser.y"
+  case 531: /* server_pad_responses_block_size: VAR_PAD_RESPONSES_BLOCK_SIZE STRING_ARG  */
+#line 2694 "./util/configparser.y"
         {
 		OUTYY(("P(server_pad_responses_block_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5824,11 +5828,11 @@ yyparse (void)
 		else cfg_parser->cfg->pad_responses_block_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5828 "util/configparser.c"
+#line 5832 "util/configparser.c"
     break;
 
-  case 531: /* server_pad_queries: VAR_PAD_QUERIES STRING_ARG  */
-#line 2702 "./util/configparser.y"
+  case 532: /* server_pad_queries: VAR_PAD_QUERIES STRING_ARG  */
+#line 2703 "./util/configparser.y"
         {
 		OUTYY(("P(server_pad_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5837,11 +5841,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5841 "util/configparser.c"
+#line 5845 "util/configparser.c"
     break;
 
-  case 532: /* server_pad_queries_block_size: VAR_PAD_QUERIES_BLOCK_SIZE STRING_ARG  */
-#line 2712 "./util/configparser.y"
+  case 533: /* server_pad_queries_block_size: VAR_PAD_QUERIES_BLOCK_SIZE STRING_ARG  */
+#line 2713 "./util/configparser.y"
         {
 		OUTYY(("P(server_pad_queries_block_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -5849,11 +5853,11 @@ yyparse (void)
 		else cfg_parser->cfg->pad_queries_block_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5853 "util/configparser.c"
+#line 5857 "util/configparser.c"
     break;
 
-  case 533: /* server_ipsecmod_enabled: VAR_IPSECMOD_ENABLED STRING_ARG  */
-#line 2721 "./util/configparser.y"
+  case 534: /* server_ipsecmod_enabled: VAR_IPSECMOD_ENABLED STRING_ARG  */
+#line 2722 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -5865,11 +5869,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5869 "util/configparser.c"
+#line 5873 "util/configparser.c"
     break;
 
-  case 534: /* server_ipsecmod_ignore_bogus: VAR_IPSECMOD_IGNORE_BOGUS STRING_ARG  */
-#line 2734 "./util/configparser.y"
+  case 535: /* server_ipsecmod_ignore_bogus: VAR_IPSECMOD_IGNORE_BOGUS STRING_ARG  */
+#line 2735 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -5881,11 +5885,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 5885 "util/configparser.c"
+#line 5889 "util/configparser.c"
     break;
 
-  case 535: /* server_ipsecmod_hook: VAR_IPSECMOD_HOOK STRING_ARG  */
-#line 2747 "./util/configparser.y"
+  case 536: /* server_ipsecmod_hook: VAR_IPSECMOD_HOOK STRING_ARG  */
+#line 2748 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -5896,11 +5900,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5900 "util/configparser.c"
+#line 5904 "util/configparser.c"
     break;
 
-  case 536: /* server_ipsecmod_max_ttl: VAR_IPSECMOD_MAX_TTL STRING_ARG  */
-#line 2759 "./util/configparser.y"
+  case 537: /* server_ipsecmod_max_ttl: VAR_IPSECMOD_MAX_TTL STRING_ARG  */
+#line 2760 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -5913,11 +5917,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5917 "util/configparser.c"
+#line 5921 "util/configparser.c"
     break;
 
-  case 537: /* server_ipsecmod_whitelist: VAR_IPSECMOD_WHITELIST STRING_ARG  */
-#line 2773 "./util/configparser.y"
+  case 538: /* server_ipsecmod_whitelist: VAR_IPSECMOD_WHITELIST STRING_ARG  */
+#line 2774 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -5928,11 +5932,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5932 "util/configparser.c"
+#line 5936 "util/configparser.c"
     break;
 
-  case 538: /* server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG  */
-#line 2785 "./util/configparser.y"
+  case 539: /* server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG  */
+#line 2786 "./util/configparser.y"
         {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -5945,11 +5949,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5949 "util/configparser.c"
+#line 5953 "util/configparser.c"
     break;
 
-  case 539: /* server_edns_client_string: VAR_EDNS_CLIENT_STRING STRING_ARG STRING_ARG  */
-#line 2799 "./util/configparser.y"
+  case 540: /* server_edns_client_string: VAR_EDNS_CLIENT_STRING STRING_ARG STRING_ARG  */
+#line 2800 "./util/configparser.y"
         {
 		OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(
@@ -5957,11 +5961,11 @@ yyparse (void)
 			fatal_exit("out of memory adding "
 				"edns-client-string");
 	}
-#line 5961 "util/configparser.c"
+#line 5965 "util/configparser.c"
     break;
 
-  case 540: /* server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG  */
-#line 2808 "./util/configparser.y"
+  case 541: /* server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG  */
+#line 2809 "./util/configparser.y"
         {
 		OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -5971,11 +5975,11 @@ yyparse (void)
 		else cfg_parser->cfg->edns_client_string_opcode = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5975 "util/configparser.c"
+#line 5979 "util/configparser.c"
     break;
 
-  case 541: /* server_ede: VAR_EDE STRING_ARG  */
-#line 2819 "./util/configparser.y"
+  case 542: /* server_ede: VAR_EDE STRING_ARG  */
+#line 2820 "./util/configparser.y"
         {
 		OUTYY(("P(server_ede:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5983,11 +5987,21 @@ yyparse (void)
 		else cfg_parser->cfg->ede = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5987 "util/configparser.c"
+#line 5991 "util/configparser.c"
     break;
 
-  case 542: /* stub_name: VAR_NAME STRING_ARG  */
-#line 2828 "./util/configparser.y"
+  case 543: /* server_proxy_protocol_port: VAR_PROXY_PROTOCOL_PORT STRING_ARG  */
+#line 2829 "./util/configparser.y"
+        {
+		OUTYY(("P(server_proxy_protocol_port:%s)\n", (yyvsp[0].str)));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->proxy_protocol_port, (yyvsp[0].str)))
+			yyerror("out of memory");
+	}
+#line 6001 "util/configparser.c"
+    break;
+
+  case 544: /* stub_name: VAR_NAME STRING_ARG  */
+#line 2836 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -5996,31 +6010,31 @@ yyparse (void)
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 6000 "util/configparser.c"
+#line 6014 "util/configparser.c"
     break;
 
-  case 543: /* stub_host: VAR_STUB_HOST STRING_ARG  */
-#line 2838 "./util/configparser.y"
+  case 545: /* stub_host: VAR_STUB_HOST STRING_ARG  */
+#line 2846 "./util/configparser.y"
         {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6010 "util/configparser.c"
+#line 6024 "util/configparser.c"
     break;
 
-  case 544: /* stub_addr: VAR_STUB_ADDR STRING_ARG  */
-#line 2845 "./util/configparser.y"
+  case 546: /* stub_addr: VAR_STUB_ADDR STRING_ARG  */
+#line 2853 "./util/configparser.y"
         {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6020 "util/configparser.c"
+#line 6034 "util/configparser.c"
     break;
 
-  case 545: /* stub_first: VAR_STUB_FIRST STRING_ARG  */
-#line 2852 "./util/configparser.y"
+  case 547: /* stub_first: VAR_STUB_FIRST STRING_ARG  */
+#line 2860 "./util/configparser.y"
         {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6028,11 +6042,11 @@ yyparse (void)
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6032 "util/configparser.c"
+#line 6046 "util/configparser.c"
     break;
 
-  case 546: /* stub_no_cache: VAR_STUB_NO_CACHE STRING_ARG  */
-#line 2861 "./util/configparser.y"
+  case 548: /* stub_no_cache: VAR_STUB_NO_CACHE STRING_ARG  */
+#line 2869 "./util/configparser.y"
         {
 		OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6040,11 +6054,11 @@ yyparse (void)
 		else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6044 "util/configparser.c"
+#line 6058 "util/configparser.c"
     break;
 
-  case 547: /* stub_ssl_upstream: VAR_STUB_SSL_UPSTREAM STRING_ARG  */
-#line 2870 "./util/configparser.y"
+  case 549: /* stub_ssl_upstream: VAR_STUB_SSL_UPSTREAM STRING_ARG  */
+#line 2878 "./util/configparser.y"
         {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6053,11 +6067,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6057 "util/configparser.c"
+#line 6071 "util/configparser.c"
     break;
 
-  case 548: /* stub_tcp_upstream: VAR_STUB_TCP_UPSTREAM STRING_ARG  */
-#line 2880 "./util/configparser.y"
+  case 550: /* stub_tcp_upstream: VAR_STUB_TCP_UPSTREAM STRING_ARG  */
+#line 2888 "./util/configparser.y"
         {
                 OUTYY(("P(stub-tcp-upstream:%s)\n", (yyvsp[0].str)));
                 if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6066,11 +6080,11 @@ yyparse (void)
                         (strcmp((yyvsp[0].str), "yes")==0);
                 free((yyvsp[0].str));
         }
-#line 6070 "util/configparser.c"
+#line 6084 "util/configparser.c"
     break;
 
-  case 549: /* stub_prime: VAR_STUB_PRIME STRING_ARG  */
-#line 2890 "./util/configparser.y"
+  case 551: /* stub_prime: VAR_STUB_PRIME STRING_ARG  */
+#line 2898 "./util/configparser.y"
         {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6079,11 +6093,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6083 "util/configparser.c"
+#line 6097 "util/configparser.c"
     break;
 
-  case 550: /* forward_name: VAR_NAME STRING_ARG  */
-#line 2900 "./util/configparser.y"
+  case 552: /* forward_name: VAR_NAME STRING_ARG  */
+#line 2908 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -6092,31 +6106,31 @@ yyparse (void)
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 6096 "util/configparser.c"
+#line 6110 "util/configparser.c"
     break;
 
-  case 551: /* forward_host: VAR_FORWARD_HOST STRING_ARG  */
-#line 2910 "./util/configparser.y"
+  case 553: /* forward_host: VAR_FORWARD_HOST STRING_ARG  */
+#line 2918 "./util/configparser.y"
         {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6106 "util/configparser.c"
+#line 6120 "util/configparser.c"
     break;
 
-  case 552: /* forward_addr: VAR_FORWARD_ADDR STRING_ARG  */
-#line 2917 "./util/configparser.y"
+  case 554: /* forward_addr: VAR_FORWARD_ADDR STRING_ARG  */
+#line 2925 "./util/configparser.y"
         {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6116 "util/configparser.c"
+#line 6130 "util/configparser.c"
     break;
 
-  case 553: /* forward_first: VAR_FORWARD_FIRST STRING_ARG  */
-#line 2924 "./util/configparser.y"
+  case 555: /* forward_first: VAR_FORWARD_FIRST STRING_ARG  */
+#line 2932 "./util/configparser.y"
         {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6124,11 +6138,11 @@ yyparse (void)
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6128 "util/configparser.c"
+#line 6142 "util/configparser.c"
     break;
 
-  case 554: /* forward_no_cache: VAR_FORWARD_NO_CACHE STRING_ARG  */
-#line 2933 "./util/configparser.y"
+  case 556: /* forward_no_cache: VAR_FORWARD_NO_CACHE STRING_ARG  */
+#line 2941 "./util/configparser.y"
         {
 		OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6136,11 +6150,11 @@ yyparse (void)
 		else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6140 "util/configparser.c"
+#line 6154 "util/configparser.c"
     break;
 
-  case 555: /* forward_ssl_upstream: VAR_FORWARD_SSL_UPSTREAM STRING_ARG  */
-#line 2942 "./util/configparser.y"
+  case 557: /* forward_ssl_upstream: VAR_FORWARD_SSL_UPSTREAM STRING_ARG  */
+#line 2950 "./util/configparser.y"
         {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6149,11 +6163,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6153 "util/configparser.c"
+#line 6167 "util/configparser.c"
     break;
 
-  case 556: /* forward_tcp_upstream: VAR_FORWARD_TCP_UPSTREAM STRING_ARG  */
-#line 2952 "./util/configparser.y"
+  case 558: /* forward_tcp_upstream: VAR_FORWARD_TCP_UPSTREAM STRING_ARG  */
+#line 2960 "./util/configparser.y"
         {
                 OUTYY(("P(forward-tcp-upstream:%s)\n", (yyvsp[0].str)));
                 if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6162,11 +6176,11 @@ yyparse (void)
                         (strcmp((yyvsp[0].str), "yes")==0);
                 free((yyvsp[0].str));
         }
-#line 6166 "util/configparser.c"
+#line 6180 "util/configparser.c"
     break;
 
-  case 557: /* auth_name: VAR_NAME STRING_ARG  */
-#line 2962 "./util/configparser.y"
+  case 559: /* auth_name: VAR_NAME STRING_ARG  */
+#line 2970 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->auths->name)
@@ -6175,52 +6189,52 @@ yyparse (void)
 		free(cfg_parser->cfg->auths->name);
 		cfg_parser->cfg->auths->name = (yyvsp[0].str);
 	}
-#line 6179 "util/configparser.c"
+#line 6193 "util/configparser.c"
     break;
 
-  case 558: /* auth_zonefile: VAR_ZONEFILE STRING_ARG  */
-#line 2972 "./util/configparser.y"
+  case 560: /* auth_zonefile: VAR_ZONEFILE STRING_ARG  */
+#line 2980 "./util/configparser.y"
         {
 		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->auths->zonefile);
 		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
 	}
-#line 6189 "util/configparser.c"
+#line 6203 "util/configparser.c"
     break;
 
-  case 559: /* auth_master: VAR_MASTER STRING_ARG  */
-#line 2979 "./util/configparser.y"
+  case 561: /* auth_master: VAR_MASTER STRING_ARG  */
+#line 2987 "./util/configparser.y"
         {
 		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6199 "util/configparser.c"
+#line 6213 "util/configparser.c"
     break;
 
-  case 560: /* auth_url: VAR_URL STRING_ARG  */
-#line 2986 "./util/configparser.y"
+  case 562: /* auth_url: VAR_URL STRING_ARG  */
+#line 2994 "./util/configparser.y"
         {
 		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6209 "util/configparser.c"
+#line 6223 "util/configparser.c"
     break;
 
-  case 561: /* auth_allow_notify: VAR_ALLOW_NOTIFY STRING_ARG  */
-#line 2993 "./util/configparser.y"
+  case 563: /* auth_allow_notify: VAR_ALLOW_NOTIFY STRING_ARG  */
+#line 3001 "./util/configparser.y"
         {
 		OUTYY(("P(allow-notify:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->allow_notify,
 			(yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6220 "util/configparser.c"
+#line 6234 "util/configparser.c"
     break;
 
-  case 562: /* auth_zonemd_check: VAR_ZONEMD_CHECK STRING_ARG  */
-#line 3001 "./util/configparser.y"
+  case 564: /* auth_zonemd_check: VAR_ZONEMD_CHECK STRING_ARG  */
+#line 3009 "./util/configparser.y"
         {
 		OUTYY(("P(zonemd-check:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6229,11 +6243,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6233 "util/configparser.c"
+#line 6247 "util/configparser.c"
     break;
 
-  case 563: /* auth_zonemd_reject_absence: VAR_ZONEMD_REJECT_ABSENCE STRING_ARG  */
-#line 3011 "./util/configparser.y"
+  case 565: /* auth_zonemd_reject_absence: VAR_ZONEMD_REJECT_ABSENCE STRING_ARG  */
+#line 3019 "./util/configparser.y"
         {
 		OUTYY(("P(zonemd-reject-absence:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6242,11 +6256,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6246 "util/configparser.c"
+#line 6260 "util/configparser.c"
     break;
 
-  case 564: /* auth_for_downstream: VAR_FOR_DOWNSTREAM STRING_ARG  */
-#line 3021 "./util/configparser.y"
+  case 566: /* auth_for_downstream: VAR_FOR_DOWNSTREAM STRING_ARG  */
+#line 3029 "./util/configparser.y"
         {
 		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6255,11 +6269,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6259 "util/configparser.c"
+#line 6273 "util/configparser.c"
     break;
 
-  case 565: /* auth_for_upstream: VAR_FOR_UPSTREAM STRING_ARG  */
-#line 3031 "./util/configparser.y"
+  case 567: /* auth_for_upstream: VAR_FOR_UPSTREAM STRING_ARG  */
+#line 3039 "./util/configparser.y"
         {
 		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6268,11 +6282,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6272 "util/configparser.c"
+#line 6286 "util/configparser.c"
     break;
 
-  case 566: /* auth_fallback_enabled: VAR_FALLBACK_ENABLED STRING_ARG  */
-#line 3041 "./util/configparser.y"
+  case 568: /* auth_fallback_enabled: VAR_FALLBACK_ENABLED STRING_ARG  */
+#line 3049 "./util/configparser.y"
         {
 		OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6281,11 +6295,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6285 "util/configparser.c"
+#line 6299 "util/configparser.c"
     break;
 
-  case 567: /* view_name: VAR_NAME STRING_ARG  */
-#line 3051 "./util/configparser.y"
+  case 569: /* view_name: VAR_NAME STRING_ARG  */
+#line 3059 "./util/configparser.y"
         {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -6294,11 +6308,11 @@ yyparse (void)
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 6298 "util/configparser.c"
+#line 6312 "util/configparser.c"
     break;
 
-  case 568: /* view_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG  */
-#line 3061 "./util/configparser.y"
+  case 570: /* view_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG  */
+#line 3069 "./util/configparser.y"
         {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -6353,11 +6367,11 @@ yyparse (void)
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 6357 "util/configparser.c"
+#line 6371 "util/configparser.c"
     break;
 
-  case 569: /* view_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG  */
-#line 3117 "./util/configparser.y"
+  case 571: /* view_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG  */
+#line 3125 "./util/configparser.y"
         {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6366,33 +6380,33 @@ yyparse (void)
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 6370 "util/configparser.c"
+#line 6384 "util/configparser.c"
     break;
 
-  case 570: /* view_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG  */
-#line 3127 "./util/configparser.y"
+  case 572: /* view_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG  */
+#line 3135 "./util/configparser.y"
         {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6381 "util/configparser.c"
+#line 6395 "util/configparser.c"
     break;
 
-  case 571: /* view_local_data: VAR_LOCAL_DATA STRING_ARG  */
-#line 3135 "./util/configparser.y"
+  case 573: /* view_local_data: VAR_LOCAL_DATA STRING_ARG  */
+#line 3143 "./util/configparser.y"
         {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
 			fatal_exit("out of memory adding local-data");
 		}
 	}
-#line 6392 "util/configparser.c"
+#line 6406 "util/configparser.c"
     break;
 
-  case 572: /* view_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG  */
-#line 3143 "./util/configparser.y"
+  case 574: /* view_local_data_ptr: VAR_LOCAL_DATA_PTR STRING_ARG  */
+#line 3151 "./util/configparser.y"
         {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -6406,11 +6420,11 @@ yyparse (void)
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 6410 "util/configparser.c"
+#line 6424 "util/configparser.c"
     break;
 
-  case 573: /* view_first: VAR_VIEW_FIRST STRING_ARG  */
-#line 3158 "./util/configparser.y"
+  case 575: /* view_first: VAR_VIEW_FIRST STRING_ARG  */
+#line 3166 "./util/configparser.y"
         {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6418,20 +6432,20 @@ yyparse (void)
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6422 "util/configparser.c"
+#line 6436 "util/configparser.c"
     break;
 
-  case 574: /* rcstart: VAR_REMOTE_CONTROL  */
-#line 3167 "./util/configparser.y"
+  case 576: /* rcstart: VAR_REMOTE_CONTROL  */
+#line 3175 "./util/configparser.y"
         {
 		OUTYY(("\nP(remote-control:)\n"));
 		cfg_parser->started_toplevel = 1;
 	}
-#line 6431 "util/configparser.c"
+#line 6445 "util/configparser.c"
     break;
 
-  case 585: /* rc_control_enable: VAR_CONTROL_ENABLE STRING_ARG  */
-#line 3179 "./util/configparser.y"
+  case 587: /* rc_control_enable: VAR_CONTROL_ENABLE STRING_ARG  */
+#line 3187 "./util/configparser.y"
         {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6440,11 +6454,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6444 "util/configparser.c"
+#line 6458 "util/configparser.c"
     break;
 
-  case 586: /* rc_control_port: VAR_CONTROL_PORT STRING_ARG  */
-#line 3189 "./util/configparser.y"
+  case 588: /* rc_control_port: VAR_CONTROL_PORT STRING_ARG  */
+#line 3197 "./util/configparser.y"
         {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6452,80 +6466,80 @@ yyparse (void)
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6456 "util/configparser.c"
+#line 6470 "util/configparser.c"
     break;
 
-  case 587: /* rc_control_interface: VAR_CONTROL_INTERFACE STRING_ARG  */
-#line 3198 "./util/configparser.y"
+  case 589: /* rc_control_interface: VAR_CONTROL_INTERFACE STRING_ARG  */
+#line 3206 "./util/configparser.y"
         {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6466 "util/configparser.c"
+#line 6480 "util/configparser.c"
     break;
 
-  case 588: /* rc_control_use_cert: VAR_CONTROL_USE_CERT STRING_ARG  */
-#line 3205 "./util/configparser.y"
+  case 590: /* rc_control_use_cert: VAR_CONTROL_USE_CERT STRING_ARG  */
+#line 3213 "./util/configparser.y"
         {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->control_use_cert = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6476 "util/configparser.c"
+#line 6490 "util/configparser.c"
     break;
 
-  case 589: /* rc_server_key_file: VAR_SERVER_KEY_FILE STRING_ARG  */
-#line 3212 "./util/configparser.y"
+  case 591: /* rc_server_key_file: VAR_SERVER_KEY_FILE STRING_ARG  */
+#line 3220 "./util/configparser.y"
         {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 6486 "util/configparser.c"
+#line 6500 "util/configparser.c"
     break;
 
-  case 590: /* rc_server_cert_file: VAR_SERVER_CERT_FILE STRING_ARG  */
-#line 3219 "./util/configparser.y"
+  case 592: /* rc_server_cert_file: VAR_SERVER_CERT_FILE STRING_ARG  */
+#line 3227 "./util/configparser.y"
         {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 6496 "util/configparser.c"
+#line 6510 "util/configparser.c"
     break;
 
-  case 591: /* rc_control_key_file: VAR_CONTROL_KEY_FILE STRING_ARG  */
-#line 3226 "./util/configparser.y"
+  case 593: /* rc_control_key_file: VAR_CONTROL_KEY_FILE STRING_ARG  */
+#line 3234 "./util/configparser.y"
         {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 6506 "util/configparser.c"
+#line 6520 "util/configparser.c"
     break;
 
-  case 592: /* rc_control_cert_file: VAR_CONTROL_CERT_FILE STRING_ARG  */
-#line 3233 "./util/configparser.y"
+  case 594: /* rc_control_cert_file: VAR_CONTROL_CERT_FILE STRING_ARG  */
+#line 3241 "./util/configparser.y"
         {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 6516 "util/configparser.c"
+#line 6530 "util/configparser.c"
     break;
 
-  case 593: /* dtstart: VAR_DNSTAP  */
-#line 3240 "./util/configparser.y"
+  case 595: /* dtstart: VAR_DNSTAP  */
+#line 3248 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnstap:)\n"));
 		cfg_parser->started_toplevel = 1;
 	}
-#line 6525 "util/configparser.c"
+#line 6539 "util/configparser.c"
     break;
 
-  case 615: /* dt_dnstap_enable: VAR_DNSTAP_ENABLE STRING_ARG  */
-#line 3261 "./util/configparser.y"
+  case 617: /* dt_dnstap_enable: VAR_DNSTAP_ENABLE STRING_ARG  */
+#line 3269 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6533,11 +6547,11 @@ yyparse (void)
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6537 "util/configparser.c"
+#line 6551 "util/configparser.c"
     break;
 
-  case 616: /* dt_dnstap_bidirectional: VAR_DNSTAP_BIDIRECTIONAL STRING_ARG  */
-#line 3270 "./util/configparser.y"
+  case 618: /* dt_dnstap_bidirectional: VAR_DNSTAP_BIDIRECTIONAL STRING_ARG  */
+#line 3278 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_bidirectional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6546,31 +6560,31 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6550 "util/configparser.c"
+#line 6564 "util/configparser.c"
     break;
 
-  case 617: /* dt_dnstap_socket_path: VAR_DNSTAP_SOCKET_PATH STRING_ARG  */
-#line 3280 "./util/configparser.y"
+  case 619: /* dt_dnstap_socket_path: VAR_DNSTAP_SOCKET_PATH STRING_ARG  */
+#line 3288 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 6560 "util/configparser.c"
+#line 6574 "util/configparser.c"
     break;
 
-  case 618: /* dt_dnstap_ip: VAR_DNSTAP_IP STRING_ARG  */
-#line 3287 "./util/configparser.y"
+  case 620: /* dt_dnstap_ip: VAR_DNSTAP_IP STRING_ARG  */
+#line 3295 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_ip:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_ip);
 		cfg_parser->cfg->dnstap_ip = (yyvsp[0].str);
 	}
-#line 6570 "util/configparser.c"
+#line 6584 "util/configparser.c"
     break;
 
-  case 619: /* dt_dnstap_tls: VAR_DNSTAP_TLS STRING_ARG  */
-#line 3294 "./util/configparser.y"
+  case 621: /* dt_dnstap_tls: VAR_DNSTAP_TLS STRING_ARG  */
+#line 3302 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6578,51 +6592,51 @@ yyparse (void)
 		else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6582 "util/configparser.c"
+#line 6596 "util/configparser.c"
     break;
 
-  case 620: /* dt_dnstap_tls_server_name: VAR_DNSTAP_TLS_SERVER_NAME STRING_ARG  */
-#line 3303 "./util/configparser.y"
+  case 622: /* dt_dnstap_tls_server_name: VAR_DNSTAP_TLS_SERVER_NAME STRING_ARG  */
+#line 3311 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_server_name:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_server_name);
 		cfg_parser->cfg->dnstap_tls_server_name = (yyvsp[0].str);
 	}
-#line 6592 "util/configparser.c"
+#line 6606 "util/configparser.c"
     break;
 
-  case 621: /* dt_dnstap_tls_cert_bundle: VAR_DNSTAP_TLS_CERT_BUNDLE STRING_ARG  */
-#line 3310 "./util/configparser.y"
+  case 623: /* dt_dnstap_tls_cert_bundle: VAR_DNSTAP_TLS_CERT_BUNDLE STRING_ARG  */
+#line 3318 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_cert_bundle:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_cert_bundle);
 		cfg_parser->cfg->dnstap_tls_cert_bundle = (yyvsp[0].str);
 	}
-#line 6602 "util/configparser.c"
+#line 6616 "util/configparser.c"
     break;
 
-  case 622: /* dt_dnstap_tls_client_key_file: VAR_DNSTAP_TLS_CLIENT_KEY_FILE STRING_ARG  */
-#line 3317 "./util/configparser.y"
+  case 624: /* dt_dnstap_tls_client_key_file: VAR_DNSTAP_TLS_CLIENT_KEY_FILE STRING_ARG  */
+#line 3325 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_client_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_key_file);
 		cfg_parser->cfg->dnstap_tls_client_key_file = (yyvsp[0].str);
 	}
-#line 6612 "util/configparser.c"
+#line 6626 "util/configparser.c"
     break;
 
-  case 623: /* dt_dnstap_tls_client_cert_file: VAR_DNSTAP_TLS_CLIENT_CERT_FILE STRING_ARG  */
-#line 3324 "./util/configparser.y"
+  case 625: /* dt_dnstap_tls_client_cert_file: VAR_DNSTAP_TLS_CLIENT_CERT_FILE STRING_ARG  */
+#line 3332 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_tls_client_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_tls_client_cert_file);
 		cfg_parser->cfg->dnstap_tls_client_cert_file = (yyvsp[0].str);
 	}
-#line 6622 "util/configparser.c"
+#line 6636 "util/configparser.c"
     break;
 
-  case 624: /* dt_dnstap_send_identity: VAR_DNSTAP_SEND_IDENTITY STRING_ARG  */
-#line 3331 "./util/configparser.y"
+  case 626: /* dt_dnstap_send_identity: VAR_DNSTAP_SEND_IDENTITY STRING_ARG  */
+#line 3339 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6630,11 +6644,11 @@ yyparse (void)
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6634 "util/configparser.c"
+#line 6648 "util/configparser.c"
     break;
 
-  case 625: /* dt_dnstap_send_version: VAR_DNSTAP_SEND_VERSION STRING_ARG  */
-#line 3340 "./util/configparser.y"
+  case 627: /* dt_dnstap_send_version: VAR_DNSTAP_SEND_VERSION STRING_ARG  */
+#line 3348 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6642,31 +6656,31 @@ yyparse (void)
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6646 "util/configparser.c"
+#line 6660 "util/configparser.c"
     break;
 
-  case 626: /* dt_dnstap_identity: VAR_DNSTAP_IDENTITY STRING_ARG  */
-#line 3349 "./util/configparser.y"
+  case 628: /* dt_dnstap_identity: VAR_DNSTAP_IDENTITY STRING_ARG  */
+#line 3357 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 6656 "util/configparser.c"
+#line 6670 "util/configparser.c"
     break;
 
-  case 627: /* dt_dnstap_version: VAR_DNSTAP_VERSION STRING_ARG  */
-#line 3356 "./util/configparser.y"
+  case 629: /* dt_dnstap_version: VAR_DNSTAP_VERSION STRING_ARG  */
+#line 3364 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 6666 "util/configparser.c"
+#line 6680 "util/configparser.c"
     break;
 
-  case 628: /* dt_dnstap_log_resolver_query_messages: VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES STRING_ARG  */
-#line 3363 "./util/configparser.y"
+  case 630: /* dt_dnstap_log_resolver_query_messages: VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES STRING_ARG  */
+#line 3371 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6675,11 +6689,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6679 "util/configparser.c"
+#line 6693 "util/configparser.c"
     break;
 
-  case 629: /* dt_dnstap_log_resolver_response_messages: VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES STRING_ARG  */
-#line 3373 "./util/configparser.y"
+  case 631: /* dt_dnstap_log_resolver_response_messages: VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES STRING_ARG  */
+#line 3381 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6688,11 +6702,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6692 "util/configparser.c"
+#line 6706 "util/configparser.c"
     break;
 
-  case 630: /* dt_dnstap_log_client_query_messages: VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES STRING_ARG  */
-#line 3383 "./util/configparser.y"
+  case 632: /* dt_dnstap_log_client_query_messages: VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES STRING_ARG  */
+#line 3391 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6701,11 +6715,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6705 "util/configparser.c"
+#line 6719 "util/configparser.c"
     break;
 
-  case 631: /* dt_dnstap_log_client_response_messages: VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES STRING_ARG  */
-#line 3393 "./util/configparser.y"
+  case 633: /* dt_dnstap_log_client_response_messages: VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES STRING_ARG  */
+#line 3401 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6714,11 +6728,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6718 "util/configparser.c"
+#line 6732 "util/configparser.c"
     break;
 
-  case 632: /* dt_dnstap_log_forwarder_query_messages: VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES STRING_ARG  */
-#line 3403 "./util/configparser.y"
+  case 634: /* dt_dnstap_log_forwarder_query_messages: VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES STRING_ARG  */
+#line 3411 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6727,11 +6741,11 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6731 "util/configparser.c"
+#line 6745 "util/configparser.c"
     break;
 
-  case 633: /* dt_dnstap_log_forwarder_response_messages: VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES STRING_ARG  */
-#line 3413 "./util/configparser.y"
+  case 635: /* dt_dnstap_log_forwarder_response_messages: VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES STRING_ARG  */
+#line 3421 "./util/configparser.y"
         {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6740,49 +6754,49 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6744 "util/configparser.c"
+#line 6758 "util/configparser.c"
     break;
 
-  case 634: /* pythonstart: VAR_PYTHON  */
-#line 3423 "./util/configparser.y"
+  case 636: /* pythonstart: VAR_PYTHON  */
+#line 3431 "./util/configparser.y"
         {
 		OUTYY(("\nP(python:)\n"));
 		cfg_parser->started_toplevel = 1;
 	}
-#line 6753 "util/configparser.c"
+#line 6767 "util/configparser.c"
     break;
 
-  case 638: /* py_script: VAR_PYTHON_SCRIPT STRING_ARG  */
-#line 3433 "./util/configparser.y"
+  case 640: /* py_script: VAR_PYTHON_SCRIPT STRING_ARG  */
+#line 3441 "./util/configparser.y"
         {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->python_script, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6763 "util/configparser.c"
+#line 6777 "util/configparser.c"
     break;
 
-  case 639: /* dynlibstart: VAR_DYNLIB  */
-#line 3439 "./util/configparser.y"
+  case 641: /* dynlibstart: VAR_DYNLIB  */
+#line 3447 "./util/configparser.y"
         { 
 		OUTYY(("\nP(dynlib:)\n")); 
 		cfg_parser->started_toplevel = 1;
 	}
-#line 6772 "util/configparser.c"
+#line 6786 "util/configparser.c"
     break;
 
-  case 643: /* dl_file: VAR_DYNLIB_FILE STRING_ARG  */
-#line 3449 "./util/configparser.y"
+  case 645: /* dl_file: VAR_DYNLIB_FILE STRING_ARG  */
+#line 3457 "./util/configparser.y"
         {
 		OUTYY(("P(dynlib-file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_append_ex(&cfg_parser->cfg->dynlib_file, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 6782 "util/configparser.c"
+#line 6796 "util/configparser.c"
     break;
 
-  case 644: /* server_disable_dnssec_lame_check: VAR_DISABLE_DNSSEC_LAME_CHECK STRING_ARG  */
-#line 3455 "./util/configparser.y"
+  case 646: /* server_disable_dnssec_lame_check: VAR_DISABLE_DNSSEC_LAME_CHECK STRING_ARG  */
+#line 3463 "./util/configparser.y"
         {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6791,21 +6805,21 @@ yyparse (void)
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6795 "util/configparser.c"
+#line 6809 "util/configparser.c"
     break;
 
-  case 645: /* server_log_identity: VAR_LOG_IDENTITY STRING_ARG  */
-#line 3465 "./util/configparser.y"
+  case 647: /* server_log_identity: VAR_LOG_IDENTITY STRING_ARG  */
+#line 3473 "./util/configparser.y"
         {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 6805 "util/configparser.c"
+#line 6819 "util/configparser.c"
     break;
 
-  case 646: /* server_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG  */
-#line 3472 "./util/configparser.y"
+  case 648: /* server_response_ip: VAR_RESPONSE_IP STRING_ARG STRING_ARG  */
+#line 3480 "./util/configparser.y"
         {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -6813,31 +6827,31 @@ yyparse (void)
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 6817 "util/configparser.c"
+#line 6831 "util/configparser.c"
     break;
 
-  case 647: /* server_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG  */
-#line 3481 "./util/configparser.y"
+  case 649: /* server_response_ip_data: VAR_RESPONSE_IP_DATA STRING_ARG STRING_ARG  */
+#line 3489 "./util/configparser.y"
         {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 6828 "util/configparser.c"
+#line 6842 "util/configparser.c"
     break;
 
-  case 648: /* dnscstart: VAR_DNSCRYPT  */
-#line 3489 "./util/configparser.y"
+  case 650: /* dnscstart: VAR_DNSCRYPT  */
+#line 3497 "./util/configparser.y"
         {
 		OUTYY(("\nP(dnscrypt:)\n"));
 		cfg_parser->started_toplevel = 1;
 	}
-#line 6837 "util/configparser.c"
+#line 6851 "util/configparser.c"
     break;
 
-  case 661: /* dnsc_dnscrypt_enable: VAR_DNSCRYPT_ENABLE STRING_ARG  */
-#line 3506 "./util/configparser.y"
+  case 663: /* dnsc_dnscrypt_enable: VAR_DNSCRYPT_ENABLE STRING_ARG  */
+#line 3514 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -6845,11 +6859,11 @@ yyparse (void)
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 6849 "util/configparser.c"
+#line 6863 "util/configparser.c"
     break;
 
-  case 662: /* dnsc_dnscrypt_port: VAR_DNSCRYPT_PORT STRING_ARG  */
-#line 3516 "./util/configparser.y"
+  case 664: /* dnsc_dnscrypt_port: VAR_DNSCRYPT_PORT STRING_ARG  */
+#line 3524 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -6857,21 +6871,21 @@ yyparse (void)
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 6861 "util/configparser.c"
+#line 6875 "util/configparser.c"
     break;
 
-  case 663: /* dnsc_dnscrypt_provider: VAR_DNSCRYPT_PROVIDER STRING_ARG  */
-#line 3525 "./util/configparser.y"
+  case 665: /* dnsc_dnscrypt_provider: VAR_DNSCRYPT_PROVIDER STRING_ARG  */
+#line 3533 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 6871 "util/configparser.c"
+#line 6885 "util/configparser.c"
     break;
 
-  case 664: /* dnsc_dnscrypt_provider_cert: VAR_DNSCRYPT_PROVIDER_CERT STRING_ARG  */
-#line 3532 "./util/configparser.y"
+  case 666: /* dnsc_dnscrypt_provider_cert: VAR_DNSCRYPT_PROVIDER_CERT STRING_ARG  */
+#line 3540 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -6879,21 +6893,21 @@ yyparse (void)
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 6883 "util/configparser.c"
+#line 6897 "util/configparser.c"
     break;
 
-  case 665: /* dnsc_dnscrypt_provider_cert_rotated: VAR_DNSCRYPT_PROVIDER_CERT_ROTATED STRING_ARG  */
-#line 3541 "./util/configparser.y"
+  case 667: /* dnsc_dnscrypt_provider_cert_rotated: VAR_DNSCRYPT_PROVIDER_CERT_ROTATED STRING_ARG  */
+#line 3549 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 6893 "util/configparser.c"
+#line 6907 "util/configparser.c"
     break;
 
-  case 666: /* dnsc_dnscrypt_secret_key: VAR_DNSCRYPT_SECRET_KEY STRING_ARG  */
-#line 3548 "./util/configparser.y"
+  case 668: /* dnsc_dnscrypt_secret_key: VAR_DNSCRYPT_SECRET_KEY STRING_ARG  */
+#line 3556 "./util/configparser.y"
         {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -6901,22 +6915,22 @@ yyparse (void)
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 6905 "util/configparser.c"
+#line 6919 "util/configparser.c"
     break;
 
-  case 667: /* dnsc_dnscrypt_shared_secret_cache_size: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE STRING_ARG  */
-#line 3557 "./util/configparser.y"
+  case 669: /* dnsc_dnscrypt_shared_secret_cache_size: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE STRING_ARG  */
+#line 3565 "./util/configparser.y"
   {
 	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
 	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
 		yyerror("memory size expected");
 	free((yyvsp[0].str));
   }
-#line 6916 "util/configparser.c"
+#line 6930 "util/configparser.c"
     break;
 
-  case 668: /* dnsc_dnscrypt_shared_secret_cache_slabs: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS STRING_ARG  */
-#line 3565 "./util/configparser.y"
+  case 670: /* dnsc_dnscrypt_shared_secret_cache_slabs: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS STRING_ARG  */
+#line 3573 "./util/configparser.y"
   {
 	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
 	if(atoi((yyvsp[0].str)) == 0) {
@@ -6928,22 +6942,22 @@ yyparse (void)
 	}
 	free((yyvsp[0].str));
   }
-#line 6932 "util/configparser.c"
+#line 6946 "util/configparser.c"
     break;
 
-  case 669: /* dnsc_dnscrypt_nonce_cache_size: VAR_DNSCRYPT_NONCE_CACHE_SIZE STRING_ARG  */
-#line 3578 "./util/configparser.y"
+  case 671: /* dnsc_dnscrypt_nonce_cache_size: VAR_DNSCRYPT_NONCE_CACHE_SIZE STRING_ARG  */
+#line 3586 "./util/configparser.y"
   {
 	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
 	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
 		yyerror("memory size expected");
 	free((yyvsp[0].str));
   }
-#line 6943 "util/configparser.c"
+#line 6957 "util/configparser.c"
     break;
 
-  case 670: /* dnsc_dnscrypt_nonce_cache_slabs: VAR_DNSCRYPT_NONCE_CACHE_SLABS STRING_ARG  */
-#line 3586 "./util/configparser.y"
+  case 672: /* dnsc_dnscrypt_nonce_cache_slabs: VAR_DNSCRYPT_NONCE_CACHE_SLABS STRING_ARG  */
+#line 3594 "./util/configparser.y"
   {
 	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
 	if(atoi((yyvsp[0].str)) == 0) {
@@ -6955,20 +6969,20 @@ yyparse (void)
 	}
 	free((yyvsp[0].str));
   }
-#line 6959 "util/configparser.c"
+#line 6973 "util/configparser.c"
     break;
 
-  case 671: /* cachedbstart: VAR_CACHEDB  */
-#line 3599 "./util/configparser.y"
+  case 673: /* cachedbstart: VAR_CACHEDB  */
+#line 3607 "./util/configparser.y"
         {
 		OUTYY(("\nP(cachedb:)\n"));
 		cfg_parser->started_toplevel = 1;
 	}
-#line 6968 "util/configparser.c"
+#line 6982 "util/configparser.c"
     break;
 
-  case 680: /* cachedb_backend_name: VAR_CACHEDB_BACKEND STRING_ARG  */
-#line 3611 "./util/configparser.y"
+  case 682: /* cachedb_backend_name: VAR_CACHEDB_BACKEND STRING_ARG  */
+#line 3619 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -6979,11 +6993,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6983 "util/configparser.c"
+#line 6997 "util/configparser.c"
     break;
 
-  case 681: /* cachedb_secret_seed: VAR_CACHEDB_SECRETSEED STRING_ARG  */
-#line 3623 "./util/configparser.y"
+  case 683: /* cachedb_secret_seed: VAR_CACHEDB_SECRETSEED STRING_ARG  */
+#line 3631 "./util/configparser.y"
         {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -6994,11 +7008,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 6998 "util/configparser.c"
+#line 7012 "util/configparser.c"
     break;
 
-  case 682: /* redis_server_host: VAR_CACHEDB_REDISHOST STRING_ARG  */
-#line 3635 "./util/configparser.y"
+  case 684: /* redis_server_host: VAR_CACHEDB_REDISHOST STRING_ARG  */
+#line 3643 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str)));
@@ -7009,11 +7023,11 @@ yyparse (void)
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 7013 "util/configparser.c"
+#line 7027 "util/configparser.c"
     break;
 
-  case 683: /* redis_server_port: VAR_CACHEDB_REDISPORT STRING_ARG  */
-#line 3647 "./util/configparser.y"
+  case 685: /* redis_server_port: VAR_CACHEDB_REDISPORT STRING_ARG  */
+#line 3655 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		int port;
@@ -7027,11 +7041,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 7031 "util/configparser.c"
+#line 7045 "util/configparser.c"
     break;
 
-  case 684: /* redis_timeout: VAR_CACHEDB_REDISTIMEOUT STRING_ARG  */
-#line 3662 "./util/configparser.y"
+  case 686: /* redis_timeout: VAR_CACHEDB_REDISTIMEOUT STRING_ARG  */
+#line 3670 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str)));
@@ -7043,11 +7057,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 7047 "util/configparser.c"
+#line 7061 "util/configparser.c"
     break;
 
-  case 685: /* redis_expire_records: VAR_CACHEDB_REDISEXPIRERECORDS STRING_ARG  */
-#line 3675 "./util/configparser.y"
+  case 687: /* redis_expire_records: VAR_CACHEDB_REDISEXPIRERECORDS STRING_ARG  */
+#line 3683 "./util/configparser.y"
         {
 	#if defined(USE_CACHEDB) && defined(USE_REDIS)
 		OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str)));
@@ -7059,11 +7073,11 @@ yyparse (void)
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 7063 "util/configparser.c"
+#line 7077 "util/configparser.c"
     break;
 
-  case 686: /* server_tcp_connection_limit: VAR_TCP_CONNECTION_LIMIT STRING_ARG STRING_ARG  */
-#line 3688 "./util/configparser.y"
+  case 688: /* server_tcp_connection_limit: VAR_TCP_CONNECTION_LIMIT STRING_ARG STRING_ARG  */
+#line 3696 "./util/configparser.y"
         {
 		OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if (atoi((yyvsp[0].str)) < 0)
@@ -7073,20 +7087,20 @@ yyparse (void)
 				fatal_exit("out of memory adding tcp connection limit");
 		}
 	}
-#line 7077 "util/configparser.c"
+#line 7091 "util/configparser.c"
     break;
 
-  case 687: /* ipsetstart: VAR_IPSET  */
-#line 3699 "./util/configparser.y"
+  case 689: /* ipsetstart: VAR_IPSET  */
+#line 3707 "./util/configparser.y"
                 {
 			OUTYY(("\nP(ipset:)\n"));
 			cfg_parser->started_toplevel = 1;
 		}
-#line 7086 "util/configparser.c"
+#line 7100 "util/configparser.c"
     break;
 
-  case 692: /* ipset_name_v4: VAR_IPSET_NAME_V4 STRING_ARG  */
-#line 3709 "./util/configparser.y"
+  case 694: /* ipset_name_v4: VAR_IPSET_NAME_V4 STRING_ARG  */
+#line 3717 "./util/configparser.y"
                 {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str)));
@@ -7100,11 +7114,11 @@ yyparse (void)
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 7104 "util/configparser.c"
+#line 7118 "util/configparser.c"
     break;
 
-  case 693: /* ipset_name_v6: VAR_IPSET_NAME_V6 STRING_ARG  */
-#line 3724 "./util/configparser.y"
+  case 695: /* ipset_name_v6: VAR_IPSET_NAME_V6 STRING_ARG  */
+#line 3732 "./util/configparser.y"
         {
 		#ifdef USE_IPSET
 			OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str)));
@@ -7118,11 +7132,11 @@ yyparse (void)
 			free((yyvsp[0].str));
 		#endif
 		}
-#line 7122 "util/configparser.c"
+#line 7136 "util/configparser.c"
     break;
 
 
-#line 7126 "util/configparser.c"
+#line 7140 "util/configparser.c"
 
       default: break;
     }
@@ -7315,7 +7329,7 @@ yyparse (void)
   return yyresult;
 }
 
-#line 3738 "./util/configparser.y"
+#line 3746 "./util/configparser.y"
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index 18101d2cc..4987e1169 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -383,7 +383,8 @@ extern int yydebug;
     VAR_INTERFACE_VIEW = 584,      /* VAR_INTERFACE_VIEW  */
     VAR_INTERFACE_TAG = 585,       /* VAR_INTERFACE_TAG  */
     VAR_INTERFACE_TAG_ACTION = 586, /* VAR_INTERFACE_TAG_ACTION  */
-    VAR_INTERFACE_TAG_DATA = 587   /* VAR_INTERFACE_TAG_DATA  */
+    VAR_INTERFACE_TAG_DATA = 587,  /* VAR_INTERFACE_TAG_DATA  */
+    VAR_PROXY_PROTOCOL_PORT = 588  /* VAR_PROXY_PROTOCOL_PORT  */
   };
   typedef enum yytokentype yytoken_kind_t;
 #endif
@@ -722,6 +723,7 @@ extern int yydebug;
 #define VAR_INTERFACE_TAG 585
 #define VAR_INTERFACE_TAG_ACTION 586
 #define VAR_INTERFACE_TAG_DATA 587
+#define VAR_PROXY_PROTOCOL_PORT 588
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -731,7 +733,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 735 "util/configparser.h"
+#line 737 "util/configparser.h"
 
 };
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index 8f3672f5d..3ecdad2ad 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -193,6 +193,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_RPZ_SIGNAL_NXDOMAIN_RA VAR_INTERFACE_AUTOMATIC_PORTS VAR_EDE
 %token VAR_INTERFACE_ACTION VAR_INTERFACE_VIEW VAR_INTERFACE_TAG
 %token VAR_INTERFACE_TAG_ACTION VAR_INTERFACE_TAG_DATA
+%token VAR_PROXY_PROTOCOL_PORT
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -320,8 +321,8 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_edns_client_string_opcode | server_nsid |
 	server_zonemd_permissive_mode | server_max_reuse_tcp_queries |
 	server_tcp_reuse_timeout | server_tcp_auth_query_timeout |
-	server_interface_automatic_ports | server_ede
-
+	server_interface_automatic_ports | server_ede |
+	server_proxy_protocol_port
 	;
 stubstart: VAR_STUB_ZONE
 	{
@@ -2824,6 +2825,13 @@ server_ede: VAR_EDE STRING_ARG
 		free($2);
 	}
 	;
+server_proxy_protocol_port: VAR_PROXY_PROTOCOL_PORT STRING_ARG
+	{
+		OUTYY(("P(server_proxy_protocol_port:%s)\n", $2));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->proxy_protocol_port, $2))
+			yyerror("out of memory");
+	}
+	;
 stub_name: VAR_NAME STRING_ARG
 	{
 		OUTYY(("P(name:%s)\n", $2));
diff --git a/util/netevent.c b/util/netevent.c
index 9030a792c..740f7c7e1 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -45,6 +45,7 @@
 #include "util/net_help.h"
 #include "util/tcp_conn_limit.h"
 #include "util/fptr_wlist.h"
+#include "util/proxy_protocol.h"
 #include "sldns/pkthdr.h"
 #include "sldns/sbuffer.h"
 #include "sldns/str2wire.h"
@@ -755,6 +756,67 @@ static int udp_recv_needs_log(int err)
 	return 1;
 }
 
+/** Parses the PROXYv2 header from buf and updates the comm_reply struct.
+ *  Returns 1 on success, 0 on failure. */
+static int consume_pp2_header(struct sldns_buffer* buf, struct comm_reply* rep,
+	int stream) {
+	size_t size;
+	struct pp2_header *header = pp2_read_header(buf);
+	if(header == NULL) return 0;
+	size = PP2_HEADER_SIZE + ntohs(header->len);
+	if((header->ver_cmd & 0xF) == PP2_CMD_LOCAL) {
+		/* A connection from the proxy itself.
+		 * No need to do anything with addresses. */
+		goto done;
+	}
+	if(header->fam_prot == 0x00) {
+		/* Unspecified family and protocol. This could be used for
+		 * health checks by proxies.
+		 * No need to do anything with addresses. */
+		goto done;
+	}
+	/* Read the proxied address */
+	switch(header->fam_prot) {
+		case 0x11: /* AF_INET|STREAM */
+		case 0x12: /* AF_INET|DGRAM */
+			{
+			struct sockaddr_in* addr =
+				(struct sockaddr_in*)&rep->client_addr;
+			addr->sin_family = AF_INET;
+			addr->sin_addr.s_addr = header->addr.addr4.src_addr;
+			addr->sin_port = header->addr.addr4.src_port;
+			rep->client_addrlen = (socklen_t)sizeof(struct sockaddr_in);
+			}
+			/* Ignore the destination address; it should be us. */
+			break;
+		case 0x21: /* AF_INET6|STREAM */
+		case 0x22: /* AF_INET6|DGRAM */
+			{
+			struct sockaddr_in6* addr =
+				(struct sockaddr_in6*)&rep->client_addr;
+			memset(addr, 0, sizeof(*addr));
+			addr->sin6_family = AF_INET6;
+			memcpy(&addr->sin6_addr,
+				header->addr.addr6.src_addr, 16);
+			addr->sin6_port = header->addr.addr6.src_port;
+			rep->client_addrlen = (socklen_t)sizeof(struct sockaddr_in6);
+			}
+			/* Ignore the destination address; it should be us. */
+			break;
+	}
+	rep->is_proxied = 1;
+done:
+	if(!stream) {
+		/* We are reading a whole packet;
+		 * Move the rest of the data to overwrite the PROXYv2 header */
+		/* XXX can we do better to avoid memmove? */
+		memmove(header, ((void*)header)+size,
+			sldns_buffer_limit(buf)-size);
+		sldns_buffer_set_limit(buf, sldns_buffer_limit(buf)-size);
+	}
+	return 1;
+}
+
 void 
 comm_point_udp_ancil_callback(int fd, short event, void* arg)
 {
@@ -781,11 +843,11 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
 	ub_comm_base_now(rep.c->ev->base);
 	for(i=0; i<NUM_UDP_PER_SELECT; i++) {
 		sldns_buffer_clear(rep.c->buffer);
-		rep.addrlen = (socklen_t)sizeof(rep.addr);
+		rep.remote_addrlen = (socklen_t)sizeof(rep.remote_addr);
 		log_assert(fd != -1);
 		log_assert(sldns_buffer_remaining(rep.c->buffer) > 0);
-		msg.msg_name = &rep.addr;
-		msg.msg_namelen = (socklen_t)sizeof(rep.addr);
+		msg.msg_name = &rep.remote_addr;
+		msg.msg_namelen = (socklen_t)sizeof(rep.remote_addr);
 		iov[0].iov_base = sldns_buffer_begin(rep.c->buffer);
 		iov[0].iov_len = sldns_buffer_remaining(rep.c->buffer);
 		msg.msg_iov = iov;
@@ -803,10 +865,11 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
 			}
 			return;
 		}
-		rep.addrlen = msg.msg_namelen;
+		rep.remote_addrlen = msg.msg_namelen;
 		sldns_buffer_skip(rep.c->buffer, rcv);
 		sldns_buffer_flip(rep.c->buffer);
 		rep.srctype = 0;
+		rep.is_proxied = 0;
 #ifndef S_SPLINT_S
 		for(cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
 			cmsg = CMSG_NXTHDR(&msg, cmsg)) {
@@ -836,11 +899,24 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
 		if(verbosity >= VERB_ALGO)
 			p_ancil("receive_udp on interface", &rep);
 #endif /* S_SPLINT_S */
+
+		if(rep.c->pp2_enabled && !consume_pp2_header(rep.c->buffer,
+			&rep, 0)) {
+			log_err("proxy_protocol: could not consume PROXYv2 header");
+			return;
+		}
+		if(!rep.is_proxied) {
+			rep.client_addrlen = rep.remote_addrlen;
+			memmove(&rep.client_addr, &rep.remote_addr,
+				rep.remote_addrlen);
+		}
+
 		fptr_ok(fptr_whitelist_comm_point(rep.c->callback));
 		if((*rep.c->callback)(rep.c, rep.c->cb_arg, NETEVENT_NOERROR, &rep)) {
 			/* send back immediate reply */
 			(void)comm_point_send_udp_msg_if(rep.c, rep.c->buffer,
-				(struct sockaddr*)&rep.addr, rep.addrlen, &rep);
+				(struct sockaddr*)&rep.remote_addr,
+				rep.remote_addrlen, &rep);
 		}
 		if(!rep.c || rep.c->fd == -1) /* commpoint closed */
 			break;
@@ -871,12 +947,12 @@ comm_point_udp_callback(int fd, short event, void* arg)
 	ub_comm_base_now(rep.c->ev->base);
 	for(i=0; i<NUM_UDP_PER_SELECT; i++) {
 		sldns_buffer_clear(rep.c->buffer);
-		rep.addrlen = (socklen_t)sizeof(rep.addr);
+		rep.remote_addrlen = (socklen_t)sizeof(rep.remote_addr);
 		log_assert(fd != -1);
 		log_assert(sldns_buffer_remaining(rep.c->buffer) > 0);
 		rcv = recvfrom(fd, (void*)sldns_buffer_begin(rep.c->buffer), 
 			sldns_buffer_remaining(rep.c->buffer), MSG_DONTWAIT,
-			(struct sockaddr*)&rep.addr, &rep.addrlen);
+			(struct sockaddr*)&rep.remote_addr, &rep.remote_addrlen);
 		if(rcv == -1) {
 #ifndef USE_WINSOCK
 			if(errno != EAGAIN && errno != EINTR
@@ -896,6 +972,19 @@ comm_point_udp_callback(int fd, short event, void* arg)
 		sldns_buffer_skip(rep.c->buffer, rcv);
 		sldns_buffer_flip(rep.c->buffer);
 		rep.srctype = 0;
+		rep.is_proxied = 0;
+
+		if(rep.c->pp2_enabled && !consume_pp2_header(rep.c->buffer,
+			&rep, 0)) {
+			log_err("proxy_protocol: could not consume PROXYv2 header");
+			return;
+		}
+		if(!rep.is_proxied) {
+			rep.client_addrlen = rep.remote_addrlen;
+			memmove(&rep.client_addr, &rep.remote_addr,
+				rep.remote_addrlen);
+		}
+
 		fptr_ok(fptr_whitelist_comm_point(rep.c->callback));
 		if((*rep.c->callback)(rep.c, rep.c->cb_arg, NETEVENT_NOERROR, &rep)) {
 			/* send back immediate reply */
@@ -905,7 +994,8 @@ comm_point_udp_callback(int fd, short event, void* arg)
 			buffer = rep.c->buffer;
 #endif
 			(void)comm_point_send_udp_msg(rep.c, buffer,
-				(struct sockaddr*)&rep.addr, rep.addrlen, 0);
+				(struct sockaddr*)&rep.remote_addr,
+				rep.remote_addrlen, 0);
 		}
 		if(!rep.c || rep.c->fd != fd) /* commpoint closed to -1 or reused for
 		another UDP port. Note rep.c cannot be reused with TCP fd. */
@@ -1221,10 +1311,16 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
 	}
 	log_assert(fd != -1);
 	(void)fd;
-	new_fd = comm_point_perform_accept(c, &c_hdl->repinfo.addr,
-		&c_hdl->repinfo.addrlen);
+	new_fd = comm_point_perform_accept(c, &c_hdl->repinfo.remote_addr,
+		&c_hdl->repinfo.remote_addrlen);
 	if(new_fd == -1)
 		return;
+	/* Copy remote_address to client_address.
+	 * Simplest way/time for streams to do that. */
+	c_hdl->repinfo.client_addrlen = c_hdl->repinfo.remote_addrlen;
+	memmove(&c_hdl->repinfo.client_addr,
+		&c_hdl->repinfo.remote_addr,
+		c_hdl->repinfo.remote_addrlen);
 	if(c->ssl) {
 		c_hdl->ssl = incoming_ssl_fd(c->ssl, new_fd);
 		if(!c_hdl->ssl) {
@@ -1276,6 +1372,7 @@ reclaim_tcp_handler(struct comm_point* c)
 	c->tcp_more_read_again = NULL;
 	c->tcp_more_write_again = NULL;
 	c->tcp_byte_count = 0;
+	c->pp2_header_state = pp2_header_none;
 	sldns_buffer_clear(c->buffer);
 }
 
@@ -1407,8 +1504,8 @@ ssl_handshake(struct comm_point* c)
 				return 0; /* silence reset by peer */
 #endif
 			if(!tcp_connect_errno_needs_log(
-				(struct sockaddr*)&c->repinfo.addr,
-				c->repinfo.addrlen))
+				(struct sockaddr*)&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen))
 				return 0; /* silence connect failures that
 				show up because after connect this is the
 				first system call that accesses the socket */
@@ -1420,8 +1517,9 @@ ssl_handshake(struct comm_point* c)
 			unsigned long err = ERR_get_error();
 			if(!squelch_err_ssl_handshake(err)) {
 				log_crypto_err_code("ssl handshake failed", err);
-				log_addr(VERB_OPS, "ssl handshake failed", &c->repinfo.addr,
-					c->repinfo.addrlen);
+				log_addr(VERB_OPS, "ssl handshake failed",
+					&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
 			}
 			return 0;
 		}
@@ -1438,7 +1536,8 @@ ssl_handshake(struct comm_point* c)
 			if(!x) {
 				log_addr(VERB_ALGO, "SSL connection failed: "
 					"no certificate",
-					&c->repinfo.addr, c->repinfo.addrlen);
+					&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
 				return 0;
 			}
 			log_cert(VERB_ALGO, "peer certificate", x);
@@ -1448,13 +1547,13 @@ ssl_handshake(struct comm_point* c)
 				snprintf(buf, sizeof(buf), "SSL connection "
 					"to %s authenticated",
 					SSL_get0_peername(c->ssl));
-				log_addr(VERB_ALGO, buf, &c->repinfo.addr,
-					c->repinfo.addrlen);
+				log_addr(VERB_ALGO, buf, &c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
 			} else {
 #endif
 				log_addr(VERB_ALGO, "SSL connection "
-					"authenticated", &c->repinfo.addr,
-					c->repinfo.addrlen);
+					"authenticated", &c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
 #ifdef HAVE_SSL_GET0_PEERNAME
 			}
 #endif
@@ -1471,14 +1570,15 @@ ssl_handshake(struct comm_point* c)
 			}
 			log_addr(VERB_ALGO, "SSL connection failed: "
 				"failed to authenticate",
-				&c->repinfo.addr, c->repinfo.addrlen);
+				&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
 			return 0;
 		}
 	} else {
 		/* unauthenticated, the verify peer flag was not set
 		 * in c->ssl when the ssl object was created from ssl_ctx */
-		log_addr(VERB_ALGO, "SSL connection", &c->repinfo.addr,
-			c->repinfo.addrlen);
+		log_addr(VERB_ALGO, "SSL connection", &c->repinfo.remote_addr,
+			c->repinfo.remote_addrlen);
 	}
 
 #ifdef HAVE_SSL_GET0_ALPN_SELECTED
@@ -1519,6 +1619,139 @@ ssl_handle_read(struct comm_point* c)
 		if(c->ssl_shake_state != comm_ssl_shake_none)
 			return 1;
 	}
+	if(c->pp2_enabled && c->pp2_header_state != pp2_header_done) {
+		struct pp2_header* header = NULL;
+		size_t want_read_size = 0;
+		size_t current_read_size = 0;
+		if(c->pp2_header_state == pp2_header_none) {
+			want_read_size = PP2_HEADER_SIZE;
+			if(sldns_buffer_remaining(c->buffer)<want_read_size) {
+				log_err_addr("proxy_protocol: not enough "
+					"buffer size to read PROXYv2 header", "",
+					&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
+				return 0;
+			}
+			verbose(VERB_ALGO, "proxy_protocol: reading fixed "
+				"part of PROXYv2 header (len %lu)",
+				want_read_size);
+			current_read_size = want_read_size;
+			if(c->tcp_byte_count < current_read_size) {
+				ERR_clear_error();
+				if((r=SSL_read(c->ssl, (void*)sldns_buffer_at(
+					c->buffer, c->tcp_byte_count),
+					current_read_size -
+					c->tcp_byte_count)) <= 0) {
+					int want = SSL_get_error(c->ssl, r);
+					if(want == SSL_ERROR_ZERO_RETURN) {
+						if(c->tcp_req_info)
+							return tcp_req_info_handle_read_close(c->tcp_req_info);
+						return 0; /* shutdown, closed */
+					} else if(want == SSL_ERROR_WANT_READ) {
+#ifdef USE_WINSOCK
+						ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ);
+#endif
+						return 1; /* read more later */
+					} else if(want == SSL_ERROR_WANT_WRITE) {
+						c->ssl_shake_state = comm_ssl_shake_hs_write;
+						comm_point_listen_for_rw(c, 0, 1);
+						return 1;
+					} else if(want == SSL_ERROR_SYSCALL) {
+#ifdef ECONNRESET
+						if(errno == ECONNRESET && verbosity < 2)
+							return 0; /* silence reset by peer */
+#endif
+						if(errno != 0)
+							log_err("SSL_read syscall: %s",
+								strerror(errno));
+						return 0;
+					}
+					log_crypto_err("could not SSL_read");
+					return 0;
+				}
+				c->tcp_byte_count += r;
+				if(c->tcp_byte_count != current_read_size) return 1;
+				c->pp2_header_state = pp2_header_init;
+			}
+		}
+		if(c->pp2_header_state == pp2_header_init) {
+			header = pp2_read_header(c->buffer);
+			if(!header) {
+				log_err("proxy_protocol: could not parse "
+					"PROXYv2 header");
+				return 0;
+			}
+			want_read_size = ntohs(header->len);
+			if(sldns_buffer_remaining(c->buffer) <
+				PP2_HEADER_SIZE + want_read_size) {
+				log_err_addr("proxy_protocol: not enough "
+					"buffer size to read PROXYv2 header", "",
+					&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
+				return 0;
+			}
+			verbose(VERB_ALGO, "proxy_protocol: reading variable "
+				"part of PROXYv2 header (len %lu)",
+				want_read_size);
+			current_read_size = PP2_HEADER_SIZE + want_read_size;
+			if(c->tcp_byte_count < current_read_size) {
+				ERR_clear_error();
+				if((r=SSL_read(c->ssl, (void*)sldns_buffer_at(
+					c->buffer, c->tcp_byte_count),
+					current_read_size -
+					c->tcp_byte_count)) <= 0) {
+					int want = SSL_get_error(c->ssl, r);
+					if(want == SSL_ERROR_ZERO_RETURN) {
+						if(c->tcp_req_info)
+							return tcp_req_info_handle_read_close(c->tcp_req_info);
+						return 0; /* shutdown, closed */
+					} else if(want == SSL_ERROR_WANT_READ) {
+#ifdef USE_WINSOCK
+						ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ);
+#endif
+						return 1; /* read more later */
+					} else if(want == SSL_ERROR_WANT_WRITE) {
+						c->ssl_shake_state = comm_ssl_shake_hs_write;
+						comm_point_listen_for_rw(c, 0, 1);
+						return 1;
+					} else if(want == SSL_ERROR_SYSCALL) {
+#ifdef ECONNRESET
+						if(errno == ECONNRESET && verbosity < 2)
+							return 0; /* silence reset by peer */
+#endif
+						if(errno != 0)
+							log_err("SSL_read syscall: %s",
+								strerror(errno));
+						return 0;
+					}
+					log_crypto_err("could not SSL_read");
+					return 0;
+				}
+				c->tcp_byte_count += r;
+				if(c->tcp_byte_count != current_read_size) return 1;
+				c->pp2_header_state = pp2_header_done;
+			}
+		}
+		if(c->pp2_header_state != pp2_header_done || !header) {
+			log_err_addr("proxy_protocol: wrong state for the "
+				"PROXYv2 header", "", &c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
+			return 0;
+		}
+		if(!consume_pp2_header(c->buffer, &c->repinfo, 1)) {
+			log_err_addr("proxy_protocol: could not consume "
+				"PROXYv2 header", "", &c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
+			return 0;
+		}
+		verbose(VERB_ALGO, "proxy_protocol: successful read of "
+			"PROXYv2 header");
+		/* Clear and reset the buffer to read the following
+		 * DNS packet(s). */
+		sldns_buffer_clear(c->buffer);
+		c->tcp_byte_count = 0;
+		return 1;
+	}
 	if(c->tcp_byte_count < sizeof(uint16_t)) {
 		/* read length bytes */
 		ERR_clear_error();
@@ -1778,16 +2011,18 @@ ssl_handle_it(struct comm_point* c, int is_write)
 	return ssl_handle_write(c);
 }
 
-/** Handle tcp reading callback. 
+/**
+ * Handle tcp reading callback.
  * @param fd: file descriptor of socket.
  * @param c: comm point to read from into buffer.
  * @param short_ok: if true, very short packets are OK (for comm_local).
- * @return: 0 on error 
+ * @return: 0 on error
  */
 static int
 comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 {
 	ssize_t r;
+	int recv_initial = 0;
 	log_assert(c->type == comm_tcp || c->type == comm_local);
 	if(c->ssl)
 		return ssl_handle_it(c, 0);
@@ -1795,6 +2030,96 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 		return 0;
 
 	log_assert(fd != -1);
+	if(c->pp2_enabled && c->pp2_header_state != pp2_header_done) {
+		struct pp2_header* header = NULL;
+		size_t want_read_size = 0;
+		size_t current_read_size = 0;
+		if(c->pp2_header_state == pp2_header_none) {
+			want_read_size = PP2_HEADER_SIZE;
+			if(sldns_buffer_remaining(c->buffer)<want_read_size) {
+				log_err_addr("proxy_protocol: not enough "
+					"buffer size to read PROXYv2 header", "",
+					&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
+				return 0;
+			}
+			verbose(VERB_ALGO, "proxy_protocol: reading fixed "
+				"part of PROXYv2 header (len %lu)",
+				want_read_size);
+			current_read_size = want_read_size;
+			if(c->tcp_byte_count < current_read_size) {
+				r = recv(fd, (void*)sldns_buffer_at(c->buffer,
+					c->tcp_byte_count),
+					current_read_size-c->tcp_byte_count, MSG_DONTWAIT);
+				if(r == 0) {
+					if(c->tcp_req_info)
+						return tcp_req_info_handle_read_close(c->tcp_req_info);
+					return 0;
+				} else if(r == -1) {
+					goto recv_error_initial;
+				}
+				c->tcp_byte_count += r;
+				if(c->tcp_byte_count != current_read_size) return 1;
+				c->pp2_header_state = pp2_header_init;
+			}
+		}
+		if(c->pp2_header_state == pp2_header_init) {
+			header = pp2_read_header(c->buffer);
+			if(!header) {
+				log_err("proxy_protocol: could not parse "
+					"PROXYv2 header");
+				return 0;
+			}
+			want_read_size = ntohs(header->len);
+			if(sldns_buffer_remaining(c->buffer) <
+				PP2_HEADER_SIZE + want_read_size) {
+				log_err_addr("proxy_protocol: not enough "
+					"buffer size to read PROXYv2 header", "",
+					&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
+				return 0;
+			}
+			verbose(VERB_ALGO, "proxy_protocol: reading variable "
+				"part of PROXYv2 header (len %lu)",
+				want_read_size);
+			current_read_size = PP2_HEADER_SIZE + want_read_size;
+			if(c->tcp_byte_count < current_read_size) {
+				r = recv(fd, (void*)sldns_buffer_at(c->buffer,
+					c->tcp_byte_count),
+					current_read_size-c->tcp_byte_count, MSG_DONTWAIT);
+				if(r == 0) {
+					if(c->tcp_req_info)
+						return tcp_req_info_handle_read_close(c->tcp_req_info);
+					return 0;
+				} else if(r == -1) {
+					goto recv_error;
+				}
+				c->tcp_byte_count += r;
+				if(c->tcp_byte_count != current_read_size) return 1;
+				c->pp2_header_state = pp2_header_done;
+			}
+		}
+		if(c->pp2_header_state != pp2_header_done || !header) {
+			log_err_addr("proxy_protocol: wrong state for the "
+				"PROXYv2 header", "", &c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
+			return 0;
+		}
+		if(!consume_pp2_header(c->buffer, &c->repinfo, 1)) {
+			log_err_addr("proxy_protocol: could not consume "
+				"PROXYv2 header", "", &c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
+			return 0;
+		}
+		verbose(VERB_ALGO, "proxy_protocol: successful read of "
+			"PROXYv2 header");
+		/* Clear and reset the buffer to read the following
+		    * DNS packet(s). */
+		sldns_buffer_clear(c->buffer);
+		c->tcp_byte_count = 0;
+		return 1;
+	}
+
 	if(c->tcp_byte_count < sizeof(uint16_t)) {
 		/* read length bytes */
 		r = recv(fd,(void*)sldns_buffer_at(c->buffer,c->tcp_byte_count),
@@ -1804,69 +2129,9 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 				return tcp_req_info_handle_read_close(c->tcp_req_info);
 			return 0;
 		} else if(r == -1) {
-#ifndef USE_WINSOCK
-			if(errno == EINTR || errno == EAGAIN)
-				return 1;
-#ifdef ECONNRESET
-			if(errno == ECONNRESET && verbosity < 2)
-				return 0; /* silence reset by peer */
-#endif
-#ifdef ECONNREFUSED
-			if(errno == ECONNREFUSED && verbosity < 2)
-				return 0; /* silence reset by peer */
-#endif
-#ifdef ENETUNREACH
-			if(errno == ENETUNREACH && verbosity < 2)
-				return 0; /* silence it */
-#endif
-#ifdef EHOSTDOWN
-			if(errno == EHOSTDOWN && verbosity < 2)
-				return 0; /* silence it */
-#endif
-#ifdef EHOSTUNREACH
-			if(errno == EHOSTUNREACH && verbosity < 2)
-				return 0; /* silence it */
-#endif
-#ifdef ENETDOWN
-			if(errno == ENETDOWN && verbosity < 2)
-				return 0; /* silence it */
-#endif
-#ifdef EACCES
-			if(errno == EACCES && verbosity < 2)
-				return 0; /* silence it */
-#endif
-#ifdef ENOTCONN
-			if(errno == ENOTCONN) {
-				log_err_addr("read (in tcp s) failed and this could be because TCP Fast Open is enabled [--disable-tfo-client --disable-tfo-server] but does not work", sock_strerror(errno),
-					&c->repinfo.addr, c->repinfo.addrlen);
-				return 0;
-			}
-#endif
-#else /* USE_WINSOCK */
-			if(WSAGetLastError() == WSAECONNREFUSED && verbosity < 2)
-				return 0;
-			if(WSAGetLastError() == WSAEHOSTDOWN && verbosity < 2)
-				return 0;
-			if(WSAGetLastError() == WSAEHOSTUNREACH && verbosity < 2)
-				return 0;
-			if(WSAGetLastError() == WSAENETDOWN && verbosity < 2)
-				return 0;
-			if(WSAGetLastError() == WSAENETUNREACH && verbosity < 2)
-				return 0;
-			if(WSAGetLastError() == WSAECONNRESET)
-				return 0;
-			if(WSAGetLastError() == WSAEINPROGRESS)
-				return 1;
-			if(WSAGetLastError() == WSAEWOULDBLOCK) {
-				ub_winsock_tcp_wouldblock(c->ev->ev,
-					UB_EV_READ);
-				return 1;
-			}
-#endif
-			log_err_addr("read (in tcp s)", sock_strerror(errno),
-				&c->repinfo.addr, c->repinfo.addrlen);
-			return 0;
-		} 
+			if(c->pp2_enabled) goto recv_error;
+			goto recv_error_initial;
+		}
 		c->tcp_byte_count += r;
 		if(c->tcp_byte_count != sizeof(uint16_t))
 			return 1;
@@ -1875,19 +2140,21 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 			verbose(VERB_QUERY, "tcp: dropped larger than buffer");
 			return 0;
 		}
-		sldns_buffer_set_limit(c->buffer, 
+		sldns_buffer_set_limit(c->buffer,
 			sldns_buffer_read_u16_at(c->buffer, 0));
-		if(!short_ok && 
+		if(!short_ok &&
 			sldns_buffer_limit(c->buffer) < LDNS_HEADER_SIZE) {
 			verbose(VERB_QUERY, "tcp: dropped bogus too short.");
 			return 0;
 		}
-		verbose(VERB_ALGO, "Reading tcp query of length %d", 
+		verbose(VERB_ALGO, "Reading tcp query of length %d",
 			(int)sldns_buffer_limit(c->buffer));
 	}
 
 	if(sldns_buffer_remaining(c->buffer) == 0)
-		log_err("in comm_point_tcp_handle_read buffer_remaining is not > 0 as expected, continuing with (harmless) 0 length recv");
+		log_err("in comm_point_tcp_handle_read buffer_remaining is "
+			"not > 0 as expected, continuing with (harmless) 0 "
+			"length recv");
 	r = recv(fd, (void*)sldns_buffer_current(c->buffer), 
 		sldns_buffer_remaining(c->buffer), MSG_DONTWAIT);
 	if(r == 0) {
@@ -1895,28 +2162,88 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 			return tcp_req_info_handle_read_close(c->tcp_req_info);
 		return 0;
 	} else if(r == -1) {
-#ifndef USE_WINSOCK
-		if(errno == EINTR || errno == EAGAIN)
-			return 1;
-#else /* USE_WINSOCK */
-		if(WSAGetLastError() == WSAECONNRESET)
-			return 0;
-		if(WSAGetLastError() == WSAEINPROGRESS)
-			return 1;
-		if(WSAGetLastError() == WSAEWOULDBLOCK) {
-			ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ);
-			return 1;
-		}
-#endif
-		log_err_addr("read (in tcp r)", sock_strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
-		return 0;
+		goto recv_error;
 	}
 	sldns_buffer_skip(c->buffer, r);
 	if(sldns_buffer_remaining(c->buffer) <= 0) {
 		tcp_callback_reader(c);
 	}
 	return 1;
+
+recv_error_initial:
+	recv_initial = 1;
+recv_error:
+#ifndef USE_WINSOCK
+	if(errno == EINTR || errno == EAGAIN)
+		return 1;
+	if(recv_initial) {
+#ifdef ECONNRESET
+		if(errno == ECONNRESET && verbosity < 2)
+			return 0; /* silence reset by peer */
+#endif
+#ifdef ECONNREFUSED
+		if(errno == ECONNREFUSED && verbosity < 2)
+			return 0; /* silence reset by peer */
+#endif
+#ifdef ENETUNREACH
+		if(errno == ENETUNREACH && verbosity < 2)
+			return 0; /* silence it */
+#endif
+#ifdef EHOSTDOWN
+		if(errno == EHOSTDOWN && verbosity < 2)
+			return 0; /* silence it */
+#endif
+#ifdef EHOSTUNREACH
+		if(errno == EHOSTUNREACH && verbosity < 2)
+			return 0; /* silence it */
+#endif
+#ifdef ENETDOWN
+		if(errno == ENETDOWN && verbosity < 2)
+			return 0; /* silence it */
+#endif
+#ifdef EACCES
+		if(errno == EACCES && verbosity < 2)
+			return 0; /* silence it */
+#endif
+#ifdef ENOTCONN
+		if(errno == ENOTCONN) {
+			log_err_addr("read (in tcp s) failed and this "
+				"could be because TCP Fast Open is "
+				"enabled [--disable-tfo-client "
+				"--disable-tfo-server] but does not "
+				"work", sock_strerror(errno),
+				&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
+			return 0;
+		}
+	}
+#endif
+#else /* USE_WINSOCK */
+	if(recv_initial) {
+		if(WSAGetLastError() == WSAECONNREFUSED && verbosity < 2)
+			return 0;
+		if(WSAGetLastError() == WSAEHOSTDOWN && verbosity < 2)
+			return 0;
+		if(WSAGetLastError() == WSAEHOSTUNREACH && verbosity < 2)
+			return 0;
+		if(WSAGetLastError() == WSAENETDOWN && verbosity < 2)
+			return 0;
+		if(WSAGetLastError() == WSAENETUNREACH && verbosity < 2)
+			return 0;
+	}
+	if(WSAGetLastError() == WSAECONNRESET)
+		return 0;
+	if(WSAGetLastError() == WSAEINPROGRESS)
+		return 1;
+	if(WSAGetLastError() == WSAEWOULDBLOCK) {
+		ub_winsock_tcp_wouldblock(c->ev->ev,
+			UB_EV_READ);
+		return 1;
+	}
+#endif
+	log_err_addr("read (in tcp s)", sock_strerror(errno),
+		&c->repinfo.remote_addr, c->repinfo.remote_addrlen);
+	return 0;
 }
 
 /** 
@@ -1962,7 +2289,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 			return 0; /* silence lots of chatter in the logs */
                 else if(error != 0) {
 			log_err_addr("tcp connect", strerror(error),
-				&c->repinfo.addr, c->repinfo.addrlen);
+				&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
 #else /* USE_WINSOCK */
 		/* examine error */
 		if(error == WSAEINPROGRESS)
@@ -1974,7 +2302,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 			return 0;
 		else if(error != 0) {
 			log_err_addr("tcp connect", wsa_strerror(error),
-				&c->repinfo.addr, c->repinfo.addrlen);
+				&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
 #endif /* USE_WINSOCK */
 			return 0;
 		}
@@ -2006,8 +2335,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 			iov[1].iov_len = sldns_buffer_limit(buffer);
 		}
 		log_assert(iov[0].iov_len > 0);
-		msg.msg_name = &c->repinfo.addr;
-		msg.msg_namelen = c->repinfo.addrlen;
+		msg.msg_name = &c->repinfo.remote_addr;
+		msg.msg_namelen = c->repinfo.remote_addrlen;
 		msg.msg_iov = iov;
 		msg.msg_iovlen = 2;
 		r = sendmsg(fd, &msg, MSG_FASTOPEN);
@@ -2033,14 +2362,16 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 				if(verbosity < 2)
 					return 0; /* silence lots of chatter in the logs */
 				log_err_addr("tcp sendmsg", strerror(errno),
-					&c->repinfo.addr, c->repinfo.addrlen);
+					&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen);
 				return 0;
 			}
 			verbose(VERB_ALGO, "tcp sendmsg for fastopen failed (with %s), try normal connect", strerror(errno));
 			/* fallthrough to nonFASTOPEN
 			 * (MSG_FASTOPEN on Linux 3 produces EPIPE)
 			 * we need to perform connect() */
-			if(connect(fd, (struct sockaddr *)&c->repinfo.addr, c->repinfo.addrlen) == -1) {
+			if(connect(fd, (struct sockaddr *)&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen) == -1) {
 #ifdef EINPROGRESS
 				if(errno == EINPROGRESS)
 					return 1; /* wait until connect done*/
@@ -2051,9 +2382,12 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 					return 1; /* wait until connect done*/
 #endif
 				if(tcp_connect_errno_needs_log(
-					(struct sockaddr *)&c->repinfo.addr, c->repinfo.addrlen)) {
+					(struct sockaddr *)&c->repinfo.remote_addr,
+					c->repinfo.remote_addrlen)) {
 					log_err_addr("outgoing tcp: connect after EPIPE for fastopen",
-						strerror(errno), &c->repinfo.addr, c->repinfo.addrlen);
+						strerror(errno),
+						&c->repinfo.remote_addr,
+						c->repinfo.remote_addrlen);
 				}
 				return 0;
 			}
@@ -2118,10 +2452,12 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 #endif
 #  ifdef HAVE_WRITEV
 			log_err_addr("tcp writev", strerror(errno),
-				&c->repinfo.addr, c->repinfo.addrlen);
+				&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
 #  else /* HAVE_WRITEV */
 			log_err_addr("tcp send s", strerror(errno),
-				&c->repinfo.addr, c->repinfo.addrlen);
+				&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
 #  endif /* HAVE_WRITEV */
 #else
 			if(WSAGetLastError() == WSAENOTCONN)
@@ -2137,7 +2473,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 				return 0; /* silence reset by peer */
 			log_err_addr("tcp send s",
 				wsa_strerror(WSAGetLastError()),
-				&c->repinfo.addr, c->repinfo.addrlen);
+				&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen);
 #endif
 			return 0;
 		}
@@ -2185,7 +2522,8 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c)
 			return 0; /* silence reset by peer */
 #endif
 		log_err_addr("tcp send r", sock_strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
+			&c->repinfo.remote_addr,
+			c->repinfo.remote_addrlen);
 		return 0;
 	}
 	if(c->tcp_write_and_read) {
@@ -2449,7 +2787,7 @@ http_read_more(int fd, struct comm_point* c)
 		}
 #endif
 		log_err_addr("read (in http r)", sock_strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
+			&c->repinfo.remote_addr, c->repinfo.remote_addrlen);
 		return 0;
 	}
 	verbose(VERB_ALGO, "http read more skip to %d + %d",
@@ -2881,8 +3219,8 @@ ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf,
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 #endif
 		log_err_addr("could not http2 recv: %s", strerror(errno),
-			&h2_session->c->repinfo.addr,
-			h2_session->c->repinfo.addrlen);
+			&h2_session->c->repinfo.remote_addr,
+			h2_session->c->repinfo.remote_addrlen);
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() == WSAECONNRESET)
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -2895,8 +3233,8 @@ ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf,
 		}
 		log_err_addr("could not http2 recv: %s",
 			wsa_strerror(WSAGetLastError()),
-			&h2_session->c->repinfo.addr,
-			h2_session->c->repinfo.addrlen);
+			&h2_session->c->repinfo.remote_addr,
+			h2_session->c->repinfo.remote_addrlen);
 #endif
 		return NGHTTP2_ERR_CALLBACK_FAILURE;
 	}
@@ -2918,8 +3256,8 @@ comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c)
 		if(ret != NGHTTP2_ERR_EOF &&
 			ret != NGHTTP2_ERR_CALLBACK_FAILURE) {
 			char a[256];
-			addr_to_str(&c->repinfo.addr, c->repinfo.addrlen,
-				a, sizeof(a));
+			addr_to_str(&c->repinfo.remote_addr,
+				c->repinfo.remote_addrlen, a, sizeof(a));
 			verbose(VERB_QUERY, "http2: session_recv from %s failed, "
 				"error: %s", a, nghttp2_strerror(ret));
 		}
@@ -3067,7 +3405,7 @@ http_check_connect(int fd, struct comm_point* c)
 		return 0; /* silence lots of chatter in the logs */
 	else if(error != 0) {
 		log_err_addr("http connect", strerror(error),
-			&c->repinfo.addr, c->repinfo.addrlen);
+			&c->repinfo.remote_addr, c->repinfo.remote_addrlen);
 #else /* USE_WINSOCK */
 	/* examine error */
 	if(error == WSAEINPROGRESS)
@@ -3079,7 +3417,7 @@ http_check_connect(int fd, struct comm_point* c)
 		return 0;
 	else if(error != 0) {
 		log_err_addr("http connect", wsa_strerror(error),
-			&c->repinfo.addr, c->repinfo.addrlen);
+			&c->repinfo.remote_addr, c->repinfo.remote_addrlen);
 #endif /* USE_WINSOCK */
 		return 0;
 	}
@@ -3149,7 +3487,7 @@ http_write_more(int fd, struct comm_point* c)
 		}
 #endif
 		log_err_addr("http send r", sock_strerror(errno),
-			&c->repinfo.addr, c->repinfo.addrlen);
+			&c->repinfo.remote_addr, c->repinfo.remote_addrlen);
 		return 0;
 	}
 	sldns_buffer_skip(c->buffer, r);
@@ -3213,8 +3551,8 @@ ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf,
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 #endif
 		log_err_addr("could not http2 write: %s", strerror(errno),
-			&h2_session->c->repinfo.addr,
-			h2_session->c->repinfo.addrlen);
+			&h2_session->c->repinfo.remote_addr,
+			h2_session->c->repinfo.remote_addrlen);
 #else /* USE_WINSOCK */
 		if(WSAGetLastError() == WSAENOTCONN)
 			return NGHTTP2_ERR_WOULDBLOCK;
@@ -3229,8 +3567,8 @@ ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf,
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 		log_err_addr("could not http2 write: %s",
 			wsa_strerror(WSAGetLastError()),
-			&h2_session->c->repinfo.addr,
-			h2_session->c->repinfo.addrlen);
+			&h2_session->c->repinfo.remote_addr,
+			h2_session->c->repinfo.remote_addrlen);
 #endif
 		return NGHTTP2_ERR_CALLBACK_FAILURE;
 	}
@@ -3410,7 +3748,8 @@ void comm_point_raw_handle_callback(int ATTR_UNUSED(fd),
 
 struct comm_point* 
 comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer,
-	comm_point_callback_type* callback, void* callback_arg, struct unbound_socket* socket)
+	int pp2_enabled, comm_point_callback_type* callback,
+	void* callback_arg, struct unbound_socket* socket)
 {
 	struct comm_point* c = (struct comm_point*)calloc(1,
 		sizeof(struct comm_point));
@@ -3450,6 +3789,8 @@ comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer,
 	c->callback = callback;
 	c->cb_arg = callback_arg;
 	c->socket = socket;
+	c->pp2_enabled = pp2_enabled;
+	c->pp2_header_state = pp2_header_none;
 	evbits = UB_EV_READ | UB_EV_PERSIST;
 	/* ub_event stuff */
 	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
@@ -3469,8 +3810,8 @@ comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer,
 }
 
 struct comm_point* 
-comm_point_create_udp_ancil(struct comm_base *base, int fd, 
-	sldns_buffer* buffer, 
+comm_point_create_udp_ancil(struct comm_base *base, int fd,
+	sldns_buffer* buffer, int pp2_enabled,
 	comm_point_callback_type* callback, void* callback_arg, struct unbound_socket* socket)
 {
 	struct comm_point* c = (struct comm_point*)calloc(1,
@@ -3511,6 +3852,8 @@ comm_point_create_udp_ancil(struct comm_base *base, int fd,
 	c->callback = callback;
 	c->cb_arg = callback_arg;
 	c->socket = socket;
+	c->pp2_enabled = pp2_enabled;
+	c->pp2_header_state = pp2_header_none;
 	evbits = UB_EV_READ | UB_EV_PERSIST;
 	/* ub_event stuff */
 	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
@@ -3590,6 +3933,8 @@ comm_point_create_tcp_handler(struct comm_base *base,
 	c->callback = callback;
 	c->cb_arg = callback_arg;
 	c->socket = socket;
+	c->pp2_enabled = parent->pp2_enabled;
+	c->pp2_header_state = pp2_header_none;
 	if(spoolbuf) {
 		c->tcp_req_info = tcp_req_info_create(spoolbuf);
 		if(!c->tcp_req_info) {
@@ -3685,6 +4030,8 @@ comm_point_create_http_handler(struct comm_base *base,
 	c->callback = callback;
 	c->cb_arg = callback_arg;
 	c->socket = socket;
+	c->pp2_enabled = 0;
+	c->pp2_header_state = pp2_header_none;
 
 	c->http_min_version = http_version_2;
 	c->http2_stream_max_qbuffer_size = bufsize;
@@ -3749,7 +4096,8 @@ comm_point_create_tcp(struct comm_base *base, int fd, int num,
 	uint32_t http_max_streams, char* http_endpoint,
 	struct tcl_list* tcp_conn_limit, size_t bufsize,
 	struct sldns_buffer* spoolbuf, enum listen_type port_type,
-	comm_point_callback_type* callback, void* callback_arg, struct unbound_socket* socket)
+	int pp2_enabled, comm_point_callback_type* callback,
+	void* callback_arg, struct unbound_socket* socket)
 {
 	struct comm_point* c = (struct comm_point*)calloc(1,
 		sizeof(struct comm_point));
@@ -3800,6 +4148,8 @@ comm_point_create_tcp(struct comm_base *base, int fd, int num,
 	c->callback = NULL;
 	c->cb_arg = NULL;
 	c->socket = socket;
+	c->pp2_enabled = (port_type==listen_type_http?0:pp2_enabled);
+	c->pp2_header_state = pp2_header_none;
 	evbits = UB_EV_READ | UB_EV_PERSIST;
 	/* ub_event stuff */
 	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
@@ -3892,6 +4242,8 @@ comm_point_create_tcp_out(struct comm_base *base, size_t bufsize,
 	c->repinfo.c = c;
 	c->callback = callback;
 	c->cb_arg = callback_arg;
+	c->pp2_enabled = 0;
+	c->pp2_header_state = pp2_header_none;
 	evbits = UB_EV_PERSIST | UB_EV_WRITE;
 	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
 		comm_point_tcp_handle_callback, c);
@@ -3958,6 +4310,8 @@ comm_point_create_http_out(struct comm_base *base, size_t bufsize,
 	c->repinfo.c = c;
 	c->callback = callback;
 	c->cb_arg = callback_arg;
+	c->pp2_enabled = 0;
+	c->pp2_header_state = pp2_header_none;
 	evbits = UB_EV_PERSIST | UB_EV_WRITE;
 	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
 		comm_point_http_handle_callback, c);
@@ -4021,6 +4375,8 @@ comm_point_create_local(struct comm_base *base, int fd, size_t bufsize,
 #endif
 	c->callback = callback;
 	c->cb_arg = callback_arg;
+	c->pp2_enabled = 0;
+	c->pp2_header_state = pp2_header_none;
 	/* ub_event stuff */
 	evbits = UB_EV_PERSIST | UB_EV_READ;
 	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
@@ -4082,6 +4438,8 @@ comm_point_create_raw(struct comm_base* base, int fd, int writing,
 #endif
 	c->callback = callback;
 	c->cb_arg = callback_arg;
+	c->pp2_enabled = 0;
+	c->pp2_header_state = pp2_header_none;
 	/* ub_event stuff */
 	if(writing)
 		evbits = UB_EV_PERSIST | UB_EV_WRITE;
@@ -4197,20 +4555,21 @@ comm_point_send_reply(struct comm_reply *repinfo)
 #endif
 	if(repinfo->c->type == comm_udp) {
 		if(repinfo->srctype)
-			comm_point_send_udp_msg_if(repinfo->c, 
-			buffer, (struct sockaddr*)&repinfo->addr, 
-			repinfo->addrlen, repinfo);
+			comm_point_send_udp_msg_if(repinfo->c, buffer,
+				(struct sockaddr*)&repinfo->remote_addr,
+				repinfo->remote_addrlen, repinfo);
 		else
 			comm_point_send_udp_msg(repinfo->c, buffer,
-			(struct sockaddr*)&repinfo->addr, repinfo->addrlen, 0);
+				(struct sockaddr*)&repinfo->remote_addr,
+				repinfo->remote_addrlen, 0);
 #ifdef USE_DNSTAP
 		/*
 		 * sending src (client)/dst (local service) addresses over DNSTAP from udp callback
 		 */
 		if(repinfo->c->dtenv != NULL && repinfo->c->dtenv->log_client_response_messages) {
 			log_addr(VERB_ALGO, "from local addr", (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->socket->addr->ai_addrlen);
-			log_addr(VERB_ALGO, "response to client", &repinfo->addr, repinfo->addrlen);
-			dt_msg_send_client_response(repinfo->c->dtenv, &repinfo->addr, (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->type, repinfo->c->buffer);
+			log_addr(VERB_ALGO, "response to client", &repinfo->client_addr, repinfo->client_addrlen);
+			dt_msg_send_client_response(repinfo->c->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->type, repinfo->c->buffer);
 		}
 #endif
 	} else {
@@ -4220,8 +4579,8 @@ comm_point_send_reply(struct comm_reply *repinfo)
 		 */
 		if(repinfo->c->tcp_parent->dtenv != NULL && repinfo->c->tcp_parent->dtenv->log_client_response_messages) {
 			log_addr(VERB_ALGO, "from local addr", (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->socket->addr->ai_addrlen);
-			log_addr(VERB_ALGO, "response to client", &repinfo->addr, repinfo->addrlen);
-			dt_msg_send_client_response(repinfo->c->tcp_parent->dtenv, &repinfo->addr, (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->type,
+			log_addr(VERB_ALGO, "response to client", &repinfo->client_addr, repinfo->client_addrlen);
+			dt_msg_send_client_response(repinfo->c->tcp_parent->dtenv, &repinfo->client_addr, (void*)repinfo->c->socket->addr->ai_addr, repinfo->c->type,
 				( repinfo->c->tcp_req_info? repinfo->c->tcp_req_info->spool_buffer: repinfo->c->buffer ));
 		}
 #endif
diff --git a/util/netevent.h b/util/netevent.h
index 4e82703e0..3e7849c13 100644
--- a/util/netevent.h
+++ b/util/netevent.h
@@ -128,10 +128,11 @@ struct comm_reply {
 	/** the comm_point with fd to send reply on to. */
 	struct comm_point* c;
 	/** the address (for UDP based communication) */
-	struct sockaddr_storage addr;
+	struct sockaddr_storage remote_addr;
 	/** length of address */
-	socklen_t addrlen;
-	/** return type 0 (none), 4(IP4), 6(IP6) */
+	socklen_t remote_addrlen;
+	/** return type 0 (none), 4(IP4), 6(IP6)
+	 *  used only with listen_type_udp_ancil* */
 	int srctype;
 	/* DnsCrypt context */
 #ifdef USE_DNSCRYPT
@@ -155,6 +156,13 @@ struct comm_reply {
 		pktinfo;
 	/** max udp size for udp packets */
 	size_t max_udp_size;
+	/* if set, the request came through a proxy */
+	int is_proxied;
+	/** the client address
+	 *  the same as remote_addr if not proxied */
+	struct sockaddr_storage client_addr;
+	/** the original address length */
+	socklen_t client_addrlen;
 };
 
 /** 
@@ -278,6 +286,19 @@ struct comm_point {
 		/** variable with type of socket, UDP,TCP-accept,TCP,pipe */
 		type;
 
+	/* -------- PROXYv2 ------- */
+	/** if set, PROXYv2 is expected on this connection */
+	int pp2_enabled;
+	/** header state for the PROXYv2 header (for TCP) */
+	enum {
+		/** no header encounter yet */
+		pp2_header_none = 0,
+		/** read the static part of the header */
+		pp2_header_init,
+		/** read the full header */
+		pp2_header_done
+	} pp2_header_state;
+
 	/* ---------- Behaviour ----------- */
 	/** if set the connection is NOT closed on delete. */
 	int do_not_close;
@@ -496,8 +517,9 @@ struct ub_event_base* comm_base_internal(struct comm_base* b);
  * Create an UDP comm point. Calls malloc.
  * setups the structure with the parameters you provide.
  * @param base: in which base to alloc the commpoint.
- * @param fd : file descriptor of open UDP socket.
+ * @param fd: file descriptor of open UDP socket.
  * @param buffer: shared buffer by UDP sockets from this thread.
+ * @param pp2_enabled: if the comm point will support PROXYv2.
  * @param callback: callback function pointer.
  * @param callback_arg: will be passed to your callback function.
  * @param socket: and opened socket properties will be passed to your callback function.
@@ -505,7 +527,7 @@ struct ub_event_base* comm_base_internal(struct comm_base* b);
  * Sets timeout to NULL. Turns off TCP options.
  */
 struct comm_point* comm_point_create_udp(struct comm_base* base,
-	int fd, struct sldns_buffer* buffer, 
+	int fd, struct sldns_buffer* buffer, int pp2_enabled,
 	comm_point_callback_type* callback, void* callback_arg, struct unbound_socket* socket);
 
 /**
@@ -513,8 +535,9 @@ struct comm_point* comm_point_create_udp(struct comm_base* base,
  * Uses recvmsg instead of recv to get udp message.
  * setups the structure with the parameters you provide.
  * @param base: in which base to alloc the commpoint.
- * @param fd : file descriptor of open UDP socket.
+ * @param fd: file descriptor of open UDP socket.
  * @param buffer: shared buffer by UDP sockets from this thread.
+ * @param pp2_enabled: if the comm point will support PROXYv2.
  * @param callback: callback function pointer.
  * @param callback_arg: will be passed to your callback function.
  * @param socket: and opened socket properties will be passed to your callback function.
@@ -522,7 +545,7 @@ struct comm_point* comm_point_create_udp(struct comm_base* base,
  * Sets timeout to NULL. Turns off TCP options.
  */
 struct comm_point* comm_point_create_udp_ancil(struct comm_base* base,
-	int fd, struct sldns_buffer* buffer, 
+	int fd, struct sldns_buffer* buffer, int pp2_enabled,
 	comm_point_callback_type* callback, void* callback_arg, struct unbound_socket* socket);
 
 /**
@@ -544,6 +567,7 @@ struct comm_point* comm_point_create_udp_ancil(struct comm_base* base,
  * 	or NULL to not create those structures in the tcp handlers.
  * @param port_type: the type of port we are creating a TCP listener for. Used
  * 	to select handler type to use.
+ * @param pp2_enabled: if the comm point will support PROXYv2.
  * @param callback: callback function pointer for TCP handlers.
  * @param callback_arg: will be passed to your callback function.
  * @param socket: and opened socket properties will be passed to your callback function.
@@ -557,7 +581,7 @@ struct comm_point* comm_point_create_tcp(struct comm_base* base,
 	uint32_t http_max_streams, char* http_endpoint,
 	struct tcl_list* tcp_conn_limit,
 	size_t bufsize, struct sldns_buffer* spoolbuf,
-	enum listen_type port_type,
+	enum listen_type port_type, int pp2_enabled,
 	comm_point_callback_type* callback, void* callback_arg, struct unbound_socket* socket);
 
 /**
diff --git a/util/proxy_protocol.c b/util/proxy_protocol.c
new file mode 100644
index 000000000..757c5141d
--- /dev/null
+++ b/util/proxy_protocol.c
@@ -0,0 +1,139 @@
+/*
+ * util/proxy_protocol.c - event notification
+ *
+ * Copyright (c) 2022, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * This file contains PROXY protocol functions.
+ */
+#include "config.h"
+#include "util/log.h"
+#include "util/proxy_protocol.h"
+
+int
+pp2_write_to_buf(struct sldns_buffer* buf, struct sockaddr_storage* src,
+	int stream)
+{
+	int af;
+	if(!src) return 0;
+	af = (int)((struct sockaddr_in*)src)->sin_family;
+	if(sldns_buffer_remaining(buf) <
+		PP2_HEADER_SIZE + (af==AF_INET?12:36)) {
+		return 0;
+	}
+	/* sig */
+	sldns_buffer_write(buf, PP2_SIG, PP2_SIG_LEN);
+	/* version and command */
+	sldns_buffer_write_u8(buf, (PP2_VERSION << 4) | PP2_CMD_PROXY);
+	if(af==AF_INET) {
+		/* family and protocol */
+		sldns_buffer_write_u8(buf,
+			(PP2_AF_INET<<4) |
+			(stream?PP2_PROT_STREAM:PP2_PROT_DGRAM));
+		/* length */
+		sldns_buffer_write_u16(buf, 12);
+		/* src addr */
+		sldns_buffer_write(buf,
+			&((struct sockaddr_in*)src)->sin_addr.s_addr, 4);
+		/* dst addr */
+		sldns_buffer_write_u32(buf, 0);
+		/* src port */
+		sldns_buffer_write(buf,
+			&((struct sockaddr_in*)src)->sin_port, 2);
+		/* dst port */
+		sldns_buffer_write_u16(buf, 0);
+	} else {
+		/* family and protocol */
+		sldns_buffer_write_u8(buf,
+			(PP2_AF_INET6<<4) |
+			(stream?PP2_PROT_STREAM:PP2_PROT_DGRAM));
+		/* length */
+		sldns_buffer_write_u16(buf, 36);
+		/* src addr */
+		sldns_buffer_write(buf,
+			&((struct sockaddr_in6*)src)->sin6_addr, 16);
+		/* dst addr */
+		sldns_buffer_set_at(buf,
+			sldns_buffer_position(buf), 0, 16);
+		sldns_buffer_skip(buf, 16);
+		/* src port */
+		sldns_buffer_write(buf,
+			&((struct sockaddr_in6*)src)->sin6_port, 2);
+		/* dst port */
+		sldns_buffer_write_u16(buf, 0);
+	}
+	return 1;
+}
+
+struct pp2_header*
+pp2_read_header(struct sldns_buffer* buf)
+{
+	size_t size;
+	struct pp2_header* header = (struct pp2_header*)sldns_buffer_begin(buf);
+	/* Try to fail all the unsupported cases first. */
+	if(sldns_buffer_remaining(buf) < PP2_HEADER_SIZE) {
+		log_err("proxy_protocol: not enough space for header");
+		return NULL;
+	}
+	/* Check for PROXYv2 header */
+	if(memcmp(header, PP2_SIG, PP2_SIG_LEN) != 0 ||
+		((header->ver_cmd & 0xF0)>>4) != PP2_VERSION) {
+		log_err("proxy_protocol: could not match PROXYv2 header");
+		return NULL;
+	}
+	/* Check the length */
+	size = PP2_HEADER_SIZE + ntohs(header->len);
+	if(sldns_buffer_remaining(buf) < size) {
+		log_err("proxy_protocol: not enough space for header");
+		return NULL;
+	}
+	/* Check for supported commands */
+	if((header->ver_cmd & 0xF) != PP2_CMD_LOCAL &&
+		(header->ver_cmd & 0xF) != PP2_CMD_PROXY) {
+		log_err("proxy_protocol: unsupported command");
+		return NULL;
+	}
+	/* Check for supported family and protocol */
+	if(header->fam_prot != 0x00 /* AF_UNSPEC|UNSPEC */ &&
+		header->fam_prot != 0x11 /* AF_INET|STREAM */ &&
+		header->fam_prot != 0x12 /* AF_INET|DGRAM */ &&
+		header->fam_prot != 0x21 /* AF_INET6|STREAM */ &&
+		header->fam_prot != 0x22 /* AF_INET6|DGRAM */) {
+		log_err("proxy_protocol: unsupported family and protocol");
+		return NULL;
+	}
+	/* We have a correct header */
+	return header;
+}
diff --git a/util/proxy_protocol.h b/util/proxy_protocol.h
new file mode 100644
index 000000000..13cab9d74
--- /dev/null
+++ b/util/proxy_protocol.h
@@ -0,0 +1,131 @@
+/*
+ * util/proxy_protocol.h - PROXY protocol
+ *
+ * Copyright (c) 2022, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * This file contains PROXY protocol structs and functions.
+ * Only v2 is supported. TLVs are not currently supported.
+ */
+#ifndef PROXY_PROTOCOL_H
+#define PROXY_PROTOCOL_H
+
+#include "sldns/sbuffer.h"
+
+/** PROXYv2 minimum header size */
+#define PP2_HEADER_SIZE 16
+
+/** PROXYv2 header signature */
+#define PP2_SIG "\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A"
+#define PP2_SIG_LEN 12
+
+/** PROXYv2 version */
+#define PP2_VERSION 0x2
+
+/**
+ * PROXYv2 command.
+ */
+enum pp2_command {
+	PP2_CMD_LOCAL = 0x0,
+	PP2_CMD_PROXY = 0x1
+};
+
+/**
+ * PROXYv2 address family.
+ */
+enum pp2_af {
+	PP2_AF_UNSPEC = 0x0,
+	PP2_AF_INET = 0x1,
+	PP2_AF_INET6 = 0x2,
+	PP2_AF_UNIX = 0x3
+};
+
+/**
+ * PROXYv2 protocol.
+ */
+enum pp2_protocol {
+	PP2_PROT_UNSPEC = 0x0,
+	PP2_PROT_STREAM = 0x1,
+	PP2_PROT_DGRAM = 0x2
+};
+
+/**
+ * PROXYv2 header.
+ */
+struct pp2_header {
+	uint8_t sig[PP2_SIG_LEN];
+	uint8_t ver_cmd;
+	uint8_t fam_prot;
+	uint16_t len;
+	union {
+		struct {  /* for TCP/UDP over IPv4, len = 12 */
+			uint32_t src_addr;
+			uint32_t dst_addr;
+			uint16_t src_port;
+			uint16_t dst_port;
+		} addr4;
+		struct {  /* for TCP/UDP over IPv6, len = 36 */
+			uint8_t  src_addr[16];
+			uint8_t  dst_addr[16];
+			uint16_t src_port;
+			uint16_t dst_port;
+		} addr6;
+		struct {  /* for AF_UNIX sockets, len = 216 */
+			uint8_t src_addr[108];
+			uint8_t dst_addr[108];
+		} addru;
+	} addr;
+};
+
+/**
+ * Write a PROXYv2 header at the current position of the buffer.
+ * @param buf: the buffer to write to.
+ * @param src: the source address.
+ * @param stream: if the protocol is stream or datagram.
+ * @return 1 on success, 0 on failure.
+ */
+int pp2_write_to_buf(struct sldns_buffer* buf, struct sockaddr_storage* src,
+	int stream);
+
+/**
+ * Read a PROXYv2 header from the current position of the buffer.
+ * It does initial validation and returns a pointer to the buffer position on
+ * success.
+ * @param buf: the buffer to read from.
+ * @return the pointer to the buffer position on success, NULL on error.
+ */
+struct pp2_header* pp2_read_header(struct sldns_buffer* buf);
+
+#endif /* PROXY_PROTOCOL_H */

From 22e43aa6319401188ba8ba702b0b4738d22e2c21 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Mon, 3 Oct 2022 15:34:22 +0200
Subject: [PATCH 06/25] Changelog entry for #760 - Merge #760: PROXYv2
 downstream support. (New proxy-protocol-port   configuration option).

---
 doc/Changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 5ddf73183..b7d171d14 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+3 October 2022: George
+	- Merge #760: PROXYv2 downstream support. (New proxy-protocol-port
+	  configuration option).
+
 3 October 2022: Wouter
 	- Fix to remove erroneous TC flag from TCP upstream.
 	- Fix test tdir skip report printout.

From c0eaadfc42d5f19cf81f996be67d429c003c5878 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Mon, 3 Oct 2022 16:21:39 +0200
Subject: [PATCH 07/25] - Fix to close errno block in
 comm_point_tcp_handle_read outside of   ifdef.

---
 doc/Changelog   | 2 ++
 util/netevent.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index b7d171d14..25357d1a6 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,8 @@
 	- Fix to remove erroneous TC flag from TCP upstream.
 	- Fix test tdir skip report printout.
 	- Fix windows compile, the identifier interface is defined in headers.
+	- Fix to close errno block in comm_point_tcp_handle_read outside of
+	  ifdef.
 
 26 September 2022: George
 	- Better output for skipped tdir tests.
diff --git a/util/netevent.c b/util/netevent.c
index 740f7c7e1..55c9a041f 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -2216,8 +2216,8 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 				c->repinfo.remote_addrlen);
 			return 0;
 		}
-	}
 #endif
+	}
 #else /* USE_WINSOCK */
 	if(recv_initial) {
 		if(WSAGetLastError() == WSAECONNREFUSED && verbosity < 2)

From bf7a2884fb8e0a020244be99eeda754a6fc5ee26 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 4 Oct 2022 09:08:11 +0200
Subject: [PATCH 08/25] - Fix static analysis report to remove dead code from
 the   rpz_callback_from_iterator_module function.

---
 doc/Changelog  |  4 ++++
 services/rpz.c | 14 ++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 25357d1a6..b007a168e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+4 October 2022: Wouter
+	- Fix static analysis report to remove dead code from the
+	  rpz_callback_from_iterator_module function.
+
 3 October 2022: George
 	- Merge #760: PROXYv2 downstream support. (New proxy-protocol-port
 	  configuration option).
diff --git a/services/rpz.c b/services/rpz.c
index e8b734a89..e876f3f94 100644
--- a/services/rpz.c
+++ b/services/rpz.c
@@ -2168,18 +2168,16 @@ rpz_callback_from_iterator_module(struct module_qstate* ms, struct iter_qstate*
 
 	lock_rw_unlock(&az->rpz_lock);
 
-	if(raddr == NULL && z == NULL) { return NULL; }
-	else if(raddr != NULL) {
+	if(raddr == NULL && z == NULL)
+		return NULL;
+
+	if(raddr != NULL) {
 		if(z) {
 			lock_rw_unlock(&z->lock);
 		}
 		return rpz_apply_nsip_trigger(ms, r, raddr, a);
-	} else if(z != NULL) {
-		if(raddr) {
-			lock_rw_unlock(&raddr->lock);
-		}
-		return rpz_apply_nsdname_trigger(ms, r, z, &match, a);
-	} else { return NULL; }
+	}
+	return rpz_apply_nsdname_trigger(ms, r, z, &match, a);
 }
 
 struct dns_msg* rpz_callback_from_iterator_cname(struct module_qstate* ms,

From f0614a57f86c1d7dadc078e0f2ec199d719da5dd Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 4 Oct 2022 16:59:10 +0200
Subject: [PATCH 09/25] - Fix to clean up after the acl_interface unit test.

---
 doc/Changelog                                  |  1 +
 testdata/acl_interface.tdir/acl_interface.dsc  |  2 +-
 testdata/acl_interface.tdir/acl_interface.post | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 testdata/acl_interface.tdir/acl_interface.post

diff --git a/doc/Changelog b/doc/Changelog
index b007a168e..24b17b506 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 4 October 2022: Wouter
 	- Fix static analysis report to remove dead code from the
 	  rpz_callback_from_iterator_module function.
+	- Fix to clean up after the acl_interface unit test.
 
 3 October 2022: George
 	- Merge #760: PROXYv2 downstream support. (New proxy-protocol-port
diff --git a/testdata/acl_interface.tdir/acl_interface.dsc b/testdata/acl_interface.tdir/acl_interface.dsc
index 3e5e94de8..cfe5c3cf5 100644
--- a/testdata/acl_interface.tdir/acl_interface.dsc
+++ b/testdata/acl_interface.tdir/acl_interface.dsc
@@ -9,7 +9,7 @@ CmdDepends:
 Depends:
 Help:
 Pre: acl_interface.pre
-Post:
+Post: acl_interface.post
 Test: acl_interface.test
 AuxFiles:
 Passed:
diff --git a/testdata/acl_interface.tdir/acl_interface.post b/testdata/acl_interface.tdir/acl_interface.post
new file mode 100644
index 000000000..982e2b895
--- /dev/null
+++ b/testdata/acl_interface.tdir/acl_interface.post
@@ -0,0 +1,11 @@
+# #-- acl_interface.post --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# source the test var file when it's there
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+#
+# do your teardown here
+. ../common.sh
+kill_pid $UNBOUND_PID
+kill_pid $FWD_PID
+kill_pid $STUB_PID

From f1d263a318af5c81afd62261b5ee0df560bb1b8d Mon Sep 17 00:00:00 2001
From: Yorgos Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 4 Oct 2022 22:21:08 +0200
Subject: [PATCH 10/25] Leniency for target discovery when under load (for
 NRDelegation changes) (#764)

* - Introduce leniency for target discovery when under load.

* - Allow for easier testing (to be reverted).

* - Happy compiler.

* - Precheck access to target_fetch_policy.

* - Do not mark a nameserver as resolved when one of A/AAAA is negative.

* - Update fetch_glue.rpl test for (possible) outstanding queries.

* - Update fetch_glue_cname.rpl test for possible outstanding queries.

* - Better fix for fetch_glue_cname.rpl.

* - Fix iter_emptydp_for_glue.rpl to match the referral.

* - Disabled the nxns tests for now (to be reverted).

* - Update iter_recurse.rpl for possible outstanding queries.

* Revert "- Disabled the nxns tests for now (to be reverted)."

This reverts commit 34a9c13a90015fba5f8a8a1c516c00d4bf5003f8.

* Revert "- Allow for easier testing (to be reverted)."

This reverts commit b6dfe35e1d02c89ada5b656fdf8956304bb73be8.
---
 iterator/iterator.c                | 55 ++++++++++++++++++++++++------
 iterator/iterator.h                |  2 +-
 testdata/fetch_glue.rpl            | 33 ++----------------
 testdata/fetch_glue_cname.rpl      | 35 ++-----------------
 testdata/iter_emptydp_for_glue.rpl |  4 +--
 testdata/iter_recurse.rpl          | 11 ++----
 6 files changed, 54 insertions(+), 86 deletions(-)

diff --git a/iterator/iterator.c b/iterator/iterator.c
index e1c556b39..2d676b1df 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -255,9 +255,9 @@ error_supers(struct module_qstate* qstate, int id, struct module_qstate* super)
 				log_err("out of memory adding missing");
 		}
 		delegpt_mark_neg(dpns, qstate->qinfo.qtype);
-		dpns->resolved = 1; /* mark as failed */
 		if((dpns->got4 == 2 || !ie->supports_ipv4) &&
 			(dpns->got6 == 2 || !ie->supports_ipv6)) {
+			dpns->resolved = 1; /* mark as failed */
 			target_count_increase_nx(super_iq, 1);
 		}
 	}
@@ -2264,6 +2264,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 	size_t qout_orig_len = 0;
 	int sq_check_ratelimit = 1;
 	int sq_was_ratelimited = 0;
+	int can_do_promisc = 0;
 
 	/* NOTE: a request will encounter this state for each target it
 	 * needs to send a query to. That is, at least one per referral,
@@ -2591,12 +2592,12 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 	if(iq->depth < ie->max_dependency_depth
 		&& iq->num_target_queries == 0
 		&& (!iq->target_count || iq->target_count[TARGET_COUNT_NX]==0)
-		&& iq->sent_count < TARGET_FETCH_STOP
-		/* if the mesh query list is full, then do not waste cpu
-		 * and sockets to fetch promiscuous targets. They can be
-		 * looked up when needed. */
-		&& !mesh_jostle_exceeded(qstate->env->mesh)
-		) {
+		&& iq->sent_count < TARGET_FETCH_STOP) {
+		can_do_promisc = 1;
+	}
+	/* if the mesh query list is full, then do not waste cpu and sockets to
+	 * fetch promiscuous targets. They can be looked up when needed. */
+	if(can_do_promisc && !mesh_jostle_exceeded(qstate->env->mesh)) {
 		tf_policy = ie->target_fetch_policy[iq->depth];
 	}
 
@@ -2768,6 +2769,37 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
 		return 0;
 	}
 
+	/* We have a target. We could have created promiscuous target
+	 * queries but we are currently under pressure (mesh_jostle_exceeded).
+	 * If we are configured to allow promiscuous target queries and haven't
+	 * gone out to the network for a target query for this delegation, then
+	 * it is possible to slip in a promiscuous one with a 1/10 chance. */
+	if(can_do_promisc && tf_policy == 0 && iq->depth == 0
+		&& iq->depth < ie->max_dependency_depth
+		&& ie->target_fetch_policy[iq->depth] != 0
+		&& iq->dp_target_count == 0
+		&& !ub_random_max(qstate->env->rnd, 10)) {
+		int extra = 0;
+		verbose(VERB_ALGO, "available target exists in cache but "
+			"attempt to get extra 1 target");
+		(void)query_for_targets(qstate, iq, ie, id, 1, &extra);
+		/* errors ignored, these targets are not strictly necessary for
+		* this result, we do not have to reply with SERVFAIL */
+		if(extra > 0) {
+			iq->num_target_queries += extra;
+			target_count_increase(iq, extra);
+			check_waiting_queries(iq, qstate, id);
+			/* undo qname minimise step because we'll get back here
+			 * to do it again */
+			if(qout_orig && iq->minimise_count > 0) {
+				iq->minimise_count--;
+				iq->qinfo_out.qname = qout_orig;
+				iq->qinfo_out.qname_len = qout_orig_len;
+			}
+			return 0;
+		}
+	}
+
 	/* Do not check ratelimit for forwarding queries or if we already got a
 	 * pass. */
 	sq_check_ratelimit = (!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok);
@@ -3531,12 +3563,13 @@ processTargetResponse(struct module_qstate* qstate, int id,
 	} else {
 		verbose(VERB_ALGO, "iterator TargetResponse failed");
 		delegpt_mark_neg(dpns, qstate->qinfo.qtype);
-		dpns->resolved = 1; /* fail the target */
 		if((dpns->got4 == 2 || !ie->supports_ipv4) &&
-			(dpns->got6 == 2 || !ie->supports_ipv6) &&
+			(dpns->got6 == 2 || !ie->supports_ipv6)) {
+			dpns->resolved = 1; /* fail the target */
 			/* do not count cached answers */
-			(qstate->reply_origin && qstate->reply_origin->len != 0)) {
-			target_count_increase_nx(foriq, 1);
+			if(qstate->reply_origin && qstate->reply_origin->len != 0) {
+				target_count_increase_nx(foriq, 1);
+			}
 		}
 	}
 }
diff --git a/iterator/iterator.h b/iterator/iterator.h
index b71b7fe99..e35718cf3 100644
--- a/iterator/iterator.h
+++ b/iterator/iterator.h
@@ -324,7 +324,7 @@ struct iter_qstate {
 	/** the number of times this query has been restarted. */
 	int query_restart_count;
 
-	/** the number of times this query as followed a referral. */
+	/** the number of times this query has followed a referral. */
 	int referral_count;
 
 	/** number of queries fired off */
diff --git a/testdata/fetch_glue.rpl b/testdata/fetch_glue.rpl
index 3e9f64f8d..8860d85b0 100644
--- a/testdata/fetch_glue.rpl
+++ b/testdata/fetch_glue.rpl
@@ -176,36 +176,7 @@ SECTION ADDITIONAL
 ns.example.com.		IN 	A	1.2.3.4
 ENTRY_END
 
-; due to ordering of answer packets, this is still outstanding, remove it
-STEP 21 CHECK_OUT_QUERY
-ENTRY_BEGIN
-ADJUST copy_id
-MATCH qname qtype
-REPLY QR
-SECTION QUESTION
-ns.example.com IN AAAA
-ENTRY_END
-
-; some more recursion needed.
-; to finish the NS query
-STEP 40 QUERY
-ENTRY_BEGIN
-REPLY RD
-SECTION QUESTION
-. IN NS
-ENTRY_END
-
-STEP 41 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION AUTHORITY
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
+; let (possible) outstanding queries finish resolving
+STEP 21 TRAFFIC
 
 SCENARIO_END
diff --git a/testdata/fetch_glue_cname.rpl b/testdata/fetch_glue_cname.rpl
index 4a86afa50..64f00fb20 100644
--- a/testdata/fetch_glue_cname.rpl
+++ b/testdata/fetch_glue_cname.rpl
@@ -155,7 +155,7 @@ ENTRY_END
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
-REPLY QR NOERROR
+REPLY QR AA NOERROR
 SECTION QUESTION
 ns.example.com. IN AAAA
 SECTION AUTHORITY
@@ -188,36 +188,7 @@ SECTION ADDITIONAL
 ns.example.com.		IN 	A	1.2.3.4
 ENTRY_END
 
-; due to ordering of answer packets, this is still outstanding, remove it
-STEP 21 CHECK_OUT_QUERY
-ENTRY_BEGIN
-ADJUST copy_id
-MATCH qname qtype
-REPLY QR
-SECTION QUESTION
-ns.example.com IN AAAA
-ENTRY_END
-
-; some more recursion needed.
-; to finish the NS query
-STEP 40 QUERY
-ENTRY_BEGIN
-REPLY RD
-SECTION QUESTION
-. IN NS
-ENTRY_END
-
-STEP 41 CHECK_ANSWER
-ENTRY_BEGIN
-MATCH all
-REPLY QR RD RA NOERROR
-SECTION QUESTION
-. IN NS
-SECTION ANSWER
-. IN NS	K.ROOT-SERVERS.NET.
-SECTION AUTHORITY
-SECTION ADDITIONAL
-K.ROOT-SERVERS.NET.	IN	A	193.0.14.129
-ENTRY_END
+; let (possible) outstanding queries finish resolving
+STEP 21 TRAFFIC
 
 SCENARIO_END
diff --git a/testdata/iter_emptydp_for_glue.rpl b/testdata/iter_emptydp_for_glue.rpl
index 2e7db65e1..68fad6f15 100644
--- a/testdata/iter_emptydp_for_glue.rpl
+++ b/testdata/iter_emptydp_for_glue.rpl
@@ -164,11 +164,11 @@ a.gtld-servers.net.	IN 	A	192.5.6.30
 ENTRY_END
 
 ENTRY_BEGIN
-MATCH opcode qname
+MATCH opcode subdomain
 ADJUST copy_id copy_query
 REPLY QR NOERROR
 SECTION QUESTION
-ns.example.org. IN A
+example.org. IN A
 SECTION AUTHORITY
 example.org. NS ns.example.net.
 example.org. NS ns.example.org.
diff --git a/testdata/iter_recurse.rpl b/testdata/iter_recurse.rpl
index 181af1107..be50b4af8 100644
--- a/testdata/iter_recurse.rpl
+++ b/testdata/iter_recurse.rpl
@@ -216,14 +216,7 @@ example.com.	IN NS	ns.example.net.
 ;ns.example.net 	IN A 	1.2.3.44
 ENTRY_END
 
-; due to ordering of answer packets, this is still outstanding, remove it
-STEP 21 CHECK_OUT_QUERY
-ENTRY_BEGIN
-ADJUST copy_id
-MATCH qname qtype
-REPLY QR
-SECTION QUESTION
-ns.example.net IN AAAA
-ENTRY_END
+; let (possible) outstanding queries finish resolving
+STEP 21 TRAFFIC
 
 SCENARIO_END

From 40b2b3a6f39941c75b87b5b5b2f4e6bdd03fa9da Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 4 Oct 2022 22:24:18 +0200
Subject: [PATCH 11/25] Changelog entry for #764 - Merge #764: Leniency for
 target discovery when under load (for   NRDelegation changes).

---
 doc/Changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 24b17b506..8c7483f88 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+4 October 2022: George
+	- Merge #764: Leniency for target discovery when under load (for
+	  NRDelegation changes).
+
 4 October 2022: Wouter
 	- Fix static analysis report to remove dead code from the
 	  rpz_callback_from_iterator_module function.

From 60db1111c02354a54f7f5673b174d110ba336962 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 5 Oct 2022 00:48:20 +0200
Subject: [PATCH 12/25] - Use DEBUG_TDIR from environment in mini_tdir.sh for
 debugging. - Fix string comparison in mini_tdir.sh.

---
 doc/Changelog         | 4 ++++
 testcode/mini_tdir.sh | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 8c7483f88..6823a60ba 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+5 October 2022: George
+	- Use DEBUG_TDIR from environment in mini_tdir.sh for debugging.
+	- Fix string comparison in mini_tdir.sh.
+
 4 October 2022: George
 	- Merge #764: Leniency for target discovery when under load (for
 	  NRDelegation changes).
diff --git a/testcode/mini_tdir.sh b/testcode/mini_tdir.sh
index 3b0719369..624ecdf7f 100755
--- a/testcode/mini_tdir.sh
+++ b/testcode/mini_tdir.sh
@@ -8,6 +8,7 @@ fi
 
 # This will keep the temporary directory around and return 1 when the test failed.
 DEBUG=0
+test -n "$DEBUG_TDIR" && DEBUG=1
 
 quiet=0
 if test "$1" = "-q"; then
@@ -213,7 +214,7 @@ if test $DEBUG -eq 0; then
 		rm -rf $dir
 	fi
 else
-	if test $success == "no"; then
+	if test $success = "no"; then
 		exit 1
 	fi
 	exit 0

From f609a45354cd3e8aa2a6a12190aed043a0fbbd05 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 5 Oct 2022 02:44:50 +0200
Subject: [PATCH 13/25] - Make ede.tdir test more predictable by using static
 data.

---
 doc/Changelog                                 |  1 +
 testdata/ede.tdir/bogus/clean.sh              |  1 -
 .../bogus/dnskey-failures.test.signed         |  7 ++++
 .../bogus/dnssec-failures.test.signed         | 25 ++++++++++++
 testdata/ede.tdir/bogus/make-broken-zone.sh   | 38 +++++++++++--------
 .../ede.tdir/bogus/nsec-failures.test.signed  |  7 ++++
 .../ede.tdir/bogus/rrsig-failures.test.signed |  4 ++
 testdata/ede.tdir/bogus/trust-anchors         |  5 +++
 testdata/ede.tdir/ede.conf                    |  1 +
 testdata/ede.tdir/ede.pre                     |  8 +---
 10 files changed, 75 insertions(+), 22 deletions(-)
 delete mode 100755 testdata/ede.tdir/bogus/clean.sh
 create mode 100644 testdata/ede.tdir/bogus/dnskey-failures.test.signed
 create mode 100644 testdata/ede.tdir/bogus/dnssec-failures.test.signed
 create mode 100644 testdata/ede.tdir/bogus/nsec-failures.test.signed
 create mode 100644 testdata/ede.tdir/bogus/rrsig-failures.test.signed
 create mode 100644 testdata/ede.tdir/bogus/trust-anchors

diff --git a/doc/Changelog b/doc/Changelog
index 6823a60ba..bd2b33ff2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 5 October 2022: George
 	- Use DEBUG_TDIR from environment in mini_tdir.sh for debugging.
 	- Fix string comparison in mini_tdir.sh.
+	- Make ede.tdir test more predictable by using static data.
 
 4 October 2022: George
 	- Merge #764: Leniency for target discovery when under load (for
diff --git a/testdata/ede.tdir/bogus/clean.sh b/testdata/ede.tdir/bogus/clean.sh
deleted file mode 100755
index 54128f807..000000000
--- a/testdata/ede.tdir/bogus/clean.sh
+++ /dev/null
@@ -1 +0,0 @@
-rm -f K* piece1 base expired notyetincepted trust-anchors dnssec-failures.test.signed dnskey-failures.test.signed nsec-failures.test.signed rrsig-failures.test.signed
diff --git a/testdata/ede.tdir/bogus/dnskey-failures.test.signed b/testdata/ede.tdir/bogus/dnskey-failures.test.signed
new file mode 100644
index 000000000..69bfde48b
--- /dev/null
+++ b/testdata/ede.tdir/bogus/dnskey-failures.test.signed
@@ -0,0 +1,7 @@
+dnskey-failures.test.	3600	IN	SOA	ns.dnskey-failures.test. hostmaster.dnskey-failures.test. 1 14400 1800 2419200 300
+dnskey-failures.test.	3600	IN	RRSIG	SOA 13 2 3600 20010201000000 20001230000000 45928 dnskey-failures.test. NKixvGKa0WHSI8oE5THI1hjm5nExVkryUmW15VoNZ3pwqUYexGWLIlfuYsTaDE5GVEtPpSKbA+PlYDk19EsLNQ==
+dnskey-failures.test.	3600	IN	A	192.0.2.1
+dnskey-failures.test.	3600	IN	RRSIG	A 13 2 3600 20010201000000 20001230000000 45928 dnskey-failures.test. FCEvbVL3TkzO7jWeOz7E/A3Q64QkpegVazS4OL+ybxN2o8OzXdCJN3QbCGdFP26/Rbj089ThDCZ0+OormAk1dw==
+dnskey-failures.test.	3600	IN	RRSIG	DNSKEY 13 2 3600 20010201000000 20001230000000 45928 dnskey-failures.test. pEjWVsJbFiQBvwNGV3v0nVirMJDOYKXqC4IX9dFuRTnoWSb95anvB08pgaZ1ie+thk6YC1fX2fUTRKRFr3vHnA==
+dnskey-failures.test.	300	IN	NSEC	dnskey-failures.test. A SOA RRSIG NSEC DNSKEY 
+dnskey-failures.test.	300	IN	RRSIG	NSEC 13 2 300 20010201000000 20001230000000 45928 dnskey-failures.test. /vAazBDetA5+np+fE7V6f9W+faEQT3ETGueNNhFPjUsPF1dU9Gglu4PZ15fWOxsk0DPWHNmTMF70ZCGQJ2k+fw==
diff --git a/testdata/ede.tdir/bogus/dnssec-failures.test.signed b/testdata/ede.tdir/bogus/dnssec-failures.test.signed
new file mode 100644
index 000000000..ed8f5d9d9
--- /dev/null
+++ b/testdata/ede.tdir/bogus/dnssec-failures.test.signed
@@ -0,0 +1,25 @@
+dnssec-failures.test.	3600	IN	SOA	ns.dnssec-failures.test. hostmaster.dnssec-failures.test. 1 14400 1800 2419200 300
+dnssec-failures.test.	3600	IN	RRSIG	SOA 13 2 3600 20010201000000 20001230000000 53876 dnssec-failures.test. K37BIR/jLR4tN1JtTx3MwzgozslvnFtwUquCSfiBykCcKIv6wErSI9Gnw/tjH0tXrLI1eoLa5oWkgtxy0KKybg==
+dnssec-failures.test.	3600	IN	NS	ns.dnssec-failures.test.
+dnssec-failures.test.	3600	IN	RRSIG	NS 13 2 3600 20010201000000 20001230000000 53876 dnssec-failures.test. JP6mYQORwnwwv+2q9UxpeeaVs5/171y3lyc1FKAY3FHmFqjd4Uo0byW8jgk/BrJyVkaDeZbjvuZq+BED0codpw==
+dnssec-failures.test.	3600	IN	DNSKEY	257 3 13 mx6xe39HZrYCpyC+9YmquHIf1WdWYaDqOfcpXg2Gtv5VJGS/WSO14txlUoKjYCldyRwcg9wT6JAwikpkzWS6UQ== ;{id = 53876 (ksk), size = 256b}
+dnssec-failures.test.	3600	IN	RRSIG	DNSKEY 13 2 3600 20010201000000 20001230000000 53876 dnssec-failures.test. F760TrogHIBkenX7nGr6LEvocTcGAZamfAaiftIkwprBp21/LZ+qotGsFu9YWsxlGqB3KAINXYATjS6AEJfGEQ==
+dnssec-failures.test.	300	IN	NSEC	expired.dnssec-failures.test. NS SOA RRSIG NSEC DNSKEY 
+dnssec-failures.test.	300	IN	RRSIG	NSEC 13 2 300 20010201000000 20001230000000 53876 dnssec-failures.test. Zk+RW0mbLSzwvSYuNQJhNdd4XmtQv47CiLtHbqOyS8/xt5Pt87T0v1UxnCkZAlA+VTEWbJkasq06ER1wMuTetA==
+expired.dnssec-failures.test.	300	IN	RRSIG	NSEC 13 3 300 20010201000000 20001230000000 53876 dnssec-failures.test. UAhzOVumQZ2PVspwJS5NyOjZypIaQXfHMiXGEUYaZ161IfQdB3coBx2vF8MHdqbePOl6Z4oa51ltITMlBL+Stw==
+missingrrsigs.dnssec-failures.test.	3600	IN	TXT	"Signatures missing"
+missingrrsigs.dnssec-failures.test.	300	IN	NSEC	notyetincepted.dnssec-failures.test. TXT RRSIG NSEC 
+missingrrsigs.dnssec-failures.test.	300	IN	RRSIG	NSEC 13 3 300 20010201000000 20001230000000 53876 dnssec-failures.test. 4phKld6eMt4cxA4w6I1i29uAbdfbwFrkpRGLBWwerUgDbOdDwUm1de6t4QhBys7DtoZb3wIS+DLJYjBNbz7Sig==
+notyetincepted.dnssec-failures.test.	300	IN	RRSIG	NSEC 13 3 300 20010201000000 20001230000000 53876 dnssec-failures.test. ix6Gg9uUZ0A56IQXbDJuBQ3vIm6QipuvzQTKd2wF6kZuEW/53wuy4ROBDIQ4IgnQD17vG8tJNeDOCfj0hh8+dQ==
+ns.dnssec-failures.test.	3600	IN	A	192.0.2.1
+ns.dnssec-failures.test.	3600	IN	RRSIG	A 13 3 3600 20010201000000 20001230000000 53876 dnssec-failures.test. PbcykgJEHG218vCkj9pD8W5JVqyCD9VRNOy3SHqCTvWGVAApasdZ7n5wzNVpHdKrqlTpyLwf6z6vv4NMYbEQdw==
+ns.dnssec-failures.test.	300	IN	NSEC	sigsinvalid.dnssec-failures.test. A RRSIG NSEC 
+ns.dnssec-failures.test.	300	IN	RRSIG	NSEC 13 3 300 20010201000000 20001230000000 53876 dnssec-failures.test. SEO+C116gcmI0sY4lnIM4DQrUxqyaGIIqlvhxyGrzF9jJopRZB8gflQcYPy5qhIwGZJoEMB+SO4er4LCaS8NwA==
+sigsinvalid.dnssec-failures.test.	3600	IN	TXT	"Signatures INVALID"
+sigsinvalid.dnssec-failures.test.	3600	IN	RRSIG	TXT 13 3 3600 20010201000000 20001230000000 53876 dnssec-failures.test. 3XFjjPt+UyY4ZIj8PAINTtOTh7sk4OIAO5akFDQhqgB/Wv6f7dWdqvl8Y2RIqdh0WQz+nGPRMktS8exA3FKW4Q==
+sigsinvalid.dnssec-failures.test.	300	IN	NSEC	dnssec-failures.test. TXT RRSIG NSEC 
+sigsinvalid.dnssec-failures.test.	300	IN	RRSIG	NSEC 13 3 300 20010201000000 20001230000000 53876 dnssec-failures.test. gmft6HYmqZalLwmdnuWBqJod3JD5fRoGqiwYXVFxySm2bHPvz8J9xSe7RdTSONXPUc+7mE8IHYff/gGW7gctqw==
+expired.dnssec-failures.test.	3600	IN	TXT	"Expired"
+expired.dnssec-failures.test.	3600	IN	RRSIG	TXT 13 3 3600 20001230000000 20001201000000 53876 dnssec-failures.test. 8zosYGmmGGcGcBuWaf3oL3TE/hpKDrddtm7ZQGndjmqkZ8CVg6RwFb+8YLqcG5du3Si0rmTuZId+qBOV/pnViA==
+notyetincepted.dnssec-failures.test.	3600	IN	TXT	"Not yet incepted"
+notyetincepted.dnssec-failures.test.	3600	IN	RRSIG	TXT 13 3 3600 20010201000000 20010103000000 53876 dnssec-failures.test. lmk0+oEdnnKa1oujIsMeimuElrKvrUSlBknsfSNqOo07VxJxT2R4qkKc95oiEmeSWHcVTOrXxEhtl4kAAactPg==
diff --git a/testdata/ede.tdir/bogus/make-broken-zone.sh b/testdata/ede.tdir/bogus/make-broken-zone.sh
index 67b4fcfb2..f93df3978 100755
--- a/testdata/ede.tdir/bogus/make-broken-zone.sh
+++ b/testdata/ede.tdir/bogus/make-broken-zone.sh
@@ -1,21 +1,28 @@
 #!/usr/bin/env bash
 
-# create oudated zones
-CSK=`ldns-keygen -a ECDSAP256SHA256 -k -r /dev/urandom dnssec-failures.test`
-echo $CSK
+# This script was used to generate the broken signed zones used for testing.
 
-echo ". IN DS 20326 8 2 e06d44b80b8f1d39a95c0b0d7c65d08458e880409bbc683457104237c7f8ec8d" | \
-	cat $CSK.ds - > bogus/trust-anchors
+# Override the current date; it is used in Unbound's configuration also.
+NOW=20010101
 
 # differentiate for MacOS with "gdate"
 DATE=date
 which gdate > /dev/null 2>&1 && DATE=gdate
 
-ONEMONTHAGO=`$DATE -d 'now - 1 month' +%Y%m%d`
-YESTERDAY=`$DATE -d 'now - 2 days' +%Y%m%d`
-TOMORROW=`$DATE -d 'now + 2 days' +%Y%m%d`
+ONEMONTHAGO=`$DATE -d "$NOW - 1 month" +%Y%m%d`
+ONEMONTH=`$DATE -d "$NOW + 1 month" +%Y%m%d`
+YESTERDAY=`$DATE -d "$NOW - 2 days" +%Y%m%d`
+TOMORROW=`$DATE -d "$NOW + 2 days" +%Y%m%d`
+
+# Root trust anchor
+echo ". IN DS 20326 8 2 e06d44b80b8f1d39a95c0b0d7c65d08458e880409bbc683457104237c7f8ec8d" > bogus/trust-anchors
+
+# create oudated zones
+CSK=`ldns-keygen -a ECDSAP256SHA256 -k -r /dev/urandom dnssec-failures.test`
+echo $CSK
+cat $CSK.ds >> bogus/trust-anchors
 
-ldns-signzone -i $YESTERDAY -f - bogus/dnssec-failures.test $CSK | \
+ldns-signzone -i $YESTERDAY -e $ONEMONTH -f - bogus/dnssec-failures.test $CSK | \
 	grep -v '^missingrrsigs\.dnssec-failures\.test\..*IN.*RRSIG.*TXT' | \
 	sed 's/Signatures invalid/Signatures INVALID/g' | \
 	grep -v '^notyetincepted\.dnssec-failures\.test\..*IN.*TXT' | \
@@ -25,7 +32,7 @@ ldns-signzone -i $YESTERDAY -f - bogus/dnssec-failures.test $CSK | \
 ldns-signzone -i $ONEMONTHAGO -e $YESTERDAY -f - bogus/dnssec-failures.test $CSK | \
 	grep -v '[	]NSEC[	]' | \
 	grep '^expired\.dnssec-failures\.test\..*IN.*TXT' > expired
-ldns-signzone -i $TOMORROW -f - bogus/dnssec-failures.test $CSK | \
+ldns-signzone -i $TOMORROW -e $ONEMONTH -f - bogus/dnssec-failures.test $CSK | \
 	grep -v '[	]NSEC[	]' | \
 	grep '^notyetincepted\.dnssec-failures\.test\..*IN.*TXT' > notyetincepted
 
@@ -33,34 +40,35 @@ cat base expired notyetincepted > bogus/dnssec-failures.test.signed
 
 # cleanup old zone keys
 rm -f $CSK.*
+
 # create zone with DNSKEY missing
 CSK=`ldns-keygen -a ECDSAP256SHA256 -k -r /dev/urandom dnskey-failures.test`
 echo $CSK
 cat $CSK.ds >> bogus/trust-anchors
 
-ldns-signzone -f tmp.signed bogus/dnskey-failures.test $CSK
+ldns-signzone -i $YESTERDAY -e $ONEMONTH -f tmp.signed bogus/dnskey-failures.test $CSK
 grep -v '	DNSKEY	' tmp.signed > bogus/dnskey-failures.test.signed
 
-
 # cleanup old zone keys
 rm -f $CSK.*
+
 # create zone with NSEC missing
 CSK=`ldns-keygen -a ECDSAP256SHA256 -k -r /dev/urandom nsec-failures.test`
 echo $CSK
 cat $CSK.ds >> bogus/trust-anchors
 
-ldns-signzone -f tmp.signed bogus/nsec-failures.test $CSK
+ldns-signzone -i $YESTERDAY -e $ONEMONTH -f tmp.signed bogus/nsec-failures.test $CSK
 grep -v '	NSEC	' tmp.signed > bogus/nsec-failures.test.signed
 
-
 # cleanup old zone keys
 rm -f $CSK.*
+
 # create zone with RRSIGs missing
 CSK=`ldns-keygen -a ECDSAP256SHA256 -k -r /dev/urandom rrsig-failures.test`
 echo $CSK
 cat $CSK.ds >> bogus/trust-anchors
 
-ldns-signzone -f tmp.signed bogus/rrsig-failures.test $CSK
+ldns-signzone -i $YESTERDAY -e $ONEMONTH -f tmp.signed bogus/rrsig-failures.test $CSK
 grep -v '	RRSIG	' tmp.signed > bogus/rrsig-failures.test.signed
 
 # cleanup
diff --git a/testdata/ede.tdir/bogus/nsec-failures.test.signed b/testdata/ede.tdir/bogus/nsec-failures.test.signed
new file mode 100644
index 000000000..b63138613
--- /dev/null
+++ b/testdata/ede.tdir/bogus/nsec-failures.test.signed
@@ -0,0 +1,7 @@
+nsec-failures.test.	3600	IN	SOA	ns.nsec-failures.test. hostmaster.nsec-failures.test. 1 14400 1800 2419200 300
+nsec-failures.test.	3600	IN	RRSIG	SOA 13 2 3600 20010201000000 20001230000000 12342 nsec-failures.test. ZdnRF2uI0IDJsHTXsd4TclX9gUEkxjp19LykHuI3DaCKe3bY8uTETta8i73hlKWJWeRjmgQojIsi9tBlivOwjQ==
+nsec-failures.test.	3600	IN	A	192.0.2.1
+nsec-failures.test.	3600	IN	RRSIG	A 13 2 3600 20010201000000 20001230000000 12342 nsec-failures.test. /JccCtWkuQgSF81gv6DPsxaicmlJoGAhVpCpR4JGgVz3tZMhIp+iXUGeI+CkBofw9G/MK66Hk937JRmMh9UTvQ==
+nsec-failures.test.	3600	IN	DNSKEY	257 3 13 41tJnzHY0o3WKid0ZsIo6S5SJdC1JiW0H/KizsAD2phHdi1AIDiBclL+nG2lKvPjMoX2hcMfd8h9DfU99HR3kg== ;{id = 12342 (ksk), size = 256b}
+nsec-failures.test.	3600	IN	RRSIG	DNSKEY 13 2 3600 20010201000000 20001230000000 12342 nsec-failures.test. Y23xTzxdqQBjFsWLlqCRgPKT7raPcP0lAy2tR8trW5+vUAhBePXdVixp4AjoxEqXsLLalAtnJnc4QgH7+HO6PA==
+nsec-failures.test.	300	IN	RRSIG	NSEC 13 2 300 20010201000000 20001230000000 12342 nsec-failures.test. KfpncqGIzIPNB2ExkH22/z0jAPmq8jTTjDkLte29iKqR9t3bSZlcS0MQ2QB7Z6tgks8fo7Zpc9+BvaDq7Y6ONg==
diff --git a/testdata/ede.tdir/bogus/rrsig-failures.test.signed b/testdata/ede.tdir/bogus/rrsig-failures.test.signed
new file mode 100644
index 000000000..222bdc0c6
--- /dev/null
+++ b/testdata/ede.tdir/bogus/rrsig-failures.test.signed
@@ -0,0 +1,4 @@
+rrsig-failures.test.	3600	IN	SOA	ns.rrsig-failures.test. hostmaster.rrsig-failures.test. 1 14400 1800 2419200 300
+rrsig-failures.test.	3600	IN	A	192.0.2.1
+rrsig-failures.test.	3600	IN	DNSKEY	257 3 13 rIMJ4/qnOb91GuxKzAYiCdPNdEtUhyt+mi1Jz+NPP0rJQdGOhXr37LpctEiKK4isabCXcwYlVtFdDPopa4RufA== ;{id = 13838 (ksk), size = 256b}
+rrsig-failures.test.	300	IN	NSEC	rrsig-failures.test. A SOA RRSIG NSEC DNSKEY 
diff --git a/testdata/ede.tdir/bogus/trust-anchors b/testdata/ede.tdir/bogus/trust-anchors
new file mode 100644
index 000000000..bd20c8702
--- /dev/null
+++ b/testdata/ede.tdir/bogus/trust-anchors
@@ -0,0 +1,5 @@
+. IN DS 20326 8 2 e06d44b80b8f1d39a95c0b0d7c65d08458e880409bbc683457104237c7f8ec8d
+dnssec-failures.test.	IN	DS	53876 13 2 e0207223d847e0d8f3bd2afcf887f727178777a94563b94e1d0be8ca2f070d9a
+dnskey-failures.test.	IN	DS	45928 13 2 9295d5c0d9296599809ce968f994a974d4da7752266ee124ead4ce980c006c20
+nsec-failures.test.	IN	DS	12342 13 2 b0a994fe4ff12a706b2a47a794601b254a8d28e040832ad6e39e96dbf7736ca2
+rrsig-failures.test.	IN	DS	13838 13 2 b083d59d2e7ac370e1103bc5ada2a921e4e65745ea8550350b6fcb57eba9f917
diff --git a/testdata/ede.tdir/ede.conf b/testdata/ede.tdir/ede.conf
index 13730d42f..639899d13 100644
--- a/testdata/ede.tdir/ede.conf
+++ b/testdata/ede.tdir/ede.conf
@@ -11,6 +11,7 @@ server:
 	val-log-level: 2
 
 	trust-anchor-file: "bogus/trust-anchors"
+	val-override-date: "20010101020202"
 
 	module-config: "respip validator iterator"
 
diff --git a/testdata/ede.tdir/ede.pre b/testdata/ede.tdir/ede.pre
index e5a0667b0..57e15cc5a 100644
--- a/testdata/ede.tdir/ede.pre
+++ b/testdata/ede.tdir/ede.pre
@@ -4,7 +4,9 @@
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
+PRE="../.."
 . ../common.sh
+
 get_random_port 2
 UNBOUND_PORT=$RND_PORT
 UNBOUND_PORT2=$(($RND_PORT + 1))
@@ -16,11 +18,7 @@ sed -e 's/@PORT\@/'$UNBOUND_PORT'/' < ede.conf > temp.conf
 sed -e 's/@PORT2\@/'$UNBOUND_PORT2'/' < temp.conf > ub.conf
 sed -e 's/@PORT2\@/'$UNBOUND_PORT2'/' < ede-auth.conf > ub2.conf
 
-# create broken dnssec zone
-bogus/make-broken-zone.sh
-
 # start unbound in the background
-PRE="../.."
 $PRE/unbound -d -c ub.conf > unbound.log 2>&1 &
 UNBOUND_PID=$!
 echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test
@@ -30,8 +28,6 @@ $PRE/unbound -d -c ub2.conf > unbound2.log 2>&1 &
 UNBOUND_PID2=$!
 echo "UNBOUND_PID2=$UNBOUND_PID2" >> .tpkg.var.test
 
-
 cat .tpkg.var.test
 wait_unbound_up unbound.log
 wait_unbound_up unbound2.log
-

From 6b8181acb7171320dd6e8ed59497f35c04e3ee56 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Wed, 5 Oct 2022 14:09:12 +0200
Subject: [PATCH 14/25] - Fix dnscrypt compile for proxy protocol code changes.

---
 daemon/worker.c | 8 ++++----
 doc/Changelog   | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/daemon/worker.c b/daemon/worker.c
index 6b188047f..caefad621 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1301,16 +1301,16 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
 		if(worker_check_request(c->buffer, worker) != 0) {
 			verbose(VERB_ALGO,
 				"dnscrypt: worker check request: bad query.");
-			log_addr(VERB_CLIENT,"from",&repinfo->addr,
-				repinfo->addrlen);
+			log_addr(VERB_CLIENT,"from",&repinfo->client_addr,
+				repinfo->client_addrlen);
 			comm_point_drop_reply(repinfo);
 			return 0;
 		}
 		if(!query_info_parse(&qinfo, c->buffer)) {
 			verbose(VERB_ALGO,
 				"dnscrypt: worker parse request: formerror.");
-			log_addr(VERB_CLIENT, "from", &repinfo->addr,
-				repinfo->addrlen);
+			log_addr(VERB_CLIENT, "from", &repinfo->client_addr,
+				repinfo->client_addrlen);
 			comm_point_drop_reply(repinfo);
 			return 0;
 		}
diff --git a/doc/Changelog b/doc/Changelog
index bd2b33ff2..08eba8740 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+5 October 2022: Wouter
+	- Fix dnscrypt compile for proxy protocol code changes.
+
 5 October 2022: George
 	- Use DEBUG_TDIR from environment in mini_tdir.sh for debugging.
 	- Fix string comparison in mini_tdir.sh.

From d122617dd431191d1d2fe171b009d9eecc32bf96 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Wed, 5 Oct 2022 22:02:30 +0200
Subject: [PATCH 15/25] - Fix checkconf test for dnscrypt and proxy port.

---
 doc/Changelog                                     | 1 +
 testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index 08eba8740..20d3c05c9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -5,6 +5,7 @@
 	- Use DEBUG_TDIR from environment in mini_tdir.sh for debugging.
 	- Fix string comparison in mini_tdir.sh.
 	- Make ede.tdir test more predictable by using static data.
+	- Fix checkconf test for dnscrypt and proxy port.
 
 4 October 2022: George
 	- Merge #764: Leniency for target discovery when under load (for
diff --git a/testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt b/testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt
index ece7544ba..f62f7868c 100644
--- a/testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt
+++ b/testdata/04-checkconf.tdir/bad.proxy-and-dnscrypt
@@ -2,4 +2,5 @@ server:
 	interface: 127.0.0.1
         proxy-protocol-port: 53
 dnscrypt:
-        dnscrypt-port: 53
+	dnscrypt-enable: yes
+	dnscrypt-port: 53

From b043bc5eb4150e755027d17d62596dbee17fd346 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 6 Oct 2022 10:01:09 +0200
Subject: [PATCH 16/25] - Fix to stop responses with TC flag from resulting in
 partial   responses. It retries to fetch the data elsewhere, or fails the  
 query and in depth fix removes the TC flag from the cached item.

---
 doc/Changelog                                |  5 +++
 iterator/iter_resptype.c                     |  6 +++-
 iterator/iterator.c                          |  4 +--
 testdata/iter_auth_tc.rpl                    | 35 ++++++++++++++------
 testdata/stub_auth_tc.tdir/stub_auth_tc.test |  2 +-
 5 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 20d3c05c9..61a10f9a5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+6 October 2022: Wouter
+	- Fix to stop responses with TC flag from resulting in partial
+	  responses. It retries to fetch the data elsewhere, or fails the
+	  query and in depth fix removes the TC flag from the cached item.
+
 5 October 2022: Wouter
 	- Fix dnscrypt compile for proxy protocol code changes.
 
diff --git a/iterator/iter_resptype.c b/iterator/iter_resptype.c
index f146a2b6b..c2b824a0f 100644
--- a/iterator/iter_resptype.c
+++ b/iterator/iter_resptype.c
@@ -113,7 +113,11 @@ 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 */
diff --git a/iterator/iterator.c b/iterator/iterator.c
index 2d676b1df..2f3ad06fe 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2907,6 +2907,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 		(int)((iq->chase_flags&BIT_RD) || iq->chase_to_rd),
 		iq->response, &iq->qinfo_out, iq->dp);
 	iq->chase_to_rd = 0;
+	/* remove TC flag, if this is erroneously set by TCP upstream */
+	iq->response->rep->flags &= ~BIT_TC;
 	if(type == RESPONSE_TYPE_REFERRAL && (iq->chase_flags&BIT_RD) &&
 		!iq->auth_zone_response) {
 		/* When forwarding (RD bit is set), we handle referrals 
@@ -4027,8 +4029,6 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
 
 	/* remove CD-bit, we asked for in case we handle validation ourself */
 	prs->flags &= ~BIT_CD;
-	/* remove TC flag, if this is erroneously set by TCP upstream */
-	prs->flags &= ~BIT_TC;
 
 	/* normalize and sanitize: easy to delete items from linked lists */
 	if(!scrub_message(pkt, prs, &iq->qinfo_out, iq->dp->name, 
diff --git a/testdata/iter_auth_tc.rpl b/testdata/iter_auth_tc.rpl
index 2136ca8b0..417807724 100644
--- a/testdata/iter_auth_tc.rpl
+++ b/testdata/iter_auth_tc.rpl
@@ -55,11 +55,11 @@ a.gtld-servers.net.	IN 	A	192.5.6.30
 ENTRY_END
 
 ENTRY_BEGIN
-MATCH opcode qtype qname
-ADJUST copy_id
+MATCH opcode subdomain
+ADJUST copy_id copy_query
 REPLY QR NOERROR
 SECTION QUESTION
-www.example.com. IN A
+example.com. IN NS
 SECTION AUTHORITY
 example.com.	IN NS	ns.example.com.
 SECTION ADDITIONAL
@@ -82,6 +82,27 @@ SECTION ADDITIONAL
 ns.example.com.		IN 	A	1.2.3.4
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA NOERROR
+SECTION QUESTION
+ns.example.com. IN A
+SECTION ANSWER
+ns.example.com.		IN 	A	1.2.3.4
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA NOERROR
+SECTION QUESTION
+ns.example.com. IN AAAA
+SECTION ANSWER
+SECTION AUTHORITY
+example.com.	IN NS	ns.example.com.
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
@@ -109,15 +130,9 @@ ENTRY_END
 STEP 10 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RD RA NOERROR
+REPLY QR RD RA SERVFAIL
 SECTION QUESTION
 www.example.com. IN A
-SECTION ANSWER
-www.example.com. IN A	10.20.30.40
-SECTION AUTHORITY
-example.com.	IN NS	ns.example.com.
-SECTION ADDITIONAL
-ns.example.com.		IN 	A	1.2.3.4
 ENTRY_END
 
 SCENARIO_END
diff --git a/testdata/stub_auth_tc.tdir/stub_auth_tc.test b/testdata/stub_auth_tc.tdir/stub_auth_tc.test
index 2d3df5365..7b7440274 100644
--- a/testdata/stub_auth_tc.tdir/stub_auth_tc.test
+++ b/testdata/stub_auth_tc.tdir/stub_auth_tc.test
@@ -12,7 +12,7 @@ echo "> cat logfiles"
 cat fwd.log
 cat unbound.log
 echo "> check answer"
-if grep "10.20.30.42" outfile; then
+if grep "SERVFAIL" outfile; then
 	echo "OK"
 else
 	echo "Not OK"

From bf1cce6f9b0fa3f7c9667fc4bb6586698bd1d518 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 6 Oct 2022 15:53:21 +0200
Subject: [PATCH 17/25] - Fix proxy length debug output printout typecasts.

---
 doc/Changelog   | 1 +
 util/netevent.c | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 61a10f9a5..b73b8bdd1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix to stop responses with TC flag from resulting in partial
 	  responses. It retries to fetch the data elsewhere, or fails the
 	  query and in depth fix removes the TC flag from the cached item.
+	- Fix proxy length debug output printout typecasts.
 
 5 October 2022: Wouter
 	- Fix dnscrypt compile for proxy protocol code changes.
diff --git a/util/netevent.c b/util/netevent.c
index 55c9a041f..9e5436b93 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1634,7 +1634,7 @@ ssl_handle_read(struct comm_point* c)
 			}
 			verbose(VERB_ALGO, "proxy_protocol: reading fixed "
 				"part of PROXYv2 header (len %lu)",
-				want_read_size);
+				(unsigned long)want_read_size);
 			current_read_size = want_read_size;
 			if(c->tcp_byte_count < current_read_size) {
 				ERR_clear_error();
@@ -1692,7 +1692,7 @@ ssl_handle_read(struct comm_point* c)
 			}
 			verbose(VERB_ALGO, "proxy_protocol: reading variable "
 				"part of PROXYv2 header (len %lu)",
-				want_read_size);
+				(unsigned long)want_read_size);
 			current_read_size = PP2_HEADER_SIZE + want_read_size;
 			if(c->tcp_byte_count < current_read_size) {
 				ERR_clear_error();
@@ -2045,7 +2045,7 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 			}
 			verbose(VERB_ALGO, "proxy_protocol: reading fixed "
 				"part of PROXYv2 header (len %lu)",
-				want_read_size);
+				(unsigned long)want_read_size);
 			current_read_size = want_read_size;
 			if(c->tcp_byte_count < current_read_size) {
 				r = recv(fd, (void*)sldns_buffer_at(c->buffer,
@@ -2081,7 +2081,7 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 			}
 			verbose(VERB_ALGO, "proxy_protocol: reading variable "
 				"part of PROXYv2 header (len %lu)",
-				want_read_size);
+				(unsigned long)want_read_size);
 			current_read_size = PP2_HEADER_SIZE + want_read_size;
 			if(c->tcp_byte_count < current_read_size) {
 				r = recv(fd, (void*)sldns_buffer_at(c->buffer,

From 2569b12b9c8b703944d82a62781a7f42626ac8f8 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Fri, 7 Oct 2022 11:25:36 +0200
Subject: [PATCH 18/25] - Fix to stop possible loops in the tcp reuse code
 (write_wait list   and tcp_wait list). Based on analysis and patch from Prad
 Seniappan   and Karthik Umashankar.

---
 doc/Changelog              |   5 +
 services/outside_network.c | 131 ++++++++++---------
 services/outside_network.h |  24 ++++
 testcode/unittcpreuse.c    | 253 +++++++++++++++++++++++++++++++++++++
 4 files changed, 354 insertions(+), 59 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index b73b8bdd1..c956c58bc 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+7 October 2022: George
+	- Fix to stop possible loops in the tcp reuse code (write_wait list
+	  and tcp_wait list). Based on analysis and patch from Prad Seniappan
+	  and Karthik Umashankar.
+
 6 October 2022: Wouter
 	- Fix to stop responses with TC flag from resulting in partial
 	  responses. It retries to fetch the data elsewhere, or fails the
diff --git a/services/outside_network.c b/services/outside_network.c
index 165a50755..a4529ade5 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -86,10 +86,6 @@ static void serviced_tcp_initiate(struct serviced_query* sq, sldns_buffer* buff)
 static int randomize_and_send_udp(struct pending* pend, sldns_buffer* packet,
 	int timeout);
 
-/** remove waiting tcp from the outnet waiting list */
-static void waiting_list_remove(struct outside_network* outnet,
-	struct waiting_tcp* w);
-
 /** select a DNS ID for a TCP stream */
 static uint16_t tcp_select_id(struct outside_network* outnet,
 	struct reuse_tcp* reuse);
@@ -372,7 +368,8 @@ log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse)
 }
 
 /** pop the first element from the writewait list */
-static struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse)
+struct waiting_tcp*
+reuse_write_wait_pop(struct reuse_tcp* reuse)
 {
 	struct waiting_tcp* w = reuse->write_wait_first;
 	if(!w)
@@ -390,8 +387,8 @@ static struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse)
 }
 
 /** remove the element from the writewait list */
-static void reuse_write_wait_remove(struct reuse_tcp* reuse,
-	struct waiting_tcp* w)
+void
+reuse_write_wait_remove(struct reuse_tcp* reuse, struct waiting_tcp* w)
 {
 	log_assert(w);
 	log_assert(w->write_wait_queued);
@@ -415,8 +412,8 @@ static void reuse_write_wait_remove(struct reuse_tcp* reuse,
 }
 
 /** push the element after the last on the writewait list */
-static void reuse_write_wait_push_back(struct reuse_tcp* reuse,
-	struct waiting_tcp* w)
+void
+reuse_write_wait_push_back(struct reuse_tcp* reuse, struct waiting_tcp* w)
 {
 	if(!w) return;
 	log_assert(!w->write_wait_queued);
@@ -427,7 +424,9 @@ static void reuse_write_wait_push_back(struct reuse_tcp* reuse,
 		w->write_wait_prev = reuse->write_wait_last;
 	} else {
 		reuse->write_wait_first = w;
+		w->write_wait_prev = NULL;
 	}
+	w->write_wait_next = NULL;
 	reuse->write_wait_last = w;
 	w->write_wait_queued = 1;
 }
@@ -810,20 +809,50 @@ reuse_tcp_lru_snip(struct outside_network* outnet)
 	return reuse;
 }
 
-/** call callback on waiting_tcp, if not NULL */
-static void
-waiting_tcp_callback(struct waiting_tcp* w, struct comm_point* c, int error,
-	struct comm_reply* reply_info)
+/** remove waiting tcp from the outnet waiting list */
+void
+outnet_waiting_tcp_list_remove(struct outside_network* outnet, struct waiting_tcp* w)
 {
-	if(w && w->cb) {
-		fptr_ok(fptr_whitelist_pending_tcp(w->cb));
-		(void)(*w->cb)(c, w->cb_arg, error, reply_info);
+	struct waiting_tcp* p = outnet->tcp_wait_first, *prev = NULL;
+	w->on_tcp_waiting_list = 0;
+	while(p) {
+		if(p == w) {
+			/* remove w */
+			if(prev)
+				prev->next_waiting = w->next_waiting;
+			else	outnet->tcp_wait_first = w->next_waiting;
+			if(outnet->tcp_wait_last == w)
+				outnet->tcp_wait_last = prev;
+			w->next_waiting = NULL;
+			return;
+		}
+		prev = p;
+		p = p->next_waiting;
 	}
+	/* outnet_waiting_tcp_list_remove is currently called only with items
+	 * that are already in the waiting list. */
+	log_assert(0);
+}
+
+/** pop the first waiting tcp from the outnet waiting list */
+struct waiting_tcp*
+outnet_waiting_tcp_list_pop(struct outside_network* outnet)
+{
+	struct waiting_tcp* w = outnet->tcp_wait_first;
+	if(!outnet->tcp_wait_first) return NULL;
+	log_assert(w->on_tcp_waiting_list);
+	outnet->tcp_wait_first = w->next_waiting;
+	if(outnet->tcp_wait_last == w)
+		outnet->tcp_wait_last = NULL;
+	w->on_tcp_waiting_list = 0;
+	w->next_waiting = NULL;
+	return w;
 }
 
 /** add waiting_tcp element to the outnet tcp waiting list */
-static void
-outnet_add_tcp_waiting(struct outside_network* outnet, struct waiting_tcp* w)
+void
+outnet_waiting_tcp_list_add(struct outside_network* outnet,
+	struct waiting_tcp* w, int set_timer)
 {
 	struct timeval tv;
 	log_assert(!w->on_tcp_waiting_list);
@@ -835,16 +864,18 @@ outnet_add_tcp_waiting(struct outside_network* outnet, struct waiting_tcp* w)
 	else	outnet->tcp_wait_first = w;
 	outnet->tcp_wait_last = w;
 	w->on_tcp_waiting_list = 1;
+	if(set_timer) {
 #ifndef S_SPLINT_S
-	tv.tv_sec = w->timeout/1000;
-	tv.tv_usec = (w->timeout%1000)*1000;
+		tv.tv_sec = w->timeout/1000;
+		tv.tv_usec = (w->timeout%1000)*1000;
 #endif
-	comm_timer_set(w->timer, &tv);
+		comm_timer_set(w->timer, &tv);
+	}
 }
 
 /** add waiting_tcp element as first to the outnet tcp waiting list */
-static void
-outnet_add_tcp_waiting_first(struct outside_network* outnet,
+void
+outnet_waiting_tcp_list_add_first(struct outside_network* outnet,
 	struct waiting_tcp* w, int reset_timer)
 {
 	struct timeval tv;
@@ -869,6 +900,17 @@ outnet_add_tcp_waiting_first(struct outside_network* outnet,
 		(outnet->tcp_reuse_first && outnet->tcp_reuse_last));
 }
 
+/** call callback on waiting_tcp, if not NULL */
+static void
+waiting_tcp_callback(struct waiting_tcp* w, struct comm_point* c, int error,
+	struct comm_reply* reply_info)
+{
+	if(w && w->cb) {
+		fptr_ok(fptr_whitelist_pending_tcp(w->cb));
+		(void)(*w->cb)(c, w->cb_arg, error, reply_info);
+	}
+}
+
 /** see if buffers can be used to service TCP queries */
 static void
 use_free_buffer(struct outside_network* outnet)
@@ -879,15 +921,10 @@ use_free_buffer(struct outside_network* outnet)
 		struct pending_tcp* pend_tcp = NULL;
 #endif
 		struct reuse_tcp* reuse = NULL;
-		w = outnet->tcp_wait_first;
-		log_assert(w->on_tcp_waiting_list);
-		outnet->tcp_wait_first = w->next_waiting;
-		if(outnet->tcp_wait_last == w)
-			outnet->tcp_wait_last = NULL;
+		w = outnet_waiting_tcp_list_pop(outnet);
 		log_assert(
 			(!outnet->tcp_reuse_first && !outnet->tcp_reuse_last) ||
 			(outnet->tcp_reuse_first && outnet->tcp_reuse_last));
-		w->on_tcp_waiting_list = 0;
 		reuse = reuse_tcp_find(outnet, &w->addr, w->addrlen,
 			w->ssl_upstream);
 		/* re-select an ID when moving to a new TCP buffer */
@@ -934,7 +971,7 @@ use_free_buffer(struct outside_network* outnet)
 #endif
 		} else {
 			/* no reuse and no free buffer, put back at the start */
-			outnet_add_tcp_waiting_first(outnet, w, 0);
+			outnet_waiting_tcp_list_add_first(outnet, w, 0);
 			break;
 		}
 #ifdef USE_DNSTAP
@@ -1008,7 +1045,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 		 * fail the query */
 		w->error_count ++;
 		reuse_tree_by_id_delete(&pend->reuse, w);
-		outnet_add_tcp_waiting(outnet, w);
+		outnet_waiting_tcp_list_add(outnet, w, 1);
 	}
 	while((w = reuse_write_wait_pop(&pend->reuse)) != NULL) {
 		if(verbosity >= VERB_CLIENT && w->pkt_len > 12+2+2 &&
@@ -1019,7 +1056,7 @@ reuse_move_writewait_away(struct outside_network* outnet,
 			verbose(VERB_CLIENT, "reuse_move_writewait_away item %s", buf);
 		}
 		reuse_tree_by_id_delete(&pend->reuse, w);
-		outnet_add_tcp_waiting(outnet, w);
+		outnet_waiting_tcp_list_add(outnet, w, 1);
 	}
 }
 
@@ -2237,7 +2274,7 @@ outnet_tcptimer(void* arg)
 	verbose(VERB_CLIENT, "outnet_tcptimer");
 	if(w->on_tcp_waiting_list) {
 		/* it is on the waiting list */
-		waiting_list_remove(outnet, w);
+		outnet_waiting_tcp_list_remove(outnet, w);
 		waiting_tcp_callback(w, NULL, NETEVENT_TIMEOUT, NULL);
 		waiting_tcp_delete(w);
 	} else {
@@ -2464,7 +2501,7 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet,
 #ifdef USE_DNSTAP
 		w->sq = sq;
 #endif
-		outnet_add_tcp_waiting(sq->outnet, w);
+		outnet_waiting_tcp_list_add(sq->outnet, w, 1);
 	}
 	return w;
 }
@@ -2612,30 +2649,6 @@ serviced_create(struct outside_network* outnet, sldns_buffer* buff, int dnssec,
 	return sq;
 }
 
-/** remove waiting tcp from the outnet waiting list */
-static void
-waiting_list_remove(struct outside_network* outnet, struct waiting_tcp* w)
-{
-	struct waiting_tcp* p = outnet->tcp_wait_first, *prev = NULL;
-	w->on_tcp_waiting_list = 0;
-	while(p) {
-		if(p == w) {
-			/* remove w */
-			if(prev)
-				prev->next_waiting = w->next_waiting;
-			else	outnet->tcp_wait_first = w->next_waiting;
-			if(outnet->tcp_wait_last == w)
-				outnet->tcp_wait_last = prev;
-			return;
-		}
-		prev = p;
-		p = p->next_waiting;
-	}
-	/* waiting_list_remove is currently called only with items that are
-	 * already in the waiting list. */
-	log_assert(0);
-}
-
 /** reuse tcp stream, remove serviced query from stream,
  * return true if the stream is kept, false if it is to be closed */
 static int
@@ -2730,7 +2743,7 @@ serviced_delete(struct serviced_query* sq)
 				sq->pending = NULL;
 			} else {
 				verbose(VERB_CLIENT, "serviced_delete: tcpwait");
-				waiting_list_remove(sq->outnet, w);
+				outnet_waiting_tcp_list_remove(sq->outnet, w);
 				if(!w->in_cb_and_decommission)
 					waiting_tcp_delete(w);
 			}
diff --git a/services/outside_network.h b/services/outside_network.h
index c383b8f09..467c81f60 100644
--- a/services/outside_network.h
+++ b/services/outside_network.h
@@ -718,6 +718,30 @@ struct reuse_tcp* reuse_tcp_lru_snip(struct outside_network* outnet);
 /** delete readwait waiting_tcp elements, deletes the elements in the list */
 void reuse_del_readwait(rbtree_type* tree_by_id);
 
+/** remove waiting tcp from the outnet waiting list */
+void outnet_waiting_tcp_list_remove(struct outside_network* outnet,
+	struct waiting_tcp* w);
+
+/** pop the first waiting tcp from the outnet waiting list */
+struct waiting_tcp* outnet_waiting_tcp_list_pop(struct outside_network* outnet);
+
+/** add waiting_tcp element to the outnet tcp waiting list */
+void outnet_waiting_tcp_list_add(struct outside_network* outnet,
+	struct waiting_tcp* w, int set_timer);
+
+/** add waiting_tcp element as first to the outnet tcp waiting list */
+void outnet_waiting_tcp_list_add_first(struct outside_network* outnet,
+	struct waiting_tcp* w, int reset_timer);
+
+/** pop the first element from the writewait list */
+struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse);
+
+/** remove the element from the writewait list */
+void reuse_write_wait_remove(struct reuse_tcp* reuse, struct waiting_tcp* w);
+
+/** push the element after the last on the writewait list */
+void reuse_write_wait_push_back(struct reuse_tcp* reuse, struct waiting_tcp* w);
+
 /** get TCP file descriptor for address, returns -1 on failure,
  * tcp_mss is 0 or maxseg size to set for TCP packets. */
 int outnet_get_tcp_fd(struct sockaddr_storage* addr, socklen_t addrlen,
diff --git a/testcode/unittcpreuse.c b/testcode/unittcpreuse.c
index 087c6c1b9..b32262dac 100644
--- a/testcode/unittcpreuse.c
+++ b/testcode/unittcpreuse.c
@@ -44,6 +44,8 @@
 #include "util/random.h"
 #include "services/outside_network.h"
 
+#define MAX_TCP_WAITING_NODES 5
+
 /** add number of new IDs to the reuse tree, randomly chosen */
 static void tcpid_addmore(struct reuse_tcp* reuse,
 	struct outside_network* outnet, unsigned int addnum)
@@ -228,9 +230,260 @@ static void tcp_reuse_tree_list_test(void)
 	free(outnet.tcp_conns);
 }
 
+static void check_waiting_tcp_list(struct outside_network* outnet,
+	struct waiting_tcp* first, struct waiting_tcp* last, size_t total)
+{
+	size_t i, j;
+	struct waiting_tcp* w = outnet->tcp_wait_first;
+	struct waiting_tcp* n = NULL;
+	if(first) unit_assert(outnet->tcp_wait_first == first);
+	if(last) unit_assert(outnet->tcp_wait_last == last && !last->next_waiting);
+	for(i=0; w; i++) {
+		unit_assert(i<total); /* otherwise we are looping */
+		unit_assert(w->on_tcp_waiting_list);
+		n = w->next_waiting;
+		for(j=0; n; j++) {
+			unit_assert(j<total-i-1); /* otherwise we are looping */
+			unit_assert(n != w);
+			n = n->next_waiting;
+		}
+		w = w->next_waiting;
+	}
+}
+
+/** clear the tcp waiting list */
+static void waiting_tcp_list_clear(struct outside_network* outnet)
+{
+	struct waiting_tcp* w = outnet->tcp_wait_first, *n = NULL;
+	if(!w) return;
+	unit_assert(outnet->tcp_wait_first);
+	unit_assert(outnet->tcp_wait_last);
+	while(w) {
+		n = w->next_waiting;
+		w->on_tcp_waiting_list = 0;
+		w->next_waiting = (struct waiting_tcp*)1; /* In purpose faux value */
+		w = n;
+	}
+	outnet->tcp_wait_first = NULL;
+	outnet->tcp_wait_last = NULL;
+}
+
+/** check removal of the waiting_tcp element on the given position of total
+ *  elements */
+static void check_waiting_tcp_removal(int is_pop,
+	struct outside_network* outnet, struct waiting_tcp* store,
+	size_t position, size_t total)
+{
+	size_t i;
+	struct waiting_tcp* w;
+	waiting_tcp_list_clear(outnet);
+	for(i=0; i<total; i++) {
+		outnet_waiting_tcp_list_add(outnet, &store[i], 0);
+	}
+	check_waiting_tcp_list(outnet, &store[0], &store[total-1], total);
+
+	if(is_pop) {
+		w = outnet_waiting_tcp_list_pop(outnet);
+		unit_assert(w); /* please clang-analyser */
+	} else {
+		w = outnet->tcp_wait_first;
+		for(i=0; i<position; i++) {
+			unit_assert(w); /* please clang-analyser */
+			w = w->next_waiting;
+		}
+		unit_assert(w); /* please clang-analyser */
+		outnet_waiting_tcp_list_remove(outnet, w);
+	}
+	unit_assert(!(w->on_tcp_waiting_list || w->next_waiting));
+
+	if(position == 0 && total == 1) {
+		/* the list should be empty */
+		check_waiting_tcp_list(outnet, NULL, NULL, total-1);
+	} else if(position == 0) {
+		/* first element should be gone */
+		check_waiting_tcp_list(outnet, &store[1], &store[total-1], total-1);
+	} else if(position == total - 1) {
+		/* last element should be gone */
+		check_waiting_tcp_list(outnet, &store[0], &store[total-2], total-1);
+	} else {
+		/* an element should be gone */
+		check_waiting_tcp_list(outnet, &store[0], &store[total-1], total-1);
+	}
+}
+
+static void waiting_tcp_list_test(void)
+{
+	size_t i = 0;
+	struct outside_network outnet;
+	struct waiting_tcp* w, *t = NULL;
+	struct waiting_tcp store[MAX_TCP_WAITING_NODES];
+	memset(&outnet, 0, sizeof(outnet));
+	memset(&store, 0, sizeof(store));
+
+	/* Check add first on empty list */
+	unit_show_func("services/outside_network.c", "outnet_waiting_tcp_list_add_first");
+	t = &store[i];
+	outnet_waiting_tcp_list_add_first(&outnet, t, 0);
+	check_waiting_tcp_list(&outnet, t, t, 1);
+
+	/* Check add */
+	unit_show_func("services/outside_network.c", "outnet_waiting_tcp_list_add");
+	for(i=1; i<MAX_TCP_WAITING_NODES-1; i++) {
+		w = &store[i];
+		outnet_waiting_tcp_list_add(&outnet, w, 0);
+	}
+	check_waiting_tcp_list(&outnet, t, w, MAX_TCP_WAITING_NODES-1);
+
+	/* Check add first on populated list */
+	unit_show_func("services/outside_network.c", "outnet_waiting_tcp_list_add_first");
+	w = &store[i];
+	t = outnet.tcp_wait_last;
+	outnet_waiting_tcp_list_add_first(&outnet, w, 0);
+	check_waiting_tcp_list(&outnet, w, t, MAX_TCP_WAITING_NODES);
+
+	/* Check removal */
+	unit_show_func("services/outside_network.c", "outnet_waiting_tcp_list_remove");
+	check_waiting_tcp_removal(0, &outnet, store, 2, 5);
+	check_waiting_tcp_removal(0, &outnet, store, 1, 3);
+	check_waiting_tcp_removal(0, &outnet, store, 0, 2);
+	check_waiting_tcp_removal(0, &outnet, store, 1, 2);
+	check_waiting_tcp_removal(0, &outnet, store, 0, 1);
+
+	/* Check pop */
+	unit_show_func("services/outside_network.c", "outnet_waiting_tcp_list_pop");
+	check_waiting_tcp_removal(1, &outnet, store, 0, 3);
+	check_waiting_tcp_removal(1, &outnet, store, 0, 2);
+	check_waiting_tcp_removal(1, &outnet, store, 0, 1);
+}
+
+static void check_reuse_write_wait(struct reuse_tcp* reuse,
+	struct waiting_tcp* first, struct waiting_tcp* last, size_t total)
+{
+	size_t i, j;
+	struct waiting_tcp* w = reuse->write_wait_first;
+	struct waiting_tcp* n = NULL;
+	if(first) unit_assert(reuse->write_wait_first == first && !first->write_wait_prev);
+	if(last) unit_assert(reuse->write_wait_last == last && !last->write_wait_next);
+	/* check one way */
+	for(i=0; w; i++) {
+		unit_assert(i<total); /* otherwise we are looping */
+		unit_assert(w->write_wait_queued);
+		n = w->write_wait_next;
+		for(j=0; n; j++) {
+			unit_assert(j<total-i-1); /* otherwise we are looping */
+			unit_assert(n != w);
+			n = n->write_wait_next;
+		}
+		w = w->write_wait_next;
+	}
+	/* check the other way */
+	w = reuse->write_wait_last;
+	for(i=0; w; i++) {
+		unit_assert(i<total); /* otherwise we are looping */
+		unit_assert(w->write_wait_queued);
+		n = w->write_wait_prev;
+		for(j=0; n; j++) {
+			unit_assert(j<total-i-1); /* otherwise we are looping */
+			unit_assert(n != w);
+			n = n->write_wait_prev;
+		}
+		w = w->write_wait_prev;
+	}
+}
+
+/** clear the tcp waiting list */
+static void reuse_write_wait_clear(struct reuse_tcp* reuse)
+{
+	struct waiting_tcp* w = reuse->write_wait_first, *n = NULL;
+	if(!w) return;
+	unit_assert(reuse->write_wait_first);
+	unit_assert(reuse->write_wait_last);
+	while(w) {
+		n = w->write_wait_next;
+		w->write_wait_queued = 0;
+		w->write_wait_next = (struct waiting_tcp*)1;  /* In purpose faux value */
+		w->write_wait_prev = (struct waiting_tcp*)1;  /* In purpose faux value */
+		w = n;
+	}
+	reuse->write_wait_first = NULL;
+	reuse->write_wait_last = NULL;
+}
+
+/** check removal of the reuse_write_wait element on the given position of total
+ *  elements */
+static void check_reuse_write_wait_removal(int is_pop,
+	struct reuse_tcp* reuse, struct waiting_tcp* store,
+	size_t position, size_t total)
+{
+	size_t i;
+	struct waiting_tcp* w;
+	reuse_write_wait_clear(reuse);
+	for(i=0; i<total; i++) {
+		reuse_write_wait_push_back(reuse, &store[i]);
+	}
+	check_reuse_write_wait(reuse, &store[0], &store[total-1], total);
+
+	if(is_pop) {
+		w = reuse_write_wait_pop(reuse);
+	} else {
+		w = reuse->write_wait_first;
+		for(i=0; i<position; i++) w = w->write_wait_next;
+		reuse_write_wait_remove(reuse, w);
+	}
+	unit_assert(!(w->write_wait_queued || w->write_wait_next || w->write_wait_prev));
+
+	if(position == 0 && total == 1) {
+		/* the list should be empty */
+		check_reuse_write_wait(reuse, NULL, NULL, total-1);
+	} else if(position == 0) {
+		/* first element should be gone */
+		check_reuse_write_wait(reuse, &store[1], &store[total-1], total-1);
+	} else if(position == total - 1) {
+		/* last element should be gone */
+		check_reuse_write_wait(reuse, &store[0], &store[total-2], total-1);
+	} else {
+		/* an element should be gone */
+		check_reuse_write_wait(reuse, &store[0], &store[total-1], total-1);
+	}
+}
+
+static void reuse_write_wait_test(void)
+{
+	size_t i;
+	struct reuse_tcp reuse;
+	struct waiting_tcp store[MAX_TCP_WAITING_NODES];
+	struct waiting_tcp* w;
+	memset(&reuse, 0, sizeof(reuse));
+	memset(&store, 0, sizeof(store));
+
+	/* Check adding */
+	unit_show_func("services/outside_network.c", "reuse_write_wait_push_back");
+	for(i=0; i<MAX_TCP_WAITING_NODES; i++) {
+		w = &store[i];
+		reuse_write_wait_push_back(&reuse, w);
+	}
+	check_reuse_write_wait(&reuse, &store[0], w, MAX_TCP_WAITING_NODES);
+
+	/* Check removal */
+	unit_show_func("services/outside_network.c", "reuse_write_wait_remove");
+	check_reuse_write_wait_removal(0, &reuse, store, 2, 5);
+	check_reuse_write_wait_removal(0, &reuse, store, 1, 3);
+	check_reuse_write_wait_removal(0, &reuse, store, 0, 2);
+	check_reuse_write_wait_removal(0, &reuse, store, 1, 2);
+	check_reuse_write_wait_removal(0, &reuse, store, 0, 1);
+
+	/* Check pop */
+	unit_show_func("services/outside_network.c", "reuse_write_wait_pop");
+	check_reuse_write_wait_removal(0, &reuse, store, 0, 3);
+	check_reuse_write_wait_removal(0, &reuse, store, 0, 2);
+	check_reuse_write_wait_removal(0, &reuse, store, 0, 1);
+}
+
 void tcpreuse_test(void)
 {
     unit_show_feature("tcp_reuse");
     tcpid_test();
     tcp_reuse_tree_list_test();
+    waiting_tcp_list_test();
+    reuse_write_wait_test();
 }

From a4631a3ecff7d6a44269190a667c9a623e3b4685 Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Fri, 7 Oct 2022 11:29:46 +0200
Subject: [PATCH 19/25] - Fix unit test to properly test the
 reuse_write_wait_pop function.

---
 doc/Changelog           | 1 +
 testcode/unittcpreuse.c | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index c956c58bc..790d7793f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
 	- Fix to stop possible loops in the tcp reuse code (write_wait list
 	  and tcp_wait list). Based on analysis and patch from Prad Seniappan
 	  and Karthik Umashankar.
+	- Fix unit test to properly test the reuse_write_wait_pop function.
 
 6 October 2022: Wouter
 	- Fix to stop responses with TC flag from resulting in partial
diff --git a/testcode/unittcpreuse.c b/testcode/unittcpreuse.c
index b32262dac..5f45a4b45 100644
--- a/testcode/unittcpreuse.c
+++ b/testcode/unittcpreuse.c
@@ -474,9 +474,9 @@ static void reuse_write_wait_test(void)
 
 	/* Check pop */
 	unit_show_func("services/outside_network.c", "reuse_write_wait_pop");
-	check_reuse_write_wait_removal(0, &reuse, store, 0, 3);
-	check_reuse_write_wait_removal(0, &reuse, store, 0, 2);
-	check_reuse_write_wait_removal(0, &reuse, store, 0, 1);
+	check_reuse_write_wait_removal(1, &reuse, store, 0, 3);
+	check_reuse_write_wait_removal(1, &reuse, store, 0, 2);
+	check_reuse_write_wait_removal(1, &reuse, store, 0, 1);
 }
 
 void tcpreuse_test(void)

From 97d1cff3157591f843be9b38acfd08c6d380b509 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 7 Oct 2022 13:29:33 +0200
Subject: [PATCH 20/25] Changelog note for tag for 1.17.0rc1 release.

---
 doc/Changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index 790d7793f..078774989 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+7 October 2022: Wouter
+	- Tag for 1.17.0rc1 release.
+
 7 October 2022: George
 	- Fix to stop possible loops in the tcp reuse code (write_wait list
 	  and tcp_wait list). Based on analysis and patch from Prad Seniappan

From d25e0cd9b0545ff13120430c94326ceaf14b074f Mon Sep 17 00:00:00 2001
From: George Thessalonikefs <george@nlnetlabs.nl>
Date: Tue, 11 Oct 2022 17:39:30 +0200
Subject: [PATCH 21/25] - Fix PROXYv2 header read for TCP connections when no
 proxied addresses   are provided.

---
 doc/Changelog   |  4 ++++
 util/netevent.c | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 790d7793f..727d1543e 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+11 October 2022: George
+	- Fix PROXYv2 header read for TCP connections when no proxied addresses
+	  are provided.
+
 7 October 2022: George
 	- Fix to stop possible loops in the tcp reuse code (write_wait list
 	  and tcp_wait list). Based on analysis and patch from Prad Seniappan
diff --git a/util/netevent.c b/util/netevent.c
index 9e5436b93..da59a9d60 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1694,7 +1694,10 @@ ssl_handle_read(struct comm_point* c)
 				"part of PROXYv2 header (len %lu)",
 				(unsigned long)want_read_size);
 			current_read_size = PP2_HEADER_SIZE + want_read_size;
-			if(c->tcp_byte_count < current_read_size) {
+			if(want_read_size == 0) {
+				/* nothing more to read; header is complete */
+				c->pp2_header_state = pp2_header_done;
+			} else if(c->tcp_byte_count < current_read_size) {
 				ERR_clear_error();
 				if((r=SSL_read(c->ssl, (void*)sldns_buffer_at(
 					c->buffer, c->tcp_byte_count),
@@ -2083,7 +2086,10 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok)
 				"part of PROXYv2 header (len %lu)",
 				(unsigned long)want_read_size);
 			current_read_size = PP2_HEADER_SIZE + want_read_size;
-			if(c->tcp_byte_count < current_read_size) {
+			if(want_read_size == 0) {
+				/* nothing more to read; header is complete */
+				c->pp2_header_state = pp2_header_done;
+			} else if(c->tcp_byte_count < current_read_size) {
 				r = recv(fd, (void*)sldns_buffer_at(c->buffer,
 					c->tcp_byte_count),
 					current_read_size-c->tcp_byte_count, MSG_DONTWAIT);

From 5ac1bc13cb82b7e7ef5dfaabb82b6780dabd64a0 Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Thu, 13 Oct 2022 09:34:44 +0200
Subject: [PATCH 22/25] - Tag for 1.17.0 release. The code repository continues
 with 1.17.1.

---
 configure     | 25 +++++++++++++------------
 configure.ac  |  5 +++--
 doc/Changelog |  3 +++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index a2837d185..5823e49f2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for unbound 1.17.0.
+# Generated by GNU Autoconf 2.69 for unbound 1.17.1.
 #
 # Report bugs to <unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.17.0'
-PACKAGE_STRING='unbound 1.17.0'
+PACKAGE_VERSION='1.17.1'
+PACKAGE_STRING='unbound 1.17.1'
 PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues'
 PACKAGE_URL=''
 
@@ -1477,7 +1477,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures unbound 1.17.0 to adapt to many kinds of systems.
+\`configure' configures unbound 1.17.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1543,7 +1543,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unbound 1.17.0:";;
+     short | recursive ) echo "Configuration of unbound 1.17.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1785,7 +1785,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unbound configure 1.17.0
+unbound configure 1.17.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2494,7 +2494,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by unbound $as_me 1.17.0, which was
+It was created by unbound $as_me 1.17.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2846,11 +2846,11 @@ UNBOUND_VERSION_MAJOR=1
 
 UNBOUND_VERSION_MINOR=17
 
-UNBOUND_VERSION_MICRO=0
+UNBOUND_VERSION_MICRO=1
 
 
 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=20
+LIBUNBOUND_REVISION=21
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2938,6 +2938,7 @@ LIBUNBOUND_AGE=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
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -22085,7 +22086,7 @@ _ACEOF
 
 
 
-version=1.17.0
+version=1.17.1
 
 date=`date +'%b %e, %Y'`
 
@@ -22604,7 +22605,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unbound $as_me 1.17.0, which was
+This file was extended by unbound $as_me 1.17.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22670,7 +22671,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-unbound config.status 1.17.0
+unbound config.status 1.17.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 57cc7e604..2c7583310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4)
 # must be numbers. ac_defun because of later processing
 m4_define([VERSION_MAJOR],[1])
 m4_define([VERSION_MINOR],[17])
-m4_define([VERSION_MICRO],[0])
+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])
 AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
 AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO])
 
 LIBUNBOUND_CURRENT=9
-LIBUNBOUND_REVISION=20
+LIBUNBOUND_REVISION=21
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -106,6 +106,7 @@ LIBUNBOUND_AGE=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
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
diff --git a/doc/Changelog b/doc/Changelog
index 2dca09e62..dd5e1e316 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+13 October 2022: Wouter
+	- Tag for 1.17.0 release. The code repository continues with 1.17.1.
+
 11 October 2022: George
 	- Fix PROXYv2 header read for TCP connections when no proxied addresses
 	  are provided.

From 08dcae0dabd266b011fd82d9970aa5219559094e Mon Sep 17 00:00:00 2001
From: Florian Obser <florian@narrans.de>
Date: Fri, 14 Oct 2022 13:56:32 +0200
Subject: [PATCH 23/25] Arithmetic on a pointer to void is a GNU extension.

---
 util/netevent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/netevent.c b/util/netevent.c
index da59a9d60..c67a49ff8 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -810,7 +810,7 @@ static int consume_pp2_header(struct sldns_buffer* buf, struct comm_reply* rep,
 		/* We are reading a whole packet;
 		 * Move the rest of the data to overwrite the PROXYv2 header */
 		/* XXX can we do better to avoid memmove? */
-		memmove(header, ((void*)header)+size,
+		memmove(header, ((char*)header)+size,
 			sldns_buffer_limit(buf)-size);
 		sldns_buffer_set_limit(buf, sldns_buffer_limit(buf)-size);
 	}

From 2571d00535a7374adb22925b1c25dc69c0b477ce Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 14 Oct 2022 16:22:17 +0200
Subject: [PATCH 24/25] Changelog note for #768 - Merge #768 from fobser:
 Arithmetic on a pointer to void is a GNU   extension.

---
 doc/Changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/Changelog b/doc/Changelog
index dd5e1e316..a24d1fdc2 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+14 October 2022: Wouter
+	- Merge #768 from fobser: Arithmetic on a pointer to void is a GNU
+	  extension.
+
 13 October 2022: Wouter
 	- Tag for 1.17.0 release. The code repository continues with 1.17.1.
 

From 5ffa4d7232df578ff5d99cf40cdb041a8ece219b Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Fri, 14 Oct 2022 16:49:57 +0200
Subject: [PATCH 25/25] - In unit test, print python script name list
 correctly.

---
 doc/Changelog                | 1 +
 testdata/pymod.tdir/pymod.py | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/Changelog b/doc/Changelog
index a24d1fdc2..9c916c297 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 14 October 2022: Wouter
 	- Merge #768 from fobser: Arithmetic on a pointer to void is a GNU
 	  extension.
+	- In unit test, print python script name list correctly.
 
 13 October 2022: Wouter
 	- Tag for 1.17.0 release. The code repository continues with 1.17.1.
diff --git a/testdata/pymod.tdir/pymod.py b/testdata/pymod.tdir/pymod.py
index a8018e7f7..1eb7af5b1 100644
--- a/testdata/pymod.tdir/pymod.py
+++ b/testdata/pymod.tdir/pymod.py
@@ -37,7 +37,12 @@
 import os
 
 def init(id, cfg):
-    log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, cfg.python_script))
+    scripts=[]
+    s = cfg.python_script
+    while s != None:
+        scripts.append(s.str)
+        s = s.next
+    log_info("pythonmod: init called, module id is %d port: %d script: %s" % (id, cfg.port, scripts))
     return True
 
 def deinit(id):