diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2020-12-08 21:23:03 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2020-12-08 21:23:03 +0000 |
| commit | c1dbcbf2d10cd99864ab0eb44358d9875ba0c0a5 (patch) | |
| tree | 8cbca8d9dc814933d2bc59b6623b792b549aac6b | |
| parent | 4cb89f2eee3bb358f0491932ab0498b5319f4229 (diff) | |
| download | src-test2-vendor/unbound/1.13.0.tar.gz src-test2-vendor/unbound/1.13.0.zip | |
Vendor import of Unbound 1.13.0.vendor/unbound/1.13.0
Security: CVE-2020-28935
96 files changed, 9846 insertions, 6009 deletions
diff --git a/config.guess b/config.guess index 8d70ec2b2633..699b3a10b21c 100755 --- a/config.guess +++ b/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2020-09-19' +timestamp='2020-11-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,12 +27,12 @@ timestamp='2020-09-19' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to <config-patches@gnu.org>. -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] @@ -103,7 +103,7 @@ set_cc_for_build() { test "$tmp" && return 0 : "${TMPDIR=/tmp}" # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } @@ -131,16 +131,14 @@ if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -149,16 +147,30 @@ Linux|GNU|GNU/*) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc + #elif defined(__GLIBC__) + LIBC=gnu #else #include <stdarg.h> + /* First heuristic to detect musl libc. */ #ifdef __DEFINED_va_list LIBC=musl - #else - LIBC=gnu #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi ;; esac @@ -177,19 +189,20 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ "/sbin/$sysctl" 2>/dev/null || \ "/usr/sbin/$sysctl" 2>/dev/null || \ - echo unknown)` + echo unknown)) case "$UNAME_MACHINE_ARCH" in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') machine="${arch}${endian}"-unknown ;; *) machine="$UNAME_MACHINE_ARCH"-unknown ;; @@ -220,7 +233,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr") ;; esac # The OS release @@ -233,7 +246,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in release='-gnu' ;; *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2) ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: @@ -242,15 +255,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//') echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//') echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//') echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) @@ -286,17 +299,17 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}') ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}') ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1) case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; @@ -334,7 +347,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -368,7 +381,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then + if test "$( (/bin/universe) 2>/dev/null)" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd @@ -381,17 +394,17 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in + case $(/usr/bin/uname -p) in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) echo i386-pc-auroraux"$UNAME_RELEASE" @@ -410,30 +423,30 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case "$(/usr/bin/arch -k)" in Series*|S4*) - UNAME_RELEASE=`uname -v` + UNAME_RELEASE=$(uname -v) ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')" exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null) test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case "$(/bin/arch)" in sun3) echo m68k-sun-sunos"$UNAME_RELEASE" ;; @@ -513,8 +526,8 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') && + SYSTEM_NAME=$("$dummy" "$dummyarg") && { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos"$UNAME_RELEASE" exit ;; @@ -541,7 +554,7 @@ EOF exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=$(/usr/bin/uname -p) if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ @@ -569,17 +582,17 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) if test -x /usr/bin/oslevel ; then - IBM_REV=`/usr/bin/oslevel` + IBM_REV=$(/usr/bin/oslevel) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -599,7 +612,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") then echo "$SYSTEM_NAME" else @@ -612,15 +625,15 @@ EOF fi exit ;; *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }') if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi if test -x /usr/bin/lslpp ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi @@ -648,14 +661,14 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if test -x /usr/bin/getconf; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null) + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null) case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 @@ -702,7 +715,7 @@ EOF exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy") test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac @@ -730,7 +743,7 @@ EOF echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) @@ -760,7 +773,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; @@ -829,14 +842,14 @@ EOF echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/') echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/') echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -849,25 +862,25 @@ EOF echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf fi exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` + UNAME_PROCESSOR=$(/usr/bin/uname -p) case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; i*:CYGWIN*:*) echo "$UNAME_MACHINE"-pc-cygwin @@ -903,15 +916,15 @@ EOF echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" exit ;; *:Minix:*:*) echo "$UNAME_MACHINE"-unknown-minix @@ -924,7 +937,7 @@ EOF echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -1033,7 +1046,7 @@ EOF #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')" test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) @@ -1053,7 +1066,7 @@ EOF exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; *) echo hppa-unknown-linux-"$LIBC" ;; @@ -1143,7 +1156,7 @@ EOF echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//') if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else @@ -1152,7 +1165,7 @@ EOF exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in + case $(/bin/uname -X | grep "^Machine") in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; @@ -1161,10 +1174,10 @@ EOF exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` + UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name) echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" elif /bin/uname -X 2>/dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //')) (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 @@ -1214,7 +1227,7 @@ EOF 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1225,7 +1238,7 @@ EOF NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ @@ -1258,7 +1271,7 @@ EOF exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv @@ -1344,7 +1357,7 @@ EOF echo aarch64-apple-darwin"$UNAME_RELEASE" exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) case $UNAME_PROCESSOR in unknown) UNAME_PROCESSOR=powerpc ;; esac @@ -1381,7 +1394,7 @@ EOF echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc @@ -1449,10 +1462,10 @@ EOF echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=$( (uname -p) 2>/dev/null) case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1462,7 +1475,7 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')" exit ;; i*86:rdos:*:*) echo "$UNAME_MACHINE"-pc-rdos @@ -1520,7 +1533,7 @@ main () #define __ARCHITECTURE__ "m68k" #endif int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null); if (version < 4) printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else @@ -1612,7 +1625,7 @@ main () } EOF -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. @@ -1637,14 +1650,14 @@ This script (version $timestamp), has failed to recognize the operating system you are using. If your script is old, overwrite *all* copies of config.guess and config.sub with the latest versions from: - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess and - https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/cgit/config.git/plain/config.sub EOF -year=`echo $timestamp | sed 's,-.*,,'` +year=$(echo $timestamp | sed 's,-.*,,') # shellcheck disable=SC2003 -if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then +if test "$(expr "$(date +%Y)" - "$year")" -lt 3 ; then cat >&2 <<EOF If $0 has already been updated, send the following data and any @@ -1653,20 +1666,20 @@ provide the necessary information to handle your system. config.guess timestamp = $timestamp -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` +uname -m = $( (uname -m) 2>/dev/null || echo unknown) +uname -r = $( (uname -r) 2>/dev/null || echo unknown) +uname -s = $( (uname -s) 2>/dev/null || echo unknown) +uname -v = $( (uname -v) 2>/dev/null || echo unknown) -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null) +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null) -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` +hostinfo = $( (hostinfo) 2>/dev/null) +/bin/universe = $( (/bin/universe) 2>/dev/null) +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null) +/bin/arch = $( (/bin/arch) 2>/dev/null) +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null) +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null) UNAME_MACHINE = "$UNAME_MACHINE" UNAME_RELEASE = "$UNAME_RELEASE" diff --git a/config.sub b/config.sub index 9bc49a7e9223..19c9553b1825 100755 --- a/config.sub +++ b/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2020-09-08' +timestamp='2020-12-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ timestamp='2020-09-08' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,7 +50,7 @@ timestamp='2020-09-08' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS @@ -769,22 +769,22 @@ case $basic_machine in vendor=hp ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc basic_os=sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc basic_os=sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc basic_os=sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` + cpu=$(echo "$1" | sed -e 's/86.*/86/') vendor=pc basic_os=solaris2 ;; @@ -917,7 +917,7 @@ case $basic_machine in ;; leon-*|leon[3-9]-*) cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + vendor=$(echo "$basic_machine" | sed 's/-.*//') ;; *-*) @@ -1084,7 +1084,7 @@ case $cpu-$vendor in cpu=mipsisa64sb1el ;; sh5e[lb]-*) - cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + cpu=$(echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/') ;; spur-*) cpu=spur @@ -1102,7 +1102,7 @@ case $cpu-$vendor in cpu=x86_64 ;; xscale-* | xscalee[bl]-*) - cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + cpu=$(echo "$cpu" | sed 's/^xscale/arm/') ;; arm64-*) cpu=aarch64 @@ -1241,6 +1241,7 @@ case $cpu-$vendor in | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ | spu \ | tahoe \ + | thumbv7* \ | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ | tron \ | ubicom32 \ @@ -1286,11 +1287,15 @@ then case $basic_os in gnu/linux*) kernel=linux - os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'` + os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') + ;; + os2-emx) + kernel=os2 + os=$(echo $basic_os | sed -e 's|os2-emx|emx|') ;; nto-qnx*) kernel=nto - os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'` + os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') ;; *-*) # shellcheck disable=SC2162 @@ -1301,11 +1306,11 @@ EOF # Default OS when just kernel was specified nto*) kernel=nto - os=`echo $basic_os | sed -e 's|nto|qnx|'` + os=$(echo $basic_os | sed -e 's|nto|qnx|') ;; linux*) kernel=linux - os=`echo $basic_os | sed -e 's|linux|gnu|'` + os=$(echo $basic_os | sed -e 's|linux|gnu|') ;; *) kernel= @@ -1326,7 +1331,7 @@ case $os in os=cnk ;; solaris1 | solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` + os=$(echo $os | sed -e 's|solaris1|sunos4|') ;; solaris) os=solaris2 @@ -1355,7 +1360,7 @@ case $os in os=sco3.2v4 ;; sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + os=$(echo $os | sed -e 's/sco3.2./sco3.2v/') ;; sco*v* | scout) # Don't match below @@ -1385,7 +1390,7 @@ case $os in os=lynxos ;; mac[0-9]*) - os=`echo "$os" | sed -e 's|mac|macos|'` + os=$(echo "$os" | sed -e 's|mac|macos|') ;; opened*) os=openedition @@ -1394,10 +1399,10 @@ case $os in os=os400 ;; sunos5*) - os=`echo "$os" | sed -e 's|sunos5|solaris2|'` + os=$(echo "$os" | sed -e 's|sunos5|solaris2|') ;; sunos6*) - os=`echo "$os" | sed -e 's|sunos6|solaris3|'` + os=$(echo "$os" | sed -e 's|sunos6|solaris3|') ;; wince*) os=wince @@ -1431,7 +1436,7 @@ case $os in ;; # Preserve the version number of sinix5. sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` + os=$(echo $os | sed -e 's|sinix|sysv|') ;; sinix*) os=sysv4 @@ -1716,7 +1721,7 @@ case $os in | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* ) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1747,6 +1752,8 @@ case $kernel-$os in ;; nto-qnx*) ;; + os2-emx) + ;; *-eabi* | *-gnueabi*) ;; -*) diff --git a/configure b/configure index 69bc15f97fda..b3c53378ee0f 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.12.0. +# Generated by GNU Autoconf 2.69 for unbound 1.13.0. # # 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.12.0' -PACKAGE_STRING='unbound 1.12.0' +PACKAGE_VERSION='1.13.0' +PACKAGE_STRING='unbound 1.13.0' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -1459,7 +1459,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.12.0 to adapt to many kinds of systems. +\`configure' configures unbound 1.13.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1524,7 +1524,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.12.0:";; + short | recursive ) echo "Configuration of unbound 1.13.0:";; esac cat <<\_ACEOF @@ -1752,7 +1752,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.12.0 +unbound configure 1.13.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2461,7 +2461,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.12.0, which was +It was created by unbound $as_me 1.13.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2811,13 +2811,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=12 +UNBOUND_VERSION_MINOR=13 UNBOUND_VERSION_MICRO=0 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=10 +LIBUNBOUND_REVISION=11 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2895,6 +2895,7 @@ LIBUNBOUND_AGE=1 # 1.10.1 had 9:8:1 # 1.11.0 had 9:9:1 # 1.12.0 had 9:10:1 +# 1.13.0 had 9:11:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -14728,7 +14729,7 @@ $as_echo "no" >&6; } fi # Checks for header files. -for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h net/if.h +for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default @@ -14742,6 +14743,34 @@ fi done +# net/if.h portability for Darwin see: +# https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Header-Portability.html +for ac_header in net/if.h +do : + ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " +#include <stdio.h> +#ifdef STDC_HEADERS +# include <stdlib.h> +# include <stddef.h> +#else +# ifdef HAVE_STDLIB_H +# include <stdlib.h> +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif + +" +if test "x$ac_cv_header_net_if_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NET_IF_H 1 +_ACEOF + +fi + +done + # Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH for ac_header in TargetConditionals.h @@ -21686,7 +21715,7 @@ _ACEOF -version=1.12.0 +version=1.13.0 date=`date +'%b %e, %Y'` @@ -22205,7 +22234,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.12.0, which was +This file was extended by unbound $as_me 1.13.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22271,7 +22300,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.12.0 +unbound config.status 1.13.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7d987929469a..5385f7747e8e 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[12]) +m4_define([VERSION_MINOR],[13]) m4_define([VERSION_MICRO],[0]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) @@ -18,7 +18,7 @@ AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=10 +LIBUNBOUND_REVISION=11 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -96,6 +96,7 @@ LIBUNBOUND_AGE=1 # 1.10.1 had 9:8:1 # 1.11.0 had 9:9:1 # 1.12.0 had 9:10:1 +# 1.13.0 had 9:11:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -399,7 +400,23 @@ ACX_LIBTOOL_C_ONLY PKG_PROG_PKG_CONFIG # Checks for header files. -AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h net/if.h],,, [AC_INCLUDES_DEFAULT]) +AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h ifaddrs.h],,, [AC_INCLUDES_DEFAULT]) +# net/if.h portability for Darwin see: +# https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Header-Portability.html +AC_CHECK_HEADERS([net/if.h],,, [ +#include <stdio.h> +#ifdef STDC_HEADERS +# include <stdlib.h> +# include <stddef.h> +#else +# ifdef HAVE_STDLIB_H +# include <stdlib.h> +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif +]) # Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH AC_CHECK_HEADERS([TargetConditionals.h]) diff --git a/contrib/README b/contrib/README index 9db078e5617c..ef2a0ab885dd 100644 --- a/contrib/README +++ b/contrib/README @@ -53,3 +53,5 @@ distribution but may be helpful. lookups for downstream clients. * drop2rpz: perl script that converts the Spamhaus DROP-List in RPZ-Format, contributed by Andreas Schulze. +* metrics.awk: awk script that can convert unbound-control stats to + Prometheus metrics format output. diff --git a/contrib/metrics.awk b/contrib/metrics.awk new file mode 100644 index 000000000000..5a7a2569c29a --- /dev/null +++ b/contrib/metrics.awk @@ -0,0 +1,180 @@ +# read output of unbound-control stats +# and output prometheus metrics style output. +# use these options: +# server: extended-statistics: yes +# statistics-cumulative: no +# statistics-interval: 0 +# remote-control: control-enable: yes +# Can use it like unbound-control stats | awk -f "metrics.awk" + +BEGIN { + FS="="; +} +# everything like total.num.queries=value is put in val["total.num.queries"] +/^.*\..*=/ { + val[$1]=$2; +} +# print the output metrics +END { + print "# HELP unbound_hits_queries Unbound DNS traffic and cache hits" + print "# TYPE unbound_hits_queries gauge" + print "unbound_hits_queries{type=\"total.num.queries\"} " val["total.num.queries"]; + for (x=0; x<99; x++) { + if(val["thread" $x ".num.queries"] != "") { + print "unbound_hits_queries{type=\"thread" $x ".num.queries\"} " val["thread" $x ".num.queries"]; + } + } + print "unbound_hits_queries{type=\"total.num.cachehits\"} " val["total.num.cachehits"]; + print "unbound_hits_queries{type=\"total.num.prefetch\"} " val["total.num.prefetch"]; + print "unbound_hits_queries{type=\"num.query.tcp\"} " val["num.query.tcp"]; + print "unbound_hits_queries{type=\"num.query.tcpout\"} " val["num.query.tcpout"]; + print "unbound_hits_queries{type=\"num.query.tls\"} " val["num.query.tls"]; + print "unbound_hits_queries{type=\"num.query.tls.resume\"} " val["num.query.tls.resume"]; + print "unbound_hits_queries{type=\"num.query.ipv6\"} " val["num.query.ipv6"]; + print "unbound_hits_queries{type=\"unwanted.queries\"} " val["unwanted.queries"]; + print "" + + print "# HELP unbound_queue_queries Unbound requestlist size" + print "# TYPE unbound_queue_queries gauge" + print "unbound_queue_queries{type=\"total.requestlist.avg\"} " val["total.requestlist.avg"]; + print "unbound_queue_queries{type=\"total.requestlist.max\"} " val["total.requestlist.max"]; + print "unbound_queue_queries{type=\"total.requestlist.overwritten\"} " val["total.requestlist.overwritten"]; + print "unbound_queue_queries{type=\"total.requestlist.exceeded\"} " val["total.requestlist.exceeded"]; + print "" + + print "# HELP unbound_memory_bytes Unbound memory usage" + print "# TYPE unbound_memory_bytes gauge" + print "unbound_memory_bytes{type=\"mem.cache.rrset\"} " val["mem.cache.rrset"]; + print "unbound_memory_bytes{type=\"mem.cache.message\"} " val["mem.cache.message"]; + print "unbound_memory_bytes{type=\"mem.mod.iterator\"} " val["mem.mod.iterator"]; + if(val["mem.mod.validator"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.validator\"} " val["mem.mod.validator"]; + } + if(val["mem.mod.respip"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.respip\"} " val["mem.mod.respip"]; + } + if(val["mem.mod.subnet"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.subnet\"} " val["mem.mod.subnet"]; + } + if(val["mem.mod.ipsecmod"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.ipsecmod\"} " val["mem.mod.ipsecmod"]; + } + if(val["mem.mod.dynlibmod"] != "") { + print "unbound_memory_bytes{type=\"mem.mod.dynlibmod\"} " val["mem.mod.dynlibmod"]; + } + print "unbound_memory_bytes{type=\"msg.cache.count\"} " val["msg.cache.count"]; + print "unbound_memory_bytes{type=\"rrset.cache.count\"} " val["rrset.cache.count"]; + print "unbound_memory_bytes{type=\"infra.cache.count\"} " val["infra.cache.count"]; + print "unbound_memory_bytes{type=\"key.cache.count\"} " val["key.cache.count"]; + print "" + + print "# HELP unbound_by_type_queries Unbound DNS queries by type" + print "# TYPE unbound_by_type_queries gauge" + for(x in val) { + if(x ~ /^num.query.type./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_type_queries{type=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_class_queries Unbound DNS queries by class" + print "# TYPE unbound_by_class_queries gauge" + for(x in val) { + if(x ~ /^num.query.class./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_class_queries{class=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_opcode_queries Unbound DNS queries by opcode" + print "# TYPE unbound_by_opcode_queries gauge" + for(x in val) { + if(x ~ /^num.query.opcode./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_opcode_queries{opcode=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_rcode_queries Unbound DNS answers by rcode" + print "# TYPE unbound_by_rcode_queries gauge" + for(x in val) { + if(x ~ /^num.answer.rcode./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_rcode_queries{rcode=\"" a[4] "\"} " val[x]; + } + } + } + print "" + + print "# HELP unbound_by_flags_queries Unbound DNS queries by flags" + print "# TYPE unbound_by_flags_queries gauge" + for(x in val) { + if(x ~ /^num.query.flags./) { + if(val[x] != "") { + split(x, a, "."); + print "unbound_by_flags_queries{flag=\"" a[4] "\"} " val[x]; + } + } + } + if(val["num.query.edns.present"] != "") { + print "unbound_by_flags_queries{flag=\"num.query.edns.present\"} " val["num.query.edns.present"]; + } + if(val["num.query.edns.DO"] != "") { + print "unbound_by_flags_queries{flag=\"num.query.edns.DO\"} " val["num.query.edns.DO"]; + } + print "" + + print "# HELP unbound_histogram_seconds Unbound DNS histogram of reply time" + print "# TYPE unbound_histogram_seconds gauge" + print "unbound_histogram_seconds{bucket=\"000000.000000.to.000000.000001\"} " val["histogram.000000.000000.to.000000.000001"]; + print "unbound_histogram_seconds{bucket=\"000000.000001.to.000000.000002\"} " val["histogram.000000.000001.to.000000.000002"]; + print "unbound_histogram_seconds{bucket=\"000000.000002.to.000000.000004\"} " val["histogram.000000.000002.to.000000.000004"]; + print "unbound_histogram_seconds{bucket=\"000000.000004.to.000000.000008\"} " val["histogram.000000.000004.to.000000.000008"]; + print "unbound_histogram_seconds{bucket=\"000000.000008.to.000000.000016\"} " val["histogram.000000.000008.to.000000.000016"]; + print "unbound_histogram_seconds{bucket=\"000000.000016.to.000000.000032\"} " val["histogram.000000.000016.to.000000.000032"]; + print "unbound_histogram_seconds{bucket=\"000000.000032.to.000000.000064\"} " val["histogram.000000.000032.to.000000.000064"]; + print "unbound_histogram_seconds{bucket=\"000000.000064.to.000000.000128\"} " val["histogram.000000.000064.to.000000.000128"]; + print "unbound_histogram_seconds{bucket=\"000000.000128.to.000000.000256\"} " val["histogram.000000.000128.to.000000.000256"]; + print "unbound_histogram_seconds{bucket=\"000000.000256.to.000000.000512\"} " val["histogram.000000.000256.to.000000.000512"]; + print "unbound_histogram_seconds{bucket=\"000000.000512.to.000000.001024\"} " val["histogram.000000.000512.to.000000.001024"]; + print "unbound_histogram_seconds{bucket=\"000000.001024.to.000000.002048\"} " val["histogram.000000.001024.to.000000.002048"]; + print "unbound_histogram_seconds{bucket=\"000000.002048.to.000000.004096\"} " val["histogram.000000.002048.to.000000.004096"]; + print "unbound_histogram_seconds{bucket=\"000000.004096.to.000000.008192\"} " val["histogram.000000.004096.to.000000.008192"]; + print "unbound_histogram_seconds{bucket=\"000000.008192.to.000000.016384\"} " val["histogram.000000.008192.to.000000.016384"]; + print "unbound_histogram_seconds{bucket=\"000000.016384.to.000000.032768\"} " val["histogram.000000.016384.to.000000.032768"]; + print "unbound_histogram_seconds{bucket=\"000000.032768.to.000000.065536\"} " val["histogram.000000.032768.to.000000.065536"]; + print "unbound_histogram_seconds{bucket=\"000000.065536.to.000000.131072\"} " val["histogram.000000.065536.to.000000.131072"]; + print "unbound_histogram_seconds{bucket=\"000000.131072.to.000000.262144\"} " val["histogram.000000.131072.to.000000.262144"]; + print "unbound_histogram_seconds{bucket=\"000000.262144.to.000000.524288\"} " val["histogram.000000.262144.to.000000.524288"]; + print "unbound_histogram_seconds{bucket=\"000000.524288.to.000001.000000\"} " val["histogram.000000.524288.to.000001.000000"]; + print "unbound_histogram_seconds{bucket=\"000001.000000.to.000002.000000\"} " val["histogram.000001.000000.to.000002.000000"]; + print "unbound_histogram_seconds{bucket=\"000002.000000.to.000004.000000\"} " val["histogram.000002.000000.to.000004.000000"]; + print "unbound_histogram_seconds{bucket=\"000004.000000.to.000008.000000\"} " val["histogram.000004.000000.to.000008.000000"]; + print "unbound_histogram_seconds{bucket=\"000008.000000.to.000016.000000\"} " val["histogram.000008.000000.to.000016.000000"]; + print "unbound_histogram_seconds{bucket=\"000016.000000.to.000032.000000\"} " val["histogram.000016.000000.to.000032.000000"]; + print "unbound_histogram_seconds{bucket=\"000032.000000.to.000064.000000\"} " val["histogram.000032.000000.to.000064.000000"]; + print "unbound_histogram_seconds{bucket=\"000064.000000.to.000128.000000\"} " val["histogram.000064.000000.to.000128.000000"]; + print "unbound_histogram_seconds{bucket=\"000128.000000.to.000256.000000\"} " val["histogram.000128.000000.to.000256.000000"]; + print "unbound_histogram_seconds{bucket=\"000256.000000.to.000512.000000\"} " val["histogram.000256.000000.to.000512.000000"]; + print "unbound_histogram_seconds{bucket=\"000512.000000.to.001024.000000\"} " val["histogram.000512.000000.to.001024.000000"]; + print "unbound_histogram_seconds{bucket=\"001024.000000.to.002048.000000\"} " val["histogram.001024.000000.to.002048.000000"]; + print "unbound_histogram_seconds{bucket=\"002048.000000.to.004096.000000\"} " val["histogram.002048.000000.to.004096.000000"]; + print "unbound_histogram_seconds{bucket=\"004096.000000.to.008192.000000\"} " val["histogram.004096.000000.to.008192.000000"]; + print "unbound_histogram_seconds{bucket=\"008192.000000.to.016384.000000\"} " val["histogram.008192.000000.to.016384.000000"]; + print "unbound_histogram_seconds{bucket=\"016384.000000.to.032768.000000\"} " val["histogram.016384.000000.to.032768.000000"]; + print "unbound_histogram_seconds{bucket=\"032768.000000.to.065536.000000\"} " val["histogram.032768.000000.to.065536.000000"]; + print "unbound_histogram_seconds{bucket=\"065536.000000.to.131072.000000\"} " val["histogram.065536.000000.to.131072.000000"]; + print "unbound_histogram_seconds{bucket=\"131072.000000.to.262144.000000\"} " val["histogram.131072.000000.to.262144.000000"]; + print "unbound_histogram_seconds{bucket=\"262144.000000.to.524288.000000\"} " val["histogram.262144.000000.to.524288.000000"]; + print "" +} diff --git a/contrib/unbound.service.in b/contrib/unbound.service.in index c95ab94b343a..a4596978dbe2 100644 --- a/contrib/unbound.service.in +++ b/contrib/unbound.service.in @@ -66,7 +66,7 @@ ProtectSystem=strict RuntimeDirectory=unbound ConfigurationDirectory=unbound StateDirectory=unbound -RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX RestrictRealtime=true SystemCallArchitectures=native SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module mount @obsolete @resources diff --git a/contrib/unbound_portable.service.in b/contrib/unbound_portable.service.in index 998b66dec999..e763763f02e1 100644 --- a/contrib/unbound_portable.service.in +++ b/contrib/unbound_portable.service.in @@ -38,7 +38,7 @@ ProtectSystem=strict RuntimeDirectory=unbound ConfigurationDirectory=unbound StateDirectory=unbound -RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX +RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX RestrictRealtime=true SystemCallArchitectures=native SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module mount @obsolete @resources diff --git a/daemon/daemon.c b/daemon/daemon.c index f480c94e61f6..a11d50a9ba93 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -291,7 +291,7 @@ daemon_init(void) free(daemon); return NULL; } - if(!(daemon->env->edns_tags = edns_tags_create())) { + if(!(daemon->env->edns_strings = edns_strings_create())) { auth_zones_delete(daemon->env->auth_zones); acl_list_delete(daemon->acl); tcl_list_delete(daemon->tcl); @@ -638,9 +638,9 @@ daemon_fork(struct daemon* daemon) &daemon->use_rpz)) fatal_exit("auth_zones could not be setup"); - /* Set-up EDNS tags */ - if(!edns_tags_apply_cfg(daemon->env->edns_tags, daemon->cfg)) - fatal_exit("Could not set up EDNS tags"); + /* Set-up EDNS strings */ + if(!edns_strings_apply_cfg(daemon->env->edns_strings, daemon->cfg)) + fatal_exit("Could not set up EDNS strings"); /* setup modules */ daemon_setup_modules(daemon); @@ -773,7 +773,7 @@ daemon_delete(struct daemon* daemon) rrset_cache_delete(daemon->env->rrset_cache); infra_delete(daemon->env->infra_cache); edns_known_options_delete(daemon->env); - edns_tags_delete(daemon->env->edns_tags); + edns_strings_delete(daemon->env->edns_strings); auth_zones_delete(daemon->env->auth_zones); } ub_randfree(daemon->rand); diff --git a/daemon/unbound.c b/daemon/unbound.c index cd0fd69f2ca4..bc6d2bc9efc5 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -337,22 +337,44 @@ readpid (const char* file) /** write pid to file. * @param pidfile: file name of pid file. * @param pid: pid to write to file. + * @return false on failure */ -static void +static int writepid (const char* pidfile, pid_t pid) { - FILE* f; + int fd; + char pidbuf[32]; + size_t count = 0; + snprintf(pidbuf, sizeof(pidbuf), "%lu\n", (unsigned long)pid); - if ((f = fopen(pidfile, "w")) == NULL ) { + if((fd = open(pidfile, O_WRONLY | O_CREAT | O_TRUNC +#ifdef O_NOFOLLOW + | O_NOFOLLOW +#endif + , 0644)) == -1) { log_err("cannot open pidfile %s: %s", pidfile, strerror(errno)); - return; + return 0; } - if(fprintf(f, "%lu\n", (unsigned long)pid) < 0) { - log_err("cannot write to pidfile %s: %s", - pidfile, strerror(errno)); + while(count < strlen(pidbuf)) { + ssize_t r = write(fd, pidbuf+count, strlen(pidbuf)-count); + if(r == -1) { + if(errno == EAGAIN || errno == EINTR) + continue; + log_err("cannot write to pidfile %s: %s", + pidfile, strerror(errno)); + close(fd); + return 0; + } else if(r == 0) { + log_err("cannot write any bytes to pidfile %s: " + "write returns 0 bytes written", pidfile); + close(fd); + return 0; + } + count += r; } - fclose(f); + close(fd); + return 1; } /** @@ -506,16 +528,17 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode, /* write new pidfile (while still root, so can be outside chroot) */ #ifdef HAVE_KILL if(cfg->pidfile && cfg->pidfile[0] && need_pidfile) { - writepid(daemon->pidfile, getpid()); - if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 && - pidinchroot) { + if(writepid(daemon->pidfile, getpid())) { + if(cfg->username && cfg->username[0] && cfg_uid != (uid_t)-1 && + pidinchroot) { # ifdef HAVE_CHOWN - if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) { - verbose(VERB_QUERY, "cannot chown %u.%u %s: %s", - (unsigned)cfg_uid, (unsigned)cfg_gid, - daemon->pidfile, strerror(errno)); - } + if(chown(daemon->pidfile, cfg_uid, cfg_gid) == -1) { + verbose(VERB_QUERY, "cannot chown %u.%u %s: %s", + (unsigned)cfg_uid, (unsigned)cfg_gid, + daemon->pidfile, strerror(errno)); + } # endif /* HAVE_CHOWN */ + } } } #else diff --git a/daemon/worker.c b/daemon/worker.c index 5ad8ce4e4094..76c4bb5b1e76 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -576,7 +576,7 @@ apply_respip_action(struct worker* worker, const struct query_info* qinfo, struct comm_reply* repinfo, struct ub_packed_rrset_key** alias_rrset, struct reply_info** encode_repp, struct auth_zones* az) { - struct respip_action_info actinfo = {0}; + struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL}; actinfo.action = respip_none; if(qinfo->qtype != LDNS_RR_TYPE_A && @@ -1789,8 +1789,8 @@ worker_init(struct worker* worker, struct config_file *cfg, ? cfg->tcp_keepalive_timeout : cfg->tcp_idle_timeout, cfg->harden_large_queries, cfg->http_max_streams, - cfg->http_endpoint, worker->daemon->tcl, - worker->daemon->listen_sslctx, + cfg->http_endpoint, cfg->http_notls_downstream, + worker->daemon->tcl, worker->daemon->listen_sslctx, dtenv, worker_handle_request, worker); if(!worker->front) { log_err("could not create listening sockets"); @@ -1807,7 +1807,7 @@ worker_init(struct worker* worker, struct config_file *cfg, &worker_alloc_cleanup, worker, cfg->do_udp || cfg->udp_upstream_without_downstream, worker->daemon->connect_sslctx, cfg->delay_close, - cfg->tls_use_sni, dtenv); + cfg->tls_use_sni, dtenv, cfg->udp_connect); if(!worker->back) { log_err("could not create outgoing sockets"); worker_delete(worker); diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c index 0c8c6c4d462a..b8a3216703c1 100644 --- a/dnstap/dnstap.c +++ b/dnstap/dnstap.c @@ -134,15 +134,13 @@ dt_create(struct config_file* cfg) if(cfg->dnstap && cfg->dnstap_socket_path && cfg->dnstap_socket_path[0] && (cfg->dnstap_ip==NULL || cfg->dnstap_ip[0]==0)) { - char* p = fname_after_chroot(cfg->dnstap_socket_path, cfg, 1); - if(!p) { - log_err("malloc failure"); - return NULL; - } + char* p = cfg->dnstap_socket_path; + if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(p, + cfg->chrootdir, strlen(cfg->chrootdir)) == 0) + p += strlen(cfg->chrootdir); verbose(VERB_OPS, "attempting to connect to dnstap socket %s", p); check_socket_file(p); - free(p); } env = (struct dt_env *) calloc(1, sizeof(struct dt_env)); diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c index b0918c52cc63..f1ace3c34023 100644 --- a/dnstap/dtstream.c +++ b/dnstap/dtstream.c @@ -341,15 +341,19 @@ int dt_io_thread_apply_cfg(struct dt_io_thread* dtio, struct config_file *cfg) dtio->is_bidirectional = cfg->dnstap_bidirectional; if(dtio->upstream_is_unix) { + char* nm; if(!cfg->dnstap_socket_path || cfg->dnstap_socket_path[0]==0) { log_err("dnstap setup: no dnstap-socket-path for " "socket connect"); return 0; } + nm = cfg->dnstap_socket_path; + if(cfg->chrootdir && cfg->chrootdir[0] && strncmp(nm, + cfg->chrootdir, strlen(cfg->chrootdir)) == 0) + nm += strlen(cfg->chrootdir); free(dtio->socket_path); - dtio->socket_path = fname_after_chroot(cfg->dnstap_socket_path, - cfg, 1); + dtio->socket_path = strdup(nm); if(!dtio->socket_path) { log_err("dnstap setup: malloc failure"); return 0; diff --git a/doc/Changelog b/doc/Changelog index 87f796398993..1622dd2b5e27 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,166 @@ +30 November 2020: Wouter + - Fix assertion failure on double callback when iterator loses + interest in query at head of line that then has the tcp stream + not kept for reuse. + - tag for the 1.13.0rc4 release. + +27 November 2020: Wouter + - Fix compile warning for type cast in http2_submit_dns_response. + - Fix when use free buffer to initialize rbtree for stream reuse. + - Fix compile warnings for windows. + - Fix compile warnings in rpz initialization. + - Fix contrib/metrics.awk for FreeBSD awk compatibility. + - tag for the 1.13.0rc3 release. + +26 November 2020: Wouter + - Fix to omit UDP receive errors from log, if verbosity low. + These happen because of udp-connect. + - For #352: contrib/metrics.awk for Prometheus style metrics output. + - Fix that after failed read, the readagain cannot activate. + - Clear readagain upon decommission of pending tcp structure. + +25 November 2020: Wouter + - with udp-connect ignore connection refused with UDP timeouts. + - Fix udp-connect on FreeBSD, do send calls on connected UDP socket. + - Better fix for reuse tree comparison for is-tls sockets. Where + the tree key identity is preserved after cleanup of the TLS state. + - Remove debug commands from reuse tests. + - Fix memory leak for edns client tag opcode config element. + - Attempt fix for libevent state in tcp reuse cases after a packet + is written. + - Fix readagain and writeagain callback functions for comm point + cleanup. + - tag for the 1.13.0rc2 release. + +24 November 2020: Wouter + - Merge PR #283 : Stream reuse. This implements upstream stream + reuse for performing several queries over the same TCP or TLS + channel. + - set version of main branch to 1.13.0 for upcoming release. + - iana portlist updated. + - Fix one port unit test for udp-connect. + - tag for the 1.13.0rc1 release. + - Fix crash when TLS connection is closed prematurely, when + reuse tree comparison is not properly identical to insertion. + - Fix padding of struct regional for 32bit systems. + +23 November 2020: George + - Merge PR #313 from Ralph Dolmans: Replace edns-client-tag with + edns-client-string option. + +23 November 2020: Wouter + - Merge #351 from dvzrv: Add AF_NETLINK to set of allowed socket + address families. + - Fix #350: with the AF_NETLINK permission, to fix 1.12.0 error: + failed to list interfaces: getifaddrs: Address family not + supported by protocol. + - Fix #347: IP_DONTFRAG broken on Apple xcode 12.2. + - Option to toggle udp-connect, default is enabled. + - Fix for #303 CVE-2020-28935 : Fix that symlink does not interfere + with chown of pidfile. + - Further fix for it and retvalue 0 fix for it. + +12 November 2020: Wouter + - Fix to connect() to UDP destinations, default turned on, + this lowers vulnerability to ICMP side channels. + - Retry for interfaces with unused ports if possible. + +10 November 2020: Wouter + - Fix #341: fixing a possible memory leak. + - Fix memory leak after fix for possible memory leak failure. + - Fix #343: Fail to build --with-libnghttp2 with error: 'SSIZE_MAX' + undeclared. + +27 October 2020: Wouter + - In man page note that tls-cert-bundle is read before permission + drop and chroot. + +22 October 2020: Wouter + - Fix #333: Unbound Segmentation Fault w/ log_info Functions From + Python Mod. + - Fix that minimal-responses does not remove addresses from a priming + query response. + +21 October 2020: George + - Fix #327: net/if.h check fails on some darwin versions; contribution by + Joshua Root. + - Fix #320: potential memory corruption due to size miscomputation upton + custom region alloc init. + +21 October 2020: Wouter + - Merge PR #228 : infra-keep-probing option to probe hosts that are + down. Add infra-keep-probing: yes option. Hosts that are down are + probed more frequently. + With the option turned on, it probes about every 120 seconds, + eventually after exponential backoff, and that keeps that way. If + traffic keeps up for the domain. It probes with one at a time, eg. + one query is allowed to probe, other queries within that 120 second + interval are turned away. + +19 October 2020: George + - Merge PR #324 from James Renken: Add modern X.509v3 extensions to + unbound-control TLS certificates. + - Fix for PR #324 to attach the x509v3 extensions to the client + certificate. + +19 October 2020: Ralph + - local-zone regional allocations outside of chunk + +19 October 2020: Wouter + - Fix that http settings have colon in set_option, for + http-endpoint, http-max-streams, http-query-buffer-size, + http-response-buffer-size, and http-nodelay. + - Fix memory leak of https port string when reading config. + - Fix #330: [Feature request] Add unencrypted DNS over HTTPS support. + This adds the option http-notls-downstream: yesno to change that, + and the dohclient test code has the -n option. + - Fix python documentation warning on functions.rst inplace_cb_reply. + - Fix dnstap test to wait for log timer to see if queries are logged. + - Log ip address when http session recv fails, eg. due to tls fail. + - Fix to set the tcp handler event toggle flag back to default when + the handler structure is reused. + - Clean the fix for out of order TCP processing limits on number + of queries. It was tested to work. + +16 October 2020: Wouter + - Fix that the out of order TCP processing does not limit the + number of outstanding queries over a connection. + +15 October 2020: George + - Fix that if there are reply callbacks for the given rcode, those + are called per reply and a new message created if that was modified + by the call. + - Pass the comm_reply information to the inplace_cb_reply* functions + during the mesh state and update the documentation on that. + +15 October 2020: Wouter + - Merge PR #326 from netblue30: DoH: implement content-length + header field + - DoH content length, simplify code, remove declaration after + statement and fix cast warning. + +14 October 2020: Wouter + - Fix for python reply callback to see mesh state reply_list member, + it only removes it briefly for the commpoint call so that it does + not drop it and attempt to modify the reply list during reply. + - Fix that if there are on reply callbacks, those are called per + reply and a new message created if that was modified by the call. + - Free up auth zone parse region after use for lookup of host + +13 October 2020: Wouter + - Fix #323: unbound testsuite fails on mock build in systemd-nspawn + if systemd support is build. + +9 October 2020: Wouter + - Fix dnstap socket and the chroot not applied properly to the dnstap + socket path. + - Fix warning in libnss compile, nss_buf2dsa is not used without DSA. + +8 October 2020: Wouter + - Tag for 1.12.0 release. + - Current repo is version 1.12.1 in development. + - Fix #319: potential memory leak on config failure, in rpz config. + 1 October 2020: Wouter - Current repo is version 1.12.0 for release. Tag for 1.12.0rc1. diff --git a/doc/README b/doc/README index c6ff31a6fac3..e864bb188e33 100644 --- a/doc/README +++ b/doc/README @@ -1,4 +1,4 @@ -README for Unbound 1.12.0 +README for Unbound 1.13.0 Copyright 2007 NLnet Labs http://unbound.net diff --git a/doc/example.conf.in b/doc/example.conf.in index 2fe9a2c7e7a7..82ccaa4dd9f9 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -1,7 +1,7 @@ # # Example configuration file. # -# See unbound.conf(5) man page, version 1.12.0. +# See unbound.conf(5) man page, version 1.13.0. # # this is a comment. @@ -161,6 +161,9 @@ server: # msec to wait before close of port on timeout UDP. 0 disables. # delay-close: 0 + # perform connect for UDP sockets to mitigate ICMP side channel. + # udp-connect: yes + # msec for waiting for an unknown server to reply. Increase if you # are behind a slow satellite link, to eg. 1128. # unknown-server-time-limit: 376 @@ -192,6 +195,9 @@ server: # minimum wait time for responses, increase if uplink is long. In msec. # infra-cache-min-rtt: 50 + # enable to make server probe down hosts more frequently. + # infra-keep-probing: no + # the number of slabs to use for the Infrastructure cache. # the number of slabs must be a power of 2. # more slabs reduce lock contention, but fragment memory usage. @@ -788,6 +794,9 @@ server: # service. # http-nodelay: yes + # Disable TLS for DNS-over-HTTP downstream service. + # http-notls-downstream: no + # 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/libunbound.3.in b/doc/libunbound.3.in index 34778ee5c09e..80f7335be05e 100644 --- a/doc/libunbound.3.in +++ b/doc/libunbound.3.in @@ -1,4 +1,4 @@ -.TH "libunbound" "3" "Oct 8, 2020" "NLnet Labs" "unbound 1.12.0" +.TH "libunbound" "3" "Dec 3, 2020" "NLnet Labs" "unbound 1.13.0" .\" .\" libunbound.3 -- unbound library functions manual .\" @@ -44,7 +44,7 @@ .B ub_ctx_zone_remove, .B ub_ctx_data_add, .B ub_ctx_data_remove -\- Unbound DNS validating resolver 1.12.0 functions. +\- Unbound DNS validating resolver 1.13.0 functions. .SH "SYNOPSIS" .B #include <unbound.h> .LP diff --git a/doc/unbound-anchor.8.in b/doc/unbound-anchor.8.in index 21f12ebeff1c..564420da04a7 100644 --- a/doc/unbound-anchor.8.in +++ b/doc/unbound-anchor.8.in @@ -1,4 +1,4 @@ -.TH "unbound-anchor" "8" "Oct 8, 2020" "NLnet Labs" "unbound 1.12.0" +.TH "unbound-anchor" "8" "Dec 3, 2020" "NLnet Labs" "unbound 1.13.0" .\" .\" unbound-anchor.8 -- unbound anchor maintenance utility manual .\" diff --git a/doc/unbound-checkconf.8.in b/doc/unbound-checkconf.8.in index a7389376599a..ab22ad0b676e 100644 --- a/doc/unbound-checkconf.8.in +++ b/doc/unbound-checkconf.8.in @@ -1,4 +1,4 @@ -.TH "unbound-checkconf" "8" "Oct 8, 2020" "NLnet Labs" "unbound 1.12.0" +.TH "unbound-checkconf" "8" "Dec 3, 2020" "NLnet Labs" "unbound 1.13.0" .\" .\" unbound-checkconf.8 -- unbound configuration checker manual .\" diff --git a/doc/unbound-control.8.in b/doc/unbound-control.8.in index f82b62d3d9b6..f63a2f49cee4 100644 --- a/doc/unbound-control.8.in +++ b/doc/unbound-control.8.in @@ -1,4 +1,4 @@ -.TH "unbound-control" "8" "Oct 8, 2020" "NLnet Labs" "unbound 1.12.0" +.TH "unbound-control" "8" "Dec 3, 2020" "NLnet Labs" "unbound 1.13.0" .\" .\" unbound-control.8 -- unbound remote control manual .\" diff --git a/doc/unbound-host.1.in b/doc/unbound-host.1.in index d3b502d92657..e0cc704d39df 100644 --- a/doc/unbound-host.1.in +++ b/doc/unbound-host.1.in @@ -1,4 +1,4 @@ -.TH "unbound\-host" "1" "Oct 8, 2020" "NLnet Labs" "unbound 1.12.0" +.TH "unbound\-host" "1" "Dec 3, 2020" "NLnet Labs" "unbound 1.13.0" .\" .\" unbound-host.1 -- unbound DNS lookup utility .\" diff --git a/doc/unbound.8.in b/doc/unbound.8.in index 44a9879e5872..c012e379eb40 100644 --- a/doc/unbound.8.in +++ b/doc/unbound.8.in @@ -1,4 +1,4 @@ -.TH "unbound" "8" "Oct 8, 2020" "NLnet Labs" "unbound 1.12.0" +.TH "unbound" "8" "Dec 3, 2020" "NLnet Labs" "unbound 1.13.0" .\" .\" unbound.8 -- unbound manual .\" @@ -9,7 +9,7 @@ .\" .SH "NAME" .B unbound -\- Unbound DNS validating resolver 1.12.0. +\- Unbound DNS validating resolver 1.13.0. .SH "SYNOPSIS" .B unbound .RB [ \-h ] diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index bcbc9f205333..a244eee7a70e 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -1,4 +1,4 @@ -.TH "unbound.conf" "5" "Oct 8, 2020" "NLnet Labs" "unbound 1.12.0" +.TH "unbound.conf" "5" "Dec 3, 2020" "NLnet Labs" "unbound 1.13.0" .\" .\" unbound.conf.5 -- unbound.conf manual .\" @@ -274,6 +274,10 @@ eg. 1500 msec. When timeouts happen you need extra sockets, it checks the ID and remote IP of packets, and unwanted packets are added to the unwanted packet counter. .TP +.B udp\-connect: \fI<yes or no> +Perform connect for UDP sockets that mitigates ICMP side channel leakage. +Default is yes. +.TP .B unknown\-server\-time\-limit: \fI<msec> The wait time in msec for waiting for an unknown server to reply. Increase this if you are behind a slow satellite link, to eg. 1128. @@ -382,6 +386,12 @@ Lower limit for dynamic retransmit timeout calculation in infrastructure cache. Default is 50 milliseconds. Increase this value if using forwarders needing more time to do recursive name resolution. .TP +.B infra\-keep\-probing: \fI<yes or no> +If enabled the server keeps probing hosts that are down, in the one probe +at a time regime. Default is no. Hosts that are down, eg. they did +not respond during the one probe at a time period, are marked as down and +it may take \fBinfra\-host\-ttl\fR time to get probed again. +.TP .B define\-tag: \fI<"list of tags"> Define the tags that can be used with local\-zone and access\-control. Enclose the list between quotes ("") and put spaces between tags. @@ -516,7 +526,8 @@ Alternate syntax for \fBtls\-port\fR. If null or "", no file is used. Set it to the certificate bundle file, for example "/etc/pki/tls/certs/ca\-bundle.crt". These certificates are used for authenticating connections made to outside peers. For example auth\-zone -urls, and also DNS over TLS connections. +urls, and also DNS over TLS connections. It is read at start up before +permission drop and chroot. .TP .B ssl\-cert\-bundle: \fI<file> Alternate syntax for \fBtls\-cert\-bundle\fR. @@ -587,6 +598,10 @@ megabytes or gigabytes (1024*1024 bytes in a megabyte). Set TCP_NODELAY socket option on sockets used to provide DNS-over-HTTPS service. Ignored if the option is not available. Default is yes. .TP +.B http\-notls\-downstream: \fI<yes or no> +Disable use of TLS for the downstream DNS-over-HTTP connections. Useful for +local back end servers. Default is no. +.TP .B use\-systemd: \fI<yes or no> Enable or disable systemd socket activation. Default is no. @@ -1535,15 +1550,15 @@ Set the number of servers that should be used for fast server selection. Only use the fastest specified number of servers with the fast\-server\-permil option, that turns this on or off. The default is to use the fastest 3 servers. .TP 5 -.B edns\-client\-tag: \fI<IP netblock> <tag data> -Include an edns-client-tag option in queries with destination address matching -the configured IP netblock. This configuration option can be used multiple -times. The most specific match will be used. The tag data is configured in -decimal format, from 0 to 65535. +.B edns\-client\-string: \fI<IP netblock> <string> +Include an EDNS0 option containing configured ascii string in queries with +destination address matching the configured IP netblock. This configuration +option can be used multiple times. The most specific match will be used. .TP 5 -.B edns\-client\-tag\-opcode: \fI<opcode> -EDNS0 option code for the edns-client-tag option, from 0 to 65535. Default is -16, as assigned by IANA. +.B edns\-client\-string\-opcode: \fI<opcode> +EDNS0 option code for the \fIedns\-client\-string\fR option, from 0 to 65535. +A value from the `Reserved for Local/Experimental` range (65001-65534) should +be used. Default is 65001. .SS "Remote Control Options" In the .B remote\-control: diff --git a/libunbound/context.c b/libunbound/context.c index 713259c718ce..cff2831a77cd 100644 --- a/libunbound/context.c +++ b/libunbound/context.c @@ -80,7 +80,7 @@ context_finalize(struct ub_ctx* ctx) return UB_INITFAIL; if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1, &is_rpz)) return UB_INITFAIL; - if(!edns_tags_apply_cfg(ctx->env->edns_tags, cfg)) + if(!edns_strings_apply_cfg(ctx->env->edns_strings, cfg)) return UB_INITFAIL; if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size, cfg->msg_cache_slabs)) { diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c index 3922eb0417f8..c9e24ba8d8f2 100644 --- a/libunbound/libunbound.c +++ b/libunbound/libunbound.c @@ -154,8 +154,8 @@ static struct ub_ctx* ub_ctx_create_nopipe(void) errno = ENOMEM; return NULL; } - ctx->env->edns_tags = edns_tags_create(); - if(!ctx->env->edns_tags) { + ctx->env->edns_strings = edns_strings_create(); + if(!ctx->env->edns_strings) { auth_zones_delete(ctx->env->auth_zones); edns_known_options_delete(ctx->env); config_delete(ctx->env->cfg); @@ -186,7 +186,7 @@ ub_ctx_create(void) config_delete(ctx->env->cfg); modstack_desetup(&ctx->mods, ctx->env); edns_known_options_delete(ctx->env); - edns_tags_delete(ctx->env->edns_tags); + edns_strings_delete(ctx->env->edns_strings); free(ctx->env); free(ctx); errno = e; @@ -199,7 +199,7 @@ ub_ctx_create(void) config_delete(ctx->env->cfg); modstack_desetup(&ctx->mods, ctx->env); edns_known_options_delete(ctx->env); - edns_tags_delete(ctx->env->edns_tags); + edns_strings_delete(ctx->env->edns_strings); free(ctx->env); free(ctx); errno = e; @@ -338,7 +338,7 @@ ub_ctx_delete(struct ub_ctx* ctx) infra_delete(ctx->env->infra_cache); config_delete(ctx->env->cfg); edns_known_options_delete(ctx->env); - edns_tags_delete(ctx->env->edns_tags); + edns_strings_delete(ctx->env->edns_strings); auth_zones_delete(ctx->env->auth_zones); free(ctx->env); } diff --git a/libunbound/libworker.c b/libunbound/libworker.c index bd42462e1be6..06cbb8869f61 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -238,7 +238,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb) ports, numports, cfg->unwanted_threshold, cfg->outgoing_tcp_mss, &libworker_alloc_cleanup, w, cfg->do_udp || cfg->udp_upstream_without_downstream, w->sslctx, - cfg->delay_close, cfg->tls_use_sni, NULL); + cfg->delay_close, cfg->tls_use_sni, NULL, cfg->udp_connect); w->env->outnet = w->back; if(!w->is_bg || w->is_bg_thread) { lock_basic_unlock(&ctx->cfglock); diff --git a/pythonmod/doc/examples/example6.rst b/pythonmod/doc/examples/example6.rst index d294fb8be618..fd6caf74d549 100644 --- a/pythonmod/doc/examples/example6.rst +++ b/pythonmod/doc/examples/example6.rst @@ -60,7 +60,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh states. :return: True on success, False on failure. @@ -105,8 +104,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -154,8 +151,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -201,8 +196,6 @@ The callback function's prototype is the following: :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. diff --git a/pythonmod/doc/modules/functions.rst b/pythonmod/doc/modules/functions.rst index 43c66eb380dd..333f696b814f 100644 --- a/pythonmod/doc/modules/functions.rst +++ b/pythonmod/doc/modules/functions.rst @@ -89,7 +89,7 @@ EDNS options Inplace callbacks ----------------- -.. function:: inplace_cb_reply(qinfo, qstate, rep, rcode, edns, opt_list_out, region) +.. function:: inplace_cb_reply(qinfo, qstate, rep, rcode, edns, opt_list_out, region, \*\*kwargs) Function prototype for callback functions used in `register_inplace_cb_reply`_, `register_inplace_cb_reply_cache`_, @@ -102,6 +102,9 @@ Inplace callbacks :param edns: :class:`edns_data` :param opt_list_out: :class:`edns_option`. EDNS option list to append options to. :param region: :class:`regional` + :param \*\*kwargs: Dictionary that may contain parameters added in a future + release. Current parameters: + ``repinfo``: :class:`comm_reply`. Reply information for a communication point. .. function:: inplace_cb_query(qinfo, flags, qstate, addr, zone, region) diff --git a/pythonmod/examples/inplace_callbacks.py b/pythonmod/examples/inplace_callbacks.py index 768c2d0138c5..de375b4e12fc 100644 --- a/pythonmod/examples/inplace_callbacks.py +++ b/pythonmod/examples/inplace_callbacks.py @@ -43,7 +43,7 @@ # This query returns SERVFAIL as the txt record of bogus.nlnetlabs.nl is # intentionally bogus. The reply will contain an empty EDNS option # with option code 65003. -# Unbound will also log the source address(es) of the client(s) that made +# Unbound will also log the source address of the client that made # the request. # (unbound needs to be validating for this example to work) @@ -91,8 +91,6 @@ def inplace_reply_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -121,8 +119,6 @@ def inplace_cache_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -173,8 +169,6 @@ def inplace_local_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. @@ -205,13 +199,11 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, :param **kwargs: Dictionary that may contain parameters added in a future release. Current parameters: ``repinfo``: Reply information for a communication point (comm_reply). - It is None when the callback happens in the mesh - states(modules). :return: True on success, False on failure. For demonstration purposes we want to reply with an empty EDNS code '65003' - and log the IP address(es) of the client(s). + and log the IP address of the client. """ log_info("python: called back while servfail.") @@ -219,30 +211,14 @@ def inplace_servfail_callback(qinfo, qstate, rep, rcode, edns, opt_list_out, b = bytearray.fromhex("") edns_opt_list_append(opt_list_out, 65003, b, region) - # Log the client(s) IP address(es) + # Log the client's IP address comm_reply = kwargs['repinfo'] if comm_reply: - # If it is not None this callback was called before the query reached - # the mesh states(modules). There is only one client associated with - # this query. addr = comm_reply.addr port = comm_reply.port addr_family = comm_reply.family log_info("python: Client IP: {}({}), port: {}" "".format(addr, addr_family, port)) - else: - # If it is not None this callback was called while the query is in the - # mesh states(modules). In this case they may be multiple clients - # waiting for this query. - # The following code is the same as with the resip.py example. - rl = qstate.mesh_info.reply_list - while (rl): - if rl.query_reply: - q = rl.query_reply - log_info("python: Client IP: {}({}), port: {}" - "".format(q.addr, q.family, q.port)) - rl = rl.next - return True diff --git a/pythonmod/interface.i b/pythonmod/interface.i index 71f2bf774d0f..cbee4f714764 100644 --- a/pythonmod/interface.i +++ b/pythonmod/interface.i @@ -1413,6 +1413,19 @@ struct delegpt* find_delegation(struct module_qstate* qstate, char *nm, size_t n /****************************** * Various debugging functions * ******************************/ + +/* rename the variadic functions because python does the formatting already*/ +%rename (unbound_log_info) log_info; +%rename (unbound_log_err) log_err; +%rename (unbound_log_warn) log_warn; +%rename (unbound_verbose) verbose; +/* provide functions that take one string as argument, so python can cook +the string */ +%rename (log_info) pymod_log_info; +%rename (log_warn) pymod_log_warn; +%rename (log_err) pymod_log_err; +%rename (verbose) pymod_verbose; + void verbose(enum verbosity_value level, const char* format, ...); void log_info(const char* format, ...); void log_err(const char* format, ...); @@ -1422,6 +1435,19 @@ void log_dns_msg(const char* str, struct query_info* qinfo, struct reply_info* r void log_query_info(enum verbosity_value v, const char* str, struct query_info* qinf); void regional_log_stats(struct regional *r); +/* the one argument string log functions */ +void pymod_log_info(const char* str); +void pymod_log_err(const char* str); +void pymod_log_warn(const char* str); +void pymod_verbose(enum verbosity_value level, const char* str); +%{ +void pymod_log_info(const char* str) { log_info("%s", str); } +void pymod_log_err(const char* str) { log_err("%s", str); } +void pymod_log_warn(const char* str) { log_warn("%s", str); } +void pymod_verbose(enum verbosity_value level, const char* str) { + verbose(level, "%s", str); } +%} + /*************************************************************************** * Free allocated memory from marked sources returning corresponding types * ***************************************************************************/ diff --git a/respip/respip.c b/respip/respip.c index 6fa4f18851fd..9ee098def820 100644 --- a/respip/respip.c +++ b/respip/respip.c @@ -914,7 +914,7 @@ respip_rewrite_reply(const struct query_info* qinfo, int ret = 1; struct ub_packed_rrset_key* redirect_rrset = NULL; struct rpz* r; - struct auth_zone* a; + struct auth_zone* a = NULL; struct ub_packed_rrset_key* data = NULL; int rpz_used = 0; int rpz_log = 0; @@ -1109,7 +1109,7 @@ respip_operate(struct module_qstate* qstate, enum module_ev event, int id, qstate->return_msg && qstate->return_msg->rep) { struct reply_info* new_rep = qstate->return_msg->rep; struct ub_packed_rrset_key* alias_rrset = NULL; - struct respip_action_info actinfo = {0}; + struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL}; actinfo.action = respip_none; if(!respip_rewrite_reply(&qstate->qinfo, @@ -1170,7 +1170,7 @@ respip_merge_cname(struct reply_info* base_rep, struct ub_packed_rrset_key* alias_rrset = NULL; /* ditto */ uint16_t tgt_rcode; size_t i, j; - struct respip_action_info actinfo = {0}; + struct respip_action_info actinfo = {0, 0, 0, 0, NULL, 0, NULL}; actinfo.action = respip_none; /* If the query for the CNAME target would result in an unusual rcode, diff --git a/services/authzone.c b/services/authzone.c index a26d1003abe2..15be5d60c653 100644 --- a/services/authzone.c +++ b/services/authzone.c @@ -5387,6 +5387,7 @@ void auth_xfer_transfer_lookup_callback(void* arg, int rcode, sldns_buffer* buf, verbose(VERB_ALGO, "auth zone %s host %s type %s transfer lookup has no answer", zname, xfr->task_transfer->lookup_target->host, (xfr->task_transfer->lookup_aaaa?"AAAA":"A")); } } + regional_free_all(temp); } else { if(verbosity >= VERB_ALGO) { char zname[255+1]; @@ -6444,6 +6445,7 @@ void auth_xfer_probe_lookup_callback(void* arg, int rcode, sldns_buffer* buf, verbose(VERB_ALGO, "auth zone %s host %s type %s probe lookup has no address", zname, xfr->task_probe->lookup_target->host, (xfr->task_probe->lookup_aaaa?"AAAA":"A")); } } + regional_free_all(temp); } else { if(verbosity >= VERB_ALGO) { char zname[255+1]; diff --git a/services/cache/infra.c b/services/cache/infra.c index c2484a9f1aa8..2d16bcd6e405 100644 --- a/services/cache/infra.c +++ b/services/cache/infra.c @@ -244,6 +244,7 @@ infra_create(struct config_file* cfg) return NULL; } infra->host_ttl = cfg->host_ttl; + infra->infra_keep_probing = cfg->infra_keep_probing; infra_dp_ratelimit = cfg->ratelimit; infra->domain_rates = slabhash_create(cfg->ratelimit_slabs, INFRA_HOST_STARTSIZE, cfg->ratelimit_size, @@ -297,6 +298,7 @@ infra_adjust(struct infra_cache* infra, struct config_file* cfg) if(!infra) return infra_create(cfg); infra->host_ttl = cfg->host_ttl; + infra->infra_keep_probing = cfg->infra_keep_probing; infra_dp_ratelimit = cfg->ratelimit; infra_ip_ratelimit = cfg->ip_ratelimit; maxmem = cfg->infra_cache_numhosts * (sizeof(struct infra_key)+ @@ -445,6 +447,7 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, if(e && ((struct infra_data*)e->data)->ttl < timenow) { /* it expired, try to reuse existing entry */ int old = ((struct infra_data*)e->data)->rtt.rto; + time_t tprobe = ((struct infra_data*)e->data)->probedelay; uint8_t tA = ((struct infra_data*)e->data)->timeout_A; uint8_t tAAAA = ((struct infra_data*)e->data)->timeout_AAAA; uint8_t tother = ((struct infra_data*)e->data)->timeout_other; @@ -460,6 +463,7 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, if(old >= USEFUL_SERVER_TOP_TIMEOUT) { ((struct infra_data*)e->data)->rtt.rto = USEFUL_SERVER_TOP_TIMEOUT; + ((struct infra_data*)e->data)->probedelay = tprobe; ((struct infra_data*)e->data)->timeout_A = tA; ((struct infra_data*)e->data)->timeout_AAAA = tAAAA; ((struct infra_data*)e->data)->timeout_other = tother; @@ -482,7 +486,8 @@ infra_host(struct infra_cache* infra, struct sockaddr_storage* addr, *edns_vs = data->edns_version; *edns_lame_known = data->edns_lame_known; *to = rtt_timeout(&data->rtt); - if(*to >= PROBE_MAXRTO && rtt_notimeout(&data->rtt)*4 <= *to) { + if(*to >= PROBE_MAXRTO && (infra->infra_keep_probing || + rtt_notimeout(&data->rtt)*4 <= *to)) { /* delay other queries, this is the probe query */ if(!wr) { lock_rw_unlock(&e->lock); @@ -566,18 +571,27 @@ infra_rtt_update(struct infra_cache* infra, struct sockaddr_storage* addr, struct lruhash_entry* e = infra_lookup_nottl(infra, addr, addrlen, nm, nmlen, 1); struct infra_data* data; - int needtoinsert = 0; + int needtoinsert = 0, expired = 0; int rto = 1; + time_t oldprobedelay = 0; if(!e) { if(!(e = new_entry(infra, addr, addrlen, nm, nmlen, timenow))) return 0; needtoinsert = 1; } else if(((struct infra_data*)e->data)->ttl < timenow) { + oldprobedelay = ((struct infra_data*)e->data)->probedelay; data_entry_init(infra, e, timenow); + expired = 1; } /* have an entry, update the rtt */ data = (struct infra_data*)e->data; if(roundtrip == -1) { + if(needtoinsert || expired) { + /* timeout on entry that has expired before the timer + * keep old timeout from the function caller */ + data->rtt.rto = orig_rtt; + data->probedelay = oldprobedelay; + } rtt_lost(&data->rtt, orig_rtt); if(qtype == LDNS_RR_TYPE_A) { if(data->timeout_A < TIMEOUT_COUNT_MAX) @@ -681,7 +695,12 @@ infra_get_lame_rtt(struct infra_cache* infra, return 0; host = (struct infra_data*)e->data; *rtt = rtt_unclamped(&host->rtt); - if(host->rtt.rto >= PROBE_MAXRTO && timenow < host->probedelay + if(host->rtt.rto >= PROBE_MAXRTO && timenow >= host->probedelay + && infra->infra_keep_probing) { + /* single probe, keep probing */ + if(*rtt >= USEFUL_SERVER_TOP_TIMEOUT) + *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000; + } else if(host->rtt.rto >= PROBE_MAXRTO && timenow < host->probedelay && rtt_notimeout(&host->rtt)*4 <= host->rtt.rto) { /* single probe for this domain, and we are not probing */ /* unless the query type allows a probe to happen */ @@ -704,7 +723,8 @@ infra_get_lame_rtt(struct infra_cache* infra, /* see if this can be a re-probe of an unresponsive server */ /* minus 1000 because that is outside of the RTTBAND, so * blacklisted servers stay blacklisted if this is chosen */ - if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT) { + if(host->rtt.rto >= USEFUL_SERVER_TOP_TIMEOUT || + infra->infra_keep_probing) { lock_rw_unlock(&e->lock); *rtt = USEFUL_SERVER_TOP_TIMEOUT-1000; *lame = 0; diff --git a/services/cache/infra.h b/services/cache/infra.h index e33f2a6c04ee..14f97c4c64d3 100644 --- a/services/cache/infra.h +++ b/services/cache/infra.h @@ -114,6 +114,8 @@ struct infra_cache { struct slabhash* hosts; /** TTL value for host information, in seconds */ int host_ttl; + /** the hosts that are down are kept probed for recovery */ + int infra_keep_probing; /** hash table with query rates per name: rate_key, rate_data */ struct slabhash* domain_rates; /** ratelimit settings for domains, struct domain_limit_data */ diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 3a98c264297a..d63c0e0aab00 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -43,6 +43,7 @@ # include <sys/types.h> #endif #include <sys/time.h> +#include <limits.h> #ifdef USE_TCP_FASTOPEN #include <netinet/tcp.h> #endif @@ -81,9 +82,6 @@ /** number of queued TCP connections for listen() */ #define TCP_BACKLOG 256 -/** number of simultaneous requests a client can have */ -#define TCP_MAX_REQ_SIMULTANEOUS 32 - #ifndef THREADS_DISABLED /** lock on the counter of stream buffer memory */ static lock_basic_type stream_wait_count_lock; @@ -533,7 +531,9 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, return -1; } } -# elif defined(IP_DONTFRAG) +# elif defined(IP_DONTFRAG) && !defined(__APPLE__) + /* the IP_DONTFRAG option if defined in the 11.0 OSX headers, + * but does not work on that version, so we exclude it */ int off = 0; if (setsockopt(s, IPPROTO_IP, IP_DONTFRAG, &off, (socklen_t)sizeof(off)) < 0) { @@ -1244,8 +1244,9 @@ struct listen_dnsport* listen_create(struct comm_base* base, struct listen_port* ports, size_t bufsize, int tcp_accept_count, int tcp_idle_timeout, int harden_large_queries, uint32_t http_max_streams, - char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx, - struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg) + char* http_endpoint, int http_notls, struct tcl_list* tcp_conn_limit, + void* sslctx, struct dt_env* dtenv, comm_point_callback_type* cb, + void *cb_arg) { struct listen_dnsport* front = (struct listen_dnsport*) malloc(sizeof(struct listen_dnsport)); @@ -1295,15 +1296,19 @@ listen_create(struct comm_base* base, struct listen_port* ports, http_max_streams, http_endpoint, tcp_conn_limit, bufsize, front->udp_buff, ports->ftype, cb, cb_arg); - cp->ssl = sslctx; + if(http_notls && ports->ftype == listen_type_http) + cp->ssl = NULL; + else + cp->ssl = sslctx; if(ports->ftype == listen_type_http) { - if(!sslctx) { - log_warn("HTTPS port configured, but no TLS " + if(!sslctx && !http_notls) { + log_warn("HTTPS port configured, but no TLS " "tls-service-key or tls-service-pem " "set"); } #ifndef HAVE_SSL_CTX_SET_ALPN_SELECT_CB - log_warn("Unbound is not compiled with an " + if(!http_notls) + log_warn("Unbound is not compiled with an " "OpenSSL version supporting ALPN " " (OpenSSL >= 1.0.2). This is required " "to use DNS-over-HTTPS"); @@ -1402,6 +1407,7 @@ static int resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addresses, int *ip_addresses_size) { struct ifaddrs *ifa; + void *tmpbuf; int last_ip_addresses_size = *ip_addresses_size; for(ifa = ifas; ifa != NULL; ifa = ifa->ifa_next) { @@ -1466,10 +1472,12 @@ resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addres } verbose(4, "interface %s has address %s", search_ifa, addr_buf); - *ip_addresses = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); - if(!*ip_addresses) { + tmpbuf = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); + if(!tmpbuf) { log_err("realloc failed: out of memory"); return 0; + } else { + *ip_addresses = tmpbuf; } (*ip_addresses)[*ip_addresses_size] = strdup(addr_buf); if(!(*ip_addresses)[*ip_addresses_size]) { @@ -1480,10 +1488,12 @@ resolve_ifa_name(struct ifaddrs *ifas, const char *search_ifa, char ***ip_addres } if (*ip_addresses_size == last_ip_addresses_size) { - *ip_addresses = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); - if(!*ip_addresses) { + tmpbuf = realloc(*ip_addresses, sizeof(char *) * (*ip_addresses_size + 1)); + if(!tmpbuf) { log_err("realloc failed: out of memory"); return 0; + } else { + *ip_addresses = tmpbuf; } (*ip_addresses)[*ip_addresses_size] = strdup(search_ifa); if(!(*ip_addresses)[*ip_addresses_size]) { @@ -1804,8 +1814,7 @@ tcp_req_info_setup_listen(struct tcp_req_info* req) if(!req->cp->tcp_is_reading) wr = 1; - if(req->num_open_req + req->num_done_req < TCP_MAX_REQ_SIMULTANEOUS && - !req->read_is_closed) + if(!req->read_is_closed) rd = 1; if(wr) { @@ -2177,9 +2186,10 @@ int http2_submit_dns_response(struct http2_session* h2_session) int ret; nghttp2_data_provider data_prd; char status[4]; - nghttp2_nv headers[2]; + nghttp2_nv headers[3]; struct http2_stream* h2_stream = h2_session->c->h2_stream; size_t rlen; + char rlen_str[32]; if(h2_stream->rbuffer) { log_err("http2 submit response error: rbuffer already " @@ -2198,6 +2208,8 @@ int http2_submit_dns_response(struct http2_session* h2_session) } rlen = sldns_buffer_remaining(h2_session->c->buffer); + snprintf(rlen_str, sizeof(rlen_str), "%u", (unsigned)rlen); + lock_basic_lock(&http2_response_buffer_count_lock); if(http2_response_buffer_count + rlen > http2_response_buffer_max) { lock_basic_unlock(&http2_response_buffer_count_lock); @@ -2228,13 +2240,11 @@ int http2_submit_dns_response(struct http2_session* h2_session) headers[1].valuelen = 23; headers[1].flags = NGHTTP2_NV_FLAG_NONE; - /*TODO be nice and add the content-length header headers[2].name = (uint8_t*)"content-length"; headers[2].namelen = 14; - headers[2].value = - headers[2].valuelen = + headers[2].value = (uint8_t*)rlen_str; + headers[2].valuelen = strlen(rlen_str); headers[2].flags = NGHTTP2_NV_FLAG_NONE; - */ sldns_buffer_write(h2_stream->rbuffer, sldns_buffer_current(h2_session->c->buffer), @@ -2244,7 +2254,7 @@ int http2_submit_dns_response(struct http2_session* h2_session) data_prd.source.ptr = h2_session; data_prd.read_callback = http2_submit_response_read_callback; ret = nghttp2_submit_response(h2_session->session, h2_stream->stream_id, - headers, 2, &data_prd); + headers, 3, &data_prd); if(ret) { verbose(VERB_QUERY, "http2: set_stream_user_data failed, " "error: %s", nghttp2_strerror(ret)); diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h index 4bbde0691fec..9d6ea2c33adf 100644 --- a/services/listen_dnsport.h +++ b/services/listen_dnsport.h @@ -159,6 +159,7 @@ int resolve_interface_names(struct config_file* cfg, char*** resif, * @param harden_large_queries: whether query size should be limited. * @param http_max_streams: maximum number of HTTP/2 streams per connection. * @param http_endpoint: HTTP endpoint to service queries on + * @param http_notls: no TLS for http downstream * @param tcp_conn_limit: TCP connection limit info. * @param sslctx: nonNULL if ssl context. * @param dtenv: nonNULL if dnstap enabled. @@ -171,8 +172,9 @@ struct listen_dnsport* listen_create(struct comm_base* base, struct listen_port* ports, size_t bufsize, int tcp_accept_count, int tcp_idle_timeout, int harden_large_queries, uint32_t http_max_streams, - char* http_endpoint, struct tcl_list* tcp_conn_limit, void* sslctx, - struct dt_env* dtenv, comm_point_callback_type* cb, void *cb_arg); + char* http_endpoint, int http_notls, struct tcl_list* tcp_conn_limit, + void* sslctx, struct dt_env* dtenv, comm_point_callback_type* cb, + void *cb_arg); /** * delete the listening structure diff --git a/services/localzone.c b/services/localzone.c index 6aaf0c05518c..cad46066334c 100644 --- a/services/localzone.c +++ b/services/localzone.c @@ -157,7 +157,7 @@ local_zone_create(uint8_t* nm, size_t len, int labs, z->namelen = len; z->namelabs = labs; lock_rw_init(&z->lock); - z->region = regional_create_custom(sizeof(struct regional)); + z->region = regional_create_nochunk(sizeof(struct regional)); if(!z->region) { free(z); return NULL; diff --git a/services/mesh.c b/services/mesh.c index 52ff97e4a2e8..cd90509366f2 100644 --- a/services/mesh.c +++ b/services/mesh.c @@ -1196,6 +1196,12 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, /* Copy the client's EDNS for later restore, to make sure the edns * compare is with the correct edns options. */ struct edns_data edns_bak = r->edns; + /* briefly set the replylist to null in case the + * meshsendreply calls tcpreqinfo sendreply that + * comm_point_drops because of size, and then the + * null stops the mesh state remove and thus + * reply_list modification and accounting */ + struct mesh_reply* rlist = m->reply_list; /* examine security status */ if(m->s.env->need_to_validate && (!(r->qflags&BIT_CD) || m->s.env->cfg->ignore_cd) && rep && @@ -1218,15 +1224,21 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, r->h2_stream->mesh_state = NULL; } /* send the reply */ - /* We don't reuse the encoded answer if either the previous or current - * response has a local alias. We could compare the alias records - * and still reuse the previous answer if they are the same, but that - * would be complicated and error prone for the relatively minor case. - * So we err on the side of safety. */ - if(prev && prev_buffer && prev->qflags == r->qflags && + /* We don't reuse the encoded answer if: + * - either the previous or current response has a local alias. We could + * compare the alias records and still reuse the previous answer if they + * are the same, but that would be complicated and error prone for the + * relatively minor case. So we err on the side of safety. + * - there are registered callback functions for the given rcode, as these + * need to be called for each reply. */ + if(((rcode != LDNS_RCODE_SERVFAIL && + !m->s.env->inplace_cb_lists[inplace_cb_reply]) || + (rcode == LDNS_RCODE_SERVFAIL && + !m->s.env->inplace_cb_lists[inplace_cb_reply_servfail])) && + prev && prev_buffer && prev->qflags == r->qflags && !prev->local_alias && !r->local_alias && - prev->edns.edns_present == r->edns.edns_present && - prev->edns.bits == r->edns.bits && + prev->edns.edns_present == r->edns.edns_present && + prev->edns.bits == r->edns.bits && prev->edns.udp_size == r->edns.udp_size && edns_opt_list_compare(prev->edns.opt_list, r->edns.opt_list) == 0) { @@ -1236,22 +1248,26 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, sldns_buffer_write_at(r_buffer, 0, &r->qid, sizeof(uint16_t)); sldns_buffer_write_at(r_buffer, 12, r->qname, m->s.qinfo.qname_len); + m->reply_list = NULL; comm_point_send_reply(&r->query_reply); + m->reply_list = rlist; } else if(rcode) { m->s.qinfo.qname = r->qname; m->s.qinfo.local_alias = r->local_alias; if(rcode == LDNS_RCODE_SERVFAIL) { if(!inplace_cb_reply_servfail_call(m->s.env, &m->s.qinfo, &m->s, - rep, rcode, &r->edns, NULL, m->s.region)) + rep, rcode, &r->edns, &r->query_reply, m->s.region)) r->edns.opt_list = NULL; } else { if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep, rcode, - &r->edns, NULL, m->s.region)) + &r->edns, &r->query_reply, m->s.region)) r->edns.opt_list = NULL; } error_encode(r_buffer, rcode, &m->s.qinfo, r->qid, r->qflags, &r->edns); + m->reply_list = NULL; comm_point_send_reply(&r->query_reply); + m->reply_list = rlist; } else { size_t udp_size = r->edns.udp_size; r->edns.edns_version = EDNS_ADVERTISED_VERSION; @@ -1261,7 +1277,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, m->s.qinfo.qname = r->qname; m->s.qinfo.local_alias = r->local_alias; if(!inplace_cb_reply_call(m->s.env, &m->s.qinfo, &m->s, rep, - LDNS_RCODE_NOERROR, &r->edns, NULL, m->s.region) || + LDNS_RCODE_NOERROR, &r->edns, &r->query_reply, m->s.region) || !apply_edns_options(&r->edns, &edns_bak, m->s.env->cfg, r->query_reply.c, m->s.region) || @@ -1271,13 +1287,15 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, secure)) { if(!inplace_cb_reply_servfail_call(m->s.env, &m->s.qinfo, &m->s, - rep, LDNS_RCODE_SERVFAIL, &r->edns, NULL, m->s.region)) + rep, LDNS_RCODE_SERVFAIL, &r->edns, &r->query_reply, m->s.region)) r->edns.opt_list = NULL; error_encode(r_buffer, LDNS_RCODE_SERVFAIL, &m->s.qinfo, r->qid, r->qflags, &r->edns); } r->edns = edns_bak; + m->reply_list = NULL; comm_point_send_reply(&r->query_reply); + m->reply_list = rlist; } /* account */ log_assert(m->s.env->mesh->num_reply_addrs > 0); @@ -1365,20 +1383,12 @@ void mesh_query_done(struct mesh_state* mstate) mstate->reply_list = reply_list; } else { struct sldns_buffer* r_buffer = r->query_reply.c->buffer; - struct mesh_reply* rlist = mstate->reply_list; if(r->query_reply.c->tcp_req_info) { r_buffer = r->query_reply.c->tcp_req_info->spool_buffer; prev_buffer = NULL; } - /* briefly set the replylist to null in case the - * meshsendreply calls tcpreqinfo sendreply that - * comm_point_drops because of size, and then the - * null stops the mesh state remove and thus - * reply_list modification and accounting */ - mstate->reply_list = NULL; mesh_send_reply(mstate, mstate->s.return_rcode, rep, r, r_buffer, prev, prev_buffer); - mstate->reply_list = rlist; if(r->query_reply.c->tcp_req_info) { tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate); r_buffer = NULL; @@ -1894,7 +1904,7 @@ mesh_serve_expired_callback(void* arg) { struct mesh_state* mstate = (struct mesh_state*) arg; struct module_qstate* qstate = &mstate->s; - struct mesh_reply* r, *rlist; + struct mesh_reply* r; struct mesh_area* mesh = qstate->env->mesh; struct dns_msg* msg; struct mesh_cb* c; @@ -1999,15 +2009,8 @@ mesh_serve_expired_callback(void* arg) r_buffer = r->query_reply.c->buffer; if(r->query_reply.c->tcp_req_info) r_buffer = r->query_reply.c->tcp_req_info->spool_buffer; - /* briefly set the replylist to null in case the meshsendreply - * calls tcpreqinfo sendreply that comm_point_drops because - * of size, and then the null stops the mesh state remove and - * thus reply_list modification and accounting */ - rlist = mstate->reply_list; - mstate->reply_list = NULL; mesh_send_reply(mstate, LDNS_RCODE_NOERROR, msg->rep, r, r_buffer, prev, prev_buffer); - mstate->reply_list = rlist; if(r->query_reply.c->tcp_req_info) tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate); prev = r; diff --git a/services/outside_network.c b/services/outside_network.c index 41a1d83f1454..11951adea7bc 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -132,6 +132,52 @@ serviced_cmp(const void* key1, const void* key2) return sockaddr_cmp(&q1->addr, q1->addrlen, &q2->addr, q2->addrlen); } +/** compare if the reuse element has the same address, port and same ssl-is + * used-for-it characteristic */ +static int +reuse_cmp_addrportssl(const void* key1, const void* key2) +{ + struct reuse_tcp* r1 = (struct reuse_tcp*)key1; + struct reuse_tcp* r2 = (struct reuse_tcp*)key2; + int r; + /* compare address and port */ + r = sockaddr_cmp(&r1->addr, r1->addrlen, &r2->addr, r2->addrlen); + if(r != 0) + return r; + + /* compare if SSL-enabled */ + if(r1->is_ssl && !r2->is_ssl) + return 1; + if(!r1->is_ssl && r2->is_ssl) + return -1; + return 0; +} + +int +reuse_cmp(const void* key1, const void* key2) +{ + int r; + r = reuse_cmp_addrportssl(key1, key2); + if(r != 0) + return r; + + /* compare ptr value */ + if(key1 < key2) return -1; + if(key1 > key2) return 1; + return 0; +} + +int reuse_id_cmp(const void* key1, const void* key2) +{ + struct waiting_tcp* w1 = (struct waiting_tcp*)key1; + struct waiting_tcp* w2 = (struct waiting_tcp*)key2; + if(w1->id < w2->id) + return -1; + if(w1->id > w2->id) + return 1; + return 0; +} + /** delete waiting_tcp entry. Does not unlink from waiting list. * @param w: to delete. */ @@ -280,15 +326,234 @@ outnet_tcp_connect(int s, struct sockaddr_storage* addr, socklen_t addrlen) return 1; } +/** log reuse item addr and ptr with message */ +static void +log_reuse_tcp(enum verbosity_value v, const char* msg, struct reuse_tcp* reuse) +{ + uint16_t port; + char addrbuf[128]; + if(verbosity < v) return; + addr_to_str(&reuse->addr, reuse->addrlen, addrbuf, sizeof(addrbuf)); + port = ntohs(((struct sockaddr_in*)&reuse->addr)->sin_port); + verbose(v, "%s %s#%u fd %d", msg, addrbuf, (unsigned)port, + reuse->pending->c->fd); +} + +/** pop the first element from the writewait list */ +static struct waiting_tcp* reuse_write_wait_pop(struct reuse_tcp* reuse) +{ + struct waiting_tcp* w = reuse->write_wait_first; + if(!w) + return NULL; + log_assert(w->write_wait_queued); + log_assert(!w->write_wait_prev); + reuse->write_wait_first = w->write_wait_next; + if(w->write_wait_next) + w->write_wait_next->write_wait_prev = NULL; + else reuse->write_wait_last = NULL; + w->write_wait_queued = 0; + return w; +} + +/** remove the element from the writewait list */ +static void reuse_write_wait_remove(struct reuse_tcp* reuse, + struct waiting_tcp* w) +{ + if(!w) + return; + if(!w->write_wait_queued) + return; + if(w->write_wait_prev) + w->write_wait_prev->write_wait_next = w->write_wait_next; + else reuse->write_wait_first = w->write_wait_next; + if(w->write_wait_next) + w->write_wait_next->write_wait_prev = w->write_wait_prev; + else reuse->write_wait_last = w->write_wait_prev; + w->write_wait_queued = 0; +} + +/** 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) +{ + if(!w) return; + log_assert(!w->write_wait_queued); + if(reuse->write_wait_last) { + reuse->write_wait_last->write_wait_next = w; + w->write_wait_prev = reuse->write_wait_last; + } else { + reuse->write_wait_first = w; + } + reuse->write_wait_last = w; + w->write_wait_queued = 1; +} + +/** insert element in tree by id */ +void +reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w) +{ + log_assert(w->id_node.key == NULL); + w->id_node.key = w; + rbtree_insert(&reuse->tree_by_id, &w->id_node); +} + +/** find element in tree by id */ +struct waiting_tcp* +reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id) +{ + struct waiting_tcp key_w; + rbnode_type* n; + memset(&key_w, 0, sizeof(key_w)); + key_w.id_node.key = &key_w; + key_w.id = id; + n = rbtree_search(&reuse->tree_by_id, &key_w); + if(!n) return NULL; + return (struct waiting_tcp*)n->key; +} + +/** return ID value of rbnode in tree_by_id */ +static uint16_t +tree_by_id_get_id(rbnode_type* node) +{ + struct waiting_tcp* w = (struct waiting_tcp*)node->key; + return w->id; +} + +/** insert into reuse tcp tree and LRU, false on failure (duplicate) */ +static int +reuse_tcp_insert(struct outside_network* outnet, struct pending_tcp* pend_tcp) +{ + log_reuse_tcp(VERB_CLIENT, "reuse_tcp_insert", &pend_tcp->reuse); + if(pend_tcp->reuse.item_on_lru_list) + return 1; + pend_tcp->reuse.node.key = &pend_tcp->reuse; + pend_tcp->reuse.pending = pend_tcp; + if(!rbtree_insert(&outnet->tcp_reuse, &pend_tcp->reuse.node)) { + /* this is a duplicate connection, close this one */ + verbose(VERB_CLIENT, "reuse_tcp_insert: duplicate connection"); + pend_tcp->reuse.node.key = NULL; + return 0; + } + /* insert into LRU, first is newest */ + pend_tcp->reuse.lru_prev = NULL; + if(outnet->tcp_reuse_first) { + pend_tcp->reuse.lru_next = outnet->tcp_reuse_first; + outnet->tcp_reuse_first->lru_prev = &pend_tcp->reuse; + } else { + pend_tcp->reuse.lru_next = NULL; + outnet->tcp_reuse_last = &pend_tcp->reuse; + } + outnet->tcp_reuse_first = &pend_tcp->reuse; + pend_tcp->reuse.item_on_lru_list = 1; + return 1; +} + +/** find reuse tcp stream to destination for query, or NULL if none */ +static struct reuse_tcp* +reuse_tcp_find(struct outside_network* outnet, struct sockaddr_storage* addr, + socklen_t addrlen, int use_ssl) +{ + struct waiting_tcp key_w; + struct pending_tcp key_p; + struct comm_point c; + rbnode_type* result = NULL, *prev; + verbose(VERB_CLIENT, "reuse_tcp_find"); + memset(&key_w, 0, sizeof(key_w)); + memset(&key_p, 0, sizeof(key_p)); + memset(&c, 0, sizeof(c)); + key_p.query = &key_w; + key_p.c = &c; + key_p.reuse.pending = &key_p; + key_p.reuse.node.key = &key_p.reuse; + if(use_ssl) + key_p.reuse.is_ssl = 1; + if(addrlen > (socklen_t)sizeof(key_p.reuse.addr)) + return NULL; + memmove(&key_p.reuse.addr, addr, addrlen); + key_p.reuse.addrlen = addrlen; + + verbose(VERB_CLIENT, "reuse_tcp_find: num reuse streams %u", + (unsigned)outnet->tcp_reuse.count); + if(outnet->tcp_reuse.root == NULL || + outnet->tcp_reuse.root == RBTREE_NULL) + return NULL; + if(rbtree_find_less_equal(&outnet->tcp_reuse, &key_p.reuse.node, + &result)) { + /* exact match */ + /* but the key is on stack, and ptr is compared, impossible */ + log_assert(&key_p.reuse != (struct reuse_tcp*)result); + log_assert(&key_p != ((struct reuse_tcp*)result)->pending); + } + /* not found, return null */ + if(!result || result == RBTREE_NULL) + return NULL; + verbose(VERB_CLIENT, "reuse_tcp_find check inexact match"); + /* inexact match, find one of possibly several connections to the + * same destination address, with the correct port, ssl, and + * also less than max number of open queries, or else, fail to open + * a new one */ + /* rewind to start of sequence of same address,port,ssl */ + prev = rbtree_previous(result); + while(prev && prev != RBTREE_NULL && + reuse_cmp_addrportssl(prev->key, &key_p.reuse) == 0) { + result = prev; + prev = rbtree_previous(result); + } + + /* loop to find first one that has correct characteristics */ + while(result && result != RBTREE_NULL && + reuse_cmp_addrportssl(result->key, &key_p.reuse) == 0) { + if(((struct reuse_tcp*)result)->tree_by_id.count < + MAX_REUSE_TCP_QUERIES) { + /* same address, port, ssl-yes-or-no, and has + * space for another query */ + return (struct reuse_tcp*)result; + } + result = rbtree_next(result); + } + return NULL; +} + +/** use the buffer to setup writing the query */ +static void +outnet_tcp_take_query_setup(int s, struct pending_tcp* pend, + struct waiting_tcp* w) +{ + struct timeval tv; + verbose(VERB_CLIENT, "outnet_tcp_take_query_setup: setup packet to write " + "len %d timeout %d msec", + (int)w->pkt_len, w->timeout); + pend->c->tcp_write_pkt = w->pkt; + pend->c->tcp_write_pkt_len = w->pkt_len; + pend->c->tcp_write_and_read = 1; + pend->c->tcp_write_byte_count = 0; + pend->c->tcp_is_reading = 0; + comm_point_start_listening(pend->c, s, -1); + /* set timer on the waiting_tcp entry, this is the write timeout + * for the written packet. The timer on pend->c is the timer + * for when there is no written packet and we have readtimeouts */ +#ifndef S_SPLINT_S + tv.tv_sec = w->timeout/1000; + tv.tv_usec = (w->timeout%1000)*1000; +#endif + /* if the waiting_tcp was previously waiting for a buffer in the + * outside_network.tcpwaitlist, then the timer is reset now that + * we start writing it */ + comm_timer_set(w->timer, &tv); +} + /** use next free buffer to service a tcp query */ static int -outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len) +outnet_tcp_take_into_use(struct waiting_tcp* w) { struct pending_tcp* pend = w->outnet->tcp_free; int s; log_assert(pend); - log_assert(pkt); + log_assert(w->pkt); + log_assert(w->pkt_len > 0); log_assert(w->addrlen > 0); + pend->c->tcp_do_toggle_rw = 0; + pend->c->tcp_do_close = 0; /* open socket */ s = outnet_get_tcp_fd(&w->addr, w->addrlen, w->outnet->tcp_mss, w->outnet->ip_dscp); @@ -383,24 +648,65 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len) return 0; } } - w->pkt = NULL; w->next_waiting = (void*)pend; - pend->id = LDNS_ID_WIRE(pkt); w->outnet->num_tcp_outgoing++; w->outnet->tcp_free = pend->next_free; pend->next_free = NULL; pend->query = w; + pend->reuse.outnet = w->outnet; pend->c->repinfo.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); - sldns_buffer_clear(pend->c->buffer); - sldns_buffer_write(pend->c->buffer, pkt, pkt_len); - sldns_buffer_flip(pend->c->buffer); - pend->c->tcp_is_reading = 0; - pend->c->tcp_byte_count = 0; - comm_point_start_listening(pend->c, s, -1); + pend->reuse.pending = pend; + if(pend->c->ssl) + pend->reuse.is_ssl = 1; + else pend->reuse.is_ssl = 0; + /* insert in reuse by address tree if not already inserted there */ + (void)reuse_tcp_insert(w->outnet, pend); + reuse_tree_by_id_insert(&pend->reuse, w); + outnet_tcp_take_query_setup(s, pend, w); return 1; } +/** Touch the lru of a reuse_tcp element, it is in use. + * This moves it to the front of the list, where it is not likely to + * be closed. Items at the back of the list are closed to make space. */ +static void +reuse_tcp_lru_touch(struct outside_network* outnet, struct reuse_tcp* reuse) +{ + if(!reuse->item_on_lru_list) + return; /* not on the list, no lru to modify */ + if(!reuse->lru_prev) + return; /* already first in the list */ + /* remove at current position */ + /* since it is not first, there is a previous element */ + reuse->lru_prev->lru_next = reuse->lru_next; + if(reuse->lru_next) + reuse->lru_next->lru_prev = reuse->lru_prev; + else outnet->tcp_reuse_last = reuse->lru_prev; + /* insert at the front */ + reuse->lru_prev = NULL; + reuse->lru_next = outnet->tcp_reuse_first; + /* since it is not first, it is not the only element and + * lru_next is thus not NULL and thus reuse is now not the last in + * the list, so outnet->tcp_reuse_last does not need to be modified */ + outnet->tcp_reuse_first = 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) +{ + if(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) @@ -408,25 +714,198 @@ use_free_buffer(struct outside_network* outnet) struct waiting_tcp* w; while(outnet->tcp_free && outnet->tcp_wait_first && !outnet->want_to_quit) { + struct reuse_tcp* reuse = NULL; w = outnet->tcp_wait_first; outnet->tcp_wait_first = w->next_waiting; if(outnet->tcp_wait_last == w) outnet->tcp_wait_last = NULL; - if(!outnet_tcp_take_into_use(w, w->pkt, w->pkt_len)) { - comm_point_callback_type* cb = w->cb; - void* cb_arg = w->cb_arg; - waiting_tcp_delete(w); - fptr_ok(fptr_whitelist_pending_tcp(cb)); - (void)(*cb)(NULL, cb_arg, NETEVENT_CLOSED, NULL); + w->on_tcp_waiting_list = 0; + reuse = reuse_tcp_find(outnet, &w->addr, w->addrlen, + w->ssl_upstream); + if(reuse) { + log_reuse_tcp(VERB_CLIENT, "use free buffer for waiting tcp: " + "found reuse", reuse); + reuse_tcp_lru_touch(outnet, reuse); + comm_timer_disable(w->timer); + w->next_waiting = (void*)reuse->pending; + reuse_tree_by_id_insert(reuse, w); + if(reuse->pending->query) { + /* on the write wait list */ + reuse_write_wait_push_back(reuse, w); + } else { + /* write straight away */ + /* stop the timer on read of the fd */ + comm_point_stop_listening(reuse->pending->c); + reuse->pending->query = w; + outnet_tcp_take_query_setup( + reuse->pending->c->fd, reuse->pending, + w); + } + } else { + struct pending_tcp* pend = w->outnet->tcp_free; + rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp); + pend->reuse.pending = pend; + memcpy(&pend->reuse.addr, &w->addr, w->addrlen); + pend->reuse.addrlen = w->addrlen; + if(!outnet_tcp_take_into_use(w)) { + waiting_tcp_callback(w, NULL, NETEVENT_CLOSED, + NULL); + waiting_tcp_delete(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) +{ + struct timeval tv; + if(w->on_tcp_waiting_list) + return; + w->next_waiting = NULL; + if(outnet->tcp_wait_last) + outnet->tcp_wait_last->next_waiting = w; + else outnet->tcp_wait_first = w; + outnet->tcp_wait_last = w; + w->on_tcp_waiting_list = 1; +#ifndef S_SPLINT_S + tv.tv_sec = w->timeout/1000; + tv.tv_usec = (w->timeout%1000)*1000; +#endif + comm_timer_set(w->timer, &tv); +} + +/** delete element from tree by id */ +static void +reuse_tree_by_id_delete(struct reuse_tcp* reuse, struct waiting_tcp* w) +{ + log_assert(w->id_node.key != NULL); + rbtree_delete(&reuse->tree_by_id, w); + w->id_node.key = NULL; +} + +/** move writewait list to go for another connection. */ +static void +reuse_move_writewait_away(struct outside_network* outnet, + struct pending_tcp* pend) +{ + /* the writewait list has not been written yet, so if the + * stream was closed, they have not actually been failed, only + * the queries written. Other queries can get written to another + * stream. For upstreams that do not support multiple queries + * and answers, the stream can get closed, and then the queries + * can get written on a new socket */ + struct waiting_tcp* w; + if(pend->query && pend->query->error_count == 0 && + pend->c->tcp_write_pkt == pend->query->pkt && + pend->c->tcp_write_pkt_len == pend->query->pkt_len) { + /* since the current query is not written, it can also + * move to a free buffer */ + if(verbosity >= VERB_CLIENT && pend->query->pkt_len > 12+2+2 && + LDNS_QDCOUNT(pend->query->pkt) > 0 && + dname_valid(pend->query->pkt+12, pend->query->pkt_len-12)) { + char buf[LDNS_MAX_DOMAINLEN+1]; + dname_str(pend->query->pkt+12, buf); + verbose(VERB_CLIENT, "reuse_move_writewait_away current %s %d bytes were written", + buf, (int)pend->c->tcp_write_byte_count); + } + pend->c->tcp_write_pkt = NULL; + pend->c->tcp_write_pkt_len = 0; + pend->c->tcp_write_and_read = 0; + pend->reuse.cp_more_read_again = 0; + pend->reuse.cp_more_write_again = 0; + pend->c->tcp_is_reading = 1; + w = pend->query; + pend->query = NULL; + /* increase error count, so that if the next socket fails too + * the server selection is run again with this query failed + * and it can select a different server (if possible), or + * fail the query */ + w->error_count ++; + reuse_tree_by_id_delete(&pend->reuse, w); + outnet_add_tcp_waiting(outnet, w); + } + while((w = reuse_write_wait_pop(&pend->reuse)) != NULL) { + if(verbosity >= VERB_CLIENT && w->pkt_len > 12+2+2 && + LDNS_QDCOUNT(w->pkt) > 0 && + dname_valid(w->pkt+12, w->pkt_len-12)) { + char buf[LDNS_MAX_DOMAINLEN+1]; + dname_str(w->pkt+12, buf); + verbose(VERB_CLIENT, "reuse_move_writewait_away item %s", buf); + } + reuse_tree_by_id_delete(&pend->reuse, w); + outnet_add_tcp_waiting(outnet, w); + } +} + +/** remove reused element from tree and lru list */ +static void +reuse_tcp_remove_tree_list(struct outside_network* outnet, + struct reuse_tcp* reuse) +{ + verbose(VERB_CLIENT, "reuse_tcp_remove_tree_list"); + if(reuse->node.key) { + /* delete it from reuse tree */ + (void)rbtree_delete(&outnet->tcp_reuse, &reuse->node); + reuse->node.key = NULL; + } + /* delete from reuse list */ + if(reuse->item_on_lru_list) { + if(reuse->lru_prev) { + /* assert that members of the lru list are waiting + * and thus have a pending pointer to the struct */ + log_assert(reuse->lru_prev->pending); + reuse->lru_prev->lru_next = reuse->lru_next; + } else { + log_assert(!reuse->lru_next || reuse->lru_next->pending); + outnet->tcp_reuse_first = reuse->lru_next; + } + if(reuse->lru_next) { + /* assert that members of the lru list are waiting + * and thus have a pending pointer to the struct */ + log_assert(reuse->lru_next->pending); + reuse->lru_next->lru_prev = reuse->lru_prev; + } else { + log_assert(!reuse->lru_prev || reuse->lru_prev->pending); + outnet->tcp_reuse_last = reuse->lru_prev; + } + reuse->item_on_lru_list = 0; + } +} + +/** helper function that deletes an element from the tree of readwait + * elements in tcp reuse structure */ +static void reuse_del_readwait_elem(rbnode_type* node, void* ATTR_UNUSED(arg)) +{ + struct waiting_tcp* w = (struct waiting_tcp*)node->key; + waiting_tcp_delete(w); +} + +/** delete readwait waiting_tcp elements, deletes the elements in the list */ +void reuse_del_readwait(rbtree_type* tree_by_id) +{ + if(tree_by_id->root == NULL || + tree_by_id->root == RBTREE_NULL) + return; + traverse_postorder(tree_by_id, &reuse_del_readwait_elem, NULL); + rbtree_init(tree_by_id, reuse_id_cmp); +} + /** decommission a tcp buffer, closes commpoint and frees waiting_tcp entry */ static void decommission_pending_tcp(struct outside_network* outnet, struct pending_tcp* pend) { + verbose(VERB_CLIENT, "decommission_pending_tcp"); + pend->next_free = outnet->tcp_free; + outnet->tcp_free = pend; + if(pend->reuse.node.key) { + /* needs unlink from the reuse tree to get deleted */ + reuse_tcp_remove_tree_list(outnet, &pend->reuse); + } + /* free SSL structure after remove from outnet tcp reuse tree, + * because the c->ssl null or not is used for sorting in the tree */ if(pend->c->ssl) { #ifdef HAVE_SSL SSL_shutdown(pend->c->ssl); @@ -435,11 +914,68 @@ decommission_pending_tcp(struct outside_network* outnet, #endif } comm_point_close(pend->c); - pend->next_free = outnet->tcp_free; - outnet->tcp_free = pend; - waiting_tcp_delete(pend->query); + pend->reuse.cp_more_read_again = 0; + pend->reuse.cp_more_write_again = 0; + /* unlink the query and writewait list, it is part of the tree + * nodes and is deleted */ pend->query = NULL; - use_free_buffer(outnet); + pend->reuse.write_wait_first = NULL; + pend->reuse.write_wait_last = NULL; + reuse_del_readwait(&pend->reuse.tree_by_id); +} + +/** perform failure callbacks for waiting queries in reuse read rbtree */ +static void reuse_cb_readwait_for_failure(rbtree_type* tree_by_id, int err) +{ + rbnode_type* node; + if(tree_by_id->root == NULL || + tree_by_id->root == RBTREE_NULL) + return; + node = rbtree_first(tree_by_id); + while(node && node != RBTREE_NULL) { + struct waiting_tcp* w = (struct waiting_tcp*)node->key; + waiting_tcp_callback(w, NULL, err, NULL); + node = rbtree_next(node); + } +} + +/** perform callbacks for failure and also decommission pending tcp. + * the callbacks remove references in sq->pending to the waiting_tcp + * members of the tree_by_id in the pending tcp. The pending_tcp is + * removed before the callbacks, so that the callbacks do not modify + * the pending_tcp due to its reference in the outside_network reuse tree */ +static void reuse_cb_and_decommission(struct outside_network* outnet, + struct pending_tcp* pend, int error) +{ + rbtree_type store; + store = pend->reuse.tree_by_id; + pend->query = NULL; + rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp); + pend->reuse.write_wait_first = NULL; + pend->reuse.write_wait_last = NULL; + decommission_pending_tcp(outnet, pend); + reuse_cb_readwait_for_failure(&store, error); + reuse_del_readwait(&store); +} + +/** set timeout on tcp fd and setup read event to catch incoming dns msgs */ +static void +reuse_tcp_setup_timeout(struct pending_tcp* pend_tcp) +{ + log_reuse_tcp(VERB_CLIENT, "reuse_tcp_setup_timeout", &pend_tcp->reuse); + comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT); +} + +/** set timeout on tcp fd and setup read event to catch incoming dns msgs */ +static void +reuse_tcp_setup_read_and_timeout(struct pending_tcp* pend_tcp) +{ + log_reuse_tcp(VERB_CLIENT, "reuse_tcp_setup_readtimeout", &pend_tcp->reuse); + sldns_buffer_clear(pend_tcp->c->buffer); + pend_tcp->c->tcp_is_reading = 1; + pend_tcp->c->tcp_byte_count = 0; + comm_point_stop_listening(pend_tcp->c); + comm_point_start_listening(pend_tcp->c, -1, REUSE_TIMEOUT); } int @@ -447,24 +983,116 @@ outnet_tcp_cb(struct comm_point* c, void* arg, int error, struct comm_reply *reply_info) { struct pending_tcp* pend = (struct pending_tcp*)arg; - struct outside_network* outnet = pend->query->outnet; + struct outside_network* outnet = pend->reuse.outnet; + struct waiting_tcp* w = NULL; verbose(VERB_ALGO, "outnettcp cb"); - if(error != NETEVENT_NOERROR) { + if(error == NETEVENT_TIMEOUT) { + if(pend->c->tcp_write_and_read) { + verbose(VERB_QUERY, "outnettcp got tcp timeout " + "for read, ignored because write underway"); + /* if we are writing, ignore readtimer, wait for write timer + * or write is done */ + return 0; + } else { + verbose(VERB_QUERY, "outnettcp got tcp timeout %s", + (pend->reuse.tree_by_id.count?"for reading pkt": + "for keepalive for reuse")); + } + /* must be timeout for reading or keepalive reuse, + * close it. */ + reuse_tcp_remove_tree_list(outnet, &pend->reuse); + } else if(error == NETEVENT_PKT_WRITTEN) { + /* the packet we want to write has been written. */ + verbose(VERB_ALGO, "outnet tcp pkt was written event"); + log_assert(c == pend->c); + log_assert(pend->query->pkt == pend->c->tcp_write_pkt); + log_assert(pend->query->pkt_len == pend->c->tcp_write_pkt_len); + pend->c->tcp_write_pkt = NULL; + pend->c->tcp_write_pkt_len = 0; + /* the pend.query is already in tree_by_id */ + log_assert(pend->query->id_node.key); + pend->query = NULL; + /* setup to write next packet or setup read timeout */ + if(pend->reuse.write_wait_first) { + verbose(VERB_ALGO, "outnet tcp setup next pkt"); + /* we can write it straight away perhaps, set flag + * because this callback called after a tcp write + * succeeded and likely more buffer space is available + * and we can write some more. */ + pend->reuse.cp_more_write_again = 1; + pend->query = reuse_write_wait_pop(&pend->reuse); + comm_point_stop_listening(pend->c); + outnet_tcp_take_query_setup(pend->c->fd, pend, + pend->query); + } else { + verbose(VERB_ALGO, "outnet tcp writes done, wait"); + pend->c->tcp_write_and_read = 0; + pend->reuse.cp_more_read_again = 0; + pend->reuse.cp_more_write_again = 0; + pend->c->tcp_is_reading = 1; + comm_point_stop_listening(pend->c); + reuse_tcp_setup_timeout(pend); + } + return 0; + } else if(error != NETEVENT_NOERROR) { verbose(VERB_QUERY, "outnettcp got tcp error %d", error); + reuse_move_writewait_away(outnet, pend); /* pass error below and exit */ } else { /* check ID */ - if(sldns_buffer_limit(c->buffer) < sizeof(uint16_t) || - LDNS_ID_WIRE(sldns_buffer_begin(c->buffer))!=pend->id) { + if(sldns_buffer_limit(c->buffer) < sizeof(uint16_t)) { log_addr(VERB_QUERY, - "outnettcp: bad ID in reply, from:", - &pend->query->addr, pend->query->addrlen); + "outnettcp: bad ID in reply, too short, from:", + &pend->reuse.addr, pend->reuse.addrlen); error = NETEVENT_CLOSED; - } + } else { + uint16_t id = LDNS_ID_WIRE(sldns_buffer_begin( + c->buffer)); + /* find the query the reply is for */ + w = reuse_tcp_by_id_find(&pend->reuse, id); + } + } + if(error == NETEVENT_NOERROR && !w) { + /* no struct waiting found in tree, no reply to call */ + log_addr(VERB_QUERY, "outnettcp: bad ID in reply, from:", + &pend->reuse.addr, pend->reuse.addrlen); + error = NETEVENT_CLOSED; + } + if(error == NETEVENT_NOERROR) { + /* add to reuse tree so it can be reused, if not a failure. + * This is possible if the state machine wants to make a tcp + * query again to the same destination. */ + if(outnet->tcp_reuse.count < outnet->tcp_reuse_max) { + (void)reuse_tcp_insert(outnet, pend); + } + } + if(w) { + reuse_tree_by_id_delete(&pend->reuse, w); + verbose(VERB_CLIENT, "outnet tcp callback query err %d buflen %d", + error, (int)sldns_buffer_limit(c->buffer)); + waiting_tcp_callback(w, c, error, reply_info); + waiting_tcp_delete(w); + } + verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb"); + if(error == NETEVENT_NOERROR && pend->reuse.node.key) { + verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb: keep it"); + /* it is in the reuse_tcp tree, with other queries, or + * on the empty list. do not decommission it */ + /* if there are more outstanding queries, we could try to + * read again, to see if it is on the input, + * because this callback called after a successful read + * and there could be more bytes to read on the input */ + if(pend->reuse.tree_by_id.count != 0) + pend->reuse.cp_more_read_again = 1; + reuse_tcp_setup_read_and_timeout(pend); + return 0; } - fptr_ok(fptr_whitelist_pending_tcp(pend->query->cb)); - (void)(*pend->query->cb)(c, pend->query->cb_arg, error, reply_info); - decommission_pending_tcp(outnet, pend); + verbose(VERB_CLIENT, "outnet_tcp_cb reuse after cb: decommission it"); + /* no queries on it, no space to keep it. or timeout or closed due + * to error. Close it */ + reuse_cb_and_decommission(outnet, pend, (error==NETEVENT_TIMEOUT? + NETEVENT_TIMEOUT:NETEVENT_CLOSED)); + use_free_buffer(outnet); return 0; } @@ -723,7 +1351,8 @@ outside_network_create(struct comm_base *base, size_t bufsize, struct ub_randstate* rnd, int use_caps_for_id, int* availports, int numavailports, size_t unwanted_threshold, int tcp_mss, void (*unwanted_action)(void*), void* unwanted_param, int do_udp, - void* sslctx, int delayclose, int tls_use_sni, struct dt_env* dtenv) + void* sslctx, int delayclose, int tls_use_sni, struct dt_env* dtenv, + int udp_connect) { struct outside_network* outnet = (struct outside_network*) calloc(1, sizeof(struct outside_network)); @@ -761,6 +1390,9 @@ outside_network_create(struct comm_base *base, size_t bufsize, outnet->delay_tv.tv_usec = (delayclose%1000)*1000; } #endif + if(udp_connect) { + outnet->udp_connect = 1; + } if(numavailports == 0 || num_ports == 0) { log_err("no outgoing ports available"); outside_network_delete(outnet); @@ -795,6 +1427,8 @@ outside_network_create(struct comm_base *base, size_t bufsize, outside_network_delete(outnet); return NULL; } + rbtree_init(&outnet->tcp_reuse, reuse_cmp); + outnet->tcp_reuse_max = num_tcp; /* allocate commpoints */ for(k=0; k<num_ports; k++) { @@ -958,6 +1592,17 @@ outside_network_delete(struct outside_network* outnet) size_t i; for(i=0; i<outnet->num_tcp; i++) if(outnet->tcp_conns[i]) { + if(outnet->tcp_conns[i]->query && + !outnet->tcp_conns[i]->query-> + on_tcp_waiting_list) { + /* delete waiting_tcp elements that + * the tcp conn is working on */ + struct pending_tcp* pend = + (struct pending_tcp*)outnet-> + tcp_conns[i]->query-> + next_waiting; + decommission_pending_tcp(outnet, pend); + } comm_point_delete(outnet->tcp_conns[i]->c); waiting_tcp_delete(outnet->tcp_conns[i]->query); free(outnet->tcp_conns[i]); @@ -972,6 +1617,10 @@ outside_network_delete(struct outside_network* outnet) p = np; } } + /* was allocated in struct pending that was deleted above */ + rbtree_init(&outnet->tcp_reuse, reuse_cmp); + outnet->tcp_reuse_first = NULL; + outnet->tcp_reuse_last = NULL; if(outnet->udp_wait_first) { struct pending* p = outnet->udp_wait_first, *np; while(p) { @@ -1115,13 +1764,26 @@ select_ifport(struct outside_network* outnet, struct pending* pend, my_if = ub_random_max(outnet->rnd, num_if); pif = &ifs[my_if]; #ifndef DISABLE_EXPLICIT_PORT_RANDOMISATION - my_port = ub_random_max(outnet->rnd, pif->avail_total); - if(my_port < pif->inuse) { - /* port already open */ - pend->pc = pif->out[my_port]; - verbose(VERB_ALGO, "using UDP if=%d port=%d", - my_if, pend->pc->number); - break; + if(outnet->udp_connect) { + /* if we connect() we cannot reuse fds for a port */ + if(pif->inuse >= pif->avail_total) { + tries++; + if(tries < MAX_PORT_RETRY) + continue; + log_err("failed to find an open port, drop msg"); + return 0; + } + my_port = pif->inuse + ub_random_max(outnet->rnd, + pif->avail_total - pif->inuse); + } else { + my_port = ub_random_max(outnet->rnd, pif->avail_total); + if(my_port < pif->inuse) { + /* port already open */ + pend->pc = pif->out[my_port]; + verbose(VERB_ALGO, "using UDP if=%d port=%d", + my_if, pend->pc->number); + break; + } } /* try to open new port, if fails, loop to try again */ log_assert(pif->inuse < pif->maxout); @@ -1138,6 +1800,17 @@ select_ifport(struct outside_network* outnet, struct pending* pend, if(fd != -1) { verbose(VERB_ALGO, "opened UDP if=%d port=%d", my_if, portno); + if(outnet->udp_connect) { + /* connect() to the destination */ + if(connect(fd, (struct sockaddr*)&pend->addr, + pend->addrlen) < 0) { + log_err_addr("udp connect failed", + strerror(errno), &pend->addr, + pend->addrlen); + sock_close(fd); + return 0; + } + } /* grab fd */ pend->pc = outnet->unused_fds; outnet->unused_fds = pend->pc->next; @@ -1197,10 +1870,17 @@ randomize_and_send_udp(struct pending* pend, sldns_buffer* packet, int timeout) log_assert(pend->pc && pend->pc->cp); /* send it over the commlink */ - if(!comm_point_send_udp_msg(pend->pc->cp, packet, - (struct sockaddr*)&pend->addr, pend->addrlen)) { - portcomm_loweruse(outnet, pend->pc); - return 0; + if(outnet->udp_connect) { + if(!comm_point_send_udp_msg(pend->pc->cp, packet, NULL, 0)) { + portcomm_loweruse(outnet, pend->pc); + return 0; + } + } else { + if(!comm_point_send_udp_msg(pend->pc->cp, packet, + (struct sockaddr*)&pend->addr, pend->addrlen)) { + portcomm_loweruse(outnet, pend->pc); + return 0; + } } /* system calls to set timeout after sending UDP to make roundtrip @@ -1273,45 +1953,152 @@ outnet_tcptimer(void* arg) { struct waiting_tcp* w = (struct waiting_tcp*)arg; struct outside_network* outnet = w->outnet; - comm_point_callback_type* cb; - void* cb_arg; - if(w->pkt) { + verbose(VERB_CLIENT, "outnet_tcptimer"); + if(w->on_tcp_waiting_list) { /* it is on the waiting list */ waiting_list_remove(outnet, w); + waiting_tcp_callback(w, NULL, NETEVENT_TIMEOUT, NULL); + waiting_tcp_delete(w); } else { /* it was in use */ struct pending_tcp* pend=(struct pending_tcp*)w->next_waiting; - if(pend->c->ssl) { -#ifdef HAVE_SSL - SSL_shutdown(pend->c->ssl); - SSL_free(pend->c->ssl); - pend->c->ssl = NULL; -#endif - } - comm_point_close(pend->c); - pend->query = NULL; - pend->next_free = outnet->tcp_free; - outnet->tcp_free = pend; + reuse_cb_and_decommission(outnet, pend, NETEVENT_TIMEOUT); } - cb = w->cb; - cb_arg = w->cb_arg; - waiting_tcp_delete(w); - fptr_ok(fptr_whitelist_pending_tcp(cb)); - (void)(*cb)(NULL, cb_arg, NETEVENT_TIMEOUT, NULL); use_free_buffer(outnet); } +/** close the oldest reuse_tcp connection to make a fd and struct pend + * available for a new stream connection */ +static void +reuse_tcp_close_oldest(struct outside_network* outnet) +{ + struct pending_tcp* pend; + verbose(VERB_CLIENT, "reuse_tcp_close_oldest"); + if(!outnet->tcp_reuse_last) return; + pend = outnet->tcp_reuse_last->pending; + + /* snip off of LRU */ + log_assert(pend->reuse.lru_next == NULL); + if(pend->reuse.lru_prev) { + outnet->tcp_reuse_last = pend->reuse.lru_prev; + pend->reuse.lru_prev->lru_next = NULL; + } else { + outnet->tcp_reuse_last = NULL; + outnet->tcp_reuse_first = NULL; + } + pend->reuse.item_on_lru_list = 0; + + /* free up */ + reuse_cb_and_decommission(outnet, pend, NETEVENT_CLOSED); +} + +/** find spare ID value for reuse tcp stream. That is random and also does + * not collide with an existing query ID that is in use or waiting */ +uint16_t +reuse_tcp_select_id(struct reuse_tcp* reuse, struct outside_network* outnet) +{ + uint16_t id = 0, curid, nextid; + const int try_random = 2000; + int i; + unsigned select, count, space; + rbnode_type* node; + + /* make really sure the tree is not empty */ + if(reuse->tree_by_id.count == 0) { + id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff; + return id; + } + + /* try to find random empty spots by picking them */ + for(i = 0; i<try_random; i++) { + id = ((unsigned)ub_random(outnet->rnd)>>8) & 0xffff; + if(!reuse_tcp_by_id_find(reuse, id)) { + return id; + } + } + + /* equally pick a random unused element from the tree that is + * not in use. Pick a the n-th index of an ununused number, + * then loop over the empty spaces in the tree and find it */ + log_assert(reuse->tree_by_id.count < 0xffff); + select = ub_random_max(outnet->rnd, 0xffff - reuse->tree_by_id.count); + /* select value now in 0 .. num free - 1 */ + + count = 0; /* number of free spaces passed by */ + node = rbtree_first(&reuse->tree_by_id); + log_assert(node && node != RBTREE_NULL); /* tree not empty */ + /* see if select is before first node */ + if(select < tree_by_id_get_id(node)) + return select; + count += tree_by_id_get_id(node); + /* perhaps select is between nodes */ + while(node && node != RBTREE_NULL) { + rbnode_type* next = rbtree_next(node); + if(next && next != RBTREE_NULL) { + curid = tree_by_id_get_id(node); + nextid = tree_by_id_get_id(next); + log_assert(curid < nextid); + if(curid != 0xffff && curid + 1 < nextid) { + /* space between nodes */ + space = nextid - curid - 1; + log_assert(select >= count); + if(select < count + space) { + /* here it is */ + return curid + 1 + (select - count); + } + count += space; + } + } + node = next; + } + + /* select is after the last node */ + /* count is the number of free positions before the nodes in the + * tree */ + node = rbtree_last(&reuse->tree_by_id); + log_assert(node && node != RBTREE_NULL); /* tree not empty */ + curid = tree_by_id_get_id(node); + log_assert(count + (0xffff-curid) + reuse->tree_by_id.count == 0xffff); + return curid + 1 + (select - count); +} + struct waiting_tcp* pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet, int timeout, comm_point_callback_type* callback, void* callback_arg) { struct pending_tcp* pend = sq->outnet->tcp_free; + struct reuse_tcp* reuse = NULL; struct waiting_tcp* w; - struct timeval tv; - uint16_t id; - /* if no buffer is free allocate space to store query */ + + verbose(VERB_CLIENT, "pending_tcp_query"); + if(sldns_buffer_limit(packet) < sizeof(uint16_t)) { + verbose(VERB_ALGO, "pending tcp query with too short buffer < 2"); + return NULL; + } + + /* find out if a reused stream to the target exists */ + /* if so, take it into use */ + reuse = reuse_tcp_find(sq->outnet, &sq->addr, sq->addrlen, + sq->ssl_upstream); + if(reuse) { + log_reuse_tcp(VERB_CLIENT, "pending_tcp_query: found reuse", reuse); + log_assert(reuse->pending); + pend = reuse->pending; + reuse_tcp_lru_touch(sq->outnet, reuse); + } + + /* if !pend but we have reuse streams, close a reuse stream + * to be able to open a new one to this target, no use waiting + * to reuse a file descriptor while another query needs to use + * that buffer and file descriptor now. */ + if(!pend) { + reuse_tcp_close_oldest(sq->outnet); + pend = sq->outnet->tcp_free; + } + + /* allocate space to store query */ w = (struct waiting_tcp*)malloc(sizeof(struct waiting_tcp) - + (pend?0:sldns_buffer_limit(packet))); + + sldns_buffer_limit(packet)); if(!w) { return NULL; } @@ -1319,47 +2106,76 @@ pending_tcp_query(struct serviced_query* sq, sldns_buffer* packet, free(w); return NULL; } - w->pkt = NULL; - w->pkt_len = 0; - id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff; - LDNS_ID_SET(sldns_buffer_begin(packet), id); + w->pkt = (uint8_t*)w + sizeof(struct waiting_tcp); + w->pkt_len = sldns_buffer_limit(packet); + memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len); + if(reuse) + w->id = reuse_tcp_select_id(reuse, sq->outnet); + else w->id = ((unsigned)ub_random(sq->outnet->rnd)>>8) & 0xffff; + LDNS_ID_SET(w->pkt, w->id); memcpy(&w->addr, &sq->addr, sq->addrlen); w->addrlen = sq->addrlen; w->outnet = sq->outnet; + w->on_tcp_waiting_list = 0; + w->next_waiting = NULL; w->cb = callback; w->cb_arg = callback_arg; w->ssl_upstream = sq->ssl_upstream; w->tls_auth_name = sq->tls_auth_name; -#ifndef S_SPLINT_S - tv.tv_sec = timeout/1000; - tv.tv_usec = (timeout%1000)*1000; -#endif - comm_timer_set(w->timer, &tv); + w->timeout = timeout; + w->id_node.key = NULL; + w->write_wait_prev = NULL; + w->write_wait_next = NULL; + w->write_wait_queued = 0; + w->error_count = 0; if(pend) { /* we have a buffer available right now */ - if(!outnet_tcp_take_into_use(w, sldns_buffer_begin(packet), - sldns_buffer_limit(packet))) { - waiting_tcp_delete(w); - return NULL; + if(reuse) { + /* reuse existing fd, write query and continue */ + /* store query in tree by id */ + verbose(VERB_CLIENT, "pending_tcp_query: reuse, store"); + w->next_waiting = (void*)pend; + reuse_tree_by_id_insert(&pend->reuse, w); + /* can we write right now? */ + if(pend->query == NULL) { + /* write straight away */ + /* stop the timer on read of the fd */ + comm_point_stop_listening(pend->c); + pend->query = w; + outnet_tcp_take_query_setup(pend->c->fd, pend, + w); + } else { + /* put it in the waiting list for + * this stream */ + reuse_write_wait_push_back(&pend->reuse, w); + } + } else { + /* create new fd and connect to addr, setup to + * write query */ + verbose(VERB_CLIENT, "pending_tcp_query: new fd, connect"); + rbtree_init(&pend->reuse.tree_by_id, reuse_id_cmp); + pend->reuse.pending = pend; + memcpy(&pend->reuse.addr, &sq->addr, sq->addrlen); + pend->reuse.addrlen = sq->addrlen; + if(!outnet_tcp_take_into_use(w)) { + waiting_tcp_delete(w); + return NULL; + } } -#ifdef USE_DNSTAP - if(sq->outnet->dtenv && - (sq->outnet->dtenv->log_resolver_query_messages || - sq->outnet->dtenv->log_forwarder_query_messages)) - dt_msg_send_outside_query(sq->outnet->dtenv, &sq->addr, - comm_tcp, sq->zone, sq->zonelen, packet); -#endif } else { /* queue up */ - w->pkt = (uint8_t*)w + sizeof(struct waiting_tcp); - w->pkt_len = sldns_buffer_limit(packet); - memmove(w->pkt, sldns_buffer_begin(packet), w->pkt_len); - w->next_waiting = NULL; - if(sq->outnet->tcp_wait_last) - sq->outnet->tcp_wait_last->next_waiting = w; - else sq->outnet->tcp_wait_first = w; - sq->outnet->tcp_wait_last = w; + /* waiting for a buffer on the outside network buffer wait + * list */ + verbose(VERB_CLIENT, "pending_tcp_query: queue to wait"); + outnet_add_tcp_waiting(sq->outnet, w); } +#ifdef USE_DNSTAP + if(sq->outnet->dtenv && + (sq->outnet->dtenv->log_resolver_query_messages || + sq->outnet->dtenv->log_forwarder_query_messages)) + dt_msg_send_outside_query(sq->outnet->dtenv, &sq->addr, + comm_tcp, sq->zone, sq->zonelen, packet); +#endif return w; } @@ -1477,6 +2293,7 @@ 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 */ @@ -1492,10 +2309,53 @@ waiting_list_remove(struct outside_network* outnet, struct waiting_tcp* w) } } +/** reuse tcp stream, remove serviced query from stream, + * return true if the stream is kept, false if it is to be closed */ +static int +reuse_tcp_remove_serviced_keep(struct waiting_tcp* w, + struct serviced_query* sq) +{ + struct pending_tcp* pend_tcp = (struct pending_tcp*)w->next_waiting; + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep"); + /* remove the callback. let query continue to write to not cancel + * the stream itself. also keep it as an entry in the tree_by_id, + * in case the answer returns (that we no longer want), but we cannot + * pick the same ID number meanwhile */ + w->cb = NULL; + /* see if can be entered in reuse tree + * for that the FD has to be non-1 */ + if(pend_tcp->c->fd == -1) { + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: -1 fd"); + return 0; + } + /* if in tree and used by other queries */ + if(pend_tcp->reuse.node.key) { + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: in use by other queries"); + /* do not reset the keepalive timer, for that + * we'd need traffic, and this is where the serviced is + * removed due to state machine internal reasons, + * eg. iterator no longer interested in this query */ + return 1; + } + /* if still open and want to keep it open */ + if(pend_tcp->c->fd != -1 && sq->outnet->tcp_reuse.count < + sq->outnet->tcp_reuse_max) { + verbose(VERB_CLIENT, "reuse_tcp_remove_serviced_keep: keep open"); + /* set a keepalive timer on it */ + if(!reuse_tcp_insert(sq->outnet, pend_tcp)) { + return 0; + } + reuse_tcp_setup_timeout(pend_tcp); + return 1; + } + return 0; +} + /** cleanup serviced query entry */ static void serviced_delete(struct serviced_query* sq) { + verbose(VERB_CLIENT, "serviced_delete"); if(sq->pending) { /* clear up the pending query */ if(sq->status == serviced_query_UDP_EDNS || @@ -1503,6 +2363,7 @@ serviced_delete(struct serviced_query* sq) sq->status == serviced_query_UDP_EDNS_FRAG || sq->status == serviced_query_UDP_EDNS_fallback) { struct pending* p = (struct pending*)sq->pending; + verbose(VERB_CLIENT, "serviced_delete: UDP"); if(p->pc) portcomm_loweruse(sq->outnet, p->pc); pending_delete(sq->outnet, p); @@ -1510,14 +2371,32 @@ serviced_delete(struct serviced_query* sq) * mesh */ outnet_send_wait_udp(sq->outnet); } else { - struct waiting_tcp* p = (struct waiting_tcp*) + struct waiting_tcp* w = (struct waiting_tcp*) sq->pending; - if(p->pkt == NULL) { - decommission_pending_tcp(sq->outnet, - (struct pending_tcp*)p->next_waiting); + verbose(VERB_CLIENT, "serviced_delete: TCP"); + /* if on stream-write-waiting list then + * remove from waiting list and waiting_tcp_delete */ + if(w->write_wait_queued) { + struct pending_tcp* pend = + (struct pending_tcp*)w->next_waiting; + verbose(VERB_CLIENT, "serviced_delete: writewait"); + reuse_tree_by_id_delete(&pend->reuse, w); + reuse_write_wait_remove(&pend->reuse, w); + waiting_tcp_delete(w); + } else if(!w->on_tcp_waiting_list) { + struct pending_tcp* pend = + (struct pending_tcp*)w->next_waiting; + verbose(VERB_CLIENT, "serviced_delete: tcpreusekeep"); + if(!reuse_tcp_remove_serviced_keep(w, sq)) { + reuse_cb_and_decommission(sq->outnet, + pend, NETEVENT_CLOSED); + use_free_buffer(sq->outnet); + } + sq->pending = NULL; } else { - waiting_list_remove(sq->outnet, p); - waiting_tcp_delete(p); + verbose(VERB_CLIENT, "serviced_delete: tcpwait"); + waiting_list_remove(sq->outnet, w); + waiting_tcp_delete(w); } } } @@ -2097,18 +2976,18 @@ outnet_serviced_query(struct outside_network* outnet, { struct serviced_query* sq; struct service_callback* cb; - struct edns_tag_addr* client_tag_addr; + struct edns_string_addr* client_string_addr; if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen, zone, zonelen, qstate, qstate->region)) return NULL; - if((client_tag_addr = edns_tag_addr_lookup(&env->edns_tags->client_tags, - addr, addrlen))) { - uint16_t client_tag = htons(client_tag_addr->tag_data); + if((client_string_addr = edns_string_addr_lookup( + &env->edns_strings->client_strings, addr, addrlen))) { edns_opt_list_append(&qstate->edns_opts_back_out, - env->edns_tags->client_tag_opcode, 2, - (uint8_t*)&client_tag, qstate->region); + env->edns_strings->client_string_opcode, + client_string_addr->string_len, + client_string_addr->string, qstate->region); } serviced_gen_query(buff, qinfo->qname, qinfo->qname_len, qinfo->qtype, diff --git a/services/outside_network.h b/services/outside_network.h index c8f6d5724a87..2fe97fa6c5c9 100644 --- a/services/outside_network.h +++ b/services/outside_network.h @@ -52,6 +52,7 @@ struct ub_randstate; struct pending_tcp; struct waiting_tcp; struct waiting_udp; +struct reuse_tcp; struct infra_cache; struct port_comm; struct port_if; @@ -106,6 +107,9 @@ struct outside_network { int delayclose; /** timeout for delayclose */ struct timeval delay_tv; + /** if we perform udp-connect, connect() for UDP socket to mitigate + * ICMP side channel leakage */ + int udp_connect; /** array of outgoing IP4 interfaces */ struct port_if* ip4_ifs; @@ -154,6 +158,21 @@ struct outside_network { size_t num_tcp; /** number of tcp communication points in use. */ size_t num_tcp_outgoing; + /** + * tree of still-open and waiting tcp connections for reuse. + * can be closed and reopened to get a new tcp connection. + * or reused to the same destination again. with timeout to close. + * Entries are of type struct reuse_tcp. + * The entries are both active and empty connections. + */ + rbtree_type tcp_reuse; + /** max number of tcp_reuse entries we want to keep open */ + size_t tcp_reuse_max; + /** first and last(oldest) in lru list of reuse connections. + * the oldest can be closed to get a new free pending_tcp if needed + * The list contains empty connections, that wait for timeout or + * a new query that can use the existing connection. */ + struct reuse_tcp* tcp_reuse_first, *tcp_reuse_last; /** list of tcp comm points that are free for use */ struct pending_tcp* tcp_free; /** list of tcp queries waiting for a buffer */ @@ -212,6 +231,76 @@ struct port_comm { }; /** + * Reuse TCP connection, still open can be used again. + */ +struct reuse_tcp { + /** rbtree node with links in tcp_reuse tree. key is NULL when not + * in tree. Both active and empty connections are in the tree. + * key is a pointer to this structure, the members used to compare + * are the sockaddr and and then is-ssl bool, and then ptr value is + * used in case the same address exists several times in the tree + * when there are multiple connections to the same destination to + * make the rbtree items unique. */ + rbnode_type node; + /** the key for the tcp_reuse tree. address of peer, ip4 or ip6, + * and port number of peer */ + struct sockaddr_storage addr; + /** length of addr */ + socklen_t addrlen; + /** also key for tcp_reuse tree, if ssl is used */ + int is_ssl; + /** lru chain, so that the oldest can be removed to get a new + * connection when all are in (re)use. oldest is last in list. + * The lru only contains empty connections waiting for reuse, + * the ones with active queries are not on the list because they + * do not need to be closed to make space for others. They already + * service a query so the close for another query does not help + * service a larger number of queries. */ + struct reuse_tcp* lru_next, *lru_prev; + /** true if the reuse_tcp item is on the lru list with empty items */ + int item_on_lru_list; + /** the connection to reuse, the fd is non-1 and is open. + * the addr and port determine where the connection is going, + * and is key to the rbtree. The SSL ptr determines if it is + * a TLS connection or a plain TCP connection there. And TLS + * or not is also part of the key to the rbtree. + * There is a timeout and read event on the fd, to close it. */ + struct pending_tcp* pending; + /** + * The more read again value pointed to by the commpoint + * tcp_more_read_again pointer, so that it exists after commpoint + * delete + */ + int cp_more_read_again; + /** + * The more write again value pointed to by the commpoint + * tcp_more_write_again pointer, so that it exists after commpoint + * delete + */ + int cp_more_write_again; + /** rbtree with other queries waiting on the connection, by ID number, + * of type struct waiting_tcp. It is for looking up received + * answers to the structure for callback. And also to see if ID + * numbers are unused and can be used for a new query. + * The write_wait elements are also in the tree, so that ID numbers + * can be looked up also for them. They are bool write_wait_queued. */ + rbtree_type tree_by_id; + /** list of queries waiting to be written on the channel, + * if NULL no queries are waiting to be written and the pending->query + * is the query currently serviced. The first is the next in line. + * They are also in the tree_by_id. Once written, the are removed + * from this list, but stay in the tree. */ + struct waiting_tcp* write_wait_first, *write_wait_last; + /** the outside network it is part of */ + struct outside_network* outnet; +}; + +/** max number of queries on a reuse connection */ +#define MAX_REUSE_TCP_QUERIES 200 +/** timeout for REUSE entries in milliseconds. */ +#define REUSE_TIMEOUT 60000 + +/** * A query that has an answer pending for it. */ struct pending { @@ -255,12 +344,15 @@ struct pending { struct pending_tcp { /** next in list of free tcp comm points, or NULL. */ struct pending_tcp* next_free; - /** the ID for the query; checked in reply */ - uint16_t id; /** tcp comm point it was sent on (and reply must come back on). */ struct comm_point* c; /** the query being serviced, NULL if the pending_tcp is unused. */ struct waiting_tcp* query; + /** the pre-allocated reuse tcp structure. if ->pending is nonNULL + * it is in use and the connection is waiting for reuse. + * It is here for memory pre-allocation, and used to make this + * pending_tcp wait for reuse. */ + struct reuse_tcp reuse; }; /** @@ -269,12 +361,27 @@ struct pending_tcp { struct waiting_tcp { /** * next in waiting list. - * if pkt==0, this points to the pending_tcp structure. + * if on_tcp_waiting_list==0, this points to the pending_tcp structure. */ struct waiting_tcp* next_waiting; + /** if true the item is on the tcp waiting list and next_waiting + * is used for that. If false, the next_waiting points to the + * pending_tcp */ + int on_tcp_waiting_list; + /** next and prev in query waiting list for stream connection */ + struct waiting_tcp* write_wait_prev, *write_wait_next; + /** true if the waiting_tcp structure is on the write_wait queue */ + int write_wait_queued; + /** entry in reuse.tree_by_id, if key is NULL, not in tree, otherwise, + * this struct is key and sorted by ID (from waiting_tcp.id). */ + rbnode_type id_node; + /** the ID for the query; checked in reply */ + uint16_t id; /** timeout event; timer keeps running whether the query is * waiting for a buffer or the tcp reply is pending */ struct comm_timer* timer; + /** timeout in msec */ + int timeout; /** the outside network it is part of */ struct outside_network* outnet; /** remote address. */ @@ -284,13 +391,14 @@ struct waiting_tcp { /** * The query itself, the query packet to send. * allocated after the waiting_tcp structure. - * set to NULL when the query is serviced and it part of pending_tcp. - * if this is NULL, the next_waiting points to the pending_tcp. */ uint8_t* pkt; /** length of query packet. */ size_t pkt_len; - /** callback for the timeout, error or reply to the message */ + /** callback for the timeout, error or reply to the message, + * or NULL if no user is waiting. the entry uses an ID number. + * a query that was written is no longer needed, but the ID number + * and a reply will come back and can be ignored if NULL */ comm_point_callback_type* cb; /** callback user argument */ void* cb_arg; @@ -298,6 +406,8 @@ struct waiting_tcp { int ssl_upstream; /** ref to the tls_auth_name from the serviced_query */ char* tls_auth_name; + /** the packet was involved in an error, to stop looping errors */ + int error_count; }; /** @@ -421,6 +531,7 @@ struct serviced_query { * msec to wait on timeouted udp sockets. * @param tls_use_sni: if SNI is used for TLS connections. * @param dtenv: environment to send dnstap events with (if enabled). + * @param udp_connect: if the udp_connect option is enabled. * @return: the new structure (with no pending answers) or NULL on error. */ struct outside_network* outside_network_create(struct comm_base* base, @@ -429,7 +540,8 @@ struct outside_network* outside_network_create(struct comm_base* base, struct ub_randstate* rnd, int use_caps_for_id, int* availports, int numavailports, size_t unwanted_threshold, int tcp_mss, void (*unwanted_action)(void*), void* unwanted_param, int do_udp, - void* sslctx, int delayclose, int tls_use_sni, struct dt_env *dtenv); + void* sslctx, int delayclose, int tls_use_sni, struct dt_env *dtenv, + int udp_connect); /** * Delete outside_network structure. @@ -546,6 +658,19 @@ size_t outnet_get_mem(struct outside_network* outnet); */ size_t serviced_get_mem(struct serviced_query* sq); +/** Pick random ID value for a tcp stream, avoids existing IDs. */ +uint16_t reuse_tcp_select_id(struct reuse_tcp* reuse, + struct outside_network* outnet); + +/** find element in tree by id */ +struct waiting_tcp* reuse_tcp_by_id_find(struct reuse_tcp* reuse, uint16_t id); + +/** insert element in tree by id */ +void reuse_tree_by_id_insert(struct reuse_tcp* reuse, struct waiting_tcp* w); + +/** delete readwait waiting_tcp elements, deletes the elements in the list */ +void reuse_del_readwait(rbtree_type* tree_by_id); + /** 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, int tcp_mss, int dscp); @@ -643,4 +768,10 @@ int pending_cmp(const void* key1, const void* key2); /** compare function of serviced query rbtree */ int serviced_cmp(const void* key1, const void* key2); +/** compare function of reuse_tcp rbtree in outside_network struct */ +int reuse_cmp(const void* key1, const void* key2); + +/** compare function of reuse_tcp tree_by_id rbtree */ +int reuse_id_cmp(const void* key1, const void* key2); + #endif /* OUTSIDE_NETWORK_H */ diff --git a/services/rpz.c b/services/rpz.c index ba5dd186daad..13304652cc02 100644 --- a/services/rpz.c +++ b/services/rpz.c @@ -440,6 +440,8 @@ err: respip_set_delete(r->respip_set); if(r->taglist) free(r->taglist); + if(r->region) + regional_destroy(r->region); free(r); } return NULL; diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in index 3e506e84e236..eaf1d082cb76 100644 --- a/smallapp/unbound-control-setup.sh.in +++ b/smallapp/unbound-control-setup.sh.in @@ -120,12 +120,19 @@ if [ ! -f "$SVR_BASE.key" ]; then fi cat >server.cnf <<EOF +[req] default_bits=$BITS default_md=$HASH prompt=no distinguished_name=req_distinguished_name +x509_extensions=v3_ca [req_distinguished_name] commonName=$SERVERNAME +[v3_ca] +subjectKeyIdentifier=hash +authorityKeyIdentifier=keyid:always,issuer:always +basicConstraints=critical,CA:TRUE,pathlen:0 +subjectAltName=DNS:$SERVERNAME EOF [ -f server.cnf ] || fatal "cannot create openssl configuration" @@ -156,8 +163,12 @@ default_bits=$BITS default_md=$HASH prompt=no distinguished_name=req_distinguished_name +req_extensions=v3_req [req_distinguished_name] commonName=$CLIENTNAME +[v3_req] +basicConstraints=critical,CA:FALSE +subjectAltName=DNS:$CLIENTNAME EOF [ -f client.cnf ] || fatal "cannot create openssl configuration" @@ -179,6 +190,8 @@ if [ ! -f "$CTL_BASE.pem" -o $RECREATE -eq 1 ]; then -CAkey "$SVR_BASE.key" \ -CAcreateserial \ -$HASH \ + -extfile client.cnf \ + -extensions v3_req \ -out "$CTL_BASE.pem" [ ! -f "CTL_BASE.pem" ] || fatal "cannot create signed client certificate" diff --git a/testcode/do-tests.sh b/testcode/do-tests.sh index 5439f0f285e6..effb7c16a5bb 100755 --- a/testcode/do-tests.sh +++ b/testcode/do-tests.sh @@ -29,6 +29,9 @@ else HAVE_MINGW=no fi +# stop tests from notifying systemd, if that is compiled in. +export -n NOTIFY_SOCKET + cd testdata; sh ../testcode/mini_tdir.sh clean rm -f .perfstats.txt diff --git a/testcode/dohclient.c b/testcode/dohclient.c index adcc7d831554..263418049beb 100644 --- a/testcode/dohclient.c +++ b/testcode/dohclient.c @@ -90,6 +90,7 @@ static void usage(char* argv[]) printf("-e HTTP endpoint, default: /dns-query\n"); printf("-c Content-type in request, default: " "application/dns-message\n"); + printf("-n no-tls, TLS is disabled\n"); printf("-h This help text\n"); exit(1); } @@ -185,7 +186,10 @@ submit_query(struct http2_session* h2_session, struct sldns_buffer* buf) headers[1].name = (uint8_t*)":path"; headers[1].value = (uint8_t*)h2_stream->path; headers[2].name = (uint8_t*)":scheme"; - headers[2].value = (uint8_t*)"https"; + if(h2_session->ssl) + headers[2].value = (uint8_t*)"https"; + else + headers[2].value = (uint8_t*)"http"; headers[3].name = (uint8_t*)":authority"; headers[3].value = (uint8_t*)h2_session->authority; headers[4].name = (uint8_t*)"content-type"; @@ -246,6 +250,7 @@ static ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), { struct http2_session* h2_session = (struct http2_session*)cb_arg; int r; + ssize_t ret; struct timeval tv, *waittv; fd_set rfd; ERR_clear_error(); @@ -267,35 +272,58 @@ static ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), return NGHTTP2_ERR_WOULDBLOCK; } - r = SSL_read(h2_session->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { + if(h2_session->ssl) { + r = SSL_read(h2_session->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + return NGHTTP2_ERR_EOF; + } + log_crypto_err("could not SSL_read"); return NGHTTP2_ERR_EOF; } - log_crypto_err("could not SSL_read"); + return r; + } + + ret = read(h2_session->fd, buf, len); + if(ret == 0) { + return NGHTTP2_ERR_EOF; + } else if(ret < 0) { + log_err("could not http2 read: %s", strerror(errno)); return NGHTTP2_ERR_EOF; } - return r; + return ret; } static ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg) { struct http2_session* h2_session = (struct http2_session*)cb_arg; + ssize_t ret; - int r; - ERR_clear_error(); - r = SSL_write(h2_session->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { + if(h2_session->ssl) { + int r; + ERR_clear_error(); + r = SSL_write(h2_session->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + log_crypto_err("could not SSL_write"); return NGHTTP2_ERR_CALLBACK_FAILURE; } - log_crypto_err("could not SSL_write"); + return r; + } + + ret = write(h2_session->fd, buf, len); + if(ret == 0) { + return NGHTTP2_ERR_CALLBACK_FAILURE; + } else if(ret < 0) { + log_err("could not http2 write: %s", strerror(errno)); return NGHTTP2_ERR_CALLBACK_FAILURE; } - return r; + return ret; } static int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session), @@ -459,7 +487,7 @@ http2_read(struct http2_session* h2_session) } static void -run(struct http2_session* h2_session, int port, int count, char** q) +run(struct http2_session* h2_session, int port, int no_tls, int count, char** q) { int i; SSL_CTX* ctx = NULL; @@ -470,26 +498,28 @@ run(struct http2_session* h2_session, int port, int count, char** q) fd = open_svr(h2_session->authority, port); h2_session->fd = fd; - ctx = connect_sslctx_create(NULL, NULL, NULL, 0); - if(!ctx) fatal_exit("cannot create ssl ctx"); - SSL_CTX_set_alpn_protos(ctx, (const unsigned char *)"\x02h2", 3); - ssl = outgoing_ssl_fd(ctx, fd); - if(!ssl) { - printf("cannot create ssl\n"); - exit(1); - } - h2_session->ssl = ssl; - while(1) { - int r; - ERR_clear_error(); - if( (r=SSL_do_handshake(ssl)) == 1) - break; - r = SSL_get_error(ssl, r); - if(r != SSL_ERROR_WANT_READ && - r != SSL_ERROR_WANT_WRITE) { - log_crypto_err("could not ssl_handshake"); + if(!no_tls) { + ctx = connect_sslctx_create(NULL, NULL, NULL, 0); + if(!ctx) fatal_exit("cannot create ssl ctx"); + SSL_CTX_set_alpn_protos(ctx, (const unsigned char *)"\x02h2", 3); + ssl = outgoing_ssl_fd(ctx, fd); + if(!ssl) { + printf("cannot create ssl\n"); exit(1); } + h2_session->ssl = ssl; + while(1) { + int r; + ERR_clear_error(); + if( (r=SSL_do_handshake(ssl)) == 1) + break; + r = SSL_get_error(ssl, r); + if(r != SSL_ERROR_WANT_READ && + r != SSL_ERROR_WANT_WRITE) { + log_crypto_err("could not ssl_handshake"); + exit(1); + } + } } http2_submit_setting(h2_session); @@ -511,9 +541,13 @@ run(struct http2_session* h2_session, int port, int count, char** q) /* shutdown */ http2_session_delete(h2_session); - SSL_shutdown(ssl); - SSL_free(ssl); - SSL_CTX_free(ctx); + if(ssl) { + SSL_shutdown(ssl); + SSL_free(ssl); + } + if(ctx) { + SSL_CTX_free(ctx); + } close(fd); } @@ -524,10 +558,21 @@ extern char* optarg; int main(int argc, char** argv) { int c; - int port = UNBOUND_DNS_OVER_HTTPS_PORT; - struct http2_session* h2_session = http2_session_create(); - if(!h2_session) fatal_exit("out of memory"); + int port = UNBOUND_DNS_OVER_HTTPS_PORT, no_tls = 0; + struct http2_session* h2_session; +#ifdef USE_WINSOCK + WSADATA wsa_data; + if(WSAStartup(MAKEWORD(2,2), &wsa_data) != 0) { + printf("WSAStartup failed\n"); + return 1; + } +#endif + log_init(0, 0, 0); + checklock_start(); + + h2_session = http2_session_create(); + if(!h2_session) fatal_exit("out of memory"); if(argc == 1) { usage(argv); } @@ -537,7 +582,7 @@ int main(int argc, char** argv) h2_session->endpoint = "/dns-query"; h2_session->content_type = "application/dns-message"; - while((c=getopt(argc, argv, "c:e:hs:p:P")) != -1) { + while((c=getopt(argc, argv, "c:e:hns:p:P")) != -1) { switch(c) { case 'c': h2_session->content_type = optarg; @@ -545,6 +590,9 @@ int main(int argc, char** argv) case 'e': h2_session->endpoint = optarg; break; + case 'n': + no_tls = 1; + break; case 'p': if(atoi(optarg)==0 && strcmp(optarg,"0")!=0) { printf("error parsing port, " @@ -573,8 +621,12 @@ int main(int argc, char** argv) } - run(h2_session, port, argc, argv); + run(h2_session, port, no_tls, argc, argv); + checklock_stop(); +#ifdef USE_WINSOCK + WSACleanup(); +#endif return 0; } #else diff --git a/testcode/fake_event.c b/testcode/fake_event.c index d8df76492540..591557c35f12 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -872,6 +872,7 @@ listen_create(struct comm_base* base, struct listen_port* ATTR_UNUSED(ports), int ATTR_UNUSED(harden_large_queries), uint32_t ATTR_UNUSED(http_max_streams), char* ATTR_UNUSED(http_endpoint), + int ATTR_UNUSED(http_notls), struct tcl_list* ATTR_UNUSED(tcp_conn_limit), void* ATTR_UNUSED(sslctx), struct dt_env* ATTR_UNUSED(dtenv), comm_point_callback_type* cb, void *cb_arg) @@ -1044,7 +1045,7 @@ outside_network_create(struct comm_base* base, size_t bufsize, void (*unwanted_action)(void*), void* ATTR_UNUSED(unwanted_param), int ATTR_UNUSED(do_udp), void* ATTR_UNUSED(sslctx), int ATTR_UNUSED(delayclose), int ATTR_UNUSED(tls_use_sni), - struct dt_env* ATTR_UNUSED(dtenv)) + struct dt_env* ATTR_UNUSED(dtenv), int ATTR_UNUSED(udp_connect)) { struct replay_runtime* runtime = (struct replay_runtime*)base; struct outside_network* outnet = calloc(1, @@ -1213,7 +1214,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, sldns_buffer_flip(pend->buffer); if(1) { struct edns_data edns; - struct edns_tag_addr* client_tag_addr; + struct edns_string_addr* client_string_addr; if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen, zone, zonelen, qstate, qstate->region)) { free(pend); @@ -1227,13 +1228,13 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet, edns.bits = 0; if(dnssec) edns.bits = EDNS_DO; - if((client_tag_addr = edns_tag_addr_lookup( - &env->edns_tags->client_tags, + if((client_string_addr = edns_string_addr_lookup( + &env->edns_strings->client_strings, addr, addrlen))) { - uint16_t client_tag = htons(client_tag_addr->tag_data); edns_opt_list_append(&qstate->edns_opts_back_out, - env->edns_tags->client_tag_opcode, 2, - (uint8_t*)&client_tag, qstate->region); + env->edns_strings->client_string_opcode, + client_string_addr->string_len, + client_string_addr->string, qstate->region); } edns.opt_list = qstate->edns_opts_back_out; attach_edns_record(pend->buffer, &edns); @@ -1510,6 +1511,18 @@ int serviced_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b)) return 0; } +int reuse_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b)) +{ + log_assert(0); + return 0; +} + +int reuse_id_cmp(const void* ATTR_UNUSED(a), const void* ATTR_UNUSED(b)) +{ + log_assert(0); + return 0; +} + /* timers in testbound for autotrust. statistics tested in tdir. */ struct comm_timer* comm_timer_create(struct comm_base* base, void (*cb)(void*), void* cb_arg) diff --git a/testcode/run_vm.sh b/testcode/run_vm.sh index 5f599e144a5b..363a32b52cb5 100755 --- a/testcode/run_vm.sh +++ b/testcode/run_vm.sh @@ -40,6 +40,8 @@ cleanup() { exit 0 } trap cleanup INT +# stop tests from notifying systemd, if that is compiled in. +export -n NOTIFY_SOCKET for t in $RUNLIST do diff --git a/testcode/testbound.c b/testcode/testbound.c index 602dffaff14a..3f3e106b039c 100644 --- a/testcode/testbound.c +++ b/testcode/testbound.c @@ -362,6 +362,10 @@ main(int argc, char* argv[]) /* we do not want the test to depend on the timezone */ (void)putenv("TZ=UTC"); memset(pass_argv, 0, sizeof(pass_argv)); +#ifdef HAVE_SYSTEMD + /* we do not want the test to use systemd daemon startup notification*/ + (void)unsetenv("NOTIFY_SOCKET"); +#endif /* HAVE_SYSTEMD */ log_init(NULL, 0, NULL); /* determine commandline options for the daemon */ diff --git a/testcode/unitmain.c b/testcode/unitmain.c index a42be424e9e9..c61026f26808 100644 --- a/testcode/unitmain.c +++ b/testcode/unitmain.c @@ -839,6 +839,52 @@ static void respip_test(void) respip_conf_actions_test(); } +#include "services/outside_network.h" +/** 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) +{ + unsigned int i; + struct waiting_tcp* w; + for(i=0; i<addnum; i++) { + uint16_t id = reuse_tcp_select_id(reuse, outnet); + unit_assert(!reuse_tcp_by_id_find(reuse, id)); + w = calloc(1, sizeof(*w)); + unit_assert(w); + w->id = id; + w->outnet = outnet; + w->next_waiting = (void*)reuse->pending; + reuse_tree_by_id_insert(reuse, w); + } +} + +/** fill up the reuse ID tree and test assertions */ +static void tcpid_fillup(struct reuse_tcp* reuse, + struct outside_network* outnet) +{ + int t, numtest=3; + for(t=0; t<numtest; t++) { + rbtree_init(&reuse->tree_by_id, reuse_id_cmp); + tcpid_addmore(reuse, outnet, 65535); + reuse_del_readwait(&reuse->tree_by_id); + } +} + +/** test TCP ID selection */ +static void tcpid_test(void) +{ + struct pending_tcp pend; + struct outside_network outnet; + unit_show_func("services/outside_network.c", "reuse_tcp_select_id"); + memset(&pend, 0, sizeof(pend)); + pend.reuse.pending = &pend; + memset(&outnet, 0, sizeof(outnet)); + outnet.rnd = ub_initstate(NULL); + rbtree_init(&pend.reuse.tree_by_id, reuse_id_cmp); + tcpid_fillup(&pend.reuse, &outnet); + ub_randfree(outnet.rnd); +} + void unit_show_func(const char* file, const char* func) { printf("test %s:%s\n", file, func); @@ -907,6 +953,7 @@ main(int argc, char* argv[]) infra_test(); ldns_test(); msgparse_test(); + tcpid_test(); #ifdef CLIENT_SUBNET ecs_test(); #endif /* CLIENT_SUBNET */ diff --git a/testdata/dnstap.tdir/dnstap.pre b/testdata/dnstap.tdir/dnstap.pre index 95216949cdde..6561d77e98a2 100644 --- a/testdata/dnstap.tdir/dnstap.pre +++ b/testdata/dnstap.tdir/dnstap.pre @@ -45,7 +45,7 @@ fi # make config file sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' -e 's/@CONTROL_PORT\@/'$CONTROL_PORT'/' < dnstap.conf > ub.conf # start unbound in the background -$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +$PRE/unbound -d -c ub.conf -vvvv >unbound.log 2>&1 & UNBOUND_PID=$! echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test diff --git a/testdata/dnstap.tdir/dnstap.test b/testdata/dnstap.tdir/dnstap.test index d548e2dad784..fbf8565ffcac 100644 --- a/testdata/dnstap.tdir/dnstap.test +++ b/testdata/dnstap.tdir/dnstap.test @@ -59,6 +59,8 @@ dig @127.0.0.1 -p $UNBOUND_PORT q7.example.net. dig @127.0.0.1 -p $UNBOUND_PORT q8.example.net. dig @127.0.0.1 -p $UNBOUND_PORT q9.example.net. dig @127.0.0.1 -p $UNBOUND_PORT q10.example.net. +echo "> wait for log to happen on timer" +sleep 3 for x in q1 q2 q3 q4 5 q6 q7 q8 q9 q10; do if grep "$x.example.net" tap.log >/dev/null; then :; else sleep 1; fi if grep "$x.example.net" tap.log >/dev/null; then :; else sleep 1; fi diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf new file mode 100644 index 000000000000..bdca456455ae --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.conf @@ -0,0 +1,28 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1@@PORT@ + https-port: @PORT@ + tls-service-key: "unbound_server.key" + tls-service-pem: "unbound_server.pem" + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + http-query-buffer-size: 1G + http-response-buffer-size: 1G + http-max-streams: 200 + http-notls-downstream: yes + + local-zone: "example.net" static + local-data: "www1.example.net. IN A 1.2.3.1" + local-data: "www2.example.net. IN A 1.2.3.2" + local-data: "www3.example.net. IN A 1.2.3.3" + local-zone: "drop.net" deny + tcp-upstream: yes + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc new file mode 100644 index 000000000000..4b908e0526d0 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.dsc @@ -0,0 +1,16 @@ +BaseName: doh_downstream_notls +Version: 1.0 +Description: Test DNS-over-HTTP query processing with no-tls +CreationDate: Mon Jun 12 12:00:00 CET 2020 +Maintainer: +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: doh_downstream_notls.pre +Post: doh_downstream_notls.post +Test: doh_downstream_notls.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post new file mode 100644 index 000000000000..3ceaeade8f8d --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.post @@ -0,0 +1,13 @@ +# #-- doh_downstream_notls.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +PRE="../.." +if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID +cat unbound.log diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre new file mode 100644 index 000000000000..e1f30a575a81 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.pre @@ -0,0 +1,33 @@ +# #-- doh_downstream_notls.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +PRE="../.." +. ../common.sh +if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi + +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 doh_downstream_notls.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'/' < doh_downstream_notls.conf > ub.conf +# start unbound in the background +$PRE/unbound -vvvv -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/doh_downstream_notls.tdir/doh_downstream_notls.test b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test new file mode 100644 index 000000000000..87ff560d3eae --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.test @@ -0,0 +1,339 @@ +# #-- doh_downstream_notls.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 +if grep "define HAVE_NGHTTP2 1" $PRE/config.h; then echo test enabled; else echo test skipped; exit 0; fi +get_make +(cd $PRE; $MAKE dohclient) + + +# this test query should just work (server is up) +echo "> query www1.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +echo "OK" + +# multiple requests (from localdata) +echo "> query www1.example.net. www2.example.net. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +# out of order requests, the example.com elements take 2 seconds to wait. +echo "" +echo "> query www1.example.net. www.example.com. www2.example.net. www2.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www.example.com" outfile | grep "10.20.30.40"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.com" outfile | grep "10.20.30.42"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +# out of order requests, the example.com elements take 2 seconds to wait. +# www.example.com present twice, answered twice. +echo "" +echo "> query www1.example.net. www.example.com. www2.example.net. www.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www.example.com" outfile | grep "10.20.30.40"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +# out of order requests, the example.com elements take 2 seconds to wait. +# www3.example.com present twice, answered twice. +echo "" +echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.net" outfile | grep "1.2.3.1"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www2.example.net" outfile | grep "1.2.3.2"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www3.example.com" outfile | grep "10.20.30.43"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + +echo "" +echo "> query www4.example.com. www3.example.net." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www3.example.net" outfile | grep "1.2.3.3"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi +if grep "www4.example.com" outfile | grep "10.20.30.44"; then + echo "content OK" +else + echo "result contents not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "result contents not OK" + exit 1 +fi + + +echo "" +echo "> query a1.example.com. - a90.example.com." +$PRE/dohclient -n -s 127.0.0.1 -p $UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi +num_ans=$(grep -B 3 "a.example.com. IN A" outfile | grep "rcode: NOERROR" | wc -l ) +if test "$num_ans" -ne 90; then + echo "number of answers not OK" + echo "> cat logfiles" + cat outfile + cat fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns new file mode 100644 index 000000000000..c53941b678bc --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/doh_downstream_notls.testns @@ -0,0 +1,74 @@ +; nameserver test file +$ORIGIN example.com. +$TTL 3600 + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www IN A +SECTION ANSWER +www IN A 10.20.30.40 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www2 IN A +SECTION ANSWER +www2 IN A 10.20.30.42 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id +SECTION QUESTION +www3 IN A +SECTION ANSWER +www3 IN A 10.20.30.43 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www4 IN A +SECTION ANSWER +www4 IN A 10.20.30.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www5 IN A +SECTION ANSWER +www5 IN A 10.20.30.45 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=2 +SECTION QUESTION +www6 IN A +SECTION ANSWER +www6 IN A 10.20.30.46 +ENTRY_END + +; lots of noerror/nodata answers for other queries (a.. queries) +ENTRY_BEGIN +MATCH opcode qtype subdomain +REPLY QR AA NOERROR +ADJUST copy_id copy_query +SECTION QUESTION +a.example.com. IN A +SECTION AUTHORITY +example.com. IN SOA ns hostmaster 2019 28800 7200 604800 3600 +ENTRY_END diff --git a/testdata/doh_downstream_notls.tdir/unbound_server.key b/testdata/doh_downstream_notls.tdir/unbound_server.key new file mode 100644 index 000000000000..4256c421dd0d --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/unbound_server.key @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICWwIBAAKBgQC3F7Jsv2u01pLL9rFnjsMU/IaCFUIz/624DcaE84Z4gjMl5kWA +3axQcqul1wlwSrbKwrony+d9hH/+MX0tZwvl8w3OmhmOAiaQ+SHCsIuOjVwQjX0s +RLB61Pz5+PAiVvnPa9JIYB5QrK6DVEsxIHj8MOc5JKORrnESsFDh6yeMeQIDAQAB +AoGAAuWoGBprTOA8UGfl5LqYkaNxSWumsYXxLMFjC8WCsjN1NbtQDDr1uAwodSZS +6ujzvX+ZTHnofs7y64XC8k34HTOCD2zlW7kijWbT8YjRYFU6o9F5zUGD9RCan0ds +sVscT2psLSzfdsmFAcbmnGdxYkXk2PC1FHtaqExxehralGUCQQDcqrg9uQKXlhQi +XAaPr8SiWvtRm2a9IMMZkRfUWZclPHq6fCWNuUaCD+cTat4wAuqeknAz33VEosw3 +fXGsok//AkEA1GjIHXrOcSlpfVJb6NeOBugjRtZ7ZDT5gbtnMS9ob0qntKV6saaL +CNmJwuD9Q3XkU5j1+uHvYGP2NzcJd2CjhwJACV0hNlVMe9w9fHvFN4Gw6WbM9ViP +0oS6YrJafYNTu5vGZXVxLoNnL4u3NYa6aPUmuZXjNwBLfJ8f5VboZPf6RwJAINd2 +oYA8bSi/A755MX4qmozH74r4Fx1Nuq5UHTm8RwDe/0Javx8F/j9MWpJY9lZDEF3l +In5OebPa/NyInSmW/wJAZuP9aRn0nDBkHYri++1A7NykMiJ/nH0mDECbnk+wxx0S +LwqIetBhxb8eQwMg45+iAH7CHAMQ8BQuF/nFE6eotg== +-----END RSA PRIVATE KEY----- diff --git a/testdata/doh_downstream_notls.tdir/unbound_server.pem b/testdata/doh_downstream_notls.tdir/unbound_server.pem new file mode 100644 index 000000000000..aeda3ff11882 --- /dev/null +++ b/testdata/doh_downstream_notls.tdir/unbound_server.pem @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE----- +MIIBmzCCAQQCCQDsNJ1UmphEFzANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDEwd1 +bmJvdW5kMB4XDTA4MDkxMTA5MDk0MFoXDTI4MDUyOTA5MDk0MFowEjEQMA4GA1UE +AxMHdW5ib3VuZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtxeybL9rtNaS +y/axZ47DFPyGghVCM/+tuA3GhPOGeIIzJeZFgN2sUHKrpdcJcEq2ysK6J8vnfYR/ +/jF9LWcL5fMNzpoZjgImkPkhwrCLjo1cEI19LESwetT8+fjwIlb5z2vSSGAeUKyu +g1RLMSB4/DDnOSSjka5xErBQ4esnjHkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQAZ +9N0lnLENs4JMvPS+mn8C5m9bkkFITd32IiLjf0zgYpIUbFXH6XaEr9GNZBUG8feG +l/6WRXnbnVSblI5odQ4XxGZ9inYY6qtW30uv76HvoKp+QZ1c3460ddR8NauhcCHH +Z7S+QbLXi+r2JAhpPozZCjBHlRD0ixzA1mKQTJhJZg== +-----END CERTIFICATE----- diff --git a/testdata/edns_client_tag.rpl b/testdata/edns_client_string.rpl index 767652c26aa2..1822f7898f2a 100644 --- a/testdata/edns_client_tag.rpl +++ b/testdata/edns_client_string.rpl @@ -1,14 +1,14 @@ ; config options server: - edns-client-tag: 10.0.0.0/24 1234 - edns-client-tag: 10.0.0.10/32 5678 + edns-client-string: 10.0.0.0/24 "abc d" + edns-client-string: 10.0.0.10/32 "123AbC!" stub-zone: - name: "tag1234." + name: "edns-string-abc." stub-addr: 10.0.0.1 stub-zone: - name: "tag5678." + name: "edns-string-123." stub-addr: 10.0.0.10 stub-zone: @@ -17,7 +17,7 @@ stub-zone: CONFIG_END -SCENARIO_BEGIN Test EDNS client tag option +SCENARIO_BEGIN Test EDNS string tag option RANGE_BEGIN 0 1000 ADDRESS 10.0.0.1 @@ -26,9 +26,9 @@ MATCH opcode qtype qname ADJUST copy_id REPLY QR NOERROR SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A SECTION ANSWER -tag1234. IN A 10.20.30.40 +edns-string-abc. IN A 10.20.30.40 SECTION ADDITIONAL ENTRY_END RANGE_END @@ -40,9 +40,9 @@ MATCH opcode qtype qname ADJUST copy_id REPLY QR NOERROR SECTION QUESTION -tag5678. IN A +edns-string-123. IN A SECTION ANSWER -tag5678. IN A 10.20.30.40 +edns-string-123. IN A 10.20.30.40 SECTION ADDITIONAL ENTRY_END RANGE_END @@ -65,19 +65,19 @@ STEP 10 QUERY ENTRY_BEGIN REPLY RD SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A ENTRY_END STEP 20 CHECK_OUT_QUERY ENTRY_BEGIN MATCH qname qtype opcode ednsdata SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A SECTION ADDITIONAL HEX_EDNSDATA_BEGIN - 00 10 ; Opcode 16 - 00 02 ; Length 2 - 04 d2 ; 1234 + fd e9 ; Opcode 65001 + 00 05 ; Length 5 + 61 62 63 20 64 ; "abc d" HEX_EDNSDATA_END ENTRY_END @@ -86,28 +86,29 @@ ENTRY_BEGIN MATCH all REPLY QR RD RA NOERROR SECTION QUESTION -tag1234. IN A +edns-string-abc. IN A SECTION ANSWER -tag1234. IN A 10.20.30.40 +edns-string-abc. IN A 10.20.30.40 ENTRY_END STEP 110 QUERY ENTRY_BEGIN REPLY RD SECTION QUESTION -tag5678. IN A +edns-string-123. IN A ENTRY_END STEP 120 CHECK_OUT_QUERY ENTRY_BEGIN MATCH qname qtype opcode ednsdata SECTION QUESTION -tag5678. IN A +edns-string-123. IN A SECTION ADDITIONAL HEX_EDNSDATA_BEGIN - 00 10 ; Opcode 16 - 00 02 ; Length 2 - 16 2e ; 5678 + fd e9 ; Opcode 65001 + 00 07 ; Length 7 + 31 32 33 41 62 ; "123Ab" + 43 21 ; "C!" HEX_EDNSDATA_END ENTRY_END @@ -116,9 +117,9 @@ ENTRY_BEGIN MATCH all REPLY QR RD RA NOERROR SECTION QUESTION -tag5678. IN A +edns-string-123. IN A SECTION ANSWER -tag5678. IN A 10.20.30.40 +edns-string-123. IN A 10.20.30.40 ENTRY_END STEP 210 QUERY diff --git a/testdata/edns_client_string_opcode.rpl b/testdata/edns_client_string_opcode.rpl new file mode 100644 index 000000000000..3bd6dda4edb8 --- /dev/null +++ b/testdata/edns_client_string_opcode.rpl @@ -0,0 +1,153 @@ +; config options +server: + edns-client-string: 10.0.0.0/24 "abc d" + edns-client-string: 10.0.0.10/32 "123AbC!" + edns-client-string-opcode: 65432 + +stub-zone: + name: "edns-string-abc." + stub-addr: 10.0.0.1 + +stub-zone: + name: "edns-string-123." + stub-addr: 10.0.0.10 + +stub-zone: + name: "notag." + stub-addr: 10.10.0.1 + +CONFIG_END + +SCENARIO_BEGIN Test EDNS string tag option + +RANGE_BEGIN 0 1000 + ADDRESS 10.0.0.1 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +edns-string-abc. IN A +SECTION ANSWER +edns-string-abc. IN A 10.20.30.40 +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +RANGE_BEGIN 0 1000 + ADDRESS 10.0.0.10 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +edns-string-123. IN A +SECTION ANSWER +edns-string-123. IN A 10.20.30.40 +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +RANGE_BEGIN 0 1000 + ADDRESS 10.10.0.1 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +notag. IN A +SECTION ANSWER +notag. IN A 10.20.30.40 +SECTION ADDITIONAL +ENTRY_END +RANGE_END + +STEP 10 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +edns-string-abc. IN A +ENTRY_END + +STEP 20 CHECK_OUT_QUERY +ENTRY_BEGIN +MATCH qname qtype opcode ednsdata +SECTION QUESTION +edns-string-abc. IN A +SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + ff 98 ; Opcode 65432 + 00 05 ; Length 5 + 61 62 63 20 64 ; "abc d" + HEX_EDNSDATA_END +ENTRY_END + +STEP 30 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +edns-string-abc. IN A +SECTION ANSWER +edns-string-abc. IN A 10.20.30.40 +ENTRY_END + +STEP 110 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +edns-string-123. IN A +ENTRY_END + +STEP 120 CHECK_OUT_QUERY +ENTRY_BEGIN +MATCH qname qtype opcode ednsdata +SECTION QUESTION +edns-string-123. IN A +SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + ff 98 ; Opcode 65432 + 00 07 ; Length 7 + 31 32 33 41 62 ; "123Ab" + 43 21 ; "C!" + HEX_EDNSDATA_END +ENTRY_END + +STEP 130 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +edns-string-123. IN A +SECTION ANSWER +edns-string-123. IN A 10.20.30.40 +ENTRY_END + +STEP 210 QUERY +ENTRY_BEGIN +REPLY RD +SECTION QUESTION +notag. IN A +ENTRY_END + +STEP 220 CHECK_OUT_QUERY +ENTRY_BEGIN +MATCH qname qtype opcode ednsdata +SECTION QUESTION +notag. IN A +SECTION ADDITIONAL + HEX_EDNSDATA_BEGIN + HEX_EDNSDATA_END +ENTRY_END + +STEP 230 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR RD RA NOERROR +SECTION QUESTION +notag. IN A +SECTION ANSWER +notag. IN A 10.20.30.40 +ENTRY_END + +SCENARIO_END diff --git a/testdata/fwd_oneport.tdir/fwd_oneport.conf b/testdata/fwd_oneport.tdir/fwd_oneport.conf index f3427fece2c5..21ebc9fed054 100644 --- a/testdata/fwd_oneport.tdir/fwd_oneport.conf +++ b/testdata/fwd_oneport.tdir/fwd_oneport.conf @@ -13,6 +13,7 @@ server: num-queries-per-thread: 1024 use-syslog: no do-not-query-localhost: no + udp-connect: no forward-zone: name: "." forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf b/testdata/tcp_reuse.tdir/tcp_reuse.conf new file mode 100644 index 000000000000..e8de8d3f8667 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf @@ -0,0 +1,17 @@ +server: + verbosity: 5 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + + tcp-upstream: yes + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.conf2 b/testdata/tcp_reuse.tdir/tcp_reuse.conf2 new file mode 100644 index 000000000000..55985c83fe13 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.conf2 @@ -0,0 +1,39 @@ +# this is the upstream server that has pipelining and responds to queries. +server: + verbosity: 1 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound2.pid" + chroot: "" + username: "" + do-not-query-localhost: no + tcp-idle-timeout: 10000 + + log-queries: yes + log-replies: yes + log-identity: "upstream" + + local-zone: "." refuse + local-zone: "example.com" static + local-data: "www.example.com A 10.20.30.40" + local-data: "www1.example.com A 10.20.30.41" + local-data: "www2.example.com A 10.20.30.42" + local-data: "www3.example.com A 10.20.30.43" + local-data: "www4.example.com A 10.20.30.44" + local-data: "www5.example.com A 10.20.30.45" + local-data: "www6.example.com A 10.20.30.46" + local-data: "www7.example.com A 10.20.30.47" + + local-zone: "drop.net" deny + local-zone: "refuse.net" refuse + + local-zone: "more.net" redirect + local-data: "more.net A 10.20.30.40" + +# if queries escape, send them to localhost +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.dsc b/testdata/tcp_reuse.tdir/tcp_reuse.dsc new file mode 100644 index 000000000000..8a780480d1a0 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.dsc @@ -0,0 +1,16 @@ +BaseName: tcp_reuse +Version: 1.0 +Description: Test tcp stream reuse. +CreationDate: Wed Jun 03 09:37:00 CET 2020 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tcp_reuse.pre +Post: tcp_reuse.post +Test: tcp_reuse.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.post b/testdata/tcp_reuse.tdir/tcp_reuse.post new file mode 100644 index 000000000000..ca75354714ed --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.post @@ -0,0 +1,19 @@ +# #-- tcp_reuse.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 `cat unbound2.pid` +if test -f unbound2.log; then + echo ">>> upstream log" + cat unbound2.log +fi +#kill_pid $UNBOUND_PID +kill_pid `cat unbound.pid` +if test -f unbound.log; then + echo ">>> unbound log" + cat unbound.log +fi diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.pre b/testdata/tcp_reuse.tdir/tcp_reuse.pre new file mode 100644 index 000000000000..511dbc6f73f5 --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.pre @@ -0,0 +1,34 @@ +# #-- tcp_reuse.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 +get_random_port 2 +UNBOUND_PORT=$RND_PORT +UPSTREAM_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf > ub.conf +# start unbound in the background +#$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test +wait_unbound_up unbound.log + +# make upstream config file +sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tcp_reuse.conf2 > ub2.conf +# start upstream unbound in the background +#$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 & +$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log & +UPSTREAM_PID=$! +echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test +wait_unbound_up unbound2.log + +cat .tpkg.var.test + diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test new file mode 100644 index 000000000000..b62ec0d196ca --- /dev/null +++ b/testdata/tcp_reuse.tdir/tcp_reuse.test @@ -0,0 +1,309 @@ +# #-- tcp_reuse.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 + +get_make +(cd $PRE; $MAKE streamtcp) + +echo "> query www1.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www1.example.com. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.com" outfile | grep "10.20.30.41"; then + echo "content OK" +else + echo "result contents not OK, for www1.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www1.example.com" + exit 1 +fi +echo "OK" +echo "" + +# this should be reused on the same tcp stream: +echo "> query www2.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www2.example.com" outfile | grep "10.20.30.42"; then + echo "content OK" +else + echo "result contents not OK, for www2.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www2.example.com" + exit 1 +fi + +echo "> query refuse.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for refuse.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for refuse.net" + exit 1 +fi + +echo "> query www3.example.com." +echo "> query www4.example.com." +echo "> query www5.example.com." +echo "> query www6.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www3.example.com. A IN >outfile3 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN >outfile4 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN >outfile5 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN >outfile6 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www3.example.com" outfile3 | grep "10.20.30.43"; then + echo "content OK" +else + echo "result contents not OK, for www3.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www3.example.com" + exit 1 +fi +if grep "www4.example.com" outfile4 | grep "10.20.30.44"; then + echo "content OK" +else + echo "result contents not OK, for www4.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www4.example.com" + exit 1 +fi +if grep "www5.example.com" outfile5 | grep "10.20.30.45"; then + echo "content OK" +else + echo "result contents not OK, for www5.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www5.example.com" + exit 1 +fi +if grep "www6.example.com" outfile6 | grep "10.20.30.46"; then + echo "content OK" +else + echo "result contents not OK, for www6.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www6.example.com" + exit 1 +fi + +echo "> query a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a1.more.net A IN a2.more.net A IN a3.more.net A IN a4.more.net A IN a5.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# make the server timeout to drop the upstream connection +echo "> sleep 15" +sleep 15 +# see if we are still up. +echo "> query a7.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a7.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a7.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# dropconn.drop.net make the server drop the connection. +echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +# cannot really check outfile, because it may or may not have answers depending +# on how fast the other server responds or the drop happens, but there are +# a bunch of connection drops, whilst resolving the other queries. + +echo "> query drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT drop.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for drop.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for drop.net" + exit 1 +fi + + +# timeouts at the end. (so that the server is not marked as failed for +# the other tests). +echo "> query q1.drop.net." +echo "> query q2.drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile1 +cat outfile2 +if grep "rcode: SERVFAIL" outfile1; then + echo "content OK" +else + echo "result contents not OK, for q1.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q1.drop.net" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile2; then + echo "content OK" +else + echo "result contents not OK, for q2.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q2.drop.net" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/tls_reuse.tdir/tls_reuse.conf b/testdata/tls_reuse.tdir/tls_reuse.conf new file mode 100644 index 000000000000..e8200b28b7ae --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.conf @@ -0,0 +1,18 @@ +server: + verbosity: 5 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + + tls-cert-bundle: "unbound_server.pem" + tls-upstream: yes + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@#unbound" diff --git a/testdata/tls_reuse.tdir/tls_reuse.conf2 b/testdata/tls_reuse.tdir/tls_reuse.conf2 new file mode 100644 index 000000000000..0b452558d8c9 --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.conf2 @@ -0,0 +1,43 @@ +# this is the upstream server that has pipelining and responds to queries. +server: + verbosity: 1 + # num-threads: 1 + interface: 127.0.0.1@@PORT@ + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound2.pid" + chroot: "" + username: "" + do-not-query-localhost: no + tls-port: @PORT@ + tls-service-key: "unbound_server.key" + tls-service-pem: "unbound_server.pem" + tcp-idle-timeout: 10000 + + log-queries: yes + log-replies: yes + log-identity: "upstream" + + local-zone: "." refuse + local-zone: "example.com" static + local-data: "www.example.com A 10.20.30.40" + local-data: "www1.example.com A 10.20.30.41" + local-data: "www2.example.com A 10.20.30.42" + local-data: "www3.example.com A 10.20.30.43" + local-data: "www4.example.com A 10.20.30.44" + local-data: "www5.example.com A 10.20.30.45" + local-data: "www6.example.com A 10.20.30.46" + local-data: "www7.example.com A 10.20.30.47" + + local-zone: "drop.net" deny + local-zone: "refuse.net" refuse + + local-zone: "more.net" redirect + local-data: "more.net A 10.20.30.40" + +# if queries escape, send them to localhost +forward-zone: + name: "." + forward-tls-upstream: yes + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tls_reuse.tdir/tls_reuse.dsc b/testdata/tls_reuse.tdir/tls_reuse.dsc new file mode 100644 index 000000000000..76a80cdadbdb --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.dsc @@ -0,0 +1,16 @@ +BaseName: tls_reuse +Version: 1.0 +Description: Test tls stream reuse. +CreationDate: Wed Jun 30 16:37:00 CET 2020 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tls_reuse.pre +Post: tls_reuse.post +Test: tls_reuse.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tls_reuse.tdir/tls_reuse.post b/testdata/tls_reuse.tdir/tls_reuse.post new file mode 100644 index 000000000000..2eef0da96233 --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.post @@ -0,0 +1,19 @@ +# #-- tls_reuse.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 `cat unbound2.pid` +if test -f unbound2.log; then + echo ">>> upstream log" + cat unbound2.log +fi +#kill_pid $UNBOUND_PID +kill_pid `cat unbound.pid` +if test -f unbound.log; then + echo ">>> unbound log" + cat unbound.log +fi diff --git a/testdata/tls_reuse.tdir/tls_reuse.pre b/testdata/tls_reuse.tdir/tls_reuse.pre new file mode 100644 index 000000000000..f4ba26372da7 --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.pre @@ -0,0 +1,34 @@ +# #-- tls_reuse.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 +get_random_port 2 +UNBOUND_PORT=$RND_PORT +UPSTREAM_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "UPSTREAM_PORT=$UPSTREAM_PORT" >> .tpkg.var.test + +# make config file +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf > ub.conf +# start unbound in the background +#$PRE/unbound -d -c ub.conf >unbound.log 2>&1 & +$PRE/unbound -d -c ub.conf 2>&1 | tee unbound.log & +UNBOUND_PID=$! +echo "UNBOUND_PID=$UNBOUND_PID" >> .tpkg.var.test +wait_unbound_up unbound.log + +# make upstream config file +sed -e 's/@PORT\@/'$UPSTREAM_PORT'/' -e 's/@TOPORT\@/'$UPSTREAM_PORT'/' < tls_reuse.conf2 > ub2.conf +# start upstream unbound in the background +#$PRE/unbound -d -c ub2.conf >unbound2.log 2>&1 & +$PRE/unbound -d -c ub2.conf 2>&1 | tee unbound2.log & +UPSTREAM_PID=$! +echo "UPSTREAM_PID=$UPSTREAM_PID" >> .tpkg.var.test +wait_unbound_up unbound2.log + +cat .tpkg.var.test + diff --git a/testdata/tls_reuse.tdir/tls_reuse.test b/testdata/tls_reuse.tdir/tls_reuse.test new file mode 100644 index 000000000000..0f392fba81fe --- /dev/null +++ b/testdata/tls_reuse.tdir/tls_reuse.test @@ -0,0 +1,308 @@ +# #-- tls_reuse.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 + +get_make +(cd $PRE; $MAKE streamtcp) + +echo "> query www1.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www1.example.com. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www1.example.com" outfile | grep "10.20.30.41"; then + echo "content OK" +else + echo "result contents not OK, for www1.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www1.example.com" + exit 1 +fi +echo "OK" +echo "" + +# this should be reused on the same tcp stream: +echo "> query www2.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www2.example.com" outfile | grep "10.20.30.42"; then + echo "content OK" +else + echo "result contents not OK, for www2.example.com" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www2.example.com" + exit 1 +fi + +echo "> query refuse.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for refuse.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for refuse.net" + exit 1 +fi + +echo "> query www3.example.com." +echo "> query www4.example.com." +echo "> query www5.example.com." +echo "> query www6.example.com." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www3.example.com. A IN >outfile3 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN >outfile4 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN >outfile5 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN >outfile6 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "www3.example.com" outfile3 | grep "10.20.30.43"; then + echo "content OK" +else + echo "result contents not OK, for www3.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www3.example.com" + exit 1 +fi +if grep "www4.example.com" outfile4 | grep "10.20.30.44"; then + echo "content OK" +else + echo "result contents not OK, for www4.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www4.example.com" + exit 1 +fi +if grep "www5.example.com" outfile5 | grep "10.20.30.45"; then + echo "content OK" +else + echo "result contents not OK, for www5.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www5.example.com" + exit 1 +fi +if grep "www6.example.com" outfile6 | grep "10.20.30.46"; then + echo "content OK" +else + echo "result contents not OK, for www6.example.com" + echo "> cat logfiles" + cat outfile3 + cat outfile4 + cat outfile5 + cat outfile6 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for www6.example.com" + exit 1 +fi + +echo "> query a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a1.more.net A IN a2.more.net A IN a3.more.net A IN a4.more.net A IN a5.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a1.more.net a2.more.net a3.more.net a4.more.net a5.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# make the server timeout to drop the upstream connection +echo "> sleep 15" +sleep 15 +# see if we are still up. +echo "> query a7.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a7.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +for x in a7.more.net; do + if grep "$x" outfile | grep "10.20.30.40"; then + echo "content OK for $x" + else + echo "result contents not OK, for $x" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for $x" + exit 1 + fi +done + +# dropconn.drop.net make the server drop the connection. +echo "> query a11.more.net a12.more.net dropconn.drop.net a14.more.net a15.more.net" +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT a11.more.net A IN a12.more.net A IN dropconn.drop.net A IN a14.more.net A IN a15.more.net A IN >outfile 2>&1 +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile +# cannot really check outfile, because it may or may not have answers depending +# on how fast the other server responds or the drop happens, but there are +# a bunch of connection drops, whilst resolving the other queries. + +echo "> query drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT drop.net. A IN >outfile 2>&1 +cat outfile +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile; then + echo "content OK" +else + echo "result contents not OK, for drop.net" + echo "> cat logfiles" + cat outfile + cat unbound2.log + cat unbound.log + echo "result contents not OK, for drop.net" + exit 1 +fi + +# timeouts at the end. (so that the server is not marked as failed for +# the other tests). +echo "> query q1.drop.net." +echo "> query q2.drop.net." +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q1.drop.net. A IN >outfile1 2>&1 & +$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT q2.drop.net. A IN >outfile2 2>&1 & +wait +if test "$?" -ne 0; then + echo "exit status not OK" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "Not OK" + exit 1 +fi +cat outfile1 +cat outfile2 +if grep "rcode: SERVFAIL" outfile1; then + echo "content OK" +else + echo "result contents not OK, for q1.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q1.drop.net" + exit 1 +fi +if grep "rcode: SERVFAIL" outfile2; then + echo "content OK" +else + echo "result contents not OK, for q2.drop.net" + echo "> cat logfiles" + cat outfile1 + cat outfile2 + cat unbound2.log + cat unbound.log + echo "result contents not OK, for q2.drop.net" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/tls_reuse.tdir/unbound_control.key b/testdata/tls_reuse.tdir/unbound_control.key new file mode 100644 index 000000000000..753a4ef6162e --- /dev/null +++ b/testdata/tls_reuse.tdir/unbound_control.key @@ -0,0 +1,39 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIG4gIBAAKCAYEAstEp+Pyh8XGrtZ77A4FhYjvbeB3dMa7Q2rGWxobzlA9przhA +1aChAvUtCOAuM+rB6NTNB8YWfZJbQHawyMNpmC77cg6vXLYCGUQHZyAqidN049RJ +F5T7j4N8Vniv17LiRdr0S6swy4PRvEnIPPV43EQHZqC5jVvHsKkhIfmBF/Dj5TXR +ypeawWV/m5jeU6/4HRYMfytBZdO1mPXuWLh0lgbQ4SCbgrOUVD3rniMk1yZIbQOm +vlDHYqekjDb/vOW2KxUQLG04aZMJ1mWfdbwG0CKQkSjISEDZ1l76vhM6mTM0fwXb +IvyFZ9yPPCle1mF5aSlxS2cmGuGVSRQaw8XF9fe3a9ACJJTr33HdSpyaZkKRAUzL +cKqLCl323daKv3NwwAT03Tj4iQM416ASMoiyfFa/2GWTKQVjddu8Crar7tGaf5xr +lig4DBmrBvdYA3njy72/RD71hLwmlRoCGU7dRuDr9O6KASUm1Ri91ONZ/qdjMvov +15l2vj4GV+KXR00dAgMBAAECggGAHepIL1N0dEQkCdpy+/8lH54L9WhpnOo2HqAf +LU9eaKK7d4jdr9+TkD8cLaPzltPrZNxVALvu/0sA4SP6J1wpyj/x6P7z73qzly5+ +Xo5PD4fEwmi9YaiW/UduAblnEZrnp/AddptJKoL/D5T4XtpiQddPtael4zQ7kB57 +YIexRSQTvEDovA/o3/nvA0TrzOxfgd4ycQP3iOWGN/TMzyLsvjydrUwbOB567iz9 +whL3Etdgvnwh5Sz2blbFfH+nAR8ctvFFz+osPvuIVR21VMEI6wm7kTpSNnQ6sh/c +lrLb/bTADn4g7z/LpIZJ+MrLvyEcoqValrLYeFBhM9CV8woPxvkO2P3pU47HVGax +tC7GV6a/kt5RoKFd/TNdiA3OC7NGZtaeXv9VkPf4fVwBtSO9d5ZZXTGEynDD/rUQ +U4KFJe6OD23APjse08HiiKqTPhsOneOONU67iqoaTdIkT2R4EdlkVEDpXVtWb+G9 +Q+IqYzVljlzuyHrhWXLJw/FMa2aBAoHBAOnZbi4gGpH+P6886WDWVgIlTccuXoyc +Mg9QQYk9UDeXxL0AizR5bZy49Sduegz9vkHpAiZARQsUnizHjZ8YlRcrmn4t6tx3 +ahTIKAjdprnxJfYINM580j8CGbXvX5LhIlm3O267D0Op+co3+7Ujy+cjsIuFQrP+ +1MqMgXSeBjzC1APivmps7HeFE+4w0k2PfN5wSMDNCzLo99PZuUG5XZ93OVOS5dpN +b+WskdcD8NOoJy/X/5A08veEI/jYO/DyqQKBwQDDwUQCOWf41ecvJLtBHKmEnHDz +ftzHino9DRKG8a9XaN4rmetnoWEaM2vHGX3pf3mwH+dAe8vJdAQueDhBKYeEpm6C +TYNOpou1+Zs5s99BilCTNYo8fkMOAyqwRwmz9zgHS6QxXuPwsghKefLJGt6o6RFF +tfWVTfLlYJ+I3GQe3ySsk3wjVz4oUTKiyiq5+KzD+HhEkS7u+RQ7Z0ZI2xd2cF8Y +aN2hjKDpcOiFf3CDoqka5D1qMNLgIHO52AHww1UCgcA1h7o7AMpURRka6hyaODY0 +A4oMYEbwdQjYjIyT998W+rzkbu1us6UtzQEBZ760npkgyU/epbOoV63lnkCC/MOU +LD0PST+L/CHiY/cWIHb79YG1EifUZKpUFg0Aoq0EGFkepF0MefGCkbRGYA5UZr9U +R80wAu9D+L+JJiS0J0BSRF74DL196zUuHt5zFeXuLzxsRtPAnq9DliS08BACRYZy +7H3I7cWD9Vn5/0jbKWHFcaaWwyETR6uekTcSzZzbCRECgcBeoE3/xUA9SSk34Mmj +7/cB4522Ft0imA3+9RK/qJTZ7Bd5fC4PKjOGNtUiqW/0L2rjeIiQ40bfWvWqgPKw +jSK1PL6uvkl6+4cNsFsYyZpiVDoe7wKju2UuoNlB3RUTqa2r2STFuNj2wRjA57I1 +BIgdnox65jqQsd14g/yaa+75/WP9CE45xzKEyrtvdcqxm0Pod3OrsYK+gikFjiar +kT0GQ8u0QPzh2tjt/2ZnIfOBrl+QYERP0MofDZDjhUdq2wECgcB0Lu841+yP5cdR +qbJhXO4zJNh7oWNcJlOuQp3ZMNFrA1oHpe9pmLukiROOy01k9WxIMQDzU5GSqRv3 +VLkYOIcbhJ3kClKAcM3j95SkKbU2H5/RENb3Ck52xtl4pNU1x/3PnVFZfDVuuHO9 +MZ9YBcIeK98MyP2jr5JtFKnOyPE7xKq0IHIhXadpbc2wjje5FtZ1cUtMyEECCXNa +C1TpXebHGyXGpY9WdWXhjdE/1jPvfS+uO5WyuDpYPr339gsdq1g= +-----END RSA PRIVATE KEY----- diff --git a/testdata/tls_reuse.tdir/unbound_control.pem b/testdata/tls_reuse.tdir/unbound_control.pem new file mode 100644 index 000000000000..a1edf7017f1d --- /dev/null +++ b/testdata/tls_reuse.tdir/unbound_control.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDszCCAhsCFGD5193whHQ2bVdzbaQfdf1gc4SkMA0GCSqGSIb3DQEBCwUAMBIx +EDAOBgNVBAMMB3VuYm91bmQwHhcNMjAwNzA4MTMzMjMwWhcNNDAwMzI1MTMzMjMw +WjAaMRgwFgYDVQQDDA91bmJvdW5kLWNvbnRyb2wwggGiMA0GCSqGSIb3DQEBAQUA +A4IBjwAwggGKAoIBgQCy0Sn4/KHxcau1nvsDgWFiO9t4Hd0xrtDasZbGhvOUD2mv +OEDVoKEC9S0I4C4z6sHo1M0HxhZ9kltAdrDIw2mYLvtyDq9ctgIZRAdnICqJ03Tj +1EkXlPuPg3xWeK/XsuJF2vRLqzDLg9G8Scg89XjcRAdmoLmNW8ewqSEh+YEX8OPl +NdHKl5rBZX+bmN5Tr/gdFgx/K0Fl07WY9e5YuHSWBtDhIJuCs5RUPeueIyTXJkht +A6a+UMdip6SMNv+85bYrFRAsbThpkwnWZZ91vAbQIpCRKMhIQNnWXvq+EzqZMzR/ +Bdsi/IVn3I88KV7WYXlpKXFLZyYa4ZVJFBrDxcX197dr0AIklOvfcd1KnJpmQpEB +TMtwqosKXfbd1oq/c3DABPTdOPiJAzjXoBIyiLJ8Vr/YZZMpBWN127wKtqvu0Zp/ +nGuWKDgMGasG91gDeePLvb9EPvWEvCaVGgIZTt1G4Ov07ooBJSbVGL3U41n+p2My ++i/XmXa+PgZX4pdHTR0CAwEAATANBgkqhkiG9w0BAQsFAAOCAYEAd++Wen6l8Ifj +4h3p/y16PhSsWJWuJ4wdNYy3/GM84S26wGjzlEEwiW76HpH6VJzPOiBAeWnFKE83 +hFyetEIxgJeIPbcs9ZP/Uoh8GZH9tRISBSN9Hgk2Slr9llo4t1H0g/XTgA5HqMQU +9YydlBh43G7Vw3FVwh09OM6poNOGQKNc/tq2/QdKeUMtyBbLWpRmjH5XcCT35fbn +ZiVOUldqSHD4kKrFO4nJYXZyipRbcXybsLiX9GP0GLemc3IgIvOXyJ2RPp06o/SJ +pzlMlkcAfLJaSuEW57xRakhuNK7m051TKKzJzIEX+NFYOVdafFHS8VwGrYsdrFvD +72tMfu+Fu55y3awdWWGc6YlaGogZiuMnJkvQphwgn+5qE/7CGEckoKEsH601rqIZ +muaIc85+nEcHJeijd/ZlBN9zeltjFoMuqTUENgmv8+tUAdVm/UMY9Vjme6b43ydP +uv6DS02+k9z8toxXworLiPr94BGaiGV1NxgwZKLZigYJt/Fi2Qte +-----END CERTIFICATE----- diff --git a/testdata/tls_reuse.tdir/unbound_server.key b/testdata/tls_reuse.tdir/unbound_server.key new file mode 100644 index 000000000000..370a7bbb2f22 --- /dev/null +++ b/testdata/tls_reuse.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/tls_reuse.tdir/unbound_server.pem b/testdata/tls_reuse.tdir/unbound_server.pem new file mode 100644 index 000000000000..986807310f2b --- /dev/null +++ b/testdata/tls_reuse.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 b789c3359979..4c827b74e7e0 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -170,7 +170,9 @@ config_create(void) cfg->infra_cache_slabs = 4; cfg->infra_cache_numhosts = 10000; cfg->infra_cache_min_rtt = 50; + cfg->infra_keep_probing = 0; cfg->delay_close = 0; + cfg->udp_connect = 1; if(!(cfg->outgoing_avail_ports = (int*)calloc(65536, sizeof(int)))) goto error_exit; init_outgoing_availports(cfg->outgoing_avail_ports, 65536); @@ -321,8 +323,8 @@ config_create(void) cfg->qname_minimisation_strict = 0; cfg->shm_enable = 0; cfg->shm_key = 11777; - cfg->edns_client_tags = NULL; - cfg->edns_client_tag_opcode = LDNS_EDNS_CLIENT_TAG; + cfg->edns_client_strings = NULL; + cfg->edns_client_string_opcode = 65001; cfg->dnscrypt = 0; cfg->dnscrypt_port = 0; cfg->dnscrypt_provider = NULL; @@ -522,11 +524,12 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_STR("tls-ciphersuites:", tls_ciphersuites) else S_YNO("tls-use-sni:", tls_use_sni) else S_NUMBER_NONZERO("https-port:", https_port) - else S_STR("http-endpoint", http_endpoint) - else S_NUMBER_NONZERO("http-max-streams", http_max_streams) - else S_MEMSIZE("http-query-buffer-size", http_query_buffer_size) - else S_MEMSIZE("http-response-buffer-size", http_response_buffer_size) - else S_YNO("http-nodelay", http_nodelay) + else S_STR("http-endpoint:", http_endpoint) + else S_NUMBER_NONZERO("http-max-streams:", http_max_streams) + else S_MEMSIZE("http-query-buffer-size:", http_query_buffer_size) + else S_MEMSIZE("http-response-buffer-size:", http_response_buffer_size) + else S_YNO("http-nodelay:", http_nodelay) + else S_YNO("http-notls-downstream:", http_notls_downstream) else S_YNO("interface-automatic:", if_automatic) else S_YNO("use-systemd:", use_systemd) else S_YNO("do-daemonize:", do_daemonize) @@ -562,10 +565,12 @@ int config_set_option(struct config_file* cfg, const char* opt, IS_NUMBER_OR_ZERO; cfg->infra_cache_min_rtt = atoi(val); RTT_MIN_TIMEOUT=cfg->infra_cache_min_rtt; } + else S_YNO("infra-keep-probing:", infra_keep_probing) else S_NUMBER_OR_ZERO("infra-host-ttl:", host_ttl) else S_POW2("infra-cache-slabs:", infra_cache_slabs) else S_SIZET_NONZERO("infra-cache-numhosts:", infra_cache_numhosts) else S_NUMBER_OR_ZERO("delay-close:", delay_close) + else S_YNO("udp-connect:", udp_connect) else S_STR("chroot:", chrootdir) else S_STR("username:", username) else S_STR("directory:", directory) @@ -958,8 +963,10 @@ config_get_option(struct config_file* cfg, const char* opt, else O_DEC(opt, "infra-host-ttl", host_ttl) else O_DEC(opt, "infra-cache-slabs", infra_cache_slabs) else O_DEC(opt, "infra-cache-min-rtt", infra_cache_min_rtt) + else O_YNO(opt, "infra-keep-probing", infra_keep_probing) else O_MEM(opt, "infra-cache-numhosts", infra_cache_numhosts) else O_UNS(opt, "delay-close", delay_close) + else O_YNO(opt, "udp-connect", udp_connect) else O_YNO(opt, "do-ip4", do_ip4) else O_YNO(opt, "do-ip6", do_ip6) else O_YNO(opt, "do-udp", do_udp) @@ -990,6 +997,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_MEM(opt, "http-query-buffer-size", http_query_buffer_size) else O_MEM(opt, "http-response-buffer-size", http_response_buffer_size) else O_YNO(opt, "http-nodelay", http_nodelay) + else O_YNO(opt, "http-notls-downstream", http_notls_downstream) else O_YNO(opt, "use-systemd", use_systemd) else O_YNO(opt, "do-daemonize", do_daemonize) else O_STR(opt, "chroot", chrootdir) @@ -1150,7 +1158,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_LS3(opt, "access-control-tag-action", acl_tag_actions) else O_LS3(opt, "access-control-tag-data", acl_tag_datas) else O_LS2(opt, "access-control-view", acl_view) - else O_LS2(opt, "edns-client-tags", edns_client_tags) + else O_LS2(opt, "edns-client-strings", edns_client_strings) #ifdef USE_IPSECMOD else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled) else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus) @@ -1519,7 +1527,7 @@ config_delete(struct config_file* cfg) config_deldblstrlist(cfg->ratelimit_below_domain); config_delstrlist(cfg->python_script); config_delstrlist(cfg->dynlib_file); - config_deldblstrlist(cfg->edns_client_tags); + config_deldblstrlist(cfg->edns_client_strings); #ifdef USE_IPSECMOD free(cfg->ipsecmod_hook); config_delstrlist(cfg->ipsecmod_whitelist); diff --git a/util/config_file.h b/util/config_file.h index 7750eaa0e6b0..556544021538 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -143,6 +143,8 @@ struct config_file { size_t http_response_buffer_size; /** set TCP_NODELAY option for http sockets */ int http_nodelay; + /** Disable TLS for http sockets downstream */ + int http_notls_downstream; /** outgoing port range number of ports (per thread) */ int outgoing_num_ports; @@ -179,8 +181,12 @@ struct config_file { size_t infra_cache_numhosts; /** min value for infra cache rtt */ int infra_cache_min_rtt; + /** keep probing hosts that are down */ + int infra_keep_probing; /** delay close of udp-timeouted ports, if 0 no delayclose. in msec */ int delay_close; + /** udp_connect enable uses UDP connect to mitigate ICMP side channel */ + int udp_connect; /** the target fetch policy for the iterator */ char* target_fetch_policy; @@ -562,10 +568,10 @@ struct config_file { /** SHM data - key for the shm */ int shm_key; - /** list of EDNS client tag entries, linked list */ - struct config_str2list* edns_client_tags; - /** EDNS opcode to use for EDNS client tags */ - uint16_t edns_client_tag_opcode; + /** list of EDNS client string entries, linked list */ + struct config_str2list* edns_client_strings; + /** EDNS opcode to use for EDNS client strings */ + uint16_t edns_client_string_opcode; /** DNSCrypt */ /** true to enable dnscrypt */ diff --git a/util/configlexer.c b/util/configlexer.c index a57aaa53fe2a..01f295ec30b8 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 334 -#define YY_END_OF_BUFFER 335 +#define YY_NUM_RULES 337 +#define YY_END_OF_BUFFER 338 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -363,366 +363,371 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[3253] = +static const flex_int16_t yy_accept[3292] = { 0, - 1, 1, 308, 308, 312, 312, 316, 316, 320, 320, - 1, 1, 324, 324, 328, 328, 335, 332, 1, 306, - 306, 333, 2, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 333, 308, 309, 309, 310, - 333, 312, 313, 313, 314, 333, 319, 316, 317, 317, - 318, 333, 320, 321, 321, 322, 333, 331, 307, 2, - 311, 331, 333, 327, 324, 325, 325, 326, 333, 328, - 329, 329, 330, 333, 332, 0, 1, 2, 2, 2, - 2, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 308, 0, 312, - 0, 319, 0, 316, 320, 0, 331, 0, 2, 2, - 331, 327, 0, 324, 328, 0, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 331, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 122, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 131, 332, 332, 332, 332, 332, 332, - 332, 331, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 106, 332, 332, 332, 332, 332, 332, 8, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 123, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 136, 332, 331, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 299, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 331, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 63, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 235, 332, 14, - 15, 332, 19, 18, 332, 332, 219, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 129, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 217, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 3, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 331, 332, 332, 332, 332, 332, 332, 332, - 293, 332, 332, 292, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 315, 332, 332, 332, 332, 332, 332, 332, 62, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 66, 332, 266, 332, 332, - 332, 332, 332, 332, 332, 332, 300, 301, 332, 332, - 332, 332, 332, 67, 332, 332, 130, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 126, 332, 332, 332, 332, 332, 332, 332, 332, - 206, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 21, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 155, 332, 332, 331, 315, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 104, 332, 332, 332, - - 332, 332, 332, 332, 274, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 178, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 154, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 103, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 32, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 33, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 64, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 128, 331, 332, 332, - 332, 332, 332, 121, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 65, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 239, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 179, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 53, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 257, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 57, 332, 58, 332, 332, 332, 332, 332, - 107, 332, 108, 332, 332, 332, 332, 105, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 7, 332, 331, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 228, 332, 332, - 332, 332, 157, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 240, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 45, 332, 332, 332, 332, - 332, 332, 332, 332, 54, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 198, - 332, 197, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 16, 17, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 68, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 205, 332, 332, 332, 332, - 332, 332, 110, 332, 109, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 189, 332, 332, 332, - 332, 332, 332, 332, 332, 137, 331, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 98, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 87, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 218, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 91, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 61, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 192, 193, 332, 332, 332, 268, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 6, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 272, 332, 332, 332, 332, 332, 332, 294, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 42, - 332, 332, 332, 332, 44, 332, 332, 332, 332, 332, - 332, 332, 332, 51, 332, 332, 332, 332, 332, 332, - 332, 331, 332, 185, 332, 332, 332, 132, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 210, 332, - 186, 332, 332, 332, 225, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 52, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 134, 115, 332, 116, - 332, 332, 332, 114, 332, 332, 332, 332, 332, 332, - 332, 332, 152, 332, 332, 50, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 256, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 187, 332, 332, 332, 332, 332, 190, 332, 196, 332, - 332, 332, 332, 332, 224, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 102, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 127, 332, - 332, 332, 332, 332, 332, 59, 332, 332, 332, 26, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 20, - 332, 332, 332, 332, 332, 332, 27, 36, 332, 162, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 331, 332, 332, 332, 332, 332, 332, - 76, 78, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 276, 332, 332, 332, 332, - 236, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 117, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 151, 332, 46, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 287, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 156, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 216, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 297, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 173, 332, 332, 332, 332, 332, 332, 332, 332, 111, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 168, - 332, 180, 332, 332, 332, 332, 331, 332, 140, 332, - 332, 332, 332, 332, 97, 332, 332, 332, 332, 208, - 332, 332, 332, 332, 332, 332, 226, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 248, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 133, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 172, 332, - 332, 332, 332, 332, 332, 79, 80, 332, 332, 332, - - 332, 332, 60, 290, 332, 332, 332, 332, 332, 86, - 181, 332, 199, 332, 229, 332, 332, 191, 269, 332, - 332, 332, 332, 332, 72, 332, 183, 332, 332, 332, - 332, 332, 9, 332, 332, 332, 101, 332, 332, 332, - 332, 261, 332, 332, 332, 332, 207, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 331, 332, 332, 332, 332, 171, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 158, 332, - 275, 332, 332, 332, 332, 332, 247, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 220, 332, - 332, 304, 332, 332, 332, 267, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 291, 332, 182, 332, 332, 332, - 332, 332, 332, 332, 71, 73, 332, 332, 332, 332, - 332, 332, 332, 100, 332, 332, 332, 332, 259, 332, - 332, 332, 332, 271, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 212, 34, 28, 30, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 35, 332, - 29, 31, 332, 332, 332, 332, 332, 332, 332, 332, - 96, 332, 332, 332, 332, 332, 332, 331, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 214, - 211, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 70, - 332, 332, 332, 135, 332, 118, 332, 332, 332, 332, - 332, 332, 332, 332, 153, 47, 332, 332, 323, 13, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 285, - - 332, 288, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 12, 332, 332, 22, 332, 332, 332, 265, - 332, 332, 332, 332, 273, 332, 332, 332, 74, 332, - 222, 332, 332, 332, 332, 213, 332, 332, 69, 332, - 332, 332, 332, 23, 332, 43, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 167, 166, - 323, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 215, 209, 332, 227, 332, 332, 277, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 81, 332, - 332, 332, 260, 332, 332, 332, 332, 195, 332, 332, - 332, 332, 221, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 295, 296, 164, 332, 332, 75, 332, 332, - 332, 332, 174, 332, 332, 112, 113, 332, 332, 332, - 332, 159, 332, 161, 332, 200, 332, 332, 332, 332, - 165, 332, 332, 230, 332, 332, 332, 332, 332, 332, - 332, 142, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 238, 332, 332, 332, 332, 332, - 332, 332, 332, 24, 332, 270, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 332, 201, - 332, 332, 258, 332, 289, 332, 194, 332, 332, 332, - 332, 55, 332, 332, 332, 332, 4, 332, 332, 332, - 332, 125, 141, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 233, 37, 38, 332, 332, 332, 332, 332, 332, - 332, 278, 332, 332, 332, 332, 332, 332, 332, 246, - 332, 332, 332, 332, 332, 332, 332, 332, 204, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 84, 332, 56, 264, 332, 234, 332, 332, 332, 332, - - 11, 332, 332, 332, 332, 332, 332, 124, 332, 332, - 332, 332, 202, 88, 332, 40, 332, 332, 332, 332, - 332, 332, 332, 332, 170, 332, 332, 332, 332, 332, - 144, 332, 332, 332, 332, 237, 332, 332, 332, 332, - 332, 245, 332, 332, 332, 332, 138, 332, 332, 332, - 119, 120, 332, 332, 332, 90, 94, 89, 332, 332, - 332, 82, 332, 332, 332, 332, 332, 10, 332, 332, - 332, 262, 298, 332, 332, 332, 332, 303, 39, 332, - 332, 332, 332, 332, 169, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 332, 332, 332, 332, 332, 332, 95, 93, - 332, 332, 332, 83, 286, 332, 332, 332, 332, 332, - 332, 332, 188, 332, 332, 332, 332, 332, 203, 332, - 332, 332, 332, 332, 332, 332, 332, 160, 77, 332, - 332, 332, 332, 332, 279, 332, 332, 332, 332, 332, - 332, 332, 242, 332, 332, 241, 139, 305, 332, 92, - 48, 332, 145, 146, 149, 150, 147, 148, 85, 332, - 263, 332, 332, 332, 332, 163, 332, 332, 332, 332, - 332, 232, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - - 176, 175, 41, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 99, 332, - 231, 332, 255, 283, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 49, 5, 332, 332, - 223, 332, 332, 284, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 243, 25, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 244, 332, 332, - 332, 143, 332, 332, 332, 332, 332, 332, 332, 332, - 177, 332, 184, 332, 332, 332, 332, 332, 332, 332, - - 332, 332, 280, 332, 332, 332, 332, 332, 332, 332, - 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, - 302, 332, 332, 251, 332, 332, 332, 332, 332, 281, - 332, 332, 332, 332, 332, 332, 282, 332, 332, 332, - 249, 332, 252, 253, 332, 332, 332, 332, 332, 250, - 254, 0 + 1, 1, 311, 311, 315, 315, 319, 319, 323, 323, + 1, 1, 327, 327, 331, 331, 338, 335, 1, 309, + 309, 336, 2, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 336, 311, 312, 312, 313, + 336, 315, 316, 316, 317, 336, 322, 319, 320, 320, + 321, 336, 323, 324, 324, 325, 336, 334, 310, 2, + 314, 334, 336, 330, 327, 328, 328, 329, 336, 331, + 332, 332, 333, 336, 335, 0, 1, 2, 2, 2, + 2, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 311, 0, 315, + 0, 322, 0, 319, 323, 0, 334, 0, 2, 2, + 334, 330, 0, 327, 331, 0, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 334, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 125, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 134, 335, 335, 335, 335, 335, 335, + 335, 334, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 109, 335, 335, 335, 335, 335, 335, 8, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 126, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 139, 335, + 334, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 302, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 334, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 64, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 238, + 335, 14, 15, 335, 19, 18, 335, 335, 222, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 132, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 220, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 3, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 334, 335, 335, 335, + 335, 335, 335, 335, 296, 335, 335, 295, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 318, 335, 335, 335, 335, + 335, 335, 335, 335, 63, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 67, 335, 269, 335, 335, 335, 335, 335, 335, + 335, 335, 303, 304, 335, 335, 335, 335, 335, 68, + + 335, 335, 133, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 129, 335, 335, + 335, 335, 335, 335, 335, 335, 209, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 21, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 158, 335, 335, + 334, 318, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 107, 335, 335, 335, 335, 335, 335, + 335, 277, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 181, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 157, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 106, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 32, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 33, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 65, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 131, 334, 335, 335, + 335, 335, 335, 124, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 66, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 242, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 182, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 54, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 260, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 58, 335, 59, 335, 335, 335, + 335, 335, 110, 335, 111, 335, 335, 335, 335, 108, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 7, + 335, 334, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 231, 335, 335, 335, 335, 160, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 243, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 45, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 55, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 201, 335, 200, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 16, 17, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 69, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 208, 335, 335, 335, 335, 335, 335, 113, 335, 112, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 192, 335, 335, 335, 335, 335, 335, 335, + 335, 140, 334, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 101, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 89, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 221, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 94, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 62, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 195, + 196, 335, 335, 335, 271, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 6, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 275, + 335, 335, 335, 335, 335, 335, 297, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 42, 335, 335, + 335, 335, 44, 335, 335, 335, 90, 335, 335, 335, + 335, 335, 52, 335, 335, 335, 335, 335, 335, 335, + 334, 335, 188, 335, 335, 335, 135, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 213, 335, 189, + + 335, 335, 335, 228, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 53, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 137, 118, 335, 119, 335, + 335, 335, 117, 335, 335, 335, 335, 335, 335, 335, + 335, 155, 335, 335, 50, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 259, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 190, 335, 335, 335, 335, 335, 193, 335, 199, + 335, 335, 335, 335, 335, 227, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 105, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 130, + 335, 335, 335, 335, 335, 335, 60, 335, 335, 335, + 26, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 20, 335, 335, 335, 335, 335, 335, 27, 36, 335, + 165, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 334, 335, 335, 335, 335, 335, + 335, 77, 79, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 279, 335, 335, 335, + + 335, 239, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 120, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 154, 335, 46, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 290, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 159, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 219, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 300, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 176, 335, 335, 335, 335, 335, 335, + 335, 335, 114, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 171, 335, 183, 335, 335, 335, 335, 334, + 335, 143, 335, 335, 335, 335, 335, 100, 335, 335, + 335, 335, 211, 335, 335, 335, 335, 335, 335, 229, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 251, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 136, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 175, 335, 335, 335, 335, 335, 335, 80, + 335, 81, 335, 335, 335, 335, 335, 61, 293, 335, + 335, 335, 335, 335, 88, 184, 335, 202, 335, 232, + 335, 335, 194, 272, 335, 335, 335, 335, 335, 73, + 335, 186, 335, 335, 335, 335, 335, 9, 335, 335, + 335, 104, 335, 335, 335, 335, 264, 335, 335, 335, + 335, 210, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 334, 335, 335, + 335, 335, 174, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 161, 335, 278, 335, 335, 335, 335, + 335, 250, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 223, 335, 335, 335, 335, 335, 270, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 294, 335, 185, 335, 335, 335, 335, 335, 335, 335, + + 72, 74, 335, 335, 335, 335, 335, 335, 335, 103, + 335, 335, 335, 335, 262, 335, 335, 335, 335, 274, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 215, 34, 28, 30, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 35, 335, 29, 31, 335, 335, + 335, 335, 335, 335, 335, 335, 99, 335, 335, 335, + 335, 335, 335, 334, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 217, 214, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 71, 335, 335, 335, 138, + + 335, 121, 335, 335, 335, 335, 335, 335, 335, 335, + 156, 47, 335, 335, 335, 326, 13, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 288, 335, 291, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 12, 335, 335, 22, 335, 335, 335, 268, 335, 335, + 335, 335, 276, 335, 335, 335, 75, 335, 225, 335, + 335, 335, 335, 216, 335, 335, 70, 335, 335, 335, + 335, 23, 335, 43, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 170, 169, 326, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 218, 212, + + 335, 230, 335, 335, 280, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 82, 335, 335, + 335, 335, 263, 335, 335, 335, 335, 198, 335, 335, + 335, 335, 224, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 298, 299, 167, 335, 335, 76, 335, 335, + 335, 335, 177, 335, 335, 115, 116, 335, 335, 335, + 335, 162, 335, 164, 335, 203, 335, 335, 335, 335, + 168, 335, 335, 233, 335, 335, 335, 335, 335, 335, + + 335, 145, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 241, 335, 335, 335, 335, 335, + 335, 335, 307, 335, 24, 335, 273, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 86, 204, 335, 335, 261, 335, 292, 335, 197, + 335, 335, 335, 335, 56, 335, 335, 335, 335, 4, + 335, 335, 335, 335, 128, 144, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 236, 37, 38, 335, 335, 335, + 335, 335, 335, 335, 281, 335, 335, 335, 335, 335, + + 335, 335, 249, 335, 335, 335, 335, 335, 335, 335, + 335, 207, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 85, 335, 57, 267, 335, 237, + 335, 335, 335, 335, 11, 335, 335, 335, 335, 335, + 335, 127, 335, 335, 335, 335, 205, 91, 335, 40, + 335, 335, 335, 335, 335, 335, 335, 335, 173, 335, + 335, 335, 335, 335, 147, 335, 335, 335, 335, 240, + 335, 335, 335, 335, 335, 248, 335, 335, 335, 335, + 141, 335, 335, 335, 122, 123, 335, 335, 335, 93, + 97, 92, 335, 335, 335, 335, 83, 335, 335, 335, + + 335, 335, 10, 335, 335, 335, 265, 301, 335, 335, + 335, 335, 306, 39, 335, 335, 335, 335, 335, 172, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 98, 96, 335, 51, 335, 335, 84, + 289, 335, 335, 335, 335, 335, 335, 335, 191, 335, + 335, 335, 335, 335, 206, 335, 335, 335, 335, 335, + 335, 335, 335, 163, 78, 335, 335, 335, 335, 335, + 282, 335, 335, 335, 335, 335, 335, 335, 245, 335, + 335, 244, 142, 335, 335, 95, 48, 335, 148, 149, + + 152, 153, 150, 151, 87, 335, 266, 335, 335, 335, + 335, 166, 335, 335, 335, 335, 335, 235, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 179, 178, 41, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 102, 335, 234, 335, + 258, 286, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 308, 335, 49, 5, 335, 335, 226, + 335, 335, 287, 335, 335, 335, 335, 335, 335, 335, + + 335, 335, 246, 25, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 247, 335, 335, 335, + 146, 335, 335, 335, 335, 335, 335, 335, 335, 180, + 335, 187, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 283, 335, 335, 335, 335, 335, 335, 335, 335, + 335, 335, 335, 335, 335, 335, 335, 335, 335, 305, + 335, 335, 254, 335, 335, 335, 335, 335, 284, 335, + 335, 335, 335, 335, 335, 285, 335, 335, 335, 252, + 335, 255, 256, 335, 335, 335, 335, 335, 253, 257, + 0 + } ; static const YY_CHAR yy_ec[256] = @@ -768,17 +773,17 @@ static const YY_CHAR yy_meta[67] = 1, 1, 1, 1, 1, 1 } ; -static const flex_int16_t yy_base[3271] = +static const flex_int16_t yy_base[3310] = { 0, 0, 0, 64, 67, 70, 72, 78, 84, 89, 92, - 131, 137, 112, 118, 123, 142, 479, 435, 96, 9263, - 9263, 9263, 160, 185, 116, 183, 229, 132, 175, 173, + 131, 137, 112, 118, 123, 142, 479, 435, 96, 9388, + 9388, 9388, 160, 185, 116, 183, 229, 132, 175, 173, 232, 50, 66, 120, 263, 275, 151, 319, 134, 371, - 412, 286, 308, 283, 126, 237, 394, 9263, 9263, 9263, - 95, 385, 9263, 9263, 9263, 186, 366, 385, 9263, 9263, - 9263, 258, 340, 9263, 9263, 9263, 104, 338, 9263, 266, - 9263, 167, 349, 303, 319, 9263, 9263, 9263, 356, 273, - 9263, 9263, 9263, 146, 268, 368, 177, 0, 388, 0, + 412, 286, 308, 283, 126, 237, 394, 9388, 9388, 9388, + 95, 385, 9388, 9388, 9388, 186, 366, 385, 9388, 9388, + 9388, 258, 340, 9388, 9388, 9388, 104, 338, 9388, 266, + 9388, 167, 349, 303, 319, 9388, 9388, 9388, 356, 273, + 9388, 9388, 9388, 146, 268, 368, 177, 0, 388, 0, 0, 291, 270, 235, 346, 259, 339, 367, 178, 177, 226, 395, 373, 384, 377, 368, 410, 411, 309, 429, @@ -808,693 +813,703 @@ static const flex_int16_t yy_base[3271] = 1102, 1094, 1085, 1115, 1096, 1141, 1111, 1109, 1119, 1152, 1136, 1135, 1144, 1162, 1172, 1166, 1177, 1163, 1186, 1189, 1143, 1176, 1200, 1205, 1187, 1204, 1199, 1188, 1190, 1203, - 1107, 1238, 9263, 1215, 1242, 1149, 1243, 1244, 1251, 1226, - 1269, 1237, 1259, 1217, 1252, 1275, 1292, 1340, 1264, 1273, - 1282, 1283, 1279, 9263, 1320, 1289, 1389, 1311, 1309, 1342, - 1302, 1306, 1325, 1331, 1348, 1353, 1224, 1367, 1335, 1337, - 1394, 1390, 1380, 1382, 1370, 1406, 1399, 1262, 1409, 1419, - - 1422, 1428, 1354, 1418, 1431, 1445, 1425, 1424, 1432, 1437, - 1440, 1455, 1476, 1456, 1481, 1461, 1360, 1471, 1449, 1472, - 1477, 1502, 1547, 1468, 1492, 1488, 1503, 1505, 1499, 1489, - 1515, 1527, 1506, 1530, 1519, 1542, 1532, 1304, 1548, 1550, - 1554, 1549, 1567, 1541, 1557, 1568, 1580, 1588, 1574, 1520, - 1575, 1584, 1600, 1595, 1592, 1605, 1609, 1607, 1616, 1613, - 9263, 1620, 1618, 1602, 1629, 1622, 1634, 9263, 1632, 1633, - 1637, 1640, 1658, 1659, 1663, 1665, 1660, 1664, 1673, 1666, - 1656, 1687, 1669, 1685, 1699, 1691, 1701, 1682, 1692, 1707, - 1703, 1695, 1715, 1709, 1702, 1714, 1754, 9263, 1719, 1730, - - 1752, 1731, 1748, 1757, 1758, 1744, 1771, 1777, 1742, 1797, - 1783, 1803, 1782, 1788, 1810, 1787, 1815, 1798, 1807, 1821, - 1822, 1795, 1823, 1818, 1832, 1837, 1847, 9263, 1848, 1854, - 1861, 1850, 1845, 1846, 1855, 1856, 1849, 1866, 1873, 1888, - 1875, 1883, 1895, 1906, 1892, 1908, 1893, 1909, 1897, 1901, - 1902, 1918, 1928, 1898, 1951, 1927, 1923, 1930, 1932, 1942, - 1949, 1957, 1958, 1935, 1948, 1962, 1961, 1953, 1955, 1967, - 1968, 1954, 1979, 1982, 1984, 1987, 1978, 1997, 1989, 2000, - 1992, 1994, 2005, 2004, 2006, 2013, 2012, 2008, 2033, 2025, - 2037, 2028, 2032, 2049, 2051, 2044, 2035, 9263, 2062, 2052, - - 2063, 2065, 2075, 2071, 2077, 2068, 2076, 2079, 2087, 2092, - 2085, 2099, 2101, 2089, 2104, 2106, 2111, 2122, 2119, 2126, - 2141, 2127, 2131, 2116, 2137, 2146, 2139, 2150, 2145, 2135, - 2154, 2170, 2142, 2161, 2171, 2172, 2165, 2180, 2178, 2173, - 2194, 2197, 2205, 2185, 2167, 2209, 2230, 2201, 2188, 2217, - 2207, 2225, 2215, 2220, 2221, 2218, 2229, 2248, 2247, 2246, - 2243, 2244, 2245, 2242, 2250, 2252, 2273, 2266, 2269, 2264, - 2265, 2291, 2279, 2271, 2285, 2286, 2282, 2294, 2288, 2315, - 2313, 2300, 2309, 2311, 2318, 2321, 2314, 2322, 2327, 2346, - 2332, 2348, 2350, 2338, 2360, 2349, 2343, 2354, 2359, 2364, - - 2365, 2370, 2375, 2379, 2378, 2385, 2382, 2400, 2409, 2404, - 2402, 2405, 9263, 2392, 2413, 2397, 2419, 2416, 2408, 2421, - 2426, 2434, 2440, 2431, 2427, 2436, 2482, 9263, 2444, 9263, - 9263, 2445, 9263, 9263, 2461, 2472, 9263, 2479, 2471, 2465, - 2469, 2489, 2492, 2499, 2450, 2508, 2503, 2430, 2550, 2528, - 2511, 2497, 2509, 2519, 2540, 2529, 2520, 2538, 2547, 2555, - 2588, 2566, 2563, 2560, 2585, 2571, 2589, 2596, 2594, 2595, - 2593, 2587, 2600, 2590, 2599, 2603, 2607, 2614, 2622, 2624, - 2621, 2628, 2620, 2648, 2641, 2644, 2658, 9263, 2645, 2659, - 2662, 2655, 2664, 2667, 2668, 2653, 2665, 2676, 2671, 2663, - - 2673, 2677, 2680, 2683, 2687, 2685, 2702, 2714, 2694, 9263, - 2706, 2707, 2695, 2712, 2709, 2721, 2720, 2723, 2703, 2722, - 2740, 2732, 2734, 2739, 2738, 2747, 2736, 2765, 9263, 2767, - 2770, 2750, 2773, 2758, 2755, 2766, 2777, 2781, 2780, 2787, - 2784, 2791, 2793, 2795, 2808, 2807, 2802, 2811, 2818, 2813, - 2826, 2823, 2822, 2832, 2835, 2839, 2836, 2838, 2845, 2850, - 2848, 2862, 2853, 2866, 2851, 2878, 2881, 2875, 2865, 2876, - 2880, 2874, 2889, 2886, 2897, 2891, 2901, 2904, 2899, 2910, - 2902, 2916, 2930, 2917, 2929, 2934, 2918, 2922, 2945, 2936, - 9263, 2927, 2925, 9263, 2952, 2944, 2947, 2993, 2957, 2949, - - 2966, 2970, 2948, 2979, 2974, 2972, 2985, 2980, 3024, 3006, - 2991, 3018, 3011, 3025, 3016, 3032, 3021, 3023, 3033, 3045, - 3050, 3041, 3063, 3068, 3039, 615, 3070, 3053, 3057, 3051, - 3103, 3067, 3080, 3072, 3081, 3087, 3100, 3083, 3107, 3073, - 3097, 3110, 3106, 3120, 3124, 3112, 3127, 3135, 3136, 3137, - 9263, 3146, 3155, 3141, 3148, 3151, 3154, 3147, 9263, 3156, - 3162, 3163, 3175, 3167, 3172, 3190, 3177, 3182, 3180, 3189, - 3199, 3202, 3204, 3188, 3185, 9263, 3198, 9263, 3206, 3216, - 3194, 3225, 3224, 3219, 3240, 3243, 9263, 9263, 3244, 3241, - 3229, 3258, 3246, 9263, 3238, 3260, 9263, 3278, 3261, 3266, - - 3263, 3268, 3271, 3281, 3277, 3301, 3293, 3302, 3285, 3298, - 3304, 9263, 3296, 3311, 3309, 3310, 3306, 3312, 3319, 3323, - 9263, 3328, 3327, 3341, 3353, 3274, 3348, 3338, 3349, 3359, - 3340, 3344, 3346, 3361, 3365, 3374, 3377, 3376, 3384, 3390, - 3382, 9263, 3379, 3380, 3387, 3391, 3394, 3393, 3401, 3407, - 3411, 3409, 3416, 3388, 3413, 3420, 3414, 3418, 3440, 3427, - 3439, 3448, 3434, 3435, 3438, 91, 3437, 3447, 3451, 3454, - 9263, 3465, 3463, 3466, 128, 3458, 3473, 3475, 3489, 3482, - 3468, 3476, 3478, 3503, 3485, 3499, 3505, 3512, 3506, 3508, - 3514, 3509, 3510, 3518, 3523, 3521, 9263, 3527, 3528, 3535, - - 3543, 3551, 3539, 3563, 9263, 3556, 3570, 3567, 3561, 3566, - 3562, 3578, 3583, 3574, 3587, 3586, 3588, 3599, 3612, 3606, - 3605, 3603, 9263, 3621, 3619, 3623, 3615, 3626, 3632, 3618, - 3610, 3641, 3638, 3648, 3646, 3659, 3652, 3650, 3649, 3653, - 3668, 3663, 3662, 3665, 3672, 3679, 3683, 3688, 3686, 3689, - 3687, 9263, 3548, 3703, 3705, 3709, 3706, 3715, 3710, 3728, - 3716, 3725, 3727, 3723, 3767, 3743, 3751, 3645, 3757, 3764, - 3752, 3730, 3766, 3777, 3773, 3784, 3788, 3803, 3792, 3796, - 3801, 3798, 3815, 3807, 3804, 3746, 3770, 3819, 3823, 3846, - 3825, 3765, 3829, 9263, 3832, 3842, 3843, 3849, 3877, 3856, - - 3852, 3863, 3867, 3869, 3879, 3880, 3883, 3848, 3885, 3892, - 3888, 3904, 3889, 3905, 3893, 3896, 3912, 3844, 3907, 3918, - 3926, 9263, 3930, 3932, 3916, 3931, 3942, 3927, 3946, 3949, - 3951, 3944, 3945, 3952, 3941, 3960, 3955, 3976, 3971, 3968, - 3967, 9263, 3983, 3969, 3994, 3977, 3995, 3993, 4004, 4010, - 4005, 4011, 3996, 4013, 4017, 4012, 9263, 4022, 4034, 4030, - 4039, 4036, 4028, 4037, 4050, 4033, 9263, 4041, 4038, 4044, - 4059, 4064, 4063, 9263, 4075, 4062, 4061, 4072, 4066, 4070, - 4077, 4086, 4080, 4085, 4088, 4093, 4101, 4094, 4111, 9263, - 4099, 4129, 4105, 4121, 4126, 4122, 4120, 4124, 4147, 4131, - - 4144, 4127, 9263, 4164, 4156, 4154, 4175, 4153, 4150, 4166, - 4173, 4180, 4168, 4169, 4183, 4170, 9263, 4187, 4191, 4202, - 4197, 4200, 4203, 4207, 4211, 4196, 4213, 4219, 4222, 4224, - 4223, 4236, 4238, 4247, 4240, 4234, 4253, 4229, 4246, 4256, - 4261, 4280, 4263, 4257, 4272, 4270, 4266, 4289, 4296, 4297, - 4299, 4301, 9263, 4295, 4304, 4303, 4288, 4298, 4305, 4321, - 4311, 4316, 4314, 4332, 4315, 4335, 4331, 4356, 4357, 4333, - 4354, 4345, 4346, 4359, 4361, 4351, 4367, 4371, 4374, 4380, - 4373, 4376, 4377, 4384, 4379, 4383, 4386, 4400, 4401, 4394, - 4388, 4403, 4421, 4428, 4412, 4425, 4433, 4429, 4436, 4430, - - 4432, 4437, 4460, 9263, 4426, 4449, 4457, 4453, 4458, 4438, - 4464, 4480, 4463, 4470, 4477, 4484, 4490, 4475, 4485, 4493, - 4491, 4492, 9263, 4496, 9263, 4504, 4511, 4507, 4529, 4506, - 9263, 4527, 9263, 4533, 4528, 4521, 4523, 9263, 4541, 4522, - 4538, 4531, 4530, 4540, 4543, 4546, 4563, 4574, 4567, 4564, - 4565, 4554, 4583, 4571, 4568, 4588, 4572, 4596, 4601, 4597, - 4599, 4594, 4607, 4604, 4603, 4614, 9263, 4625, 4613, 4615, - 4623, 4628, 4624, 4632, 4635, 4634, 4649, 4650, 4653, 4645, - 4662, 4651, 4656, 4663, 4678, 4659, 4687, 9263, 4674, 4691, - 4673, 4693, 9263, 4697, 4680, 4707, 4709, 4689, 4694, 4696, - - 4714, 4721, 4715, 4701, 4705, 4740, 4732, 4742, 4752, 9263, - 4736, 4748, 4729, 4759, 4750, 4756, 4766, 4760, 4763, 4767, - 4781, 4773, 4775, 4739, 4777, 4779, 4794, 4806, 4808, 4802, - 4814, 4787, 4811, 4812, 4813, 4801, 4800, 4805, 4803, 4822, - 4828, 4830, 4826, 4829, 4835, 9263, 4838, 4847, 4853, 4865, - 4841, 4844, 4856, 4846, 9263, 4872, 4862, 4871, 4873, 4878, - 4869, 4881, 4863, 4883, 4893, 4889, 4900, 4906, 4897, 9263, - 4910, 9263, 4892, 4920, 4921, 4926, 4924, 4914, 4935, 4939, - 4933, 4937, 4944, 4950, 4942, 4927, 4958, 4953, 4966, 4959, - 4963, 4974, 4964, 4976, 4969, 4965, 4981, 4986, 9263, 9263, - - 4982, 4992, 4999, 4988, 5003, 5013, 5020, 5024, 5017, 5005, - 5025, 5011, 5058, 9263, 5014, 5027, 5037, 5038, 5062, 5048, - 5061, 5072, 5063, 5076, 5071, 9263, 5054, 5064, 5081, 5067, - 5093, 5084, 9263, 5079, 9263, 5073, 5090, 5089, 5101, 5099, - 5100, 5104, 5107, 5122, 5088, 5130, 5119, 5133, 5115, 5120, - 5125, 5128, 5155, 5129, 5137, 5136, 9263, 5158, 5146, 5157, - 5162, 5164, 5170, 5163, 5156, 9263, 5165, 5159, 5176, 5168, - 5186, 5181, 5205, 5193, 5202, 5199, 5203, 9263, 5191, 5192, - 5221, 5216, 5204, 5217, 5224, 5230, 5235, 9263, 5236, 5231, - 5226, 5245, 5234, 5250, 5244, 5239, 5242, 5238, 5257, 5249, - - 5265, 5269, 5268, 5267, 5283, 5276, 5273, 5294, 5284, 5286, - 5287, 5295, 5296, 9263, 5300, 5304, 5302, 5310, 5332, 5322, - 5339, 5308, 5341, 5323, 5342, 5346, 5327, 5331, 5353, 5351, - 5337, 5357, 9263, 5344, 5354, 5361, 5358, 5359, 5376, 5370, - 5386, 5377, 5371, 5388, 5394, 5396, 5399, 5417, 5380, 5385, - 5407, 5413, 9263, 5411, 5410, 5420, 5412, 5432, 5427, 5421, - 5437, 5425, 5428, 5450, 5439, 5452, 5441, 5456, 5466, 5471, - 5454, 9263, 9263, 5475, 5457, 5476, 9263, 5477, 5468, 5492, - 5490, 5470, 5481, 5493, 5497, 5484, 5498, 5488, 5505, 9263, - 5502, 5527, 5508, 5523, 5536, 5541, 5538, 5534, 5531, 5522, - - 5524, 5532, 5549, 5529, 5519, 5559, 5558, 5567, 5553, 5562, - 5571, 9263, 5561, 5556, 5579, 5582, 5574, 5580, 9263, 5594, - 5588, 5590, 5601, 5597, 5599, 5616, 5612, 5604, 5615, 5614, - 5630, 5618, 5624, 5619, 5621, 5642, 5634, 5648, 5646, 9263, - 5655, 5656, 5658, 5653, 9263, 5666, 5684, 5660, 5663, 5662, - 5665, 5669, 5673, 9263, 5674, 5691, 5690, 5679, 5703, 5685, - 5708, 5705, 5697, 9263, 5711, 5700, 5715, 9263, 5713, 5724, - 5714, 5721, 5706, 5733, 5738, 5734, 5743, 5736, 9263, 5750, - 9263, 5751, 5746, 5756, 9263, 5747, 5752, 5762, 5768, 5760, - 5770, 5783, 5777, 5790, 5772, 5784, 5782, 5779, 5797, 5803, - - 5810, 5794, 5804, 5796, 5802, 9263, 5821, 5818, 5817, 5831, - 5837, 5825, 5830, 5829, 5841, 5849, 9263, 9263, 5847, 9263, - 5848, 5839, 5854, 9263, 5852, 5857, 5859, 5863, 5882, 5885, - 5872, 5884, 9263, 5888, 5890, 9263, 5889, 5898, 5893, 5874, - 5886, 5901, 5894, 5905, 5912, 5919, 5922, 5909, 5923, 5936, - 9263, 5917, 5918, 5940, 5943, 5929, 5939, 5945, 5949, 5951, - 9263, 5968, 5958, 5962, 5972, 5976, 9263, 5975, 9263, 5970, - 5981, 5979, 5992, 5974, 9263, 6003, 5982, 6012, 5987, 6011, - 6020, 6019, 6021, 6007, 6008, 5913, 6031, 6014, 6029, 9263, - 6023, 6030, 6033, 6058, 6046, 6045, 6050, 6057, 6064, 6049, - - 6071, 6068, 6063, 6069, 6073, 6072, 6077, 6085, 9263, 6098, - 6109, 6092, 6120, 6096, 6104, 9263, 6106, 6112, 6119, 9263, - 6108, 6102, 6132, 6126, 6134, 6136, 6139, 6142, 6135, 9263, - 6145, 6146, 6140, 6159, 6165, 6162, 9263, 9263, 6169, 9263, - 6168, 6153, 6163, 6181, 6179, 6184, 6194, 6191, 6207, 6190, - 6206, 6208, 6201, 6197, 6230, 6217, 6221, 6220, 6224, 6202, - 9263, 9263, 6238, 6241, 6234, 6239, 6244, 6246, 6235, 6257, - 6249, 6259, 6255, 6269, 6268, 9263, 6271, 6270, 6273, 6272, - 9263, 6264, 6283, 6280, 6278, 6301, 6291, 6295, 6294, 6307, - 6286, 6323, 6320, 6310, 6321, 6305, 6322, 6315, 6336, 6335, - - 6330, 6341, 6344, 9263, 6337, 6342, 6346, 6351, 6352, 6356, - 6339, 6368, 6363, 9263, 6362, 9263, 6372, 6387, 6379, 6391, - 6389, 6395, 6383, 6386, 6392, 6408, 6397, 6415, 6402, 6413, - 6427, 6421, 6431, 6434, 6432, 9263, 6436, 6418, 6419, 6435, - 6443, 6449, 6448, 6450, 6451, 6452, 6456, 6468, 6472, 6480, - 6470, 6476, 6474, 6462, 9263, 6477, 6486, 6483, 6487, 6498, - 6499, 6490, 6517, 6492, 6503, 6508, 6509, 6521, 9263, 6504, - 6511, 6512, 6536, 6537, 6538, 6541, 6532, 6543, 9263, 6542, - 6551, 6545, 6539, 6559, 6563, 6549, 6555, 6578, 6586, 6589, - 9263, 6579, 6590, 6594, 6576, 6583, 6603, 6606, 6567, 9263, - - 6620, 6622, 6614, 6605, 6610, 6617, 6630, 6634, 6615, 6632, - 6643, 6641, 6644, 6651, 6654, 6655, 6648, 6670, 6672, 9263, - 6659, 9263, 6665, 6682, 6689, 6684, 6686, 6678, 9263, 6688, - 6692, 6562, 6680, 6705, 9263, 6690, 6707, 6706, 6712, 9263, - 6725, 6731, 6710, 6726, 6740, 6741, 9263, 6743, 6744, 6749, - 6699, 6750, 6737, 6756, 6745, 6760, 6763, 6752, 6765, 6777, - 6767, 6768, 6780, 9263, 6787, 6786, 6796, 6792, 6803, 6790, - 6781, 6802, 6800, 6807, 9263, 6805, 6795, 6811, 6821, 6832, - 6819, 6838, 6826, 6834, 6823, 6825, 6846, 6828, 9263, 6833, - 6848, 6852, 6859, 6861, 6854, 9263, 9263, 6860, 6876, 6879, - - 6863, 6884, 9263, 9263, 6888, 6898, 6868, 6894, 6890, 9263, - 9263, 6897, 9263, 6887, 9263, 6886, 6902, 9263, 9263, 6903, - 6896, 6915, 6923, 6910, 9263, 6931, 9263, 6907, 6932, 6924, - 6914, 6934, 9263, 6919, 6941, 6943, 9263, 6935, 6957, 6930, - 6949, 9263, 6954, 6966, 6955, 6959, 9263, 6971, 6956, 6968, - 6960, 6970, 6980, 6986, 6975, 6976, 6982, 6987, 6991, 7003, - 7010, 7020, 7022, 7023, 7012, 7007, 7021, 7027, 7030, 7017, - 7033, 7016, 7043, 7040, 7042, 7041, 7046, 7051, 7052, 7058, - 7054, 7055, 7069, 7056, 7057, 7071, 7078, 7068, 7070, 7086, - 7082, 7093, 7088, 7109, 7102, 7097, 7101, 9263, 7104, 7096, - - 7117, 7105, 7127, 7120, 7137, 7119, 7130, 7147, 9263, 7149, - 9263, 7152, 7133, 7144, 7139, 7146, 9263, 7136, 7154, 7143, - 7164, 7177, 7167, 7188, 7169, 7175, 7179, 7194, 9263, 7198, - 7185, 9263, 7181, 7192, 7205, 9263, 7209, 7207, 7208, 7211, - 7216, 7222, 7213, 7215, 7225, 7220, 7244, 7246, 7230, 7245, - 7254, 7255, 7264, 7243, 7247, 7250, 7258, 7256, 7259, 7260, - 7278, 7267, 7282, 7293, 9263, 7281, 9263, 7286, 7283, 7285, - 7294, 7296, 7298, 7307, 9263, 9263, 7310, 7312, 7304, 7317, - 7320, 7316, 7329, 9263, 7321, 7331, 7319, 7327, 9263, 7334, - 7344, 7346, 7350, 9263, 7343, 7342, 7348, 7368, 7353, 7374, - - 7376, 7375, 7367, 7373, 7386, 9263, 9263, 9263, 9263, 7387, - 7370, 7389, 7377, 7393, 7396, 7398, 7409, 7403, 9263, 7421, - 9263, 9263, 7417, 7419, 7412, 7423, 7427, 7410, 7431, 7430, - 9263, 7432, 7436, 7437, 7445, 7443, 7452, 7461, 7459, 7468, - 7453, 7457, 7481, 7472, 7482, 7463, 7480, 7489, 7491, 9263, - 9263, 7479, 7494, 7493, 7522, 7498, 7506, 7487, 7486, 7520, - 7510, 7517, 7512, 7521, 7513, 7536, 7537, 7530, 7531, 9263, - 7525, 7540, 7547, 9263, 7548, 9263, 7554, 7561, 7528, 7552, - 7562, 7567, 7568, 7573, 9263, 9263, 7583, 7574, 9263, 9263, - 7572, 7570, 7585, 7584, 7586, 7593, 7599, 7606, 7589, 9263, - - 7600, 9263, 7601, 7618, 7619, 7598, 7629, 7635, 7639, 7636, - 7630, 7632, 9263, 7631, 7634, 9263, 7648, 7641, 7645, 9263, - 7642, 7626, 7651, 7654, 9263, 7673, 7672, 7675, 9263, 7677, - 9263, 7663, 7679, 7674, 7693, 9263, 7665, 7688, 9263, 7691, - 7694, 7692, 7696, 9263, 7687, 9263, 7697, 7698, 7707, 7726, - 7712, 7728, 7716, 7713, 7719, 7735, 7737, 7734, 9263, 9263, - 73, 7747, 7718, 7730, 7732, 7742, 7754, 7745, 7759, 7751, - 9263, 9263, 7761, 9263, 7765, 7764, 9263, 7755, 7768, 7775, - 7787, 7779, 7781, 7769, 7795, 7783, 7798, 7810, 7801, 7800, - 7816, 7814, 7823, 7811, 7820, 7828, 7832, 7834, 7844, 7836, - - 7848, 7838, 7840, 7849, 7859, 7860, 7850, 7854, 9263, 7873, - 7875, 7865, 9263, 7882, 7877, 7888, 7885, 9263, 7889, 7894, - 7897, 7898, 9263, 7881, 7913, 7910, 7909, 7904, 7927, 7915, - 7911, 7925, 9263, 9263, 9263, 7930, 7923, 9263, 7932, 7934, - 7924, 7926, 9263, 7951, 7931, 9263, 9263, 7938, 7955, 7946, - 7972, 9263, 7956, 9263, 7953, 9263, 7976, 7979, 7985, 7980, - 9263, 7983, 7993, 9263, 7969, 7977, 7992, 7991, 7978, 7990, - 8017, 9263, 8007, 8018, 8021, 8014, 8010, 8019, 8008, 8025, - 8015, 8037, 8013, 8039, 9263, 8043, 8046, 8049, 8058, 8042, - 8048, 8052, 8057, 9263, 8062, 9263, 8055, 8070, 8076, 8078, - - 8075, 8073, 8085, 8094, 8089, 8088, 8082, 8096, 8103, 9263, - 8101, 8111, 9263, 8110, 9263, 8113, 9263, 8116, 8118, 8120, - 8112, 9263, 8124, 8121, 8119, 8133, 9263, 8126, 8143, 8137, - 8150, 9263, 9263, 8135, 8170, 8161, 8145, 8171, 8173, 8154, - 8176, 8164, 8169, 8160, 8190, 8185, 8187, 8186, 8189, 8205, - 8191, 9263, 9263, 9263, 8197, 8200, 8215, 8211, 8218, 8228, - 8207, 9263, 8224, 8230, 8232, 8222, 8233, 8226, 8239, 9263, - 8234, 8236, 8240, 8245, 8250, 8255, 8271, 8253, 9263, 8269, - 8276, 8273, 8270, 8281, 8279, 8283, 8287, 8264, 8293, 8289, - 9263, 8295, 9263, 9263, 8280, 9263, 8282, 8296, 8297, 8311, - - 9263, 8315, 8313, 8305, 8320, 8328, 8330, 9263, 8338, 8314, - 8316, 8331, 9263, 9263, 8337, 9263, 8344, 8343, 8339, 8354, - 8347, 8342, 8351, 8355, 9263, 8352, 8356, 8362, 8361, 8378, - 9263, 8377, 8371, 8375, 8381, 9263, 8379, 8380, 8392, 8393, - 8386, 9263, 8411, 8405, 8420, 8421, 9263, 8407, 8424, 8417, - 9263, 9263, 8431, 8433, 8435, 9263, 9263, 9263, 8437, 8436, - 8440, 9263, 8445, 8394, 8451, 8472, 8457, 9263, 8446, 8441, - 8460, 9263, 9263, 8456, 8465, 8470, 8477, 9263, 9263, 8454, - 8473, 8486, 8482, 8478, 9263, 8471, 8487, 8494, 8508, 8510, - 8500, 8506, 8516, 8524, 8499, 8504, 8517, 8509, 8534, 8535, - - 8522, 8545, 8551, 8542, 8547, 8550, 8553, 8549, 9263, 9263, - 8558, 8560, 8555, 9263, 9263, 8563, 8565, 8570, 8571, 8573, - 8579, 8583, 9263, 8575, 8586, 8580, 8576, 8574, 9263, 8577, - 8593, 8590, 8582, 8587, 8607, 8597, 8618, 9263, 9263, 8601, - 8622, 8603, 8626, 8613, 9263, 8630, 8641, 8623, 8638, 8628, - 8624, 8632, 9263, 8655, 8635, 9263, 9263, 9263, 8651, 9263, - 9263, 8646, 9263, 9263, 9263, 9263, 9263, 9263, 9263, 8660, - 9263, 8654, 8676, 8677, 8679, 9263, 8657, 8674, 8681, 8669, - 8678, 9263, 8668, 8675, 8693, 8695, 8694, 8699, 8701, 8696, - 8711, 8716, 8706, 8719, 8708, 8718, 8726, 8735, 8728, 8744, - - 9263, 9263, 9263, 8723, 8743, 8739, 8742, 8752, 8753, 8760, - 8765, 8758, 8762, 8769, 8768, 8778, 8759, 8776, 8793, 8780, - 8785, 8796, 8786, 8798, 8802, 8799, 8789, 8815, 9263, 8804, - 9263, 8809, 9263, 9263, 8817, 8821, 8824, 8811, 8839, 8842, - 8826, 8834, 8831, 8838, 8845, 8852, 9263, 9263, 8835, 8844, - 9263, 8841, 8859, 9263, 8853, 8870, 8857, 8865, 8868, 8866, - 8882, 8883, 8889, 9263, 9263, 8874, 8880, 8877, 8899, 8901, - 8916, 8912, 8914, 8915, 8917, 8905, 8923, 9263, 8927, 8925, - 8929, 9263, 8931, 8918, 8941, 8934, 8936, 8939, 8940, 8947, - 9263, 8964, 9263, 8969, 8961, 8966, 8957, 8958, 8968, 8978, - - 8967, 8988, 9263, 8963, 8982, 8992, 9006, 9012, 8997, 9010, - 8995, 9018, 9015, 9019, 9023, 9024, 9025, 9008, 9038, 9030, - 9263, 9026, 9036, 9263, 9051, 9057, 9041, 9042, 9063, 9263, - 9066, 9048, 9052, 9072, 9074, 9070, 9263, 9080, 9081, 9078, - 9263, 9087, 9263, 9263, 9090, 9083, 9084, 9086, 9096, 9263, - 9263, 9263, 9143, 9150, 9157, 9164, 9171, 9178, 9185, 102, - 9192, 9199, 9206, 9213, 9220, 9227, 9234, 9241, 9248, 9255 + 1107, 1238, 9388, 1215, 1242, 1149, 1243, 1244, 1251, 1226, + 1269, 1237, 1259, 1217, 1252, 1275, 1292, 1340, 1264, 1297, + 1279, 1283, 1289, 9388, 1320, 1317, 1389, 1293, 1324, 1309, + 1342, 1325, 1307, 1322, 1345, 1338, 1224, 1353, 1335, 1371, + 1383, 1388, 1375, 1380, 1382, 1394, 1398, 1262, 1416, 1409, + + 1421, 1420, 1266, 1412, 1425, 1418, 1455, 1422, 1430, 1435, + 1444, 1457, 1463, 1468, 1470, 1475, 1448, 1464, 1461, 1469, + 1484, 1499, 1544, 1302, 1491, 1502, 1501, 1503, 1347, 1488, + 1511, 1516, 1510, 1518, 1504, 1532, 1528, 1542, 1547, 1540, + 1555, 1527, 1559, 1550, 1543, 1567, 1568, 1592, 1569, 1577, + 1560, 1586, 1599, 1603, 1594, 1608, 1605, 1590, 1613, 1596, + 9388, 1615, 1623, 1604, 1637, 1627, 1636, 9388, 1631, 1634, + 1633, 1641, 1632, 1656, 1661, 1657, 1658, 1659, 1663, 1673, + 1654, 1682, 1671, 1692, 1706, 1688, 1698, 1683, 1686, 1700, + 1711, 1693, 1712, 1710, 1709, 1727, 1767, 9388, 1722, 1730, + + 1719, 1733, 1731, 1757, 1771, 1750, 1758, 1785, 1755, 1794, + 1782, 1789, 1803, 1788, 1798, 1795, 1792, 1826, 1814, 1822, + 1820, 1821, 1815, 1831, 1830, 1824, 1844, 1846, 9388, 1841, + 1851, 1865, 1857, 1860, 1853, 1862, 1866, 1856, 1884, 1877, + 1883, 1867, 1887, 1721, 1870, 1886, 1905, 1894, 1904, 1902, + 1908, 1914, 1917, 1921, 1911, 1956, 1915, 1909, 1926, 1944, + 1945, 1949, 1957, 1963, 1938, 1948, 1958, 1964, 1943, 1965, + 1971, 1972, 1955, 1975, 1976, 1984, 1989, 1979, 1990, 1996, + 2007, 1998, 1988, 2014, 2002, 2006, 2017, 2022, 2016, 2039, + 2034, 2031, 2037, 2040, 2033, 2043, 2049, 2053, 9388, 2044, + + 2064, 2059, 2077, 2067, 2082, 2079, 2071, 2070, 2086, 2083, + 2097, 2098, 2092, 2107, 2108, 2101, 2112, 2110, 2106, 2099, + 2128, 2142, 2133, 2141, 2120, 2137, 2147, 2145, 2157, 2153, + 2134, 2161, 2162, 2154, 2158, 2177, 2175, 2160, 2181, 2186, + 2172, 2194, 2193, 2198, 2180, 2199, 2205, 2234, 2213, 2178, + 2229, 2217, 2233, 2221, 2224, 2227, 2228, 2226, 2238, 2248, + 2240, 2244, 2253, 2260, 2258, 2269, 2255, 2262, 2274, 2271, + 2265, 2272, 2286, 2275, 2287, 2282, 2304, 2297, 2301, 2280, + 2311, 2315, 2318, 2307, 2314, 2321, 2324, 2320, 2338, 2327, + 2337, 2350, 2351, 2356, 2363, 2342, 2359, 2364, 2362, 2365, + + 2367, 2370, 2369, 2377, 2384, 2396, 2392, 2395, 2389, 2412, + 2417, 2413, 2415, 2419, 9388, 2402, 2422, 2404, 2423, 2429, + 2408, 2425, 2435, 2430, 2451, 2445, 2434, 2444, 2490, 9388, + 2452, 9388, 9388, 2449, 9388, 9388, 2460, 2471, 9388, 2474, + 2479, 2457, 2493, 2504, 2507, 2500, 2496, 2489, 2498, 2486, + 2545, 2516, 2523, 2515, 2524, 2529, 2550, 2535, 2539, 2560, + 2534, 2562, 2583, 2561, 2581, 2578, 2589, 2595, 2598, 2597, + 2599, 2601, 2605, 2602, 2592, 2608, 2586, 2617, 2610, 2639, + 2627, 2629, 2645, 2630, 2635, 2628, 2622, 2653, 2651, 2664, + 9388, 2655, 2657, 2666, 2663, 2670, 2673, 2665, 2675, 2679, + + 2681, 2678, 2689, 2691, 2687, 2682, 2688, 2690, 2703, 2704, + 2717, 2700, 9388, 2713, 2715, 2705, 2720, 2726, 2730, 2731, + 2723, 2714, 2734, 2732, 2773, 2747, 2740, 2750, 2756, 2752, + 2775, 9388, 2779, 2771, 2763, 2780, 2766, 2768, 2774, 2777, + 2789, 2801, 2795, 2793, 2805, 2798, 2824, 2820, 2815, 2811, + 2819, 2825, 2821, 2834, 2840, 2843, 2832, 2844, 2845, 2849, + 2851, 2855, 2857, 2848, 2854, 2865, 2860, 2871, 2866, 2870, + 2888, 2890, 2876, 2887, 2884, 2881, 2904, 2893, 2906, 2892, + 2911, 2923, 2908, 2925, 2912, 2922, 2945, 2926, 2938, 2943, + 2934, 2939, 2953, 2948, 9388, 2936, 2950, 9388, 2949, 2954, + + 2952, 2999, 2989, 2978, 2969, 2992, 2970, 2994, 2991, 3000, + 3007, 3009, 3043, 3019, 3018, 3036, 3029, 3046, 3037, 3048, + 3054, 3039, 3055, 3021, 3056, 3067, 2951, 3059, 3058, 615, + 3070, 3071, 3065, 3073, 3120, 3078, 3097, 3089, 3092, 3105, + 3109, 3100, 3096, 3123, 3124, 3122, 3082, 3147, 3132, 3127, + 3141, 3158, 3074, 3156, 3155, 9388, 3161, 3159, 3171, 3172, + 3151, 3168, 3187, 3174, 9388, 3185, 3188, 3180, 3186, 3191, + 3189, 3201, 3202, 3211, 3210, 3214, 3223, 3227, 3228, 3229, + 3215, 9388, 3224, 9388, 3217, 3242, 3220, 3250, 3247, 3233, + 3263, 3266, 9388, 9388, 3267, 3261, 3275, 3216, 3269, 9388, + + 3284, 3283, 9388, 3303, 3278, 3287, 3259, 3296, 3295, 3302, + 3305, 3289, 3297, 3292, 3306, 3330, 3311, 9388, 3323, 3316, + 3331, 3340, 3333, 3341, 3350, 3339, 9388, 3348, 3343, 3363, + 3361, 3365, 3362, 3356, 3376, 3383, 3367, 3368, 3373, 3377, + 3378, 3402, 3404, 3403, 3410, 3411, 3407, 9388, 3395, 3397, + 3414, 3418, 3419, 3412, 3424, 3409, 3428, 3422, 3429, 3442, + 3452, 3440, 3449, 3443, 3468, 3469, 3450, 3466, 3472, 3454, + 3464, 3463, 91, 3476, 3474, 3485, 3481, 9388, 3488, 3482, + 3491, 128, 3499, 3501, 3502, 3492, 3508, 3520, 3503, 3527, + 3530, 3521, 3531, 3540, 3534, 3518, 3535, 3541, 3538, 3533, + + 3544, 3555, 3556, 9388, 3572, 3560, 3559, 3566, 3578, 3565, + 3601, 9388, 3587, 3594, 3598, 3589, 3600, 3582, 3610, 3605, + 3608, 3622, 3614, 3629, 3627, 3633, 3636, 3632, 3642, 9388, + 3645, 3647, 3657, 3644, 3663, 3651, 3658, 3665, 3666, 3677, + 3671, 3672, 3679, 3685, 3682, 3684, 3698, 3694, 3688, 3699, + 3702, 3708, 3718, 3712, 3724, 3715, 3713, 3726, 3727, 9388, + 3561, 3735, 3742, 3740, 3732, 3739, 3759, 3745, 3776, 3751, + 3766, 3760, 3784, 3812, 3768, 3779, 3795, 3791, 3796, 3800, + 3799, 3797, 3805, 3815, 3824, 3829, 3850, 3814, 3836, 3837, + 3839, 3833, 3856, 3849, 3873, 3874, 3866, 3875, 3898, 3877, + + 3806, 3881, 9388, 3884, 3894, 3872, 3886, 3896, 3901, 3902, + 3915, 3913, 3917, 3911, 3929, 3919, 3908, 3931, 3941, 3936, + 3947, 3951, 3946, 3943, 3937, 3964, 3966, 3956, 3967, 3970, + 9388, 3977, 3976, 3968, 3975, 3985, 3986, 3990, 3999, 3996, + 3988, 3989, 4005, 3998, 4016, 4002, 4015, 4012, 4028, 4013, + 9388, 4032, 4023, 4029, 4027, 4039, 4043, 4047, 4050, 4055, + 4062, 4059, 4049, 4066, 4068, 4056, 9388, 4078, 4086, 4079, + 4090, 4083, 4081, 4077, 4097, 4087, 9388, 4094, 4096, 4095, + 4103, 4106, 4114, 9388, 4108, 4111, 4112, 4117, 4128, 4115, + 4130, 4145, 4133, 4124, 4136, 4156, 4150, 4139, 4160, 9388, + + 4151, 4174, 4164, 4159, 4163, 4179, 4169, 4185, 4194, 4195, + 4205, 4196, 9388, 4190, 4209, 4197, 4219, 4206, 4189, 4220, + 4223, 4234, 4226, 4221, 4240, 4229, 9388, 4237, 4236, 4242, + 4256, 4255, 4252, 4258, 4248, 4261, 4271, 4266, 4247, 4276, + 4275, 4287, 4288, 4296, 4281, 4297, 4304, 4298, 4300, 4310, + 4311, 4315, 4316, 4320, 4329, 4335, 4328, 4324, 4343, 4325, + 4340, 4351, 4349, 4352, 9388, 4354, 4355, 4356, 4342, 4346, + 4370, 4373, 4367, 4362, 4371, 4385, 4390, 4382, 4380, 4408, + 4410, 4386, 4401, 4397, 4400, 4405, 4420, 4411, 4422, 4413, + 4409, 4429, 4418, 4426, 4432, 4433, 4453, 4435, 4436, 4445, + + 4446, 4456, 4447, 4452, 4449, 4472, 4473, 4484, 4486, 4482, + 4489, 4477, 4479, 4483, 4499, 9388, 4480, 4503, 4504, 4502, + 4511, 4521, 4528, 4529, 4524, 4523, 4532, 4530, 4538, 4520, + 4525, 4548, 4546, 4544, 9388, 4535, 9388, 4551, 4569, 4557, + 4581, 4559, 9388, 4577, 9388, 4580, 4582, 4571, 4573, 9388, + 4585, 4570, 4584, 4591, 4598, 4600, 4603, 4597, 4609, 4604, + 4617, 4610, 4618, 4614, 4615, 4637, 4620, 4625, 4641, 4636, + 4654, 4652, 4647, 4657, 4649, 4648, 4665, 4653, 4677, 9388, + 4687, 4673, 4670, 4676, 4686, 4681, 4666, 4700, 4697, 4692, + 4703, 4707, 4711, 4716, 4715, 4724, 4731, 4730, 4717, 4745, + + 9388, 4727, 4746, 4733, 4743, 9388, 4750, 4732, 4760, 4764, + 4753, 4748, 4754, 4768, 4773, 4772, 4777, 4758, 4800, 4802, + 4781, 4804, 9388, 4775, 4805, 4787, 4816, 4809, 4820, 4825, + 4817, 4827, 4834, 4826, 4833, 4829, 4830, 4832, 4843, 4837, + 4831, 4846, 4861, 4873, 4849, 4869, 4871, 4875, 4859, 4862, + 4864, 4865, 4867, 4883, 4885, 4888, 4891, 4912, 4898, 9388, + 4893, 4904, 4906, 4926, 4907, 4920, 4908, 4915, 4924, 9388, + 4923, 4932, 4933, 4937, 4947, 4942, 4944, 4943, 4950, 4953, + 4946, 4959, 4969, 4971, 9388, 4977, 9388, 4974, 4979, 4983, + 4990, 4988, 4984, 5004, 4991, 5003, 4993, 5008, 5017, 5006, + + 5005, 5014, 5009, 5033, 5029, 5051, 5037, 5027, 5040, 5039, + 5044, 5043, 5049, 9388, 9388, 5048, 5050, 5062, 5065, 5070, + 5077, 5086, 5084, 5078, 5076, 5091, 5080, 5122, 9388, 5088, + 5104, 5105, 5111, 5129, 5108, 5130, 5138, 5131, 5139, 5134, + 9388, 5117, 5128, 5146, 5132, 5159, 5152, 9388, 5143, 9388, + 5155, 5156, 5163, 5167, 5164, 5172, 5166, 5170, 5160, 5193, + 5197, 5183, 5200, 5186, 5187, 5190, 5215, 5203, 5223, 5199, + 5212, 5204, 9388, 5219, 5214, 5225, 5230, 5232, 5233, 5231, + 5224, 9388, 5241, 5239, 5244, 5250, 5251, 5256, 5245, 5259, + 5272, 5258, 5264, 9388, 5265, 5262, 5292, 5281, 5277, 5288, + + 5298, 5302, 5301, 9388, 5307, 5304, 5315, 5314, 5306, 5321, + 5324, 5297, 5308, 5319, 5320, 5331, 5344, 5334, 5340, 5341, + 5348, 5350, 5335, 5361, 5364, 5363, 5360, 5379, 5368, 9388, + 5365, 5375, 5381, 5383, 5396, 5393, 5400, 5385, 5404, 5395, + 5413, 5416, 5405, 5408, 5414, 5433, 5423, 5435, 9388, 5424, + 5421, 5450, 5422, 5443, 5452, 5434, 5453, 5455, 5442, 5451, + 5462, 5470, 5463, 5464, 5474, 5456, 5478, 5480, 5497, 5482, + 9388, 5511, 5490, 5495, 5506, 5501, 5503, 5521, 5516, 5499, + 5513, 5532, 5515, 5535, 5524, 5527, 5546, 5550, 5533, 9388, + 9388, 5555, 5531, 5548, 9388, 5558, 5543, 5570, 5566, 5551, + + 5554, 5579, 5578, 5562, 5589, 5574, 5576, 9388, 5593, 5584, + 5575, 5597, 5612, 5613, 5609, 5605, 5614, 5601, 5599, 5617, + 5627, 5615, 5608, 5637, 5648, 5651, 5632, 5640, 5643, 9388, + 5642, 5631, 5644, 5666, 5654, 5657, 9388, 5658, 5664, 5680, + 5674, 5687, 5684, 5681, 5694, 5675, 5689, 5679, 5700, 5702, + 5706, 5714, 5713, 5707, 5717, 5719, 5727, 9388, 5709, 5732, + 5715, 5737, 9388, 5738, 5756, 5755, 9388, 5757, 5734, 5758, + 5754, 5762, 9388, 5759, 5764, 5761, 5742, 5777, 5752, 5781, + 5775, 5784, 9388, 5785, 5786, 5787, 9388, 5800, 5798, 5806, + 5809, 5790, 5820, 5812, 5811, 5815, 5813, 9388, 5823, 9388, + + 5826, 5819, 5833, 9388, 5832, 5839, 5830, 5841, 5843, 5849, + 5858, 5861, 5865, 5847, 5860, 5855, 5853, 5871, 5878, 5882, + 5866, 5877, 5879, 5881, 9388, 5900, 5889, 5894, 5898, 5913, + 5906, 5905, 5899, 5924, 5910, 9388, 9388, 5919, 9388, 5928, + 5922, 5927, 9388, 5921, 5939, 5940, 5935, 5956, 5958, 5959, + 5961, 9388, 5964, 5967, 9388, 5948, 5966, 5978, 5970, 5954, + 5962, 5973, 5981, 5985, 5980, 5998, 5987, 5999, 5989, 6003, + 6016, 9388, 5993, 6000, 6009, 6024, 6014, 6019, 6025, 6026, + 6027, 9388, 6029, 6042, 6045, 6052, 6053, 9388, 6055, 9388, + 6049, 6056, 6058, 6066, 6054, 9388, 6075, 6072, 6078, 6062, + + 6091, 6099, 6093, 6102, 6085, 6089, 6111, 6105, 6095, 6106, + 9388, 6100, 6117, 6121, 6123, 6125, 6122, 6116, 6134, 6143, + 6129, 6146, 6153, 6148, 6156, 6158, 6155, 6163, 6161, 9388, + 6184, 6174, 6144, 6199, 6188, 6186, 9388, 6190, 6173, 6203, + 9388, 6191, 6187, 6200, 6210, 6194, 6201, 6206, 6218, 6223, + 9388, 6228, 6229, 6224, 6237, 6243, 6245, 9388, 9388, 6247, + 9388, 6246, 6234, 6261, 6259, 6233, 6269, 6216, 6273, 6262, + 6264, 6286, 6287, 6281, 6275, 6306, 6268, 6303, 6296, 6304, + 6291, 9388, 9388, 6307, 6314, 6316, 6320, 6321, 6323, 6309, + 6333, 6332, 6343, 6345, 6341, 6356, 9388, 6349, 6338, 6351, + + 6354, 9388, 6336, 6352, 6363, 6360, 6364, 6371, 6350, 6372, + 6390, 6378, 6394, 6393, 6388, 6399, 6380, 6391, 6396, 6410, + 6407, 6398, 6414, 6428, 9388, 6434, 6421, 6424, 6422, 6420, + 6427, 6431, 6438, 6436, 9388, 6447, 9388, 6451, 6439, 6454, + 6466, 6475, 6471, 6479, 6470, 6472, 6477, 6484, 6488, 6492, + 6496, 6493, 6487, 6504, 6513, 6501, 6507, 6511, 9388, 6519, + 6506, 6509, 6518, 6537, 6539, 6523, 6541, 6536, 6544, 6532, + 6543, 6555, 6558, 6546, 6552, 6551, 6553, 9388, 6557, 6567, + 6564, 6576, 6559, 6584, 6592, 6596, 6593, 6579, 6586, 6581, + 6602, 9388, 6587, 6582, 6603, 6611, 6616, 6614, 6621, 6620, + + 6622, 9388, 6631, 6624, 6629, 6632, 6634, 6639, 6628, 6649, + 6656, 6666, 6667, 9388, 6662, 6664, 6673, 6655, 6659, 6677, + 6683, 6676, 9388, 6701, 6703, 6694, 6695, 6690, 6718, 6714, + 6715, 6691, 6710, 6721, 6717, 6722, 6725, 6730, 6713, 6737, + 6760, 6752, 9388, 6742, 9388, 6750, 6764, 6768, 6766, 6769, + 6751, 9388, 6754, 6772, 6640, 6789, 6776, 9388, 6778, 6791, + 6793, 6794, 9388, 6810, 6809, 6799, 6811, 6782, 6783, 9388, + 6822, 6821, 6820, 6832, 6833, 6830, 6829, 6828, 6843, 6841, + 6831, 6835, 6860, 6837, 6849, 6862, 9388, 6869, 6871, 6865, + 6870, 6868, 6876, 6859, 6878, 6883, 6880, 9388, 6886, 6888, + + 6894, 6897, 6895, 6896, 6912, 6924, 6919, 6909, 6910, 6913, + 6923, 6921, 9388, 6918, 6931, 6944, 6936, 6926, 6958, 9388, + 6953, 9388, 6950, 6965, 6967, 6946, 6974, 9388, 9388, 6977, + 6938, 6956, 6978, 6973, 9388, 9388, 6979, 9388, 6980, 9388, + 6976, 6994, 9388, 9388, 6991, 6985, 7008, 7009, 6988, 9388, + 7016, 9388, 7024, 7019, 7006, 7004, 7023, 9388, 7015, 7017, + 7027, 9388, 7021, 7037, 7040, 7044, 9388, 7039, 7042, 7033, + 7047, 9388, 7061, 7063, 7068, 7057, 7067, 7072, 7078, 7056, + 7079, 7069, 7082, 7071, 7096, 7110, 7111, 7112, 7113, 7103, + 7098, 7114, 7120, 7123, 7105, 7122, 7106, 7129, 7127, 7133, + + 7131, 7135, 7144, 7147, 7150, 7151, 7146, 7160, 7148, 7149, + 7164, 7158, 7154, 7177, 7175, 7174, 7185, 7191, 7182, 7196, + 7193, 7201, 9388, 7195, 7184, 7194, 7211, 7215, 7222, 7226, + 7219, 7234, 7235, 9388, 7238, 9388, 7244, 7230, 7240, 7228, + 7237, 9388, 7249, 7232, 7246, 7260, 7261, 7262, 7279, 7263, + 7266, 7267, 7290, 9388, 7286, 7278, 7276, 7293, 7299, 9388, + 7295, 7300, 7296, 7297, 7294, 7317, 7312, 7316, 7319, 7318, + 7333, 7336, 7320, 7331, 7342, 7338, 7350, 7356, 7352, 7339, + 7353, 7341, 7366, 7358, 7364, 7368, 7385, 7374, 7386, 7389, + 9388, 7375, 9388, 7381, 7377, 7380, 7383, 7401, 7398, 7405, + + 9388, 9388, 7400, 7419, 7409, 7411, 7413, 7429, 7430, 9388, + 7427, 7433, 7435, 7428, 9388, 7444, 7423, 7445, 7439, 9388, + 7436, 7458, 7469, 7452, 7455, 7476, 7472, 7471, 7462, 7475, + 7481, 9388, 9388, 9388, 9388, 7482, 7466, 7484, 7493, 7499, + 7486, 7507, 7490, 7503, 9388, 7497, 9388, 9388, 7514, 7520, + 7509, 7522, 7513, 7510, 7526, 7524, 9388, 7540, 7533, 7537, + 7543, 7544, 7557, 7561, 7556, 7567, 7548, 7550, 7578, 7569, + 7575, 7564, 7581, 7580, 7587, 9388, 9388, 7584, 7589, 7595, + 7609, 7605, 7607, 7601, 7622, 7596, 7613, 7611, 7604, 7621, + 7614, 7626, 7631, 7625, 7632, 9388, 7636, 7628, 7647, 9388, + + 7639, 9388, 7649, 7656, 7646, 7652, 7658, 7659, 7671, 7660, + 9388, 9388, 7657, 7685, 7676, 9388, 9388, 7670, 7673, 7686, + 7690, 7694, 7687, 7695, 7692, 7708, 7691, 9388, 7696, 9388, + 7709, 7720, 7715, 7700, 7731, 7735, 7744, 7740, 7733, 7738, + 9388, 7736, 7737, 9388, 7742, 7734, 7739, 9388, 7752, 7756, + 7749, 7755, 9388, 7757, 7781, 7773, 9388, 7759, 9388, 7767, + 7783, 7777, 7795, 9388, 7771, 7792, 9388, 7796, 7797, 7799, + 7790, 9388, 7807, 9388, 7786, 7809, 7810, 7821, 7812, 7828, + 7818, 7814, 7826, 7847, 7835, 7839, 9388, 9388, 73, 7849, + 7823, 7836, 7837, 7845, 7852, 7844, 7861, 7860, 9388, 9388, + + 7863, 9388, 7867, 7874, 9388, 7855, 7878, 7884, 7882, 7886, + 7871, 7883, 7879, 7897, 7901, 7911, 7905, 7898, 7913, 7934, + 7936, 7916, 7923, 7932, 7938, 7944, 7946, 7937, 7949, 7931, + 7929, 7952, 7948, 7963, 7960, 7950, 7965, 9388, 7983, 7986, + 7988, 7971, 9388, 7993, 7992, 8000, 7996, 9388, 8002, 7994, + 7995, 7997, 9388, 7987, 8007, 8013, 8016, 8020, 8041, 8024, + 8029, 8042, 9388, 9388, 9388, 8034, 8045, 9388, 8048, 8036, + 8028, 8031, 9388, 8051, 8047, 9388, 9388, 8054, 8058, 8062, + 8075, 9388, 8071, 9388, 8063, 9388, 8086, 8087, 8094, 8088, + 9388, 8096, 8099, 9388, 8093, 8104, 8105, 8098, 8109, 8089, + + 8112, 9388, 8138, 8132, 8135, 8141, 8124, 8131, 8125, 8144, + 8127, 8152, 8123, 8153, 9388, 8151, 8156, 8158, 8159, 8147, + 8162, 8169, 9388, 8171, 9388, 8181, 9388, 8179, 8182, 8190, + 8188, 8183, 8186, 8193, 8198, 8206, 8214, 8209, 8211, 8202, + 8212, 9388, 9388, 8216, 8235, 9388, 8219, 9388, 8242, 9388, + 8228, 8229, 8232, 8246, 9388, 8247, 8233, 8234, 8249, 9388, + 8262, 8238, 8258, 8266, 9388, 9388, 8261, 8275, 8278, 8260, + 8286, 8291, 8272, 8296, 8287, 8285, 8280, 8302, 8284, 8289, + 8297, 8306, 8319, 8325, 9388, 9388, 9388, 8308, 8311, 8337, + 8334, 8333, 8342, 8321, 9388, 8335, 8341, 8338, 8332, 8350, + + 8354, 8355, 9388, 8361, 8356, 8359, 8362, 8376, 8360, 8364, + 8381, 9388, 8385, 8392, 8388, 8382, 8389, 8395, 8397, 8404, + 8400, 8399, 8410, 8409, 9388, 8418, 9388, 9388, 8411, 9388, + 8406, 8407, 8417, 8431, 9388, 8435, 8433, 8422, 8434, 8446, + 8448, 9388, 8455, 8444, 8449, 8458, 9388, 9388, 8451, 9388, + 8453, 8460, 8440, 8477, 8467, 8475, 8484, 8481, 9388, 8469, + 8473, 8492, 8476, 8495, 9388, 8490, 8480, 8485, 8494, 9388, + 8491, 8507, 8512, 8506, 8526, 9388, 8532, 8515, 8543, 8539, + 9388, 8520, 8542, 8533, 9388, 9388, 8548, 8549, 8547, 9388, + 9388, 9388, 8552, 8550, 8561, 8563, 9388, 8565, 8585, 8587, + + 8595, 8564, 9388, 8581, 8571, 8582, 9388, 9388, 8577, 8579, + 8598, 8600, 9388, 9388, 8586, 8594, 8606, 8593, 8590, 9388, + 8613, 8609, 8614, 8619, 8634, 8620, 8638, 8639, 8644, 8654, + 8625, 8640, 8632, 8652, 8658, 8637, 8660, 8659, 8662, 8669, + 8672, 8661, 8686, 9388, 9388, 8673, 9388, 8674, 8683, 9388, + 9388, 8693, 8694, 8697, 8698, 8702, 8704, 8705, 9388, 8699, + 8706, 8700, 8695, 8696, 9388, 8711, 8712, 8713, 8724, 8729, + 8743, 8727, 8745, 9388, 9388, 8731, 8747, 8720, 8751, 8735, + 9388, 8756, 8765, 8734, 8758, 8762, 8764, 8768, 9388, 8760, + 8779, 9388, 9388, 8790, 8783, 9388, 9388, 8770, 9388, 9388, + + 9388, 9388, 9388, 9388, 9388, 8797, 9388, 8786, 8801, 8802, + 8803, 9388, 8789, 8795, 8810, 8813, 8791, 9388, 8811, 8808, + 8815, 8841, 8821, 8844, 8837, 8830, 8835, 8838, 8831, 8840, + 8842, 8847, 8861, 8852, 8870, 8864, 8880, 9388, 9388, 9388, + 8876, 8867, 8889, 8883, 8895, 8897, 8896, 8899, 8882, 8886, + 8902, 8903, 8910, 8893, 8912, 8909, 8907, 8919, 8933, 8940, + 8923, 8941, 8944, 8932, 8930, 8951, 9388, 8937, 9388, 8935, + 9388, 9388, 8955, 8960, 8948, 8950, 8968, 8971, 8958, 8973, + 8962, 8979, 8990, 9388, 8991, 9388, 9388, 8976, 8974, 9388, + 8978, 8989, 9388, 8982, 8999, 8988, 9001, 9009, 9006, 9005, + + 9018, 9012, 9388, 9388, 9015, 9020, 9021, 9027, 9039, 9048, + 9029, 9041, 9050, 9053, 9032, 9065, 9388, 9061, 9059, 9063, + 9388, 9066, 9057, 9062, 9060, 9075, 9077, 9080, 9068, 9388, + 9073, 9388, 9083, 9100, 9093, 9086, 9092, 9101, 9115, 9113, + 9104, 9388, 9096, 9123, 9110, 9132, 9134, 9125, 9139, 9128, + 9148, 9149, 9151, 9158, 9156, 9157, 9150, 9160, 9152, 9388, + 9167, 9170, 9388, 9177, 9181, 9174, 9176, 9187, 9388, 9172, + 9183, 9192, 9199, 9205, 9210, 9388, 9206, 9207, 9214, 9388, + 9213, 9388, 9388, 9219, 9204, 9209, 9212, 9225, 9388, 9388, + 9388, 9268, 9275, 9282, 9289, 9296, 9303, 9310, 102, 9317, + + 9324, 9331, 9338, 9345, 9352, 9359, 9366, 9373, 9380 } ; -static const flex_int16_t yy_def[3271] = +static const flex_int16_t yy_def[3310] = { 0, - 3252, 1, 3253, 3253, 3254, 3254, 3255, 3255, 3256, 3256, - 3257, 3257, 3258, 3258, 3259, 3259, 3252, 3260, 3252, 3252, - 3252, 3252, 3261, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3262, 3252, 3252, 3252, - 3262, 3263, 3252, 3252, 3252, 3263, 3264, 3252, 3252, 3252, - 3252, 3264, 3265, 3252, 3252, 3252, 3265, 3266, 3252, 3267, - 3252, 3266, 3266, 3268, 3252, 3252, 3252, 3252, 3268, 3269, - 3252, 3252, 3252, 3269, 3260, 3260, 3252, 3270, 3261, 3270, - 3261, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3262, 3262, 3263, - 3263, 3264, 3264, 3252, 3265, 3265, 3266, 3266, 3267, 3267, - 3266, 3268, 3268, 3252, 3269, 3269, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3266, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3266, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3266, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252, - 3252, 3260, 3252, 3252, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3266, 3266, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3266, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3266, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3266, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3266, 3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3252, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3266, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3252, 3260, 3260, 3260, 3260, 3266, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, - - 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3252, - 3252, 3260, 3252, 3260, 3252, 3260, 3260, 3252, 3252, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3266, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3252, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3252, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3266, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3252, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3252, 3260, - 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, - 3266, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3252, 3260, 3252, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3252, 3252, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3252, 3252, 3260, 3260, 3260, - 3260, 3252, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3260, 3252, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3252, 3260, 3252, 3260, 3252, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3252, 3252, 3260, 3252, 3260, 3260, 3260, 3260, - - 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3260, 3252, 3252, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3252, 3252, 3260, 3260, 3260, 3252, 3252, 3252, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3252, 3252, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, - 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, - 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3252, 3260, 3260, 3252, 3252, 3252, 3260, 3252, - 3252, 3260, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3260, - 3252, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3252, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, - 3252, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3252, 3260, 3260, - 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, - 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - - 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, 3260, - 3252, 3260, 3260, 3252, 3260, 3260, 3260, 3260, 3260, 3252, - 3260, 3260, 3260, 3260, 3260, 3260, 3252, 3260, 3260, 3260, - 3252, 3260, 3252, 3252, 3260, 3260, 3260, 3260, 3260, 3252, - 3252, 0, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252 + 3291, 1, 3292, 3292, 3293, 3293, 3294, 3294, 3295, 3295, + 3296, 3296, 3297, 3297, 3298, 3298, 3291, 3299, 3291, 3291, + 3291, 3291, 3300, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3301, 3291, 3291, 3291, + 3301, 3302, 3291, 3291, 3291, 3302, 3303, 3291, 3291, 3291, + 3291, 3303, 3304, 3291, 3291, 3291, 3304, 3305, 3291, 3306, + 3291, 3305, 3305, 3307, 3291, 3291, 3291, 3291, 3307, 3308, + 3291, 3291, 3291, 3308, 3299, 3299, 3291, 3309, 3300, 3309, + 3300, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3301, 3301, 3302, + 3302, 3303, 3303, 3291, 3304, 3304, 3305, 3305, 3306, 3306, + 3305, 3307, 3307, 3291, 3308, 3308, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3291, 3299, 3291, 3291, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3291, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3305, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3305, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3305, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3305, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3305, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3305, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, + 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, 3291, + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3305, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3291, 3291, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3305, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3291, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3299, 3291, 3299, + 3299, 3299, 3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3305, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, + + 3299, 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3291, 3291, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3291, 3299, 3299, 3291, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3291, 3299, 3291, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3291, 3299, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3291, 3299, 3299, 3291, 3299, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3291, 3291, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3291, 3291, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3291, + 3291, 3291, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + + 3299, 3299, 3291, 3299, 3299, 3299, 3291, 3291, 3299, 3299, + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3291, 3299, 3291, 3299, 3299, 3291, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3291, 3291, 3299, 3299, 3291, 3291, 3299, 3291, 3291, + + 3291, 3291, 3291, 3291, 3291, 3299, 3291, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3291, 3291, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3291, 3299, + 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3291, 3299, 3291, 3291, 3299, 3299, 3291, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + + 3299, 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, + 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, + 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3299, 3291, + 3299, 3299, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3299, + 3299, 3299, 3299, 3299, 3299, 3291, 3299, 3299, 3299, 3291, + 3299, 3291, 3291, 3299, 3299, 3299, 3299, 3299, 3291, 3291, + 0, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291 } ; -static const flex_int16_t yy_nxt[9330] = +static const flex_int16_t yy_nxt[9455] = { 0, 18, 19, 20, 21, 22, 23, 22, 18, 18, 18, 18, 18, 22, 24, 25, 26, 27, 28, 29, 18, @@ -1507,7 +1522,7 @@ static const flex_int16_t yy_nxt[9330] = 59, 60, 61, 120, 22, 58, 59, 60, 61, 86, 22, 64, 65, 66, 64, 65, 66, 87, 158, 158, - 1261, 88, 85, 51, 119, 86, 51, 165, 165, 56, + 1271, 88, 85, 51, 119, 86, 51, 165, 165, 56, 120, 56, 168, 75, 76, 77, 78, 62, 22, 75, 76, 77, 78, 62, 22, 81, 82, 83, 67, 97, 86, 67, 19, 20, 21, 69, 70, 71, 19, 20, @@ -1547,63 +1562,63 @@ static const flex_int16_t yy_nxt[9330] = 188, 165, 165, 144, 145, 193, 189, 86, 190, 86, 86, 86, 200, 201, 205, 206, 141, 175, 175, 142, 202, 207, 86, 197, 198, 204, 143, 215, 86, 213, - 144, 145, 208, 209, 86, 86, 210, 86, 3252, 200, - 201, 205, 206, 86, 216, 86, 3252, 202, 207, 211, - 212, 3252, 224, 214, 215, 3252, 223, 86, 218, 208, + 144, 145, 208, 209, 86, 86, 210, 86, 3291, 200, + 201, 205, 206, 86, 216, 86, 3291, 202, 207, 211, + 212, 3291, 224, 214, 215, 3291, 223, 86, 218, 208, 209, 86, 219, 210, 217, 221, 86, 225, 227, 86, 222, 216, 226, 86, 229, 86, 211, 212, 220, 224, 214, 86, 86, 223, 228, 218, 86, 86, 86, 219, 231, 217, 221, 230, 225, 227, 236, 222, 86, 226, - 232, 229, 86, 233, 3252, 220, 243, 234, 235, 86, - 3252, 228, 237, 86, 86, 86, 3252, 231, 256, 86, - 230, 250, 86, 236, 3252, 86, 86, 232, 238, 244, + 232, 229, 86, 233, 3291, 220, 243, 234, 235, 86, + 3291, 228, 237, 86, 86, 86, 3291, 231, 256, 86, + 230, 250, 86, 236, 3291, 86, 86, 232, 238, 244, 233, 242, 86, 243, 234, 235, 247, 239, 251, 237, 245, 252, 249, 240, 246, 256, 257, 86, 250, 255, - 86, 86, 86, 86, 3252, 238, 244, 86, 242, 262, + 86, 86, 86, 86, 3291, 238, 244, 86, 242, 262, - 86, 253, 3252, 247, 239, 251, 258, 245, 252, 249, + 86, 253, 3291, 247, 239, 251, 258, 245, 252, 249, 240, 246, 254, 257, 86, 259, 255, 86, 265, 263, - 264, 86, 266, 1124, 260, 267, 262, 86, 253, 162, - 3252, 162, 162, 258, 162, 86, 261, 268, 86, 254, - 86, 86, 259, 3252, 86, 265, 263, 264, 3252, 266, + 264, 86, 266, 1131, 260, 267, 262, 86, 253, 162, + 3291, 162, 162, 258, 162, 86, 261, 268, 86, 254, + 86, 86, 259, 3291, 86, 265, 263, 264, 3291, 266, 269, 260, 267, 167, 86, 167, 167, 90, 167, 90, 90, 168, 90, 261, 268, 172, 270, 172, 172, 272, - 172, 3252, 86, 273, 274, 276, 3252, 269, 86, 278, - 271, 275, 279, 280, 277, 86, 282, 86, 3252, 3252, + 172, 3291, 86, 273, 274, 276, 3291, 269, 86, 278, + 271, 275, 279, 280, 277, 86, 282, 86, 3291, 3291, 281, 86, 374, 86, 86, 170, 272, 86, 86, 286, 273, 274, 276, 86, 86, 86, 278, 271, 275, 279, 280, 277, 283, 282, 285, 298, 86, 281, 284, 86, - 287, 86, 330, 297, 299, 302, 286, 289, 3252, 3252, - 86, 290, 86, 334, 300, 301, 303, 306, 3252, 304, + 287, 86, 330, 297, 299, 302, 286, 289, 3291, 3291, + 86, 290, 86, 334, 300, 301, 303, 306, 3291, 304, 86, 285, 298, 86, 86, 284, 86, 287, 291, 86, - 297, 299, 302, 3252, 86, 86, 86, 86, 290, 3252, - 86, 300, 301, 303, 306, 86, 3252, 305, 307, 308, - 309, 86, 3252, 310, 311, 291, 292, 312, 313, 3252, - 86, 293, 3252, 86, 314, 86, 294, 86, 315, 86, + 297, 299, 302, 3291, 86, 86, 86, 86, 290, 3291, + 86, 300, 301, 303, 306, 86, 3291, 305, 307, 308, + 309, 86, 3291, 310, 311, 291, 292, 312, 313, 3291, + 86, 293, 3291, 86, 314, 86, 294, 86, 315, 86, 86, 322, 295, 296, 305, 307, 308, 309, 86, 86, - 310, 311, 3252, 292, 312, 313, 86, 321, 293, 325, + 310, 311, 3291, 292, 312, 313, 86, 321, 293, 325, 86, 314, 323, 294, 326, 315, 333, 331, 322, 295, 296, 316, 86, 86, 317, 327, 318, 336, 335, 86, 329, 332, 337, 340, 321, 86, 325, 86, 319, 323, - 320, 338, 339, 333, 3252, 342, 86, 86, 316, 86, + 320, 338, 339, 333, 3291, 342, 86, 86, 316, 86, 86, 317, 327, 318, 86, 335, 86, 329, 332, 86, 340, 86, 343, 341, 86, 319, 86, 320, 338, 339, 86, 344, 342, 345, 346, 347, 86, 348, 351, 349, - 356, 352, 350, 3252, 3252, 86, 353, 355, 86, 343, + 356, 352, 350, 3291, 3291, 86, 353, 355, 86, 343, 341, 86, 86, 86, 354, 86, 86, 86, 344, 358, 345, 346, 347, 86, 348, 351, 349, 356, 361, 350, 357, 359, 360, 86, 355, 86, 86, 362, 364, 363, 86, 354, 365, 367, 86, 368, 369, 366, 370, 372, - 86, 86, 373, 377, 86, 371, 3252, 357, 359, 360, + 86, 86, 373, 377, 86, 371, 3291, 357, 359, 360, 86, 86, 86, 86, 362, 364, 363, 86, 375, 365, 86, 378, 381, 369, 366, 86, 372, 86, 86, 373, 86, 383, 371, 380, 384, 86, 382, 86, 379, 86, 385, 376, 386, 388, 86, 389, 86, 86, 378, 381, - 86, 168, 387, 86, 390, 392, 86, 3252, 383, 393, + 86, 168, 387, 86, 390, 392, 86, 3291, 383, 393, 380, 384, 391, 382, 86, 379, 399, 385, 376, 386, 394, 86, 396, 395, 397, 86, 86, 86, 398, 387, @@ -1613,918 +1628,932 @@ static const flex_int16_t yy_nxt[9330] = 413, 414, 86, 412, 86, 400, 86, 409, 401, 407, 86, 402, 404, 408, 86, 415, 416, 86, 86, 405, 86, 86, 86, 406, 410, 417, 411, 418, 414, 420, - 412, 421, 86, 422, 427, 423, 426, 428, 3252, 425, - 86, 86, 429, 416, 419, 86, 86, 86, 430, 3252, + 412, 421, 86, 422, 427, 423, 426, 428, 3291, 425, + 86, 86, 429, 416, 419, 86, 86, 86, 430, 3291, 86, 86, 440, 86, 418, 86, 420, 86, 421, 424, 432, 427, 435, 426, 428, 86, 425, 86, 86, 429, 431, 419, 86, 433, 478, 430, 434, 437, 439, 86, 442, 86, 436, 86, 86, 86, 424, 432, 86, 435, - 441, 86, 449, 86, 438, 86, 451, 431, 3252, 450, - 433, 86, 3252, 434, 437, 439, 86, 442, 86, 436, - 86, 455, 3252, 3252, 86, 468, 484, 441, 86, 449, - 456, 438, 443, 451, 3252, 444, 450, 452, 457, 453, + 441, 86, 449, 86, 438, 86, 451, 431, 3291, 450, + 433, 86, 3291, 434, 437, 439, 86, 442, 86, 436, + 86, 455, 3291, 3291, 86, 468, 484, 441, 86, 449, + 456, 438, 443, 451, 3291, 444, 450, 452, 457, 453, 445, 446, 447, 448, 86, 86, 458, 459, 455, 460, - 86, 462, 86, 86, 461, 454, 3252, 456, 86, 443, + 86, 462, 86, 86, 461, 454, 3291, 456, 86, 443, 465, 86, 444, 469, 452, 457, 453, 445, 446, 447, 448, 86, 86, 458, 459, 86, 463, 466, 462, 464, 467, 86, 454, 470, 472, 86, 86, 465, 471, 475, 469, 473, 476, 474, 497, 86, 86, 86, 86, 86, - 477, 535, 3252, 463, 466, 3252, 464, 467, 86, 86, + 477, 536, 3291, 463, 466, 3291, 464, 467, 86, 86, 470, 472, 86, 86, 86, 471, 475, 482, 473, 476, - 474, 479, 490, 480, 86, 3252, 86, 477, 495, 483, - 485, 486, 481, 86, 498, 86, 488, 487, 489, 548, - 3252, 3252, 496, 3252, 482, 3252, 86, 86, 479, 490, + 474, 479, 490, 480, 86, 3291, 86, 477, 495, 483, + 485, 486, 481, 86, 498, 86, 488, 487, 489, 549, + 3291, 3291, 496, 554, 482, 3291, 86, 86, 479, 490, 480, 86, 86, 86, 491, 495, 483, 485, 486, 481, 86, 86, 499, 488, 487, 489, 510, 492, 86, 496, - 493, 86, 494, 86, 3252, 514, 511, 500, 86, 512, - 513, 491, 86, 501, 86, 517, 598, 502, 86, 499, - 529, 86, 86, 510, 492, 503, 3252, 493, 86, 494, - 526, 86, 514, 511, 500, 515, 512, 513, 525, 530, - 501, 86, 517, 86, 502, 168, 3252, 529, 86, 527, - 86, 516, 503, 504, 528, 505, 531, 526, 532, 86, - 3252, 553, 515, 538, 86, 525, 530, 537, 506, 533, - 86, 507, 3252, 508, 86, 509, 86, 3252, 516, 86, - 504, 86, 505, 531, 534, 532, 3252, 86, 3252, 3252, - 538, 571, 86, 86, 537, 506, 533, 545, 507, 86, - - 508, 539, 509, 518, 519, 536, 86, 541, 3252, 86, - 540, 534, 543, 520, 544, 521, 522, 523, 571, 86, - 524, 86, 549, 546, 545, 542, 547, 3252, 86, 86, - 518, 519, 536, 86, 541, 557, 558, 540, 86, 543, - 520, 544, 521, 522, 523, 86, 551, 524, 86, 549, - 546, 550, 542, 547, 552, 554, 559, 86, 86, 555, - 560, 86, 556, 86, 86, 561, 562, 86, 3252, 563, - 86, 86, 567, 551, 570, 584, 86, 573, 550, 86, - 3252, 552, 554, 559, 86, 3252, 555, 560, 86, 556, - 564, 565, 561, 562, 86, 86, 563, 568, 572, 567, - - 86, 570, 574, 575, 573, 586, 589, 86, 566, 3252, - 86, 86, 569, 585, 3252, 86, 86, 564, 565, 587, - 86, 593, 590, 576, 568, 572, 588, 86, 86, 574, - 575, 86, 586, 591, 577, 566, 578, 3252, 86, 569, - 585, 86, 86, 592, 86, 86, 587, 594, 593, 590, - 576, 595, 611, 588, 86, 596, 602, 597, 86, 86, - 591, 577, 3252, 578, 579, 599, 86, 601, 604, 86, - 592, 86, 580, 581, 594, 600, 582, 583, 595, 611, - 86, 86, 596, 603, 597, 606, 86, 86, 86, 86, - 605, 579, 599, 86, 601, 604, 86, 607, 610, 580, - - 581, 608, 600, 582, 583, 612, 86, 86, 613, 609, - 603, 615, 606, 86, 86, 614, 616, 605, 617, 86, - 3252, 3252, 624, 86, 607, 610, 618, 86, 608, 620, - 3252, 86, 612, 622, 86, 613, 609, 3252, 615, 86, - 619, 86, 614, 616, 86, 617, 86, 621, 86, 624, - 625, 623, 86, 618, 626, 86, 620, 86, 627, 86, - 622, 86, 628, 630, 629, 633, 632, 619, 86, 631, - 635, 86, 86, 86, 621, 3252, 86, 625, 623, 86, - 634, 626, 636, 642, 638, 627, 637, 639, 640, 628, - 630, 629, 641, 632, 643, 86, 631, 86, 86, 86, - - 645, 644, 86, 86, 86, 86, 646, 634, 86, 636, - 642, 638, 86, 637, 639, 640, 650, 648, 649, 641, - 653, 86, 654, 652, 86, 651, 86, 645, 644, 647, - 86, 86, 655, 657, 86, 3252, 3252, 656, 86, 658, - 86, 86, 86, 650, 648, 649, 86, 653, 86, 654, - 652, 667, 651, 86, 86, 3252, 647, 668, 86, 655, - 657, 3252, 670, 679, 656, 3252, 658, 659, 669, 86, - 86, 675, 660, 672, 661, 673, 671, 3252, 667, 674, - 662, 86, 663, 86, 668, 664, 665, 86, 676, 670, - 679, 86, 666, 86, 659, 669, 86, 86, 675, 660, - - 672, 661, 673, 671, 680, 677, 674, 662, 678, 663, - 86, 682, 664, 665, 681, 676, 86, 684, 683, 666, - 685, 86, 86, 686, 687, 689, 86, 86, 688, 693, - 3252, 690, 677, 3252, 86, 678, 86, 86, 682, 695, - 694, 681, 86, 3252, 684, 683, 86, 685, 691, 86, - 686, 687, 689, 692, 86, 688, 693, 86, 690, 3252, - 86, 86, 86, 696, 697, 698, 695, 694, 701, 699, - 700, 86, 703, 3252, 702, 691, 86, 704, 3252, 707, - 692, 705, 708, 706, 86, 86, 86, 86, 86, 86, - 696, 697, 698, 168, 86, 86, 699, 700, 709, 703, - - 86, 702, 710, 712, 704, 86, 707, 713, 705, 708, - 706, 711, 86, 714, 86, 716, 715, 717, 3252, 721, - 3252, 3252, 86, 719, 718, 709, 726, 86, 720, 710, - 712, 86, 86, 722, 86, 730, 86, 86, 711, 732, - 86, 86, 731, 715, 717, 86, 721, 86, 86, 723, - 719, 718, 729, 726, 733, 720, 724, 86, 727, 725, - 722, 734, 86, 728, 735, 736, 86, 86, 738, 86, - 737, 86, 739, 3252, 86, 743, 723, 740, 741, 729, - 3252, 86, 744, 724, 742, 745, 725, 86, 86, 746, - 86, 749, 86, 86, 86, 738, 86, 86, 748, 739, - - 86, 86, 743, 750, 740, 741, 86, 86, 751, 744, - 747, 742, 745, 754, 752, 753, 746, 86, 86, 755, - 760, 86, 757, 86, 3252, 748, 86, 756, 86, 761, - 750, 86, 758, 86, 762, 751, 86, 747, 759, 86, - 754, 752, 753, 86, 86, 86, 755, 86, 763, 757, - 767, 86, 86, 764, 756, 766, 761, 765, 768, 758, - 769, 762, 773, 3252, 86, 759, 770, 86, 771, 774, - 772, 86, 86, 775, 86, 763, 86, 767, 776, 3252, - 764, 777, 766, 86, 765, 768, 780, 769, 86, 773, - 86, 86, 779, 770, 781, 771, 782, 772, 784, 3252, - - 775, 86, 86, 778, 86, 776, 783, 86, 777, 786, - 86, 788, 785, 780, 86, 86, 86, 787, 86, 779, - 790, 781, 789, 782, 86, 784, 86, 792, 86, 794, - 778, 86, 791, 783, 3252, 793, 786, 795, 86, 785, - 86, 796, 799, 86, 787, 86, 801, 790, 800, 789, - 86, 797, 798, 803, 792, 86, 804, 805, 86, 791, - 806, 86, 793, 802, 795, 86, 86, 811, 796, 799, - 86, 808, 807, 801, 86, 800, 86, 809, 86, 816, - 86, 86, 810, 804, 86, 86, 812, 806, 813, 86, - 802, 826, 825, 86, 811, 819, 817, 3252, 808, 807, - - 86, 818, 814, 815, 86, 820, 86, 821, 3252, 86, - 86, 86, 86, 812, 830, 813, 822, 86, 826, 86, - 823, 3252, 819, 817, 86, 831, 827, 86, 818, 814, - 815, 832, 820, 86, 821, 824, 86, 828, 833, 834, - 86, 830, 829, 822, 86, 835, 86, 823, 86, 838, - 836, 837, 831, 827, 86, 840, 86, 86, 832, 86, - 86, 839, 824, 841, 86, 833, 834, 842, 86, 86, - 843, 844, 835, 846, 847, 845, 838, 836, 837, 848, - 849, 86, 86, 86, 86, 86, 86, 86, 839, 86, - 841, 86, 850, 851, 842, 852, 853, 843, 844, 856, - - 846, 847, 845, 86, 86, 86, 848, 854, 86, 855, - 86, 861, 86, 860, 862, 857, 858, 859, 86, 850, - 851, 86, 852, 853, 86, 86, 856, 86, 863, 864, - 86, 865, 866, 86, 854, 868, 855, 867, 861, 86, - 860, 862, 857, 858, 859, 870, 872, 871, 86, 869, - 86, 874, 86, 86, 86, 863, 864, 86, 865, 866, - 86, 86, 868, 873, 867, 875, 86, 876, 877, 880, - 879, 86, 870, 872, 871, 881, 869, 86, 874, 878, - 884, 883, 86, 882, 3252, 86, 885, 86, 86, 86, - 873, 3252, 875, 86, 876, 877, 880, 879, 86, 86, - - 887, 886, 881, 168, 86, 888, 878, 884, 883, 86, - 882, 889, 891, 885, 86, 890, 894, 86, 86, 895, - 898, 86, 892, 897, 86, 3252, 896, 887, 886, 899, - 893, 86, 888, 904, 3252, 900, 86, 931, 889, 86, - 901, 86, 890, 86, 86, 902, 895, 86, 86, 892, - 897, 903, 86, 896, 905, 86, 899, 893, 86, 906, - 86, 907, 900, 3252, 908, 86, 86, 901, 909, 86, - 86, 917, 902, 86, 918, 86, 3252, 3252, 903, 86, - 928, 905, 919, 86, 86, 924, 906, 3252, 907, 86, - 920, 908, 922, 923, 3252, 909, 910, 921, 917, 911, - - 86, 918, 925, 912, 86, 926, 913, 928, 86, 919, - 86, 86, 924, 914, 915, 3252, 916, 920, 86, 922, - 923, 86, 927, 910, 921, 942, 911, 941, 86, 925, - 912, 86, 926, 913, 929, 930, 86, 3252, 86, 3252, - 914, 915, 86, 916, 940, 939, 945, 86, 86, 927, - 86, 946, 942, 3252, 941, 943, 944, 3252, 86, 86, - 3252, 929, 930, 932, 933, 947, 934, 86, 86, 935, - 949, 940, 939, 945, 936, 3252, 953, 86, 946, 86, - 937, 938, 943, 944, 948, 952, 86, 954, 956, 86, - 932, 933, 947, 934, 86, 950, 935, 949, 955, 86, - - 951, 936, 86, 953, 957, 86, 959, 937, 938, 960, - 86, 948, 952, 958, 954, 956, 963, 961, 962, 3252, - 967, 3252, 964, 966, 86, 955, 86, 86, 86, 86, - 965, 957, 86, 86, 86, 86, 960, 970, 86, 86, - 958, 968, 86, 963, 961, 962, 86, 967, 969, 964, - 966, 971, 972, 86, 973, 974, 976, 965, 975, 86, - 86, 86, 979, 86, 970, 977, 980, 86, 968, 981, - 978, 983, 982, 986, 3252, 969, 3252, 987, 971, 972, - 86, 973, 984, 86, 86, 975, 985, 86, 988, 979, - 991, 989, 86, 990, 86, 994, 992, 86, 86, 982, - - 986, 86, 86, 86, 86, 996, 86, 86, 995, 984, - 86, 993, 86, 985, 997, 86, 86, 991, 989, 86, - 990, 998, 86, 992, 86, 999, 86, 1000, 1001, 1003, - 1004, 1002, 996, 86, 86, 995, 1005, 1006, 993, 1011, - 1008, 86, 86, 1009, 1012, 86, 86, 1013, 86, 1007, - 3252, 86, 999, 86, 1000, 1001, 1003, 1004, 1002, 86, - 86, 86, 86, 1005, 1006, 1010, 1014, 1008, 1016, 1015, - 1009, 86, 1017, 86, 1013, 86, 1007, 86, 86, 86, - 1018, 1020, 1021, 1022, 3252, 3252, 86, 1025, 1019, 86, - 1023, 1024, 1010, 1014, 86, 1016, 1015, 86, 1026, 1017, - - 1031, 1029, 1034, 3252, 86, 86, 86, 1018, 1020, 86, - 1022, 1027, 86, 1028, 1025, 1019, 86, 1023, 1024, 86, - 86, 1032, 1030, 86, 1033, 1026, 86, 1031, 1029, 1035, - 86, 1036, 86, 1037, 86, 1042, 1039, 1038, 1027, 1040, - 1028, 86, 3252, 1041, 3252, 3252, 86, 86, 1032, 1030, - 86, 1033, 86, 1044, 1043, 1051, 1035, 86, 1036, 1046, - 1037, 86, 86, 1039, 1038, 86, 1040, 1045, 1047, 1052, - 1041, 86, 1048, 1054, 86, 86, 1049, 86, 86, 1053, - 1044, 1043, 1050, 1055, 86, 1056, 1046, 86, 1057, 86, - 86, 1058, 86, 1065, 1045, 1047, 1059, 1062, 3252, 1048, - - 1060, 86, 1064, 1049, 86, 86, 1053, 1063, 1061, 1050, - 1055, 1069, 1066, 86, 86, 86, 3252, 86, 1058, 86, - 86, 1067, 1071, 1059, 1062, 86, 1068, 1060, 86, 1064, - 86, 1070, 1072, 1073, 1063, 1061, 86, 1074, 86, 1066, - 86, 86, 1075, 86, 1076, 1077, 3252, 1078, 1067, 86, - 3252, 1084, 1079, 1068, 1080, 86, 86, 86, 1070, 1072, - 1073, 86, 1081, 1083, 86, 1095, 86, 1082, 86, 168, - 1094, 1076, 1077, 86, 1078, 86, 1086, 1085, 1084, 1079, - 1087, 1080, 1097, 86, 86, 1098, 86, 86, 86, 1081, - 1083, 86, 1095, 1096, 1082, 1099, 86, 1094, 1101, 3252, - - 3252, 1100, 1102, 1086, 1085, 86, 1103, 1087, 1088, 86, - 1089, 86, 1098, 86, 1090, 3252, 1091, 1107, 86, 86, - 1096, 1092, 1099, 3252, 86, 1101, 1093, 1106, 1100, 1102, - 86, 1104, 86, 1103, 1108, 1088, 1105, 1089, 1110, 3252, - 1113, 1090, 1111, 1091, 1107, 86, 1109, 1115, 1092, 1114, - 86, 1123, 1112, 1093, 1106, 86, 1116, 86, 1120, 1117, - 86, 1108, 86, 86, 86, 1110, 1118, 1113, 1119, 1111, - 1121, 86, 86, 1109, 1115, 1122, 1114, 1125, 86, 1112, - 86, 1128, 3252, 1116, 86, 1120, 1117, 1126, 1127, 86, - 86, 1136, 86, 1118, 3252, 1119, 86, 1137, 1138, 3252, - - 1140, 3252, 86, 1142, 1144, 1139, 86, 86, 1128, 86, - 3252, 86, 86, 1147, 1126, 1127, 1129, 1141, 1136, 86, - 86, 1130, 86, 1131, 1137, 1138, 86, 1140, 1145, 1132, - 1142, 1144, 1139, 1143, 1133, 1134, 86, 1148, 1146, 86, - 1150, 1135, 86, 1129, 1141, 86, 86, 1152, 1130, 86, - 1131, 86, 1153, 1155, 1149, 1145, 1132, 1151, 1159, 86, - 1143, 1133, 1134, 86, 1148, 1146, 86, 1150, 1135, 1154, - 1156, 1160, 1157, 1158, 86, 86, 86, 1162, 1161, 1153, - 86, 1149, 1165, 1163, 1151, 86, 86, 86, 1166, 3252, - 86, 1164, 1177, 86, 86, 86, 1154, 1156, 1160, 1157, - - 1158, 86, 86, 1167, 1162, 1161, 86, 1168, 1170, 1169, - 1163, 86, 1171, 1172, 86, 1166, 86, 1176, 1164, 86, - 1173, 86, 1175, 1174, 86, 1181, 1178, 86, 86, 86, - 1167, 3252, 1179, 86, 1168, 1170, 1169, 86, 86, 1171, - 1172, 86, 1189, 86, 1176, 86, 1184, 1173, 1180, 1175, - 1174, 1182, 1181, 1178, 1183, 86, 3252, 1185, 86, 1179, - 1186, 1187, 1188, 86, 86, 1190, 1192, 1193, 86, 1189, - 3252, 1191, 1194, 1184, 3252, 1180, 1197, 86, 1182, 86, - 86, 1183, 86, 86, 1185, 86, 1222, 1186, 1187, 1188, - 3252, 1195, 1198, 1192, 1196, 1199, 1200, 86, 1191, 86, - - 86, 1201, 86, 1197, 1203, 86, 1202, 86, 1204, 1206, - 86, 1210, 1207, 86, 3252, 1208, 86, 86, 1195, 1198, - 86, 1196, 1199, 1200, 86, 1205, 1212, 1213, 1201, 1215, - 1209, 1203, 86, 1202, 1214, 86, 1216, 86, 1210, 1207, - 86, 86, 1208, 86, 1211, 86, 1218, 1217, 86, 86, - 86, 86, 1205, 1212, 1213, 1219, 1215, 1209, 86, 1220, - 1221, 1214, 86, 1216, 1225, 3252, 86, 86, 1224, 1223, - 1227, 1211, 1226, 1218, 1217, 1228, 1230, 86, 1229, 86, - 86, 1232, 1219, 86, 1233, 86, 1220, 86, 86, 1237, - 1231, 1225, 86, 1234, 1240, 1224, 1223, 1227, 86, 1226, - - 86, 1235, 1228, 1230, 86, 1229, 1242, 1236, 1241, 1238, - 3252, 1249, 1239, 86, 1243, 86, 86, 1231, 86, 86, - 1234, 86, 1244, 86, 1247, 1253, 86, 86, 1235, 86, - 86, 1248, 86, 86, 1236, 1241, 1238, 1245, 1249, 1239, - 86, 1243, 1246, 1250, 1251, 1252, 86, 1254, 86, 1244, - 86, 1247, 86, 86, 1255, 86, 1256, 86, 1248, 86, - 1257, 1259, 1260, 3252, 1245, 1258, 86, 1262, 1263, 1246, - 1250, 1251, 1252, 86, 86, 1267, 86, 86, 86, 86, - 1274, 1255, 1264, 1256, 1269, 1276, 86, 86, 1259, 1260, - 86, 1265, 1258, 86, 1262, 1263, 1266, 86, 1268, 1271, - - 1270, 3252, 86, 1273, 86, 168, 1272, 86, 1275, 1264, - 1277, 1269, 86, 1278, 86, 86, 1279, 86, 1265, 1280, - 3252, 86, 3252, 1266, 86, 1268, 1271, 1270, 86, 1281, - 1273, 1284, 1282, 1272, 1283, 1275, 1285, 1287, 86, 1290, - 1278, 1286, 86, 1279, 86, 86, 1280, 86, 86, 86, - 1288, 86, 1289, 86, 1291, 1345, 1281, 86, 1284, 1282, - 86, 1283, 86, 1285, 1287, 1292, 86, 86, 1286, 1294, - 1293, 1295, 1300, 1303, 86, 3252, 3252, 1288, 86, 1289, - 1296, 1291, 86, 1301, 1302, 1304, 3252, 86, 1305, 1297, - 86, 1298, 1292, 1306, 1299, 86, 1294, 1293, 1295, 1300, - - 86, 86, 86, 1310, 1308, 86, 86, 1296, 1309, 86, - 1301, 1302, 1304, 86, 1307, 1305, 1297, 86, 1298, 1311, - 1306, 1299, 86, 1312, 3252, 86, 86, 86, 1315, 1313, - 1310, 1308, 1314, 1317, 1316, 1309, 1318, 1324, 86, 1323, - 1319, 1307, 86, 1321, 86, 86, 1311, 1320, 1322, 86, - 1312, 86, 1367, 3252, 86, 1315, 1313, 86, 86, 1314, - 86, 1316, 86, 1318, 1324, 86, 1323, 1319, 1325, 1326, - 1321, 86, 1327, 1328, 1320, 1322, 1330, 86, 1329, 3252, - 86, 1331, 1332, 1333, 86, 86, 1334, 86, 86, 86, - 1335, 86, 86, 1338, 1336, 1325, 1326, 1337, 86, 1327, - - 1328, 86, 86, 1330, 86, 1329, 1339, 86, 1331, 1332, - 1333, 86, 1341, 1334, 1340, 3252, 1343, 1335, 86, 1344, - 1338, 1336, 86, 1342, 1337, 86, 86, 86, 86, 1348, - 1346, 1347, 1350, 1339, 1351, 1352, 1357, 1371, 1349, 1341, - 1353, 1340, 86, 1343, 86, 86, 1344, 1354, 86, 86, - 1342, 1355, 1356, 1386, 86, 86, 1348, 1346, 1347, 1350, - 3252, 1351, 86, 1357, 86, 1349, 86, 86, 1365, 86, - 1368, 3252, 1366, 1370, 1354, 1396, 1397, 1387, 1355, 1356, - 1358, 1369, 86, 1372, 1359, 86, 1374, 1360, 1361, 3252, - 86, 86, 1362, 3252, 1373, 1365, 86, 1368, 1363, 1366, - - 1370, 1376, 1364, 86, 86, 86, 86, 1358, 1369, 86, - 1372, 1359, 86, 1374, 1360, 1361, 86, 1375, 1377, 1362, - 1378, 1373, 1381, 86, 1379, 1363, 1380, 86, 1376, 1364, - 1382, 86, 1383, 1384, 1385, 86, 1388, 86, 1395, 1389, - 86, 3252, 86, 86, 1375, 1377, 86, 1378, 1399, 1381, - 3252, 1379, 1398, 1380, 86, 1413, 1423, 1382, 86, 1383, - 1384, 1385, 86, 1388, 86, 1395, 1389, 1390, 86, 1400, - 1402, 86, 1391, 1401, 1392, 1399, 1393, 1405, 1394, 1398, - 1407, 86, 86, 86, 1403, 86, 1406, 86, 86, 1404, - 1409, 86, 3252, 1408, 1390, 86, 1400, 1402, 1414, 1391, - - 1401, 1392, 86, 1393, 1405, 1394, 86, 1407, 86, 1412, - 1410, 1411, 1415, 1406, 1416, 1418, 86, 1409, 86, 86, - 1408, 1417, 86, 1420, 86, 1414, 1419, 86, 86, 1422, - 1425, 86, 86, 1421, 1424, 86, 1412, 1410, 1411, 1415, - 1426, 1416, 1418, 86, 86, 1427, 86, 1429, 1417, 1428, - 1420, 86, 1430, 1419, 1431, 86, 1422, 86, 1433, 1432, - 1421, 1424, 1434, 3252, 1438, 86, 86, 1426, 1435, 86, - 86, 86, 1427, 1439, 1429, 1440, 1428, 1436, 1437, 1430, - 86, 86, 1444, 86, 86, 86, 1432, 1441, 86, 1434, - 86, 86, 1443, 1442, 86, 1435, 1447, 1445, 1446, 86, - - 1439, 3252, 1440, 1449, 1436, 1437, 86, 86, 86, 1444, - 86, 1448, 1450, 1451, 1441, 86, 86, 3252, 1454, 1443, - 1442, 1452, 86, 1447, 1445, 1446, 1456, 1453, 1455, 1460, - 1449, 1457, 86, 86, 86, 86, 1458, 1459, 1448, 1450, - 1451, 1461, 3252, 86, 86, 1454, 1463, 1462, 1452, 86, - 86, 86, 86, 1456, 1453, 1455, 86, 1464, 1457, 1465, - 1466, 86, 1467, 1458, 1459, 1468, 1472, 86, 1469, 86, - 1470, 1473, 86, 86, 1462, 86, 86, 86, 86, 1471, - 168, 1474, 1475, 86, 1464, 3252, 1465, 1466, 1476, 86, - 1480, 3252, 1468, 1478, 1477, 1469, 1481, 1470, 86, 1483, - - 86, 86, 86, 86, 1479, 86, 1471, 1482, 1474, 86, - 1487, 86, 1484, 1488, 86, 1476, 86, 1480, 1486, 86, - 1478, 1477, 1485, 1481, 86, 86, 1483, 86, 1490, 1489, - 1491, 1479, 86, 86, 1482, 1494, 1492, 1487, 86, 1484, - 86, 1493, 1495, 3252, 86, 1486, 1496, 1498, 1497, 1485, - 86, 1499, 1503, 1505, 1500, 1490, 1489, 1491, 1504, 86, - 86, 86, 1494, 86, 1501, 86, 86, 1502, 86, 1495, - 86, 1506, 1507, 1496, 1498, 1497, 3252, 1508, 1499, 1503, - 1505, 1500, 1509, 86, 1511, 1504, 86, 1510, 1512, 86, - 1514, 1501, 86, 86, 1502, 86, 1513, 1515, 1516, 1507, - - 1518, 1517, 1519, 86, 1508, 86, 3252, 86, 86, 86, - 1523, 1511, 86, 1520, 86, 1512, 1524, 1514, 1527, 86, - 1528, 1521, 86, 1513, 1515, 1516, 86, 1518, 1517, 1519, - 86, 3252, 1522, 1525, 3252, 86, 86, 1523, 1526, 86, - 1520, 86, 86, 1524, 1529, 1530, 86, 1528, 1521, 1531, - 86, 1532, 86, 1534, 1533, 1538, 1540, 1535, 86, 1522, - 1525, 86, 86, 86, 1536, 1526, 1539, 1541, 86, 1546, - 1537, 1529, 1530, 86, 1543, 86, 1531, 86, 1532, 86, - 1534, 1533, 1538, 1540, 1535, 86, 86, 1544, 1542, 1545, - 1547, 1536, 86, 1539, 1541, 86, 86, 1537, 1548, 1549, - - 86, 1543, 86, 1551, 1552, 86, 1550, 1555, 3252, 86, - 3252, 86, 1553, 3252, 1554, 1542, 1545, 1547, 1558, 86, - 1556, 3252, 1559, 3252, 1557, 1548, 1549, 86, 86, 1563, - 1562, 1560, 1566, 1550, 86, 86, 86, 86, 86, 1553, - 86, 1554, 86, 86, 86, 1558, 1564, 1556, 1561, 1559, - 86, 1557, 1565, 86, 86, 86, 1563, 1562, 1560, 1566, - 86, 1567, 1568, 1569, 1571, 1573, 3252, 1574, 1570, 1572, - 86, 86, 86, 1564, 86, 1561, 1575, 1576, 1578, 1565, - 1577, 1582, 1579, 1585, 86, 86, 1588, 3252, 1567, 1568, - 86, 3252, 1573, 86, 1574, 86, 86, 1583, 86, 1580, - - 86, 1581, 1587, 1575, 1576, 1578, 86, 1577, 1586, 1579, - 86, 1584, 86, 86, 1589, 86, 86, 1590, 86, 86, - 1593, 1594, 86, 86, 1583, 86, 1580, 86, 1581, 1587, - 1595, 1591, 1592, 86, 1596, 1586, 1598, 1599, 1584, 86, - 86, 1589, 86, 1597, 1590, 1600, 1601, 1593, 1594, 3252, - 1614, 86, 1602, 1604, 3252, 1603, 1609, 1595, 1591, 1592, - 86, 1596, 1605, 1598, 86, 86, 1610, 86, 86, 86, - 1597, 86, 86, 1601, 1606, 86, 86, 86, 1607, 1602, - 1604, 1615, 1603, 1609, 1611, 1612, 1613, 1616, 86, 1605, - 1617, 1608, 86, 1610, 1619, 1618, 86, 86, 1625, 86, - - 1620, 1606, 86, 86, 1626, 1607, 1621, 1622, 1615, 86, - 3252, 1611, 1612, 1613, 86, 1623, 86, 1617, 1608, 86, - 1630, 1619, 1618, 86, 86, 1624, 1627, 1620, 1629, 86, - 86, 86, 86, 1621, 1622, 86, 1631, 1628, 1632, 1633, - 1635, 3252, 1623, 86, 1641, 86, 86, 1630, 1634, 1636, - 86, 1637, 1624, 1627, 1639, 1629, 1638, 1642, 3252, 1640, - 86, 86, 86, 1645, 1628, 1632, 86, 86, 86, 86, - 86, 1641, 86, 1643, 1644, 1634, 1636, 86, 1637, 86, - 86, 1639, 86, 1638, 1642, 86, 1640, 1647, 1648, 1646, - 1645, 1651, 1650, 86, 1649, 3252, 1652, 1653, 1654, 1656, - - 1643, 1644, 86, 86, 86, 1655, 86, 86, 1657, 3252, - 86, 86, 1660, 86, 1647, 1648, 1646, 1658, 1651, 1650, - 1663, 1649, 86, 1652, 1653, 1654, 1656, 86, 1661, 1659, - 1662, 1665, 1655, 86, 1664, 86, 86, 1666, 86, 1660, - 86, 1667, 86, 86, 1658, 1668, 86, 1663, 1674, 1669, - 1672, 1675, 168, 86, 86, 1661, 1659, 1662, 1665, 1670, - 1671, 1664, 86, 86, 86, 1678, 1679, 86, 1667, 1673, - 1682, 86, 1668, 86, 86, 1674, 1669, 1672, 1675, 1680, - 1683, 1676, 1677, 1681, 86, 1684, 1670, 1671, 86, 86, - 86, 1685, 86, 1679, 1686, 86, 1673, 1682, 86, 3252, - - 1687, 86, 86, 1688, 1689, 3252, 1680, 1683, 1676, 1677, - 1681, 1690, 86, 86, 1691, 1695, 1692, 86, 1685, 86, - 1693, 3252, 1694, 1697, 1696, 1701, 86, 1687, 86, 1698, - 86, 1689, 86, 86, 1699, 86, 86, 1702, 1690, 1706, - 86, 1691, 1695, 1692, 86, 1700, 86, 1693, 86, 1694, - 1697, 1696, 1701, 86, 86, 1703, 1698, 1710, 1704, 1707, - 86, 1699, 1714, 1715, 1702, 1711, 1712, 1708, 86, 1723, - 1705, 86, 1700, 1716, 1713, 86, 1718, 1717, 86, 86, - 1719, 86, 1703, 1709, 1710, 1704, 1707, 86, 1720, 86, - 1721, 86, 1711, 1712, 1708, 86, 1723, 1705, 86, 86, - - 1722, 1713, 86, 1718, 1717, 86, 86, 1719, 1724, 1726, - 1709, 1725, 86, 1727, 86, 1728, 86, 1721, 86, 1729, - 86, 1730, 1731, 3252, 1733, 3252, 86, 1722, 1732, 1738, - 1734, 1735, 1736, 86, 3252, 1724, 1726, 1737, 1725, 86, - 86, 86, 86, 1743, 86, 86, 1729, 86, 1739, 1731, - 86, 86, 86, 86, 1740, 1732, 1738, 1734, 1735, 1736, - 1741, 86, 1745, 1742, 1737, 86, 1744, 86, 86, 86, - 1743, 1746, 1748, 1749, 86, 1739, 1750, 86, 1747, 1752, - 86, 1740, 1751, 86, 1753, 86, 86, 1741, 1755, 1745, - 1742, 1757, 86, 1744, 1754, 86, 1758, 1756, 1746, 1760, - - 1749, 86, 86, 1750, 86, 1747, 1752, 1759, 86, 1751, - 86, 86, 86, 1761, 1762, 1755, 1763, 86, 1757, 1764, - 86, 1754, 86, 1758, 1756, 1767, 1760, 1765, 86, 1770, - 1766, 86, 86, 1772, 1759, 1771, 86, 1768, 1773, 86, - 1761, 1762, 1769, 1763, 1775, 86, 1764, 3252, 1774, 86, - 1776, 1777, 1767, 86, 1765, 1783, 1770, 1766, 1778, 86, - 86, 1780, 1771, 86, 1768, 86, 86, 1781, 1779, 1769, - 1789, 1775, 86, 1782, 86, 1774, 86, 1776, 86, 1784, - 1788, 86, 1783, 86, 1785, 1778, 1790, 1786, 1780, 86, - 1787, 1794, 86, 3252, 1781, 1779, 1791, 86, 86, 1793, - - 1782, 1792, 86, 86, 86, 86, 1784, 1788, 86, 1795, - 1796, 1785, 1799, 86, 1786, 86, 1800, 1787, 1794, 1797, - 86, 86, 1798, 1791, 1801, 86, 1793, 86, 1792, 3252, - 1802, 86, 3252, 1803, 1807, 1808, 1795, 1796, 86, 1799, - 1813, 1810, 86, 1800, 86, 1805, 1797, 1804, 1806, 1798, - 86, 1801, 86, 86, 1814, 1816, 86, 1802, 1809, 86, - 1803, 1807, 1808, 86, 86, 1811, 86, 1813, 1810, 1817, - 1812, 1815, 1805, 1819, 1804, 1806, 86, 86, 1818, 1820, - 1821, 1814, 1816, 1822, 3252, 1809, 1824, 86, 1826, 1823, - 1825, 1830, 1827, 86, 3252, 1842, 3252, 86, 1815, 1831, - - 86, 86, 86, 86, 1832, 1818, 86, 1821, 1828, 1834, - 86, 86, 86, 1824, 1829, 86, 1823, 1825, 86, 1827, - 86, 1833, 1835, 86, 1836, 1837, 1831, 86, 86, 86, - 1838, 1832, 86, 1839, 1840, 1828, 1834, 1843, 86, 86, - 86, 1829, 3252, 86, 1844, 1845, 86, 1846, 1833, 1835, - 1847, 1836, 1837, 1849, 86, 1841, 1848, 1838, 86, 86, - 1839, 86, 1850, 1851, 86, 1852, 1853, 86, 86, 86, - 1854, 1844, 86, 1856, 1846, 86, 86, 1847, 1855, 1857, - 1849, 1858, 1841, 1848, 1860, 86, 1863, 1859, 1864, 1862, - 1851, 1861, 1852, 1853, 86, 86, 86, 86, 86, 1865, - - 1856, 86, 86, 86, 168, 1855, 1857, 86, 1858, 86, - 1866, 1860, 1867, 1863, 1859, 86, 1862, 1868, 1861, 1869, - 86, 1870, 1873, 1871, 1874, 86, 1865, 1872, 1875, 3252, - 86, 86, 86, 1884, 1877, 1878, 1879, 1866, 86, 1867, - 1876, 86, 86, 86, 86, 1880, 1869, 1881, 1870, 1873, - 1871, 1874, 1883, 1882, 1872, 86, 86, 1885, 1886, 1888, - 86, 1877, 1878, 86, 1887, 86, 1893, 1876, 1891, 86, - 86, 1889, 1880, 86, 86, 86, 1890, 86, 86, 1883, - 1882, 86, 1894, 86, 86, 1886, 1888, 1892, 86, 86, - 1895, 1887, 1896, 1893, 1897, 1891, 86, 1899, 1889, 1906, - - 1898, 1904, 1907, 1890, 86, 1901, 86, 86, 86, 1894, - 1900, 1902, 86, 1905, 1892, 86, 3252, 1895, 1903, 1896, - 1917, 1897, 86, 86, 1899, 86, 86, 1898, 1904, 1908, - 1911, 1909, 1901, 86, 86, 86, 1910, 1900, 1902, 86, - 1905, 86, 1912, 86, 1926, 1903, 1913, 86, 1914, 86, - 1915, 1928, 1916, 1918, 1920, 1919, 1908, 1911, 1909, 1921, - 1922, 86, 86, 1910, 1923, 1924, 86, 1925, 1930, 1912, - 86, 86, 1927, 1913, 1932, 1914, 86, 1915, 86, 1916, - 86, 86, 1919, 86, 1929, 86, 1921, 1922, 1933, 1936, - 86, 1923, 86, 86, 1925, 1931, 86, 86, 86, 1927, - - 86, 1932, 1934, 1935, 1937, 1938, 1941, 1939, 3252, 86, - 86, 1929, 1946, 1940, 1948, 86, 86, 1947, 1950, 86, - 3252, 3252, 1931, 1951, 86, 86, 1954, 86, 1957, 1934, - 1935, 1937, 1938, 86, 1939, 86, 1952, 3252, 86, 1946, - 1940, 1942, 1943, 1944, 1947, 1949, 86, 1953, 1945, 86, - 86, 86, 86, 1954, 1956, 1955, 86, 1959, 1958, 86, - 86, 1960, 1961, 1952, 86, 1963, 86, 86, 1942, 1943, - 1944, 86, 1949, 1964, 1953, 1945, 86, 1962, 86, 1966, - 86, 1956, 1955, 1967, 1959, 1958, 1968, 1969, 1960, 86, - 1965, 86, 1963, 86, 1970, 86, 86, 1971, 1972, 1974, - - 1964, 1973, 1975, 1976, 1962, 86, 1966, 86, 1977, 86, - 86, 1981, 1978, 1968, 86, 86, 86, 1965, 1979, 1984, - 86, 1970, 1980, 86, 1971, 1972, 1982, 86, 1973, 86, - 1976, 86, 86, 1983, 1985, 1977, 86, 86, 1981, 1978, - 1986, 86, 1987, 1988, 86, 1979, 1984, 86, 1989, 1980, - 1990, 1991, 1992, 1982, 1993, 1994, 1995, 1998, 86, 1997, - 1983, 86, 86, 86, 1996, 2000, 86, 1986, 86, 1987, - 86, 86, 1999, 86, 2001, 86, 3252, 86, 1991, 1992, - 86, 1993, 1994, 1995, 1998, 2002, 1997, 2004, 86, 2003, - 2007, 1996, 86, 2006, 2009, 86, 2008, 86, 86, 1999, - - 86, 86, 3252, 2005, 2013, 2010, 86, 2011, 2014, 2016, - 86, 3252, 2002, 86, 2004, 2017, 2003, 2007, 86, 86, - 2006, 86, 2015, 2008, 2020, 2012, 2027, 86, 3252, 86, - 2005, 2013, 2010, 86, 2011, 2014, 86, 2021, 86, 2018, - 86, 2022, 2017, 86, 2019, 2023, 2030, 2024, 2028, 2015, - 2025, 86, 2012, 86, 86, 86, 2026, 86, 86, 2029, - 86, 2031, 2032, 86, 2021, 2037, 2018, 2041, 2022, 86, - 2042, 2019, 2023, 86, 2024, 2028, 2033, 2025, 2038, 2034, - 2046, 86, 2044, 2026, 2035, 86, 2029, 86, 2031, 2032, - 2036, 2039, 86, 2045, 86, 86, 2040, 86, 2047, 86, - - 2043, 86, 86, 2033, 86, 86, 2034, 2048, 86, 2044, - 2051, 2035, 86, 86, 2049, 2053, 2050, 2036, 86, 2052, - 2045, 2055, 2054, 86, 86, 2047, 2061, 2043, 2059, 86, - 86, 2057, 2058, 2062, 2048, 2056, 86, 2060, 2063, 86, - 2064, 2049, 86, 2050, 168, 86, 2052, 86, 2055, 2054, - 86, 2066, 86, 86, 86, 2059, 2065, 2068, 2057, 2058, - 86, 2067, 2056, 86, 2060, 2063, 2070, 2069, 3252, 2072, - 2071, 2073, 86, 86, 3252, 86, 2074, 86, 2066, 2075, - 2076, 2077, 86, 2065, 2068, 86, 86, 2078, 2067, 86, - 86, 86, 2080, 2070, 2069, 86, 2072, 2071, 2073, 86, - - 2079, 86, 2081, 2074, 2082, 2083, 2075, 86, 2077, 86, - 2085, 86, 2084, 2086, 2078, 3252, 86, 2088, 86, 2080, - 2087, 86, 86, 86, 2089, 2090, 2091, 2079, 2092, 86, - 3252, 2082, 2083, 86, 2093, 86, 86, 2085, 2096, 2084, - 2086, 86, 86, 86, 2097, 2094, 2099, 2087, 2095, 86, - 2098, 2089, 2090, 2091, 2100, 2092, 86, 86, 2102, 2104, - 86, 2093, 2101, 2105, 86, 2096, 2110, 2106, 86, 86, - 86, 2097, 2094, 2099, 2103, 2095, 86, 2098, 86, 2108, - 86, 2100, 2107, 2109, 2114, 2102, 86, 86, 86, 2101, - 2105, 86, 2111, 86, 2106, 2112, 86, 3252, 86, 2113, - - 2116, 2103, 86, 2117, 2115, 2119, 2108, 2118, 2121, 2107, - 2109, 86, 2120, 86, 2123, 2124, 3252, 3252, 2122, 2111, - 2163, 86, 2112, 86, 86, 86, 2113, 86, 86, 86, - 2117, 2115, 86, 86, 2118, 2121, 2126, 86, 2125, 2120, - 86, 2123, 2124, 2127, 86, 2122, 2128, 2129, 86, 2133, - 2130, 86, 86, 2134, 2131, 2136, 86, 86, 86, 2137, - 2139, 86, 86, 2126, 2135, 2125, 2140, 2132, 86, 3252, - 2127, 2138, 2143, 2128, 2129, 86, 2133, 2130, 86, 86, - 2134, 2131, 86, 2141, 86, 2142, 2137, 2139, 86, 2145, - 86, 2135, 2144, 2140, 2132, 2146, 2147, 86, 2138, 2143, - - 2148, 86, 2149, 2150, 3252, 2152, 2151, 86, 2154, 86, - 2141, 86, 2142, 86, 86, 86, 2145, 2153, 86, 2144, - 86, 86, 2146, 2147, 2155, 2156, 86, 2148, 2157, 2149, - 2150, 86, 2152, 2151, 2158, 2154, 2159, 2161, 2160, 2165, - 2162, 3252, 86, 3252, 2153, 2169, 86, 86, 2164, 2166, - 86, 86, 2156, 86, 2167, 2157, 2168, 2173, 86, 86, - 86, 2158, 86, 2159, 2161, 2160, 2165, 2162, 86, 86, - 86, 2170, 86, 2171, 2174, 2164, 2166, 2172, 2175, 2176, - 2179, 2167, 2181, 2168, 86, 86, 2182, 2180, 86, 86, - 3252, 2177, 3252, 2183, 2184, 3252, 86, 86, 2170, 2178, - - 2171, 2174, 86, 86, 2172, 2175, 2176, 86, 86, 2181, - 86, 86, 86, 2182, 2180, 2185, 86, 2192, 2177, 2186, - 2183, 2184, 2187, 2188, 86, 2189, 2178, 2190, 2193, 2195, - 2194, 86, 2191, 2197, 2198, 86, 2196, 86, 2200, 3252, - 3252, 86, 2185, 86, 2192, 86, 2186, 86, 86, 2187, - 2188, 86, 2189, 2199, 3252, 2193, 2195, 2194, 86, 86, - 2197, 2198, 2205, 2196, 2201, 86, 2202, 2203, 2204, 2206, - 2207, 86, 2208, 86, 86, 86, 2209, 3252, 86, 86, - 2199, 86, 2210, 2211, 86, 86, 2214, 2212, 2215, 2205, - 2216, 2201, 86, 2202, 2203, 2204, 2206, 2207, 86, 2208, - - 2213, 86, 86, 2209, 86, 2219, 2220, 86, 86, 2210, - 2211, 2217, 2221, 2214, 2212, 2215, 2218, 2216, 86, 2222, - 86, 2223, 2224, 86, 2230, 2225, 2226, 2213, 2231, 86, - 86, 2227, 2219, 86, 2234, 2232, 168, 2228, 2217, 2221, - 86, 86, 2229, 2218, 2233, 86, 86, 86, 2223, 2224, - 2235, 2240, 2225, 2226, 2236, 2239, 86, 2241, 2227, 86, - 86, 2234, 2232, 86, 2244, 2243, 2245, 2247, 2237, 86, - 2242, 2233, 2246, 86, 86, 2249, 3252, 86, 86, 2238, - 86, 2236, 2239, 86, 2241, 86, 2248, 2250, 86, 2252, - 3252, 3252, 2243, 2245, 86, 2237, 86, 2242, 86, 2246, - - 2255, 2254, 2251, 86, 2253, 2257, 2238, 86, 86, 86, - 86, 86, 86, 2248, 2250, 2256, 2252, 86, 2258, 86, - 2263, 2259, 86, 2260, 2262, 86, 2261, 2255, 2254, 2251, - 86, 2253, 2257, 86, 86, 2264, 2265, 2266, 2267, 2270, - 86, 2269, 2256, 2268, 86, 2258, 86, 2263, 2259, 86, - 2260, 2262, 2272, 2261, 86, 2273, 2275, 2276, 3252, 86, - 86, 86, 86, 2265, 2266, 2267, 2270, 2271, 2269, 86, - 2268, 2274, 2282, 2277, 86, 86, 86, 2278, 86, 2272, - 86, 86, 2273, 86, 2276, 86, 2279, 2281, 2280, 2285, - 86, 86, 2283, 2288, 2271, 86, 2284, 2286, 2274, 2282, - - 2277, 86, 86, 2289, 2278, 2287, 2290, 86, 2292, 2296, - 2291, 86, 2293, 2279, 2281, 2280, 2285, 2294, 86, 2283, - 2288, 2295, 86, 2284, 2286, 86, 86, 2297, 86, 2298, - 86, 86, 2287, 2290, 86, 2292, 86, 2291, 2299, 2293, - 2300, 86, 2301, 2303, 2294, 2302, 2304, 86, 2295, 2305, - 2307, 2308, 86, 2306, 86, 2310, 2298, 86, 86, 2309, - 86, 2311, 2313, 3252, 2315, 2299, 86, 2300, 3252, 2301, - 86, 86, 2302, 86, 86, 86, 2305, 2307, 2308, 2312, - 2306, 2314, 86, 2316, 2318, 2317, 2309, 86, 86, 86, - 86, 86, 2319, 2323, 2324, 86, 2320, 2321, 2325, 2327, - - 2322, 86, 3252, 3252, 2333, 2330, 2312, 86, 2314, 86, - 2316, 86, 2317, 86, 2326, 86, 86, 2329, 3252, 86, - 2323, 2324, 86, 2320, 2321, 86, 86, 2322, 2328, 86, - 2331, 86, 2330, 2337, 2334, 2335, 2338, 86, 86, 2340, - 2336, 2326, 86, 86, 2329, 2332, 2339, 86, 86, 2342, - 86, 86, 2341, 3252, 2347, 2328, 86, 2331, 2344, 2345, - 86, 2334, 2335, 2338, 2349, 2350, 2340, 2336, 2354, 2343, - 2346, 86, 2332, 2339, 2398, 86, 86, 86, 86, 2341, - 86, 86, 86, 2348, 86, 2344, 2345, 2353, 86, 2351, - 86, 2349, 2350, 2352, 86, 2354, 2343, 2346, 86, 2355, - - 2356, 86, 86, 2360, 2357, 2367, 86, 2361, 2364, 3252, - 2348, 2362, 2371, 2363, 2353, 86, 2351, 86, 86, 2358, - 2352, 2359, 86, 2366, 2373, 86, 2355, 2356, 86, 86, - 2360, 2357, 2367, 86, 2361, 2364, 2365, 2368, 2362, 2369, - 2363, 2370, 86, 2372, 86, 86, 2358, 2374, 2359, 86, - 2366, 2375, 2376, 86, 86, 2384, 86, 2377, 2378, 86, - 3252, 86, 2379, 2365, 2368, 2380, 2369, 3252, 2370, 86, - 2372, 86, 2381, 86, 2374, 2382, 3252, 2385, 2375, 2376, - 86, 2383, 86, 86, 2377, 2378, 2388, 86, 2386, 2379, - 86, 2387, 2380, 86, 86, 2389, 2390, 2391, 86, 2381, - - 3252, 3252, 2382, 2393, 86, 2392, 2414, 2399, 2383, 86, - 2394, 86, 2395, 2388, 2401, 2386, 2396, 86, 2387, 86, - 2397, 86, 2389, 86, 2391, 168, 2400, 86, 86, 86, - 2393, 86, 2392, 2403, 2399, 2402, 2404, 2394, 86, 2395, - 2405, 2401, 2407, 2396, 86, 86, 86, 2397, 2406, 86, - 2408, 86, 2409, 2400, 2410, 2411, 3252, 2415, 2416, 2412, - 2403, 3252, 2402, 2404, 86, 86, 2413, 2405, 2417, 2407, - 86, 2418, 3252, 2419, 2424, 2406, 86, 2408, 2421, 86, - 86, 2410, 86, 86, 86, 2416, 2412, 2420, 86, 86, - 2423, 86, 3252, 2413, 2425, 86, 2422, 2426, 2418, 86, - - 2419, 2428, 86, 2427, 86, 2421, 86, 86, 2429, 2430, - 2431, 2433, 2436, 2434, 2420, 2432, 86, 2423, 2435, 86, - 86, 2425, 2438, 2422, 2426, 86, 86, 2439, 2428, 86, - 2427, 86, 2437, 2445, 86, 86, 2430, 3252, 2433, 86, - 2434, 86, 86, 2440, 86, 2435, 86, 2441, 2442, 2438, - 86, 2443, 2446, 2447, 2439, 2444, 2448, 2451, 86, 2437, - 86, 2450, 86, 2449, 86, 86, 2454, 86, 2456, 2453, - 2440, 86, 86, 86, 2441, 2442, 2452, 86, 2443, 2446, - 2447, 2455, 2444, 2448, 2451, 86, 2457, 86, 2450, 2458, - 2449, 86, 2464, 86, 2459, 2456, 2453, 2461, 86, 86, - - 86, 2460, 86, 2452, 2462, 2463, 2465, 86, 2455, 2467, - 3252, 2466, 2469, 2457, 2477, 86, 2458, 2468, 86, 2464, - 2471, 2459, 2475, 86, 2461, 86, 86, 86, 2460, 86, - 2470, 2462, 2473, 86, 2472, 86, 86, 86, 2466, 2469, - 2474, 86, 86, 2476, 2468, 2478, 86, 2471, 2480, 86, - 2482, 2481, 2479, 86, 86, 2484, 2485, 2470, 86, 2473, - 2487, 2472, 86, 86, 2486, 2483, 2489, 2474, 2494, 86, - 86, 86, 2478, 86, 86, 2480, 2488, 2482, 2481, 2479, - 86, 2490, 86, 2485, 2493, 2495, 2491, 2487, 86, 2492, - 2496, 2497, 2483, 86, 86, 86, 86, 2498, 86, 86, - - 2499, 2500, 2501, 2488, 2503, 86, 2502, 86, 2490, 86, - 86, 2493, 2495, 2491, 86, 86, 2492, 2496, 2497, 86, - 2505, 86, 2506, 2504, 2498, 86, 86, 2499, 2500, 2501, - 86, 2503, 2507, 2502, 2508, 2509, 2510, 2511, 2512, 3252, - 2513, 2515, 86, 2514, 3252, 3252, 86, 2505, 2517, 86, - 2504, 86, 2519, 2521, 3252, 86, 86, 2516, 2522, 86, - 86, 86, 86, 2510, 2511, 2512, 86, 2513, 2515, 86, - 2514, 2518, 86, 2520, 2523, 2517, 2524, 2525, 2526, 86, - 86, 86, 86, 2531, 2516, 86, 2528, 2527, 2529, 2530, - 86, 86, 3252, 86, 86, 86, 86, 86, 2518, 2532, - - 2520, 2523, 2534, 2524, 2525, 2526, 2533, 86, 86, 86, - 86, 2535, 2538, 2528, 2527, 2529, 2530, 86, 2536, 2537, - 2546, 86, 2539, 2540, 2541, 86, 2532, 168, 2542, 2534, - 2544, 2550, 86, 2533, 2543, 86, 86, 2548, 2535, 2538, - 86, 86, 2551, 86, 86, 2536, 2537, 2546, 86, 2539, - 2540, 2541, 2545, 2547, 2549, 2542, 86, 2544, 86, 86, - 2552, 2543, 2553, 2555, 2548, 2554, 86, 2556, 2559, 86, - 2557, 3252, 86, 2558, 3252, 86, 86, 2561, 86, 2545, - 2547, 2549, 86, 86, 2560, 86, 86, 2552, 86, 2553, - 2555, 86, 2554, 86, 2556, 2559, 2562, 2557, 2563, 2564, - - 2558, 2566, 2565, 86, 2561, 2567, 86, 2569, 86, 2568, - 2570, 2560, 2571, 2573, 86, 2572, 86, 2574, 86, 2576, - 86, 3252, 3252, 2562, 86, 2563, 2564, 86, 2566, 2565, - 2575, 86, 2567, 86, 2569, 2579, 2568, 86, 2577, 2571, - 2573, 2578, 2572, 2581, 86, 2582, 86, 86, 86, 2580, - 86, 2584, 86, 2583, 86, 86, 2585, 2575, 2586, 86, - 2587, 86, 2579, 2588, 86, 2577, 2589, 2590, 2578, 86, - 2581, 2591, 2582, 2592, 2593, 2595, 2580, 2598, 2584, 2600, - 2583, 2594, 86, 86, 86, 86, 86, 2587, 2596, 86, - 2588, 2597, 2599, 86, 86, 86, 2601, 86, 86, 86, - - 2592, 2593, 2595, 86, 2598, 2602, 86, 2604, 2594, 2606, - 3252, 3252, 2603, 2608, 2605, 2596, 2613, 86, 2597, 2599, - 86, 86, 86, 2601, 86, 86, 2607, 2612, 2616, 3252, - 2609, 2620, 86, 86, 2604, 86, 2606, 86, 2610, 2603, - 2608, 2605, 2611, 86, 2614, 2617, 86, 2619, 2618, 86, - 2615, 86, 2621, 2607, 2612, 86, 86, 2609, 86, 86, - 86, 2622, 2625, 2627, 2628, 2610, 86, 2626, 86, 2611, - 86, 2614, 2617, 86, 2619, 2618, 2623, 2615, 2624, 2621, - 2629, 86, 86, 86, 2630, 86, 2631, 86, 2622, 86, - 2627, 2628, 86, 2632, 2626, 2634, 2633, 2635, 2636, 3252, - - 2637, 2639, 2640, 2623, 2638, 2624, 86, 86, 3252, 86, - 3252, 2630, 86, 86, 86, 86, 86, 2642, 2641, 2643, - 2632, 2644, 2634, 2633, 2635, 86, 86, 2637, 86, 2640, - 2645, 2638, 86, 2646, 2647, 86, 2648, 86, 2649, 3252, - 2650, 2652, 86, 3252, 2642, 2641, 2643, 2651, 86, 86, - 2654, 86, 2653, 2656, 2657, 2659, 86, 2645, 86, 2655, - 86, 2647, 86, 2648, 2660, 2649, 86, 2650, 2652, 86, - 86, 86, 2658, 2661, 2651, 86, 86, 2654, 2662, 2653, - 2656, 2657, 86, 2664, 86, 2663, 2655, 2665, 2666, 2667, - 2669, 86, 86, 2681, 3252, 2668, 86, 2670, 86, 2658, - - 168, 2671, 86, 2672, 2673, 2662, 2674, 86, 2675, 3252, - 2664, 86, 2663, 2680, 2665, 2678, 2667, 2669, 86, 86, - 86, 86, 2668, 2679, 2670, 86, 86, 2683, 86, 2676, - 86, 2673, 86, 86, 2677, 2675, 2682, 86, 2684, 2685, - 2680, 2686, 2678, 2688, 2689, 86, 2687, 2690, 3252, 86, - 2679, 86, 86, 2692, 2683, 2691, 86, 2693, 2698, 86, - 86, 86, 2694, 2682, 86, 2684, 2685, 86, 2686, 86, - 86, 2696, 2695, 2687, 2690, 86, 86, 2699, 2697, 86, - 2692, 2702, 2691, 2700, 2693, 2698, 86, 86, 2701, 2694, - 2704, 86, 2705, 86, 2703, 3252, 2709, 3252, 2696, 2695, - - 86, 86, 2707, 2706, 2699, 2697, 86, 86, 2702, 86, - 2700, 86, 86, 86, 2711, 2701, 2708, 2710, 2713, 2705, - 2714, 2703, 86, 86, 86, 86, 2712, 2715, 86, 2707, - 2706, 2718, 86, 2716, 2717, 2719, 2720, 86, 86, 86, - 86, 2711, 2721, 2708, 2710, 86, 2722, 2714, 2723, 2725, - 2724, 3252, 2726, 2712, 2715, 2731, 2732, 86, 86, 2727, - 2716, 2717, 2719, 2733, 2728, 86, 2734, 2729, 86, 86, - 86, 86, 2730, 86, 86, 86, 2725, 2724, 86, 2726, - 86, 86, 2731, 2732, 86, 2735, 2727, 86, 2736, 2738, - 86, 2728, 2737, 86, 2729, 2739, 2740, 2744, 2741, 2730, - - 2742, 2745, 86, 2746, 86, 2743, 2747, 2748, 3252, 3252, - 2752, 86, 86, 86, 86, 2736, 86, 2750, 86, 2737, - 2753, 2749, 2739, 2740, 2744, 2741, 86, 86, 2745, 2751, - 86, 86, 86, 86, 2748, 86, 86, 86, 2754, 2755, - 2756, 2757, 2760, 2758, 2750, 2759, 86, 2753, 2749, 2761, - 2762, 86, 86, 2765, 2763, 86, 2751, 86, 86, 2764, - 2768, 2769, 2766, 2772, 2767, 86, 2755, 86, 2757, 86, - 2758, 86, 2759, 86, 86, 2771, 86, 2762, 2773, 2775, - 2765, 86, 2770, 2777, 86, 2774, 86, 2768, 2778, 2766, - 86, 2767, 2776, 86, 86, 2785, 2781, 3252, 86, 3252, - - 86, 2783, 2771, 86, 86, 2773, 2775, 86, 86, 2770, - 2777, 2782, 2774, 3252, 86, 2778, 2779, 2780, 86, 2776, - 86, 2784, 86, 2781, 2786, 2787, 86, 2789, 2783, 2792, - 2793, 2790, 2796, 2788, 86, 2794, 2791, 86, 2782, 86, - 86, 2797, 2795, 2779, 2780, 2798, 3252, 2799, 2784, 86, - 86, 2786, 2787, 86, 2789, 86, 2792, 2800, 2790, 86, - 2788, 3252, 86, 2791, 2801, 2802, 3252, 86, 2797, 2795, - 2803, 86, 2798, 86, 2799, 86, 2806, 86, 2804, 86, - 2805, 2807, 2808, 86, 2800, 2810, 2809, 86, 86, 86, - 2811, 2801, 2802, 86, 2813, 2812, 2814, 2803, 86, 86, - - 2815, 2817, 2816, 2806, 86, 2804, 3252, 2805, 2807, 2808, - 3252, 2821, 86, 2809, 86, 2818, 86, 2811, 2819, 2820, - 86, 86, 2812, 2814, 86, 2822, 2823, 86, 86, 2816, - 2824, 2825, 2829, 86, 2826, 2832, 86, 86, 2821, 2827, - 2828, 2830, 2818, 86, 2833, 2819, 2820, 2831, 86, 86, - 86, 3252, 86, 2823, 86, 2838, 2836, 2824, 2825, 2829, - 2834, 2835, 86, 86, 86, 86, 86, 2828, 2830, 86, - 86, 86, 2837, 86, 2831, 2839, 2840, 86, 2841, 2842, - 2843, 2852, 2838, 2836, 3252, 86, 2844, 2834, 2835, 2853, - 86, 3252, 86, 2845, 86, 86, 2846, 3252, 2847, 2837, - - 2849, 2848, 2839, 2840, 2854, 2841, 2850, 2843, 86, 2851, - 2856, 86, 2855, 2844, 2859, 86, 86, 86, 86, 86, - 2845, 2857, 86, 2846, 86, 2847, 2862, 2849, 2848, 86, - 86, 86, 86, 2850, 2858, 2860, 2851, 2856, 2861, 2855, - 2863, 2865, 2866, 2864, 2868, 2867, 86, 86, 2857, 86, - 2869, 2870, 86, 86, 86, 3252, 86, 86, 86, 2871, - 86, 2858, 2860, 2872, 86, 2861, 2873, 2863, 2865, 2866, - 2864, 2874, 2867, 2875, 2879, 2876, 86, 2869, 86, 2877, - 2880, 86, 86, 3252, 3252, 86, 2871, 86, 86, 2878, - 2872, 86, 2882, 2873, 86, 2881, 86, 86, 2874, 2883, - - 2875, 86, 2876, 2884, 2885, 2886, 2877, 2880, 2891, 86, - 2888, 2887, 86, 2893, 86, 86, 2878, 86, 2889, 2882, - 2890, 86, 2881, 2894, 86, 2896, 2883, 86, 86, 2900, - 2884, 2885, 2886, 86, 2892, 86, 2901, 2888, 2887, 2905, - 86, 3252, 86, 2895, 2897, 2889, 2898, 2890, 2899, 86, - 86, 86, 86, 2902, 2903, 86, 2900, 86, 86, 86, - 86, 2892, 2908, 86, 2904, 86, 2905, 2909, 2907, 2906, - 2895, 2897, 86, 2898, 86, 2899, 86, 2910, 2911, 2912, - 2902, 2903, 86, 2913, 86, 2914, 2915, 2918, 2916, 86, - 2919, 2904, 2920, 86, 2909, 2907, 2906, 2921, 3252, 86, - - 86, 2925, 3252, 86, 2927, 2911, 2912, 2917, 86, 86, - 86, 2923, 86, 2915, 2918, 86, 2922, 2919, 2924, 2920, - 2926, 2928, 2930, 2931, 86, 86, 86, 3252, 86, 86, - 86, 2927, 2929, 2932, 2917, 2933, 86, 2934, 2923, 86, - 2939, 2935, 2936, 2922, 86, 2924, 86, 2926, 2928, 2937, - 86, 2942, 3252, 2938, 86, 2940, 2941, 86, 2943, 2929, - 2932, 86, 2947, 86, 2934, 86, 2944, 86, 2935, 86, - 2946, 86, 86, 86, 2950, 86, 2937, 2945, 86, 86, - 2938, 2951, 2940, 2941, 86, 2943, 2948, 2949, 2952, 86, - 2953, 2956, 86, 2944, 86, 2957, 2954, 2946, 2955, 2958, - - 2960, 2950, 2959, 86, 2945, 3252, 2961, 2962, 86, 86, - 86, 2963, 86, 2948, 2949, 86, 2964, 2953, 86, 86, - 86, 86, 86, 2954, 2967, 2955, 86, 2968, 86, 2959, - 2965, 2966, 86, 2961, 86, 86, 86, 2970, 2963, 2969, - 2972, 2971, 2973, 2964, 86, 2974, 2975, 2976, 2977, 2978, - 86, 2967, 86, 86, 86, 86, 2979, 2965, 2966, 86, - 2980, 2982, 2984, 2985, 2970, 2981, 2969, 86, 2971, 86, - 86, 2983, 2986, 2975, 2976, 2977, 86, 86, 86, 2989, - 3252, 86, 86, 86, 2987, 2990, 86, 2980, 2988, 2984, - 86, 86, 2981, 86, 86, 86, 2991, 2992, 2983, 2986, - - 86, 86, 2993, 3001, 3016, 3017, 2989, 2994, 2997, 2996, - 86, 2987, 2990, 2995, 86, 2988, 86, 86, 86, 86, - 86, 2998, 2999, 2991, 2992, 86, 3000, 3004, 3002, 2993, - 3001, 86, 86, 86, 2994, 2997, 2996, 3003, 3005, 3006, - 2995, 3007, 3008, 3009, 86, 3010, 86, 3252, 2998, 2999, - 86, 3011, 3014, 3000, 3012, 3002, 86, 3015, 3023, 86, - 86, 3018, 3019, 86, 3003, 3005, 3006, 3013, 3007, 3008, - 86, 3024, 86, 3022, 86, 86, 86, 3252, 3011, 86, - 86, 3012, 3020, 3021, 86, 86, 3025, 3028, 3026, 3029, - 86, 3030, 3031, 86, 3013, 86, 86, 3027, 3024, 86, - - 3022, 3035, 3032, 3033, 86, 3034, 3046, 3037, 3036, 86, - 86, 86, 86, 3025, 3028, 3026, 86, 86, 3030, 3031, - 3038, 86, 3039, 3041, 3027, 86, 86, 3040, 3035, 3032, - 3033, 3044, 3034, 86, 3037, 3036, 3045, 3042, 86, 86, - 3043, 3047, 3049, 86, 3048, 86, 3252, 86, 86, 86, - 3041, 3050, 3051, 3052, 3040, 86, 86, 3053, 3054, 3056, - 3055, 86, 3057, 86, 3042, 3058, 3059, 3043, 3047, 3049, - 3060, 3048, 3061, 86, 86, 3063, 3062, 3064, 3050, 3051, - 3052, 86, 3065, 3066, 86, 3067, 86, 3055, 86, 86, - 86, 3068, 86, 3059, 86, 3069, 3070, 86, 3071, 86, - - 3073, 3072, 86, 3062, 86, 3076, 3074, 3078, 3075, 86, - 86, 3079, 86, 86, 86, 86, 86, 3077, 86, 86, - 3080, 86, 86, 3070, 3081, 86, 86, 3073, 3072, 86, - 3082, 3083, 86, 3074, 3078, 3075, 86, 3084, 3079, 3086, - 86, 3085, 86, 3087, 3077, 3088, 86, 3080, 3089, 3090, - 3252, 3081, 86, 3252, 3093, 3091, 3096, 86, 3083, 3092, - 3094, 86, 86, 86, 3084, 86, 3086, 86, 3085, 86, - 3087, 86, 3088, 3095, 86, 3099, 3090, 86, 3097, 3100, - 86, 3093, 3091, 3096, 3098, 86, 3092, 3094, 3101, 3102, - 86, 3103, 3104, 86, 86, 3105, 86, 3106, 3110, 86, - - 3095, 3107, 3099, 3109, 3108, 3097, 3100, 86, 86, 3112, - 3111, 3098, 3114, 86, 86, 86, 86, 86, 86, 3104, - 86, 3113, 3105, 3252, 3106, 3110, 3115, 3116, 3107, 3121, - 3109, 3108, 86, 86, 86, 86, 3112, 3111, 86, 3114, - 86, 3117, 3122, 3119, 3118, 86, 3120, 86, 3113, 3127, - 86, 3129, 3124, 3115, 3116, 86, 3121, 86, 86, 3123, - 3125, 3126, 86, 3130, 3131, 86, 3132, 86, 3117, 3122, - 3119, 3118, 3133, 3120, 86, 3128, 3127, 3134, 86, 3124, - 3252, 86, 86, 86, 3137, 3138, 3123, 3125, 3126, 3135, - 3130, 86, 86, 3132, 3136, 3139, 3140, 86, 86, 86, - - 3142, 86, 3128, 3141, 86, 3252, 3143, 86, 86, 3144, - 3147, 3137, 3138, 3145, 3148, 86, 3135, 86, 3146, 86, - 3150, 3136, 3139, 3140, 86, 86, 3149, 3151, 86, 3154, - 3141, 3152, 86, 3143, 3155, 86, 3144, 86, 86, 3153, - 3145, 86, 3157, 86, 3156, 3146, 3158, 3150, 86, 3159, - 86, 3252, 3160, 3149, 86, 3163, 86, 3164, 3152, 3161, - 86, 3155, 3162, 86, 3165, 86, 3153, 3168, 3166, 3157, - 86, 3156, 3252, 86, 86, 3169, 3167, 86, 86, 3160, - 86, 86, 3163, 86, 86, 3170, 3161, 3171, 3172, 3162, - 3173, 86, 86, 3174, 3168, 3166, 86, 3175, 86, 3176, - - 3177, 3178, 3169, 3167, 86, 86, 3179, 86, 3181, 86, - 3180, 3182, 3170, 86, 3171, 3172, 86, 3173, 3183, 86, - 3174, 86, 86, 3184, 3175, 3185, 3176, 3177, 86, 3252, - 3190, 3186, 3187, 3179, 3188, 3181, 3189, 3180, 86, 3191, - 86, 3193, 3192, 3252, 86, 3183, 3199, 3194, 3252, 3195, - 3252, 86, 3185, 86, 86, 86, 86, 86, 3186, 3187, - 3196, 3188, 86, 3189, 86, 3197, 86, 3198, 86, 3192, - 86, 3200, 3201, 86, 3194, 86, 3195, 3202, 86, 86, - 86, 3203, 3204, 3206, 3211, 3205, 86, 3196, 3207, 3208, - 3252, 3210, 3197, 3209, 3198, 3214, 86, 86, 3200, 3201, - - 86, 3213, 86, 86, 3202, 86, 86, 86, 86, 3204, - 3206, 3211, 3205, 3212, 3218, 3207, 3208, 86, 3210, 3216, - 3209, 86, 3214, 3215, 3252, 3217, 3220, 86, 3213, 3219, - 3221, 86, 3222, 3223, 86, 3224, 86, 3252, 3230, 3227, - 3212, 3218, 3252, 3225, 3226, 86, 3216, 86, 3252, 86, - 3215, 86, 3217, 3220, 86, 3228, 3219, 86, 86, 3222, - 3223, 3229, 86, 86, 86, 86, 3227, 3231, 3232, 86, - 3225, 3226, 3234, 3235, 3233, 86, 3236, 86, 3237, 3238, - 86, 86, 3228, 3239, 3252, 3240, 3241, 86, 3229, 3242, - 86, 86, 3243, 3244, 3231, 3232, 86, 3245, 3250, 3234, - - 3235, 3233, 86, 3236, 3246, 86, 3238, 3247, 3251, 86, - 3239, 86, 3240, 86, 3248, 3249, 3242, 86, 3252, 86, - 86, 3252, 86, 86, 3245, 86, 86, 3252, 3252, 86, - 3252, 3246, 3252, 3252, 3247, 86, 3252, 3252, 3252, 3252, - 3252, 3248, 3249, 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, 3252, 89, 89, 89, 89, 158, - - 158, 3252, 3252, 3252, 158, 158, 160, 160, 3252, 3252, - 160, 3252, 160, 162, 3252, 3252, 3252, 3252, 3252, 162, - 165, 165, 3252, 3252, 3252, 165, 165, 167, 3252, 3252, - 3252, 3252, 3252, 167, 169, 169, 3252, 169, 169, 169, - 169, 172, 3252, 3252, 3252, 3252, 3252, 172, 175, 175, - 3252, 3252, 3252, 175, 175, 90, 90, 3252, 90, 90, - 90, 90, 17, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252 + 493, 86, 494, 86, 3291, 86, 513, 500, 86, 585, + 514, 491, 511, 501, 86, 515, 528, 502, 86, 499, + 526, 529, 86, 510, 492, 503, 3291, 493, 86, 494, + 512, 86, 86, 513, 500, 516, 86, 514, 532, 511, + 501, 86, 515, 518, 502, 527, 86, 526, 86, 533, + 3291, 517, 503, 504, 590, 505, 86, 512, 531, 86, + 530, 86, 516, 86, 168, 532, 534, 538, 506, 535, + 518, 507, 527, 508, 86, 509, 533, 86, 517, 86, + 504, 86, 505, 3291, 86, 531, 86, 530, 3291, 3291, + 540, 537, 86, 534, 538, 506, 535, 539, 507, 541, + + 508, 3291, 509, 519, 520, 542, 3291, 544, 3291, 546, + 86, 547, 545, 521, 86, 522, 523, 524, 537, 86, + 525, 86, 86, 543, 539, 548, 541, 86, 86, 550, + 519, 520, 542, 86, 544, 557, 546, 86, 547, 545, + 521, 551, 522, 523, 524, 552, 553, 525, 86, 555, + 543, 86, 548, 556, 560, 86, 550, 86, 561, 86, + 86, 86, 557, 562, 86, 558, 559, 3291, 551, 86, + 563, 564, 552, 553, 86, 3291, 555, 565, 566, 572, + 556, 560, 3291, 86, 568, 561, 569, 86, 571, 574, + 562, 573, 3291, 3291, 86, 567, 86, 563, 564, 575, + + 86, 570, 86, 86, 565, 566, 572, 86, 86, 86, + 576, 568, 586, 569, 86, 571, 574, 588, 573, 587, + 577, 591, 567, 86, 589, 594, 575, 86, 570, 592, + 86, 578, 593, 579, 603, 595, 596, 576, 86, 586, + 86, 86, 86, 86, 588, 597, 587, 577, 591, 86, + 86, 589, 594, 598, 599, 86, 592, 86, 578, 593, + 579, 580, 595, 596, 600, 601, 86, 86, 602, 581, + 582, 86, 597, 583, 584, 604, 606, 605, 3291, 86, + 598, 86, 86, 86, 607, 608, 86, 3291, 580, 86, + 613, 600, 601, 611, 86, 602, 581, 582, 86, 86, + + 583, 584, 604, 606, 605, 609, 86, 86, 86, 612, + 614, 607, 608, 610, 615, 3291, 86, 613, 617, 616, + 611, 618, 619, 620, 625, 86, 621, 3291, 623, 86, + 622, 86, 609, 86, 3291, 86, 612, 614, 86, 634, + 610, 615, 86, 86, 86, 617, 616, 86, 618, 619, + 620, 625, 86, 621, 86, 623, 624, 622, 626, 627, + 628, 629, 86, 630, 631, 632, 86, 633, 636, 3291, + 86, 86, 86, 86, 637, 86, 86, 635, 641, 639, + 86, 643, 640, 624, 638, 626, 627, 628, 629, 644, + 630, 631, 632, 86, 633, 86, 86, 86, 86, 642, + + 86, 637, 86, 645, 635, 641, 639, 646, 643, 640, + 86, 638, 86, 647, 649, 650, 653, 651, 3291, 652, + 655, 86, 86, 3291, 3291, 86, 642, 86, 654, 656, + 645, 86, 86, 715, 646, 670, 648, 86, 657, 86, + 658, 649, 650, 653, 651, 86, 652, 655, 86, 86, + 86, 86, 659, 3291, 668, 654, 656, 669, 86, 672, + 86, 86, 670, 648, 671, 657, 86, 658, 3291, 86, + 86, 3291, 86, 673, 3291, 677, 680, 676, 3291, 659, + 660, 668, 3291, 3291, 669, 661, 672, 662, 674, 86, + 3291, 671, 675, 663, 86, 664, 86, 86, 665, 666, + + 673, 681, 677, 680, 676, 667, 86, 660, 688, 683, + 86, 682, 661, 678, 662, 674, 679, 684, 685, 675, + 663, 86, 664, 686, 86, 665, 666, 86, 86, 689, + 687, 86, 667, 86, 86, 688, 683, 86, 682, 690, + 678, 691, 86, 679, 684, 685, 692, 693, 696, 695, + 686, 697, 694, 86, 86, 698, 689, 687, 3291, 86, + 86, 86, 701, 86, 700, 86, 690, 702, 691, 86, + 86, 699, 703, 692, 693, 696, 695, 716, 697, 694, + 86, 704, 698, 86, 706, 86, 709, 705, 707, 701, + 168, 700, 86, 708, 702, 86, 86, 712, 699, 86, + + 710, 86, 711, 713, 86, 86, 86, 714, 704, 86, + 717, 706, 718, 709, 705, 707, 86, 3291, 719, 720, + 708, 732, 86, 86, 712, 86, 86, 710, 721, 711, + 713, 723, 724, 86, 714, 722, 3291, 717, 733, 728, + 731, 86, 725, 86, 86, 719, 720, 86, 86, 726, + 86, 734, 727, 86, 86, 721, 86, 735, 723, 724, + 86, 736, 722, 729, 737, 86, 728, 731, 730, 725, + 738, 740, 741, 742, 744, 739, 726, 86, 3291, 727, + 3291, 743, 86, 86, 86, 745, 746, 86, 86, 747, + 748, 751, 750, 3291, 86, 86, 86, 86, 740, 741, + + 742, 744, 86, 86, 86, 752, 749, 754, 743, 753, + 86, 86, 745, 746, 86, 86, 747, 748, 86, 750, + 756, 758, 755, 86, 762, 757, 3291, 86, 86, 86, + 760, 759, 752, 749, 754, 86, 753, 86, 761, 763, + 3291, 86, 764, 3291, 770, 86, 86, 756, 758, 755, + 773, 777, 757, 86, 765, 86, 86, 760, 759, 766, + 774, 86, 767, 768, 769, 761, 763, 771, 772, 764, + 86, 770, 86, 86, 779, 775, 86, 773, 86, 86, + 776, 765, 86, 86, 782, 778, 766, 774, 86, 767, + 768, 769, 86, 780, 771, 772, 784, 783, 86, 785, + + 786, 779, 775, 86, 791, 787, 86, 776, 788, 86, + 86, 782, 778, 797, 789, 781, 86, 798, 86, 3291, + 780, 86, 86, 784, 783, 86, 785, 786, 792, 794, + 790, 86, 787, 795, 796, 788, 86, 86, 86, 793, + 86, 789, 781, 799, 798, 86, 86, 86, 802, 86, + 804, 86, 800, 801, 806, 792, 794, 790, 803, 86, + 795, 796, 807, 805, 808, 3291, 793, 86, 809, 812, + 799, 810, 86, 86, 813, 802, 86, 804, 811, 814, + 86, 86, 819, 815, 86, 803, 86, 828, 3291, 807, + 805, 820, 86, 86, 816, 809, 86, 86, 810, 86, + + 86, 86, 821, 822, 823, 811, 814, 824, 817, 818, + 815, 86, 825, 826, 86, 834, 86, 86, 820, 86, + 86, 816, 830, 829, 3291, 86, 833, 3291, 827, 821, + 822, 823, 86, 86, 824, 817, 818, 86, 86, 825, + 826, 831, 834, 835, 86, 843, 832, 837, 836, 830, + 829, 838, 86, 833, 839, 827, 86, 840, 842, 841, + 86, 845, 3291, 86, 844, 86, 86, 86, 86, 852, + 835, 846, 86, 86, 837, 836, 3291, 86, 838, 86, + 847, 839, 851, 86, 840, 842, 841, 86, 845, 849, + 848, 844, 86, 850, 86, 854, 855, 86, 846, 86, + + 853, 86, 857, 856, 86, 858, 865, 847, 86, 851, + 86, 86, 860, 86, 86, 859, 849, 848, 864, 86, + 850, 86, 854, 855, 866, 86, 86, 853, 863, 857, + 856, 867, 858, 865, 861, 862, 86, 870, 869, 860, + 86, 872, 859, 86, 868, 864, 86, 871, 873, 3291, + 86, 866, 875, 86, 86, 863, 876, 86, 867, 86, + 86, 861, 862, 86, 870, 869, 86, 877, 872, 874, + 878, 868, 881, 879, 871, 873, 86, 86, 882, 875, + 880, 86, 3291, 876, 888, 883, 885, 887, 884, 86, + 86, 886, 3291, 889, 877, 86, 874, 878, 86, 881, + + 879, 86, 86, 86, 86, 882, 86, 880, 86, 168, + 890, 888, 883, 885, 887, 884, 86, 891, 886, 892, + 889, 893, 894, 86, 895, 898, 3291, 3291, 86, 902, + 896, 86, 899, 901, 86, 86, 903, 890, 897, 904, + 900, 86, 908, 86, 891, 906, 892, 86, 893, 894, + 909, 86, 86, 905, 86, 907, 86, 896, 86, 899, + 901, 86, 86, 903, 86, 897, 904, 900, 86, 86, + 910, 912, 906, 86, 86, 911, 913, 909, 922, 921, + 905, 923, 907, 86, 86, 927, 3291, 3291, 86, 924, + 86, 86, 925, 935, 3291, 3291, 86, 910, 912, 86, + + 926, 3291, 911, 913, 914, 922, 921, 915, 923, 928, + 86, 916, 927, 86, 917, 933, 924, 929, 86, 925, + 930, 918, 919, 931, 920, 86, 932, 926, 86, 86, + 934, 914, 86, 943, 915, 86, 928, 86, 916, 86, + 946, 917, 933, 86, 929, 945, 86, 930, 918, 919, + 931, 920, 950, 932, 86, 86, 944, 934, 936, 937, + 943, 938, 86, 86, 939, 947, 948, 946, 86, 940, + 951, 953, 945, 86, 86, 941, 942, 954, 86, 950, + 957, 3291, 949, 944, 86, 936, 937, 952, 938, 86, + 955, 939, 947, 948, 958, 956, 940, 951, 953, 86, + + 86, 86, 941, 942, 954, 959, 960, 957, 961, 949, + 3291, 3291, 963, 965, 952, 962, 964, 86, 970, 966, + 86, 958, 86, 968, 969, 86, 967, 3291, 86, 980, + 972, 86, 959, 960, 86, 961, 86, 86, 86, 963, + 86, 86, 962, 964, 86, 970, 966, 86, 971, 86, + 968, 969, 973, 967, 974, 975, 86, 972, 976, 978, + 977, 86, 979, 982, 986, 3291, 86, 86, 86, 86, + 981, 983, 985, 987, 86, 971, 984, 989, 86, 973, + 988, 974, 975, 991, 86, 976, 978, 977, 990, 979, + 86, 993, 86, 994, 86, 992, 86, 981, 995, 985, + + 1000, 3291, 86, 86, 86, 86, 998, 988, 997, 86, + 991, 1001, 86, 999, 86, 990, 1003, 86, 86, 996, + 86, 86, 992, 1002, 1004, 995, 86, 86, 86, 86, + 86, 1005, 3291, 998, 1006, 997, 1007, 1009, 1001, 86, + 999, 1008, 86, 86, 86, 1011, 996, 1010, 1012, 1013, + 1002, 1014, 86, 86, 86, 1015, 86, 1016, 1005, 86, + 1019, 1006, 86, 1007, 1009, 86, 3291, 1020, 1008, 86, + 86, 86, 1011, 86, 1010, 1012, 1013, 1022, 1014, 86, + 1017, 1021, 1015, 1027, 1016, 1018, 86, 1019, 1023, 86, + 1024, 86, 3291, 1026, 1020, 86, 1028, 1029, 1025, 1030, + + 1031, 3291, 86, 3291, 1022, 86, 1032, 86, 1021, 1037, + 86, 1033, 86, 86, 86, 1023, 86, 1024, 86, 86, + 1026, 1034, 1035, 1028, 1029, 1025, 1030, 1031, 86, 1039, + 1036, 1040, 86, 1032, 86, 1038, 1037, 86, 1033, 1042, + 86, 1041, 1043, 1045, 86, 1044, 3291, 1046, 1034, 1035, + 86, 1047, 1048, 1050, 86, 1057, 1039, 1036, 86, 86, + 86, 1058, 1038, 86, 86, 1052, 1042, 1060, 1041, 1043, + 1045, 86, 1044, 86, 1046, 1049, 1051, 1063, 1047, 86, + 1050, 1053, 86, 86, 86, 1054, 1055, 86, 86, 1056, + 86, 1059, 1052, 86, 86, 1064, 86, 1061, 1062, 86, + + 1072, 1069, 1049, 1051, 86, 86, 1065, 1066, 1053, 86, + 86, 1067, 1054, 1055, 1070, 86, 1056, 1071, 1059, 1068, + 86, 1073, 1074, 86, 1061, 1062, 86, 86, 1069, 86, + 1076, 86, 86, 1065, 1066, 3291, 1075, 1078, 1067, 1080, + 1077, 1070, 1079, 86, 1071, 86, 1068, 86, 1073, 1074, + 86, 86, 1081, 1083, 1084, 3291, 1085, 1082, 1128, 3291, + 3291, 86, 86, 1075, 86, 86, 1080, 1077, 1086, 1079, + 1088, 1087, 1090, 86, 1092, 86, 1091, 86, 86, 1089, + 1083, 1084, 86, 1085, 168, 1094, 1093, 86, 86, 86, + 86, 86, 86, 86, 1102, 1086, 1103, 1088, 1087, 1090, + + 3291, 1092, 1101, 1091, 1104, 3291, 1089, 1105, 86, 86, + 1106, 3291, 1094, 1093, 1095, 3291, 1096, 86, 1107, 3291, + 1097, 1102, 1098, 1103, 1109, 3291, 1108, 1099, 86, 1101, + 86, 86, 1100, 86, 1105, 1110, 3291, 1106, 86, 86, + 1113, 1095, 1125, 1096, 1114, 1107, 86, 1097, 86, 1098, + 1111, 1109, 1115, 1108, 1099, 1112, 1117, 86, 86, 1100, + 86, 1120, 1110, 1118, 1116, 1121, 1129, 1113, 86, 1125, + 1130, 1114, 1123, 1119, 1126, 86, 86, 1132, 86, 1115, + 1122, 1124, 86, 1117, 1127, 86, 1160, 86, 1120, 1154, + 1118, 1116, 1121, 86, 86, 86, 1134, 86, 86, 1123, + + 1119, 1126, 1143, 1135, 86, 1133, 86, 1122, 1124, 86, + 86, 1127, 86, 86, 1144, 1145, 1146, 86, 1147, 3291, + 1149, 86, 1150, 1134, 3291, 3291, 1148, 3291, 86, 1143, + 1135, 86, 1133, 1136, 3291, 86, 86, 3291, 1137, 86, + 1138, 1144, 1145, 1146, 86, 1147, 1139, 1149, 86, 1150, + 1153, 1140, 1141, 1148, 1151, 1152, 1156, 1157, 1142, 86, + 1136, 86, 86, 86, 1155, 1137, 86, 1138, 1163, 1158, + 3291, 86, 1161, 1139, 1164, 1168, 1167, 1153, 1140, 1141, + 86, 1151, 1152, 1156, 1157, 1142, 86, 1162, 1159, 1166, + 86, 1155, 3291, 1174, 86, 86, 1158, 86, 86, 1161, + + 86, 1164, 1165, 1167, 1169, 1170, 1171, 86, 1173, 1172, + 86, 86, 1175, 86, 1162, 1159, 1166, 3291, 1177, 86, + 1176, 3291, 1186, 1199, 86, 86, 86, 86, 86, 1165, + 86, 1169, 1170, 1171, 1178, 1173, 1172, 1179, 1181, 1175, + 86, 86, 1180, 1188, 1182, 1177, 1184, 1176, 1183, 86, + 86, 1190, 1187, 86, 86, 86, 86, 3291, 1185, 86, + 1193, 1178, 86, 86, 1179, 1181, 86, 86, 86, 1180, + 1188, 1182, 86, 1184, 1189, 1183, 1191, 1192, 1190, 1187, + 1194, 86, 1197, 1195, 1196, 1185, 86, 1193, 1198, 86, + 1202, 1208, 3291, 1206, 1200, 1203, 1213, 3291, 86, 1215, + + 86, 1189, 86, 1191, 1192, 86, 86, 1194, 86, 1197, + 1195, 1196, 1201, 1207, 86, 1198, 1204, 86, 1208, 1205, + 1206, 1200, 86, 86, 1209, 1210, 86, 1211, 86, 1214, + 3291, 86, 1212, 1216, 86, 86, 86, 1218, 1219, 1201, + 1207, 86, 86, 1204, 86, 86, 1205, 1217, 1221, 1220, + 86, 1209, 1210, 3291, 1211, 86, 1214, 1222, 1224, 1212, + 1216, 1223, 86, 1226, 1218, 1219, 1227, 1225, 1230, 86, + 86, 1228, 86, 3291, 1217, 1221, 1220, 1231, 86, 86, + 86, 1229, 86, 1232, 1222, 1224, 1233, 86, 1223, 86, + 1226, 1234, 1239, 1227, 1225, 86, 1235, 1236, 1228, 1237, + + 86, 86, 86, 1240, 86, 1238, 86, 86, 1229, 1241, + 1232, 1242, 86, 1233, 1246, 86, 86, 86, 1234, 1239, + 1243, 1249, 86, 1235, 1236, 1247, 1237, 1244, 1245, 1248, + 1240, 1251, 1238, 1252, 86, 1250, 86, 1256, 3291, 1254, + 3291, 86, 86, 86, 1257, 1253, 86, 1243, 86, 86, + 86, 86, 1247, 86, 1244, 1245, 1248, 86, 86, 1255, + 1252, 86, 1250, 86, 1256, 1258, 1254, 86, 86, 1259, + 1260, 1257, 1253, 1261, 1262, 1263, 1264, 1265, 3291, 86, + 3291, 86, 86, 1266, 1267, 1268, 1255, 1270, 86, 86, + 1269, 86, 1258, 86, 1277, 1273, 1259, 1260, 3291, 3291, + + 1261, 1262, 86, 86, 1265, 86, 1272, 86, 86, 1282, + 1266, 86, 1268, 86, 1270, 86, 1274, 1269, 1275, 1276, + 86, 86, 1273, 1278, 86, 1279, 1281, 86, 1280, 1283, + 168, 86, 1284, 1272, 1286, 1285, 1282, 1287, 86, 3291, + 86, 86, 86, 1274, 1292, 1275, 1276, 86, 1289, 1288, + 1278, 1291, 1279, 1281, 1290, 1280, 1283, 86, 1294, 86, + 86, 1293, 1285, 1297, 1296, 1295, 86, 3291, 1356, 86, + 86, 1292, 86, 86, 86, 1289, 1288, 86, 1291, 86, + 86, 1290, 1298, 86, 1300, 1294, 1301, 1299, 1293, 1302, + 1297, 1296, 1295, 1303, 86, 86, 1304, 1305, 86, 86, + + 86, 1313, 3291, 1310, 86, 86, 3291, 1311, 1315, 1298, + 3291, 86, 3291, 1301, 1299, 1312, 1302, 86, 1306, 1314, + 1303, 86, 3291, 1304, 1305, 1316, 86, 1307, 86, 1308, + 1310, 1320, 1309, 86, 1311, 1315, 1317, 86, 1318, 86, + 86, 3291, 1312, 1319, 86, 1306, 1314, 86, 3291, 86, + 1323, 1322, 1316, 86, 1307, 1325, 1308, 1327, 1320, 1309, + 1321, 86, 1324, 1317, 1328, 1318, 86, 1332, 86, 3291, + 1319, 86, 86, 1326, 1329, 86, 1330, 1323, 1322, 1333, + 1331, 86, 1325, 86, 86, 3291, 86, 1321, 3291, 1324, + 86, 1328, 1334, 1335, 1332, 1337, 86, 86, 1339, 1338, + + 1326, 1329, 86, 1330, 86, 86, 1333, 1331, 1336, 1340, + 86, 86, 1344, 1341, 3291, 1345, 86, 1342, 86, 1334, + 1335, 86, 1337, 86, 86, 1339, 1338, 86, 1343, 1348, + 3291, 1346, 3291, 86, 1347, 1336, 1340, 86, 86, 1344, + 1341, 86, 1345, 1350, 1342, 1349, 1352, 86, 1351, 3291, + 1353, 86, 86, 1354, 86, 1343, 1348, 86, 1346, 1355, + 1359, 1347, 1357, 86, 1360, 86, 86, 1361, 1358, 1363, + 1350, 86, 1349, 1352, 86, 1351, 1362, 1353, 86, 86, + 1354, 86, 1366, 1364, 86, 1368, 1355, 1359, 1365, 1357, + 86, 1360, 1367, 1377, 1361, 1358, 1363, 1369, 86, 86, + + 1378, 3291, 1379, 1362, 1380, 86, 1383, 86, 3291, 1366, + 3291, 3291, 1368, 1381, 1384, 86, 1408, 1409, 86, 1367, + 1377, 1382, 1385, 86, 1369, 1370, 3291, 1378, 1386, 1371, + 86, 1380, 1372, 1373, 86, 86, 86, 1374, 86, 86, + 1381, 1384, 1388, 1375, 86, 86, 1391, 1376, 1382, 1385, + 1395, 86, 1370, 86, 86, 1386, 1371, 1387, 1393, 1372, + 1373, 3291, 3291, 86, 1374, 1389, 1392, 1390, 86, 1388, + 1375, 1394, 86, 1391, 1376, 86, 86, 1395, 86, 1397, + 1398, 1399, 1396, 1400, 1387, 1393, 3291, 3291, 86, 86, + 1407, 1401, 1389, 1392, 1390, 86, 3291, 3291, 1394, 3291, + + 1411, 3291, 1413, 1415, 1410, 86, 1397, 1414, 1416, 1396, + 1400, 86, 86, 86, 86, 1425, 86, 1407, 1401, 1402, + 86, 1412, 1417, 86, 1403, 86, 1404, 1411, 1405, 1413, + 1406, 1410, 1419, 86, 1414, 86, 1418, 86, 1421, 1420, + 86, 86, 1422, 3291, 1426, 1424, 1402, 86, 1412, 1417, + 86, 1403, 86, 1404, 86, 1405, 86, 1406, 86, 1419, + 1423, 1427, 1428, 1418, 1429, 1421, 1420, 1431, 86, 1422, + 86, 1426, 1424, 1432, 1433, 86, 86, 1430, 1435, 1437, + 86, 1434, 86, 1436, 1438, 86, 86, 1423, 1427, 1428, + 86, 1429, 1439, 1440, 1431, 86, 1442, 1443, 3291, 1441, + + 1432, 1433, 1445, 86, 1430, 86, 86, 86, 1434, 86, + 1436, 1438, 1446, 1447, 86, 86, 86, 1450, 1444, 1439, + 1440, 1448, 1449, 1442, 86, 86, 1441, 86, 86, 86, + 1451, 1452, 1454, 1455, 1453, 86, 3291, 86, 86, 1446, + 1447, 86, 1456, 1457, 86, 1444, 1460, 1458, 1448, 1449, + 1459, 86, 86, 1461, 86, 86, 1462, 1451, 1452, 1454, + 1455, 1453, 86, 1463, 1464, 1465, 86, 86, 86, 1456, + 1457, 86, 1466, 1460, 1458, 1467, 1468, 1459, 86, 1469, + 1461, 1472, 86, 1462, 1470, 1473, 86, 1471, 86, 86, + 1463, 1464, 1465, 1474, 86, 86, 1475, 1476, 86, 1466, + + 1479, 86, 1467, 1468, 1477, 86, 1469, 86, 1472, 1480, + 1485, 1470, 1478, 1486, 1471, 1488, 86, 86, 86, 1481, + 86, 1482, 86, 1475, 3291, 86, 86, 1479, 1483, 86, + 1484, 1477, 1487, 168, 86, 86, 86, 1489, 3291, 1478, + 3291, 1494, 86, 1490, 1491, 86, 1481, 86, 1482, 1492, + 86, 86, 1493, 86, 86, 1483, 86, 1484, 1496, 1487, + 1495, 1498, 1501, 86, 1489, 1497, 1499, 86, 1494, 86, + 1490, 1491, 86, 1500, 1502, 86, 1492, 1503, 86, 1493, + 1508, 1505, 1504, 1509, 86, 1496, 1506, 1495, 1498, 86, + 86, 3291, 1497, 1499, 1507, 86, 1511, 1519, 86, 86, + + 1500, 1502, 86, 86, 1503, 1510, 3291, 1508, 86, 1504, + 1509, 1514, 1512, 86, 1515, 1513, 1516, 3291, 86, 1517, + 1521, 1507, 1518, 1511, 86, 1520, 1522, 1525, 86, 86, + 3291, 1523, 1510, 86, 86, 86, 86, 1524, 1514, 1512, + 1527, 1515, 1513, 1516, 86, 86, 1517, 1521, 86, 1518, + 1526, 1528, 1520, 1530, 1525, 1540, 1529, 1531, 86, 86, + 86, 1532, 86, 1533, 1524, 86, 1534, 1527, 86, 1536, + 3291, 1537, 1535, 86, 1544, 86, 86, 1526, 1528, 86, + 1530, 86, 1538, 1529, 1531, 1541, 86, 86, 1532, 1539, + 1533, 86, 1543, 1534, 86, 86, 1536, 86, 1537, 1535, + + 86, 1544, 1542, 1545, 1547, 86, 1546, 1548, 3291, 1538, + 86, 1550, 1541, 1549, 86, 86, 1539, 1552, 1551, 1543, + 86, 1554, 1557, 1558, 1556, 1553, 86, 86, 3291, 1542, + 1545, 1547, 1565, 1546, 1548, 86, 86, 86, 1550, 86, + 1549, 1560, 1555, 86, 1552, 1551, 1559, 1566, 1554, 86, + 86, 1556, 1553, 1561, 86, 86, 1562, 1563, 1567, 86, + 1564, 3291, 1568, 86, 86, 1569, 1570, 86, 86, 1555, + 1574, 1571, 1573, 1559, 86, 1578, 3291, 1572, 3291, 86, + 1561, 86, 86, 1562, 1563, 86, 1577, 1564, 86, 1568, + 86, 86, 1569, 86, 86, 86, 1575, 1574, 1571, 1573, + + 1576, 86, 1578, 1579, 1572, 1580, 86, 1581, 1582, 86, + 86, 1583, 86, 1577, 1589, 1584, 1597, 1586, 1588, 86, + 1585, 86, 1587, 1575, 86, 86, 1592, 1576, 1590, 86, + 1579, 1591, 1580, 1600, 1581, 1582, 86, 1593, 1583, 86, + 86, 1589, 1594, 1596, 86, 1588, 1598, 86, 86, 86, + 86, 1602, 86, 1592, 1595, 1590, 1599, 86, 1591, 86, + 1603, 86, 1611, 1601, 1593, 86, 1604, 1605, 86, 1594, + 1596, 86, 86, 1598, 86, 86, 1606, 1607, 1602, 1610, + 1609, 1595, 1608, 1599, 86, 86, 86, 1612, 86, 1611, + 1601, 86, 86, 1604, 1605, 86, 1614, 1613, 1615, 1616, + + 1619, 3291, 1618, 1606, 1607, 1617, 1610, 1609, 1620, 1608, + 1624, 86, 86, 1621, 1612, 3291, 86, 1622, 86, 86, + 1625, 86, 86, 86, 1613, 86, 1616, 1619, 86, 1618, + 1623, 1626, 1617, 1629, 1627, 1620, 1631, 1624, 86, 1628, + 1621, 86, 86, 86, 1622, 1630, 1635, 1625, 1633, 1634, + 86, 1632, 1637, 1640, 1636, 1638, 1641, 1623, 1626, 86, + 86, 1627, 86, 86, 86, 1642, 1628, 86, 86, 86, + 1645, 86, 1630, 1635, 86, 1633, 1634, 86, 1632, 1637, + 1639, 1636, 1638, 86, 1643, 86, 1644, 86, 1646, 1648, + 86, 1647, 1642, 3291, 1650, 1649, 86, 1645, 86, 1651, + + 1653, 1652, 1654, 3291, 1656, 1655, 3291, 1639, 86, 86, + 86, 1643, 86, 1644, 1660, 3291, 86, 1662, 1647, 86, + 86, 86, 1649, 86, 86, 1657, 1651, 1653, 1652, 1654, + 86, 1656, 1655, 1658, 1659, 1661, 86, 86, 1663, 86, + 1664, 1660, 86, 86, 1662, 1665, 1669, 1667, 86, 86, + 1668, 1666, 1657, 86, 86, 1670, 86, 86, 1671, 86, + 1658, 1659, 1661, 1672, 86, 1663, 1673, 1664, 1674, 3291, + 1676, 1678, 1665, 1669, 1667, 86, 86, 1668, 1666, 1675, + 86, 1679, 1670, 1677, 1680, 1671, 86, 86, 86, 3291, + 1672, 86, 86, 86, 1681, 1674, 86, 1676, 1678, 1682, + + 1684, 1683, 1685, 1689, 86, 86, 1675, 1688, 1679, 86, + 1677, 1680, 168, 1690, 1691, 86, 86, 1686, 1687, 1694, + 86, 1681, 3291, 3291, 1692, 86, 86, 1684, 1683, 1685, + 1689, 86, 1695, 1696, 1688, 1693, 86, 1700, 1698, 86, + 1690, 1691, 86, 3291, 1686, 1687, 86, 1697, 1699, 1701, + 86, 1692, 1702, 1703, 86, 86, 86, 3291, 1704, 1695, + 1696, 1706, 1693, 86, 1705, 1698, 86, 1707, 1708, 86, + 86, 86, 86, 1709, 1697, 1699, 1701, 1710, 1712, 1711, + 1703, 1713, 86, 1714, 86, 86, 1715, 86, 1706, 86, + 1718, 1705, 86, 86, 1707, 1708, 1726, 86, 1723, 86, + + 1709, 1717, 1716, 86, 1710, 1712, 1711, 86, 1713, 1722, + 1714, 86, 86, 1715, 86, 1719, 86, 1718, 1720, 1724, + 86, 1730, 1727, 1726, 1728, 1723, 86, 1731, 1717, 1716, + 1721, 1729, 1732, 1736, 1733, 1725, 3291, 3291, 1743, 86, + 1734, 86, 1719, 86, 86, 1720, 1724, 1735, 86, 1727, + 1737, 1728, 1742, 1744, 1738, 86, 86, 1721, 1729, 86, + 1739, 1733, 1725, 1740, 86, 86, 86, 1734, 86, 86, + 86, 86, 86, 86, 1735, 1741, 86, 1737, 1745, 1742, + 1746, 1738, 86, 1749, 1747, 86, 1748, 1739, 86, 1751, + 1740, 1754, 1750, 1755, 1752, 3291, 1753, 3291, 86, 3291, + + 86, 86, 1741, 86, 86, 1745, 86, 1759, 86, 1756, + 86, 1747, 86, 1748, 86, 1757, 1751, 1762, 1754, 1750, + 1755, 1752, 86, 1753, 86, 1758, 1760, 86, 1763, 1761, + 86, 1764, 86, 1765, 1759, 1771, 1756, 86, 3291, 1766, + 1768, 1769, 1757, 86, 1762, 86, 86, 86, 1767, 3291, + 1773, 86, 1758, 1760, 86, 1763, 1761, 1770, 1764, 86, + 1775, 1774, 86, 86, 1772, 86, 1766, 1768, 1769, 1776, + 1777, 86, 86, 1781, 1780, 1767, 86, 1773, 1782, 1778, + 1779, 86, 86, 86, 1770, 86, 86, 1775, 1774, 86, + 1783, 1772, 86, 1784, 1789, 1790, 1776, 1777, 86, 1785, + + 1781, 1780, 1791, 1795, 1786, 1782, 1778, 1779, 86, 1787, + 86, 1788, 1792, 86, 1793, 3291, 86, 1783, 86, 1794, + 1784, 1789, 86, 86, 1797, 1798, 1785, 86, 1796, 86, + 86, 1786, 86, 1801, 1799, 1802, 1787, 1800, 1788, 1792, + 1803, 1793, 86, 86, 86, 86, 1794, 86, 86, 1808, + 1806, 1797, 1798, 86, 1804, 1796, 86, 1805, 1807, 1809, + 1801, 1799, 1802, 3291, 1800, 1810, 86, 1803, 86, 1811, + 1812, 1813, 86, 1814, 3291, 1817, 86, 1806, 86, 86, + 1816, 1804, 86, 86, 1805, 1815, 1809, 86, 86, 86, + 86, 1819, 1810, 1818, 1820, 1825, 1811, 1812, 1813, 1821, + + 1814, 86, 1817, 3291, 86, 1823, 1826, 1816, 1824, 86, + 1828, 3291, 1815, 1822, 1831, 86, 86, 86, 1819, 86, + 1818, 1820, 1825, 86, 1827, 86, 1821, 86, 1834, 1829, + 86, 1832, 1823, 1826, 1830, 1824, 1835, 1828, 1836, 1833, + 1822, 1831, 1837, 86, 86, 1838, 1840, 86, 1839, 1842, + 86, 1827, 1841, 1844, 1843, 1834, 86, 1845, 1832, 1848, + 3291, 86, 3291, 1849, 3291, 1836, 1833, 86, 86, 86, + 86, 86, 1858, 86, 1846, 1839, 1842, 86, 86, 1841, + 1847, 1843, 86, 1852, 1845, 86, 1850, 1851, 1853, 1854, + 1849, 86, 1856, 1859, 86, 86, 1857, 1855, 86, 86, + + 1860, 1846, 86, 86, 1861, 86, 86, 1847, 1862, 86, + 1852, 86, 1863, 1850, 1851, 1853, 1854, 1865, 1864, 1856, + 1859, 1866, 86, 1857, 1855, 86, 86, 1867, 1868, 86, + 1869, 1873, 86, 1870, 1872, 1862, 86, 3291, 86, 86, + 1871, 1875, 86, 86, 1865, 1864, 1874, 1876, 1866, 1877, + 1878, 86, 1879, 86, 86, 1868, 1883, 1887, 86, 1880, + 1870, 1872, 86, 86, 86, 1881, 1882, 1871, 1875, 86, + 86, 86, 86, 1874, 1876, 1885, 1877, 1878, 86, 1879, + 168, 1884, 1890, 86, 86, 1888, 1880, 1886, 1891, 86, + 86, 1889, 1881, 1882, 1893, 86, 1892, 86, 86, 1894, + + 3291, 86, 1885, 86, 86, 1895, 1897, 1896, 1884, 1890, + 1898, 86, 1888, 1900, 1886, 1891, 86, 1899, 1889, 3291, + 86, 1893, 1903, 1892, 1901, 1902, 1904, 86, 3291, 1908, + 1905, 86, 1895, 1897, 1896, 1906, 86, 86, 3291, 1907, + 86, 86, 1909, 86, 1899, 86, 86, 86, 1912, 1910, + 1911, 1901, 1902, 86, 86, 1914, 1908, 1905, 86, 86, + 86, 1913, 1906, 86, 1915, 1917, 1907, 1920, 1916, 1909, + 86, 1918, 1925, 86, 86, 1912, 1910, 1911, 1921, 86, + 86, 1923, 1914, 86, 1919, 1922, 1926, 86, 1913, 86, + 1924, 1915, 1917, 3291, 1920, 1916, 1928, 1936, 1918, 86, + + 86, 1927, 86, 86, 86, 1921, 1929, 86, 1923, 1930, + 1932, 1919, 1922, 1935, 86, 1931, 1937, 1924, 86, 1933, + 86, 1934, 86, 1928, 86, 1939, 1943, 1938, 1927, 1940, + 1945, 1947, 86, 1929, 86, 86, 1930, 1932, 1941, 86, + 1935, 1942, 1931, 86, 86, 3291, 1933, 86, 1934, 1944, + 1946, 1948, 86, 86, 1938, 86, 1940, 1949, 1951, 1950, + 86, 86, 86, 86, 1952, 1941, 1953, 1955, 1942, 1956, + 1954, 1961, 86, 86, 86, 3291, 1944, 1946, 1948, 1958, + 1960, 86, 86, 1959, 1957, 1951, 1950, 3291, 1966, 86, + 86, 86, 86, 1953, 86, 86, 1956, 1954, 1962, 1963, + + 1964, 86, 86, 86, 1969, 1965, 1958, 1960, 1967, 86, + 1959, 1957, 1968, 86, 1970, 1966, 1973, 86, 1971, 86, + 1975, 86, 1974, 1972, 1976, 1962, 1963, 1964, 1978, 86, + 1977, 1980, 1965, 3291, 86, 1967, 86, 1979, 86, 1968, + 86, 1970, 86, 1973, 1982, 86, 1981, 1975, 1984, 1974, + 86, 1976, 86, 1983, 86, 86, 1985, 1977, 1980, 1987, + 86, 1986, 1988, 86, 1979, 1989, 86, 1990, 1991, 1992, + 86, 86, 86, 1981, 86, 1984, 1994, 1995, 1996, 1993, + 1983, 1998, 86, 1985, 1997, 86, 1987, 86, 1986, 86, + 86, 2006, 1989, 86, 86, 1991, 1992, 86, 1999, 2000, + + 2001, 86, 2002, 1994, 2004, 86, 1993, 2007, 1998, 86, + 2005, 1997, 2003, 86, 86, 86, 2008, 86, 86, 2009, + 2010, 2011, 2012, 86, 3291, 1999, 2000, 2001, 86, 2002, + 2015, 2004, 86, 2014, 2007, 2013, 86, 2005, 86, 2003, + 86, 2016, 2017, 2008, 86, 2018, 2019, 86, 86, 2012, + 2020, 86, 86, 86, 86, 2021, 86, 2015, 2022, 2025, + 2014, 2029, 2013, 3291, 2023, 2028, 86, 2024, 2016, 2017, + 86, 86, 2018, 2019, 2027, 2026, 86, 2020, 2030, 86, + 2034, 86, 86, 86, 2032, 2031, 2025, 86, 2029, 2033, + 86, 2023, 2028, 86, 2024, 2036, 86, 86, 2035, 2037, + + 2038, 2027, 2026, 86, 2039, 86, 2041, 2034, 2042, 2040, + 2044, 2032, 2031, 86, 86, 2043, 2033, 2045, 86, 86, + 86, 2048, 2036, 86, 2050, 2035, 86, 2038, 86, 2051, + 2054, 2039, 2052, 86, 2046, 2042, 2040, 2044, 2047, 86, + 2049, 86, 2043, 2053, 2045, 86, 86, 2057, 86, 2058, + 2059, 2050, 86, 86, 86, 2055, 86, 2054, 86, 2052, + 2056, 2046, 2062, 2060, 2063, 2047, 86, 2049, 2061, 2067, + 2053, 86, 2064, 86, 2057, 2065, 86, 86, 2066, 2071, + 2069, 86, 2055, 2068, 2072, 2070, 2073, 2056, 2074, 3291, + 3291, 86, 2075, 86, 86, 86, 86, 86, 86, 2064, + + 86, 86, 2065, 86, 2079, 2066, 2071, 2069, 2076, 2077, + 2068, 2081, 2070, 2073, 168, 2080, 86, 2078, 2082, 2075, + 86, 2083, 2084, 86, 86, 86, 86, 2085, 2087, 86, + 2086, 2079, 3291, 2088, 2089, 2076, 2077, 86, 2081, 86, + 2090, 2091, 2080, 2092, 2078, 86, 2093, 2096, 86, 2084, + 86, 86, 86, 2097, 86, 2087, 2094, 2086, 86, 86, + 2088, 2089, 86, 2095, 2098, 86, 2099, 2090, 2091, 86, + 2092, 86, 86, 2093, 2096, 2100, 2101, 2102, 86, 2103, + 86, 2104, 86, 2094, 2106, 2105, 86, 2107, 86, 2109, + 2095, 2098, 86, 2099, 86, 2108, 2110, 86, 2111, 86, + + 86, 3291, 2100, 2101, 86, 86, 2103, 2113, 2104, 2112, + 86, 2106, 2105, 2114, 2107, 2117, 86, 86, 86, 2116, + 86, 86, 2108, 2110, 2115, 2111, 2119, 2120, 86, 2121, + 2118, 2125, 2122, 86, 2113, 2124, 2112, 86, 86, 86, + 2114, 2123, 2117, 2126, 86, 86, 2116, 2131, 2129, 86, + 2127, 2115, 86, 2119, 2120, 2128, 2121, 2118, 86, 2122, + 86, 86, 2124, 86, 2132, 2130, 86, 86, 2123, 2133, + 2126, 2135, 2134, 3291, 86, 2129, 2137, 2127, 86, 86, + 2138, 2136, 2128, 2139, 2140, 2141, 2145, 86, 2143, 2142, + 3291, 2132, 2130, 86, 2144, 86, 2133, 86, 86, 2134, + + 86, 86, 2146, 86, 2148, 86, 86, 2138, 2136, 86, + 2139, 2140, 86, 2145, 2150, 2143, 2142, 86, 2147, 86, + 86, 2144, 2149, 2151, 86, 2156, 86, 2152, 86, 2146, + 2153, 2148, 86, 2158, 2154, 2157, 2159, 86, 86, 86, + 2162, 2150, 86, 2163, 2160, 2147, 2165, 2155, 86, 2149, + 2151, 2161, 2156, 86, 2152, 86, 2166, 2153, 86, 2164, + 2158, 2154, 2157, 86, 86, 86, 86, 2162, 86, 2168, + 2163, 2160, 2169, 2165, 2155, 2167, 2170, 2172, 2161, 2171, + 2174, 86, 2173, 2166, 86, 2175, 2164, 3291, 86, 2176, + 2178, 86, 86, 86, 86, 86, 2168, 86, 2177, 2169, + + 2179, 86, 2167, 2170, 2172, 86, 2171, 2174, 2180, 2173, + 2182, 86, 2175, 2181, 86, 2184, 2176, 86, 2186, 2183, + 2188, 2185, 2187, 2196, 86, 2177, 2189, 2179, 86, 3291, + 86, 2190, 86, 2192, 86, 2180, 2193, 2182, 86, 86, + 2181, 86, 2184, 2191, 86, 86, 2183, 2188, 2185, 2187, + 86, 2197, 2194, 2189, 2195, 86, 86, 2198, 2190, 2199, + 86, 86, 86, 2193, 86, 2202, 2200, 3291, 86, 2204, + 2191, 2205, 2203, 86, 2201, 3291, 2206, 2212, 2197, 2194, + 2207, 2195, 86, 86, 2198, 86, 2199, 86, 2211, 3291, + 2218, 2208, 86, 2200, 86, 86, 2204, 86, 2205, 2203, + + 86, 2201, 86, 2206, 2212, 2209, 2213, 2207, 2210, 2215, + 2216, 2214, 86, 86, 2217, 2211, 2220, 2218, 2208, 2221, + 2219, 2222, 2223, 86, 2224, 86, 86, 86, 2243, 86, + 86, 2225, 2209, 86, 2226, 2210, 2215, 2216, 86, 86, + 86, 2217, 86, 2220, 2227, 86, 2221, 2219, 2222, 86, + 2228, 2224, 2229, 2230, 2232, 86, 2231, 86, 2225, 3291, + 2233, 2226, 86, 86, 2237, 2235, 2234, 86, 86, 2238, + 2241, 2227, 86, 86, 2245, 2253, 86, 2228, 2236, 2229, + 2230, 2232, 86, 2231, 86, 86, 86, 2233, 2239, 2240, + 2242, 2237, 2235, 2234, 2244, 2246, 2238, 2241, 86, 3291, + + 86, 86, 2247, 86, 2248, 2236, 2249, 86, 86, 2250, + 2254, 2255, 86, 2251, 168, 2239, 2240, 2242, 2252, 2258, + 86, 2244, 2246, 2257, 2256, 86, 86, 2259, 3291, 2247, + 86, 2248, 2263, 2249, 2264, 86, 2250, 2262, 2255, 2266, + 2267, 2260, 86, 86, 3291, 86, 86, 2265, 86, 2268, + 2257, 2256, 2261, 86, 2259, 86, 2269, 2270, 2271, 86, + 86, 2264, 86, 2272, 2262, 2273, 2266, 2275, 2260, 2278, + 2274, 86, 86, 2277, 2265, 86, 2268, 86, 2283, 2261, + 86, 2281, 86, 2269, 86, 2271, 2276, 2280, 86, 86, + 86, 86, 2273, 86, 2275, 86, 2278, 2274, 2279, 86, + + 2277, 2282, 86, 86, 2284, 2283, 2287, 2285, 2281, 2288, + 86, 86, 2286, 2276, 2280, 2289, 2290, 86, 2291, 86, + 2293, 2292, 3291, 2296, 2295, 2279, 3291, 86, 2282, 86, + 86, 2284, 86, 86, 2285, 86, 2288, 86, 86, 2286, + 2298, 2294, 2289, 2290, 2297, 2291, 86, 2293, 2292, 86, + 2296, 2295, 2300, 86, 2299, 2301, 2303, 2302, 2304, 86, + 86, 86, 2306, 86, 2305, 2310, 86, 86, 2294, 2307, + 86, 2297, 2311, 86, 2308, 86, 2309, 86, 86, 2300, + 2312, 2299, 2301, 2303, 2302, 2304, 86, 2313, 2314, 2306, + 86, 2305, 2310, 86, 2315, 2316, 2307, 2319, 2317, 2311, + + 2320, 2308, 2318, 2309, 3291, 86, 2321, 2312, 2322, 86, + 86, 86, 2324, 2328, 86, 2314, 86, 2325, 86, 2329, + 2323, 2315, 2316, 86, 2319, 2317, 86, 86, 2330, 2318, + 3291, 86, 86, 2321, 2326, 86, 2331, 2327, 2332, 2324, + 86, 2333, 2334, 86, 2325, 86, 86, 2323, 86, 2335, + 86, 2336, 86, 2338, 2337, 2330, 2340, 86, 86, 2341, + 2342, 2326, 86, 2331, 2327, 2332, 2339, 2343, 2333, 2334, + 2344, 86, 2345, 2346, 2349, 86, 86, 2347, 86, 2350, + 86, 2337, 86, 86, 2348, 86, 2341, 2342, 2352, 2353, + 86, 86, 86, 2339, 86, 2351, 86, 86, 86, 2345, + + 2346, 2349, 2354, 86, 2347, 2358, 86, 2355, 3291, 2356, + 2359, 2348, 2361, 2360, 2362, 86, 2353, 2364, 86, 2363, + 86, 86, 2351, 86, 2357, 86, 86, 2366, 2367, 2354, + 2365, 86, 86, 3291, 2355, 86, 2356, 2359, 2369, 2361, + 2360, 86, 86, 2372, 2364, 2368, 2363, 2370, 2374, 2371, + 86, 2357, 2423, 86, 2366, 86, 2373, 2365, 2375, 86, + 86, 86, 2379, 86, 2376, 2369, 2378, 86, 86, 2377, + 86, 86, 2368, 86, 2370, 2374, 2371, 2380, 86, 86, + 2381, 2386, 2382, 2373, 2389, 2375, 2385, 3291, 86, 2379, + 2387, 2376, 2388, 2378, 86, 86, 2377, 2383, 86, 2384, + + 2391, 86, 2396, 86, 2380, 86, 86, 2381, 2386, 2382, + 2390, 2389, 86, 2385, 2392, 86, 86, 2387, 2393, 2388, + 2394, 2395, 86, 2397, 2383, 2398, 2384, 2391, 2401, 86, + 86, 2399, 2400, 86, 86, 2402, 2403, 2390, 2404, 2408, + 86, 2392, 86, 2405, 2409, 2393, 2406, 2394, 2395, 86, + 2397, 2407, 86, 86, 86, 2401, 86, 86, 2399, 2400, + 86, 86, 2402, 2403, 86, 2404, 2408, 2410, 2411, 86, + 2405, 2413, 3291, 2406, 2412, 2415, 86, 2414, 2407, 2416, + 3291, 86, 2421, 2419, 3291, 2420, 2418, 2417, 3291, 86, + 86, 86, 3291, 86, 2434, 2411, 2435, 2425, 2413, 86, + + 2422, 2412, 2426, 86, 2414, 86, 2416, 86, 168, 2421, + 2419, 86, 2420, 2418, 2417, 86, 2424, 86, 2429, 2427, + 2428, 86, 86, 2435, 2425, 2430, 2431, 2422, 86, 2426, + 86, 2432, 86, 86, 2436, 2433, 2437, 2438, 86, 2439, + 2440, 2442, 3291, 2424, 2449, 2429, 2427, 2428, 86, 86, + 86, 2441, 2430, 2431, 2443, 3291, 2444, 2446, 2432, 86, + 86, 86, 2433, 2437, 2438, 2445, 2447, 86, 86, 86, + 86, 86, 86, 2448, 86, 2450, 86, 2454, 2441, 2451, + 86, 2443, 86, 2444, 2446, 2452, 2453, 2455, 86, 2456, + 3291, 2458, 2445, 2447, 2459, 2460, 3291, 2457, 86, 86, + + 2448, 86, 2450, 2462, 86, 2461, 2451, 86, 86, 86, + 86, 2466, 2452, 2453, 2455, 86, 2456, 86, 2458, 86, + 2463, 2459, 86, 2465, 2457, 86, 2464, 86, 2467, 2468, + 2462, 2469, 2461, 86, 86, 86, 86, 2470, 2466, 2471, + 2474, 2472, 2476, 2479, 2473, 2489, 2480, 2463, 86, 86, + 2465, 86, 86, 2464, 2475, 2467, 2468, 86, 86, 2477, + 86, 2478, 86, 86, 2470, 86, 2471, 2474, 2472, 2476, + 86, 2473, 2481, 2480, 2482, 86, 2483, 86, 2484, 3291, + 2490, 2475, 2485, 86, 2486, 86, 2477, 2487, 2478, 86, + 2491, 2493, 86, 2488, 2492, 86, 3291, 86, 3291, 2481, + + 2501, 2482, 2495, 2483, 86, 2484, 86, 2490, 2497, 2485, + 2494, 2486, 86, 86, 2487, 86, 86, 86, 86, 86, + 2488, 2492, 2496, 2498, 86, 2499, 2500, 86, 2502, 2495, + 86, 2503, 2504, 86, 2505, 2497, 3291, 2494, 2506, 2510, + 2507, 2509, 2511, 86, 2512, 86, 2508, 86, 86, 2496, + 2498, 2515, 2499, 2500, 86, 86, 86, 2516, 86, 2504, + 86, 2505, 86, 86, 2517, 2506, 86, 2507, 2509, 2511, + 2513, 2514, 86, 2508, 2519, 2520, 86, 2518, 86, 86, + 3291, 86, 2526, 86, 2516, 2521, 86, 2522, 2523, 2524, + 3291, 2517, 2525, 2528, 3291, 86, 86, 2513, 2514, 2529, + + 86, 2519, 86, 2530, 2518, 2527, 86, 86, 86, 2526, + 86, 86, 2521, 2531, 2522, 2523, 2524, 86, 86, 2525, + 2528, 86, 2532, 2533, 2534, 2535, 2529, 2536, 2537, 2541, + 2530, 2538, 2527, 2539, 3291, 86, 2540, 86, 2543, 2545, + 2531, 3291, 86, 2547, 86, 86, 2542, 2548, 3291, 86, + 86, 86, 86, 86, 2536, 2537, 2541, 2544, 2538, 86, + 2539, 86, 86, 2540, 2546, 2543, 86, 2549, 86, 2551, + 86, 2550, 86, 2542, 86, 2552, 2557, 2554, 2553, 2558, + 2555, 2556, 3291, 86, 2544, 86, 86, 86, 86, 86, + 86, 2546, 2559, 86, 2549, 2565, 2551, 86, 2550, 86, + + 2561, 3291, 2552, 86, 2554, 2553, 2558, 2555, 2556, 2560, + 2562, 2563, 3291, 86, 86, 2564, 86, 2566, 2570, 2559, + 2567, 86, 2565, 86, 86, 2569, 2572, 2561, 2568, 2571, + 168, 2576, 86, 86, 86, 86, 2560, 2562, 2563, 2574, + 86, 2573, 2564, 2575, 2566, 2570, 2577, 2567, 2578, 3291, + 86, 2579, 2569, 2572, 86, 2568, 2571, 2580, 86, 2583, + 2581, 86, 2586, 2582, 2584, 86, 2574, 86, 2573, 86, + 2575, 86, 3291, 86, 86, 2578, 86, 86, 2579, 86, + 2587, 2585, 2589, 86, 2580, 86, 2583, 2581, 86, 2586, + 2582, 2584, 2588, 2591, 2590, 2592, 2593, 2594, 2596, 86, + + 86, 86, 86, 2595, 2597, 86, 86, 2587, 2585, 2589, + 2598, 2600, 2602, 2605, 2599, 86, 2601, 86, 86, 2588, + 2591, 2590, 2592, 2593, 2594, 86, 2603, 2604, 3291, 86, + 2595, 2597, 86, 86, 86, 86, 86, 2598, 86, 86, + 2605, 2599, 2607, 2601, 2606, 2611, 2608, 2609, 2612, 2610, + 2616, 86, 2613, 2603, 2604, 86, 86, 86, 86, 86, + 2615, 2614, 2617, 2618, 3291, 3291, 2620, 2622, 3291, 2607, + 86, 2606, 86, 2608, 2609, 86, 2610, 86, 86, 2613, + 86, 86, 2619, 2623, 2621, 2626, 2628, 2615, 2614, 86, + 2624, 86, 86, 2620, 2622, 86, 2625, 86, 3291, 2627, + + 2629, 2630, 2632, 86, 2634, 86, 2631, 86, 2633, 2619, + 2623, 2621, 2626, 86, 86, 2635, 86, 2624, 2636, 86, + 86, 2641, 86, 2625, 86, 86, 2627, 2629, 86, 2632, + 2637, 2634, 2639, 2631, 2640, 2633, 2638, 86, 2642, 86, + 86, 2644, 2635, 2643, 86, 2636, 2645, 2648, 86, 2647, + 86, 2653, 86, 2649, 2646, 2651, 3291, 2637, 86, 2639, + 2654, 2640, 86, 2638, 2657, 2642, 86, 86, 86, 86, + 2643, 2650, 86, 2645, 86, 86, 2647, 2652, 86, 2655, + 2649, 2646, 2651, 86, 86, 2656, 2658, 2654, 2659, 2660, + 2662, 86, 2661, 2664, 86, 2665, 2667, 86, 2650, 2663, + + 2666, 86, 2672, 3291, 2652, 86, 2655, 2670, 86, 2674, + 86, 86, 2656, 2658, 86, 86, 2660, 2662, 2668, 2661, + 86, 86, 2665, 86, 2669, 86, 2663, 2666, 2671, 86, + 2673, 2675, 86, 2679, 2670, 2677, 86, 2676, 86, 2678, + 3291, 2680, 86, 3291, 2682, 2668, 86, 2681, 86, 86, + 2684, 2669, 86, 86, 2685, 2671, 2687, 2673, 2675, 86, + 2679, 86, 2677, 86, 2676, 86, 2678, 2683, 2680, 2688, + 2686, 2682, 86, 2689, 2681, 2690, 86, 2684, 2692, 86, + 2693, 2685, 86, 86, 2691, 2694, 2695, 86, 2696, 86, + 3291, 2697, 2699, 3291, 2683, 86, 86, 2686, 2698, 2700, + + 168, 2702, 2690, 86, 3291, 2692, 86, 2693, 86, 2701, + 2703, 2691, 2710, 2695, 86, 2696, 2704, 86, 2697, 86, + 86, 2705, 2706, 86, 2707, 2698, 86, 2708, 86, 2709, + 2711, 2713, 2712, 2716, 86, 86, 2701, 2703, 2717, 2710, + 86, 2714, 2718, 86, 86, 2721, 86, 2715, 86, 2706, + 86, 2707, 86, 86, 2708, 2720, 2719, 2711, 2713, 2712, + 86, 86, 2722, 2723, 86, 86, 2724, 86, 2714, 2718, + 86, 86, 2721, 2725, 2715, 86, 2726, 2727, 86, 2728, + 2729, 2731, 2720, 2719, 2730, 86, 86, 2732, 86, 2722, + 2723, 86, 2733, 2724, 2734, 86, 86, 86, 86, 86, + + 2725, 2735, 2738, 2726, 2727, 2736, 2728, 2729, 2731, 86, + 86, 2730, 86, 2739, 2732, 86, 2741, 2737, 2740, 2742, + 2743, 2734, 2744, 2745, 86, 86, 86, 2748, 2735, 86, + 86, 86, 2736, 86, 86, 86, 2747, 2749, 2750, 86, + 2739, 2746, 2751, 2741, 2737, 2740, 2742, 86, 86, 2744, + 2745, 2752, 2753, 2754, 86, 2755, 3291, 2756, 2758, 86, + 2759, 2763, 2757, 2747, 2749, 2761, 2760, 2764, 2746, 2765, + 86, 2768, 86, 86, 86, 86, 86, 86, 86, 86, + 2754, 86, 2755, 86, 2756, 2758, 2762, 2759, 86, 2757, + 2767, 86, 2761, 2760, 86, 86, 86, 2766, 86, 2769, + + 2770, 2771, 2772, 2774, 3291, 2775, 86, 2773, 2776, 2777, + 86, 3291, 86, 2762, 2778, 2779, 86, 2767, 2781, 3291, + 86, 2782, 86, 2783, 2766, 86, 2769, 2770, 2771, 86, + 2774, 86, 2775, 2784, 86, 86, 86, 2780, 86, 2785, + 2786, 2778, 2779, 2787, 2788, 2781, 86, 2791, 86, 86, + 2783, 86, 2789, 86, 2790, 2792, 2793, 86, 2795, 2799, + 86, 2794, 86, 2798, 2780, 86, 2785, 86, 2796, 2797, + 2787, 2788, 2802, 3291, 86, 86, 86, 2801, 86, 2789, + 2803, 2800, 2792, 86, 86, 2795, 86, 2804, 86, 2805, + 2798, 86, 2806, 2807, 86, 2796, 2797, 2808, 3291, 86, + + 86, 2812, 86, 2811, 2801, 2814, 86, 2803, 2800, 2815, + 86, 2809, 2810, 86, 2804, 2813, 2805, 86, 86, 2806, + 2807, 86, 86, 86, 2808, 86, 2817, 2816, 2812, 2820, + 2811, 2819, 2814, 2821, 2818, 2827, 86, 86, 2809, 2810, + 86, 2822, 2813, 2824, 86, 2828, 2823, 2826, 2825, 3291, + 86, 2829, 86, 2817, 2816, 86, 2820, 2830, 2819, 2831, + 2821, 2818, 86, 2834, 3291, 2832, 2833, 2835, 86, 2836, + 86, 86, 2828, 86, 2826, 86, 86, 86, 2829, 2837, + 2838, 2839, 2840, 86, 2830, 86, 2831, 86, 86, 86, + 2834, 86, 2832, 2833, 2835, 2842, 2836, 2841, 2843, 86, + + 3291, 2845, 86, 2844, 86, 2846, 2837, 2838, 2839, 2840, + 86, 2847, 2848, 2849, 2850, 2851, 2852, 2854, 2853, 2855, + 3291, 3291, 86, 3291, 2841, 86, 86, 86, 2845, 2856, + 2844, 86, 86, 86, 86, 86, 86, 2857, 2847, 86, + 2849, 86, 2851, 2852, 2854, 2853, 86, 2858, 2859, 2861, + 2862, 2864, 86, 2860, 3291, 86, 2856, 2865, 2863, 86, + 2866, 2869, 2867, 86, 2857, 2868, 3291, 86, 86, 3291, + 86, 2871, 2870, 86, 2858, 86, 2861, 2862, 2864, 2873, + 86, 86, 2875, 3291, 86, 2863, 86, 86, 2869, 2867, + 86, 2872, 2868, 86, 2874, 2876, 2877, 86, 2871, 2870, + + 3291, 86, 86, 2878, 2879, 2885, 2873, 2880, 3291, 2881, + 86, 3291, 2883, 2882, 86, 2884, 2886, 2887, 2872, 2888, + 2890, 2874, 2876, 2877, 3291, 86, 86, 86, 86, 2891, + 2878, 2879, 86, 86, 2880, 86, 2881, 86, 86, 2883, + 2882, 2889, 2884, 86, 86, 2892, 2888, 2890, 86, 2893, + 3291, 86, 2894, 2895, 2896, 2897, 2891, 2900, 2898, 2901, + 2902, 2899, 86, 86, 86, 2903, 86, 2904, 2889, 3291, + 86, 86, 2907, 2905, 86, 2906, 2893, 86, 2908, 2894, + 86, 2896, 2897, 86, 2900, 2898, 86, 2902, 2899, 2909, + 86, 86, 86, 2912, 2904, 86, 2910, 86, 86, 2907, + + 2905, 86, 2906, 2911, 2913, 2908, 2915, 2914, 86, 2916, + 86, 2917, 3291, 2919, 2925, 2920, 2909, 2918, 86, 2921, + 86, 86, 86, 2910, 3291, 86, 3291, 86, 2927, 86, + 2911, 2913, 86, 2915, 2914, 2922, 2916, 86, 2917, 2923, + 2919, 86, 2920, 2926, 2918, 86, 2921, 2928, 86, 2924, + 86, 86, 2929, 86, 2930, 86, 2931, 2932, 86, 2935, + 2933, 3291, 2922, 2934, 2940, 2936, 2923, 86, 86, 2937, + 2926, 86, 86, 86, 86, 2939, 2924, 86, 2942, 2929, + 2938, 86, 2944, 2931, 2932, 86, 86, 2933, 86, 2941, + 2934, 2940, 2936, 2943, 2946, 2945, 2937, 86, 2947, 86, + + 86, 86, 2939, 2948, 2949, 86, 2953, 2938, 2950, 2955, + 2952, 86, 2954, 2957, 86, 2956, 2941, 86, 2959, 86, + 2943, 2946, 2945, 86, 86, 86, 86, 2951, 86, 2958, + 86, 2949, 2962, 2953, 2960, 86, 86, 2952, 2961, 2954, + 2957, 86, 2956, 2963, 2964, 86, 2965, 86, 2966, 2967, + 86, 2968, 2969, 2970, 2951, 2971, 2958, 2973, 86, 2962, + 86, 2960, 3291, 2972, 86, 2961, 3291, 2976, 3291, 3291, + 2963, 86, 86, 86, 86, 2966, 86, 86, 2968, 2969, + 86, 86, 2971, 2974, 2975, 2977, 2978, 2980, 2981, 86, + 2972, 2982, 2983, 86, 86, 86, 2979, 2985, 86, 86, + + 86, 86, 2984, 86, 2986, 2987, 2989, 2990, 2988, 2991, + 2974, 2975, 2977, 2978, 2980, 86, 2992, 2995, 2982, 2983, + 86, 86, 3291, 2979, 86, 2993, 2996, 86, 86, 2984, + 2997, 86, 2987, 2989, 86, 2988, 86, 2994, 86, 86, + 2999, 3000, 2998, 86, 3002, 86, 86, 3003, 86, 86, + 86, 3001, 2993, 2996, 3005, 3006, 86, 86, 3007, 3004, + 3008, 86, 3009, 3013, 2994, 3014, 3016, 2999, 3000, 2998, + 86, 3002, 86, 86, 86, 3012, 3010, 3015, 3001, 86, + 3011, 3005, 3006, 86, 3017, 86, 3004, 86, 86, 3291, + 86, 3018, 86, 3016, 86, 3019, 3020, 86, 3021, 86, + + 3025, 3022, 3012, 3010, 3015, 3023, 86, 3011, 86, 3024, + 3027, 3028, 86, 3026, 86, 86, 86, 3029, 3018, 86, + 86, 3031, 3019, 86, 86, 3021, 3030, 3025, 3022, 86, + 86, 86, 3023, 86, 86, 3032, 3024, 3027, 3028, 3035, + 3026, 3033, 3034, 3036, 3029, 86, 86, 3038, 3031, 3037, + 3039, 86, 3041, 3030, 86, 3291, 3040, 3042, 3043, 86, + 3044, 3045, 3032, 3046, 3047, 86, 3035, 3048, 3033, 3034, + 3036, 86, 86, 3291, 3038, 3050, 3037, 3051, 86, 3041, + 3058, 86, 86, 3040, 3042, 3043, 86, 86, 86, 86, + 3046, 86, 3049, 3059, 3048, 3052, 3053, 3054, 3055, 3291, + + 86, 3060, 86, 86, 86, 3056, 3057, 3058, 3061, 3062, + 86, 3063, 3065, 3067, 3069, 3064, 86, 3070, 86, 3049, + 86, 86, 3068, 3066, 86, 86, 86, 3073, 3060, 86, + 3072, 3074, 86, 86, 86, 3061, 3062, 86, 3063, 86, + 3067, 3069, 3064, 3071, 3070, 86, 3075, 3076, 86, 3068, + 3066, 3080, 86, 86, 3073, 3077, 3081, 3072, 86, 86, + 3078, 3082, 3083, 3079, 86, 3085, 3090, 3084, 3088, 3086, + 3071, 86, 3089, 86, 3076, 3087, 86, 86, 86, 86, + 3091, 3092, 3077, 86, 3093, 3096, 3097, 3078, 3094, 3083, + 3079, 86, 3085, 86, 3084, 3088, 3086, 86, 86, 86, + + 86, 86, 3087, 3095, 3098, 3099, 3100, 3091, 86, 3101, + 3102, 86, 86, 86, 3103, 3094, 3104, 3105, 3107, 3109, + 3106, 3108, 86, 3291, 3112, 86, 3291, 3291, 3110, 3291, + 3095, 3098, 86, 86, 86, 86, 86, 86, 86, 86, + 3113, 86, 3111, 86, 86, 86, 3109, 3106, 3108, 3114, + 86, 86, 86, 3115, 3117, 3110, 3116, 3118, 3121, 86, + 3126, 3119, 3120, 86, 3122, 3123, 86, 3113, 86, 3111, + 86, 3124, 3125, 86, 86, 3127, 3114, 3291, 3131, 3291, + 3115, 3117, 86, 3116, 86, 3121, 86, 3126, 3119, 3120, + 86, 3122, 3123, 3128, 3129, 86, 3130, 86, 3124, 86, + + 3132, 86, 3127, 86, 86, 3131, 3133, 86, 3135, 86, + 3134, 3137, 3136, 3138, 3139, 3140, 3142, 3145, 86, 3291, + 3128, 3129, 86, 3130, 3141, 86, 3143, 3132, 86, 86, + 86, 3147, 3148, 3133, 86, 3135, 86, 3134, 3137, 3136, + 86, 86, 86, 3142, 3145, 3144, 3146, 86, 3150, 86, + 86, 3141, 86, 3143, 86, 3149, 3291, 3151, 3147, 3148, + 86, 3153, 3152, 3158, 3291, 3154, 3155, 3157, 3156, 86, + 86, 3159, 3144, 3146, 86, 3150, 86, 86, 3160, 86, + 86, 86, 3149, 86, 3151, 3161, 86, 3162, 3153, 3152, + 3158, 86, 3154, 3155, 3157, 3156, 3163, 3164, 3159, 3166, + + 86, 3167, 3165, 86, 3168, 3160, 86, 3169, 3171, 86, + 3170, 3172, 3161, 3173, 3162, 86, 3180, 3175, 3174, 86, + 3176, 86, 86, 3163, 3164, 86, 3166, 3177, 86, 3165, + 3178, 3168, 86, 3181, 86, 86, 86, 3170, 86, 3179, + 3173, 86, 86, 3182, 3175, 3174, 86, 3176, 86, 86, + 3183, 86, 3184, 3186, 3177, 3185, 3187, 3178, 86, 3188, + 3181, 3189, 86, 3190, 3191, 3192, 3179, 3193, 3195, 86, + 3182, 86, 86, 3194, 86, 3197, 86, 3183, 3198, 86, + 86, 3196, 3185, 86, 3199, 3291, 3188, 86, 3189, 86, + 86, 3191, 3192, 3201, 86, 3195, 3202, 86, 3200, 86, + + 3194, 86, 3203, 3204, 3207, 3208, 3206, 86, 3196, 3205, + 86, 3199, 86, 86, 3209, 86, 3210, 86, 86, 3211, + 3201, 86, 3215, 3202, 3217, 3200, 3212, 86, 86, 86, + 86, 3207, 3208, 3206, 3213, 3216, 3205, 3214, 86, 3221, + 86, 3209, 3224, 3210, 86, 86, 3211, 3218, 86, 3215, + 3219, 86, 3220, 3212, 86, 3223, 3222, 86, 3225, 86, + 86, 3213, 3216, 3228, 3214, 3291, 86, 3226, 86, 3224, + 3227, 86, 3229, 3230, 3218, 3232, 3231, 3219, 86, 3220, + 86, 3235, 3233, 3222, 3238, 3225, 3241, 86, 3234, 86, + 3228, 3236, 86, 3240, 3226, 3242, 86, 3227, 86, 86, + + 86, 86, 86, 3231, 86, 86, 3237, 86, 3235, 3233, + 3245, 3239, 86, 3241, 86, 3234, 86, 3246, 3236, 86, + 3240, 3243, 86, 3247, 3244, 86, 3248, 3291, 3249, 3251, + 3250, 86, 86, 3237, 3252, 86, 3253, 3245, 3239, 86, + 86, 3254, 3257, 86, 3246, 3255, 3291, 3256, 3243, 86, + 3247, 3244, 86, 3248, 86, 3249, 3251, 3250, 3258, 3259, + 3260, 3252, 86, 3253, 86, 3262, 3261, 86, 3254, 3257, + 3263, 86, 3255, 86, 3256, 3264, 3265, 3267, 86, 3269, + 3291, 3266, 3291, 3268, 3276, 3258, 3259, 86, 86, 86, + 86, 86, 3262, 3261, 3271, 86, 86, 86, 3272, 86, + + 3275, 3270, 3264, 3265, 3267, 3273, 86, 3274, 3266, 86, + 3268, 86, 3279, 86, 3277, 86, 86, 3280, 3282, 3283, + 86, 3271, 86, 3278, 3289, 3272, 86, 3275, 3270, 3281, + 3285, 86, 3273, 3284, 3274, 3287, 3286, 3290, 86, 3279, + 3288, 3277, 3291, 86, 86, 86, 86, 3291, 86, 86, + 3278, 86, 86, 86, 3291, 3291, 3281, 3285, 86, 3291, + 3284, 3291, 3287, 3286, 86, 3291, 3291, 3288, 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, 3291, + 89, 89, 89, 89, 158, 158, 3291, 3291, 3291, 158, + 158, 160, 160, 3291, 3291, 160, 3291, 160, 162, 3291, + 3291, 3291, 3291, 3291, 162, 165, 165, 3291, 3291, 3291, + 165, 165, 167, 3291, 3291, 3291, 3291, 3291, 167, 169, + 169, 3291, 169, 169, 169, 169, 172, 3291, 3291, 3291, + 3291, 3291, 172, 175, 175, 3291, 3291, 3291, 175, 175, + 90, 90, 3291, 90, 90, 90, 90, 17, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291 } ; -static const flex_int16_t yy_chk[9330] = +static const flex_int16_t yy_chk[9455] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -2537,13 +2566,13 @@ static const flex_int16_t yy_chk[9330] = 7, 7, 7, 33, 7, 8, 8, 8, 8, 32, 8, 9, 9, 9, 10, 10, 10, 19, 51, 51, - 1066, 19, 3260, 3, 32, 33, 4, 67, 67, 5, - 33, 6, 2661, 13, 13, 13, 13, 7, 13, 14, + 1073, 19, 3299, 3, 32, 33, 4, 67, 67, 5, + 33, 6, 2689, 13, 13, 13, 13, 7, 13, 14, 14, 14, 14, 8, 14, 15, 15, 15, 9, 25, - 1066, 10, 11, 11, 11, 11, 11, 11, 12, 12, + 1073, 10, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 16, 16, 16, 34, 28, 84, 84, 13, 11, 45, 289, 25, 25, 14, 12, 34, - 39, 23, 15, 23, 23, 45, 23, 1075, 28, 175, + 39, 23, 15, 23, 23, 45, 23, 1082, 28, 175, 11, 28, 23, 39, 34, 28, 12, 174, 87, 11, 45, 16, 87, 289, 37, 12, 30, 39, 29, 56, 37, 172, 56, 72, 30, 28, 26, 167, 100, 23, @@ -2594,10 +2623,10 @@ static const flex_int16_t yy_chk[9330] = 147, 146, 0, 142, 137, 145, 150, 141, 145, 144, 137, 141, 146, 149, 152, 151, 147, 150, 155, 153, - 154, 146, 156, 926, 151, 157, 152, 155, 146, 163, + 154, 146, 156, 930, 151, 157, 152, 155, 146, 163, 0, 163, 163, 150, 163, 154, 151, 171, 157, 146, 151, 153, 151, 0, 156, 155, 153, 154, 0, 156, - 177, 151, 157, 168, 926, 168, 168, 169, 168, 169, + 177, 151, 157, 168, 930, 168, 168, 169, 168, 169, 169, 171, 169, 151, 171, 173, 178, 173, 173, 179, 173, 0, 177, 180, 181, 182, 0, 177, 179, 184, 178, 181, 185, 186, 183, 180, 188, 184, 0, 0, @@ -2665,893 +2694,907 @@ static const flex_int16_t yy_chk[9330] = 343, 345, 350, 346, 344, 344, 348, 354, 346, 349, 347, 352, 360, 352, 354, 0, 364, 350, 362, 355, 357, 358, 352, 387, 365, 360, 359, 358, 359, 398, - 0, 0, 363, 0, 354, 0, 362, 352, 352, 360, + 0, 0, 363, 403, 354, 0, 362, 352, 352, 360, 352, 355, 357, 358, 361, 362, 355, 357, 358, 352, 359, 365, 366, 359, 358, 359, 369, 361, 363, 363, - 361, 398, 361, 369, 0, 373, 370, 367, 361, 371, - 372, 361, 370, 367, 366, 376, 438, 367, 373, 366, - 381, 371, 372, 369, 361, 367, 0, 361, 376, 361, - 379, 367, 373, 370, 367, 375, 371, 372, 378, 382, - 367, 381, 376, 438, 367, 382, 0, 381, 379, 380, - 378, 375, 367, 368, 380, 368, 383, 379, 384, 375, - 0, 403, 375, 390, 383, 378, 382, 389, 368, 385, - 384, 368, 0, 368, 389, 368, 390, 0, 375, 368, - 368, 380, 368, 383, 386, 384, 0, 385, 0, 0, - 390, 417, 386, 403, 389, 368, 385, 395, 368, 417, - - 368, 391, 368, 377, 377, 388, 388, 392, 0, 395, - 391, 386, 393, 377, 394, 377, 377, 377, 417, 393, - 377, 394, 399, 396, 395, 392, 397, 0, 377, 392, - 377, 377, 388, 391, 392, 407, 407, 391, 397, 393, - 377, 394, 377, 377, 377, 396, 401, 377, 399, 399, - 396, 400, 392, 397, 402, 404, 408, 404, 400, 405, - 409, 401, 406, 408, 407, 410, 411, 402, 0, 412, - 405, 409, 414, 401, 416, 424, 410, 419, 400, 411, - 0, 402, 404, 408, 406, 0, 405, 409, 419, 406, - 413, 413, 410, 411, 412, 414, 412, 415, 418, 414, - - 416, 416, 420, 421, 419, 426, 429, 424, 413, 0, - 418, 420, 415, 425, 0, 413, 421, 413, 413, 427, - 415, 433, 430, 422, 415, 418, 428, 426, 430, 420, - 421, 425, 426, 431, 422, 413, 422, 0, 429, 415, - 425, 422, 427, 432, 428, 433, 427, 434, 433, 430, - 422, 435, 450, 428, 431, 436, 442, 437, 435, 450, - 431, 422, 0, 422, 423, 439, 432, 441, 444, 434, - 432, 437, 423, 423, 434, 440, 423, 423, 435, 450, - 444, 436, 436, 443, 437, 446, 423, 439, 442, 440, - 445, 423, 439, 441, 441, 444, 445, 447, 449, 423, - - 423, 448, 440, 423, 423, 451, 443, 446, 452, 448, - 443, 454, 446, 449, 451, 453, 455, 445, 456, 447, - 0, 0, 464, 452, 447, 449, 457, 448, 448, 459, - 0, 455, 451, 462, 454, 452, 448, 0, 454, 453, - 458, 464, 453, 455, 456, 456, 458, 460, 457, 464, - 465, 463, 460, 457, 466, 459, 459, 463, 467, 462, - 462, 466, 469, 470, 469, 473, 472, 458, 465, 471, - 475, 469, 470, 467, 460, 0, 471, 465, 463, 472, - 474, 466, 476, 481, 478, 467, 477, 478, 479, 469, - 470, 469, 480, 472, 482, 481, 471, 473, 474, 477, - - 484, 483, 475, 478, 476, 480, 485, 474, 483, 476, - 481, 478, 479, 477, 478, 479, 488, 486, 487, 480, - 491, 488, 492, 490, 484, 489, 482, 484, 483, 485, - 486, 489, 493, 495, 492, 0, 0, 494, 485, 496, - 487, 495, 491, 488, 486, 487, 490, 491, 494, 492, - 490, 499, 489, 496, 493, 0, 485, 500, 499, 493, - 495, 0, 502, 509, 494, 0, 496, 497, 501, 500, - 502, 506, 497, 504, 497, 505, 503, 0, 499, 505, - 497, 509, 497, 506, 500, 497, 497, 503, 507, 502, - 509, 501, 497, 497, 497, 501, 504, 505, 506, 497, - - 504, 497, 505, 503, 510, 508, 505, 497, 508, 497, - 507, 511, 497, 497, 510, 507, 508, 513, 512, 497, - 514, 513, 511, 515, 516, 518, 516, 514, 517, 522, - 0, 519, 508, 0, 522, 508, 510, 518, 511, 524, - 523, 510, 512, 0, 513, 512, 519, 514, 520, 515, - 515, 516, 518, 521, 517, 517, 522, 524, 519, 0, - 520, 521, 523, 525, 526, 527, 524, 523, 531, 529, - 530, 525, 533, 0, 532, 520, 526, 534, 0, 537, - 521, 535, 538, 536, 533, 534, 527, 529, 537, 532, - 525, 526, 527, 530, 535, 536, 529, 530, 539, 533, - - 531, 532, 540, 542, 534, 538, 537, 543, 535, 538, - 536, 541, 539, 544, 541, 546, 545, 547, 0, 551, - 0, 0, 542, 549, 548, 539, 554, 540, 550, 540, - 542, 545, 547, 552, 543, 557, 549, 554, 541, 559, - 550, 551, 558, 545, 547, 544, 551, 546, 548, 553, - 549, 548, 556, 554, 560, 550, 553, 552, 555, 553, - 552, 561, 557, 555, 562, 563, 556, 553, 564, 558, - 563, 559, 565, 0, 564, 569, 553, 566, 567, 556, - 0, 560, 570, 553, 568, 571, 553, 565, 561, 572, - 555, 575, 568, 572, 569, 564, 562, 563, 574, 565, - - 567, 566, 569, 576, 566, 567, 570, 571, 577, 570, - 573, 568, 571, 580, 578, 579, 572, 577, 573, 581, - 586, 574, 583, 575, 0, 574, 576, 582, 579, 587, - 576, 581, 584, 582, 588, 577, 578, 573, 585, 580, - 580, 578, 579, 584, 583, 585, 581, 588, 589, 583, - 591, 587, 586, 589, 582, 590, 587, 589, 592, 584, - 593, 588, 597, 0, 590, 585, 594, 592, 595, 599, - 596, 593, 589, 600, 597, 589, 591, 591, 601, 0, - 589, 602, 590, 596, 589, 592, 604, 593, 594, 597, - 595, 600, 603, 594, 605, 595, 606, 596, 608, 0, - - 600, 599, 601, 602, 602, 601, 607, 606, 602, 610, - 604, 612, 609, 604, 603, 607, 605, 611, 608, 603, - 614, 605, 613, 606, 611, 608, 609, 616, 614, 618, - 602, 610, 615, 607, 0, 617, 610, 619, 612, 609, - 613, 620, 622, 615, 611, 616, 624, 614, 623, 613, - 617, 621, 621, 626, 616, 624, 627, 628, 619, 615, - 629, 618, 617, 625, 619, 620, 622, 633, 620, 622, - 623, 631, 630, 624, 630, 623, 625, 632, 627, 636, - 621, 633, 632, 627, 629, 626, 634, 629, 635, 628, - 625, 645, 644, 631, 633, 639, 637, 0, 631, 630, - - 634, 638, 635, 635, 637, 640, 645, 641, 0, 632, - 635, 636, 640, 634, 648, 635, 642, 639, 645, 638, - 643, 0, 639, 637, 644, 649, 646, 649, 638, 635, - 635, 650, 640, 641, 641, 643, 642, 647, 651, 652, - 648, 648, 647, 642, 643, 653, 651, 643, 646, 656, - 654, 655, 649, 646, 653, 658, 650, 656, 650, 654, - 655, 657, 643, 659, 652, 651, 652, 660, 657, 647, - 661, 662, 653, 664, 665, 663, 656, 654, 655, 666, - 667, 664, 661, 662, 663, 660, 659, 658, 657, 665, - 659, 666, 668, 669, 660, 670, 671, 661, 662, 674, - - 664, 665, 663, 670, 671, 668, 666, 672, 669, 673, - 674, 678, 667, 677, 679, 675, 676, 676, 673, 668, - 669, 677, 670, 671, 675, 676, 674, 679, 680, 681, - 672, 682, 683, 678, 672, 685, 673, 684, 678, 682, - 677, 679, 675, 676, 676, 687, 689, 688, 683, 686, - 684, 691, 681, 687, 680, 680, 681, 685, 682, 683, - 686, 688, 685, 690, 684, 692, 689, 693, 694, 697, - 696, 691, 687, 689, 688, 698, 686, 694, 691, 695, - 701, 700, 697, 699, 0, 690, 702, 692, 696, 693, - 690, 0, 692, 698, 693, 694, 697, 696, 699, 695, - - 704, 703, 698, 700, 701, 705, 695, 701, 700, 702, - 699, 706, 708, 702, 703, 707, 710, 705, 704, 711, - 715, 707, 709, 714, 706, 0, 712, 704, 703, 716, - 709, 714, 705, 721, 0, 717, 716, 748, 706, 708, - 718, 711, 707, 710, 712, 719, 711, 719, 709, 709, - 714, 720, 715, 712, 722, 718, 716, 709, 717, 723, - 720, 724, 717, 0, 725, 721, 725, 718, 726, 748, - 724, 729, 719, 722, 732, 726, 0, 0, 720, 723, - 745, 722, 735, 729, 732, 741, 723, 0, 724, 745, - 736, 725, 739, 740, 0, 726, 727, 738, 729, 727, - - 735, 732, 742, 727, 740, 743, 727, 745, 741, 735, - 739, 736, 741, 727, 727, 0, 727, 736, 738, 739, - 740, 727, 744, 727, 738, 753, 727, 752, 742, 742, - 727, 743, 743, 727, 746, 747, 752, 0, 744, 0, - 727, 727, 747, 727, 751, 750, 756, 746, 753, 744, - 751, 757, 753, 0, 752, 754, 755, 0, 754, 757, - 0, 746, 747, 749, 749, 758, 749, 750, 756, 749, - 760, 751, 750, 756, 749, 0, 763, 758, 757, 755, - 749, 749, 754, 755, 759, 762, 759, 764, 766, 749, - 749, 749, 758, 749, 760, 761, 749, 760, 765, 764, - - 761, 749, 763, 763, 767, 762, 769, 749, 749, 770, - 766, 759, 762, 768, 764, 766, 773, 771, 772, 0, - 777, 0, 774, 776, 765, 765, 772, 761, 767, 774, - 775, 767, 771, 769, 770, 768, 770, 780, 775, 773, - 768, 778, 776, 773, 771, 772, 777, 777, 779, 774, - 776, 781, 782, 778, 783, 784, 786, 775, 785, 783, - 781, 779, 789, 780, 780, 787, 790, 782, 778, 791, - 787, 793, 792, 796, 0, 779, 0, 797, 781, 782, - 785, 783, 794, 786, 789, 785, 795, 784, 798, 789, - 801, 799, 796, 800, 792, 804, 802, 787, 790, 792, - - 796, 791, 800, 793, 797, 806, 794, 795, 805, 794, - 799, 803, 801, 795, 807, 798, 802, 801, 799, 803, - 800, 808, 804, 802, 806, 809, 805, 811, 812, 814, - 815, 813, 806, 809, 813, 805, 816, 817, 803, 822, - 819, 807, 819, 820, 822, 811, 812, 823, 815, 818, - 0, 814, 809, 808, 811, 812, 814, 815, 813, 817, - 816, 820, 818, 816, 817, 821, 824, 819, 826, 825, - 820, 822, 827, 823, 823, 827, 818, 825, 824, 821, - 828, 830, 831, 832, 0, 0, 826, 835, 828, 832, - 833, 834, 821, 824, 835, 826, 825, 834, 836, 827, - - 841, 839, 844, 0, 828, 836, 830, 828, 830, 831, - 832, 837, 833, 838, 835, 828, 837, 833, 834, 839, - 838, 842, 840, 841, 843, 836, 840, 841, 839, 845, - 842, 846, 843, 847, 844, 852, 849, 848, 837, 850, - 838, 847, 0, 851, 0, 0, 846, 845, 842, 840, - 848, 843, 850, 854, 853, 861, 845, 849, 846, 856, - 847, 853, 852, 849, 848, 851, 850, 855, 857, 862, - 851, 854, 858, 864, 855, 857, 859, 858, 856, 863, - 854, 853, 860, 865, 859, 866, 856, 861, 867, 860, - 865, 868, 863, 874, 855, 857, 869, 871, 0, 858, - - 870, 862, 873, 859, 869, 864, 863, 872, 870, 860, - 865, 878, 875, 872, 868, 870, 0, 866, 868, 871, - 867, 876, 880, 869, 871, 874, 877, 870, 873, 873, - 876, 879, 881, 882, 872, 870, 875, 883, 879, 875, - 877, 881, 883, 878, 884, 885, 0, 886, 876, 880, - 0, 893, 887, 877, 888, 882, 884, 887, 879, 881, - 882, 888, 889, 892, 893, 900, 892, 890, 885, 883, - 899, 884, 885, 886, 886, 890, 896, 895, 893, 887, - 897, 888, 902, 896, 889, 903, 897, 903, 900, 889, - 892, 895, 900, 901, 890, 904, 899, 899, 906, 0, - - 0, 905, 907, 896, 895, 901, 908, 897, 898, 902, - 898, 906, 903, 905, 898, 0, 898, 911, 904, 908, - 901, 898, 904, 0, 907, 906, 898, 910, 905, 907, - 911, 909, 898, 908, 912, 898, 909, 898, 913, 0, - 915, 898, 914, 898, 911, 910, 912, 917, 898, 916, - 913, 925, 914, 898, 910, 915, 918, 912, 922, 919, - 917, 912, 918, 909, 914, 913, 920, 915, 921, 914, - 923, 916, 919, 912, 917, 924, 916, 927, 925, 914, - 922, 930, 0, 918, 920, 922, 919, 928, 929, 921, - 930, 932, 928, 920, 0, 921, 929, 933, 934, 0, - - 936, 0, 923, 938, 940, 935, 932, 924, 930, 927, - 0, 934, 940, 943, 928, 929, 931, 937, 932, 933, - 935, 931, 938, 931, 933, 934, 936, 936, 941, 931, - 938, 940, 935, 939, 931, 931, 941, 944, 942, 937, - 946, 931, 931, 931, 937, 943, 939, 948, 931, 942, - 931, 946, 949, 952, 945, 941, 931, 947, 956, 944, - 939, 931, 931, 945, 944, 942, 947, 946, 931, 950, - 953, 957, 954, 955, 948, 949, 950, 960, 958, 949, - 954, 945, 963, 961, 947, 952, 958, 955, 964, 0, - 956, 962, 975, 957, 953, 960, 950, 953, 957, 954, - - 955, 961, 962, 965, 960, 958, 964, 966, 968, 967, - 961, 965, 969, 970, 963, 964, 967, 974, 962, 969, - 971, 968, 973, 972, 975, 981, 977, 974, 970, 966, - 965, 0, 979, 981, 966, 968, 967, 977, 971, 969, - 970, 972, 991, 973, 974, 979, 984, 971, 980, 973, - 972, 982, 981, 977, 983, 980, 0, 985, 984, 979, - 986, 989, 990, 983, 982, 992, 995, 996, 991, 991, - 0, 993, 996, 984, 0, 980, 999, 995, 982, 985, - 990, 983, 986, 989, 985, 993, 1026, 986, 989, 990, - 0, 998, 1000, 995, 998, 1001, 1002, 992, 993, 996, - - 999, 1003, 1001, 999, 1005, 1000, 1004, 1002, 1006, 1008, - 1003, 1013, 1009, 1026, 0, 1010, 1005, 998, 998, 1000, - 1004, 998, 1001, 1002, 1009, 1007, 1015, 1016, 1003, 1018, - 1011, 1005, 1007, 1004, 1017, 1013, 1019, 1010, 1013, 1009, - 1006, 1008, 1010, 1011, 1014, 1017, 1022, 1020, 1015, 1016, - 1014, 1018, 1007, 1015, 1016, 1023, 1018, 1011, 1019, 1024, - 1025, 1017, 1020, 1019, 1029, 0, 1023, 1022, 1028, 1027, - 1031, 1014, 1030, 1022, 1020, 1032, 1034, 1028, 1033, 1031, - 1024, 1036, 1023, 1032, 1037, 1033, 1024, 1027, 1029, 1041, - 1035, 1029, 1025, 1038, 1045, 1028, 1027, 1031, 1030, 1030, - - 1034, 1039, 1032, 1034, 1035, 1033, 1047, 1040, 1046, 1043, - 0, 1054, 1044, 1036, 1048, 1038, 1037, 1035, 1043, 1044, - 1038, 1041, 1049, 1039, 1052, 1058, 1045, 1054, 1039, 1040, - 1046, 1053, 1048, 1047, 1040, 1046, 1043, 1050, 1054, 1044, - 1049, 1048, 1051, 1055, 1056, 1057, 1050, 1059, 1052, 1049, - 1051, 1052, 1055, 1057, 1060, 1053, 1061, 1058, 1053, 1056, - 1062, 1064, 1065, 0, 1050, 1063, 1060, 1067, 1068, 1051, - 1055, 1056, 1057, 1063, 1064, 1073, 1067, 1065, 1061, 1059, - 1081, 1060, 1069, 1061, 1076, 1083, 1068, 1062, 1064, 1065, - 1069, 1070, 1063, 1070, 1067, 1068, 1072, 1076, 1074, 1078, - - 1077, 0, 1073, 1080, 1072, 1074, 1079, 1081, 1082, 1069, - 1084, 1076, 1077, 1085, 1078, 1082, 1086, 1083, 1070, 1087, - 0, 1080, 0, 1072, 1085, 1074, 1078, 1077, 1079, 1088, - 1080, 1091, 1089, 1079, 1090, 1082, 1092, 1094, 1086, 1098, - 1085, 1093, 1084, 1086, 1087, 1089, 1087, 1090, 1092, 1093, - 1095, 1088, 1096, 1091, 1099, 1153, 1088, 1094, 1091, 1089, - 1096, 1090, 1095, 1092, 1094, 1100, 1098, 1099, 1093, 1102, - 1101, 1103, 1106, 1109, 1100, 0, 0, 1095, 1103, 1096, - 1104, 1099, 1101, 1107, 1108, 1110, 0, 1153, 1111, 1104, - 1102, 1104, 1100, 1112, 1104, 1106, 1102, 1101, 1103, 1106, - - 1109, 1111, 1104, 1116, 1114, 1110, 1108, 1104, 1115, 1107, - 1107, 1108, 1110, 1114, 1113, 1111, 1104, 1112, 1104, 1117, - 1112, 1104, 1113, 1118, 0, 1116, 1115, 1117, 1121, 1119, - 1116, 1114, 1120, 1124, 1122, 1115, 1125, 1131, 1118, 1130, - 1126, 1113, 1122, 1128, 1121, 1120, 1117, 1127, 1129, 1131, - 1118, 1119, 1168, 0, 1127, 1121, 1119, 1130, 1125, 1120, - 1124, 1122, 1126, 1125, 1131, 1128, 1130, 1126, 1132, 1133, - 1128, 1129, 1134, 1135, 1127, 1129, 1137, 1133, 1136, 0, - 1132, 1138, 1139, 1140, 1168, 1135, 1141, 1134, 1139, 1138, - 1142, 1137, 1140, 1145, 1143, 1132, 1133, 1144, 1136, 1134, - - 1135, 1143, 1142, 1137, 1144, 1136, 1146, 1141, 1138, 1139, - 1140, 1145, 1148, 1141, 1147, 0, 1150, 1142, 1146, 1151, - 1145, 1143, 1147, 1149, 1144, 1149, 1151, 1148, 1150, 1156, - 1154, 1155, 1158, 1146, 1159, 1160, 1164, 1172, 1157, 1148, - 1160, 1147, 1154, 1150, 1155, 1157, 1151, 1161, 1156, 1159, - 1149, 1162, 1163, 1186, 1158, 1161, 1156, 1154, 1155, 1158, - 0, 1159, 1164, 1164, 1162, 1157, 1163, 1160, 1166, 1172, - 1169, 0, 1167, 1171, 1161, 1192, 1192, 1187, 1162, 1163, - 1165, 1170, 1166, 1173, 1165, 1186, 1175, 1165, 1165, 0, - 1167, 1171, 1165, 0, 1174, 1166, 1169, 1169, 1165, 1167, - - 1171, 1177, 1165, 1170, 1192, 1173, 1165, 1165, 1170, 1187, - 1173, 1165, 1175, 1175, 1165, 1165, 1174, 1176, 1178, 1165, - 1178, 1174, 1181, 1176, 1179, 1165, 1180, 1177, 1177, 1165, - 1182, 1179, 1183, 1184, 1185, 1180, 1188, 1182, 1191, 1189, - 1181, 0, 1178, 1185, 1176, 1178, 1184, 1178, 1195, 1181, - 0, 1179, 1193, 1180, 1183, 1208, 1218, 1182, 1188, 1183, - 1184, 1185, 1189, 1188, 1191, 1191, 1189, 1190, 1193, 1196, - 1198, 1195, 1190, 1197, 1190, 1195, 1190, 1200, 1190, 1193, - 1202, 1196, 1197, 1218, 1199, 1190, 1201, 1208, 1198, 1199, - 1204, 1201, 0, 1203, 1190, 1200, 1196, 1198, 1209, 1190, - - 1197, 1190, 1202, 1190, 1200, 1190, 1203, 1202, 1204, 1207, - 1205, 1206, 1210, 1201, 1211, 1213, 1199, 1204, 1205, 1206, - 1203, 1212, 1207, 1215, 1209, 1209, 1214, 1211, 1213, 1217, - 1220, 1210, 1215, 1216, 1219, 1216, 1207, 1205, 1206, 1210, - 1221, 1211, 1213, 1212, 1214, 1223, 1219, 1225, 1212, 1224, - 1215, 1217, 1226, 1214, 1227, 1225, 1217, 1220, 1229, 1228, - 1216, 1219, 1230, 0, 1234, 1221, 1228, 1221, 1231, 1223, - 1226, 1224, 1223, 1235, 1225, 1236, 1224, 1232, 1233, 1226, - 1235, 1227, 1240, 1232, 1233, 1229, 1228, 1237, 1230, 1230, - 1231, 1234, 1239, 1238, 1237, 1231, 1244, 1241, 1243, 1236, - - 1235, 0, 1236, 1246, 1232, 1233, 1241, 1240, 1244, 1240, - 1239, 1245, 1247, 1248, 1237, 1238, 1246, 0, 1251, 1239, - 1238, 1249, 1243, 1244, 1241, 1243, 1253, 1250, 1252, 1258, - 1246, 1254, 1248, 1245, 1247, 1253, 1255, 1256, 1245, 1247, - 1248, 1259, 0, 1249, 1251, 1251, 1261, 1260, 1249, 1250, - 1252, 1256, 1254, 1253, 1250, 1252, 1255, 1262, 1254, 1263, - 1264, 1258, 1265, 1255, 1256, 1266, 1271, 1263, 1268, 1260, - 1269, 1272, 1266, 1259, 1260, 1262, 1264, 1269, 1261, 1270, - 1268, 1273, 1275, 1270, 1262, 0, 1263, 1264, 1276, 1265, - 1279, 0, 1266, 1277, 1276, 1268, 1280, 1269, 1271, 1282, - - 1277, 1276, 1273, 1272, 1278, 1279, 1270, 1281, 1273, 1280, - 1286, 1278, 1283, 1287, 1275, 1276, 1281, 1279, 1285, 1283, - 1277, 1276, 1284, 1280, 1284, 1282, 1282, 1285, 1289, 1288, - 1291, 1278, 1286, 1288, 1281, 1293, 1292, 1286, 1291, 1283, - 1287, 1292, 1294, 0, 1293, 1285, 1295, 1297, 1296, 1284, - 1289, 1298, 1300, 1302, 1298, 1289, 1288, 1291, 1301, 1297, - 1294, 1296, 1293, 1298, 1299, 1295, 1302, 1299, 1292, 1294, - 1300, 1304, 1305, 1295, 1297, 1296, 0, 1306, 1298, 1300, - 1302, 1298, 1307, 1301, 1308, 1301, 1299, 1307, 1309, 1309, - 1311, 1299, 1308, 1306, 1299, 1305, 1310, 1312, 1313, 1305, - - 1315, 1314, 1316, 1304, 1306, 1310, 0, 1313, 1314, 1316, - 1321, 1308, 1311, 1318, 1307, 1309, 1322, 1311, 1325, 1312, - 1326, 1319, 1315, 1310, 1312, 1313, 1318, 1315, 1314, 1316, - 1319, 0, 1320, 1323, 0, 1326, 1321, 1321, 1324, 1322, - 1318, 1320, 1323, 1322, 1327, 1328, 1324, 1326, 1319, 1329, - 1325, 1330, 1327, 1332, 1331, 1336, 1338, 1333, 1328, 1320, - 1323, 1329, 1331, 1330, 1334, 1324, 1337, 1339, 1338, 1344, - 1335, 1327, 1328, 1336, 1341, 1332, 1329, 1333, 1330, 1335, - 1332, 1331, 1336, 1338, 1333, 1339, 1334, 1342, 1340, 1343, - 1345, 1334, 1337, 1337, 1339, 1340, 1344, 1335, 1346, 1347, - - 1341, 1341, 1343, 1349, 1350, 1347, 1348, 1354, 0, 1346, - 0, 1345, 1351, 0, 1352, 1340, 1343, 1345, 1357, 1342, - 1355, 0, 1358, 0, 1356, 1346, 1347, 1357, 1348, 1362, - 1361, 1359, 1365, 1348, 1354, 1349, 1350, 1358, 1351, 1351, - 1352, 1352, 1356, 1355, 1359, 1357, 1363, 1355, 1360, 1358, - 1361, 1356, 1364, 1363, 1365, 1362, 1362, 1361, 1359, 1365, - 1360, 1366, 1367, 1368, 1369, 1370, 0, 1371, 1368, 1369, - 1367, 1364, 1370, 1363, 1366, 1360, 1372, 1373, 1375, 1364, - 1374, 1379, 1376, 1382, 1372, 1373, 1385, 0, 1366, 1367, - 1376, 0, 1370, 1371, 1371, 1368, 1369, 1380, 1374, 1377, - - 1375, 1378, 1384, 1372, 1373, 1375, 1377, 1374, 1383, 1376, - 1378, 1381, 1381, 1379, 1386, 1382, 1383, 1387, 1385, 1380, - 1390, 1391, 1386, 1384, 1380, 1387, 1377, 1391, 1378, 1384, - 1392, 1388, 1389, 1390, 1393, 1383, 1395, 1396, 1381, 1388, - 1389, 1386, 1392, 1394, 1387, 1397, 1398, 1390, 1391, 0, - 1410, 1395, 1399, 1401, 0, 1400, 1405, 1392, 1388, 1389, - 1393, 1393, 1402, 1395, 1396, 1405, 1406, 1394, 1398, 1400, - 1394, 1401, 1397, 1398, 1403, 1399, 1402, 1410, 1403, 1399, - 1401, 1411, 1400, 1405, 1407, 1408, 1409, 1412, 1406, 1402, - 1413, 1403, 1408, 1406, 1415, 1414, 1407, 1409, 1421, 1403, - - 1416, 1403, 1413, 1411, 1422, 1403, 1417, 1418, 1411, 1414, - 0, 1407, 1408, 1409, 1418, 1419, 1415, 1413, 1403, 1412, - 1428, 1415, 1414, 1416, 1419, 1420, 1424, 1416, 1427, 1417, - 1421, 1422, 1420, 1417, 1418, 1424, 1429, 1426, 1430, 1432, - 1435, 0, 1419, 1426, 1442, 1430, 1428, 1428, 1434, 1436, - 1427, 1437, 1420, 1424, 1440, 1427, 1439, 1443, 0, 1441, - 1436, 1440, 1437, 1446, 1426, 1430, 1432, 1435, 1429, 1443, - 1442, 1442, 1434, 1444, 1445, 1434, 1436, 1441, 1437, 1444, - 1439, 1440, 1445, 1439, 1443, 1446, 1441, 1448, 1449, 1447, - 1446, 1452, 1451, 1452, 1450, 0, 1453, 1454, 1455, 1457, - - 1444, 1445, 1447, 1450, 1451, 1456, 1449, 1455, 1458, 0, - 1454, 1457, 1461, 1448, 1448, 1449, 1447, 1459, 1452, 1451, - 1464, 1450, 1453, 1453, 1454, 1455, 1457, 1456, 1462, 1460, - 1463, 1466, 1456, 1462, 1465, 1458, 1460, 1468, 1461, 1461, - 1459, 1469, 1465, 1464, 1459, 1470, 1463, 1464, 1475, 1471, - 1473, 1476, 1469, 1466, 1470, 1462, 1460, 1463, 1466, 1472, - 1472, 1465, 1471, 1473, 1468, 1479, 1480, 1472, 1469, 1474, - 1483, 1474, 1470, 1476, 1475, 1475, 1471, 1473, 1476, 1481, - 1484, 1477, 1478, 1482, 1480, 1485, 1472, 1472, 1477, 1478, - 1482, 1486, 1479, 1480, 1487, 1483, 1474, 1483, 1486, 0, - - 1489, 1481, 1484, 1490, 1491, 0, 1481, 1484, 1477, 1478, - 1482, 1492, 1491, 1489, 1494, 1498, 1495, 1485, 1486, 1495, - 1496, 0, 1497, 1500, 1499, 1504, 1487, 1489, 1498, 1501, - 1490, 1491, 1492, 1499, 1502, 1500, 1494, 1505, 1492, 1507, - 1504, 1494, 1498, 1495, 1505, 1503, 1496, 1496, 1497, 1497, - 1500, 1499, 1504, 1501, 1503, 1506, 1501, 1511, 1506, 1508, - 1502, 1502, 1515, 1516, 1505, 1512, 1513, 1509, 1513, 1524, - 1506, 1507, 1503, 1517, 1514, 1511, 1519, 1518, 1524, 1506, - 1520, 1508, 1506, 1509, 1511, 1506, 1508, 1512, 1521, 1515, - 1522, 1509, 1512, 1513, 1509, 1516, 1524, 1506, 1514, 1518, - - 1523, 1514, 1519, 1519, 1518, 1517, 1520, 1520, 1525, 1527, - 1509, 1526, 1522, 1528, 1523, 1529, 1525, 1522, 1526, 1530, - 1521, 1531, 1532, 0, 1534, 0, 1532, 1523, 1533, 1539, - 1535, 1536, 1537, 1527, 0, 1525, 1527, 1538, 1526, 1537, - 1536, 1530, 1539, 1544, 1538, 1528, 1530, 1529, 1540, 1532, - 1533, 1534, 1535, 1531, 1541, 1533, 1539, 1535, 1536, 1537, - 1542, 1540, 1547, 1543, 1538, 1543, 1545, 1541, 1544, 1542, - 1544, 1548, 1550, 1551, 1545, 1540, 1552, 1547, 1549, 1554, - 1551, 1541, 1553, 1552, 1556, 1554, 1548, 1542, 1558, 1547, - 1543, 1560, 1549, 1545, 1557, 1553, 1561, 1559, 1548, 1563, - - 1551, 1557, 1563, 1552, 1550, 1549, 1554, 1562, 1561, 1553, - 1558, 1556, 1559, 1564, 1565, 1558, 1566, 1560, 1560, 1567, - 1562, 1557, 1564, 1561, 1559, 1569, 1563, 1568, 1566, 1573, - 1568, 1573, 1565, 1575, 1562, 1574, 1569, 1571, 1576, 1567, - 1564, 1565, 1571, 1566, 1578, 1568, 1567, 0, 1577, 1571, - 1579, 1580, 1569, 1578, 1568, 1586, 1573, 1568, 1581, 1574, - 1575, 1583, 1574, 1577, 1571, 1576, 1586, 1584, 1582, 1571, - 1591, 1578, 1581, 1585, 1579, 1577, 1582, 1579, 1580, 1587, - 1590, 1585, 1586, 1583, 1588, 1581, 1592, 1589, 1583, 1584, - 1589, 1596, 1588, 0, 1584, 1582, 1593, 1587, 1590, 1595, - - 1585, 1594, 1591, 1593, 1596, 1589, 1587, 1590, 1595, 1597, - 1598, 1588, 1603, 1592, 1589, 1594, 1604, 1589, 1596, 1601, - 1597, 1601, 1602, 1593, 1605, 1598, 1595, 1604, 1594, 0, - 1606, 1602, 0, 1607, 1609, 1610, 1597, 1598, 1603, 1603, - 1615, 1612, 1605, 1604, 1610, 1608, 1601, 1607, 1608, 1602, - 1612, 1605, 1606, 1615, 1616, 1618, 1609, 1606, 1611, 1607, - 1607, 1609, 1610, 1608, 1611, 1613, 1616, 1615, 1612, 1619, - 1613, 1617, 1608, 1621, 1607, 1608, 1617, 1618, 1620, 1622, - 1623, 1616, 1618, 1624, 0, 1611, 1627, 1620, 1629, 1625, - 1628, 1632, 1630, 1627, 0, 1645, 0, 1613, 1617, 1634, - - 1621, 1619, 1623, 1628, 1636, 1620, 1630, 1623, 1631, 1638, - 1625, 1622, 1636, 1627, 1631, 1624, 1625, 1628, 1634, 1630, - 1629, 1637, 1639, 1632, 1640, 1641, 1634, 1645, 1638, 1637, - 1642, 1636, 1631, 1643, 1644, 1631, 1638, 1646, 1640, 1641, - 1639, 1631, 0, 1642, 1647, 1648, 1643, 1649, 1637, 1639, - 1650, 1640, 1641, 1652, 1649, 1644, 1651, 1642, 1647, 1650, - 1643, 1644, 1653, 1654, 1651, 1655, 1656, 1652, 1654, 1646, - 1658, 1647, 1648, 1660, 1649, 1656, 1655, 1650, 1659, 1661, - 1652, 1662, 1644, 1651, 1664, 1659, 1668, 1663, 1669, 1667, - 1654, 1665, 1655, 1656, 1653, 1665, 1660, 1658, 1668, 1670, - - 1660, 1661, 1664, 1662, 1667, 1659, 1661, 1670, 1662, 1663, - 1671, 1664, 1672, 1668, 1663, 1669, 1667, 1673, 1665, 1674, - 1672, 1675, 1679, 1676, 1680, 1671, 1670, 1677, 1681, 0, - 1679, 1680, 1674, 1691, 1683, 1684, 1685, 1671, 1676, 1672, - 1682, 1675, 1677, 1683, 1673, 1686, 1674, 1687, 1675, 1679, - 1676, 1680, 1690, 1689, 1677, 1682, 1684, 1692, 1693, 1695, - 1681, 1683, 1684, 1685, 1694, 1691, 1700, 1682, 1698, 1686, - 1690, 1696, 1686, 1693, 1687, 1689, 1697, 1698, 1696, 1690, - 1689, 1697, 1701, 1695, 1692, 1693, 1695, 1699, 1700, 1694, - 1702, 1694, 1703, 1700, 1704, 1698, 1699, 1706, 1696, 1711, - - 1705, 1709, 1712, 1697, 1701, 1707, 1704, 1703, 1702, 1701, - 1706, 1708, 1707, 1710, 1699, 1706, 0, 1702, 1708, 1703, - 1722, 1704, 1705, 1709, 1706, 1710, 1711, 1705, 1709, 1713, - 1717, 1715, 1707, 1708, 1712, 1713, 1716, 1706, 1708, 1715, - 1710, 1717, 1718, 1716, 1731, 1708, 1719, 1722, 1720, 1718, - 1720, 1734, 1721, 1723, 1725, 1724, 1713, 1717, 1715, 1726, - 1727, 1720, 1724, 1716, 1728, 1729, 1727, 1730, 1736, 1718, - 1728, 1719, 1732, 1719, 1738, 1720, 1731, 1720, 1721, 1721, - 1723, 1725, 1724, 1734, 1735, 1726, 1726, 1727, 1739, 1742, - 1730, 1728, 1729, 1735, 1730, 1737, 1732, 1737, 1738, 1732, - - 1736, 1738, 1740, 1741, 1743, 1744, 1747, 1745, 0, 1740, - 1743, 1735, 1749, 1746, 1751, 1739, 1742, 1750, 1754, 1749, - 0, 0, 1737, 1754, 1750, 1741, 1757, 1744, 1760, 1740, - 1741, 1743, 1744, 1745, 1745, 1746, 1755, 0, 1747, 1749, - 1746, 1748, 1748, 1748, 1750, 1752, 1751, 1756, 1748, 1755, - 1754, 1757, 1752, 1757, 1759, 1758, 1748, 1762, 1761, 1756, - 1760, 1763, 1764, 1755, 1762, 1766, 1759, 1763, 1748, 1748, - 1748, 1758, 1752, 1767, 1756, 1748, 1761, 1765, 1765, 1769, - 1767, 1759, 1758, 1770, 1762, 1761, 1771, 1774, 1763, 1764, - 1768, 1766, 1766, 1771, 1775, 1768, 1775, 1776, 1778, 1780, - - 1767, 1779, 1781, 1782, 1765, 1769, 1769, 1779, 1783, 1782, - 1770, 1787, 1784, 1771, 1774, 1776, 1778, 1768, 1785, 1791, - 1783, 1775, 1786, 1786, 1776, 1778, 1788, 1788, 1779, 1781, - 1782, 1780, 1784, 1789, 1792, 1783, 1785, 1787, 1787, 1784, - 1793, 1791, 1794, 1795, 1789, 1785, 1791, 1793, 1796, 1786, - 1797, 1798, 1799, 1788, 1800, 1801, 1802, 1805, 1805, 1804, - 1789, 1800, 1794, 1801, 1803, 1807, 1792, 1793, 1804, 1794, - 1799, 1802, 1806, 1798, 1808, 1795, 0, 1797, 1798, 1799, - 1796, 1800, 1801, 1802, 1805, 1809, 1804, 1811, 1803, 1810, - 1814, 1803, 1809, 1813, 1816, 1814, 1815, 1807, 1806, 1806, - - 1813, 1810, 0, 1811, 1821, 1817, 1808, 1818, 1822, 1824, - 1811, 0, 1809, 1817, 1811, 1825, 1810, 1814, 1815, 1818, - 1813, 1816, 1823, 1815, 1827, 1820, 1834, 1821, 0, 1822, - 1811, 1821, 1817, 1820, 1818, 1822, 1824, 1828, 1825, 1826, - 1823, 1829, 1825, 1828, 1826, 1830, 1837, 1831, 1835, 1823, - 1832, 1827, 1820, 1830, 1829, 1826, 1833, 1832, 1834, 1836, - 1835, 1838, 1839, 1833, 1828, 1844, 1826, 1848, 1829, 1831, - 1849, 1826, 1830, 1837, 1831, 1835, 1841, 1832, 1846, 1842, - 1853, 1836, 1851, 1833, 1842, 1839, 1836, 1838, 1838, 1839, - 1843, 1847, 1844, 1852, 1841, 1842, 1847, 1843, 1855, 1848, - - 1850, 1850, 1849, 1841, 1851, 1846, 1842, 1856, 1852, 1851, - 1859, 1842, 1853, 1855, 1857, 1861, 1858, 1843, 1858, 1860, - 1852, 1863, 1862, 1847, 1860, 1855, 1871, 1850, 1869, 1857, - 1856, 1866, 1867, 1872, 1856, 1865, 1863, 1870, 1873, 1866, - 1874, 1857, 1859, 1858, 1862, 1873, 1860, 1861, 1863, 1862, - 1865, 1876, 1869, 1871, 1867, 1869, 1875, 1878, 1866, 1867, - 1872, 1877, 1865, 1870, 1870, 1873, 1882, 1880, 0, 1884, - 1883, 1886, 1874, 1876, 0, 1878, 1887, 1875, 1876, 1888, - 1889, 1890, 1877, 1875, 1878, 1883, 1886, 1891, 1877, 1880, - 1882, 1887, 1893, 1882, 1880, 1884, 1884, 1883, 1886, 1890, - - 1892, 1888, 1894, 1887, 1895, 1896, 1888, 1889, 1890, 1891, - 1898, 1895, 1897, 1899, 1891, 0, 1893, 1901, 1898, 1893, - 1900, 1897, 1892, 1896, 1902, 1903, 1904, 1892, 1905, 1894, - 0, 1895, 1896, 1902, 1907, 1904, 1899, 1898, 1909, 1897, - 1899, 1905, 1900, 1903, 1910, 1907, 1912, 1900, 1908, 1901, - 1911, 1902, 1903, 1904, 1913, 1905, 1909, 1908, 1915, 1919, - 1907, 1907, 1914, 1921, 1912, 1909, 1927, 1922, 1914, 1913, - 1910, 1910, 1907, 1912, 1916, 1908, 1911, 1911, 1922, 1925, - 1915, 1913, 1923, 1926, 1931, 1915, 1919, 1921, 1916, 1914, - 1921, 1925, 1928, 1923, 1922, 1929, 1926, 0, 1927, 1930, - - 1934, 1916, 1928, 1935, 1932, 1938, 1925, 1937, 1940, 1923, - 1926, 1931, 1939, 1940, 1942, 1943, 0, 0, 1941, 1928, - 1986, 1929, 1929, 1932, 1930, 1941, 1930, 1934, 1937, 1935, - 1935, 1932, 1939, 1943, 1937, 1940, 1945, 1938, 1944, 1939, - 1942, 1942, 1943, 1946, 1944, 1941, 1947, 1948, 1948, 1952, - 1949, 1945, 1986, 1953, 1950, 1955, 1952, 1953, 1946, 1956, - 1958, 1947, 1949, 1945, 1954, 1944, 1959, 1950, 1956, 0, - 1946, 1957, 1963, 1947, 1948, 1950, 1952, 1949, 1957, 1954, - 1953, 1950, 1955, 1960, 1958, 1962, 1956, 1958, 1959, 1965, - 1960, 1954, 1964, 1959, 1950, 1966, 1968, 1963, 1957, 1963, - - 1970, 1964, 1971, 1972, 0, 1974, 1973, 1962, 1977, 1970, - 1960, 1965, 1962, 1974, 1968, 1966, 1965, 1976, 1972, 1964, - 1971, 1977, 1966, 1968, 1978, 1979, 1979, 1970, 1980, 1971, - 1972, 1973, 1974, 1973, 1981, 1977, 1982, 1984, 1983, 1988, - 1985, 0, 1976, 0, 1976, 1993, 1984, 1985, 1987, 1989, - 1980, 1978, 1979, 1988, 1991, 1980, 1992, 1997, 1982, 1981, - 1983, 1981, 1991, 1982, 1984, 1983, 1988, 1985, 1989, 1992, - 1987, 1994, 1993, 1995, 1998, 1987, 1989, 1996, 1999, 2000, - 2002, 1991, 2004, 1992, 1996, 1995, 2005, 2003, 2000, 1997, - 0, 2001, 0, 2006, 2007, 0, 1998, 1994, 1994, 2001, - - 1995, 1998, 2003, 1999, 1996, 1999, 2000, 2002, 2004, 2004, - 2001, 2006, 2005, 2005, 2003, 2008, 2007, 2014, 2001, 2010, - 2006, 2007, 2010, 2011, 2008, 2012, 2001, 2013, 2015, 2018, - 2017, 2012, 2013, 2021, 2022, 2014, 2019, 2010, 2024, 0, - 0, 2022, 2008, 2015, 2014, 2017, 2010, 2021, 2011, 2010, - 2011, 2018, 2012, 2023, 0, 2015, 2018, 2017, 2019, 2013, - 2021, 2022, 2029, 2019, 2025, 2024, 2026, 2027, 2028, 2031, - 2032, 2023, 2033, 2025, 2029, 2026, 2034, 0, 2027, 2033, - 2023, 2028, 2035, 2036, 2031, 2032, 2041, 2039, 2042, 2029, - 2043, 2025, 2042, 2026, 2027, 2028, 2031, 2032, 2034, 2033, - - 2039, 2036, 2043, 2034, 2035, 2046, 2047, 2041, 2039, 2035, - 2036, 2044, 2048, 2041, 2039, 2042, 2045, 2043, 2045, 2049, - 2044, 2050, 2051, 2046, 2056, 2052, 2053, 2039, 2057, 2050, - 2048, 2054, 2046, 2047, 2060, 2058, 2054, 2055, 2044, 2048, - 2053, 2060, 2055, 2045, 2059, 2051, 2049, 2052, 2050, 2051, - 2063, 2066, 2052, 2053, 2064, 2065, 2056, 2067, 2054, 2058, - 2057, 2060, 2058, 2059, 2070, 2069, 2071, 2073, 2064, 2055, - 2068, 2059, 2072, 2065, 2069, 2075, 0, 2063, 2066, 2064, - 2064, 2064, 2065, 2067, 2067, 2068, 2074, 2077, 2071, 2079, - 0, 0, 2069, 2071, 2073, 2064, 2070, 2068, 2072, 2072, - - 2083, 2082, 2078, 2082, 2080, 2085, 2064, 2075, 2074, 2078, - 2077, 2080, 2079, 2074, 2077, 2084, 2079, 2085, 2086, 2084, - 2091, 2087, 2083, 2088, 2090, 2091, 2089, 2083, 2082, 2078, - 2087, 2080, 2085, 2089, 2088, 2092, 2093, 2094, 2095, 2098, - 2086, 2097, 2084, 2096, 2096, 2086, 2090, 2091, 2087, 2094, - 2088, 2090, 2100, 2089, 2098, 2101, 2103, 2105, 0, 2093, - 2095, 2097, 2092, 2093, 2094, 2095, 2098, 2099, 2097, 2101, - 2096, 2102, 2111, 2106, 2100, 2099, 2105, 2107, 2111, 2100, - 2102, 2106, 2101, 2103, 2105, 2107, 2108, 2110, 2109, 2115, - 2108, 2109, 2112, 2119, 2099, 2110, 2113, 2117, 2102, 2111, - - 2106, 2115, 2113, 2120, 2107, 2118, 2121, 2112, 2123, 2127, - 2122, 2117, 2124, 2108, 2110, 2109, 2115, 2125, 2119, 2112, - 2119, 2126, 2123, 2113, 2117, 2124, 2118, 2128, 2121, 2129, - 2120, 2125, 2118, 2121, 2122, 2123, 2127, 2122, 2130, 2124, - 2131, 2129, 2132, 2133, 2125, 2132, 2134, 2126, 2126, 2135, - 2138, 2139, 2130, 2137, 2128, 2141, 2129, 2138, 2139, 2140, - 2132, 2142, 2144, 0, 2146, 2130, 2131, 2131, 0, 2132, - 2133, 2135, 2132, 2134, 2140, 2137, 2135, 2138, 2139, 2143, - 2137, 2145, 2141, 2147, 2149, 2148, 2140, 2143, 2142, 2144, - 2145, 2146, 2150, 2154, 2156, 2147, 2151, 2152, 2157, 2159, - - 2153, 2154, 0, 0, 2164, 2162, 2143, 2148, 2145, 2151, - 2147, 2149, 2148, 2153, 2158, 2152, 2156, 2161, 0, 2150, - 2154, 2156, 2158, 2151, 2152, 2157, 2159, 2153, 2160, 2162, - 2163, 2164, 2162, 2168, 2165, 2166, 2170, 2160, 2161, 2172, - 2167, 2158, 2165, 2170, 2161, 2163, 2171, 2166, 2167, 2174, - 2171, 2172, 2173, 0, 2180, 2160, 2163, 2163, 2176, 2177, - 2168, 2165, 2166, 2170, 2182, 2183, 2172, 2167, 2187, 2175, - 2178, 2177, 2163, 2171, 2232, 2173, 2174, 2175, 2183, 2173, - 2176, 2180, 2178, 2181, 2182, 2176, 2177, 2186, 2186, 2184, - 2181, 2182, 2183, 2185, 2187, 2187, 2175, 2178, 2184, 2188, - - 2189, 2232, 2185, 2192, 2190, 2199, 2199, 2193, 2196, 0, - 2181, 2194, 2204, 2195, 2186, 2195, 2184, 2188, 2192, 2190, - 2185, 2190, 2196, 2198, 2206, 2189, 2188, 2189, 2190, 2193, - 2192, 2190, 2199, 2194, 2193, 2196, 2197, 2201, 2194, 2202, - 2195, 2203, 2197, 2205, 2204, 2198, 2190, 2207, 2190, 2205, - 2198, 2208, 2209, 2203, 2209, 2217, 2206, 2210, 2211, 2201, - 0, 2202, 2212, 2197, 2201, 2213, 2202, 0, 2203, 2207, - 2205, 2210, 2214, 2208, 2207, 2215, 0, 2218, 2208, 2209, - 2212, 2216, 2211, 2213, 2210, 2211, 2223, 2217, 2219, 2212, - 2214, 2221, 2213, 2215, 2216, 2224, 2225, 2226, 2221, 2214, - - 0, 0, 2215, 2227, 2223, 2226, 2251, 2233, 2216, 2218, - 2228, 2219, 2228, 2223, 2236, 2219, 2230, 2228, 2221, 2233, - 2231, 2224, 2224, 2226, 2226, 2227, 2234, 2230, 2225, 2236, - 2227, 2231, 2226, 2238, 2233, 2237, 2239, 2228, 2251, 2228, - 2241, 2236, 2243, 2230, 2234, 2238, 2237, 2231, 2242, 2243, - 2244, 2239, 2245, 2234, 2246, 2248, 0, 2252, 2253, 2249, - 2238, 0, 2237, 2239, 2241, 2244, 2250, 2241, 2254, 2243, - 2242, 2255, 0, 2256, 2261, 2242, 2253, 2244, 2258, 2245, - 2246, 2246, 2248, 2249, 2255, 2253, 2249, 2257, 2250, 2252, - 2260, 2258, 0, 2250, 2262, 2254, 2259, 2263, 2255, 2256, - - 2256, 2266, 2257, 2265, 2259, 2258, 2261, 2262, 2267, 2268, - 2269, 2270, 2273, 2271, 2257, 2269, 2260, 2260, 2272, 2263, - 2271, 2262, 2276, 2259, 2263, 2266, 2265, 2277, 2266, 2270, - 2265, 2268, 2274, 2283, 2277, 2267, 2268, 0, 2270, 2273, - 2271, 2272, 2269, 2278, 2276, 2272, 2274, 2279, 2280, 2276, - 2278, 2281, 2284, 2285, 2277, 2282, 2286, 2290, 2281, 2274, - 2279, 2288, 2285, 2287, 2286, 2283, 2293, 2288, 2295, 2292, - 2278, 2280, 2290, 2284, 2279, 2280, 2291, 2282, 2281, 2284, - 2285, 2294, 2282, 2286, 2290, 2287, 2298, 2291, 2288, 2299, - 2287, 2292, 2307, 2295, 2300, 2295, 2292, 2302, 2293, 2298, - - 2294, 2301, 2301, 2291, 2305, 2306, 2308, 2307, 2294, 2312, - 0, 2309, 2316, 2298, 2328, 2299, 2299, 2314, 2300, 2307, - 2320, 2300, 2324, 2302, 2302, 2316, 2314, 2305, 2301, 2309, - 2317, 2305, 2322, 2308, 2321, 2321, 2312, 2306, 2309, 2316, - 2323, 2317, 2320, 2326, 2314, 2329, 2328, 2320, 2331, 2324, - 2334, 2332, 2330, 2331, 2322, 2336, 2338, 2317, 2334, 2322, - 2340, 2321, 2323, 2330, 2339, 2335, 2343, 2323, 2349, 2340, - 2326, 2329, 2329, 2332, 2338, 2331, 2341, 2334, 2332, 2330, - 2335, 2344, 2336, 2338, 2348, 2350, 2345, 2340, 2341, 2346, - 2351, 2352, 2335, 2343, 2345, 2349, 2339, 2353, 2346, 2351, - - 2354, 2355, 2356, 2341, 2358, 2344, 2357, 2350, 2344, 2352, - 2348, 2348, 2350, 2345, 2355, 2356, 2346, 2351, 2352, 2353, - 2360, 2357, 2361, 2359, 2353, 2354, 2358, 2354, 2355, 2356, - 2359, 2358, 2362, 2357, 2363, 2364, 2365, 2366, 2367, 0, - 2368, 2370, 2360, 2369, 0, 0, 2366, 2360, 2372, 2361, - 2359, 2365, 2374, 2376, 0, 2372, 2370, 2371, 2377, 2362, - 2367, 2363, 2364, 2365, 2366, 2367, 2368, 2368, 2370, 2369, - 2369, 2373, 2371, 2375, 2378, 2372, 2379, 2380, 2381, 2374, - 2376, 2375, 2373, 2386, 2371, 2377, 2383, 2382, 2384, 2385, - 2378, 2379, 0, 2381, 2382, 2384, 2385, 2380, 2373, 2387, - - 2375, 2378, 2389, 2379, 2380, 2381, 2388, 2388, 2383, 2389, - 2386, 2390, 2393, 2383, 2382, 2384, 2385, 2387, 2391, 2392, - 2402, 2391, 2394, 2395, 2396, 2390, 2387, 2393, 2397, 2389, - 2400, 2406, 2392, 2388, 2399, 2400, 2396, 2404, 2390, 2393, - 2397, 2395, 2407, 2399, 2402, 2391, 2392, 2402, 2394, 2394, - 2395, 2396, 2401, 2403, 2405, 2397, 2401, 2400, 2406, 2404, - 2408, 2399, 2410, 2413, 2404, 2412, 2403, 2414, 2418, 2407, - 2415, 0, 2413, 2416, 0, 2418, 2405, 2420, 2415, 2401, - 2403, 2405, 2420, 2414, 2419, 2416, 2408, 2408, 2410, 2410, - 2413, 2412, 2412, 2419, 2414, 2418, 2421, 2415, 2422, 2423, - - 2416, 2425, 2424, 2421, 2420, 2426, 2423, 2428, 2425, 2427, - 2430, 2419, 2431, 2434, 2426, 2433, 2422, 2435, 2427, 2438, - 2433, 0, 0, 2421, 2431, 2422, 2423, 2424, 2425, 2424, - 2437, 2434, 2426, 2428, 2428, 2441, 2427, 2430, 2439, 2431, - 2434, 2440, 2433, 2443, 2435, 2444, 2438, 2439, 2437, 2442, - 2440, 2446, 2443, 2445, 2444, 2441, 2447, 2437, 2448, 2446, - 2449, 2442, 2441, 2450, 2445, 2439, 2451, 2452, 2440, 2449, - 2443, 2453, 2444, 2454, 2455, 2457, 2442, 2460, 2446, 2462, - 2445, 2456, 2454, 2447, 2450, 2448, 2455, 2449, 2458, 2456, - 2450, 2459, 2461, 2451, 2452, 2458, 2463, 2457, 2459, 2460, - - 2454, 2455, 2457, 2453, 2460, 2464, 2462, 2468, 2456, 2470, - 0, 0, 2466, 2472, 2469, 2458, 2479, 2461, 2459, 2461, - 2466, 2463, 2469, 2463, 2470, 2468, 2471, 2478, 2482, 0, - 2473, 2487, 2464, 2471, 2468, 2472, 2470, 2473, 2474, 2466, - 2472, 2469, 2477, 2479, 2480, 2483, 2474, 2486, 2485, 2477, - 2481, 2478, 2488, 2471, 2478, 2482, 2480, 2473, 2487, 2481, - 2485, 2490, 2493, 2496, 2497, 2474, 2488, 2495, 2483, 2477, - 2486, 2480, 2483, 2490, 2486, 2485, 2491, 2481, 2492, 2488, - 2498, 2496, 2495, 2491, 2499, 2492, 2500, 2497, 2490, 2493, - 2496, 2497, 2499, 2501, 2495, 2503, 2502, 2504, 2505, 0, - - 2510, 2512, 2513, 2491, 2511, 2492, 2503, 2498, 0, 2511, - 0, 2499, 2504, 2500, 2502, 2501, 2513, 2515, 2514, 2516, - 2501, 2517, 2503, 2502, 2504, 2505, 2510, 2510, 2512, 2513, - 2518, 2511, 2514, 2520, 2523, 2515, 2524, 2516, 2525, 0, - 2526, 2528, 2518, 0, 2515, 2514, 2516, 2527, 2517, 2528, - 2530, 2525, 2529, 2533, 2534, 2536, 2523, 2518, 2524, 2532, - 2520, 2523, 2526, 2524, 2537, 2525, 2527, 2526, 2528, 2530, - 2529, 2532, 2535, 2538, 2527, 2533, 2534, 2530, 2539, 2529, - 2533, 2534, 2536, 2541, 2535, 2540, 2532, 2542, 2543, 2544, - 2546, 2537, 2541, 2559, 0, 2545, 2542, 2547, 2539, 2535, - - 2538, 2548, 2546, 2549, 2552, 2539, 2553, 2540, 2554, 0, - 2541, 2544, 2540, 2558, 2542, 2556, 2544, 2546, 2552, 2547, - 2543, 2545, 2545, 2557, 2547, 2559, 2558, 2561, 2548, 2555, - 2549, 2552, 2554, 2553, 2555, 2554, 2560, 2556, 2562, 2563, - 2558, 2564, 2556, 2566, 2567, 2557, 2565, 2568, 0, 2561, - 2557, 2563, 2565, 2571, 2561, 2569, 2562, 2572, 2579, 2560, - 2564, 2555, 2573, 2560, 2571, 2562, 2563, 2579, 2564, 2568, - 2569, 2577, 2575, 2565, 2568, 2566, 2567, 2580, 2578, 2572, - 2571, 2583, 2569, 2581, 2572, 2579, 2573, 2575, 2582, 2573, - 2587, 2580, 2588, 2577, 2584, 0, 2594, 0, 2577, 2575, - - 2578, 2581, 2592, 2591, 2580, 2578, 2582, 2583, 2583, 2592, - 2581, 2591, 2584, 2588, 2596, 2582, 2593, 2595, 2598, 2588, - 2599, 2584, 2587, 2594, 2593, 2595, 2597, 2601, 2599, 2592, - 2591, 2605, 2596, 2603, 2604, 2606, 2607, 2606, 2597, 2601, - 2603, 2596, 2608, 2593, 2595, 2598, 2609, 2599, 2610, 2612, - 2611, 0, 2614, 2597, 2601, 2621, 2622, 2604, 2605, 2615, - 2603, 2604, 2606, 2623, 2617, 2622, 2624, 2618, 2607, 2611, - 2614, 2612, 2619, 2615, 2608, 2610, 2612, 2611, 2609, 2614, - 2618, 2621, 2621, 2622, 2619, 2626, 2615, 2617, 2627, 2630, - 2623, 2617, 2628, 2624, 2618, 2632, 2633, 2637, 2634, 2619, - - 2635, 2638, 2632, 2640, 2637, 2635, 2641, 2642, 0, 0, - 2648, 2627, 2626, 2634, 2628, 2627, 2630, 2645, 2633, 2628, - 2649, 2643, 2632, 2633, 2637, 2634, 2645, 2638, 2638, 2647, - 2640, 2642, 2635, 2641, 2642, 2643, 2647, 2648, 2650, 2651, - 2652, 2653, 2656, 2654, 2645, 2655, 2649, 2649, 2643, 2657, - 2658, 2651, 2654, 2663, 2662, 2653, 2647, 2663, 2655, 2662, - 2666, 2667, 2664, 2670, 2665, 2650, 2651, 2652, 2653, 2664, - 2654, 2665, 2655, 2658, 2656, 2669, 2657, 2658, 2673, 2676, - 2663, 2666, 2668, 2679, 2668, 2675, 2662, 2666, 2680, 2664, - 2670, 2665, 2678, 2667, 2678, 2686, 2682, 0, 2669, 0, - - 2673, 2684, 2669, 2676, 2675, 2673, 2676, 2679, 2684, 2668, - 2679, 2683, 2675, 0, 2680, 2680, 2681, 2681, 2682, 2678, - 2683, 2685, 2686, 2682, 2687, 2688, 2681, 2689, 2684, 2692, - 2693, 2690, 2695, 2688, 2685, 2693, 2691, 2687, 2683, 2690, - 2689, 2696, 2694, 2681, 2681, 2697, 0, 2698, 2685, 2688, - 2694, 2687, 2688, 2692, 2689, 2691, 2692, 2699, 2690, 2695, - 2688, 0, 2693, 2691, 2700, 2701, 0, 2696, 2696, 2694, - 2702, 2697, 2697, 2698, 2698, 2700, 2705, 2702, 2703, 2703, - 2704, 2706, 2707, 2699, 2699, 2710, 2708, 2701, 2704, 2707, - 2711, 2700, 2701, 2708, 2714, 2712, 2715, 2702, 2705, 2706, - - 2716, 2719, 2717, 2705, 2712, 2703, 0, 2704, 2706, 2707, - 0, 2724, 2710, 2708, 2711, 2720, 2715, 2711, 2721, 2722, - 2724, 2714, 2712, 2715, 2717, 2725, 2726, 2716, 2719, 2717, - 2727, 2728, 2731, 2720, 2729, 2737, 2721, 2722, 2724, 2729, - 2730, 2732, 2720, 2728, 2739, 2721, 2722, 2736, 2727, 2726, - 2731, 0, 2725, 2726, 2730, 2745, 2742, 2727, 2728, 2731, - 2740, 2741, 2737, 2741, 2732, 2742, 2729, 2730, 2732, 2736, - 2745, 2739, 2744, 2740, 2736, 2748, 2749, 2748, 2750, 2751, - 2753, 2765, 2745, 2742, 0, 2750, 2755, 2740, 2741, 2766, - 2744, 0, 2755, 2757, 2749, 2753, 2758, 0, 2759, 2744, - - 2762, 2760, 2748, 2749, 2767, 2750, 2763, 2753, 2765, 2763, - 2769, 2751, 2768, 2755, 2773, 2757, 2766, 2769, 2758, 2760, - 2757, 2770, 2762, 2758, 2759, 2759, 2776, 2762, 2760, 2770, - 2768, 2767, 2763, 2763, 2771, 2774, 2763, 2769, 2775, 2768, - 2777, 2779, 2780, 2778, 2782, 2781, 2773, 2779, 2770, 2777, - 2783, 2784, 2783, 2776, 2781, 0, 2771, 2774, 2778, 2786, - 2775, 2771, 2774, 2787, 2780, 2775, 2788, 2777, 2779, 2780, - 2778, 2789, 2781, 2790, 2795, 2791, 2782, 2783, 2784, 2792, - 2797, 2790, 2786, 0, 0, 2787, 2786, 2791, 2788, 2793, - 2787, 2792, 2799, 2788, 2797, 2798, 2793, 2789, 2789, 2800, - - 2790, 2795, 2791, 2801, 2802, 2803, 2792, 2797, 2808, 2798, - 2805, 2804, 2802, 2811, 2801, 2799, 2793, 2800, 2806, 2799, - 2807, 2807, 2798, 2812, 2803, 2816, 2800, 2806, 2805, 2821, - 2801, 2802, 2803, 2804, 2809, 2808, 2823, 2805, 2804, 2828, - 2811, 0, 2809, 2814, 2818, 2806, 2819, 2807, 2820, 2814, - 2812, 2821, 2816, 2824, 2825, 2818, 2821, 2819, 2825, 2820, - 2824, 2809, 2831, 2823, 2826, 2828, 2828, 2834, 2830, 2829, - 2814, 2818, 2826, 2819, 2834, 2820, 2830, 2835, 2836, 2837, - 2824, 2825, 2829, 2838, 2837, 2839, 2840, 2842, 2841, 2831, - 2843, 2826, 2844, 2840, 2834, 2830, 2829, 2845, 0, 2844, - - 2836, 2849, 0, 2842, 2851, 2836, 2837, 2841, 2843, 2835, - 2838, 2847, 2839, 2840, 2842, 2841, 2846, 2843, 2848, 2844, - 2850, 2855, 2857, 2858, 2846, 2848, 2847, 0, 2849, 2845, - 2851, 2851, 2856, 2859, 2841, 2860, 2855, 2861, 2847, 2856, - 2867, 2863, 2864, 2846, 2850, 2848, 2861, 2850, 2855, 2865, - 2858, 2869, 0, 2866, 2857, 2868, 2868, 2859, 2871, 2856, - 2859, 2866, 2875, 2863, 2861, 2868, 2872, 2860, 2863, 2864, - 2874, 2865, 2867, 2871, 2878, 2872, 2865, 2873, 2869, 2873, - 2866, 2880, 2868, 2868, 2874, 2871, 2876, 2877, 2881, 2875, - 2882, 2885, 2878, 2872, 2876, 2886, 2883, 2874, 2884, 2887, - - 2889, 2878, 2888, 2888, 2873, 0, 2890, 2892, 2880, 2883, - 2877, 2895, 2882, 2876, 2877, 2881, 2897, 2882, 2885, 2895, - 2884, 2897, 2886, 2883, 2900, 2884, 2887, 2902, 2890, 2888, - 2898, 2899, 2889, 2890, 2892, 2898, 2899, 2904, 2895, 2903, - 2906, 2905, 2907, 2897, 2904, 2909, 2910, 2911, 2912, 2915, - 2900, 2900, 2903, 2910, 2902, 2911, 2917, 2898, 2899, 2905, - 2918, 2920, 2922, 2923, 2904, 2919, 2903, 2906, 2905, 2907, - 2912, 2921, 2924, 2910, 2911, 2912, 2915, 2909, 2919, 2928, - 0, 2922, 2918, 2917, 2926, 2929, 2921, 2918, 2927, 2922, - 2923, 2926, 2919, 2920, 2924, 2927, 2930, 2932, 2921, 2924, - - 2929, 2928, 2933, 2941, 2964, 2964, 2928, 2934, 2938, 2937, - 2933, 2926, 2929, 2935, 2934, 2927, 2932, 2930, 2937, 2938, - 2935, 2939, 2939, 2930, 2932, 2941, 2940, 2945, 2943, 2933, - 2941, 2939, 2940, 2964, 2934, 2938, 2937, 2944, 2946, 2948, - 2935, 2949, 2950, 2953, 2944, 2954, 2948, 0, 2939, 2939, - 2943, 2955, 2961, 2940, 2959, 2943, 2950, 2963, 2969, 2945, - 2946, 2965, 2965, 2949, 2944, 2946, 2948, 2960, 2949, 2950, - 2953, 2970, 2954, 2967, 2955, 2960, 2959, 0, 2955, 2961, - 2970, 2959, 2966, 2966, 2963, 2969, 2971, 2976, 2974, 2977, - 2965, 2980, 2981, 2980, 2960, 2974, 2967, 2975, 2970, 2971, - - 2967, 2986, 2982, 2983, 2975, 2984, 2995, 2988, 2987, 2976, - 2986, 2966, 2981, 2971, 2976, 2974, 2977, 2984, 2980, 2981, - 2989, 2983, 2990, 2992, 2975, 2982, 2987, 2991, 2986, 2982, - 2983, 2994, 2984, 2988, 2988, 2987, 2994, 2993, 2995, 2991, - 2993, 2996, 2998, 2996, 2997, 2992, 0, 2989, 2998, 2990, - 2992, 2999, 3000, 3001, 2991, 2993, 2997, 3002, 3003, 3005, - 3004, 3001, 3006, 2994, 2993, 3007, 3008, 2993, 2996, 2998, - 3011, 2997, 3012, 2999, 3000, 3016, 3013, 3017, 2999, 3000, - 3001, 3004, 3018, 3019, 3002, 3020, 3005, 3004, 3008, 3006, - 3003, 3021, 3007, 3008, 3013, 3022, 3024, 3011, 3025, 3012, - - 3027, 3026, 3016, 3013, 3017, 3031, 3028, 3033, 3030, 3018, - 3019, 3034, 3020, 3028, 3024, 3027, 3030, 3032, 3021, 3026, - 3035, 3033, 3022, 3024, 3036, 3025, 3034, 3027, 3026, 3032, - 3037, 3040, 3031, 3028, 3033, 3030, 3036, 3041, 3034, 3043, - 3040, 3042, 3042, 3044, 3032, 3046, 3035, 3035, 3047, 3048, - 0, 3036, 3044, 0, 3051, 3049, 3055, 3037, 3040, 3050, - 3052, 3041, 3048, 3051, 3041, 3043, 3043, 3050, 3042, 3046, - 3044, 3052, 3046, 3054, 3055, 3070, 3048, 3049, 3059, 3072, - 3047, 3051, 3049, 3055, 3062, 3062, 3050, 3052, 3073, 3074, - 3059, 3075, 3077, 3072, 3054, 3078, 3077, 3079, 3084, 3070, - - 3054, 3080, 3070, 3083, 3081, 3059, 3072, 3083, 3080, 3086, - 3085, 3062, 3088, 3078, 3084, 3073, 3074, 3081, 3075, 3077, - 3079, 3087, 3078, 0, 3079, 3084, 3089, 3090, 3080, 3095, - 3083, 3081, 3085, 3087, 3086, 3090, 3086, 3085, 3088, 3088, - 3089, 3091, 3096, 3093, 3092, 3093, 3094, 3095, 3087, 3104, - 3091, 3106, 3098, 3089, 3090, 3092, 3095, 3096, 3094, 3097, - 3099, 3100, 3104, 3107, 3108, 3097, 3109, 3099, 3091, 3096, - 3093, 3092, 3110, 3094, 3098, 3105, 3104, 3111, 3106, 3098, - 0, 3107, 3105, 3100, 3114, 3115, 3097, 3099, 3100, 3112, - 3107, 3108, 3109, 3109, 3113, 3116, 3117, 3112, 3117, 3110, - - 3119, 3113, 3105, 3118, 3111, 0, 3120, 3115, 3114, 3121, - 3124, 3114, 3115, 3122, 3125, 3118, 3112, 3116, 3123, 3120, - 3127, 3113, 3116, 3117, 3121, 3123, 3126, 3128, 3127, 3135, - 3118, 3130, 3119, 3120, 3136, 3122, 3121, 3124, 3126, 3132, - 3122, 3125, 3138, 3130, 3137, 3123, 3139, 3127, 3132, 3140, - 3138, 0, 3141, 3126, 3128, 3144, 3135, 3145, 3130, 3142, - 3136, 3136, 3143, 3137, 3146, 3141, 3132, 3152, 3149, 3138, - 3143, 3137, 0, 3142, 3149, 3153, 3150, 3144, 3139, 3141, - 3152, 3140, 3144, 3150, 3145, 3155, 3142, 3156, 3157, 3143, - 3158, 3146, 3155, 3159, 3152, 3149, 3157, 3160, 3153, 3161, - - 3162, 3163, 3153, 3150, 3158, 3160, 3166, 3159, 3168, 3156, - 3167, 3169, 3155, 3166, 3156, 3157, 3168, 3158, 3170, 3167, - 3159, 3161, 3162, 3171, 3160, 3172, 3161, 3162, 3163, 0, - 3177, 3173, 3174, 3166, 3175, 3168, 3176, 3167, 3169, 3179, - 3170, 3181, 3180, 0, 3176, 3170, 3188, 3183, 0, 3184, - 0, 3172, 3172, 3173, 3174, 3171, 3175, 3184, 3173, 3174, - 3185, 3175, 3177, 3176, 3180, 3186, 3179, 3187, 3181, 3180, - 3183, 3189, 3190, 3186, 3183, 3187, 3184, 3192, 3188, 3189, - 3185, 3194, 3195, 3196, 3201, 3195, 3190, 3185, 3197, 3198, - 0, 3200, 3186, 3199, 3187, 3205, 3197, 3198, 3189, 3190, - - 3195, 3204, 3204, 3192, 3192, 3196, 3201, 3199, 3194, 3195, - 3196, 3201, 3195, 3202, 3209, 3197, 3198, 3200, 3200, 3207, - 3199, 3205, 3205, 3206, 0, 3208, 3211, 3202, 3204, 3210, - 3212, 3206, 3213, 3214, 3211, 3215, 3209, 0, 3222, 3218, - 3202, 3209, 0, 3216, 3217, 3207, 3207, 3218, 0, 3210, - 3206, 3208, 3208, 3211, 3213, 3219, 3210, 3212, 3214, 3213, - 3214, 3220, 3215, 3216, 3217, 3222, 3218, 3223, 3225, 3220, - 3216, 3217, 3227, 3228, 3226, 3223, 3229, 3219, 3231, 3232, - 3227, 3228, 3219, 3233, 0, 3234, 3235, 3232, 3220, 3236, - 3225, 3233, 3238, 3239, 3223, 3225, 3226, 3240, 3248, 3227, - - 3228, 3226, 3229, 3229, 3242, 3231, 3232, 3245, 3249, 3236, - 3233, 3234, 3234, 3235, 3246, 3247, 3236, 3240, 0, 3238, - 3239, 0, 3246, 3247, 3240, 3248, 3242, 0, 0, 3245, - 0, 3242, 0, 0, 3245, 3249, 0, 0, 0, 0, - 0, 3246, 3247, 3253, 3253, 3253, 3253, 3253, 3253, 3253, - 3254, 3254, 3254, 3254, 3254, 3254, 3254, 3255, 3255, 3255, - 3255, 3255, 3255, 3255, 3256, 3256, 3256, 3256, 3256, 3256, - 3256, 3257, 3257, 3257, 3257, 3257, 3257, 3257, 3258, 3258, - 3258, 3258, 3258, 3258, 3258, 3259, 3259, 3259, 3259, 3259, - 3259, 3259, 3261, 3261, 0, 3261, 3261, 3261, 3261, 3262, - - 3262, 0, 0, 0, 3262, 3262, 3263, 3263, 0, 0, - 3263, 0, 3263, 3264, 0, 0, 0, 0, 0, 3264, - 3265, 3265, 0, 0, 0, 3265, 3265, 3266, 0, 0, - 0, 0, 0, 3266, 3267, 3267, 0, 3267, 3267, 3267, - 3267, 3268, 0, 0, 0, 0, 0, 3268, 3269, 3269, - 0, 0, 0, 3269, 3269, 3270, 3270, 0, 3270, 3270, - 3270, 3270, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, - 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252, 3252 + 361, 398, 361, 369, 0, 403, 371, 367, 361, 424, + 372, 361, 370, 367, 366, 373, 380, 367, 371, 366, + 378, 380, 372, 369, 361, 367, 0, 361, 373, 361, + 370, 367, 378, 371, 367, 375, 370, 372, 383, 370, + 367, 424, 373, 376, 367, 379, 383, 378, 380, 384, + 0, 375, 367, 368, 429, 368, 376, 370, 382, 375, + 381, 384, 375, 379, 382, 383, 385, 389, 368, 386, + 376, 368, 379, 368, 389, 368, 384, 386, 375, 368, + 368, 381, 368, 0, 385, 382, 429, 381, 0, 0, + 391, 388, 388, 385, 389, 368, 386, 390, 368, 391, + + 368, 0, 368, 377, 377, 392, 0, 393, 0, 395, + 390, 396, 394, 377, 393, 377, 377, 377, 388, 394, + 377, 395, 391, 392, 390, 397, 391, 392, 377, 399, + 377, 377, 392, 396, 393, 406, 395, 397, 396, 394, + 377, 400, 377, 377, 377, 401, 402, 377, 400, 404, + 392, 404, 397, 405, 408, 399, 399, 406, 409, 402, + 401, 408, 406, 410, 405, 407, 407, 0, 400, 409, + 411, 412, 401, 402, 410, 0, 404, 413, 413, 417, + 405, 408, 0, 411, 414, 409, 415, 417, 416, 419, + 410, 418, 0, 0, 407, 413, 412, 411, 412, 420, + + 419, 415, 413, 418, 413, 413, 417, 414, 420, 415, + 421, 414, 425, 415, 416, 416, 419, 427, 418, 426, + 422, 430, 413, 421, 428, 433, 420, 430, 415, 431, + 425, 422, 432, 422, 442, 434, 435, 421, 422, 425, + 427, 426, 428, 435, 427, 436, 426, 422, 430, 433, + 431, 428, 433, 437, 438, 432, 431, 434, 422, 432, + 422, 423, 434, 435, 439, 440, 442, 437, 441, 423, + 423, 436, 436, 423, 423, 443, 445, 444, 0, 440, + 437, 438, 445, 423, 446, 447, 439, 0, 423, 444, + 451, 439, 440, 449, 441, 441, 423, 423, 443, 451, + + 423, 423, 443, 445, 444, 448, 446, 447, 449, 450, + 452, 446, 447, 448, 453, 0, 450, 451, 455, 454, + 449, 456, 457, 458, 464, 452, 459, 0, 462, 458, + 460, 448, 448, 455, 0, 460, 450, 452, 453, 473, + 448, 453, 454, 464, 457, 455, 454, 456, 456, 457, + 458, 464, 459, 459, 462, 462, 463, 460, 465, 466, + 467, 469, 463, 469, 470, 471, 466, 472, 475, 0, + 469, 473, 471, 470, 476, 467, 465, 474, 479, 478, + 472, 481, 478, 463, 477, 465, 466, 467, 469, 482, + 469, 470, 471, 481, 472, 474, 476, 477, 478, 480, + + 475, 476, 479, 483, 474, 479, 478, 484, 481, 478, + 483, 477, 480, 485, 486, 487, 490, 488, 0, 489, + 492, 482, 488, 0, 0, 489, 480, 486, 491, 493, + 483, 484, 492, 544, 484, 501, 485, 487, 494, 490, + 495, 486, 487, 490, 488, 485, 489, 492, 495, 494, + 491, 493, 496, 0, 499, 491, 493, 500, 501, 503, + 544, 499, 501, 485, 502, 494, 496, 495, 0, 500, + 503, 0, 502, 504, 0, 507, 509, 506, 0, 496, + 497, 499, 0, 0, 500, 497, 503, 497, 505, 506, + 0, 502, 505, 497, 509, 497, 504, 507, 497, 497, + + 504, 510, 507, 509, 506, 497, 497, 497, 516, 511, + 505, 510, 497, 508, 497, 505, 508, 512, 513, 505, + 497, 511, 497, 514, 508, 497, 497, 514, 512, 517, + 515, 517, 497, 510, 516, 516, 511, 515, 510, 518, + 508, 519, 513, 508, 512, 513, 520, 521, 524, 523, + 514, 525, 522, 519, 523, 526, 517, 515, 0, 521, + 522, 520, 530, 526, 528, 518, 518, 531, 519, 525, + 524, 527, 532, 520, 521, 524, 523, 545, 525, 522, + 530, 533, 526, 527, 535, 528, 538, 534, 536, 530, + 531, 528, 535, 537, 531, 538, 533, 541, 527, 534, + + 539, 536, 540, 542, 532, 537, 542, 543, 533, 545, + 546, 535, 547, 538, 534, 536, 540, 0, 548, 549, + 537, 558, 541, 539, 541, 546, 543, 539, 550, 540, + 542, 552, 553, 548, 543, 551, 0, 546, 559, 555, + 557, 550, 554, 549, 547, 548, 549, 551, 558, 554, + 555, 560, 554, 552, 557, 550, 553, 561, 552, 553, + 554, 562, 551, 556, 563, 559, 555, 557, 556, 554, + 564, 565, 566, 567, 569, 564, 554, 565, 0, 554, + 0, 568, 569, 560, 561, 570, 571, 566, 562, 572, + 573, 576, 575, 0, 573, 556, 563, 567, 565, 566, + + 567, 569, 564, 568, 570, 577, 574, 579, 568, 578, + 571, 572, 570, 571, 574, 575, 572, 573, 578, 575, + 581, 583, 580, 576, 587, 582, 0, 583, 577, 579, + 585, 584, 577, 574, 579, 580, 578, 582, 586, 588, + 0, 585, 589, 0, 592, 586, 581, 581, 583, 580, + 595, 600, 582, 584, 590, 589, 587, 585, 584, 590, + 596, 588, 590, 590, 591, 586, 588, 593, 594, 589, + 592, 592, 595, 591, 602, 597, 593, 595, 590, 594, + 598, 590, 596, 600, 604, 601, 590, 596, 597, 590, + 590, 591, 598, 603, 593, 594, 606, 605, 602, 607, + + 608, 602, 597, 601, 613, 609, 604, 598, 610, 608, + 607, 604, 601, 619, 611, 603, 603, 620, 606, 0, + 603, 605, 610, 606, 605, 609, 607, 608, 614, 616, + 612, 613, 609, 617, 618, 610, 611, 612, 620, 615, + 616, 611, 603, 621, 620, 619, 614, 615, 623, 618, + 625, 617, 622, 622, 627, 614, 616, 612, 624, 625, + 617, 618, 628, 626, 629, 0, 615, 621, 630, 633, + 621, 631, 623, 631, 633, 623, 626, 625, 632, 634, + 624, 622, 637, 635, 628, 624, 627, 645, 0, 628, + 626, 638, 630, 634, 636, 630, 629, 635, 631, 638, + + 632, 633, 639, 640, 641, 632, 634, 642, 636, 636, + 635, 641, 643, 644, 637, 650, 636, 650, 638, 645, + 639, 636, 647, 646, 0, 640, 649, 0, 644, 639, + 640, 641, 643, 642, 642, 636, 636, 644, 646, 643, + 644, 648, 650, 651, 647, 659, 648, 653, 652, 647, + 646, 654, 649, 649, 655, 644, 652, 656, 658, 657, + 654, 661, 0, 655, 660, 658, 656, 657, 651, 668, + 651, 662, 653, 648, 653, 652, 0, 659, 654, 661, + 663, 655, 667, 662, 656, 658, 657, 660, 661, 665, + 664, 660, 663, 666, 667, 670, 671, 665, 662, 664, + + 669, 668, 673, 672, 671, 674, 680, 663, 666, 667, + 670, 672, 676, 669, 674, 675, 665, 664, 679, 680, + 666, 676, 670, 671, 681, 673, 675, 669, 678, 673, + 672, 682, 674, 680, 677, 677, 678, 685, 684, 676, + 679, 687, 675, 677, 683, 679, 684, 686, 688, 0, + 681, 681, 690, 685, 682, 678, 691, 683, 682, 688, + 686, 677, 677, 687, 685, 684, 690, 692, 687, 689, + 693, 683, 696, 694, 686, 688, 691, 689, 697, 690, + 695, 696, 0, 691, 703, 698, 700, 702, 699, 692, + 693, 701, 0, 704, 692, 694, 689, 693, 697, 696, + + 694, 699, 695, 698, 700, 697, 701, 695, 703, 702, + 705, 703, 698, 700, 702, 699, 704, 706, 701, 707, + 704, 708, 709, 705, 710, 712, 0, 0, 709, 717, + 711, 707, 713, 716, 708, 706, 718, 705, 711, 719, + 714, 716, 723, 718, 706, 721, 707, 721, 708, 709, + 724, 710, 712, 720, 713, 722, 711, 711, 714, 713, + 716, 717, 719, 718, 722, 711, 719, 714, 720, 724, + 725, 727, 721, 727, 723, 726, 728, 724, 734, 731, + 720, 737, 722, 728, 726, 742, 0, 0, 734, 738, + 725, 731, 740, 750, 0, 0, 742, 725, 727, 737, + + 741, 0, 726, 728, 729, 734, 731, 729, 737, 743, + 738, 729, 742, 740, 729, 748, 738, 744, 741, 740, + 745, 729, 729, 746, 729, 750, 747, 741, 748, 729, + 749, 729, 743, 752, 729, 747, 743, 749, 729, 746, + 755, 729, 748, 744, 744, 754, 745, 745, 729, 729, + 746, 729, 758, 747, 754, 752, 753, 749, 751, 751, + 752, 751, 753, 755, 751, 756, 757, 755, 756, 751, + 759, 761, 754, 761, 758, 751, 751, 762, 759, 758, + 764, 0, 757, 753, 751, 751, 751, 760, 751, 757, + 763, 751, 756, 757, 765, 763, 751, 759, 761, 760, + + 764, 762, 751, 751, 762, 766, 767, 764, 768, 757, + 0, 0, 770, 772, 760, 769, 771, 766, 777, 773, + 765, 765, 763, 775, 776, 777, 774, 0, 767, 787, + 779, 775, 766, 767, 768, 768, 770, 769, 771, 770, + 772, 774, 769, 771, 773, 777, 773, 776, 778, 779, + 775, 776, 780, 774, 781, 782, 778, 779, 783, 785, + 784, 787, 786, 789, 793, 0, 781, 786, 782, 784, + 788, 790, 792, 794, 785, 778, 790, 796, 780, 780, + 795, 781, 782, 798, 783, 783, 785, 784, 797, 786, + 789, 800, 788, 801, 792, 799, 793, 788, 802, 792, + + 807, 0, 795, 790, 798, 794, 805, 795, 804, 796, + 798, 808, 797, 806, 799, 797, 810, 802, 800, 803, + 801, 806, 799, 809, 811, 802, 805, 807, 803, 808, + 804, 812, 0, 805, 814, 804, 815, 817, 808, 812, + 806, 816, 809, 810, 816, 819, 803, 818, 820, 821, + 809, 822, 814, 822, 815, 823, 811, 824, 812, 817, + 826, 814, 821, 815, 817, 818, 0, 827, 816, 819, + 820, 824, 819, 823, 818, 820, 821, 829, 822, 827, + 825, 828, 823, 834, 824, 825, 826, 826, 830, 828, + 831, 830, 0, 833, 827, 829, 835, 836, 831, 837, + + 838, 0, 835, 0, 829, 837, 839, 838, 828, 844, + 834, 840, 825, 839, 831, 830, 840, 831, 833, 836, + 833, 841, 842, 835, 836, 831, 837, 838, 841, 846, + 843, 847, 844, 839, 843, 845, 844, 846, 840, 849, + 842, 848, 850, 852, 845, 851, 0, 853, 841, 842, + 850, 854, 855, 857, 849, 864, 846, 843, 851, 848, + 853, 865, 845, 847, 852, 859, 849, 867, 848, 850, + 852, 857, 851, 854, 853, 856, 858, 870, 854, 855, + 857, 860, 856, 858, 859, 861, 862, 864, 860, 863, + 861, 866, 859, 865, 862, 871, 863, 868, 869, 867, + + 878, 875, 856, 858, 866, 869, 872, 873, 860, 870, + 868, 874, 861, 862, 876, 873, 863, 877, 866, 874, + 876, 879, 880, 875, 868, 869, 874, 871, 875, 872, + 882, 880, 878, 872, 873, 0, 881, 884, 874, 886, + 883, 876, 885, 877, 877, 879, 874, 883, 879, 880, + 881, 885, 887, 888, 889, 0, 890, 887, 927, 0, + 0, 886, 882, 881, 884, 888, 886, 883, 891, 885, + 893, 892, 896, 891, 899, 896, 897, 889, 892, 894, + 888, 889, 890, 890, 887, 901, 900, 894, 899, 897, + 927, 901, 893, 900, 904, 891, 905, 893, 892, 896, + + 0, 899, 903, 897, 906, 0, 894, 907, 905, 907, + 908, 0, 901, 900, 902, 0, 902, 904, 909, 0, + 902, 904, 902, 905, 911, 0, 910, 902, 903, 903, + 909, 906, 902, 908, 907, 912, 0, 908, 902, 910, + 914, 902, 924, 902, 915, 909, 911, 902, 912, 902, + 913, 911, 916, 910, 902, 913, 917, 915, 914, 902, + 924, 919, 912, 918, 916, 920, 928, 914, 917, 924, + 929, 915, 922, 918, 925, 916, 919, 931, 922, 916, + 921, 923, 913, 917, 926, 918, 953, 920, 919, 947, + 918, 916, 920, 921, 923, 925, 933, 929, 928, 922, + + 918, 925, 936, 934, 933, 932, 926, 921, 923, 931, + 932, 926, 934, 953, 937, 938, 939, 936, 940, 0, + 942, 947, 943, 933, 0, 0, 941, 0, 938, 936, + 934, 939, 932, 935, 0, 943, 937, 0, 935, 942, + 935, 937, 938, 939, 940, 940, 935, 942, 941, 943, + 946, 935, 935, 941, 944, 945, 949, 950, 935, 935, + 935, 946, 944, 945, 948, 935, 950, 935, 957, 951, + 0, 949, 954, 935, 958, 962, 961, 946, 935, 935, + 951, 944, 945, 949, 950, 935, 948, 955, 952, 960, + 961, 948, 0, 969, 955, 954, 951, 952, 958, 954, + + 957, 958, 959, 961, 963, 964, 966, 962, 968, 967, + 959, 960, 970, 964, 955, 952, 960, 0, 972, 968, + 971, 0, 981, 998, 966, 969, 963, 967, 971, 959, + 970, 963, 964, 966, 973, 968, 967, 974, 976, 970, + 972, 973, 975, 985, 977, 972, 979, 971, 978, 975, + 974, 987, 983, 976, 981, 998, 985, 0, 980, 987, + 990, 973, 977, 983, 974, 976, 978, 979, 980, 975, + 985, 977, 990, 979, 986, 978, 988, 989, 987, 983, + 991, 986, 996, 992, 995, 980, 989, 990, 997, 988, + 1002, 1007, 0, 1005, 999, 1002, 1012, 0, 1007, 1014, + + 996, 986, 991, 988, 989, 992, 995, 991, 999, 996, + 992, 995, 1001, 1006, 997, 997, 1004, 1005, 1007, 1004, + 1005, 999, 1002, 1001, 1008, 1009, 1006, 1010, 1012, 1013, + 0, 1014, 1011, 1015, 1009, 1008, 1013, 1017, 1019, 1001, + 1006, 1010, 1004, 1004, 1011, 1015, 1004, 1016, 1021, 1020, + 1017, 1008, 1009, 0, 1010, 1020, 1013, 1022, 1024, 1011, + 1015, 1023, 1019, 1026, 1017, 1019, 1028, 1025, 1031, 1016, + 1021, 1029, 1023, 0, 1016, 1021, 1020, 1032, 1026, 1022, + 1024, 1030, 1029, 1033, 1022, 1024, 1034, 1028, 1023, 1025, + 1026, 1035, 1040, 1028, 1025, 1034, 1036, 1037, 1029, 1038, + + 1031, 1033, 1030, 1041, 1032, 1039, 1037, 1038, 1030, 1042, + 1033, 1043, 1039, 1034, 1047, 1035, 1040, 1041, 1035, 1040, + 1044, 1051, 1036, 1036, 1037, 1049, 1038, 1045, 1046, 1050, + 1041, 1053, 1039, 1054, 1049, 1052, 1050, 1058, 0, 1056, + 0, 1042, 1044, 1043, 1059, 1055, 1047, 1044, 1056, 1045, + 1046, 1054, 1049, 1051, 1045, 1046, 1050, 1052, 1053, 1057, + 1054, 1058, 1052, 1055, 1058, 1060, 1056, 1057, 1059, 1061, + 1062, 1059, 1055, 1063, 1064, 1065, 1066, 1067, 0, 1062, + 0, 1060, 1064, 1068, 1069, 1070, 1057, 1072, 1063, 1067, + 1071, 1061, 1060, 1070, 1080, 1075, 1061, 1062, 0, 0, + + 1063, 1064, 1072, 1071, 1067, 1068, 1074, 1065, 1066, 1086, + 1068, 1069, 1070, 1075, 1072, 1074, 1076, 1071, 1077, 1079, + 1077, 1080, 1075, 1081, 1076, 1083, 1085, 1079, 1084, 1087, + 1081, 1086, 1088, 1074, 1090, 1089, 1086, 1091, 1083, 0, + 1084, 1085, 1089, 1076, 1096, 1077, 1079, 1087, 1093, 1092, + 1081, 1095, 1083, 1085, 1094, 1084, 1087, 1096, 1098, 1088, + 1092, 1097, 1089, 1101, 1100, 1099, 1090, 0, 1161, 1091, + 1093, 1096, 1100, 1095, 1097, 1093, 1092, 1099, 1095, 1094, + 1098, 1094, 1102, 1101, 1105, 1098, 1106, 1103, 1097, 1107, + 1101, 1100, 1099, 1108, 1102, 1103, 1109, 1110, 1107, 1106, + + 1161, 1116, 0, 1113, 1110, 1108, 0, 1114, 1118, 1102, + 0, 1105, 0, 1106, 1103, 1115, 1107, 1109, 1111, 1117, + 1108, 1118, 0, 1109, 1110, 1119, 1113, 1111, 1116, 1111, + 1113, 1123, 1111, 1114, 1114, 1118, 1120, 1115, 1121, 1117, + 1111, 0, 1115, 1122, 1120, 1111, 1117, 1121, 0, 1119, + 1126, 1125, 1119, 1123, 1111, 1128, 1111, 1131, 1123, 1111, + 1124, 1122, 1127, 1120, 1132, 1121, 1125, 1136, 1124, 0, + 1122, 1128, 1126, 1129, 1133, 1127, 1134, 1126, 1125, 1137, + 1135, 1129, 1128, 1134, 1131, 0, 1132, 1124, 0, 1127, + 1136, 1132, 1138, 1139, 1136, 1141, 1133, 1137, 1143, 1142, + + 1129, 1133, 1135, 1134, 1138, 1139, 1137, 1135, 1140, 1144, + 1141, 1142, 1148, 1145, 0, 1149, 1140, 1146, 1143, 1138, + 1139, 1145, 1141, 1146, 1144, 1143, 1142, 1149, 1147, 1152, + 0, 1150, 0, 1148, 1151, 1140, 1144, 1147, 1150, 1148, + 1145, 1151, 1149, 1154, 1146, 1153, 1156, 1152, 1155, 0, + 1157, 1154, 1157, 1158, 1156, 1147, 1152, 1153, 1150, 1159, + 1164, 1151, 1162, 1155, 1165, 1158, 1159, 1166, 1163, 1168, + 1154, 1165, 1153, 1156, 1162, 1155, 1167, 1157, 1166, 1164, + 1158, 1163, 1170, 1169, 1168, 1172, 1159, 1164, 1169, 1162, + 1170, 1165, 1171, 1175, 1166, 1163, 1168, 1173, 1167, 1172, + + 1176, 0, 1177, 1167, 1178, 1171, 1181, 1175, 0, 1170, + 0, 0, 1172, 1179, 1182, 1169, 1201, 1201, 1176, 1171, + 1175, 1180, 1183, 1173, 1173, 1174, 0, 1176, 1184, 1174, + 1178, 1178, 1174, 1174, 1177, 1179, 1182, 1174, 1181, 1180, + 1179, 1182, 1186, 1174, 1183, 1201, 1188, 1174, 1180, 1183, + 1192, 1174, 1174, 1188, 1184, 1184, 1174, 1185, 1190, 1174, + 1174, 0, 0, 1185, 1174, 1187, 1189, 1187, 1186, 1186, + 1174, 1191, 1192, 1188, 1174, 1189, 1190, 1192, 1191, 1194, + 1195, 1196, 1193, 1197, 1185, 1190, 0, 0, 1194, 1187, + 1200, 1198, 1187, 1189, 1187, 1193, 0, 0, 1191, 0, + + 1204, 0, 1206, 1208, 1202, 1197, 1194, 1207, 1208, 1193, + 1197, 1206, 1195, 1196, 1198, 1217, 1200, 1200, 1198, 1199, + 1202, 1205, 1209, 1204, 1199, 1207, 1199, 1204, 1199, 1206, + 1199, 1202, 1211, 1205, 1207, 1208, 1210, 1199, 1213, 1212, + 1209, 1210, 1214, 0, 1218, 1216, 1199, 1217, 1205, 1209, + 1214, 1199, 1212, 1199, 1211, 1199, 1213, 1199, 1216, 1211, + 1215, 1219, 1220, 1210, 1221, 1213, 1212, 1223, 1215, 1214, + 1218, 1218, 1216, 1224, 1225, 1220, 1225, 1222, 1227, 1229, + 1219, 1226, 1224, 1228, 1230, 1223, 1221, 1215, 1219, 1220, + 1222, 1221, 1232, 1233, 1223, 1228, 1235, 1236, 0, 1234, + + 1224, 1225, 1238, 1226, 1222, 1227, 1229, 1234, 1226, 1230, + 1228, 1230, 1239, 1240, 1235, 1233, 1232, 1243, 1237, 1232, + 1233, 1241, 1242, 1235, 1236, 1237, 1234, 1241, 1242, 1238, + 1244, 1245, 1247, 1248, 1246, 1240, 0, 1244, 1239, 1239, + 1240, 1246, 1249, 1250, 1243, 1237, 1254, 1252, 1241, 1242, + 1253, 1248, 1250, 1255, 1247, 1245, 1256, 1244, 1245, 1247, + 1248, 1246, 1253, 1257, 1258, 1259, 1255, 1249, 1254, 1249, + 1250, 1252, 1260, 1254, 1252, 1261, 1262, 1253, 1256, 1263, + 1255, 1266, 1257, 1256, 1264, 1268, 1258, 1265, 1263, 1259, + 1257, 1258, 1259, 1269, 1260, 1266, 1270, 1271, 1262, 1260, + + 1274, 1261, 1261, 1262, 1272, 1264, 1263, 1265, 1266, 1275, + 1281, 1264, 1273, 1282, 1265, 1285, 1274, 1268, 1270, 1276, + 1273, 1278, 1272, 1270, 0, 1269, 1276, 1274, 1279, 1271, + 1280, 1272, 1283, 1278, 1280, 1279, 1275, 1286, 0, 1273, + 0, 1290, 1281, 1286, 1287, 1282, 1276, 1285, 1278, 1288, + 1286, 1287, 1289, 1283, 1290, 1279, 1288, 1280, 1292, 1283, + 1291, 1294, 1297, 1294, 1286, 1293, 1295, 1289, 1290, 1291, + 1286, 1287, 1293, 1296, 1298, 1295, 1288, 1299, 1298, 1289, + 1304, 1302, 1301, 1305, 1292, 1292, 1302, 1291, 1294, 1297, + 1301, 0, 1293, 1295, 1303, 1296, 1307, 1314, 1304, 1299, + + 1296, 1298, 1305, 1303, 1299, 1306, 0, 1304, 1307, 1301, + 1305, 1309, 1308, 1302, 1309, 1308, 1310, 0, 1306, 1311, + 1316, 1303, 1312, 1307, 1308, 1315, 1317, 1319, 1319, 1314, + 0, 1317, 1306, 1309, 1310, 1312, 1316, 1318, 1309, 1308, + 1321, 1309, 1308, 1310, 1311, 1318, 1311, 1316, 1315, 1312, + 1320, 1322, 1315, 1324, 1319, 1335, 1323, 1325, 1317, 1320, + 1324, 1326, 1321, 1328, 1318, 1323, 1329, 1321, 1326, 1331, + 0, 1332, 1330, 1322, 1339, 1329, 1328, 1320, 1322, 1325, + 1324, 1330, 1333, 1323, 1325, 1336, 1339, 1335, 1326, 1334, + 1328, 1333, 1338, 1329, 1332, 1331, 1331, 1334, 1332, 1330, + + 1336, 1339, 1337, 1340, 1342, 1338, 1341, 1343, 0, 1333, + 1337, 1345, 1336, 1344, 1341, 1340, 1334, 1347, 1346, 1338, + 1345, 1349, 1352, 1353, 1351, 1348, 1342, 1343, 0, 1337, + 1340, 1342, 1360, 1341, 1343, 1344, 1346, 1348, 1345, 1349, + 1344, 1355, 1350, 1347, 1347, 1346, 1354, 1361, 1349, 1350, + 1351, 1351, 1348, 1356, 1352, 1353, 1357, 1358, 1362, 1354, + 1359, 0, 1363, 1358, 1360, 1364, 1366, 1357, 1355, 1350, + 1370, 1367, 1369, 1354, 1356, 1374, 0, 1368, 0, 1361, + 1356, 1369, 1359, 1357, 1358, 1370, 1373, 1359, 1363, 1363, + 1362, 1364, 1364, 1366, 1367, 1368, 1371, 1370, 1367, 1369, + + 1372, 1374, 1374, 1375, 1368, 1376, 1373, 1377, 1378, 1371, + 1375, 1379, 1372, 1373, 1383, 1380, 1391, 1381, 1382, 1379, + 1380, 1378, 1381, 1371, 1376, 1382, 1386, 1372, 1384, 1377, + 1375, 1385, 1376, 1394, 1377, 1378, 1384, 1387, 1379, 1385, + 1383, 1383, 1388, 1390, 1386, 1382, 1392, 1380, 1391, 1381, + 1388, 1396, 1390, 1386, 1389, 1384, 1393, 1393, 1385, 1387, + 1397, 1389, 1405, 1395, 1387, 1394, 1398, 1399, 1392, 1388, + 1390, 1395, 1396, 1392, 1398, 1399, 1400, 1401, 1396, 1404, + 1403, 1389, 1402, 1393, 1400, 1401, 1403, 1406, 1405, 1405, + 1395, 1404, 1397, 1398, 1399, 1402, 1408, 1407, 1409, 1410, + + 1413, 0, 1412, 1400, 1401, 1411, 1404, 1403, 1414, 1402, + 1417, 1406, 1407, 1415, 1406, 0, 1412, 1415, 1413, 1417, + 1418, 1410, 1414, 1408, 1407, 1409, 1410, 1413, 1411, 1412, + 1415, 1419, 1411, 1422, 1420, 1414, 1424, 1417, 1415, 1421, + 1415, 1420, 1418, 1419, 1415, 1423, 1428, 1418, 1426, 1427, + 1421, 1425, 1430, 1433, 1429, 1431, 1434, 1415, 1419, 1430, + 1422, 1420, 1426, 1425, 1431, 1436, 1421, 1423, 1424, 1428, + 1440, 1427, 1423, 1428, 1436, 1426, 1427, 1429, 1425, 1430, + 1432, 1429, 1431, 1434, 1438, 1433, 1439, 1432, 1441, 1444, + 1438, 1442, 1436, 0, 1447, 1446, 1440, 1440, 1442, 1448, + + 1451, 1449, 1452, 0, 1454, 1453, 0, 1432, 1439, 1452, + 1448, 1438, 1449, 1439, 1458, 0, 1444, 1460, 1442, 1446, + 1441, 1447, 1446, 1453, 1451, 1455, 1448, 1451, 1449, 1452, + 1454, 1454, 1453, 1456, 1457, 1459, 1458, 1455, 1461, 1456, + 1462, 1458, 1457, 1460, 1460, 1463, 1467, 1465, 1459, 1462, + 1466, 1464, 1455, 1464, 1465, 1468, 1461, 1463, 1469, 1467, + 1456, 1457, 1459, 1470, 1468, 1461, 1471, 1462, 1472, 0, + 1474, 1476, 1463, 1467, 1465, 1470, 1466, 1466, 1464, 1473, + 1469, 1477, 1468, 1475, 1478, 1469, 1473, 1476, 1475, 0, + 1470, 1472, 1478, 1471, 1479, 1472, 1474, 1474, 1476, 1481, + + 1483, 1482, 1484, 1487, 1477, 1487, 1473, 1486, 1477, 1483, + 1475, 1478, 1482, 1488, 1489, 1484, 1479, 1485, 1485, 1492, + 1486, 1479, 0, 0, 1490, 1485, 1481, 1483, 1482, 1484, + 1487, 1490, 1493, 1494, 1486, 1491, 1489, 1498, 1496, 1488, + 1488, 1489, 1491, 0, 1485, 1485, 1492, 1495, 1497, 1499, + 1493, 1490, 1500, 1502, 1495, 1494, 1499, 0, 1503, 1493, + 1494, 1505, 1491, 1496, 1504, 1496, 1502, 1507, 1508, 1498, + 1497, 1508, 1504, 1509, 1495, 1497, 1499, 1510, 1512, 1511, + 1502, 1513, 1505, 1514, 1500, 1503, 1515, 1512, 1505, 1507, + 1518, 1504, 1511, 1513, 1507, 1508, 1524, 1518, 1521, 1509, + + 1509, 1517, 1516, 1510, 1510, 1512, 1511, 1514, 1513, 1520, + 1514, 1516, 1515, 1515, 1524, 1519, 1517, 1518, 1519, 1522, + 1521, 1528, 1525, 1524, 1526, 1521, 1526, 1529, 1517, 1516, + 1519, 1527, 1530, 1534, 1531, 1522, 0, 0, 1541, 1519, + 1532, 1520, 1519, 1522, 1525, 1519, 1522, 1533, 1528, 1525, + 1535, 1526, 1540, 1542, 1536, 1527, 1531, 1519, 1527, 1529, + 1537, 1531, 1522, 1538, 1530, 1534, 1532, 1532, 1536, 1537, + 1541, 1538, 1535, 1533, 1533, 1539, 1540, 1535, 1543, 1540, + 1544, 1536, 1539, 1547, 1545, 1542, 1546, 1537, 1545, 1549, + 1538, 1552, 1548, 1553, 1550, 0, 1551, 0, 1549, 0, + + 1543, 1550, 1539, 1551, 1552, 1543, 1553, 1557, 1546, 1554, + 1547, 1545, 1544, 1546, 1548, 1555, 1549, 1561, 1552, 1548, + 1553, 1550, 1554, 1551, 1555, 1556, 1558, 1556, 1562, 1559, + 1557, 1563, 1561, 1564, 1557, 1571, 1554, 1559, 0, 1565, + 1567, 1568, 1555, 1562, 1561, 1563, 1565, 1567, 1566, 0, + 1573, 1558, 1556, 1558, 1568, 1562, 1559, 1569, 1563, 1566, + 1575, 1574, 1571, 1569, 1572, 1564, 1565, 1567, 1568, 1576, + 1577, 1572, 1573, 1581, 1580, 1566, 1574, 1573, 1582, 1578, + 1579, 1576, 1578, 1577, 1569, 1581, 1575, 1575, 1574, 1579, + 1583, 1572, 1580, 1583, 1589, 1590, 1576, 1577, 1582, 1584, + + 1581, 1580, 1591, 1595, 1586, 1582, 1578, 1579, 1583, 1586, + 1584, 1588, 1592, 1588, 1593, 0, 1586, 1583, 1589, 1594, + 1583, 1589, 1590, 1593, 1597, 1598, 1584, 1592, 1596, 1591, + 1595, 1586, 1597, 1601, 1599, 1602, 1586, 1600, 1588, 1592, + 1603, 1593, 1596, 1594, 1601, 1600, 1594, 1598, 1603, 1607, + 1605, 1597, 1598, 1602, 1604, 1596, 1599, 1604, 1606, 1608, + 1601, 1599, 1602, 0, 1600, 1609, 1608, 1603, 1605, 1610, + 1611, 1612, 1604, 1613, 0, 1618, 1607, 1605, 1610, 1609, + 1617, 1604, 1612, 1611, 1604, 1616, 1608, 1616, 1613, 1617, + 1606, 1620, 1609, 1619, 1621, 1624, 1610, 1611, 1612, 1622, + + 1613, 1618, 1618, 0, 1619, 1623, 1625, 1617, 1623, 1620, + 1627, 0, 1616, 1622, 1630, 1625, 1621, 1624, 1620, 1627, + 1619, 1621, 1624, 1623, 1626, 1622, 1622, 1630, 1633, 1628, + 1626, 1631, 1623, 1625, 1628, 1623, 1634, 1627, 1635, 1632, + 1622, 1630, 1636, 1631, 1632, 1637, 1639, 1635, 1638, 1642, + 1633, 1626, 1640, 1644, 1643, 1633, 1642, 1645, 1631, 1647, + 0, 1628, 0, 1649, 0, 1635, 1632, 1643, 1634, 1636, + 1638, 1645, 1659, 1640, 1646, 1638, 1642, 1637, 1639, 1640, + 1646, 1643, 1649, 1653, 1645, 1644, 1651, 1652, 1654, 1655, + 1649, 1647, 1657, 1659, 1651, 1652, 1658, 1656, 1646, 1659, + + 1660, 1646, 1653, 1655, 1661, 1657, 1654, 1646, 1662, 1658, + 1653, 1656, 1663, 1651, 1652, 1654, 1655, 1665, 1664, 1657, + 1659, 1666, 1662, 1658, 1656, 1664, 1665, 1667, 1668, 1666, + 1669, 1674, 1660, 1670, 1672, 1662, 1661, 0, 1670, 1663, + 1671, 1676, 1668, 1672, 1665, 1664, 1675, 1677, 1666, 1678, + 1679, 1671, 1680, 1675, 1667, 1668, 1685, 1689, 1674, 1681, + 1670, 1672, 1669, 1681, 1676, 1683, 1684, 1671, 1676, 1677, + 1680, 1678, 1679, 1675, 1677, 1687, 1678, 1679, 1684, 1680, + 1683, 1686, 1692, 1685, 1689, 1690, 1681, 1688, 1693, 1686, + 1687, 1691, 1683, 1684, 1696, 1688, 1695, 1692, 1690, 1697, + + 0, 1696, 1687, 1693, 1695, 1698, 1700, 1699, 1686, 1692, + 1701, 1691, 1690, 1703, 1688, 1693, 1699, 1702, 1691, 0, + 1698, 1696, 1707, 1695, 1705, 1706, 1708, 1700, 0, 1712, + 1709, 1697, 1698, 1700, 1699, 1710, 1712, 1701, 0, 1711, + 1703, 1702, 1713, 1706, 1702, 1709, 1705, 1713, 1716, 1714, + 1715, 1705, 1706, 1708, 1707, 1718, 1712, 1709, 1714, 1715, + 1710, 1717, 1710, 1711, 1719, 1721, 1711, 1723, 1720, 1713, + 1716, 1722, 1727, 1718, 1723, 1716, 1714, 1715, 1724, 1719, + 1720, 1725, 1718, 1717, 1722, 1724, 1728, 1721, 1717, 1722, + 1726, 1719, 1721, 0, 1723, 1720, 1731, 1738, 1722, 1727, + + 1724, 1729, 1726, 1725, 1731, 1724, 1732, 1729, 1725, 1733, + 1735, 1722, 1724, 1737, 1732, 1734, 1739, 1726, 1728, 1736, + 1733, 1736, 1734, 1731, 1738, 1741, 1745, 1740, 1729, 1742, + 1747, 1750, 1736, 1732, 1740, 1735, 1733, 1735, 1743, 1737, + 1737, 1744, 1734, 1739, 1743, 0, 1736, 1744, 1736, 1746, + 1748, 1751, 1741, 1745, 1740, 1742, 1742, 1752, 1754, 1753, + 1751, 1753, 1747, 1750, 1755, 1743, 1756, 1758, 1744, 1759, + 1757, 1764, 1746, 1756, 1748, 0, 1746, 1748, 1751, 1761, + 1763, 1759, 1754, 1762, 1760, 1754, 1753, 0, 1766, 1752, + 1760, 1755, 1757, 1756, 1758, 1766, 1759, 1757, 1765, 1765, + + 1765, 1761, 1763, 1764, 1769, 1765, 1761, 1763, 1767, 1762, + 1762, 1760, 1768, 1765, 1770, 1766, 1773, 1767, 1772, 1768, + 1775, 1770, 1774, 1772, 1776, 1765, 1765, 1765, 1778, 1773, + 1777, 1780, 1765, 0, 1774, 1767, 1769, 1779, 1780, 1768, + 1776, 1770, 1777, 1773, 1782, 1775, 1781, 1775, 1784, 1774, + 1772, 1776, 1781, 1783, 1783, 1779, 1785, 1777, 1780, 1787, + 1778, 1786, 1788, 1785, 1779, 1789, 1786, 1792, 1793, 1794, + 1793, 1782, 1789, 1781, 1784, 1784, 1797, 1798, 1799, 1796, + 1783, 1801, 1797, 1785, 1800, 1787, 1787, 1794, 1786, 1788, + 1800, 1810, 1789, 1801, 1792, 1793, 1794, 1796, 1802, 1803, + + 1804, 1804, 1805, 1797, 1807, 1799, 1796, 1811, 1801, 1798, + 1809, 1800, 1806, 1806, 1811, 1807, 1812, 1803, 1802, 1813, + 1814, 1815, 1816, 1810, 0, 1802, 1803, 1804, 1805, 1805, + 1819, 1807, 1809, 1818, 1811, 1817, 1812, 1809, 1819, 1806, + 1818, 1820, 1821, 1812, 1816, 1822, 1823, 1823, 1815, 1816, + 1824, 1813, 1814, 1817, 1822, 1825, 1820, 1819, 1826, 1829, + 1818, 1833, 1817, 0, 1827, 1832, 1821, 1828, 1820, 1821, + 1832, 1827, 1822, 1823, 1831, 1829, 1824, 1824, 1834, 1828, + 1839, 1831, 1829, 1833, 1836, 1835, 1829, 1825, 1833, 1838, + 1826, 1827, 1832, 1835, 1828, 1841, 1836, 1838, 1840, 1842, + + 1843, 1831, 1829, 1839, 1844, 1834, 1845, 1839, 1846, 1844, + 1848, 1836, 1835, 1841, 1846, 1847, 1838, 1849, 1848, 1840, + 1844, 1852, 1841, 1843, 1854, 1840, 1842, 1843, 1847, 1855, + 1859, 1844, 1856, 1845, 1850, 1846, 1844, 1848, 1851, 1849, + 1853, 1850, 1847, 1857, 1849, 1851, 1854, 1861, 1859, 1862, + 1864, 1854, 1853, 1852, 1861, 1860, 1855, 1859, 1856, 1856, + 1860, 1850, 1866, 1865, 1868, 1851, 1857, 1853, 1865, 1872, + 1857, 1860, 1869, 1869, 1861, 1870, 1862, 1864, 1871, 1877, + 1875, 1877, 1860, 1874, 1878, 1876, 1879, 1860, 1880, 0, + 0, 1879, 1881, 1871, 1866, 1865, 1868, 1870, 1874, 1869, + + 1876, 1872, 1870, 1875, 1886, 1871, 1877, 1875, 1882, 1884, + 1874, 1889, 1876, 1879, 1881, 1888, 1878, 1885, 1890, 1881, + 1880, 1891, 1892, 1882, 1884, 1885, 1886, 1893, 1895, 1892, + 1894, 1886, 0, 1896, 1897, 1882, 1884, 1889, 1889, 1888, + 1899, 1901, 1888, 1902, 1885, 1890, 1903, 1907, 1891, 1892, + 1895, 1894, 1897, 1908, 1896, 1895, 1905, 1894, 1902, 1893, + 1896, 1897, 1899, 1906, 1909, 1901, 1910, 1899, 1901, 1907, + 1902, 1905, 1903, 1903, 1907, 1911, 1912, 1913, 1906, 1914, + 1908, 1915, 1909, 1905, 1917, 1916, 1914, 1918, 1910, 1920, + 1906, 1909, 1917, 1910, 1916, 1919, 1921, 1911, 1922, 1915, + + 1912, 0, 1911, 1912, 1913, 1921, 1914, 1924, 1915, 1923, + 1918, 1917, 1916, 1926, 1918, 1928, 1922, 1919, 1923, 1927, + 1924, 1920, 1919, 1921, 1926, 1922, 1930, 1931, 1927, 1932, + 1929, 1938, 1933, 1928, 1924, 1935, 1923, 1929, 1933, 1926, + 1926, 1934, 1928, 1940, 1932, 1931, 1927, 1946, 1944, 1935, + 1941, 1926, 1930, 1930, 1931, 1942, 1932, 1929, 1938, 1933, + 1944, 1941, 1935, 1934, 1947, 1945, 1942, 1940, 1934, 1948, + 1940, 1950, 1949, 0, 1947, 1944, 1953, 1941, 1945, 1946, + 1954, 1951, 1942, 1956, 1957, 1958, 1962, 1956, 1960, 1959, + 0, 1947, 1945, 1960, 1961, 1948, 1948, 1949, 1950, 1949, + + 1951, 1961, 1963, 1953, 1965, 1957, 1954, 1954, 1951, 1959, + 1956, 1957, 1962, 1962, 1967, 1960, 1959, 1958, 1964, 1965, + 1963, 1961, 1966, 1968, 1964, 1973, 1967, 1969, 1969, 1963, + 1970, 1965, 1973, 1975, 1971, 1974, 1976, 1966, 1968, 1974, + 1979, 1967, 1970, 1980, 1977, 1964, 1983, 1971, 1975, 1966, + 1968, 1978, 1973, 1977, 1969, 1971, 1984, 1970, 1978, 1981, + 1975, 1971, 1974, 1976, 1979, 1980, 1981, 1979, 1983, 1986, + 1980, 1977, 1987, 1983, 1971, 1985, 1989, 1992, 1978, 1991, + 1994, 1984, 1993, 1984, 1985, 1995, 1981, 0, 1991, 1997, + 1999, 1986, 1987, 1995, 1989, 1992, 1986, 1993, 1998, 1987, + + 2000, 2000, 1985, 1989, 1992, 1994, 1991, 1994, 2001, 1993, + 2003, 1998, 1995, 2002, 1997, 2005, 1997, 1999, 2007, 2004, + 2009, 2006, 2008, 2018, 2005, 1998, 2010, 2000, 2006, 0, + 2001, 2012, 2003, 2014, 2009, 2001, 2015, 2003, 2002, 2012, + 2002, 2004, 2005, 2013, 2008, 2010, 2004, 2009, 2006, 2008, + 2007, 2019, 2016, 2010, 2017, 2018, 2013, 2020, 2012, 2021, + 2014, 2017, 2015, 2015, 2016, 2023, 2022, 0, 2021, 2025, + 2013, 2026, 2024, 2019, 2022, 0, 2027, 2033, 2019, 2016, + 2028, 2017, 2020, 2033, 2020, 2022, 2021, 2024, 2032, 0, + 2039, 2029, 2023, 2022, 2027, 2025, 2025, 2026, 2026, 2024, + + 2029, 2022, 2028, 2027, 2033, 2031, 2034, 2028, 2031, 2035, + 2036, 2034, 2039, 2032, 2038, 2032, 2042, 2039, 2029, 2043, + 2040, 2044, 2045, 2031, 2046, 2036, 2043, 2035, 2068, 2038, + 2042, 2047, 2031, 2046, 2048, 2031, 2035, 2036, 2034, 2044, + 2047, 2038, 2040, 2042, 2049, 2048, 2043, 2040, 2044, 2045, + 2050, 2046, 2052, 2053, 2055, 2068, 2054, 2049, 2047, 0, + 2056, 2048, 2050, 2054, 2062, 2060, 2057, 2052, 2053, 2063, + 2066, 2049, 2066, 2063, 2070, 2077, 2055, 2050, 2060, 2052, + 2053, 2055, 2056, 2054, 2057, 2062, 2060, 2056, 2064, 2065, + 2067, 2062, 2060, 2057, 2069, 2071, 2063, 2066, 2065, 0, + + 2064, 2070, 2072, 2071, 2073, 2060, 2074, 2077, 2067, 2075, + 2078, 2079, 2069, 2076, 2075, 2064, 2065, 2067, 2076, 2084, + 2074, 2069, 2071, 2081, 2080, 2072, 2073, 2085, 0, 2072, + 2081, 2073, 2087, 2074, 2088, 2079, 2075, 2086, 2079, 2090, + 2091, 2085, 2078, 2080, 0, 2076, 2084, 2089, 2090, 2092, + 2081, 2080, 2085, 2085, 2085, 2086, 2093, 2094, 2095, 2087, + 2088, 2088, 2089, 2096, 2086, 2098, 2090, 2100, 2085, 2104, + 2099, 2092, 2091, 2103, 2089, 2103, 2092, 2099, 2109, 2085, + 2095, 2107, 2093, 2093, 2094, 2095, 2101, 2106, 2098, 2109, + 2100, 2104, 2098, 2101, 2100, 2096, 2104, 2099, 2105, 2106, + + 2103, 2108, 2105, 2107, 2110, 2109, 2113, 2111, 2107, 2114, + 2108, 2110, 2112, 2101, 2106, 2115, 2116, 2112, 2117, 2117, + 2119, 2118, 0, 2122, 2121, 2105, 0, 2115, 2108, 2111, + 2118, 2110, 2114, 2113, 2111, 2119, 2114, 2122, 2116, 2112, + 2124, 2120, 2115, 2116, 2123, 2117, 2121, 2119, 2118, 2120, + 2122, 2121, 2127, 2123, 2126, 2128, 2130, 2129, 2131, 2130, + 2127, 2129, 2133, 2128, 2132, 2139, 2131, 2124, 2120, 2134, + 2132, 2123, 2140, 2126, 2136, 2134, 2138, 2133, 2139, 2127, + 2141, 2126, 2128, 2130, 2129, 2131, 2136, 2142, 2143, 2133, + 2138, 2132, 2139, 2140, 2144, 2145, 2134, 2148, 2146, 2140, + + 2149, 2136, 2147, 2138, 0, 2141, 2150, 2141, 2151, 2145, + 2143, 2146, 2153, 2156, 2142, 2143, 2147, 2154, 2144, 2157, + 2152, 2144, 2145, 2148, 2148, 2146, 2153, 2149, 2158, 2147, + 0, 2150, 2152, 2150, 2155, 2151, 2160, 2155, 2161, 2153, + 2156, 2162, 2163, 2154, 2154, 2161, 2157, 2152, 2162, 2164, + 2158, 2165, 2155, 2167, 2166, 2158, 2169, 2163, 2160, 2170, + 2171, 2155, 2166, 2160, 2155, 2161, 2168, 2172, 2162, 2163, + 2173, 2170, 2174, 2175, 2179, 2168, 2164, 2176, 2165, 2180, + 2167, 2166, 2171, 2169, 2177, 2174, 2170, 2171, 2182, 2183, + 2176, 2175, 2177, 2168, 2172, 2181, 2179, 2173, 2183, 2174, + + 2175, 2179, 2184, 2181, 2176, 2187, 2180, 2185, 0, 2186, + 2188, 2177, 2190, 2189, 2191, 2182, 2183, 2194, 2188, 2193, + 2190, 2194, 2181, 2184, 2186, 2189, 2193, 2196, 2197, 2184, + 2195, 2185, 2187, 0, 2185, 2186, 2186, 2188, 2199, 2190, + 2189, 2191, 2195, 2203, 2194, 2198, 2193, 2200, 2205, 2201, + 2196, 2186, 2255, 2198, 2196, 2197, 2204, 2195, 2206, 2200, + 2199, 2201, 2210, 2204, 2207, 2199, 2209, 2209, 2205, 2208, + 2203, 2206, 2198, 2207, 2200, 2205, 2201, 2211, 2208, 2255, + 2212, 2216, 2213, 2204, 2219, 2206, 2215, 0, 2210, 2210, + 2217, 2207, 2218, 2209, 2218, 2211, 2208, 2213, 2219, 2213, + + 2221, 2215, 2227, 2216, 2211, 2212, 2213, 2212, 2216, 2213, + 2220, 2219, 2217, 2215, 2222, 2222, 2220, 2217, 2224, 2218, + 2225, 2226, 2221, 2228, 2213, 2229, 2213, 2221, 2232, 2228, + 2232, 2230, 2231, 2226, 2227, 2233, 2234, 2220, 2235, 2239, + 2224, 2222, 2225, 2236, 2240, 2224, 2237, 2225, 2226, 2233, + 2228, 2238, 2239, 2230, 2231, 2232, 2235, 2229, 2230, 2231, + 2234, 2236, 2233, 2234, 2237, 2235, 2239, 2241, 2242, 2238, + 2236, 2246, 0, 2237, 2244, 2248, 2240, 2247, 2238, 2249, + 0, 2244, 2253, 2251, 0, 2251, 2250, 2249, 0, 2246, + 2251, 2242, 0, 2253, 2268, 2242, 2269, 2257, 2246, 2241, + + 2254, 2244, 2259, 2247, 2247, 2249, 2249, 2248, 2250, 2253, + 2251, 2254, 2251, 2250, 2249, 2257, 2256, 2259, 2262, 2260, + 2261, 2268, 2269, 2269, 2257, 2264, 2265, 2254, 2256, 2259, + 2260, 2266, 2261, 2262, 2271, 2267, 2272, 2273, 2266, 2274, + 2275, 2277, 0, 2256, 2284, 2262, 2260, 2261, 2265, 2264, + 2267, 2276, 2264, 2265, 2278, 0, 2279, 2281, 2266, 2273, + 2272, 2271, 2267, 2272, 2273, 2280, 2282, 2278, 2277, 2276, + 2281, 2274, 2275, 2283, 2282, 2285, 2284, 2290, 2276, 2286, + 2280, 2278, 2279, 2279, 2281, 2288, 2289, 2291, 2285, 2292, + 0, 2294, 2280, 2282, 2295, 2296, 0, 2293, 2294, 2283, + + 2283, 2286, 2285, 2299, 2290, 2297, 2286, 2292, 2288, 2291, + 2289, 2303, 2288, 2289, 2291, 2293, 2292, 2295, 2294, 2297, + 2300, 2295, 2296, 2302, 2293, 2299, 2301, 2300, 2304, 2305, + 2299, 2306, 2297, 2301, 2303, 2304, 2302, 2307, 2303, 2308, + 2311, 2309, 2314, 2317, 2310, 2331, 2318, 2300, 2308, 2309, + 2302, 2305, 2310, 2301, 2312, 2304, 2305, 2314, 2307, 2315, + 2312, 2316, 2311, 2306, 2307, 2318, 2308, 2311, 2309, 2314, + 2315, 2310, 2319, 2318, 2321, 2317, 2323, 2331, 2324, 0, + 2332, 2312, 2325, 2316, 2326, 2326, 2315, 2327, 2316, 2323, + 2333, 2337, 2321, 2330, 2334, 2332, 0, 2319, 0, 2319, + + 2349, 2321, 2341, 2323, 2324, 2324, 2325, 2332, 2345, 2325, + 2339, 2326, 2334, 2327, 2327, 2341, 2330, 2333, 2337, 2339, + 2330, 2334, 2342, 2346, 2346, 2347, 2348, 2349, 2351, 2341, + 2345, 2353, 2354, 2342, 2355, 2345, 0, 2339, 2356, 2361, + 2357, 2360, 2363, 2356, 2364, 2355, 2359, 2347, 2348, 2342, + 2346, 2368, 2347, 2348, 2359, 2351, 2360, 2369, 2354, 2354, + 2363, 2355, 2357, 2353, 2370, 2356, 2361, 2357, 2360, 2363, + 2365, 2366, 2370, 2359, 2373, 2374, 2364, 2371, 2368, 2365, + 0, 2369, 2380, 2366, 2369, 2375, 2371, 2376, 2377, 2378, + 0, 2370, 2379, 2382, 0, 2380, 2376, 2365, 2366, 2383, + + 2373, 2373, 2374, 2384, 2371, 2381, 2377, 2375, 2382, 2380, + 2384, 2378, 2375, 2385, 2376, 2377, 2378, 2379, 2381, 2379, + 2382, 2383, 2386, 2387, 2388, 2389, 2383, 2390, 2391, 2395, + 2384, 2392, 2381, 2393, 0, 2385, 2394, 2391, 2397, 2399, + 2385, 0, 2390, 2401, 2395, 2397, 2396, 2402, 0, 2386, + 2387, 2388, 2389, 2392, 2390, 2391, 2395, 2398, 2392, 2393, + 2393, 2396, 2394, 2394, 2400, 2397, 2399, 2403, 2398, 2405, + 2401, 2404, 2400, 2396, 2402, 2406, 2411, 2408, 2407, 2412, + 2409, 2410, 0, 2403, 2398, 2407, 2404, 2409, 2410, 2405, + 2406, 2400, 2413, 2413, 2403, 2419, 2405, 2412, 2404, 2408, + + 2415, 0, 2406, 2411, 2408, 2407, 2412, 2409, 2410, 2414, + 2416, 2417, 0, 2416, 2415, 2418, 2414, 2420, 2425, 2413, + 2421, 2419, 2419, 2425, 2417, 2424, 2427, 2415, 2422, 2426, + 2418, 2431, 2421, 2426, 2424, 2420, 2414, 2416, 2417, 2429, + 2422, 2428, 2418, 2430, 2420, 2425, 2432, 2421, 2433, 0, + 2427, 2435, 2424, 2427, 2428, 2422, 2426, 2437, 2431, 2440, + 2438, 2429, 2444, 2439, 2441, 2430, 2429, 2440, 2428, 2438, + 2430, 2444, 0, 2432, 2433, 2433, 2441, 2435, 2435, 2439, + 2445, 2443, 2447, 2437, 2437, 2445, 2440, 2438, 2443, 2444, + 2439, 2441, 2446, 2449, 2448, 2450, 2451, 2452, 2455, 2446, + + 2447, 2448, 2450, 2453, 2456, 2451, 2452, 2445, 2443, 2447, + 2457, 2459, 2462, 2465, 2458, 2457, 2461, 2456, 2449, 2446, + 2449, 2448, 2450, 2451, 2452, 2455, 2463, 2464, 0, 2453, + 2453, 2456, 2458, 2465, 2461, 2463, 2464, 2457, 2459, 2462, + 2465, 2458, 2467, 2461, 2466, 2471, 2468, 2469, 2472, 2470, + 2476, 2467, 2473, 2463, 2464, 2468, 2466, 2470, 2469, 2473, + 2475, 2474, 2477, 2478, 0, 0, 2480, 2482, 0, 2467, + 2474, 2466, 2471, 2468, 2469, 2472, 2470, 2476, 2480, 2473, + 2482, 2475, 2479, 2483, 2481, 2486, 2488, 2475, 2474, 2477, + 2484, 2479, 2481, 2480, 2482, 2478, 2485, 2484, 0, 2487, + + 2489, 2490, 2494, 2485, 2496, 2483, 2492, 2486, 2495, 2479, + 2483, 2481, 2486, 2488, 2492, 2497, 2495, 2484, 2498, 2496, + 2494, 2505, 2497, 2485, 2487, 2489, 2487, 2489, 2490, 2494, + 2499, 2496, 2503, 2492, 2504, 2495, 2500, 2499, 2506, 2503, + 2498, 2508, 2497, 2507, 2500, 2498, 2509, 2513, 2505, 2512, + 2506, 2519, 2507, 2514, 2511, 2517, 0, 2499, 2504, 2503, + 2521, 2504, 2517, 2500, 2524, 2506, 2511, 2514, 2508, 2509, + 2507, 2516, 2512, 2509, 2513, 2521, 2512, 2518, 2519, 2522, + 2514, 2511, 2517, 2516, 2518, 2523, 2525, 2521, 2526, 2527, + 2529, 2524, 2528, 2531, 2525, 2536, 2538, 2522, 2516, 2530, + + 2537, 2529, 2543, 0, 2518, 2537, 2522, 2541, 2523, 2546, + 2528, 2527, 2523, 2525, 2530, 2526, 2527, 2529, 2539, 2528, + 2531, 2536, 2536, 2538, 2540, 2541, 2530, 2537, 2542, 2543, + 2544, 2549, 2539, 2553, 2541, 2551, 2546, 2550, 2540, 2552, + 0, 2554, 2544, 0, 2556, 2539, 2542, 2555, 2551, 2554, + 2559, 2540, 2553, 2549, 2560, 2542, 2562, 2544, 2549, 2550, + 2553, 2552, 2551, 2556, 2550, 2555, 2552, 2558, 2554, 2563, + 2561, 2556, 2559, 2564, 2555, 2565, 2560, 2559, 2567, 2558, + 2568, 2560, 2561, 2562, 2566, 2569, 2570, 2567, 2571, 2568, + 0, 2572, 2574, 0, 2558, 2565, 2563, 2561, 2573, 2575, + + 2564, 2579, 2565, 2572, 0, 2567, 2566, 2568, 2570, 2578, + 2580, 2566, 2586, 2570, 2571, 2571, 2581, 2569, 2572, 2574, + 2573, 2581, 2582, 2578, 2583, 2573, 2575, 2584, 2579, 2585, + 2587, 2589, 2588, 2592, 2580, 2586, 2578, 2580, 2593, 2586, + 2584, 2590, 2594, 2589, 2582, 2598, 2583, 2591, 2581, 2582, + 2588, 2583, 2587, 2591, 2584, 2597, 2595, 2587, 2589, 2588, + 2590, 2585, 2599, 2601, 2594, 2592, 2603, 2598, 2590, 2594, + 2593, 2595, 2598, 2604, 2591, 2597, 2605, 2606, 2601, 2607, + 2608, 2610, 2597, 2595, 2609, 2605, 2599, 2613, 2603, 2599, + 2601, 2606, 2614, 2603, 2615, 2604, 2613, 2607, 2608, 2610, + + 2604, 2618, 2621, 2605, 2606, 2619, 2607, 2608, 2610, 2618, + 2609, 2609, 2619, 2622, 2613, 2615, 2624, 2620, 2623, 2625, + 2626, 2615, 2627, 2629, 2614, 2620, 2623, 2633, 2618, 2621, + 2627, 2625, 2619, 2622, 2624, 2629, 2632, 2634, 2635, 2634, + 2622, 2631, 2636, 2624, 2620, 2623, 2625, 2626, 2631, 2627, + 2629, 2637, 2638, 2639, 2633, 2640, 0, 2642, 2645, 2632, + 2646, 2651, 2643, 2632, 2634, 2649, 2647, 2652, 2631, 2654, + 2635, 2658, 2639, 2646, 2636, 2642, 2643, 2640, 2647, 2638, + 2639, 2645, 2640, 2637, 2642, 2645, 2650, 2646, 2651, 2643, + 2656, 2649, 2649, 2647, 2652, 2650, 2654, 2655, 2658, 2660, + + 2661, 2662, 2663, 2665, 0, 2666, 2660, 2663, 2668, 2669, + 2665, 0, 2656, 2650, 2670, 2671, 2662, 2656, 2675, 0, + 2655, 2676, 2661, 2677, 2655, 2675, 2660, 2661, 2662, 2671, + 2665, 2666, 2666, 2678, 2663, 2668, 2669, 2673, 2670, 2679, + 2680, 2670, 2671, 2681, 2682, 2675, 2673, 2685, 2676, 2677, + 2677, 2679, 2683, 2682, 2684, 2686, 2690, 2681, 2691, 2695, + 2678, 2690, 2691, 2694, 2673, 2683, 2679, 2680, 2692, 2693, + 2681, 2682, 2698, 0, 2685, 2692, 2693, 2697, 2686, 2683, + 2701, 2696, 2686, 2696, 2694, 2691, 2684, 2703, 2690, 2704, + 2694, 2695, 2706, 2707, 2706, 2692, 2693, 2708, 0, 2698, + + 2697, 2711, 2701, 2710, 2697, 2713, 2703, 2701, 2696, 2714, + 2711, 2709, 2709, 2704, 2703, 2712, 2704, 2707, 2713, 2706, + 2707, 2709, 2712, 2708, 2708, 2710, 2716, 2715, 2711, 2718, + 2710, 2717, 2713, 2719, 2716, 2723, 2714, 2718, 2709, 2709, + 2715, 2720, 2712, 2721, 2717, 2724, 2720, 2722, 2721, 0, + 2716, 2725, 2719, 2716, 2715, 2722, 2718, 2726, 2717, 2727, + 2719, 2716, 2723, 2730, 0, 2728, 2729, 2731, 2731, 2732, + 2730, 2724, 2724, 2720, 2722, 2721, 2728, 2725, 2725, 2733, + 2734, 2735, 2736, 2726, 2726, 2727, 2727, 2733, 2729, 2736, + 2730, 2732, 2728, 2729, 2731, 2739, 2732, 2737, 2740, 2735, + + 0, 2742, 2734, 2741, 2737, 2744, 2733, 2734, 2735, 2736, + 2742, 2745, 2746, 2747, 2749, 2750, 2751, 2754, 2752, 2755, + 0, 0, 2739, 0, 2737, 2740, 2754, 2741, 2742, 2756, + 2741, 2745, 2744, 2750, 2751, 2747, 2752, 2757, 2745, 2746, + 2747, 2749, 2750, 2751, 2754, 2752, 2755, 2758, 2759, 2760, + 2761, 2766, 2756, 2759, 0, 2757, 2756, 2767, 2762, 2758, + 2769, 2772, 2770, 2760, 2757, 2771, 0, 2771, 2761, 0, + 2772, 2775, 2774, 2766, 2758, 2770, 2760, 2761, 2766, 2779, + 2759, 2762, 2781, 0, 2767, 2762, 2775, 2769, 2772, 2770, + 2774, 2778, 2771, 2778, 2780, 2783, 2785, 2779, 2775, 2774, + + 0, 2780, 2785, 2787, 2788, 2795, 2779, 2789, 0, 2790, + 2783, 0, 2793, 2792, 2781, 2793, 2796, 2797, 2778, 2798, + 2800, 2780, 2783, 2785, 0, 2787, 2788, 2790, 2800, 2801, + 2787, 2788, 2795, 2789, 2789, 2792, 2790, 2798, 2793, 2793, + 2792, 2799, 2793, 2796, 2797, 2803, 2798, 2800, 2799, 2804, + 0, 2801, 2805, 2806, 2807, 2808, 2801, 2811, 2809, 2812, + 2813, 2810, 2813, 2807, 2809, 2814, 2811, 2816, 2799, 0, + 2808, 2804, 2819, 2817, 2805, 2818, 2804, 2803, 2820, 2805, + 2806, 2807, 2808, 2810, 2811, 2809, 2820, 2813, 2810, 2821, + 2816, 2812, 2814, 2826, 2816, 2817, 2822, 2818, 2819, 2819, + + 2817, 2821, 2818, 2824, 2828, 2820, 2830, 2829, 2822, 2831, + 2824, 2832, 0, 2834, 2840, 2835, 2821, 2833, 2828, 2836, + 2826, 2829, 2832, 2822, 0, 2833, 0, 2831, 2844, 2830, + 2824, 2828, 2834, 2830, 2829, 2837, 2831, 2835, 2832, 2838, + 2834, 2840, 2835, 2841, 2833, 2836, 2836, 2845, 2838, 2839, + 2839, 2841, 2847, 2837, 2849, 2844, 2851, 2852, 2847, 2856, + 2853, 0, 2837, 2854, 2862, 2857, 2838, 2851, 2852, 2858, + 2841, 2853, 2857, 2858, 2845, 2861, 2839, 2862, 2864, 2847, + 2859, 2849, 2868, 2851, 2852, 2854, 2856, 2853, 2859, 2863, + 2854, 2862, 2857, 2867, 2870, 2869, 2858, 2863, 2871, 2870, + + 2867, 2861, 2861, 2872, 2873, 2864, 2876, 2859, 2874, 2878, + 2875, 2873, 2877, 2880, 2868, 2879, 2863, 2869, 2882, 2877, + 2867, 2870, 2869, 2879, 2876, 2871, 2875, 2874, 2880, 2881, + 2872, 2873, 2888, 2876, 2883, 2874, 2881, 2875, 2884, 2877, + 2880, 2878, 2879, 2889, 2890, 2882, 2891, 2888, 2892, 2893, + 2889, 2894, 2896, 2897, 2874, 2898, 2881, 2900, 2883, 2888, + 2894, 2883, 0, 2899, 2884, 2884, 0, 2902, 0, 0, + 2889, 2899, 2892, 2891, 2896, 2892, 2890, 2898, 2894, 2896, + 2897, 2893, 2898, 2901, 2901, 2904, 2905, 2907, 2908, 2900, + 2899, 2909, 2910, 2901, 2902, 2905, 2906, 2913, 2906, 2909, + + 2904, 2907, 2911, 2910, 2914, 2915, 2917, 2918, 2916, 2919, + 2901, 2901, 2904, 2905, 2907, 2908, 2920, 2923, 2909, 2910, + 2911, 2916, 0, 2906, 2913, 2921, 2924, 2915, 2917, 2911, + 2926, 2914, 2915, 2917, 2918, 2916, 2919, 2922, 2922, 2921, + 2931, 2932, 2929, 2920, 2934, 2931, 2932, 2936, 2924, 2923, + 2929, 2933, 2921, 2924, 2938, 2939, 2933, 2926, 2940, 2937, + 2941, 2938, 2943, 2949, 2922, 2951, 2953, 2931, 2932, 2929, + 2934, 2934, 2937, 2939, 2936, 2946, 2944, 2952, 2933, 2953, + 2945, 2938, 2939, 2944, 2954, 2940, 2937, 2941, 2945, 0, + 2949, 2955, 2951, 2953, 2943, 2956, 2957, 2946, 2958, 2952, + + 2963, 2960, 2946, 2944, 2952, 2961, 2955, 2945, 2960, 2962, + 2966, 2967, 2961, 2964, 2956, 2963, 2954, 2968, 2955, 2967, + 2958, 2971, 2956, 2957, 2968, 2958, 2969, 2963, 2960, 2966, + 2971, 2962, 2961, 2969, 2964, 2972, 2962, 2966, 2967, 2974, + 2964, 2973, 2973, 2975, 2968, 2974, 2972, 2978, 2971, 2977, + 2979, 2973, 2982, 2969, 2978, 0, 2980, 2983, 2984, 2982, + 2987, 2988, 2972, 2989, 2993, 2975, 2974, 2994, 2973, 2973, + 2975, 2977, 2984, 0, 2978, 2996, 2977, 2998, 2980, 2982, + 3002, 2983, 2979, 2980, 2983, 2984, 2989, 2987, 2988, 2994, + 2989, 2993, 2995, 3004, 2994, 2999, 2999, 3000, 3000, 0, + + 2995, 3005, 2996, 3002, 2998, 3001, 3001, 3002, 3006, 3009, + 3005, 3010, 3012, 3016, 3018, 3011, 3009, 3019, 3010, 2995, + 3004, 3006, 3017, 3015, 2999, 3015, 3000, 3023, 3005, 3019, + 3022, 3024, 3018, 3016, 3001, 3006, 3009, 3011, 3010, 3012, + 3016, 3018, 3011, 3021, 3019, 3017, 3025, 3026, 3022, 3017, + 3015, 3029, 3021, 3023, 3023, 3027, 3029, 3022, 3024, 3026, + 3028, 3030, 3031, 3028, 3031, 3033, 3038, 3032, 3036, 3034, + 3021, 3033, 3037, 3025, 3026, 3035, 3036, 3027, 3028, 3032, + 3039, 3040, 3027, 3029, 3041, 3046, 3048, 3028, 3042, 3031, + 3028, 3034, 3033, 3030, 3032, 3036, 3034, 3035, 3038, 3037, + + 3042, 3039, 3035, 3043, 3049, 3052, 3053, 3039, 3040, 3054, + 3055, 3041, 3046, 3048, 3056, 3042, 3057, 3058, 3061, 3063, + 3060, 3062, 3049, 0, 3067, 3043, 0, 0, 3064, 0, + 3043, 3049, 3052, 3053, 3063, 3064, 3054, 3055, 3060, 3062, + 3068, 3056, 3066, 3057, 3058, 3061, 3063, 3060, 3062, 3069, + 3066, 3067, 3068, 3070, 3072, 3064, 3071, 3073, 3078, 3078, + 3084, 3076, 3077, 3069, 3079, 3080, 3072, 3068, 3070, 3066, + 3076, 3082, 3083, 3084, 3080, 3085, 3069, 0, 3090, 0, + 3070, 3072, 3071, 3071, 3073, 3078, 3077, 3084, 3076, 3077, + 3079, 3079, 3080, 3086, 3087, 3082, 3088, 3085, 3082, 3090, + + 3091, 3086, 3085, 3087, 3083, 3090, 3094, 3088, 3098, 3098, + 3095, 3108, 3106, 3109, 3110, 3111, 3114, 3117, 3091, 0, + 3086, 3087, 3095, 3088, 3113, 3108, 3115, 3091, 3113, 3094, + 3117, 3120, 3121, 3094, 3114, 3098, 3106, 3095, 3108, 3106, + 3109, 3110, 3111, 3114, 3117, 3116, 3119, 3120, 3123, 3115, + 3119, 3113, 3116, 3115, 3121, 3122, 0, 3124, 3120, 3121, + 3123, 3126, 3125, 3131, 0, 3127, 3128, 3130, 3129, 3126, + 3129, 3132, 3116, 3119, 3127, 3123, 3125, 3128, 3133, 3130, + 3122, 3131, 3122, 3124, 3124, 3134, 3132, 3135, 3126, 3125, + 3131, 3134, 3127, 3128, 3130, 3129, 3136, 3137, 3132, 3142, + + 3133, 3143, 3141, 3136, 3144, 3133, 3142, 3145, 3147, 3135, + 3146, 3148, 3134, 3149, 3135, 3141, 3156, 3151, 3150, 3137, + 3152, 3149, 3144, 3136, 3137, 3150, 3142, 3153, 3143, 3141, + 3154, 3144, 3154, 3157, 3145, 3147, 3146, 3146, 3148, 3155, + 3149, 3151, 3152, 3158, 3151, 3150, 3157, 3152, 3156, 3153, + 3159, 3155, 3160, 3162, 3153, 3161, 3163, 3154, 3158, 3164, + 3157, 3165, 3161, 3166, 3168, 3170, 3155, 3173, 3175, 3165, + 3158, 3164, 3159, 3174, 3170, 3177, 3168, 3159, 3178, 3160, + 3162, 3176, 3161, 3163, 3179, 0, 3164, 3175, 3165, 3176, + 3166, 3168, 3170, 3181, 3173, 3175, 3182, 3179, 3180, 3174, + + 3174, 3181, 3183, 3185, 3191, 3192, 3189, 3177, 3176, 3188, + 3178, 3179, 3180, 3189, 3194, 3188, 3195, 3191, 3182, 3196, + 3181, 3194, 3200, 3182, 3202, 3180, 3197, 3196, 3192, 3183, + 3185, 3191, 3192, 3189, 3198, 3201, 3188, 3199, 3195, 3208, + 3197, 3194, 3211, 3195, 3200, 3199, 3196, 3205, 3198, 3200, + 3206, 3202, 3207, 3197, 3205, 3210, 3209, 3201, 3212, 3206, + 3207, 3198, 3201, 3215, 3199, 0, 3208, 3213, 3211, 3211, + 3214, 3215, 3216, 3218, 3205, 3220, 3219, 3206, 3209, 3207, + 3212, 3224, 3222, 3209, 3227, 3212, 3231, 3210, 3223, 3213, + 3215, 3225, 3214, 3229, 3213, 3233, 3223, 3214, 3219, 3225, + + 3218, 3224, 3220, 3219, 3216, 3222, 3226, 3229, 3224, 3222, + 3235, 3228, 3231, 3231, 3226, 3223, 3227, 3236, 3225, 3228, + 3229, 3234, 3233, 3237, 3234, 3236, 3238, 0, 3239, 3241, + 3240, 3237, 3235, 3226, 3243, 3243, 3244, 3235, 3228, 3234, + 3238, 3245, 3248, 3241, 3236, 3246, 0, 3247, 3234, 3245, + 3237, 3234, 3240, 3238, 3239, 3239, 3241, 3240, 3249, 3250, + 3251, 3243, 3244, 3244, 3248, 3253, 3252, 3250, 3245, 3248, + 3254, 3246, 3246, 3247, 3247, 3255, 3256, 3258, 3249, 3261, + 0, 3257, 0, 3259, 3270, 3249, 3250, 3251, 3252, 3257, + 3253, 3259, 3253, 3252, 3264, 3255, 3256, 3254, 3265, 3258, + + 3268, 3262, 3255, 3256, 3258, 3266, 3261, 3267, 3257, 3262, + 3259, 3270, 3273, 3266, 3271, 3267, 3264, 3274, 3277, 3278, + 3265, 3264, 3271, 3272, 3287, 3265, 3268, 3268, 3262, 3275, + 3281, 3272, 3266, 3279, 3267, 3285, 3284, 3288, 3273, 3273, + 3286, 3271, 0, 3285, 3274, 3277, 3278, 0, 3286, 3275, + 3272, 3287, 3281, 3279, 0, 0, 3275, 3281, 3284, 0, + 3279, 0, 3285, 3284, 3288, 0, 0, 3286, 3292, 3292, + 3292, 3292, 3292, 3292, 3292, 3293, 3293, 3293, 3293, 3293, + 3293, 3293, 3294, 3294, 3294, 3294, 3294, 3294, 3294, 3295, + 3295, 3295, 3295, 3295, 3295, 3295, 3296, 3296, 3296, 3296, + + 3296, 3296, 3296, 3297, 3297, 3297, 3297, 3297, 3297, 3297, + 3298, 3298, 3298, 3298, 3298, 3298, 3298, 3300, 3300, 0, + 3300, 3300, 3300, 3300, 3301, 3301, 0, 0, 0, 3301, + 3301, 3302, 3302, 0, 0, 3302, 0, 3302, 3303, 0, + 0, 0, 0, 0, 3303, 3304, 3304, 0, 0, 0, + 3304, 3304, 3305, 0, 0, 0, 0, 0, 3305, 3306, + 3306, 0, 3306, 3306, 3306, 3306, 3307, 0, 0, 0, + 0, 0, 3307, 3308, 3308, 0, 0, 0, 3308, 3308, + 3309, 3309, 0, 3309, 3309, 3309, 3309, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, 3291, + 3291, 3291, 3291, 3291 } ; static yy_state_type yy_last_accepting_state; @@ -3757,7 +3800,7 @@ static void config_end_include(void) } #endif -#line 3758 "<stdout>" +#line 3801 "<stdout>" #define YY_NO_INPUT 1 #line 191 "util/configlexer.lex" #ifndef YY_NO_UNPUT @@ -3766,9 +3809,9 @@ static void config_end_include(void) #ifndef YY_NO_INPUT #define YY_NO_INPUT 1 #endif -#line 3767 "<stdout>" +#line 3810 "<stdout>" -#line 3769 "<stdout>" +#line 3812 "<stdout>" #define INITIAL 0 #define quotedstring 1 @@ -3992,7 +4035,7 @@ YY_DECL { #line 211 "util/configlexer.lex" -#line 3993 "<stdout>" +#line 4036 "<stdout>" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -4025,13 +4068,13 @@ yy_match: 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 >= 3253 ) + if ( yy_current_state >= 3292 ) 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] != 9263 ); + while ( yy_base[yy_current_state] != 9388 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -4311,17 +4354,17 @@ YY_RULE_SETUP case 51: YY_RULE_SETUP #line 265 "util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSTEMD) } +{ YDVAR(1, VAR_HTTP_NOTLS_DOWNSTREAM) } YY_BREAK case 52: YY_RULE_SETUP #line 266 "util/configlexer.lex" -{ YDVAR(1, VAR_DO_DAEMONIZE) } +{ YDVAR(1, VAR_USE_SYSTEMD) } YY_BREAK case 53: YY_RULE_SETUP #line 267 "util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE) } +{ YDVAR(1, VAR_DO_DAEMONIZE) } YY_BREAK case 54: YY_RULE_SETUP @@ -4331,1304 +4374,1319 @@ YY_RULE_SETUP case 55: YY_RULE_SETUP #line 269 "util/configlexer.lex" -{ YDVAR(1, VAR_OUTGOING_INTERFACE) } +{ YDVAR(1, VAR_INTERFACE) } YY_BREAK case 56: YY_RULE_SETUP #line 270 "util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } +{ YDVAR(1, VAR_OUTGOING_INTERFACE) } YY_BREAK case 57: YY_RULE_SETUP #line 271 "util/configlexer.lex" -{ YDVAR(1, VAR_SO_RCVBUF) } +{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } YY_BREAK case 58: YY_RULE_SETUP #line 272 "util/configlexer.lex" -{ YDVAR(1, VAR_SO_SNDBUF) } +{ YDVAR(1, VAR_SO_RCVBUF) } YY_BREAK case 59: YY_RULE_SETUP #line 273 "util/configlexer.lex" -{ YDVAR(1, VAR_SO_REUSEPORT) } +{ YDVAR(1, VAR_SO_SNDBUF) } YY_BREAK case 60: YY_RULE_SETUP #line 274 "util/configlexer.lex" -{ YDVAR(1, VAR_IP_TRANSPARENT) } +{ YDVAR(1, VAR_SO_REUSEPORT) } YY_BREAK case 61: YY_RULE_SETUP #line 275 "util/configlexer.lex" -{ YDVAR(1, VAR_IP_FREEBIND) } +{ YDVAR(1, VAR_IP_TRANSPARENT) } YY_BREAK case 62: YY_RULE_SETUP #line 276 "util/configlexer.lex" -{ YDVAR(1, VAR_IP_DSCP) } +{ YDVAR(1, VAR_IP_FREEBIND) } YY_BREAK case 63: YY_RULE_SETUP #line 277 "util/configlexer.lex" -{ YDVAR(1, VAR_CHROOT) } +{ YDVAR(1, VAR_IP_DSCP) } YY_BREAK case 64: YY_RULE_SETUP #line 278 "util/configlexer.lex" -{ YDVAR(1, VAR_USERNAME) } +{ YDVAR(1, VAR_CHROOT) } YY_BREAK case 65: YY_RULE_SETUP #line 279 "util/configlexer.lex" -{ YDVAR(1, VAR_DIRECTORY) } +{ YDVAR(1, VAR_USERNAME) } YY_BREAK case 66: YY_RULE_SETUP #line 280 "util/configlexer.lex" -{ YDVAR(1, VAR_LOGFILE) } +{ YDVAR(1, VAR_DIRECTORY) } YY_BREAK case 67: YY_RULE_SETUP #line 281 "util/configlexer.lex" -{ YDVAR(1, VAR_PIDFILE) } +{ YDVAR(1, VAR_LOGFILE) } YY_BREAK case 68: YY_RULE_SETUP #line 282 "util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_HINTS) } +{ YDVAR(1, VAR_PIDFILE) } YY_BREAK case 69: YY_RULE_SETUP #line 283 "util/configlexer.lex" -{ YDVAR(1, VAR_STREAM_WAIT_SIZE) } +{ YDVAR(1, VAR_ROOT_HINTS) } YY_BREAK case 70: YY_RULE_SETUP #line 284 "util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } +{ YDVAR(1, VAR_STREAM_WAIT_SIZE) } YY_BREAK case 71: YY_RULE_SETUP #line 285 "util/configlexer.lex" -{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } +{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } YY_BREAK case 72: YY_RULE_SETUP #line 286 "util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } YY_BREAK case 73: YY_RULE_SETUP #line 287 "util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SLABS) } +{ YDVAR(1, VAR_MSG_CACHE_SIZE) } YY_BREAK case 74: YY_RULE_SETUP #line 288 "util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } +{ YDVAR(1, VAR_MSG_CACHE_SLABS) } YY_BREAK case 75: YY_RULE_SETUP #line 289 "util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } +{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } YY_BREAK case 76: YY_RULE_SETUP #line 290 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_TTL) } +{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } YY_BREAK case 77: YY_RULE_SETUP #line 291 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } +{ YDVAR(1, VAR_CACHE_MAX_TTL) } YY_BREAK case 78: YY_RULE_SETUP #line 292 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MIN_TTL) } +{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } YY_BREAK case 79: YY_RULE_SETUP #line 293 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_HOST_TTL) } +{ YDVAR(1, VAR_CACHE_MIN_TTL) } YY_BREAK case 80: YY_RULE_SETUP #line 294 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_LAME_TTL) } +{ YDVAR(1, VAR_INFRA_HOST_TTL) } YY_BREAK case 81: YY_RULE_SETUP #line 295 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } +{ YDVAR(1, VAR_INFRA_LAME_TTL) } YY_BREAK case 82: YY_RULE_SETUP #line 296 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } +{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } YY_BREAK case 83: YY_RULE_SETUP #line 297 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } +{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } YY_BREAK case 84: YY_RULE_SETUP #line 298 "util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } +{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } YY_BREAK case 85: YY_RULE_SETUP #line 299 "util/configlexer.lex" -{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } +{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } YY_BREAK case 86: YY_RULE_SETUP #line 300 "util/configlexer.lex" -{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } +{ YDVAR(1, VAR_INFRA_KEEP_PROBING) } YY_BREAK case 87: YY_RULE_SETUP #line 301 "util/configlexer.lex" -{ YDVAR(1, VAR_DELAY_CLOSE) } +{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } YY_BREAK case 88: YY_RULE_SETUP #line 302 "util/configlexer.lex" -{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } +{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } YY_BREAK case 89: YY_RULE_SETUP #line 303 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } +{ YDVAR(1, VAR_DELAY_CLOSE) } YY_BREAK case 90: YY_RULE_SETUP #line 304 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } +{ YDVAR(1, VAR_UDP_CONNECT) } YY_BREAK case 91: YY_RULE_SETUP #line 305 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_GLUE) } +{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 92: YY_RULE_SETUP #line 306 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } +{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 93: YY_RULE_SETUP #line 307 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } +{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 94: YY_RULE_SETUP #line 308 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } +{ YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 95: YY_RULE_SETUP #line 309 "util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 96: YY_RULE_SETUP #line 310 "util/configlexer.lex" -{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } +{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 97: YY_RULE_SETUP #line 311 "util/configlexer.lex" -{ YDVAR(1, VAR_CAPS_WHITELIST) } +{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 98: YY_RULE_SETUP #line 312 "util/configlexer.lex" -{ YDVAR(1, VAR_CAPS_WHITELIST) } +{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } YY_BREAK case 99: YY_RULE_SETUP #line 313 "util/configlexer.lex" -{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } +{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 100: YY_RULE_SETUP #line 314 "util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_ADDRESS) } +{ YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 101: YY_RULE_SETUP #line 315 "util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_DOMAIN) } +{ YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 102: YY_RULE_SETUP #line 316 "util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH_KEY) } +{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 103: YY_RULE_SETUP #line 317 "util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH) } +{ YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 104: YY_RULE_SETUP #line 318 "util/configlexer.lex" -{ YDVAR(1, VAR_DENY_ANY) } +{ YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 105: YY_RULE_SETUP #line 319 "util/configlexer.lex" -{ YDVAR(0, VAR_STUB_ZONE) } +{ YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 106: YY_RULE_SETUP #line 320 "util/configlexer.lex" -{ YDVAR(1, VAR_NAME) } +{ YDVAR(1, VAR_PREFETCH) } YY_BREAK case 107: YY_RULE_SETUP #line 321 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_ADDR) } +{ YDVAR(1, VAR_DENY_ANY) } YY_BREAK case 108: YY_RULE_SETUP #line 322 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_HOST) } +{ YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 109: YY_RULE_SETUP #line 323 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_PRIME) } +{ YDVAR(1, VAR_NAME) } YY_BREAK case 110: YY_RULE_SETUP #line 324 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_FIRST) } +{ YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 111: YY_RULE_SETUP #line 325 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_NO_CACHE) } +{ YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 112: YY_RULE_SETUP #line 326 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } +{ YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 113: YY_RULE_SETUP #line 327 "util/configlexer.lex" -{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } +{ YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 114: YY_RULE_SETUP #line 328 "util/configlexer.lex" -{ YDVAR(0, VAR_FORWARD_ZONE) } +{ YDVAR(1, VAR_STUB_NO_CACHE) } YY_BREAK case 115: YY_RULE_SETUP #line 329 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_ADDR) } +{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 116: YY_RULE_SETUP #line 330 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_HOST) } +{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 117: YY_RULE_SETUP #line 331 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_FIRST) } +{ YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 118: YY_RULE_SETUP #line 332 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_NO_CACHE) } +{ YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 119: YY_RULE_SETUP #line 333 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } +{ YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 120: YY_RULE_SETUP #line 334 "util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } +{ YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 121: YY_RULE_SETUP #line 335 "util/configlexer.lex" -{ YDVAR(0, VAR_AUTH_ZONE) } +{ YDVAR(1, VAR_FORWARD_NO_CACHE) } YY_BREAK case 122: YY_RULE_SETUP #line 336 "util/configlexer.lex" -{ YDVAR(0, VAR_RPZ) } +{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 123: YY_RULE_SETUP #line 337 "util/configlexer.lex" -{ YDVAR(1, VAR_TAGS) } +{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 124: YY_RULE_SETUP #line 338 "util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) } +{ YDVAR(0, VAR_AUTH_ZONE) } YY_BREAK case 125: YY_RULE_SETUP #line 339 "util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) } +{ YDVAR(0, VAR_RPZ) } YY_BREAK case 126: YY_RULE_SETUP #line 340 "util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_LOG) } +{ YDVAR(1, VAR_TAGS) } YY_BREAK case 127: YY_RULE_SETUP #line 341 "util/configlexer.lex" -{ YDVAR(1, VAR_RPZ_LOG_NAME) } +{ YDVAR(1, VAR_RPZ_ACTION_OVERRIDE) } YY_BREAK case 128: YY_RULE_SETUP #line 342 "util/configlexer.lex" -{ YDVAR(1, VAR_ZONEFILE) } +{ YDVAR(1, VAR_RPZ_CNAME_OVERRIDE) } YY_BREAK case 129: YY_RULE_SETUP #line 343 "util/configlexer.lex" -{ YDVAR(1, VAR_MASTER) } +{ YDVAR(1, VAR_RPZ_LOG) } YY_BREAK case 130: YY_RULE_SETUP #line 344 "util/configlexer.lex" -{ YDVAR(1, VAR_MASTER) } +{ YDVAR(1, VAR_RPZ_LOG_NAME) } YY_BREAK case 131: YY_RULE_SETUP #line 345 "util/configlexer.lex" -{ YDVAR(1, VAR_URL) } +{ YDVAR(1, VAR_ZONEFILE) } YY_BREAK case 132: YY_RULE_SETUP #line 346 "util/configlexer.lex" -{ YDVAR(1, VAR_ALLOW_NOTIFY) } +{ YDVAR(1, VAR_MASTER) } YY_BREAK case 133: YY_RULE_SETUP #line 347 "util/configlexer.lex" -{ YDVAR(1, VAR_FOR_DOWNSTREAM) } +{ YDVAR(1, VAR_MASTER) } YY_BREAK case 134: YY_RULE_SETUP #line 348 "util/configlexer.lex" -{ YDVAR(1, VAR_FOR_UPSTREAM) } +{ YDVAR(1, VAR_URL) } YY_BREAK case 135: YY_RULE_SETUP #line 349 "util/configlexer.lex" -{ YDVAR(1, VAR_FALLBACK_ENABLED) } +{ YDVAR(1, VAR_ALLOW_NOTIFY) } YY_BREAK case 136: YY_RULE_SETUP #line 350 "util/configlexer.lex" -{ YDVAR(0, VAR_VIEW) } +{ YDVAR(1, VAR_FOR_DOWNSTREAM) } YY_BREAK case 137: YY_RULE_SETUP #line 351 "util/configlexer.lex" -{ YDVAR(1, VAR_VIEW_FIRST) } +{ YDVAR(1, VAR_FOR_UPSTREAM) } YY_BREAK case 138: YY_RULE_SETUP #line 352 "util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } +{ YDVAR(1, VAR_FALLBACK_ENABLED) } YY_BREAK case 139: YY_RULE_SETUP #line 353 "util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } +{ YDVAR(0, VAR_VIEW) } YY_BREAK case 140: YY_RULE_SETUP #line 354 "util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL) } +{ YDVAR(1, VAR_VIEW_FIRST) } YY_BREAK case 141: YY_RULE_SETUP #line 355 "util/configlexer.lex" -{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } +{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 142: YY_RULE_SETUP #line 356 "util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } +{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 143: YY_RULE_SETUP #line 357 "util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } +{ YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 144: YY_RULE_SETUP #line 358 "util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } +{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } YY_BREAK case 145: YY_RULE_SETUP #line 359 "util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } YY_BREAK case 146: YY_RULE_SETUP #line 360 "util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } YY_BREAK case 147: YY_RULE_SETUP #line 361 "util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } YY_BREAK case 148: YY_RULE_SETUP #line 362 "util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } YY_BREAK case 149: YY_RULE_SETUP #line 363 "util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } YY_BREAK case 150: YY_RULE_SETUP #line 364 "util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } YY_BREAK case 151: YY_RULE_SETUP #line 365 "util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_IDENTITY) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } YY_BREAK case 152: YY_RULE_SETUP #line 366 "util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_VERSION) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } YY_BREAK case 153: YY_RULE_SETUP #line 367 "util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } YY_BREAK case 154: YY_RULE_SETUP #line 368 "util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 155: YY_RULE_SETUP #line 369 "util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 156: YY_RULE_SETUP #line 370 "util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } YY_BREAK case 157: YY_RULE_SETUP #line 371 "util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 158: YY_RULE_SETUP #line 372 "util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 159: YY_RULE_SETUP #line 373 "util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 160: YY_RULE_SETUP #line 374 "util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 161: YY_RULE_SETUP #line 375 "util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 162: YY_RULE_SETUP #line 376 "util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 163: YY_RULE_SETUP #line 377 "util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 164: YY_RULE_SETUP #line 378 "util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 165: YY_RULE_SETUP #line 379 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 166: YY_RULE_SETUP #line 380 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } YY_BREAK case 167: YY_RULE_SETUP #line 381 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } YY_BREAK case 168: YY_RULE_SETUP #line 382 "util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 169: YY_RULE_SETUP #line 383 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 170: YY_RULE_SETUP #line 384 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 171: YY_RULE_SETUP #line 385 "util/configlexer.lex" -{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 172: YY_RULE_SETUP #line 386 "util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 173: YY_RULE_SETUP #line 387 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 174: YY_RULE_SETUP #line 388 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } +{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } YY_BREAK case 175: YY_RULE_SETUP #line 389 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 176: YY_RULE_SETUP #line 390 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) } +{ YDVAR(1, VAR_SERVE_EXPIRED) } YY_BREAK case 177: YY_RULE_SETUP #line 391 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } YY_BREAK case 178: YY_RULE_SETUP #line 392 "util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_DSA) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } YY_BREAK case 179: YY_RULE_SETUP #line 393 "util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_SHA1) } +{ YDVAR(1, VAR_SERVE_EXPIRED_REPLY_TTL) } YY_BREAK case 180: YY_RULE_SETUP #line 394 "util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_SERVE_EXPIRED_CLIENT_TIMEOUT) } YY_BREAK case 181: YY_RULE_SETUP #line 395 "util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 182: YY_RULE_SETUP #line 396 "util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 183: YY_RULE_SETUP #line 397 "util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 184: YY_RULE_SETUP #line 398 "util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 185: YY_RULE_SETUP -#line 400 "util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 399 "util/configlexer.lex" +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 186: YY_RULE_SETUP -#line 401 "util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +#line 400 "util/configlexer.lex" +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 187: YY_RULE_SETUP -#line 402 "util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +#line 401 "util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 188: YY_RULE_SETUP #line 403 "util/configlexer.lex" -{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 189: YY_RULE_SETUP #line 404 "util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 190: YY_RULE_SETUP #line 405 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_IDENTITY) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 191: YY_RULE_SETUP #line 406 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 192: YY_RULE_SETUP #line 407 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 193: YY_RULE_SETUP #line 408 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_REPLIES) } +{ YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 194: YY_RULE_SETUP #line 409 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 195: YY_RULE_SETUP #line 410 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 196: YY_RULE_SETUP #line 411 "util/configlexer.lex" -{ YDVAR(1, VAR_LOG_SERVFAIL) } +{ YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 197: YY_RULE_SETUP #line 412 "util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } YY_BREAK case 198: YY_RULE_SETUP #line 413 "util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } YY_BREAK case 199: YY_RULE_SETUP #line 414 "util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOG_SERVFAIL) } YY_BREAK case 200: YY_RULE_SETUP #line 415 "util/configlexer.lex" -{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 201: YY_RULE_SETUP #line 416 "util/configlexer.lex" -{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 202: YY_RULE_SETUP #line 417 "util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 203: YY_RULE_SETUP #line 418 "util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 204: YY_RULE_SETUP #line 419 "util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 205: YY_RULE_SETUP #line 420 "util/configlexer.lex" -{ YDVAR(1, VAR_SHM_ENABLE) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 206: YY_RULE_SETUP #line 421 "util/configlexer.lex" -{ YDVAR(1, VAR_SHM_KEY) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 207: YY_RULE_SETUP #line 422 "util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 208: YY_RULE_SETUP #line 423 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 209: YY_RULE_SETUP #line 424 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 210: YY_RULE_SETUP #line 425 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 211: YY_RULE_SETUP #line 426 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 212: YY_RULE_SETUP #line 427 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 213: YY_RULE_SETUP #line 428 "util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 214: YY_RULE_SETUP #line 429 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 215: YY_RULE_SETUP #line 430 "util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 216: YY_RULE_SETUP #line 431 "util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 217: YY_RULE_SETUP #line 432 "util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 218: YY_RULE_SETUP #line 433 "util/configlexer.lex" -{ YDVAR(1, VAR_DYNLIB_FILE) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 219: YY_RULE_SETUP #line 434 "util/configlexer.lex" -{ YDVAR(0, VAR_DYNLIB) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 220: YY_RULE_SETUP #line 435 "util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 221: YY_RULE_SETUP #line 436 "util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_DYNLIB_FILE) } YY_BREAK case 222: YY_RULE_SETUP #line 437 "util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(0, VAR_DYNLIB) } YY_BREAK case 223: YY_RULE_SETUP #line 438 "util/configlexer.lex" -{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 224: YY_RULE_SETUP #line 439 "util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 225: YY_RULE_SETUP #line 440 "util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 226: YY_RULE_SETUP #line 441 "util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } YY_BREAK case 227: YY_RULE_SETUP #line 442 "util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 228: YY_RULE_SETUP #line 443 "util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 229: YY_RULE_SETUP #line 444 "util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 230: YY_RULE_SETUP #line 445 "util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } YY_BREAK case 231: YY_RULE_SETUP #line 446 "util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 232: YY_RULE_SETUP #line 447 "util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 233: YY_RULE_SETUP #line 448 "util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 234: YY_RULE_SETUP #line 449 "util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 235: YY_RULE_SETUP #line 450 "util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 236: YY_RULE_SETUP #line 451 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 237: YY_RULE_SETUP #line 452 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 238: YY_RULE_SETUP #line 453 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 239: YY_RULE_SETUP #line 454 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IP) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 240: YY_RULE_SETUP #line 455 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS) } +{ YDVAR(1, VAR_DNSTAP_BIDIRECTIONAL) } YY_BREAK case 241: YY_RULE_SETUP #line 456 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 242: YY_RULE_SETUP #line 457 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } +{ YDVAR(1, VAR_DNSTAP_IP) } YY_BREAK case 243: YY_RULE_SETUP #line 458 "util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } +{ YDVAR(1, VAR_DNSTAP_TLS) } YY_BREAK case 244: YY_RULE_SETUP -#line 460 "util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } +#line 459 "util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_TLS_SERVER_NAME) } YY_BREAK case 245: YY_RULE_SETUP -#line 462 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +#line 460 "util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_TLS_CERT_BUNDLE) } YY_BREAK case 246: YY_RULE_SETUP -#line 463 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +#line 461 "util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_KEY_FILE) } YY_BREAK case 247: YY_RULE_SETUP -#line 464 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +#line 463 "util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_TLS_CLIENT_CERT_FILE) } YY_BREAK case 248: YY_RULE_SETUP #line 465 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 249: YY_RULE_SETUP #line 466 "util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 250: YY_RULE_SETUP -#line 468 "util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } +#line 467 "util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 251: YY_RULE_SETUP -#line 470 "util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } +#line 468 "util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 252: YY_RULE_SETUP -#line 472 "util/configlexer.lex" +#line 469 "util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 253: YY_RULE_SETUP -#line 474 "util/configlexer.lex" +#line 471 "util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 254: YY_RULE_SETUP -#line 476 "util/configlexer.lex" +#line 473 "util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 255: YY_RULE_SETUP -#line 478 "util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 475 "util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 256: YY_RULE_SETUP -#line 479 "util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +#line 477 "util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 257: YY_RULE_SETUP -#line 480 "util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +#line 479 "util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 258: YY_RULE_SETUP #line 481 "util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 259: YY_RULE_SETUP #line 482 "util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 260: YY_RULE_SETUP #line 483 "util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 261: YY_RULE_SETUP #line 484 "util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 262: YY_RULE_SETUP #line 485 "util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 263: YY_RULE_SETUP #line 486 "util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 264: YY_RULE_SETUP #line 487 "util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 265: YY_RULE_SETUP #line 488 "util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 266: YY_RULE_SETUP #line 489 "util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 267: YY_RULE_SETUP #line 490 "util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_NUM) } +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 268: YY_RULE_SETUP #line 491 "util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 269: YY_RULE_SETUP #line 492 "util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_LOW_RTT) } YY_BREAK case 270: YY_RULE_SETUP #line 493 "util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_FAST_SERVER_NUM) } YY_BREAK case 271: YY_RULE_SETUP #line 494 "util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 272: YY_RULE_SETUP #line 495 "util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 273: YY_RULE_SETUP #line 496 "util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 274: YY_RULE_SETUP #line 497 "util/configlexer.lex" -{ YDVAR(0, VAR_DNSCRYPT) } +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 275: YY_RULE_SETUP #line 498 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 276: YY_RULE_SETUP #line 499 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PORT) } +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } YY_BREAK case 277: YY_RULE_SETUP #line 500 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } +{ YDVAR(0, VAR_DNSCRYPT) } YY_BREAK case 278: YY_RULE_SETUP #line 501 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } +{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } YY_BREAK case 279: YY_RULE_SETUP #line 502 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } +{ YDVAR(1, VAR_DNSCRYPT_PORT) } YY_BREAK case 280: YY_RULE_SETUP #line 503 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } YY_BREAK case 281: YY_RULE_SETUP #line 504 "util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } +{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } YY_BREAK case 282: YY_RULE_SETUP -#line 506 "util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } +#line 505 "util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } YY_BREAK case 283: YY_RULE_SETUP -#line 508 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } +#line 506 "util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } YY_BREAK case 284: YY_RULE_SETUP -#line 509 "util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } +#line 507 "util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } YY_BREAK case 285: YY_RULE_SETUP -#line 510 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_ENABLED) } +#line 509 "util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } YY_BREAK case 286: YY_RULE_SETUP #line 511 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } YY_BREAK case 287: YY_RULE_SETUP #line 512 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_HOOK) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } YY_BREAK case 288: YY_RULE_SETUP #line 513 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } +{ YDVAR(1, VAR_IPSECMOD_ENABLED) } YY_BREAK case 289: YY_RULE_SETUP #line 514 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } YY_BREAK case 290: YY_RULE_SETUP #line 515 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +{ YDVAR(1, VAR_IPSECMOD_HOOK) } YY_BREAK case 291: YY_RULE_SETUP #line 516 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_STRICT) } +{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } YY_BREAK case 292: YY_RULE_SETUP #line 517 "util/configlexer.lex" -{ YDVAR(0, VAR_CACHEDB) } +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 293: YY_RULE_SETUP #line 518 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_BACKEND) } +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 294: YY_RULE_SETUP #line 519 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } +{ YDVAR(1, VAR_IPSECMOD_STRICT) } YY_BREAK case 295: YY_RULE_SETUP #line 520 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISHOST) } +{ YDVAR(0, VAR_CACHEDB) } YY_BREAK case 296: YY_RULE_SETUP #line 521 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISPORT) } +{ YDVAR(1, VAR_CACHEDB_BACKEND) } YY_BREAK case 297: YY_RULE_SETUP #line 522 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } +{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } YY_BREAK case 298: YY_RULE_SETUP #line 523 "util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } +{ YDVAR(1, VAR_CACHEDB_REDISHOST) } YY_BREAK case 299: YY_RULE_SETUP #line 524 "util/configlexer.lex" -{ YDVAR(0, VAR_IPSET) } +{ YDVAR(1, VAR_CACHEDB_REDISPORT) } YY_BREAK case 300: YY_RULE_SETUP #line 525 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V4) } +{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } YY_BREAK case 301: YY_RULE_SETUP #line 526 "util/configlexer.lex" -{ YDVAR(1, VAR_IPSET_NAME_V6) } +{ YDVAR(1, VAR_CACHEDB_REDISEXPIRERECORDS) } YY_BREAK case 302: YY_RULE_SETUP #line 527 "util/configlexer.lex" -{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } +{ YDVAR(0, VAR_IPSET) } YY_BREAK case 303: YY_RULE_SETUP #line 528 "util/configlexer.lex" -{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } +{ YDVAR(1, VAR_IPSET_NAME_V4) } YY_BREAK case 304: YY_RULE_SETUP #line 529 "util/configlexer.lex" -{ YDVAR(2, VAR_EDNS_CLIENT_TAG) } +{ YDVAR(1, VAR_IPSET_NAME_V6) } YY_BREAK case 305: YY_RULE_SETUP #line 530 "util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) } +{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } YY_BREAK case 306: -/* rule 306 can match eol */ YY_RULE_SETUP #line 531 "util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++; } +{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } YY_BREAK -/* Quoted strings. Strip leading and ending quotes */ case 307: YY_RULE_SETUP +#line 532 "util/configlexer.lex" +{ YDVAR(2, VAR_EDNS_CLIENT_STRING) } + YY_BREAK +case 308: +YY_RULE_SETUP +#line 533 "util/configlexer.lex" +{ YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) } + YY_BREAK +case 309: +/* rule 309 can match eol */ +YY_RULE_SETUP #line 534 "util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++; } + YY_BREAK +/* Quoted strings. Strip leading and ending quotes */ +case 310: +YY_RULE_SETUP +#line 537 "util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 535 "util/configlexer.lex" +#line 538 "util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 308: +case 311: YY_RULE_SETUP -#line 540 "util/configlexer.lex" +#line 543 "util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 309: -/* rule 309 can match eol */ +case 312: +/* rule 312 can match eol */ YY_RULE_SETUP -#line 541 "util/configlexer.lex" +#line 544 "util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 310: +case 313: YY_RULE_SETUP -#line 543 "util/configlexer.lex" +#line 546 "util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -5641,34 +5699,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 311: +case 314: YY_RULE_SETUP -#line 555 "util/configlexer.lex" +#line 558 "util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 556 "util/configlexer.lex" +#line 559 "util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 312: +case 315: YY_RULE_SETUP -#line 561 "util/configlexer.lex" +#line 564 "util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 313: -/* rule 313 can match eol */ +case 316: +/* rule 316 can match eol */ YY_RULE_SETUP -#line 562 "util/configlexer.lex" +#line 565 "util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 314: +case 317: YY_RULE_SETUP -#line 564 "util/configlexer.lex" +#line 567 "util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -5681,38 +5739,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 315: +case 318: YY_RULE_SETUP -#line 576 "util/configlexer.lex" +#line 579 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 578 "util/configlexer.lex" +#line 581 "util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 316: +case 319: YY_RULE_SETUP -#line 582 "util/configlexer.lex" +#line 585 "util/configlexer.lex" { LEXOUT(("ISP ")); /* ignore */ } YY_BREAK -case 317: -/* rule 317 can match eol */ +case 320: +/* rule 320 can match eol */ YY_RULE_SETUP -#line 583 "util/configlexer.lex" +#line 586 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK -case 318: +case 321: YY_RULE_SETUP -#line 584 "util/configlexer.lex" +#line 587 "util/configlexer.lex" { LEXOUT(("IQS ")); BEGIN(include_quoted); } YY_BREAK -case 319: +case 322: YY_RULE_SETUP -#line 585 "util/configlexer.lex" +#line 588 "util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext, 0); @@ -5720,27 +5778,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 590 "util/configlexer.lex" +#line 593 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 320: +case 323: YY_RULE_SETUP -#line 594 "util/configlexer.lex" +#line 597 "util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 321: -/* rule 321 can match eol */ +case 324: +/* rule 324 can match eol */ YY_RULE_SETUP -#line 595 "util/configlexer.lex" +#line 598 "util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 322: +case 325: YY_RULE_SETUP -#line 597 "util/configlexer.lex" +#line 600 "util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -5750,7 +5808,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 603 "util/configlexer.lex" +#line 606 "util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -5765,39 +5823,39 @@ case YY_STATE_EOF(val): } YY_BREAK /* include-toplevel: directive */ -case 323: +case 326: YY_RULE_SETUP -#line 617 "util/configlexer.lex" +#line 620 "util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include_toplevel); } YY_BREAK case YY_STATE_EOF(include_toplevel): -#line 620 "util/configlexer.lex" +#line 623 "util/configlexer.lex" { yyerror("EOF inside include_toplevel directive"); BEGIN(inc_prev); } YY_BREAK -case 324: +case 327: YY_RULE_SETUP -#line 624 "util/configlexer.lex" +#line 627 "util/configlexer.lex" { LEXOUT(("ITSP ")); /* ignore */ } YY_BREAK -case 325: -/* rule 325 can match eol */ +case 328: +/* rule 328 can match eol */ YY_RULE_SETUP -#line 625 "util/configlexer.lex" +#line 628 "util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK -case 326: +case 329: YY_RULE_SETUP -#line 626 "util/configlexer.lex" +#line 629 "util/configlexer.lex" { LEXOUT(("ITQS ")); BEGIN(include_toplevel_quoted); } YY_BREAK -case 327: +case 330: YY_RULE_SETUP -#line 627 "util/configlexer.lex" +#line 630 "util/configlexer.lex" { LEXOUT(("ITunquotedstr(%s) ", yytext)); config_start_include_glob(yytext, 1); @@ -5806,29 +5864,29 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_toplevel_quoted): -#line 633 "util/configlexer.lex" +#line 636 "util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 328: +case 331: YY_RULE_SETUP -#line 637 "util/configlexer.lex" +#line 640 "util/configlexer.lex" { LEXOUT(("ITSTR(%s) ", yytext)); yymore(); } YY_BREAK -case 329: -/* rule 329 can match eol */ +case 332: +/* rule 332 can match eol */ YY_RULE_SETUP -#line 638 "util/configlexer.lex" +#line 641 "util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 330: +case 333: YY_RULE_SETUP -#line 642 "util/configlexer.lex" +#line 645 "util/configlexer.lex" { LEXOUT(("ITQE ")); yytext[yyleng - 1] = '\0'; @@ -5837,33 +5895,33 @@ YY_RULE_SETUP return (VAR_FORCE_TOPLEVEL); } YY_BREAK -case 331: +case 334: YY_RULE_SETUP -#line 650 "util/configlexer.lex" +#line 653 "util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 332: +case 335: YY_RULE_SETUP -#line 654 "util/configlexer.lex" +#line 657 "util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 333: +case 336: YY_RULE_SETUP -#line 658 "util/configlexer.lex" +#line 661 "util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 334: +case 337: YY_RULE_SETUP -#line 662 "util/configlexer.lex" +#line 665 "util/configlexer.lex" ECHO; YY_BREAK -#line 5864 "<stdout>" +#line 5922 "<stdout>" case YY_END_OF_BUFFER: { @@ -6158,7 +6216,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 >= 3253 ) + if ( yy_current_state >= 3292 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -6186,11 +6244,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 >= 3253 ) + if ( yy_current_state >= 3292 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 3252); + yy_is_jam = (yy_current_state == 3291); return yy_is_jam ? 0 : yy_current_state; } @@ -6829,6 +6887,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 662 "util/configlexer.lex" +#line 665 "util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index ea7c1cf72734..55c584a76c12 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -262,6 +262,7 @@ http-max-streams{COLON} { YDVAR(1, VAR_HTTP_MAX_STREAMS) } http-query-buffer-size{COLON} { YDVAR(1, VAR_HTTP_QUERY_BUFFER_SIZE) } http-response-buffer-size{COLON} { YDVAR(1, VAR_HTTP_RESPONSE_BUFFER_SIZE) } http-nodelay{COLON} { YDVAR(1, VAR_HTTP_NODELAY) } +http-notls-downstream{COLON} { YDVAR(1, VAR_HTTP_NOTLS_DOWNSTREAM) } use-systemd{COLON} { YDVAR(1, VAR_USE_SYSTEMD) } do-daemonize{COLON} { YDVAR(1, VAR_DO_DAEMONIZE) } interface{COLON} { YDVAR(1, VAR_INTERFACE) } @@ -296,9 +297,11 @@ infra-cache-slabs{COLON} { YDVAR(1, VAR_INFRA_CACHE_SLABS) } infra-cache-numhosts{COLON} { YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } infra-cache-lame-size{COLON} { YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } infra-cache-min-rtt{COLON} { YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } +infra-keep-probing{COLON} { YDVAR(1, VAR_INFRA_KEEP_PROBING) } num-queries-per-thread{COLON} { YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } jostle-timeout{COLON} { YDVAR(1, VAR_JOSTLE_TIMEOUT) } delay-close{COLON} { YDVAR(1, VAR_DELAY_CLOSE) } +udp-connect{COLON} { YDVAR(1, VAR_UDP_CONNECT) } target-fetch-policy{COLON} { YDVAR(1, VAR_TARGET_FETCH_POLICY) } harden-short-bufsize{COLON} { YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } harden-large-queries{COLON} { YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } @@ -526,8 +529,8 @@ name-v4{COLON} { YDVAR(1, VAR_IPSET_NAME_V4) } name-v6{COLON} { YDVAR(1, VAR_IPSET_NAME_V6) } udp-upstream-without-downstream{COLON} { YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } tcp-connection-limit{COLON} { YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } -edns-client-tag{COLON} { YDVAR(2, VAR_EDNS_CLIENT_TAG) } -edns-client-tag-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_TAG_OPCODE) } +edns-client-string{COLON} { YDVAR(2, VAR_EDNS_CLIENT_STRING) } +edns-client-string-opcode{COLON} { YDVAR(1, VAR_EDNS_CLIENT_STRING_OPCODE) } <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 d9dcbf9a56b4..45f9db0dcc42 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -279,158 +279,161 @@ extern int yydebug; VAR_HTTP_QUERY_BUFFER_SIZE = 400, VAR_HTTP_RESPONSE_BUFFER_SIZE = 401, VAR_HTTP_NODELAY = 402, - VAR_STUB_FIRST = 403, - VAR_MINIMAL_RESPONSES = 404, - VAR_RRSET_ROUNDROBIN = 405, - VAR_MAX_UDP_SIZE = 406, - VAR_DELAY_CLOSE = 407, - VAR_UNBLOCK_LAN_ZONES = 408, - VAR_INSECURE_LAN_ZONES = 409, - VAR_INFRA_CACHE_MIN_RTT = 410, - VAR_DNS64_PREFIX = 411, - VAR_DNS64_SYNTHALL = 412, - VAR_DNS64_IGNORE_AAAA = 413, - VAR_DNSTAP = 414, - VAR_DNSTAP_ENABLE = 415, - VAR_DNSTAP_SOCKET_PATH = 416, - VAR_DNSTAP_IP = 417, - VAR_DNSTAP_TLS = 418, - VAR_DNSTAP_TLS_SERVER_NAME = 419, - VAR_DNSTAP_TLS_CERT_BUNDLE = 420, - VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 421, - VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 422, - VAR_DNSTAP_SEND_IDENTITY = 423, - VAR_DNSTAP_SEND_VERSION = 424, - VAR_DNSTAP_BIDIRECTIONAL = 425, - VAR_DNSTAP_IDENTITY = 426, - VAR_DNSTAP_VERSION = 427, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 428, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 429, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 430, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 431, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 432, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 433, - VAR_RESPONSE_IP_TAG = 434, - VAR_RESPONSE_IP = 435, - VAR_RESPONSE_IP_DATA = 436, - VAR_HARDEN_ALGO_DOWNGRADE = 437, - VAR_IP_TRANSPARENT = 438, - VAR_IP_DSCP = 439, - VAR_DISABLE_DNSSEC_LAME_CHECK = 440, - VAR_IP_RATELIMIT = 441, - VAR_IP_RATELIMIT_SLABS = 442, - VAR_IP_RATELIMIT_SIZE = 443, - VAR_RATELIMIT = 444, - VAR_RATELIMIT_SLABS = 445, - VAR_RATELIMIT_SIZE = 446, - VAR_RATELIMIT_FOR_DOMAIN = 447, - VAR_RATELIMIT_BELOW_DOMAIN = 448, - VAR_IP_RATELIMIT_FACTOR = 449, - VAR_RATELIMIT_FACTOR = 450, - VAR_SEND_CLIENT_SUBNET = 451, - VAR_CLIENT_SUBNET_ZONE = 452, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 453, - VAR_CLIENT_SUBNET_OPCODE = 454, - VAR_MAX_CLIENT_SUBNET_IPV4 = 455, - VAR_MAX_CLIENT_SUBNET_IPV6 = 456, - VAR_MIN_CLIENT_SUBNET_IPV4 = 457, - VAR_MIN_CLIENT_SUBNET_IPV6 = 458, - VAR_MAX_ECS_TREE_SIZE_IPV4 = 459, - VAR_MAX_ECS_TREE_SIZE_IPV6 = 460, - VAR_CAPS_WHITELIST = 461, - VAR_CACHE_MAX_NEGATIVE_TTL = 462, - VAR_PERMIT_SMALL_HOLDDOWN = 463, - VAR_QNAME_MINIMISATION = 464, - VAR_QNAME_MINIMISATION_STRICT = 465, - VAR_IP_FREEBIND = 466, - VAR_DEFINE_TAG = 467, - VAR_LOCAL_ZONE_TAG = 468, - VAR_ACCESS_CONTROL_TAG = 469, - VAR_LOCAL_ZONE_OVERRIDE = 470, - VAR_ACCESS_CONTROL_TAG_ACTION = 471, - VAR_ACCESS_CONTROL_TAG_DATA = 472, - VAR_VIEW = 473, - VAR_ACCESS_CONTROL_VIEW = 474, - VAR_VIEW_FIRST = 475, - VAR_SERVE_EXPIRED = 476, - VAR_SERVE_EXPIRED_TTL = 477, - VAR_SERVE_EXPIRED_TTL_RESET = 478, - VAR_SERVE_EXPIRED_REPLY_TTL = 479, - VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 480, - VAR_FAKE_DSA = 481, - VAR_FAKE_SHA1 = 482, - VAR_LOG_IDENTITY = 483, - VAR_HIDE_TRUSTANCHOR = 484, - VAR_TRUST_ANCHOR_SIGNALING = 485, - VAR_AGGRESSIVE_NSEC = 486, - VAR_USE_SYSTEMD = 487, - VAR_SHM_ENABLE = 488, - VAR_SHM_KEY = 489, - VAR_ROOT_KEY_SENTINEL = 490, - VAR_DNSCRYPT = 491, - VAR_DNSCRYPT_ENABLE = 492, - VAR_DNSCRYPT_PORT = 493, - VAR_DNSCRYPT_PROVIDER = 494, - VAR_DNSCRYPT_SECRET_KEY = 495, - VAR_DNSCRYPT_PROVIDER_CERT = 496, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 497, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 498, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 499, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 500, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 501, - VAR_IPSECMOD_ENABLED = 502, - VAR_IPSECMOD_HOOK = 503, - VAR_IPSECMOD_IGNORE_BOGUS = 504, - VAR_IPSECMOD_MAX_TTL = 505, - VAR_IPSECMOD_WHITELIST = 506, - VAR_IPSECMOD_STRICT = 507, - VAR_CACHEDB = 508, - VAR_CACHEDB_BACKEND = 509, - VAR_CACHEDB_SECRETSEED = 510, - VAR_CACHEDB_REDISHOST = 511, - VAR_CACHEDB_REDISPORT = 512, - VAR_CACHEDB_REDISTIMEOUT = 513, - VAR_CACHEDB_REDISEXPIRERECORDS = 514, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 515, - VAR_FOR_UPSTREAM = 516, - VAR_AUTH_ZONE = 517, - VAR_ZONEFILE = 518, - VAR_MASTER = 519, - VAR_URL = 520, - VAR_FOR_DOWNSTREAM = 521, - VAR_FALLBACK_ENABLED = 522, - VAR_TLS_ADDITIONAL_PORT = 523, - VAR_LOW_RTT = 524, - VAR_LOW_RTT_PERMIL = 525, - VAR_FAST_SERVER_PERMIL = 526, - VAR_FAST_SERVER_NUM = 527, - VAR_ALLOW_NOTIFY = 528, - VAR_TLS_WIN_CERT = 529, - VAR_TCP_CONNECTION_LIMIT = 530, - VAR_FORWARD_NO_CACHE = 531, - VAR_STUB_NO_CACHE = 532, - VAR_LOG_SERVFAIL = 533, - VAR_DENY_ANY = 534, - VAR_UNKNOWN_SERVER_TIME_LIMIT = 535, - VAR_LOG_TAG_QUERYREPLY = 536, - VAR_STREAM_WAIT_SIZE = 537, - VAR_TLS_CIPHERS = 538, - VAR_TLS_CIPHERSUITES = 539, - VAR_TLS_USE_SNI = 540, - VAR_IPSET = 541, - VAR_IPSET_NAME_V4 = 542, - VAR_IPSET_NAME_V6 = 543, - VAR_TLS_SESSION_TICKET_KEYS = 544, - VAR_RPZ = 545, - VAR_TAGS = 546, - VAR_RPZ_ACTION_OVERRIDE = 547, - VAR_RPZ_CNAME_OVERRIDE = 548, - VAR_RPZ_LOG = 549, - VAR_RPZ_LOG_NAME = 550, - VAR_DYNLIB = 551, - VAR_DYNLIB_FILE = 552, - VAR_EDNS_CLIENT_TAG = 553, - VAR_EDNS_CLIENT_TAG_OPCODE = 554 + VAR_HTTP_NOTLS_DOWNSTREAM = 403, + VAR_STUB_FIRST = 404, + VAR_MINIMAL_RESPONSES = 405, + VAR_RRSET_ROUNDROBIN = 406, + VAR_MAX_UDP_SIZE = 407, + VAR_DELAY_CLOSE = 408, + VAR_UDP_CONNECT = 409, + VAR_UNBLOCK_LAN_ZONES = 410, + VAR_INSECURE_LAN_ZONES = 411, + VAR_INFRA_CACHE_MIN_RTT = 412, + VAR_INFRA_KEEP_PROBING = 413, + VAR_DNS64_PREFIX = 414, + VAR_DNS64_SYNTHALL = 415, + VAR_DNS64_IGNORE_AAAA = 416, + VAR_DNSTAP = 417, + VAR_DNSTAP_ENABLE = 418, + VAR_DNSTAP_SOCKET_PATH = 419, + VAR_DNSTAP_IP = 420, + VAR_DNSTAP_TLS = 421, + VAR_DNSTAP_TLS_SERVER_NAME = 422, + VAR_DNSTAP_TLS_CERT_BUNDLE = 423, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425, + VAR_DNSTAP_SEND_IDENTITY = 426, + VAR_DNSTAP_SEND_VERSION = 427, + VAR_DNSTAP_BIDIRECTIONAL = 428, + VAR_DNSTAP_IDENTITY = 429, + VAR_DNSTAP_VERSION = 430, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436, + VAR_RESPONSE_IP_TAG = 437, + VAR_RESPONSE_IP = 438, + VAR_RESPONSE_IP_DATA = 439, + VAR_HARDEN_ALGO_DOWNGRADE = 440, + VAR_IP_TRANSPARENT = 441, + VAR_IP_DSCP = 442, + VAR_DISABLE_DNSSEC_LAME_CHECK = 443, + VAR_IP_RATELIMIT = 444, + VAR_IP_RATELIMIT_SLABS = 445, + VAR_IP_RATELIMIT_SIZE = 446, + VAR_RATELIMIT = 447, + VAR_RATELIMIT_SLABS = 448, + VAR_RATELIMIT_SIZE = 449, + VAR_RATELIMIT_FOR_DOMAIN = 450, + VAR_RATELIMIT_BELOW_DOMAIN = 451, + VAR_IP_RATELIMIT_FACTOR = 452, + VAR_RATELIMIT_FACTOR = 453, + VAR_SEND_CLIENT_SUBNET = 454, + VAR_CLIENT_SUBNET_ZONE = 455, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456, + VAR_CLIENT_SUBNET_OPCODE = 457, + VAR_MAX_CLIENT_SUBNET_IPV4 = 458, + VAR_MAX_CLIENT_SUBNET_IPV6 = 459, + VAR_MIN_CLIENT_SUBNET_IPV4 = 460, + VAR_MIN_CLIENT_SUBNET_IPV6 = 461, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 462, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 463, + VAR_CAPS_WHITELIST = 464, + VAR_CACHE_MAX_NEGATIVE_TTL = 465, + VAR_PERMIT_SMALL_HOLDDOWN = 466, + VAR_QNAME_MINIMISATION = 467, + VAR_QNAME_MINIMISATION_STRICT = 468, + VAR_IP_FREEBIND = 469, + VAR_DEFINE_TAG = 470, + VAR_LOCAL_ZONE_TAG = 471, + VAR_ACCESS_CONTROL_TAG = 472, + VAR_LOCAL_ZONE_OVERRIDE = 473, + VAR_ACCESS_CONTROL_TAG_ACTION = 474, + VAR_ACCESS_CONTROL_TAG_DATA = 475, + VAR_VIEW = 476, + VAR_ACCESS_CONTROL_VIEW = 477, + VAR_VIEW_FIRST = 478, + VAR_SERVE_EXPIRED = 479, + VAR_SERVE_EXPIRED_TTL = 480, + VAR_SERVE_EXPIRED_TTL_RESET = 481, + VAR_SERVE_EXPIRED_REPLY_TTL = 482, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483, + VAR_FAKE_DSA = 484, + VAR_FAKE_SHA1 = 485, + VAR_LOG_IDENTITY = 486, + VAR_HIDE_TRUSTANCHOR = 487, + VAR_TRUST_ANCHOR_SIGNALING = 488, + VAR_AGGRESSIVE_NSEC = 489, + VAR_USE_SYSTEMD = 490, + VAR_SHM_ENABLE = 491, + VAR_SHM_KEY = 492, + VAR_ROOT_KEY_SENTINEL = 493, + VAR_DNSCRYPT = 494, + VAR_DNSCRYPT_ENABLE = 495, + VAR_DNSCRYPT_PORT = 496, + VAR_DNSCRYPT_PROVIDER = 497, + VAR_DNSCRYPT_SECRET_KEY = 498, + VAR_DNSCRYPT_PROVIDER_CERT = 499, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504, + VAR_IPSECMOD_ENABLED = 505, + VAR_IPSECMOD_HOOK = 506, + VAR_IPSECMOD_IGNORE_BOGUS = 507, + VAR_IPSECMOD_MAX_TTL = 508, + VAR_IPSECMOD_WHITELIST = 509, + VAR_IPSECMOD_STRICT = 510, + VAR_CACHEDB = 511, + VAR_CACHEDB_BACKEND = 512, + VAR_CACHEDB_SECRETSEED = 513, + VAR_CACHEDB_REDISHOST = 514, + VAR_CACHEDB_REDISPORT = 515, + VAR_CACHEDB_REDISTIMEOUT = 516, + VAR_CACHEDB_REDISEXPIRERECORDS = 517, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518, + VAR_FOR_UPSTREAM = 519, + VAR_AUTH_ZONE = 520, + VAR_ZONEFILE = 521, + VAR_MASTER = 522, + VAR_URL = 523, + VAR_FOR_DOWNSTREAM = 524, + VAR_FALLBACK_ENABLED = 525, + VAR_TLS_ADDITIONAL_PORT = 526, + VAR_LOW_RTT = 527, + VAR_LOW_RTT_PERMIL = 528, + VAR_FAST_SERVER_PERMIL = 529, + VAR_FAST_SERVER_NUM = 530, + VAR_ALLOW_NOTIFY = 531, + VAR_TLS_WIN_CERT = 532, + VAR_TCP_CONNECTION_LIMIT = 533, + VAR_FORWARD_NO_CACHE = 534, + VAR_STUB_NO_CACHE = 535, + VAR_LOG_SERVFAIL = 536, + VAR_DENY_ANY = 537, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 538, + VAR_LOG_TAG_QUERYREPLY = 539, + VAR_STREAM_WAIT_SIZE = 540, + VAR_TLS_CIPHERS = 541, + VAR_TLS_CIPHERSUITES = 542, + VAR_TLS_USE_SNI = 543, + VAR_IPSET = 544, + VAR_IPSET_NAME_V4 = 545, + VAR_IPSET_NAME_V6 = 546, + VAR_TLS_SESSION_TICKET_KEYS = 547, + VAR_RPZ = 548, + VAR_TAGS = 549, + VAR_RPZ_ACTION_OVERRIDE = 550, + VAR_RPZ_CNAME_OVERRIDE = 551, + VAR_RPZ_LOG = 552, + VAR_RPZ_LOG_NAME = 553, + VAR_DYNLIB = 554, + VAR_DYNLIB_FILE = 555, + VAR_EDNS_CLIENT_STRING = 556, + VAR_EDNS_CLIENT_STRING_OPCODE = 557 }; #endif /* Tokens. */ @@ -579,158 +582,161 @@ extern int yydebug; #define VAR_HTTP_QUERY_BUFFER_SIZE 400 #define VAR_HTTP_RESPONSE_BUFFER_SIZE 401 #define VAR_HTTP_NODELAY 402 -#define VAR_STUB_FIRST 403 -#define VAR_MINIMAL_RESPONSES 404 -#define VAR_RRSET_ROUNDROBIN 405 -#define VAR_MAX_UDP_SIZE 406 -#define VAR_DELAY_CLOSE 407 -#define VAR_UNBLOCK_LAN_ZONES 408 -#define VAR_INSECURE_LAN_ZONES 409 -#define VAR_INFRA_CACHE_MIN_RTT 410 -#define VAR_DNS64_PREFIX 411 -#define VAR_DNS64_SYNTHALL 412 -#define VAR_DNS64_IGNORE_AAAA 413 -#define VAR_DNSTAP 414 -#define VAR_DNSTAP_ENABLE 415 -#define VAR_DNSTAP_SOCKET_PATH 416 -#define VAR_DNSTAP_IP 417 -#define VAR_DNSTAP_TLS 418 -#define VAR_DNSTAP_TLS_SERVER_NAME 419 -#define VAR_DNSTAP_TLS_CERT_BUNDLE 420 -#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 421 -#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 422 -#define VAR_DNSTAP_SEND_IDENTITY 423 -#define VAR_DNSTAP_SEND_VERSION 424 -#define VAR_DNSTAP_BIDIRECTIONAL 425 -#define VAR_DNSTAP_IDENTITY 426 -#define VAR_DNSTAP_VERSION 427 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 428 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 429 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 430 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 431 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 432 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 433 -#define VAR_RESPONSE_IP_TAG 434 -#define VAR_RESPONSE_IP 435 -#define VAR_RESPONSE_IP_DATA 436 -#define VAR_HARDEN_ALGO_DOWNGRADE 437 -#define VAR_IP_TRANSPARENT 438 -#define VAR_IP_DSCP 439 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 440 -#define VAR_IP_RATELIMIT 441 -#define VAR_IP_RATELIMIT_SLABS 442 -#define VAR_IP_RATELIMIT_SIZE 443 -#define VAR_RATELIMIT 444 -#define VAR_RATELIMIT_SLABS 445 -#define VAR_RATELIMIT_SIZE 446 -#define VAR_RATELIMIT_FOR_DOMAIN 447 -#define VAR_RATELIMIT_BELOW_DOMAIN 448 -#define VAR_IP_RATELIMIT_FACTOR 449 -#define VAR_RATELIMIT_FACTOR 450 -#define VAR_SEND_CLIENT_SUBNET 451 -#define VAR_CLIENT_SUBNET_ZONE 452 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 453 -#define VAR_CLIENT_SUBNET_OPCODE 454 -#define VAR_MAX_CLIENT_SUBNET_IPV4 455 -#define VAR_MAX_CLIENT_SUBNET_IPV6 456 -#define VAR_MIN_CLIENT_SUBNET_IPV4 457 -#define VAR_MIN_CLIENT_SUBNET_IPV6 458 -#define VAR_MAX_ECS_TREE_SIZE_IPV4 459 -#define VAR_MAX_ECS_TREE_SIZE_IPV6 460 -#define VAR_CAPS_WHITELIST 461 -#define VAR_CACHE_MAX_NEGATIVE_TTL 462 -#define VAR_PERMIT_SMALL_HOLDDOWN 463 -#define VAR_QNAME_MINIMISATION 464 -#define VAR_QNAME_MINIMISATION_STRICT 465 -#define VAR_IP_FREEBIND 466 -#define VAR_DEFINE_TAG 467 -#define VAR_LOCAL_ZONE_TAG 468 -#define VAR_ACCESS_CONTROL_TAG 469 -#define VAR_LOCAL_ZONE_OVERRIDE 470 -#define VAR_ACCESS_CONTROL_TAG_ACTION 471 -#define VAR_ACCESS_CONTROL_TAG_DATA 472 -#define VAR_VIEW 473 -#define VAR_ACCESS_CONTROL_VIEW 474 -#define VAR_VIEW_FIRST 475 -#define VAR_SERVE_EXPIRED 476 -#define VAR_SERVE_EXPIRED_TTL 477 -#define VAR_SERVE_EXPIRED_TTL_RESET 478 -#define VAR_SERVE_EXPIRED_REPLY_TTL 479 -#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 480 -#define VAR_FAKE_DSA 481 -#define VAR_FAKE_SHA1 482 -#define VAR_LOG_IDENTITY 483 -#define VAR_HIDE_TRUSTANCHOR 484 -#define VAR_TRUST_ANCHOR_SIGNALING 485 -#define VAR_AGGRESSIVE_NSEC 486 -#define VAR_USE_SYSTEMD 487 -#define VAR_SHM_ENABLE 488 -#define VAR_SHM_KEY 489 -#define VAR_ROOT_KEY_SENTINEL 490 -#define VAR_DNSCRYPT 491 -#define VAR_DNSCRYPT_ENABLE 492 -#define VAR_DNSCRYPT_PORT 493 -#define VAR_DNSCRYPT_PROVIDER 494 -#define VAR_DNSCRYPT_SECRET_KEY 495 -#define VAR_DNSCRYPT_PROVIDER_CERT 496 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 497 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 498 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 499 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 500 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 501 -#define VAR_IPSECMOD_ENABLED 502 -#define VAR_IPSECMOD_HOOK 503 -#define VAR_IPSECMOD_IGNORE_BOGUS 504 -#define VAR_IPSECMOD_MAX_TTL 505 -#define VAR_IPSECMOD_WHITELIST 506 -#define VAR_IPSECMOD_STRICT 507 -#define VAR_CACHEDB 508 -#define VAR_CACHEDB_BACKEND 509 -#define VAR_CACHEDB_SECRETSEED 510 -#define VAR_CACHEDB_REDISHOST 511 -#define VAR_CACHEDB_REDISPORT 512 -#define VAR_CACHEDB_REDISTIMEOUT 513 -#define VAR_CACHEDB_REDISEXPIRERECORDS 514 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 515 -#define VAR_FOR_UPSTREAM 516 -#define VAR_AUTH_ZONE 517 -#define VAR_ZONEFILE 518 -#define VAR_MASTER 519 -#define VAR_URL 520 -#define VAR_FOR_DOWNSTREAM 521 -#define VAR_FALLBACK_ENABLED 522 -#define VAR_TLS_ADDITIONAL_PORT 523 -#define VAR_LOW_RTT 524 -#define VAR_LOW_RTT_PERMIL 525 -#define VAR_FAST_SERVER_PERMIL 526 -#define VAR_FAST_SERVER_NUM 527 -#define VAR_ALLOW_NOTIFY 528 -#define VAR_TLS_WIN_CERT 529 -#define VAR_TCP_CONNECTION_LIMIT 530 -#define VAR_FORWARD_NO_CACHE 531 -#define VAR_STUB_NO_CACHE 532 -#define VAR_LOG_SERVFAIL 533 -#define VAR_DENY_ANY 534 -#define VAR_UNKNOWN_SERVER_TIME_LIMIT 535 -#define VAR_LOG_TAG_QUERYREPLY 536 -#define VAR_STREAM_WAIT_SIZE 537 -#define VAR_TLS_CIPHERS 538 -#define VAR_TLS_CIPHERSUITES 539 -#define VAR_TLS_USE_SNI 540 -#define VAR_IPSET 541 -#define VAR_IPSET_NAME_V4 542 -#define VAR_IPSET_NAME_V6 543 -#define VAR_TLS_SESSION_TICKET_KEYS 544 -#define VAR_RPZ 545 -#define VAR_TAGS 546 -#define VAR_RPZ_ACTION_OVERRIDE 547 -#define VAR_RPZ_CNAME_OVERRIDE 548 -#define VAR_RPZ_LOG 549 -#define VAR_RPZ_LOG_NAME 550 -#define VAR_DYNLIB 551 -#define VAR_DYNLIB_FILE 552 -#define VAR_EDNS_CLIENT_TAG 553 -#define VAR_EDNS_CLIENT_TAG_OPCODE 554 +#define VAR_HTTP_NOTLS_DOWNSTREAM 403 +#define VAR_STUB_FIRST 404 +#define VAR_MINIMAL_RESPONSES 405 +#define VAR_RRSET_ROUNDROBIN 406 +#define VAR_MAX_UDP_SIZE 407 +#define VAR_DELAY_CLOSE 408 +#define VAR_UDP_CONNECT 409 +#define VAR_UNBLOCK_LAN_ZONES 410 +#define VAR_INSECURE_LAN_ZONES 411 +#define VAR_INFRA_CACHE_MIN_RTT 412 +#define VAR_INFRA_KEEP_PROBING 413 +#define VAR_DNS64_PREFIX 414 +#define VAR_DNS64_SYNTHALL 415 +#define VAR_DNS64_IGNORE_AAAA 416 +#define VAR_DNSTAP 417 +#define VAR_DNSTAP_ENABLE 418 +#define VAR_DNSTAP_SOCKET_PATH 419 +#define VAR_DNSTAP_IP 420 +#define VAR_DNSTAP_TLS 421 +#define VAR_DNSTAP_TLS_SERVER_NAME 422 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 423 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 424 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 425 +#define VAR_DNSTAP_SEND_IDENTITY 426 +#define VAR_DNSTAP_SEND_VERSION 427 +#define VAR_DNSTAP_BIDIRECTIONAL 428 +#define VAR_DNSTAP_IDENTITY 429 +#define VAR_DNSTAP_VERSION 430 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 431 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 432 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 433 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 434 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 435 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 436 +#define VAR_RESPONSE_IP_TAG 437 +#define VAR_RESPONSE_IP 438 +#define VAR_RESPONSE_IP_DATA 439 +#define VAR_HARDEN_ALGO_DOWNGRADE 440 +#define VAR_IP_TRANSPARENT 441 +#define VAR_IP_DSCP 442 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 443 +#define VAR_IP_RATELIMIT 444 +#define VAR_IP_RATELIMIT_SLABS 445 +#define VAR_IP_RATELIMIT_SIZE 446 +#define VAR_RATELIMIT 447 +#define VAR_RATELIMIT_SLABS 448 +#define VAR_RATELIMIT_SIZE 449 +#define VAR_RATELIMIT_FOR_DOMAIN 450 +#define VAR_RATELIMIT_BELOW_DOMAIN 451 +#define VAR_IP_RATELIMIT_FACTOR 452 +#define VAR_RATELIMIT_FACTOR 453 +#define VAR_SEND_CLIENT_SUBNET 454 +#define VAR_CLIENT_SUBNET_ZONE 455 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 456 +#define VAR_CLIENT_SUBNET_OPCODE 457 +#define VAR_MAX_CLIENT_SUBNET_IPV4 458 +#define VAR_MAX_CLIENT_SUBNET_IPV6 459 +#define VAR_MIN_CLIENT_SUBNET_IPV4 460 +#define VAR_MIN_CLIENT_SUBNET_IPV6 461 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 462 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 463 +#define VAR_CAPS_WHITELIST 464 +#define VAR_CACHE_MAX_NEGATIVE_TTL 465 +#define VAR_PERMIT_SMALL_HOLDDOWN 466 +#define VAR_QNAME_MINIMISATION 467 +#define VAR_QNAME_MINIMISATION_STRICT 468 +#define VAR_IP_FREEBIND 469 +#define VAR_DEFINE_TAG 470 +#define VAR_LOCAL_ZONE_TAG 471 +#define VAR_ACCESS_CONTROL_TAG 472 +#define VAR_LOCAL_ZONE_OVERRIDE 473 +#define VAR_ACCESS_CONTROL_TAG_ACTION 474 +#define VAR_ACCESS_CONTROL_TAG_DATA 475 +#define VAR_VIEW 476 +#define VAR_ACCESS_CONTROL_VIEW 477 +#define VAR_VIEW_FIRST 478 +#define VAR_SERVE_EXPIRED 479 +#define VAR_SERVE_EXPIRED_TTL 480 +#define VAR_SERVE_EXPIRED_TTL_RESET 481 +#define VAR_SERVE_EXPIRED_REPLY_TTL 482 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 483 +#define VAR_FAKE_DSA 484 +#define VAR_FAKE_SHA1 485 +#define VAR_LOG_IDENTITY 486 +#define VAR_HIDE_TRUSTANCHOR 487 +#define VAR_TRUST_ANCHOR_SIGNALING 488 +#define VAR_AGGRESSIVE_NSEC 489 +#define VAR_USE_SYSTEMD 490 +#define VAR_SHM_ENABLE 491 +#define VAR_SHM_KEY 492 +#define VAR_ROOT_KEY_SENTINEL 493 +#define VAR_DNSCRYPT 494 +#define VAR_DNSCRYPT_ENABLE 495 +#define VAR_DNSCRYPT_PORT 496 +#define VAR_DNSCRYPT_PROVIDER 497 +#define VAR_DNSCRYPT_SECRET_KEY 498 +#define VAR_DNSCRYPT_PROVIDER_CERT 499 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 500 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 501 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 502 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 503 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 504 +#define VAR_IPSECMOD_ENABLED 505 +#define VAR_IPSECMOD_HOOK 506 +#define VAR_IPSECMOD_IGNORE_BOGUS 507 +#define VAR_IPSECMOD_MAX_TTL 508 +#define VAR_IPSECMOD_WHITELIST 509 +#define VAR_IPSECMOD_STRICT 510 +#define VAR_CACHEDB 511 +#define VAR_CACHEDB_BACKEND 512 +#define VAR_CACHEDB_SECRETSEED 513 +#define VAR_CACHEDB_REDISHOST 514 +#define VAR_CACHEDB_REDISPORT 515 +#define VAR_CACHEDB_REDISTIMEOUT 516 +#define VAR_CACHEDB_REDISEXPIRERECORDS 517 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 518 +#define VAR_FOR_UPSTREAM 519 +#define VAR_AUTH_ZONE 520 +#define VAR_ZONEFILE 521 +#define VAR_MASTER 522 +#define VAR_URL 523 +#define VAR_FOR_DOWNSTREAM 524 +#define VAR_FALLBACK_ENABLED 525 +#define VAR_TLS_ADDITIONAL_PORT 526 +#define VAR_LOW_RTT 527 +#define VAR_LOW_RTT_PERMIL 528 +#define VAR_FAST_SERVER_PERMIL 529 +#define VAR_FAST_SERVER_NUM 530 +#define VAR_ALLOW_NOTIFY 531 +#define VAR_TLS_WIN_CERT 532 +#define VAR_TCP_CONNECTION_LIMIT 533 +#define VAR_FORWARD_NO_CACHE 534 +#define VAR_STUB_NO_CACHE 535 +#define VAR_LOG_SERVFAIL 536 +#define VAR_DENY_ANY 537 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 538 +#define VAR_LOG_TAG_QUERYREPLY 539 +#define VAR_STREAM_WAIT_SIZE 540 +#define VAR_TLS_CIPHERS 541 +#define VAR_TLS_CIPHERSUITES 542 +#define VAR_TLS_USE_SNI 543 +#define VAR_IPSET 544 +#define VAR_IPSET_NAME_V4 545 +#define VAR_IPSET_NAME_V6 546 +#define VAR_TLS_SESSION_TICKET_KEYS 547 +#define VAR_RPZ 548 +#define VAR_TAGS 549 +#define VAR_RPZ_ACTION_OVERRIDE 550 +#define VAR_RPZ_CNAME_OVERRIDE 551 +#define VAR_RPZ_LOG 552 +#define VAR_RPZ_LOG_NAME 553 +#define VAR_DYNLIB 554 +#define VAR_DYNLIB_FILE 555 +#define VAR_EDNS_CLIENT_STRING 556 +#define VAR_EDNS_CLIENT_STRING_OPCODE 557 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -740,7 +746,7 @@ union YYSTYPE char* str; -#line 744 "util/configparser.c" +#line 750 "util/configparser.c" }; typedef union YYSTYPE YYSTYPE; @@ -990,19 +996,19 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 635 +#define YYLAST 641 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 300 +#define YYNTOKENS 303 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 325 +#define YYNNTS 328 /* YYNRULES -- Number of rules. */ -#define YYNRULES 626 +#define YYNRULES 632 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 930 +#define YYNSTATES 939 #define YYUNDEFTOK 2 -#define YYMAXUTOK 554 +#define YYMAXUTOK 557 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ @@ -1068,76 +1074,77 @@ static const yytype_uint16 yytranslate[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299 + 295, 296, 297, 298, 299, 300, 301, 302 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 184, 184, 184, 185, 185, 186, 186, 187, 187, - 187, 188, 188, 189, 189, 190, 190, 191, 193, 199, - 204, 205, 206, 206, 206, 207, 207, 208, 208, 208, - 209, 209, 210, 210, 210, 211, 211, 212, 212, 212, - 213, 213, 213, 214, 214, 215, 215, 216, 216, 217, - 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, - 222, 222, 223, 223, 223, 224, 224, 224, 225, 225, - 226, 226, 227, 227, 228, 228, 229, 229, 229, 230, - 230, 231, 231, 232, 232, 232, 233, 233, 234, 234, - 235, 235, 236, 236, 236, 237, 237, 238, 238, 239, - 239, 240, 240, 241, 241, 242, 242, 242, 243, 243, - 244, 244, 244, 245, 245, 245, 246, 246, 246, 247, - 247, 247, 247, 248, 249, 249, 249, 250, 250, 250, - 251, 251, 252, 253, 253, 253, 254, 254, 255, 255, - 256, 256, 256, 257, 257, 258, 258, 258, 259, 260, - 260, 261, 261, 262, 263, 263, 264, 264, 265, 265, - 266, 267, 267, 268, 268, 269, 269, 270, 270, 271, - 271, 272, 272, 272, 273, 273, 274, 274, 275, 275, - 276, 276, 277, 277, 278, 278, 279, 279, 279, 280, - 280, 280, 281, 281, 281, 282, 282, 283, 284, 284, - 285, 285, 286, 286, 287, 287, 288, 288, 288, 289, - 289, 289, 290, 290, 290, 291, 291, 292, 292, 293, - 293, 294, 294, 295, 297, 309, 310, 311, 311, 311, - 311, 311, 312, 312, 314, 326, 327, 328, 328, 328, - 328, 329, 329, 331, 345, 346, 347, 347, 347, 347, - 348, 348, 348, 350, 367, 368, 369, 369, 369, 369, - 370, 370, 370, 371, 374, 393, 410, 418, 428, 436, - 453, 454, 455, 455, 455, 455, 455, 456, 456, 456, - 457, 457, 459, 468, 477, 488, 497, 506, 515, 526, - 535, 547, 561, 576, 587, 604, 621, 638, 655, 670, - 685, 698, 713, 722, 731, 740, 749, 758, 767, 776, - 785, 794, 803, 812, 821, 830, 839, 852, 861, 874, - 883, 892, 901, 908, 915, 924, 931, 940, 948, 955, - 962, 970, 979, 986, 1002, 1010, 1018, 1026, 1034, 1043, - 1052, 1066, 1075, 1084, 1093, 1102, 1111, 1120, 1127, 1134, - 1160, 1168, 1175, 1182, 1189, 1196, 1204, 1212, 1220, 1227, - 1238, 1249, 1256, 1265, 1274, 1283, 1290, 1297, 1305, 1313, - 1323, 1333, 1343, 1357, 1365, 1378, 1389, 1397, 1410, 1419, - 1428, 1437, 1447, 1457, 1465, 1478, 1487, 1495, 1504, 1512, - 1525, 1534, 1541, 1551, 1561, 1571, 1581, 1591, 1601, 1611, - 1621, 1628, 1635, 1642, 1651, 1660, 1669, 1678, 1685, 1695, - 1715, 1722, 1740, 1753, 1766, 1775, 1784, 1793, 1802, 1812, - 1822, 1833, 1842, 1851, 1860, 1869, 1878, 1887, 1900, 1913, - 1922, 1929, 1938, 1947, 1956, 1965, 1973, 1986, 1994, 2035, - 2042, 2057, 2067, 2077, 2084, 2091, 2098, 2107, 2115, 2129, - 2150, 2171, 2183, 2195, 2207, 2216, 2237, 2247, 2256, 2264, - 2272, 2285, 2298, 2313, 2328, 2337, 2346, 2352, 2361, 2370, - 2380, 2390, 2403, 2416, 2428, 2442, 2454, 2468, 2483, 2494, - 2504, 2511, 2518, 2527, 2536, 2546, 2556, 2566, 2573, 2580, - 2589, 2598, 2608, 2618, 2625, 2632, 2639, 2647, 2657, 2667, - 2677, 2687, 2726, 2736, 2744, 2752, 2767, 2776, 2781, 2782, - 2783, 2783, 2783, 2784, 2784, 2784, 2785, 2785, 2787, 2797, - 2806, 2813, 2820, 2827, 2834, 2841, 2848, 2853, 2854, 2855, - 2855, 2855, 2856, 2856, 2856, 2857, 2858, 2858, 2859, 2859, - 2860, 2860, 2861, 2862, 2863, 2864, 2865, 2866, 2868, 2877, - 2887, 2894, 2901, 2910, 2917, 2924, 2931, 2938, 2947, 2956, - 2963, 2970, 2980, 2990, 3000, 3010, 3020, 3030, 3035, 3036, - 3037, 3039, 3045, 3050, 3051, 3052, 3054, 3060, 3070, 3077, - 3086, 3094, 3099, 3100, 3102, 3102, 3102, 3103, 3103, 3104, - 3105, 3106, 3107, 3108, 3110, 3120, 3129, 3136, 3145, 3152, - 3161, 3169, 3182, 3190, 3203, 3208, 3209, 3210, 3210, 3211, - 3211, 3211, 3212, 3214, 3226, 3238, 3250, 3265, 3278, 3291, - 3302, 3307, 3308, 3309, 3309, 3311, 3326 + 0, 185, 185, 185, 186, 186, 187, 187, 188, 188, + 188, 189, 189, 190, 190, 191, 191, 192, 194, 200, + 205, 206, 207, 207, 207, 208, 208, 209, 209, 209, + 210, 210, 211, 211, 211, 212, 212, 213, 213, 213, + 214, 214, 214, 215, 215, 216, 216, 217, 217, 218, + 218, 219, 219, 220, 220, 221, 221, 222, 222, 223, + 223, 223, 224, 224, 224, 225, 225, 225, 226, 226, + 227, 227, 228, 228, 229, 229, 230, 230, 230, 231, + 231, 232, 232, 233, 233, 233, 234, 234, 235, 235, + 236, 236, 237, 237, 237, 238, 238, 239, 239, 240, + 240, 241, 241, 242, 242, 243, 243, 243, 244, 244, + 245, 245, 245, 246, 246, 246, 247, 247, 247, 248, + 248, 248, 248, 249, 250, 250, 250, 251, 251, 251, + 252, 252, 253, 253, 254, 254, 254, 255, 255, 255, + 256, 256, 257, 257, 257, 258, 258, 259, 259, 259, + 260, 260, 261, 261, 262, 262, 263, 264, 264, 265, + 265, 266, 266, 267, 268, 268, 269, 269, 270, 270, + 271, 271, 272, 272, 273, 273, 273, 274, 274, 275, + 275, 276, 276, 277, 277, 278, 278, 279, 279, 280, + 280, 280, 281, 281, 281, 282, 282, 282, 283, 283, + 284, 285, 285, 286, 286, 287, 287, 288, 288, 289, + 289, 289, 290, 290, 290, 291, 291, 291, 292, 292, + 293, 293, 294, 294, 295, 295, 296, 298, 310, 311, + 312, 312, 312, 312, 312, 313, 313, 315, 327, 328, + 329, 329, 329, 329, 330, 330, 332, 346, 347, 348, + 348, 348, 348, 349, 349, 349, 351, 368, 369, 370, + 370, 370, 370, 371, 371, 371, 372, 375, 394, 411, + 419, 429, 437, 454, 455, 456, 456, 456, 456, 456, + 457, 457, 457, 458, 458, 460, 469, 478, 489, 498, + 507, 516, 527, 536, 548, 562, 577, 588, 605, 622, + 639, 656, 671, 686, 699, 714, 723, 732, 741, 750, + 759, 768, 777, 786, 795, 804, 813, 822, 831, 840, + 853, 862, 875, 884, 893, 902, 909, 916, 925, 932, + 941, 949, 956, 963, 971, 980, 988, 1004, 1012, 1020, + 1028, 1036, 1044, 1053, 1062, 1076, 1085, 1094, 1103, 1112, + 1121, 1130, 1137, 1144, 1170, 1178, 1185, 1192, 1199, 1206, + 1214, 1222, 1230, 1237, 1248, 1259, 1266, 1275, 1284, 1293, + 1300, 1307, 1315, 1323, 1333, 1343, 1353, 1367, 1375, 1388, + 1399, 1407, 1420, 1429, 1438, 1447, 1456, 1466, 1476, 1484, + 1497, 1506, 1514, 1523, 1531, 1544, 1553, 1563, 1570, 1580, + 1590, 1600, 1610, 1620, 1630, 1640, 1650, 1657, 1664, 1671, + 1680, 1689, 1698, 1707, 1714, 1724, 1744, 1751, 1769, 1782, + 1795, 1804, 1813, 1822, 1831, 1841, 1851, 1862, 1871, 1880, + 1889, 1898, 1907, 1916, 1929, 1942, 1951, 1958, 1967, 1976, + 1985, 1994, 2002, 2015, 2023, 2064, 2071, 2086, 2096, 2106, + 2113, 2120, 2127, 2136, 2144, 2158, 2179, 2200, 2212, 2224, + 2236, 2245, 2266, 2276, 2285, 2293, 2301, 2314, 2327, 2342, + 2357, 2366, 2375, 2381, 2390, 2399, 2409, 2419, 2432, 2445, + 2457, 2471, 2483, 2497, 2506, 2518, 2528, 2535, 2542, 2551, + 2560, 2570, 2580, 2590, 2597, 2604, 2613, 2622, 2632, 2642, + 2649, 2656, 2663, 2671, 2681, 2691, 2701, 2711, 2750, 2760, + 2768, 2776, 2791, 2800, 2805, 2806, 2807, 2807, 2807, 2808, + 2808, 2808, 2809, 2809, 2811, 2821, 2830, 2837, 2844, 2851, + 2858, 2865, 2872, 2877, 2878, 2879, 2879, 2879, 2880, 2880, + 2880, 2881, 2882, 2882, 2883, 2883, 2884, 2884, 2885, 2886, + 2887, 2888, 2889, 2890, 2892, 2901, 2911, 2918, 2925, 2934, + 2941, 2948, 2955, 2962, 2971, 2980, 2987, 2994, 3004, 3014, + 3024, 3034, 3044, 3054, 3059, 3060, 3061, 3063, 3069, 3074, + 3075, 3076, 3078, 3084, 3094, 3101, 3110, 3118, 3123, 3124, + 3126, 3126, 3126, 3127, 3127, 3128, 3129, 3130, 3131, 3132, + 3134, 3144, 3153, 3160, 3169, 3176, 3185, 3193, 3206, 3214, + 3227, 3232, 3233, 3234, 3234, 3235, 3235, 3235, 3236, 3238, + 3250, 3262, 3274, 3289, 3302, 3315, 3326, 3331, 3332, 3333, + 3333, 3335, 3350 }; #endif @@ -1194,10 +1201,11 @@ static const char *const yytname[] = "VAR_FORWARD_SSL_UPSTREAM", "VAR_TLS_CERT_BUNDLE", "VAR_HTTPS_PORT", "VAR_HTTP_ENDPOINT", "VAR_HTTP_MAX_STREAMS", "VAR_HTTP_QUERY_BUFFER_SIZE", "VAR_HTTP_RESPONSE_BUFFER_SIZE", - "VAR_HTTP_NODELAY", "VAR_STUB_FIRST", "VAR_MINIMAL_RESPONSES", - "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", "VAR_DELAY_CLOSE", - "VAR_UNBLOCK_LAN_ZONES", "VAR_INSECURE_LAN_ZONES", - "VAR_INFRA_CACHE_MIN_RTT", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL", + "VAR_HTTP_NODELAY", "VAR_HTTP_NOTLS_DOWNSTREAM", "VAR_STUB_FIRST", + "VAR_MINIMAL_RESPONSES", "VAR_RRSET_ROUNDROBIN", "VAR_MAX_UDP_SIZE", + "VAR_DELAY_CLOSE", "VAR_UDP_CONNECT", "VAR_UNBLOCK_LAN_ZONES", + "VAR_INSECURE_LAN_ZONES", "VAR_INFRA_CACHE_MIN_RTT", + "VAR_INFRA_KEEP_PROBING", "VAR_DNS64_PREFIX", "VAR_DNS64_SYNTHALL", "VAR_DNS64_IGNORE_AAAA", "VAR_DNSTAP", "VAR_DNSTAP_ENABLE", "VAR_DNSTAP_SOCKET_PATH", "VAR_DNSTAP_IP", "VAR_DNSTAP_TLS", "VAR_DNSTAP_TLS_SERVER_NAME", "VAR_DNSTAP_TLS_CERT_BUNDLE", @@ -1256,15 +1264,15 @@ static const char *const yytname[] = "VAR_IPSET_NAME_V4", "VAR_IPSET_NAME_V6", "VAR_TLS_SESSION_TICKET_KEYS", "VAR_RPZ", "VAR_TAGS", "VAR_RPZ_ACTION_OVERRIDE", "VAR_RPZ_CNAME_OVERRIDE", "VAR_RPZ_LOG", "VAR_RPZ_LOG_NAME", - "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_TAG", - "VAR_EDNS_CLIENT_TAG_OPCODE", "$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", - "rpzstart", "contents_rpz", "content_rpz", "server_num_threads", - "server_verbosity", "server_statistics_interval", + "VAR_DYNLIB", "VAR_DYNLIB_FILE", "VAR_EDNS_CLIENT_STRING", + "VAR_EDNS_CLIENT_STRING_OPCODE", "$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", "rpzstart", "contents_rpz", "content_rpz", + "server_num_threads", "server_verbosity", "server_statistics_interval", "server_statistics_cumulative", "server_extended_statistics", "server_shm_enable", "server_shm_key", "server_port", "server_send_client_subnet", "server_client_subnet_zone", @@ -1288,28 +1296,29 @@ static const char *const yytname[] = "server_tls_use_sni", "server_https_port", "server_http_endpoint", "server_http_max_streams", "server_http_query_buffer_size", "server_http_response_buffer_size", "server_http_nodelay", - "server_use_systemd", "server_do_daemonize", "server_use_syslog", - "server_log_time_ascii", "server_log_queries", "server_log_replies", - "server_log_tag_queryreply", "server_log_servfail", - "server_log_local_actions", "server_chroot", "server_username", - "server_directory", "server_logfile", "server_pidfile", - "server_root_hints", "server_dlv_anchor_file", "server_dlv_anchor", - "server_auto_trust_anchor_file", "server_trust_anchor_file", - "server_trusted_keys_file", "server_trust_anchor", - "server_trust_anchor_signaling", "server_root_key_sentinel", - "server_domain_insecure", "server_hide_identity", "server_hide_version", - "server_hide_trustanchor", "server_identity", "server_version", - "server_so_rcvbuf", "server_so_sndbuf", "server_so_reuseport", - "server_ip_transparent", "server_ip_freebind", "server_ip_dscp", - "server_stream_wait_size", "server_edns_buffer_size", - "server_msg_buffer_size", "server_msg_cache_size", - "server_msg_cache_slabs", "server_num_queries_per_thread", - "server_jostle_timeout", "server_delay_close", - "server_unblock_lan_zones", "server_insecure_lan_zones", - "server_rrset_cache_size", "server_rrset_cache_slabs", - "server_infra_host_ttl", "server_infra_lame_ttl", - "server_infra_cache_numhosts", "server_infra_cache_lame_size", - "server_infra_cache_slabs", "server_infra_cache_min_rtt", + "server_http_notls_downstream", "server_use_systemd", + "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", + "server_log_queries", "server_log_replies", "server_log_tag_queryreply", + "server_log_servfail", "server_log_local_actions", "server_chroot", + "server_username", "server_directory", "server_logfile", + "server_pidfile", "server_root_hints", "server_dlv_anchor_file", + "server_dlv_anchor", "server_auto_trust_anchor_file", + "server_trust_anchor_file", "server_trusted_keys_file", + "server_trust_anchor", "server_trust_anchor_signaling", + "server_root_key_sentinel", "server_domain_insecure", + "server_hide_identity", "server_hide_version", "server_hide_trustanchor", + "server_identity", "server_version", "server_so_rcvbuf", + "server_so_sndbuf", "server_so_reuseport", "server_ip_transparent", + "server_ip_freebind", "server_ip_dscp", "server_stream_wait_size", + "server_edns_buffer_size", "server_msg_buffer_size", + "server_msg_cache_size", "server_msg_cache_slabs", + "server_num_queries_per_thread", "server_jostle_timeout", + "server_delay_close", "server_udp_connect", "server_unblock_lan_zones", + "server_insecure_lan_zones", "server_rrset_cache_size", + "server_rrset_cache_slabs", "server_infra_host_ttl", + "server_infra_lame_ttl", "server_infra_cache_numhosts", + "server_infra_cache_lame_size", "server_infra_cache_slabs", + "server_infra_cache_min_rtt", "server_infra_keep_probing", "server_target_fetch_policy", "server_harden_short_bufsize", "server_harden_large_queries", "server_harden_glue", "server_harden_dnssec_stripped", "server_harden_below_nxdomain", @@ -1349,24 +1358,25 @@ static const char *const yytname[] = "server_qname_minimisation_strict", "server_ipsecmod_enabled", "server_ipsecmod_ignore_bogus", "server_ipsecmod_hook", "server_ipsecmod_max_ttl", "server_ipsecmod_whitelist", - "server_ipsecmod_strict", "server_edns_client_tag", - "server_edns_client_tag_opcode", "stub_name", "stub_host", "stub_addr", - "stub_first", "stub_no_cache", "stub_ssl_upstream", "stub_prime", - "forward_name", "forward_host", "forward_addr", "forward_first", - "forward_no_cache", "forward_ssl_upstream", "auth_name", "auth_zonefile", - "auth_master", "auth_url", "auth_allow_notify", "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", - "dt_dnstap_bidirectional", "dt_dnstap_socket_path", "dt_dnstap_ip", - "dt_dnstap_tls", "dt_dnstap_tls_server_name", - "dt_dnstap_tls_cert_bundle", "dt_dnstap_tls_client_key_file", - "dt_dnstap_tls_client_cert_file", "dt_dnstap_send_identity", - "dt_dnstap_send_version", "dt_dnstap_identity", "dt_dnstap_version", + "server_ipsecmod_strict", "server_edns_client_string", + "server_edns_client_string_opcode", "stub_name", "stub_host", + "stub_addr", "stub_first", "stub_no_cache", "stub_ssl_upstream", + "stub_prime", "forward_name", "forward_host", "forward_addr", + "forward_first", "forward_no_cache", "forward_ssl_upstream", "auth_name", + "auth_zonefile", "auth_master", "auth_url", "auth_allow_notify", + "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", "dt_dnstap_bidirectional", + "dt_dnstap_socket_path", "dt_dnstap_ip", "dt_dnstap_tls", + "dt_dnstap_tls_server_name", "dt_dnstap_tls_cert_bundle", + "dt_dnstap_tls_client_key_file", "dt_dnstap_tls_client_cert_file", + "dt_dnstap_send_identity", "dt_dnstap_send_version", + "dt_dnstap_identity", "dt_dnstap_version", "dt_dnstap_log_resolver_query_messages", "dt_dnstap_log_resolver_response_messages", "dt_dnstap_log_client_query_messages", @@ -1424,14 +1434,15 @@ static const yytype_uint16 yytoknum[] = 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545, 546, 547, 548, 549, 550, 551, 552, 553, 554 + 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, + 555, 556, 557 }; # endif -#define YYPACT_NINF -288 +#define YYPACT_NINF -291 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-288))) + (!!((Yystate) == (-291))) #define YYTABLE_NINF -1 @@ -1442,99 +1453,100 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -288, 0, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, 284, -42, -38, -43, -21, -44, -11, -93, - -109, -287, -212, -237, -279, 3, 4, 13, 25, 26, + -291, 0, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 287, -42, -38, -43, -21, -44, -11, -96, + -109, -290, -215, -240, -282, 3, 4, 13, 25, 26, 27, 30, 31, 32, 33, 34, 35, 37, 38, 39, 40, 41, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 54, 55, 84, 85, 88, 89, 91, 93, - 94, 95, 97, 98, 99, 100, 101, 103, 104, 105, + 94, 95, 96, 98, 99, 100, 101, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 126, 127, 128, 129, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, + 148, 149, 150, 151, 153, 154, 155, 156, 157, 158, + 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 171, 172, 173, 174, 175, 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, 212, 213, - 214, 215, 216, 217, 218, 220, 221, 222, 223, 224, - 227, 229, 231, 244, 245, 246, 247, 248, 249, 250, - 251, 253, 254, 255, 256, 257, 258, 259, 260, 261, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 215, 216, 217, 218, 219, 220, 221, 223, 224, + 225, 226, 227, 230, 232, 234, 247, 248, 249, 250, + 251, 252, 253, 254, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 272, 273, 274, 275, 277, 278, 279, 281, 282, 283, - 285, 319, 320, 321, 322, 326, 327, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - 328, 370, 371, 372, 373, 374, 375, -288, -288, -288, - -288, -288, -288, -288, -288, 376, 377, 378, 382, 386, - 387, -288, -288, -288, -288, -288, -288, -288, 412, 413, - 414, 422, 433, 434, 435, -288, -288, -288, -288, -288, - -288, -288, -288, 436, 437, 438, 439, 440, 441, 442, - 443, -288, -288, -288, -288, -288, -288, -288, -288, -288, - 444, 445, 446, 447, 448, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, 449, 450, 451, 452, - 492, 494, 510, 511, -288, -288, -288, -288, -288, -288, - -288, -288, -288, 512, 513, 514, 515, 516, 517, 518, - 519, 520, 527, 528, 529, 530, 531, 532, 533, 535, - 536, 537, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, 538, -288, -288, 539, -288, -288, 540, 541, - 544, 547, 550, 551, 560, 561, 562, 564, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, 565, - 566, 567, 568, 569, 570, -288, -288, -288, -288, -288, - -288, -288, 571, 574, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 575, 576, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - 577, 578, 579, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, 580, 581, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, 582, 583, 584, 585, 586, 587, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 588, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 589, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, 590, -288, -288, 591, 592, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, 593, 594, - 595, -288, -288, -288, -288, -288, -288, -288, -288, -288 + 272, 273, 274, 275, 276, 277, 278, 280, 281, 282, + 284, 285, 286, 288, 322, 323, 324, 325, 329, 330, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 331, 373, 374, 375, + 376, 377, 378, -291, -291, -291, -291, -291, -291, -291, + -291, 379, 380, 381, 385, 389, 390, -291, -291, -291, + -291, -291, -291, -291, 415, 416, 417, 426, 439, 440, + 441, -291, -291, -291, -291, -291, -291, -291, -291, 442, + 443, 444, 445, 446, 447, 448, 449, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 450, 451, 452, 453, + 454, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 455, 456, 457, 458, 498, 500, 516, 517, + -291, -291, -291, -291, -291, -291, -291, -291, -291, 518, + 519, 520, 521, 522, 523, 524, 525, 526, 533, 534, + 535, 536, 537, 538, 539, 541, 542, 543, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, 544, -291, + -291, 545, -291, -291, 546, 547, 550, 553, 556, 557, + 566, 567, 568, 570, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, 571, 572, 573, 574, 575, + 576, -291, -291, -291, -291, -291, -291, -291, 577, 580, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, 581, 582, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, 583, + 584, 585, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 586, 587, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, 588, 589, 590, 591, 592, 593, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 594, -291, -291, -291, + -291, -291, -291, -291, -291, -291, 595, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, 596, -291, -291, 597, 598, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, 599, 600, 601, + -291, -291, -291, -291, -291, -291, -291, -291, -291 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1542,10 +1554,10 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 18, 19, 224, 234, 507, 567, 526, - 243, 581, 604, 253, 620, 269, 572, 3, 17, 21, - 226, 236, 245, 255, 271, 509, 528, 569, 574, 583, - 606, 622, 4, 5, 6, 10, 14, 15, 8, 9, + 2, 0, 1, 18, 19, 227, 237, 513, 573, 532, + 246, 587, 610, 256, 626, 272, 578, 3, 17, 21, + 229, 239, 248, 258, 274, 515, 534, 575, 580, 589, + 612, 628, 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, @@ -1566,151 +1578,152 @@ static const yytype_uint16 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, 0, 0, 20, 22, 23, - 86, 89, 98, 192, 193, 24, 157, 158, 159, 160, - 161, 162, 163, 164, 165, 166, 37, 77, 25, 90, - 91, 48, 70, 85, 26, 27, 30, 31, 28, 29, - 32, 33, 34, 35, 36, 121, 204, 122, 124, 125, - 126, 206, 211, 207, 218, 219, 220, 221, 127, 128, - 129, 130, 131, 132, 188, 87, 76, 102, 119, 120, - 216, 213, 123, 38, 39, 40, 41, 42, 78, 92, - 93, 108, 64, 74, 65, 196, 197, 103, 58, 59, - 195, 60, 61, 112, 116, 136, 145, 171, 148, 217, - 113, 71, 43, 44, 45, 100, 137, 138, 139, 46, - 47, 49, 50, 52, 53, 51, 143, 54, 55, 56, - 62, 81, 117, 95, 144, 88, 167, 96, 97, 114, - 115, 214, 101, 57, 79, 82, 63, 66, 104, 105, - 80, 168, 106, 67, 68, 69, 205, 118, 181, 182, - 183, 184, 185, 186, 194, 107, 75, 109, 110, 111, - 169, 72, 73, 94, 83, 84, 99, 133, 134, 215, - 135, 140, 141, 142, 172, 173, 175, 177, 178, 176, - 179, 189, 146, 147, 151, 152, 149, 150, 153, 154, - 156, 155, 208, 210, 209, 170, 180, 198, 200, 199, - 201, 202, 203, 222, 223, 174, 187, 190, 191, 212, - 0, 0, 0, 0, 0, 0, 0, 225, 227, 228, - 229, 231, 232, 233, 230, 0, 0, 0, 0, 0, - 0, 235, 237, 238, 239, 240, 241, 242, 0, 0, - 0, 0, 0, 0, 0, 244, 246, 247, 250, 251, - 248, 252, 249, 0, 0, 0, 0, 0, 0, 0, - 0, 254, 256, 257, 258, 259, 263, 260, 261, 262, - 0, 0, 0, 0, 0, 274, 278, 279, 280, 281, - 270, 272, 273, 275, 276, 277, 0, 0, 0, 0, - 0, 0, 0, 0, 508, 510, 512, 511, 517, 513, - 514, 515, 516, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 527, 529, 531, 530, 532, 533, 534, 535, - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 0, 568, 570, 0, 573, 575, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 582, 584, - 585, 586, 588, 589, 587, 590, 591, 592, 593, 0, - 0, 0, 0, 0, 0, 605, 607, 608, 609, 610, - 611, 612, 0, 0, 621, 623, 624, 283, 282, 289, - 302, 300, 312, 308, 309, 313, 310, 311, 314, 315, - 316, 317, 318, 347, 348, 349, 350, 351, 376, 377, - 378, 383, 384, 305, 385, 386, 389, 387, 388, 391, - 392, 393, 407, 362, 363, 365, 366, 394, 410, 356, - 358, 411, 417, 418, 419, 306, 375, 435, 436, 357, - 430, 340, 301, 352, 408, 414, 395, 0, 0, 439, - 307, 284, 339, 399, 285, 303, 304, 353, 354, 437, - 397, 401, 402, 286, 440, 379, 406, 341, 361, 412, - 413, 416, 429, 355, 433, 431, 432, 367, 374, 403, - 404, 368, 369, 396, 421, 342, 343, 346, 319, 321, - 322, 323, 324, 325, 332, 333, 334, 335, 336, 337, - 441, 442, 444, 380, 381, 382, 390, 445, 446, 447, - 0, 0, 0, 398, 370, 372, 577, 456, 460, 458, - 457, 461, 459, 0, 0, 464, 465, 290, 291, 292, - 293, 294, 295, 296, 297, 298, 299, 400, 415, 434, - 469, 470, 371, 448, 0, 0, 0, 0, 0, 0, - 422, 423, 424, 425, 426, 427, 428, 578, 364, 359, - 420, 338, 287, 288, 360, 471, 473, 472, 474, 475, - 476, 320, 327, 466, 468, 467, 326, 0, 345, 405, - 443, 344, 373, 328, 329, 331, 330, 0, 478, 479, - 480, 481, 485, 484, 482, 483, 486, 487, 488, 489, - 491, 490, 500, 0, 504, 505, 0, 0, 506, 492, - 498, 493, 494, 495, 497, 499, 496, 264, 265, 266, - 267, 268, 518, 520, 519, 522, 523, 524, 525, 521, - 548, 550, 551, 552, 553, 554, 555, 556, 557, 558, - 549, 559, 560, 561, 562, 563, 564, 565, 566, 571, - 576, 594, 595, 596, 599, 597, 598, 600, 601, 602, - 603, 613, 614, 615, 616, 617, 618, 625, 626, 409, - 438, 455, 579, 580, 462, 463, 449, 450, 0, 0, - 0, 454, 619, 477, 501, 502, 503, 453, 451, 452 + 20, 22, 23, 86, 89, 98, 195, 196, 24, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 37, + 77, 25, 90, 91, 48, 70, 85, 26, 27, 30, + 31, 28, 29, 32, 33, 34, 35, 36, 121, 207, + 122, 124, 125, 126, 209, 214, 210, 221, 222, 223, + 224, 127, 128, 129, 130, 131, 132, 133, 191, 87, + 76, 102, 119, 120, 219, 216, 123, 38, 39, 40, + 41, 42, 78, 92, 93, 108, 64, 74, 65, 199, + 200, 103, 58, 59, 198, 60, 61, 112, 116, 137, + 147, 174, 150, 220, 113, 71, 43, 44, 45, 100, + 138, 139, 140, 141, 46, 47, 49, 50, 52, 53, + 51, 145, 151, 54, 55, 56, 62, 81, 117, 95, + 146, 88, 170, 96, 97, 114, 115, 217, 101, 57, + 79, 82, 63, 66, 104, 105, 80, 171, 106, 67, + 68, 69, 208, 118, 184, 185, 186, 187, 188, 189, + 197, 107, 75, 109, 110, 111, 172, 72, 73, 94, + 83, 84, 99, 134, 135, 218, 136, 142, 143, 144, + 175, 176, 178, 180, 181, 179, 182, 192, 148, 149, + 154, 155, 152, 153, 156, 157, 159, 158, 211, 213, + 212, 173, 183, 201, 203, 202, 204, 205, 206, 225, + 226, 177, 190, 193, 194, 215, 0, 0, 0, 0, + 0, 0, 0, 228, 230, 231, 232, 234, 235, 236, + 233, 0, 0, 0, 0, 0, 0, 238, 240, 241, + 242, 243, 244, 245, 0, 0, 0, 0, 0, 0, + 0, 247, 249, 250, 253, 254, 251, 255, 252, 0, + 0, 0, 0, 0, 0, 0, 0, 257, 259, 260, + 261, 262, 266, 263, 264, 265, 0, 0, 0, 0, + 0, 277, 281, 282, 283, 284, 273, 275, 276, 278, + 279, 280, 0, 0, 0, 0, 0, 0, 0, 0, + 514, 516, 518, 517, 523, 519, 520, 521, 522, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 533, 535, + 537, 536, 538, 539, 540, 541, 542, 543, 544, 545, + 546, 547, 548, 549, 550, 551, 552, 553, 0, 574, + 576, 0, 579, 581, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 588, 590, 591, 592, 594, 595, + 593, 596, 597, 598, 599, 0, 0, 0, 0, 0, + 0, 611, 613, 614, 615, 616, 617, 618, 0, 0, + 627, 629, 630, 286, 285, 292, 305, 303, 315, 311, + 312, 316, 313, 314, 317, 318, 319, 320, 321, 351, + 352, 353, 354, 355, 380, 381, 382, 388, 389, 308, + 390, 391, 394, 392, 393, 397, 398, 399, 413, 366, + 367, 369, 370, 400, 416, 360, 362, 417, 423, 424, + 425, 309, 379, 441, 442, 361, 436, 344, 304, 356, + 414, 420, 401, 0, 0, 445, 310, 287, 343, 405, + 288, 306, 307, 357, 358, 443, 403, 407, 408, 289, + 446, 383, 412, 345, 365, 418, 419, 422, 435, 359, + 439, 437, 438, 371, 378, 409, 410, 372, 373, 402, + 427, 346, 347, 350, 322, 324, 325, 326, 327, 328, + 335, 336, 337, 338, 339, 340, 341, 447, 448, 450, + 384, 385, 386, 387, 395, 396, 451, 452, 453, 0, + 0, 0, 404, 374, 376, 583, 462, 466, 464, 463, + 467, 465, 0, 0, 470, 471, 293, 294, 295, 296, + 297, 298, 299, 300, 301, 302, 406, 421, 440, 475, + 476, 375, 454, 0, 0, 0, 0, 0, 0, 428, + 429, 430, 431, 432, 433, 434, 584, 368, 363, 426, + 342, 290, 291, 364, 477, 479, 478, 480, 481, 482, + 323, 330, 472, 474, 473, 329, 0, 349, 411, 449, + 348, 377, 331, 332, 334, 333, 0, 484, 485, 486, + 487, 491, 490, 488, 489, 492, 493, 494, 495, 497, + 496, 506, 0, 510, 511, 0, 0, 512, 498, 504, + 499, 500, 501, 503, 505, 502, 267, 268, 269, 270, + 271, 524, 526, 525, 528, 529, 530, 531, 527, 554, + 556, 557, 558, 559, 560, 561, 562, 563, 564, 555, + 565, 566, 567, 568, 569, 570, 571, 572, 577, 582, + 600, 601, 602, 605, 603, 604, 606, 607, 608, 609, + 619, 620, 621, 622, 623, 624, 631, 632, 415, 444, + 461, 585, 586, 468, 469, 455, 456, 0, 0, 0, + 460, 625, 483, 507, 508, 509, 459, 457, 458 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, 572, 573, 596, - 597, 598, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288, -288, -288, -288, -288, -288, - -288, -288, -288, -288, -288 + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + 578, 579, 602, 603, 604, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, -291, -291, -291, -291, -291 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 17, 18, 19, 32, 247, 20, 33, 457, - 21, 34, 471, 22, 35, 485, 23, 36, 501, 515, - 516, 517, 518, 519, 24, 37, 520, 248, 249, 250, - 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, - 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, - 271, 272, 273, 274, 275, 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, 458, 459, 460, 461, 462, 463, - 464, 472, 473, 474, 475, 476, 477, 502, 503, 504, - 505, 506, 507, 508, 509, 486, 487, 488, 489, 490, - 491, 492, 25, 38, 534, 535, 536, 537, 538, 539, - 540, 541, 542, 26, 39, 562, 563, 564, 565, 566, - 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, - 577, 578, 579, 580, 581, 27, 40, 583, 584, 28, - 41, 586, 587, 445, 446, 447, 448, 29, 42, 598, - 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, - 30, 43, 615, 616, 617, 618, 619, 620, 621, 449, - 31, 44, 624, 625, 626 + -1, 1, 17, 18, 19, 32, 250, 20, 33, 463, + 21, 34, 477, 22, 35, 491, 23, 36, 507, 521, + 522, 523, 524, 525, 24, 37, 526, 251, 252, 253, + 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 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, 464, 465, 466, + 467, 468, 469, 470, 478, 479, 480, 481, 482, 483, + 508, 509, 510, 511, 512, 513, 514, 515, 492, 493, + 494, 495, 496, 497, 498, 25, 38, 540, 541, 542, + 543, 544, 545, 546, 547, 548, 26, 39, 568, 569, + 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, + 580, 581, 582, 583, 584, 585, 586, 587, 27, 40, + 589, 590, 28, 41, 592, 593, 451, 452, 453, 454, + 29, 42, 604, 605, 606, 607, 608, 609, 610, 611, + 612, 613, 614, 30, 43, 621, 622, 623, 624, 625, + 626, 627, 455, 31, 44, 630, 631, 632 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1718,149 +1731,151 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 493, 478, 450, 582, 451, 452, 465, 622, 623, - 585, 3, 4, 627, 628, 466, 467, 609, 610, 611, - 612, 613, 614, 629, 493, 588, 589, 590, 591, 592, - 593, 594, 595, 596, 597, 630, 631, 632, 479, 480, - 633, 634, 635, 636, 637, 638, 5, 639, 640, 641, - 642, 643, 6, 644, 645, 646, 647, 648, 649, 650, - 651, 652, 653, 481, 654, 655, 453, 543, 544, 545, - 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, - 556, 557, 558, 559, 560, 561, 526, 527, 528, 529, - 530, 531, 532, 533, 656, 657, 7, 454, 658, 659, - 468, 660, 469, 661, 662, 663, 455, 664, 665, 666, - 667, 668, 8, 669, 670, 671, 672, 673, 674, 675, - 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, - 686, 687, 688, 689, 690, 691, 692, 482, 483, 693, - 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, - 704, 705, 706, 707, 708, 709, 710, 711, 712, 9, - 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, - 723, 724, 725, 726, 727, 728, 729, 484, 730, 731, - 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, - 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, - 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, - 762, 763, 764, 765, 766, 767, 768, 769, 10, 495, - 496, 497, 770, 771, 772, 773, 774, 775, 776, 500, - 777, 778, 779, 780, 781, 456, 11, 782, 470, 783, - 494, 784, 495, 496, 497, 498, 499, 510, 511, 512, - 513, 514, 500, 12, 785, 786, 787, 788, 789, 790, - 791, 792, 13, 793, 794, 795, 796, 797, 798, 799, - 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, - 810, 811, 812, 813, 814, 815, 14, 816, 817, 818, - 15, 819, 820, 821, 0, 822, 16, 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, 823, - 824, 825, 826, 77, 78, 79, 827, 828, 829, 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, - 830, 831, 832, 833, 834, 835, 836, 837, 838, 121, - 122, 123, 839, 124, 125, 126, 840, 841, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 842, 843, 844, 151, 152, 153, 154, 155, - 156, 157, 845, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 846, 847, 848, 849, 850, 851, 852, - 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, - 863, 864, 865, 168, 169, 170, 171, 172, 173, 174, - 175, 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, 866, 207, 867, 208, 209, 210, 211, 212, - 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, - 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, - 878, 223, 224, 225, 226, 227, 228, 879, 880, 881, - 882, 883, 884, 885, 229, 886, 887, 888, 889, 890, - 891, 892, 230, 231, 893, 232, 233, 894, 234, 235, - 895, 896, 236, 237, 238, 239, 240, 241, 242, 243, - 897, 898, 899, 244, 900, 901, 902, 903, 904, 905, - 906, 907, 245, 246, 908, 909, 910, 911, 912, 913, - 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, - 924, 925, 926, 927, 928, 929, 0, 0, 0, 521, - 522, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 499, 484, 456, 588, 457, 458, 471, 628, 629, + 591, 3, 4, 633, 634, 472, 473, 615, 616, 617, + 618, 619, 620, 635, 499, 594, 595, 596, 597, 598, + 599, 600, 601, 602, 603, 636, 637, 638, 485, 486, + 639, 640, 641, 642, 643, 644, 5, 645, 646, 647, + 648, 649, 6, 650, 651, 652, 653, 654, 655, 656, + 657, 658, 659, 487, 660, 661, 459, 549, 550, 551, + 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, + 562, 563, 564, 565, 566, 567, 532, 533, 534, 535, + 536, 537, 538, 539, 662, 663, 7, 460, 664, 665, + 474, 666, 475, 667, 668, 669, 670, 461, 671, 672, + 673, 674, 8, 675, 676, 677, 678, 679, 680, 681, + 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, + 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, + 488, 489, 702, 703, 704, 705, 706, 707, 708, 709, + 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, + 720, 721, 9, 722, 723, 724, 725, 726, 727, 728, + 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, + 490, 739, 740, 741, 742, 743, 744, 745, 746, 747, + 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, + 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, + 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, + 778, 10, 501, 502, 503, 779, 780, 781, 782, 783, + 784, 785, 506, 786, 787, 788, 789, 790, 462, 11, + 791, 476, 792, 500, 793, 501, 502, 503, 504, 505, + 516, 517, 518, 519, 520, 506, 12, 794, 795, 796, + 797, 798, 799, 800, 801, 13, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, + 816, 817, 818, 819, 820, 821, 822, 823, 824, 14, + 825, 826, 827, 15, 828, 829, 830, 0, 831, 16, + 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, 832, 833, 834, 835, 77, 78, 79, 836, + 837, 838, 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, 839, 840, 841, 842, 843, 844, 845, + 846, 847, 121, 122, 123, 848, 124, 125, 126, 849, + 850, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 851, 852, 853, 151, 152, + 153, 154, 155, 156, 157, 158, 854, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 855, + 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, + 866, 867, 868, 869, 870, 871, 872, 873, 874, 171, + 172, 173, 174, 175, 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, 875, 210, + 876, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 877, 878, 879, 880, + 881, 882, 883, 884, 885, 886, 887, 226, 227, 228, + 229, 230, 231, 888, 889, 890, 891, 892, 893, 894, + 232, 895, 896, 897, 898, 899, 900, 901, 233, 234, + 902, 235, 236, 903, 237, 238, 904, 905, 239, 240, + 241, 242, 243, 244, 245, 246, 906, 907, 908, 247, + 909, 910, 911, 912, 913, 914, 915, 916, 248, 249, + 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, + 927, 928, 929, 930, 931, 932, 933, 934, 935, 936, + 937, 938, 0, 0, 0, 527, 528, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 523, 524, 525 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 529, + 530, 531 }; static const yytype_int16 yycheck[] = { - 0, 45, 45, 45, 113, 47, 48, 45, 287, 288, - 297, 11, 12, 10, 10, 53, 54, 254, 255, 256, - 257, 258, 259, 10, 45, 237, 238, 239, 240, 241, - 242, 243, 244, 245, 246, 10, 10, 10, 81, 82, + 0, 45, 45, 45, 113, 47, 48, 45, 290, 291, + 300, 11, 12, 10, 10, 53, 54, 257, 258, 259, + 260, 261, 262, 10, 45, 240, 241, 242, 243, 244, + 245, 246, 247, 248, 249, 10, 10, 10, 81, 82, 10, 10, 10, 10, 10, 10, 46, 10, 10, 10, 10, 10, 52, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 106, 10, 10, 108, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 97, 98, 99, 100, + 10, 10, 10, 106, 10, 10, 108, 163, 164, 165, + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 97, 98, 99, 100, 101, 102, 103, 104, 10, 10, 96, 139, 10, 10, - 138, 10, 140, 10, 10, 10, 148, 10, 10, 10, + 138, 10, 140, 10, 10, 10, 10, 149, 10, 10, 10, 10, 112, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 180, 181, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 159, + 183, 184, 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, 220, 10, 10, + 10, 10, 162, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 223, 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, 218, 263, - 264, 265, 10, 10, 10, 10, 10, 10, 10, 273, - 10, 10, 10, 10, 10, 277, 236, 10, 276, 10, - 261, 10, 263, 264, 265, 266, 267, 291, 292, 293, - 294, 295, 273, 253, 10, 10, 10, 10, 10, 10, - 10, 10, 262, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 286, 10, 10, 10, - 290, 10, 10, 10, -1, 10, 296, 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, 10, - 10, 10, 10, 49, 50, 51, 10, 10, 10, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 105, - 106, 107, 10, 109, 110, 111, 10, 10, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 10, 10, 10, 141, 142, 143, 144, 145, - 146, 147, 10, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 10, 10, 10, 10, 10, 10, 10, + 10, 221, 266, 267, 268, 10, 10, 10, 10, 10, + 10, 10, 276, 10, 10, 10, 10, 10, 280, 239, + 10, 279, 10, 264, 10, 266, 267, 268, 269, 270, + 294, 295, 296, 297, 298, 276, 256, 10, 10, 10, + 10, 10, 10, 10, 10, 265, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 289, + 10, 10, 10, 293, 10, 10, 10, -1, 10, 299, + 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, 10, 10, 10, 10, 49, 50, 51, 10, + 10, 10, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, + 93, 94, 95, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 105, 106, 107, 10, 109, 110, 111, 10, + 10, 114, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 10, 10, 10, 141, 142, + 143, 144, 145, 146, 147, 148, 10, 150, 151, 152, + 153, 154, 155, 156, 157, 158, 159, 160, 161, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 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, 10, 219, 10, 221, 222, 223, 224, 225, - 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 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, 218, 219, 220, 10, 222, + 10, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 250, 251, 252, + 253, 254, 255, 10, 10, 10, 10, 10, 10, 10, + 263, 10, 10, 10, 10, 10, 10, 10, 271, 272, + 10, 274, 275, 10, 277, 278, 10, 10, 281, 282, + 283, 284, 285, 286, 287, 288, 10, 10, 10, 292, + 10, 10, 10, 10, 10, 10, 10, 10, 301, 302, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 247, 248, 249, 250, 251, 252, 10, 10, 10, - 10, 10, 10, 10, 260, 10, 10, 10, 10, 10, - 10, 10, 268, 269, 10, 271, 272, 10, 274, 275, - 10, 10, 278, 279, 280, 281, 282, 283, 284, 285, - 10, 10, 10, 289, 10, 10, 10, 10, 10, 10, - 10, 10, 298, 299, 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, 37, - 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 10, 10, -1, -1, -1, 37, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 37, 37, 37 + -1, -1, -1, -1, -1, -1, -1, -1, -1, 37, + 37, 37 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 301, 0, 11, 12, 46, 52, 96, 112, 159, - 218, 236, 253, 262, 286, 290, 296, 302, 303, 304, - 307, 310, 313, 316, 324, 552, 563, 585, 589, 597, - 610, 620, 305, 308, 311, 314, 317, 325, 553, 564, - 586, 590, 598, 611, 621, 13, 14, 15, 16, 17, + 0, 304, 0, 11, 12, 46, 52, 96, 112, 162, + 221, 239, 256, 265, 289, 293, 299, 305, 306, 307, + 310, 313, 316, 319, 327, 558, 569, 591, 595, 603, + 616, 626, 308, 311, 314, 317, 320, 328, 559, 570, + 592, 596, 604, 617, 627, 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, @@ -1871,17 +1886,17 @@ static const yytype_uint16 yystos[] = 95, 105, 106, 107, 109, 110, 111, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 141, 142, 143, 144, 145, 146, 147, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 137, 141, 142, 143, 144, 145, 146, 147, 148, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 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, 219, 221, 222, - 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, - 233, 234, 235, 247, 248, 249, 250, 251, 252, 260, - 268, 269, 271, 272, 274, 275, 278, 279, 280, 281, - 282, 283, 284, 285, 289, 298, 299, 306, 327, 328, - 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 222, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 250, 251, 252, 253, + 254, 255, 263, 271, 272, 274, 275, 277, 278, 281, + 282, 283, 284, 285, 286, 287, 288, 292, 301, 302, + 309, 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, @@ -1900,25 +1915,26 @@ static const yytype_uint16 yystos[] = 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, 518, - 519, 520, 521, 522, 523, 593, 594, 595, 596, 619, - 45, 47, 48, 108, 139, 148, 277, 309, 524, 525, - 526, 527, 528, 529, 530, 45, 53, 54, 138, 140, - 276, 312, 531, 532, 533, 534, 535, 536, 45, 81, - 82, 106, 180, 181, 220, 315, 545, 546, 547, 548, - 549, 550, 551, 45, 261, 263, 264, 265, 266, 267, - 273, 318, 537, 538, 539, 540, 541, 542, 543, 544, - 291, 292, 293, 294, 295, 319, 320, 321, 322, 323, - 326, 537, 538, 539, 540, 541, 97, 98, 99, 100, - 101, 102, 103, 104, 554, 555, 556, 557, 558, 559, - 560, 561, 562, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, - 177, 178, 565, 566, 567, 568, 569, 570, 571, 572, + 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, + 529, 599, 600, 601, 602, 625, 45, 47, 48, 108, + 139, 149, 280, 312, 530, 531, 532, 533, 534, 535, + 536, 45, 53, 54, 138, 140, 279, 315, 537, 538, + 539, 540, 541, 542, 45, 81, 82, 106, 183, 184, + 223, 318, 551, 552, 553, 554, 555, 556, 557, 45, + 264, 266, 267, 268, 269, 270, 276, 321, 543, 544, + 545, 546, 547, 548, 549, 550, 294, 295, 296, 297, + 298, 322, 323, 324, 325, 326, 329, 543, 544, 545, + 546, 547, 97, 98, 99, 100, 101, 102, 103, 104, + 560, 561, 562, 563, 564, 565, 566, 567, 568, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, - 583, 584, 113, 587, 588, 297, 591, 592, 237, 238, - 239, 240, 241, 242, 243, 244, 245, 246, 599, 600, - 601, 602, 603, 604, 605, 606, 607, 608, 609, 254, - 255, 256, 257, 258, 259, 612, 613, 614, 615, 616, - 617, 618, 287, 288, 622, 623, 624, 10, 10, 10, + 583, 584, 585, 586, 587, 588, 589, 590, 113, 593, + 594, 300, 597, 598, 240, 241, 242, 243, 244, 245, + 246, 247, 248, 249, 605, 606, 607, 608, 609, 610, + 611, 612, 613, 614, 615, 257, 258, 259, 260, 261, + 262, 618, 619, 620, 621, 622, 623, 624, 290, 291, + 628, 629, 630, 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, @@ -1948,41 +1964,41 @@ static const yytype_uint16 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, 10, 10 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 300, 301, 301, 302, 302, 302, 302, 302, 302, - 302, 302, 302, 302, 302, 302, 302, 302, 303, 304, - 305, 305, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, - 306, 306, 306, 306, 307, 308, 308, 309, 309, 309, - 309, 309, 309, 309, 310, 311, 311, 312, 312, 312, - 312, 312, 312, 313, 314, 314, 315, 315, 315, 315, - 315, 315, 315, 316, 317, 317, 318, 318, 318, 318, - 318, 318, 318, 318, 319, 320, 321, 322, 323, 324, - 325, 325, 326, 326, 326, 326, 326, 326, 326, 326, - 326, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 0, 303, 304, 304, 305, 305, 305, 305, 305, 305, + 305, 305, 305, 305, 305, 305, 305, 305, 306, 307, + 308, 308, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 310, 311, 311, + 312, 312, 312, 312, 312, 312, 312, 313, 314, 314, + 315, 315, 315, 315, 315, 315, 316, 317, 317, 318, + 318, 318, 318, 318, 318, 318, 319, 320, 320, 321, + 321, 321, 321, 321, 321, 321, 321, 322, 323, 324, + 325, 326, 327, 328, 328, 329, 329, 329, 329, 329, + 329, 329, 329, 329, 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, @@ -2004,19 +2020,20 @@ static const yytype_uint16 yyr1[] = 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, - 545, 546, 547, 548, 549, 550, 551, 552, 553, 553, - 554, 554, 554, 554, 554, 554, 554, 554, 555, 556, - 557, 558, 559, 560, 561, 562, 563, 564, 564, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 566, 567, - 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, - 578, 579, 580, 581, 582, 583, 584, 585, 586, 586, - 587, 588, 589, 590, 590, 591, 592, 593, 594, 595, - 596, 597, 598, 598, 599, 599, 599, 599, 599, 599, - 599, 599, 599, 599, 600, 601, 602, 603, 604, 605, - 606, 607, 608, 609, 610, 611, 611, 612, 612, 612, - 612, 612, 612, 613, 614, 615, 616, 617, 618, 619, - 620, 621, 621, 622, 622, 623, 624 + 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, + 555, 556, 557, 558, 559, 559, 560, 560, 560, 560, + 560, 560, 560, 560, 561, 562, 563, 564, 565, 566, + 567, 568, 569, 570, 570, 571, 571, 571, 571, 571, + 571, 571, 571, 571, 571, 571, 571, 571, 571, 571, + 571, 571, 571, 571, 572, 573, 574, 575, 576, 577, + 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, + 588, 589, 590, 591, 592, 592, 593, 594, 595, 596, + 596, 597, 598, 599, 600, 601, 602, 603, 604, 604, + 605, 605, 605, 605, 605, 605, 605, 605, 605, 605, + 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, + 616, 617, 617, 618, 618, 618, 618, 618, 618, 619, + 620, 621, 622, 623, 624, 625, 626, 627, 627, 628, + 628, 629, 630 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -2044,13 +2061,13 @@ static const yytype_uint8 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, 1, 1, 2, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 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, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 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, 2, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, + 2, 2, 1, 2, 0, 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, 2, 2, 2, @@ -2062,29 +2079,30 @@ static const yytype_uint8 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, 2, 2, 2, 2, 3, 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, 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, 2, 2, 2, 2, - 2, 2, 3, 3, 2, 2, 2, 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, 3, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 3, 3, 4, 4, 4, + 3, 3, 2, 2, 2, 2, 2, 2, 3, 3, 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, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 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, 1, 2, 0, - 1, 2, 1, 2, 0, 1, 2, 2, 2, 3, - 3, 1, 2, 0, 1, 1, 1, 1, 1, 1, + 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, 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, 1, 2, 0, 1, 1, 1, 1, 1, + 1, 1, 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, 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 }; @@ -2769,23 +2787,23 @@ yyreduce: switch (yyn) { case 18: -#line 194 "util/configparser.y" +#line 195 "util/configparser.y" { OUTYY(("\nP(force-toplevel)\n")); } -#line 2777 "util/configparser.c" +#line 2795 "util/configparser.c" break; case 19: -#line 200 "util/configparser.y" +#line 201 "util/configparser.y" { OUTYY(("\nP(server:)\n")); } -#line 2785 "util/configparser.c" +#line 2803 "util/configparser.c" break; - case 224: -#line 298 "util/configparser.y" + case 227: +#line 299 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2796,11 +2814,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2800 "util/configparser.c" +#line 2818 "util/configparser.c" break; - case 234: -#line 315 "util/configparser.y" + case 237: +#line 316 "util/configparser.y" { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2811,11 +2829,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2815 "util/configparser.c" +#line 2833 "util/configparser.c" break; - case 243: -#line 332 "util/configparser.y" + case 246: +#line 333 "util/configparser.y" { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2828,11 +2846,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2832 "util/configparser.c" +#line 2850 "util/configparser.c" break; - case 253: -#line 351 "util/configparser.y" + case 256: +#line 352 "util/configparser.y" { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2848,11 +2866,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2852 "util/configparser.c" +#line 2870 "util/configparser.c" break; - case 264: -#line 375 "util/configparser.y" + case 267: +#line 376 "util/configparser.y" { uint8_t* bitlist; size_t len = 0; @@ -2869,11 +2887,11 @@ yyreduce: } } -#line 2873 "util/configparser.c" +#line 2891 "util/configparser.c" break; - case 265: -#line 394 "util/configparser.y" + case 268: +#line 395 "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 && @@ -2888,21 +2906,21 @@ yyreduce: cfg_parser->cfg->auths->rpz_action_override = (yyvsp[0].str); } } -#line 2892 "util/configparser.c" +#line 2910 "util/configparser.c" break; - case 266: -#line 411 "util/configparser.y" + case 269: +#line 412 "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 2902 "util/configparser.c" +#line 2920 "util/configparser.c" break; - case 267: -#line 419 "util/configparser.y" + case 270: +#line 420 "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) @@ -2910,21 +2928,21 @@ yyreduce: else cfg_parser->cfg->auths->rpz_log = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2914 "util/configparser.c" +#line 2932 "util/configparser.c" break; - case 268: -#line 429 "util/configparser.y" + case 271: +#line 430 "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 2924 "util/configparser.c" +#line 2942 "util/configparser.c" break; - case 269: -#line 437 "util/configparser.y" + case 272: +#line 438 "util/configparser.y" { struct config_auth* s; OUTYY(("\nP(rpz:)\n")); @@ -2940,11 +2958,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2944 "util/configparser.c" +#line 2962 "util/configparser.c" break; - case 282: -#line 460 "util/configparser.y" + case 285: +#line 461 "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) @@ -2952,11 +2970,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2956 "util/configparser.c" +#line 2974 "util/configparser.c" break; - case 283: -#line 469 "util/configparser.y" + case 286: +#line 470 "util/configparser.y" { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2964,11 +2982,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2968 "util/configparser.c" +#line 2986 "util/configparser.c" break; - case 284: -#line 478 "util/configparser.y" + case 287: +#line 479 "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) @@ -2978,11 +2996,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2982 "util/configparser.c" +#line 3000 "util/configparser.c" break; - case 285: -#line 489 "util/configparser.y" + case 288: +#line 490 "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) @@ -2990,11 +3008,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2994 "util/configparser.c" +#line 3012 "util/configparser.c" break; - case 286: -#line 498 "util/configparser.y" + case 289: +#line 499 "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) @@ -3002,11 +3020,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3006 "util/configparser.c" +#line 3024 "util/configparser.c" break; - case 287: -#line 507 "util/configparser.y" + case 290: +#line 508 "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) @@ -3014,11 +3032,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3018 "util/configparser.c" +#line 3036 "util/configparser.c" break; - case 288: -#line 516 "util/configparser.y" + case 291: +#line 517 "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) @@ -3028,11 +3046,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3032 "util/configparser.c" +#line 3050 "util/configparser.c" break; - case 289: -#line 527 "util/configparser.y" + case 292: +#line 528 "util/configparser.y" { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3040,11 +3058,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3044 "util/configparser.c" +#line 3062 "util/configparser.c" break; - case 290: -#line 536 "util/configparser.y" + case 293: +#line 537 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -3055,11 +3073,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 3059 "util/configparser.c" +#line 3077 "util/configparser.c" break; - case 291: -#line 548 "util/configparser.y" + case 294: +#line 549 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -3071,11 +3089,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 3075 "util/configparser.c" +#line 3093 "util/configparser.c" break; - case 292: -#line 562 "util/configparser.y" + case 295: +#line 563 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -3089,11 +3107,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3093 "util/configparser.c" +#line 3111 "util/configparser.c" break; - case 293: -#line 577 "util/configparser.y" + case 296: +#line 578 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -3103,11 +3121,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3107 "util/configparser.c" +#line 3125 "util/configparser.c" break; - case 294: -#line 588 "util/configparser.y" + case 297: +#line 589 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -3123,11 +3141,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3127 "util/configparser.c" +#line 3145 "util/configparser.c" break; - case 295: -#line 605 "util/configparser.y" + case 298: +#line 606 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -3143,11 +3161,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3147 "util/configparser.c" +#line 3165 "util/configparser.c" break; - case 296: -#line 622 "util/configparser.y" + case 299: +#line 623 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -3163,11 +3181,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3167 "util/configparser.c" +#line 3185 "util/configparser.c" break; - case 297: -#line 639 "util/configparser.y" + case 300: +#line 640 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -3183,11 +3201,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3187 "util/configparser.c" +#line 3205 "util/configparser.c" break; - case 298: -#line 656 "util/configparser.y" + case 301: +#line 657 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str))); @@ -3201,11 +3219,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3205 "util/configparser.c" +#line 3223 "util/configparser.c" break; - case 299: -#line 671 "util/configparser.y" + case 302: +#line 672 "util/configparser.y" { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str))); @@ -3219,11 +3237,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3223 "util/configparser.c" +#line 3241 "util/configparser.c" break; - case 300: -#line 686 "util/configparser.y" + case 303: +#line 687 "util/configparser.y" { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -3235,11 +3253,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 3239 "util/configparser.c" +#line 3257 "util/configparser.c" break; - case 301: -#line 699 "util/configparser.y" + case 304: +#line 700 "util/configparser.y" { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -3253,11 +3271,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 3257 "util/configparser.c" +#line 3275 "util/configparser.c" break; - case 302: -#line 714 "util/configparser.y" + case 305: +#line 715 "util/configparser.y" { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3265,11 +3283,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3269 "util/configparser.c" +#line 3287 "util/configparser.c" break; - case 303: -#line 723 "util/configparser.y" + case 306: +#line 724 "util/configparser.y" { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -3277,11 +3295,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3281 "util/configparser.c" +#line 3299 "util/configparser.c" break; - case 304: -#line 732 "util/configparser.y" + case 307: +#line 733 "util/configparser.y" { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -3289,11 +3307,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 3293 "util/configparser.c" +#line 3311 "util/configparser.c" break; - case 305: -#line 741 "util/configparser.y" + case 308: +#line 742 "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) @@ -3301,11 +3319,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3305 "util/configparser.c" +#line 3323 "util/configparser.c" break; - case 306: -#line 750 "util/configparser.y" + case 309: +#line 751 "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) @@ -3313,11 +3331,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3317 "util/configparser.c" +#line 3335 "util/configparser.c" break; - case 307: -#line 759 "util/configparser.y" + case 310: +#line 760 "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) @@ -3325,11 +3343,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3329 "util/configparser.c" +#line 3347 "util/configparser.c" break; - case 308: -#line 768 "util/configparser.y" + case 311: +#line 769 "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) @@ -3337,11 +3355,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3341 "util/configparser.c" +#line 3359 "util/configparser.c" break; - case 309: -#line 777 "util/configparser.y" + case 312: +#line 778 "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) @@ -3349,11 +3367,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3353 "util/configparser.c" +#line 3371 "util/configparser.c" break; - case 310: -#line 786 "util/configparser.y" + case 313: +#line 787 "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) @@ -3361,11 +3379,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3365 "util/configparser.c" +#line 3383 "util/configparser.c" break; - case 311: -#line 795 "util/configparser.y" + case 314: +#line 796 "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) @@ -3373,11 +3391,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3377 "util/configparser.c" +#line 3395 "util/configparser.c" break; - case 312: -#line 804 "util/configparser.y" + case 315: +#line 805 "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) @@ -3385,11 +3403,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3389 "util/configparser.c" +#line 3407 "util/configparser.c" break; - case 313: -#line 813 "util/configparser.y" + case 316: +#line 814 "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) @@ -3397,11 +3415,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3401 "util/configparser.c" +#line 3419 "util/configparser.c" break; - case 314: -#line 822 "util/configparser.y" + case 317: +#line 823 "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) @@ -3409,11 +3427,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3413 "util/configparser.c" +#line 3431 "util/configparser.c" break; - case 315: -#line 831 "util/configparser.y" + case 318: +#line 832 "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) @@ -3421,11 +3439,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3425 "util/configparser.c" +#line 3443 "util/configparser.c" break; - case 316: -#line 840 "util/configparser.y" + case 319: +#line 841 "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) @@ -3437,11 +3455,11 @@ yyreduce: else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3441 "util/configparser.c" +#line 3459 "util/configparser.c" break; - case 317: -#line 853 "util/configparser.y" + case 320: +#line 854 "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) @@ -3449,11 +3467,11 @@ yyreduce: else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3453 "util/configparser.c" +#line 3471 "util/configparser.c" break; - case 318: -#line 862 "util/configparser.y" + case 321: +#line 863 "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) @@ -3465,11 +3483,11 @@ yyreduce: else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3469 "util/configparser.c" +#line 3487 "util/configparser.c" break; - case 319: -#line 875 "util/configparser.y" + case 322: +#line 876 "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) @@ -3477,11 +3495,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3481 "util/configparser.c" +#line 3499 "util/configparser.c" break; - case 320: -#line 884 "util/configparser.y" + case 323: +#line 885 "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) @@ -3489,11 +3507,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3493 "util/configparser.c" +#line 3511 "util/configparser.c" break; - case 321: -#line 893 "util/configparser.y" + case 324: +#line 894 "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) @@ -3501,31 +3519,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3505 "util/configparser.c" +#line 3523 "util/configparser.c" break; - case 322: -#line 902 "util/configparser.y" + case 325: +#line 903 "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 3515 "util/configparser.c" +#line 3533 "util/configparser.c" break; - case 323: -#line 909 "util/configparser.y" + case 326: +#line 910 "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 3525 "util/configparser.c" +#line 3543 "util/configparser.c" break; - case 324: -#line 916 "util/configparser.y" + case 327: +#line 917 "util/configparser.y" { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3533,21 +3551,21 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3537 "util/configparser.c" +#line 3555 "util/configparser.c" break; - case 325: -#line 925 "util/configparser.y" + case 328: +#line 926 "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 3547 "util/configparser.c" +#line 3565 "util/configparser.c" break; - case 326: -#line 932 "util/configparser.y" + case 329: +#line 933 "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) @@ -3555,53 +3573,53 @@ yyreduce: else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3559 "util/configparser.c" +#line 3577 "util/configparser.c" break; - case 327: -#line 941 "util/configparser.y" + case 330: +#line 942 "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 3570 "util/configparser.c" +#line 3588 "util/configparser.c" break; - case 328: -#line 949 "util/configparser.y" + case 331: +#line 950 "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 3580 "util/configparser.c" +#line 3598 "util/configparser.c" break; - case 329: -#line 956 "util/configparser.y" + case 332: +#line 957 "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 3590 "util/configparser.c" +#line 3608 "util/configparser.c" break; - case 330: -#line 963 "util/configparser.y" + case 333: +#line 964 "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 3601 "util/configparser.c" +#line 3619 "util/configparser.c" break; - case 331: -#line 971 "util/configparser.y" + case 334: +#line 972 "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) @@ -3609,22 +3627,23 @@ yyreduce: else cfg_parser->cfg->tls_use_sni = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3613 "util/configparser.c" +#line 3631 "util/configparser.c" break; - case 332: -#line 980 "util/configparser.y" + case 335: +#line 981 "util/configparser.y" { OUTYY(("P(server_https_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) yyerror("port number expected"); else cfg_parser->cfg->https_port = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); } -#line 3624 "util/configparser.c" +#line 3643 "util/configparser.c" break; - case 333: -#line 987 "util/configparser.y" + case 336: +#line 989 "util/configparser.y" { OUTYY(("P(server_http_endpoint:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->http_endpoint); @@ -3640,11 +3659,11 @@ yyreduce: cfg_parser->cfg->http_endpoint = (yyvsp[0].str); } } -#line 3644 "util/configparser.c" +#line 3663 "util/configparser.c" break; - case 334: -#line 1003 "util/configparser.y" + case 337: +#line 1005 "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) @@ -3652,11 +3671,11 @@ yyreduce: else cfg_parser->cfg->http_max_streams = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3656 "util/configparser.c" +#line 3675 "util/configparser.c" break; - case 335: -#line 1011 "util/configparser.y" + case 338: +#line 1013 "util/configparser.y" { OUTYY(("P(server_http_query_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -3664,11 +3683,11 @@ yyreduce: yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3668 "util/configparser.c" +#line 3687 "util/configparser.c" break; - case 336: -#line 1019 "util/configparser.y" + case 339: +#line 1021 "util/configparser.y" { OUTYY(("P(server_http_response_buffer_size:%s)\n", (yyvsp[0].str))); if(!cfg_parse_memsize((yyvsp[0].str), @@ -3676,11 +3695,11 @@ yyreduce: yyerror("memory size expected"); free((yyvsp[0].str)); } -#line 3680 "util/configparser.c" +#line 3699 "util/configparser.c" break; - case 337: -#line 1027 "util/configparser.y" + case 340: +#line 1029 "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) @@ -3688,11 +3707,23 @@ yyreduce: else cfg_parser->cfg->http_nodelay = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3692 "util/configparser.c" +#line 3711 "util/configparser.c" break; - case 338: -#line 1035 "util/configparser.y" + case 341: +#line 1037 "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) + yyerror("expected yes or no."); + else cfg_parser->cfg->http_notls_downstream = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 3723 "util/configparser.c" + break; + + case 342: +#line 1045 "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) @@ -3700,11 +3731,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3704 "util/configparser.c" +#line 3735 "util/configparser.c" break; - case 339: -#line 1044 "util/configparser.y" + case 343: +#line 1054 "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) @@ -3712,11 +3743,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3716 "util/configparser.c" +#line 3747 "util/configparser.c" break; - case 340: -#line 1053 "util/configparser.y" + case 344: +#line 1063 "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) @@ -3729,11 +3760,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3733 "util/configparser.c" +#line 3764 "util/configparser.c" break; - case 341: -#line 1067 "util/configparser.y" + case 345: +#line 1077 "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) @@ -3741,11 +3772,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3745 "util/configparser.c" +#line 3776 "util/configparser.c" break; - case 342: -#line 1076 "util/configparser.y" + case 346: +#line 1086 "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) @@ -3753,11 +3784,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3757 "util/configparser.c" +#line 3788 "util/configparser.c" break; - case 343: -#line 1085 "util/configparser.y" + case 347: +#line 1095 "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) @@ -3765,11 +3796,11 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3769 "util/configparser.c" +#line 3800 "util/configparser.c" break; - case 344: -#line 1094 "util/configparser.y" + case 348: +#line 1104 "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) @@ -3777,11 +3808,11 @@ yyreduce: else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3781 "util/configparser.c" +#line 3812 "util/configparser.c" break; - case 345: -#line 1103 "util/configparser.y" + case 349: +#line 1113 "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) @@ -3789,11 +3820,11 @@ yyreduce: else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3793 "util/configparser.c" +#line 3824 "util/configparser.c" break; - case 346: -#line 1112 "util/configparser.y" + case 350: +#line 1122 "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) @@ -3801,31 +3832,31 @@ yyreduce: else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3805 "util/configparser.c" +#line 3836 "util/configparser.c" break; - case 347: -#line 1121 "util/configparser.y" + case 351: +#line 1131 "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 3815 "util/configparser.c" +#line 3846 "util/configparser.c" break; - case 348: -#line 1128 "util/configparser.y" + case 352: +#line 1138 "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 3825 "util/configparser.c" +#line 3856 "util/configparser.c" break; - case 349: -#line 1135 "util/configparser.y" + case 353: +#line 1145 "util/configparser.y" { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3850,105 +3881,105 @@ yyreduce: } } } -#line 3854 "util/configparser.c" +#line 3885 "util/configparser.c" break; - case 350: -#line 1161 "util/configparser.y" + case 354: +#line 1171 "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 3865 "util/configparser.c" +#line 3896 "util/configparser.c" break; - case 351: -#line 1169 "util/configparser.y" + case 355: +#line 1179 "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 3875 "util/configparser.c" +#line 3906 "util/configparser.c" break; - case 352: -#line 1176 "util/configparser.y" + case 356: +#line 1186 "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 3885 "util/configparser.c" +#line 3916 "util/configparser.c" break; - case 353: -#line 1183 "util/configparser.y" + case 357: +#line 1193 "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 3895 "util/configparser.c" +#line 3926 "util/configparser.c" break; - case 354: -#line 1190 "util/configparser.y" + case 358: +#line 1200 "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 3905 "util/configparser.c" +#line 3936 "util/configparser.c" break; - case 355: -#line 1197 "util/configparser.y" + case 359: +#line 1207 "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 3916 "util/configparser.c" +#line 3947 "util/configparser.c" break; - case 356: -#line 1205 "util/configparser.y" + case 360: +#line 1215 "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 3927 "util/configparser.c" +#line 3958 "util/configparser.c" break; - case 357: -#line 1213 "util/configparser.y" + case 361: +#line 1223 "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 3938 "util/configparser.c" +#line 3969 "util/configparser.c" break; - case 358: -#line 1221 "util/configparser.y" + case 362: +#line 1231 "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 3948 "util/configparser.c" +#line 3979 "util/configparser.c" break; - case 359: -#line 1228 "util/configparser.y" + case 363: +#line 1238 "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) @@ -3958,11 +3989,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3962 "util/configparser.c" +#line 3993 "util/configparser.c" break; - case 360: -#line 1239 "util/configparser.y" + case 364: +#line 1249 "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) @@ -3972,21 +4003,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3976 "util/configparser.c" +#line 4007 "util/configparser.c" break; - case 361: -#line 1250 "util/configparser.y" + case 365: +#line 1260 "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 3986 "util/configparser.c" +#line 4017 "util/configparser.c" break; - case 362: -#line 1257 "util/configparser.y" + case 366: +#line 1267 "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) @@ -3994,11 +4025,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3998 "util/configparser.c" +#line 4029 "util/configparser.c" break; - case 363: -#line 1266 "util/configparser.y" + case 367: +#line 1276 "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) @@ -4006,11 +4037,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4010 "util/configparser.c" +#line 4041 "util/configparser.c" break; - case 364: -#line 1275 "util/configparser.y" + case 368: +#line 1285 "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) @@ -4018,53 +4049,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4022 "util/configparser.c" +#line 4053 "util/configparser.c" break; - case 365: -#line 1284 "util/configparser.y" + case 369: +#line 1294 "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 4032 "util/configparser.c" +#line 4063 "util/configparser.c" break; - case 366: -#line 1291 "util/configparser.y" + case 370: +#line 1301 "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 4042 "util/configparser.c" +#line 4073 "util/configparser.c" break; - case 367: -#line 1298 "util/configparser.y" + case 371: +#line 1308 "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 4053 "util/configparser.c" +#line 4084 "util/configparser.c" break; - case 368: -#line 1306 "util/configparser.y" + case 372: +#line 1316 "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 4064 "util/configparser.c" +#line 4095 "util/configparser.c" break; - case 369: -#line 1314 "util/configparser.y" + case 373: +#line 1324 "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) @@ -4073,11 +4104,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4077 "util/configparser.c" +#line 4108 "util/configparser.c" break; - case 370: -#line 1324 "util/configparser.y" + case 374: +#line 1334 "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) @@ -4086,11 +4117,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4090 "util/configparser.c" +#line 4121 "util/configparser.c" break; - case 371: -#line 1334 "util/configparser.y" + case 375: +#line 1344 "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) @@ -4099,11 +4130,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4103 "util/configparser.c" +#line 4134 "util/configparser.c" break; - case 372: -#line 1344 "util/configparser.y" + case 376: +#line 1354 "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) @@ -4116,22 +4147,22 @@ yyreduce: cfg_parser->cfg->ip_dscp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4120 "util/configparser.c" +#line 4151 "util/configparser.c" break; - case 373: -#line 1358 "util/configparser.y" + case 377: +#line 1368 "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 4131 "util/configparser.c" +#line 4162 "util/configparser.c" break; - case 374: -#line 1366 "util/configparser.y" + case 378: +#line 1376 "util/configparser.y" { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4143,11 +4174,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4147 "util/configparser.c" +#line 4178 "util/configparser.c" break; - case 375: -#line 1379 "util/configparser.y" + case 379: +#line 1389 "util/configparser.y" { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4157,22 +4188,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4161 "util/configparser.c" +#line 4192 "util/configparser.c" break; - case 376: -#line 1390 "util/configparser.y" + case 380: +#line 1400 "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 4172 "util/configparser.c" +#line 4203 "util/configparser.c" break; - case 377: -#line 1398 "util/configparser.y" + case 381: +#line 1408 "util/configparser.y" { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4184,11 +4215,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4188 "util/configparser.c" +#line 4219 "util/configparser.c" break; - case 378: -#line 1411 "util/configparser.y" + case 382: +#line 1421 "util/configparser.y" { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4196,11 +4227,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4200 "util/configparser.c" +#line 4231 "util/configparser.c" break; - case 379: -#line 1420 "util/configparser.y" + case 383: +#line 1430 "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) @@ -4208,11 +4239,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4212 "util/configparser.c" +#line 4243 "util/configparser.c" break; - case 380: -#line 1429 "util/configparser.y" + case 384: +#line 1439 "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) @@ -4220,11 +4251,23 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4224 "util/configparser.c" +#line 4255 "util/configparser.c" break; - case 381: -#line 1438 "util/configparser.y" + case 385: +#line 1448 "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) + yyerror("expected yes or no."); + else cfg_parser->cfg->udp_connect = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4267 "util/configparser.c" + break; + + case 386: +#line 1457 "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) @@ -4233,11 +4276,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4237 "util/configparser.c" +#line 4280 "util/configparser.c" break; - case 382: -#line 1448 "util/configparser.y" + case 387: +#line 1467 "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) @@ -4246,22 +4289,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4250 "util/configparser.c" +#line 4293 "util/configparser.c" break; - case 383: -#line 1458 "util/configparser.y" + case 388: +#line 1477 "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 4261 "util/configparser.c" +#line 4304 "util/configparser.c" break; - case 384: -#line 1466 "util/configparser.y" + case 389: +#line 1485 "util/configparser.y" { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4273,11 +4316,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4277 "util/configparser.c" +#line 4320 "util/configparser.c" break; - case 385: -#line 1479 "util/configparser.y" + case 390: +#line 1498 "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) @@ -4285,22 +4328,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4289 "util/configparser.c" +#line 4332 "util/configparser.c" break; - case 386: -#line 1488 "util/configparser.y" + case 391: +#line 1507 "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 4300 "util/configparser.c" +#line 4343 "util/configparser.c" break; - case 387: -#line 1496 "util/configparser.y" + case 392: +#line 1515 "util/configparser.y" { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4308,22 +4351,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4312 "util/configparser.c" +#line 4355 "util/configparser.c" break; - case 388: -#line 1505 "util/configparser.y" + case 393: +#line 1524 "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 4323 "util/configparser.c" +#line 4366 "util/configparser.c" break; - case 389: -#line 1513 "util/configparser.y" + case 394: +#line 1532 "util/configparser.y" { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4335,11 +4378,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4339 "util/configparser.c" +#line 4382 "util/configparser.c" break; - case 390: -#line 1526 "util/configparser.y" + case 395: +#line 1545 "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) @@ -4347,21 +4390,34 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4351 "util/configparser.c" +#line 4394 "util/configparser.c" break; - case 391: -#line 1535 "util/configparser.y" + case 396: +#line 1554 "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) + yyerror("expected yes or no."); + else cfg_parser->cfg->infra_keep_probing = + (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 4407 "util/configparser.c" + break; + + case 397: +#line 1564 "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 4361 "util/configparser.c" +#line 4417 "util/configparser.c" break; - case 392: -#line 1542 "util/configparser.y" + case 398: +#line 1571 "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) @@ -4370,11 +4426,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4374 "util/configparser.c" +#line 4430 "util/configparser.c" break; - case 393: -#line 1552 "util/configparser.y" + case 399: +#line 1581 "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) @@ -4383,11 +4439,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4387 "util/configparser.c" +#line 4443 "util/configparser.c" break; - case 394: -#line 1562 "util/configparser.y" + case 400: +#line 1591 "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) @@ -4396,11 +4452,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4400 "util/configparser.c" +#line 4456 "util/configparser.c" break; - case 395: -#line 1572 "util/configparser.y" + case 401: +#line 1601 "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) @@ -4409,11 +4465,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4413 "util/configparser.c" +#line 4469 "util/configparser.c" break; - case 396: -#line 1582 "util/configparser.y" + case 402: +#line 1611 "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) @@ -4422,11 +4478,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4426 "util/configparser.c" +#line 4482 "util/configparser.c" break; - case 397: -#line 1592 "util/configparser.y" + case 403: +#line 1621 "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) @@ -4435,11 +4491,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4439 "util/configparser.c" +#line 4495 "util/configparser.c" break; - case 398: -#line 1602 "util/configparser.y" + case 404: +#line 1631 "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) @@ -4448,11 +4504,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4452 "util/configparser.c" +#line 4508 "util/configparser.c" break; - case 399: -#line 1612 "util/configparser.y" + case 405: +#line 1641 "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) @@ -4461,41 +4517,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4465 "util/configparser.c" +#line 4521 "util/configparser.c" break; - case 400: -#line 1622 "util/configparser.y" + case 406: +#line 1651 "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 4475 "util/configparser.c" +#line 4531 "util/configparser.c" break; - case 401: -#line 1629 "util/configparser.y" + case 407: +#line 1658 "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 4485 "util/configparser.c" +#line 4541 "util/configparser.c" break; - case 402: -#line 1636 "util/configparser.y" + case 408: +#line 1665 "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 4495 "util/configparser.c" +#line 4551 "util/configparser.c" break; - case 403: -#line 1643 "util/configparser.y" + case 409: +#line 1672 "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) @@ -4503,11 +4559,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4507 "util/configparser.c" +#line 4563 "util/configparser.c" break; - case 404: -#line 1652 "util/configparser.y" + case 410: +#line 1681 "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) @@ -4515,11 +4571,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4519 "util/configparser.c" +#line 4575 "util/configparser.c" break; - case 405: -#line 1661 "util/configparser.y" + case 411: +#line 1690 "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) @@ -4527,11 +4583,11 @@ yyreduce: else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4531 "util/configparser.c" +#line 4587 "util/configparser.c" break; - case 406: -#line 1670 "util/configparser.y" + case 412: +#line 1699 "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) @@ -4539,21 +4595,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4543 "util/configparser.c" +#line 4599 "util/configparser.c" break; - case 407: -#line 1679 "util/configparser.y" + case 413: +#line 1708 "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 4553 "util/configparser.c" +#line 4609 "util/configparser.c" break; - case 408: -#line 1686 "util/configparser.y" + case 414: +#line 1715 "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) @@ -4562,11 +4618,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4566 "util/configparser.c" +#line 4622 "util/configparser.c" break; - case 409: -#line 1696 "util/configparser.y" + case 415: +#line 1725 "util/configparser.y" { OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 && @@ -4585,21 +4641,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 4589 "util/configparser.c" +#line 4645 "util/configparser.c" break; - case 410: -#line 1716 "util/configparser.y" + case 416: +#line 1745 "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 4599 "util/configparser.c" +#line 4655 "util/configparser.c" break; - case 411: -#line 1723 "util/configparser.y" + case 417: +#line 1752 "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) { @@ -4616,11 +4672,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4620 "util/configparser.c" +#line 4676 "util/configparser.c" break; - case 412: -#line 1741 "util/configparser.y" + case 418: +#line 1770 "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) { @@ -4632,11 +4688,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4636 "util/configparser.c" +#line 4692 "util/configparser.c" break; - case 413: -#line 1754 "util/configparser.y" + case 419: +#line 1783 "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) { @@ -4648,11 +4704,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4652 "util/configparser.c" +#line 4708 "util/configparser.c" break; - case 414: -#line 1767 "util/configparser.y" + case 420: +#line 1796 "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) @@ -4660,11 +4716,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4664 "util/configparser.c" +#line 4720 "util/configparser.c" break; - case 415: -#line 1776 "util/configparser.y" + case 421: +#line 1805 "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) @@ -4672,11 +4728,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4676 "util/configparser.c" +#line 4732 "util/configparser.c" break; - case 416: -#line 1785 "util/configparser.y" + case 422: +#line 1814 "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) @@ -4684,11 +4740,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4688 "util/configparser.c" +#line 4744 "util/configparser.c" break; - case 417: -#line 1794 "util/configparser.y" + case 423: +#line 1823 "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) @@ -4696,11 +4752,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4700 "util/configparser.c" +#line 4756 "util/configparser.c" break; - case 418: -#line 1803 "util/configparser.y" + case 424: +#line 1832 "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) @@ -4709,11 +4765,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4713 "util/configparser.c" +#line 4769 "util/configparser.c" break; - case 419: -#line 1813 "util/configparser.y" + case 425: +#line 1842 "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) @@ -4722,11 +4778,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4726 "util/configparser.c" +#line 4782 "util/configparser.c" break; - case 420: -#line 1823 "util/configparser.y" + case 426: +#line 1852 "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) @@ -4736,11 +4792,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4740 "util/configparser.c" +#line 4796 "util/configparser.c" break; - case 421: -#line 1834 "util/configparser.y" + case 427: +#line 1863 "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) @@ -4748,11 +4804,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4752 "util/configparser.c" +#line 4808 "util/configparser.c" break; - case 422: -#line 1843 "util/configparser.y" + case 428: +#line 1872 "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) @@ -4760,11 +4816,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4764 "util/configparser.c" +#line 4820 "util/configparser.c" break; - case 423: -#line 1852 "util/configparser.y" + case 429: +#line 1881 "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) @@ -4772,11 +4828,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4776 "util/configparser.c" +#line 4832 "util/configparser.c" break; - case 424: -#line 1861 "util/configparser.y" + case 430: +#line 1890 "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) @@ -4784,11 +4840,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4788 "util/configparser.c" +#line 4844 "util/configparser.c" break; - case 425: -#line 1870 "util/configparser.y" + case 431: +#line 1899 "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) @@ -4796,11 +4852,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_reply_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4800 "util/configparser.c" +#line 4856 "util/configparser.c" break; - case 426: -#line 1879 "util/configparser.y" + case 432: +#line 1908 "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) @@ -4808,11 +4864,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_client_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4812 "util/configparser.c" +#line 4868 "util/configparser.c" break; - case 427: -#line 1888 "util/configparser.y" + case 433: +#line 1917 "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) @@ -4824,11 +4880,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4828 "util/configparser.c" +#line 4884 "util/configparser.c" break; - case 428: -#line 1901 "util/configparser.y" + case 434: +#line 1930 "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) @@ -4840,11 +4896,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4844 "util/configparser.c" +#line 4900 "util/configparser.c" break; - case 429: -#line 1914 "util/configparser.y" + case 435: +#line 1943 "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) @@ -4852,21 +4908,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4856 "util/configparser.c" +#line 4912 "util/configparser.c" break; - case 430: -#line 1923 "util/configparser.y" + case 436: +#line 1952 "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 4866 "util/configparser.c" +#line 4922 "util/configparser.c" break; - case 431: -#line 1930 "util/configparser.y" + case 437: +#line 1959 "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) @@ -4874,11 +4930,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4878 "util/configparser.c" +#line 4934 "util/configparser.c" break; - case 432: -#line 1939 "util/configparser.y" + case 438: +#line 1968 "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) @@ -4886,11 +4942,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4890 "util/configparser.c" +#line 4946 "util/configparser.c" break; - case 433: -#line 1948 "util/configparser.y" + case 439: +#line 1977 "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) @@ -4898,11 +4954,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4902 "util/configparser.c" +#line 4958 "util/configparser.c" break; - case 434: -#line 1957 "util/configparser.y" + case 440: +#line 1986 "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) @@ -4911,22 +4967,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4915 "util/configparser.c" +#line 4971 "util/configparser.c" break; - case 435: -#line 1966 "util/configparser.y" + case 441: +#line 1995 "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 4926 "util/configparser.c" +#line 4982 "util/configparser.c" break; - case 436: -#line 1974 "util/configparser.y" + case 442: +#line 2003 "util/configparser.y" { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4938,22 +4994,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4942 "util/configparser.c" +#line 4998 "util/configparser.c" break; - case 437: -#line 1987 "util/configparser.y" + case 443: +#line 2016 "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 4953 "util/configparser.c" +#line 5009 "util/configparser.c" break; - case 438: -#line 1995 "util/configparser.y" + case 444: +#line 2024 "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 && @@ -4993,21 +5049,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4997 "util/configparser.c" +#line 5053 "util/configparser.c" break; - case 439: -#line 2036 "util/configparser.y" + case 445: +#line 2065 "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 5007 "util/configparser.c" +#line 5063 "util/configparser.c" break; - case 440: -#line 2043 "util/configparser.y" + case 446: +#line 2072 "util/configparser.y" { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5021,11 +5077,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5025 "util/configparser.c" +#line 5081 "util/configparser.c" break; - case 441: -#line 2058 "util/configparser.y" + case 447: +#line 2087 "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) @@ -5034,11 +5090,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5038 "util/configparser.c" +#line 5094 "util/configparser.c" break; - case 442: -#line 2068 "util/configparser.y" + case 448: +#line 2097 "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) @@ -5047,41 +5103,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5051 "util/configparser.c" +#line 5107 "util/configparser.c" break; - case 443: -#line 2078 "util/configparser.y" + case 449: +#line 2107 "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 5061 "util/configparser.c" +#line 5117 "util/configparser.c" break; - case 444: -#line 2085 "util/configparser.y" + case 450: +#line 2114 "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 5071 "util/configparser.c" +#line 5127 "util/configparser.c" break; - case 445: -#line 2092 "util/configparser.y" + case 451: +#line 2121 "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 5081 "util/configparser.c" +#line 5137 "util/configparser.c" break; - case 446: -#line 2099 "util/configparser.y" + case 452: +#line 2128 "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) @@ -5089,22 +5145,22 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5093 "util/configparser.c" +#line 5149 "util/configparser.c" break; - case 447: -#line 2108 "util/configparser.y" + case 453: +#line 2137 "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 5104 "util/configparser.c" +#line 5160 "util/configparser.c" break; - case 448: -#line 2116 "util/configparser.y" + case 454: +#line 2145 "util/configparser.y" { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -5117,11 +5173,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5121 "util/configparser.c" +#line 5177 "util/configparser.c" break; - case 449: -#line 2130 "util/configparser.y" + case 455: +#line 2159 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5141,11 +5197,11 @@ yyreduce: } } } -#line 5145 "util/configparser.c" +#line 5201 "util/configparser.c" break; - case 450: -#line 2151 "util/configparser.y" + case 456: +#line 2180 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5165,11 +5221,11 @@ yyreduce: } } } -#line 5169 "util/configparser.c" +#line 5225 "util/configparser.c" break; - case 451: -#line 2172 "util/configparser.y" + case 457: +#line 2201 "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, @@ -5180,11 +5236,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5184 "util/configparser.c" +#line 5240 "util/configparser.c" break; - case 452: -#line 2184 "util/configparser.y" + case 458: +#line 2213 "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, @@ -5195,11 +5251,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5199 "util/configparser.c" +#line 5255 "util/configparser.c" break; - case 453: -#line 2196 "util/configparser.y" + case 459: +#line 2225 "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, @@ -5210,11 +5266,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 5214 "util/configparser.c" +#line 5270 "util/configparser.c" break; - case 454: -#line 2208 "util/configparser.y" + case 460: +#line 2237 "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, @@ -5222,11 +5278,11 @@ yyreduce: yyerror("out of memory"); } } -#line 5226 "util/configparser.c" +#line 5282 "util/configparser.c" break; - case 455: -#line 2217 "util/configparser.y" + case 461: +#line 2246 "util/configparser.y" { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -5246,11 +5302,11 @@ yyreduce: } } } -#line 5250 "util/configparser.c" +#line 5306 "util/configparser.c" break; - case 456: -#line 2238 "util/configparser.y" + case 462: +#line 2267 "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) @@ -5258,11 +5314,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5262 "util/configparser.c" +#line 5318 "util/configparser.c" break; - case 457: -#line 2248 "util/configparser.y" + case 463: +#line 2277 "util/configparser.y" { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -5270,33 +5326,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5274 "util/configparser.c" +#line 5330 "util/configparser.c" break; - case 458: -#line 2257 "util/configparser.y" + case 464: +#line 2286 "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 5285 "util/configparser.c" +#line 5341 "util/configparser.c" break; - case 459: -#line 2265 "util/configparser.y" + case 465: +#line 2294 "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 5296 "util/configparser.c" +#line 5352 "util/configparser.c" break; - case 460: -#line 2273 "util/configparser.y" + case 466: +#line 2302 "util/configparser.y" { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5308,11 +5364,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5312 "util/configparser.c" +#line 5368 "util/configparser.c" break; - case 461: -#line 2286 "util/configparser.y" + case 467: +#line 2315 "util/configparser.y" { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5324,11 +5380,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5328 "util/configparser.c" +#line 5384 "util/configparser.c" break; - case 462: -#line 2299 "util/configparser.y" + case 468: +#line 2328 "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) { @@ -5342,11 +5398,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 5346 "util/configparser.c" +#line 5402 "util/configparser.c" break; - case 463: -#line 2314 "util/configparser.y" + case 469: +#line 2343 "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) { @@ -5360,11 +5416,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 5364 "util/configparser.c" +#line 5420 "util/configparser.c" break; - case 464: -#line 2329 "util/configparser.y" + case 470: +#line 2358 "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) @@ -5372,11 +5428,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5376 "util/configparser.c" +#line 5432 "util/configparser.c" break; - case 465: -#line 2338 "util/configparser.y" + case 471: +#line 2367 "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) @@ -5384,20 +5440,20 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5388 "util/configparser.c" +#line 5444 "util/configparser.c" break; - case 466: -#line 2347 "util/configparser.y" + case 472: +#line 2376 "util/configparser.y" { OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n")); free((yyvsp[0].str)); } -#line 5397 "util/configparser.c" +#line 5453 "util/configparser.c" break; - case 467: -#line 2353 "util/configparser.y" + case 473: +#line 2382 "util/configparser.y" { OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) <= 0) @@ -5405,11 +5461,11 @@ yyreduce: else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5409 "util/configparser.c" +#line 5465 "util/configparser.c" break; - case 468: -#line 2362 "util/configparser.y" + case 474: +#line 2391 "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) @@ -5417,11 +5473,11 @@ yyreduce: else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5421 "util/configparser.c" +#line 5477 "util/configparser.c" break; - case 469: -#line 2371 "util/configparser.y" + case 475: +#line 2400 "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) @@ -5430,11 +5486,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5434 "util/configparser.c" +#line 5490 "util/configparser.c" break; - case 470: -#line 2381 "util/configparser.y" + case 476: +#line 2410 "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) @@ -5443,11 +5499,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5447 "util/configparser.c" +#line 5503 "util/configparser.c" break; - case 471: -#line 2391 "util/configparser.y" + case 477: +#line 2420 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -5459,11 +5515,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5463 "util/configparser.c" +#line 5519 "util/configparser.c" break; - case 472: -#line 2404 "util/configparser.y" + case 478: +#line 2433 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -5475,11 +5531,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5479 "util/configparser.c" +#line 5535 "util/configparser.c" break; - case 473: -#line 2417 "util/configparser.y" + case 479: +#line 2446 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -5490,11 +5546,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5494 "util/configparser.c" +#line 5550 "util/configparser.c" break; - case 474: -#line 2429 "util/configparser.y" + case 480: +#line 2458 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -5507,11 +5563,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5511 "util/configparser.c" +#line 5567 "util/configparser.c" break; - case 475: -#line 2443 "util/configparser.y" + case 481: +#line 2472 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -5522,11 +5578,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5526 "util/configparser.c" +#line 5582 "util/configparser.c" break; - case 476: -#line 2455 "util/configparser.y" + case 482: +#line 2484 "util/configparser.y" { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -5539,43 +5595,38 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5543 "util/configparser.c" +#line 5599 "util/configparser.c" break; - case 477: -#line 2469 "util/configparser.y" - { - int tag_data; - OUTYY(("P(server_edns_client_tag:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); - tag_data = atoi((yyvsp[0].str)); - if(tag_data > 65535 || tag_data < 0 || - (tag_data == 0 && (strlen((yyvsp[0].str)) != 1 || (yyvsp[0].str)[0] != '0'))) - yyerror("edns-client-tag data invalid, needs to be a " - "number from 0 to 65535"); + case 483: +#line 2498 "util/configparser.y" + { + OUTYY(("P(server_edns_client_string:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert( - &cfg_parser->cfg->edns_client_tags, (yyvsp[-1].str), (yyvsp[0].str))) + &cfg_parser->cfg->edns_client_strings, (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding " - "edns-client-tag"); + "edns-client-string"); } -#line 5561 "util/configparser.c" +#line 5611 "util/configparser.c" break; - case 478: -#line 2484 "util/configparser.y" + case 484: +#line 2507 "util/configparser.y" { - OUTYY(("P(edns_client_tag_opcode:%s)\n", (yyvsp[0].str))); + OUTYY(("P(edns_client_string_opcode:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) yyerror("option code expected"); else if(atoi((yyvsp[0].str)) > 65535 || atoi((yyvsp[0].str)) < 0) yyerror("option code must be in interval [0, 65535]"); - else cfg_parser->cfg->edns_client_tag_opcode = atoi((yyvsp[0].str)); + else cfg_parser->cfg->edns_client_string_opcode = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); } -#line 5575 "util/configparser.c" +#line 5626 "util/configparser.c" break; - case 479: -#line 2495 "util/configparser.y" + case 485: +#line 2519 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -5584,31 +5635,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 5588 "util/configparser.c" +#line 5639 "util/configparser.c" break; - case 480: -#line 2505 "util/configparser.y" + case 486: +#line 2529 "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 5598 "util/configparser.c" +#line 5649 "util/configparser.c" break; - case 481: -#line 2512 "util/configparser.y" + case 487: +#line 2536 "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 5608 "util/configparser.c" +#line 5659 "util/configparser.c" break; - case 482: -#line 2519 "util/configparser.y" + case 488: +#line 2543 "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) @@ -5616,11 +5667,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5620 "util/configparser.c" +#line 5671 "util/configparser.c" break; - case 483: -#line 2528 "util/configparser.y" + case 489: +#line 2552 "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) @@ -5628,11 +5679,11 @@ yyreduce: else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5632 "util/configparser.c" +#line 5683 "util/configparser.c" break; - case 484: -#line 2537 "util/configparser.y" + case 490: +#line 2561 "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) @@ -5641,11 +5692,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5645 "util/configparser.c" +#line 5696 "util/configparser.c" break; - case 485: -#line 2547 "util/configparser.y" + case 491: +#line 2571 "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) @@ -5654,11 +5705,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5658 "util/configparser.c" +#line 5709 "util/configparser.c" break; - case 486: -#line 2557 "util/configparser.y" + case 492: +#line 2581 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -5667,31 +5718,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 5671 "util/configparser.c" +#line 5722 "util/configparser.c" break; - case 487: -#line 2567 "util/configparser.y" + case 493: +#line 2591 "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 5681 "util/configparser.c" +#line 5732 "util/configparser.c" break; - case 488: -#line 2574 "util/configparser.y" + case 494: +#line 2598 "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 5691 "util/configparser.c" +#line 5742 "util/configparser.c" break; - case 489: -#line 2581 "util/configparser.y" + case 495: +#line 2605 "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) @@ -5699,11 +5750,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5703 "util/configparser.c" +#line 5754 "util/configparser.c" break; - case 490: -#line 2590 "util/configparser.y" + case 496: +#line 2614 "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) @@ -5711,11 +5762,11 @@ yyreduce: else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5715 "util/configparser.c" +#line 5766 "util/configparser.c" break; - case 491: -#line 2599 "util/configparser.y" + case 497: +#line 2623 "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) @@ -5724,11 +5775,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5728 "util/configparser.c" +#line 5779 "util/configparser.c" break; - case 492: -#line 2609 "util/configparser.y" + case 498: +#line 2633 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -5737,52 +5788,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 5741 "util/configparser.c" +#line 5792 "util/configparser.c" break; - case 493: -#line 2619 "util/configparser.y" + case 499: +#line 2643 "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 5751 "util/configparser.c" +#line 5802 "util/configparser.c" break; - case 494: -#line 2626 "util/configparser.y" + case 500: +#line 2650 "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 5761 "util/configparser.c" +#line 5812 "util/configparser.c" break; - case 495: -#line 2633 "util/configparser.y" + case 501: +#line 2657 "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 5771 "util/configparser.c" +#line 5822 "util/configparser.c" break; - case 496: -#line 2640 "util/configparser.y" + case 502: +#line 2664 "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 5782 "util/configparser.c" +#line 5833 "util/configparser.c" break; - case 497: -#line 2648 "util/configparser.y" + case 503: +#line 2672 "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) @@ -5791,11 +5842,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5795 "util/configparser.c" +#line 5846 "util/configparser.c" break; - case 498: -#line 2658 "util/configparser.y" + case 504: +#line 2682 "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) @@ -5804,11 +5855,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5808 "util/configparser.c" +#line 5859 "util/configparser.c" break; - case 499: -#line 2668 "util/configparser.y" + case 505: +#line 2692 "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) @@ -5817,11 +5868,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5821 "util/configparser.c" +#line 5872 "util/configparser.c" break; - case 500: -#line 2678 "util/configparser.y" + case 506: +#line 2702 "util/configparser.y" { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -5830,11 +5881,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 5834 "util/configparser.c" +#line 5885 "util/configparser.c" break; - case 501: -#line 2688 "util/configparser.y" + case 507: +#line 2712 "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 && @@ -5872,11 +5923,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5876 "util/configparser.c" +#line 5927 "util/configparser.c" break; - case 502: -#line 2727 "util/configparser.y" + case 508: +#line 2751 "util/configparser.y" { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5885,33 +5936,33 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 5889 "util/configparser.c" +#line 5940 "util/configparser.c" break; - case 503: -#line 2737 "util/configparser.y" + case 509: +#line 2761 "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 5900 "util/configparser.c" +#line 5951 "util/configparser.c" break; - case 504: -#line 2745 "util/configparser.y" + case 510: +#line 2769 "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 5911 "util/configparser.c" +#line 5962 "util/configparser.c" break; - case 505: -#line 2753 "util/configparser.y" + case 511: +#line 2777 "util/configparser.y" { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5925,11 +5976,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5929 "util/configparser.c" +#line 5980 "util/configparser.c" break; - case 506: -#line 2768 "util/configparser.y" + case 512: +#line 2792 "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) @@ -5937,19 +5988,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5941 "util/configparser.c" +#line 5992 "util/configparser.c" break; - case 507: -#line 2777 "util/configparser.y" + case 513: +#line 2801 "util/configparser.y" { OUTYY(("\nP(remote-control:)\n")); } -#line 5949 "util/configparser.c" +#line 6000 "util/configparser.c" break; - case 518: -#line 2788 "util/configparser.y" + case 524: +#line 2812 "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) @@ -5958,11 +6009,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5962 "util/configparser.c" +#line 6013 "util/configparser.c" break; - case 519: -#line 2798 "util/configparser.y" + case 525: +#line 2822 "util/configparser.y" { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5970,79 +6021,79 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5974 "util/configparser.c" +#line 6025 "util/configparser.c" break; - case 520: -#line 2807 "util/configparser.y" + case 526: +#line 2831 "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 5984 "util/configparser.c" +#line 6035 "util/configparser.c" break; - case 521: -#line 2814 "util/configparser.y" + case 527: +#line 2838 "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 5994 "util/configparser.c" +#line 6045 "util/configparser.c" break; - case 522: -#line 2821 "util/configparser.y" + case 528: +#line 2845 "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 6004 "util/configparser.c" +#line 6055 "util/configparser.c" break; - case 523: -#line 2828 "util/configparser.y" + case 529: +#line 2852 "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 6014 "util/configparser.c" +#line 6065 "util/configparser.c" break; - case 524: -#line 2835 "util/configparser.y" + case 530: +#line 2859 "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 6024 "util/configparser.c" +#line 6075 "util/configparser.c" break; - case 525: -#line 2842 "util/configparser.y" + case 531: +#line 2866 "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 6034 "util/configparser.c" +#line 6085 "util/configparser.c" break; - case 526: -#line 2849 "util/configparser.y" + case 532: +#line 2873 "util/configparser.y" { OUTYY(("\nP(dnstap:)\n")); } -#line 6042 "util/configparser.c" +#line 6093 "util/configparser.c" break; - case 548: -#line 2869 "util/configparser.y" + case 554: +#line 2893 "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) @@ -6050,11 +6101,11 @@ yyreduce: else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6054 "util/configparser.c" +#line 6105 "util/configparser.c" break; - case 549: -#line 2878 "util/configparser.y" + case 555: +#line 2902 "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) @@ -6063,31 +6114,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6067 "util/configparser.c" +#line 6118 "util/configparser.c" break; - case 550: -#line 2888 "util/configparser.y" + case 556: +#line 2912 "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 6077 "util/configparser.c" +#line 6128 "util/configparser.c" break; - case 551: -#line 2895 "util/configparser.y" + case 557: +#line 2919 "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 6087 "util/configparser.c" +#line 6138 "util/configparser.c" break; - case 552: -#line 2902 "util/configparser.y" + case 558: +#line 2926 "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) @@ -6095,51 +6146,51 @@ yyreduce: else cfg_parser->cfg->dnstap_tls = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6099 "util/configparser.c" +#line 6150 "util/configparser.c" break; - case 553: -#line 2911 "util/configparser.y" + case 559: +#line 2935 "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 6109 "util/configparser.c" +#line 6160 "util/configparser.c" break; - case 554: -#line 2918 "util/configparser.y" + case 560: +#line 2942 "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 6119 "util/configparser.c" +#line 6170 "util/configparser.c" break; - case 555: -#line 2925 "util/configparser.y" + case 561: +#line 2949 "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 6129 "util/configparser.c" +#line 6180 "util/configparser.c" break; - case 556: -#line 2932 "util/configparser.y" + case 562: +#line 2956 "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 6139 "util/configparser.c" +#line 6190 "util/configparser.c" break; - case 557: -#line 2939 "util/configparser.y" + case 563: +#line 2963 "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) @@ -6147,11 +6198,11 @@ yyreduce: else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6151 "util/configparser.c" +#line 6202 "util/configparser.c" break; - case 558: -#line 2948 "util/configparser.y" + case 564: +#line 2972 "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) @@ -6159,31 +6210,31 @@ yyreduce: else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6163 "util/configparser.c" +#line 6214 "util/configparser.c" break; - case 559: -#line 2957 "util/configparser.y" + case 565: +#line 2981 "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 6173 "util/configparser.c" +#line 6224 "util/configparser.c" break; - case 560: -#line 2964 "util/configparser.y" + case 566: +#line 2988 "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 6183 "util/configparser.c" +#line 6234 "util/configparser.c" break; - case 561: -#line 2971 "util/configparser.y" + case 567: +#line 2995 "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) @@ -6192,11 +6243,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6196 "util/configparser.c" +#line 6247 "util/configparser.c" break; - case 562: -#line 2981 "util/configparser.y" + case 568: +#line 3005 "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) @@ -6205,11 +6256,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6209 "util/configparser.c" +#line 6260 "util/configparser.c" break; - case 563: -#line 2991 "util/configparser.y" + case 569: +#line 3015 "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) @@ -6218,11 +6269,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6222 "util/configparser.c" +#line 6273 "util/configparser.c" break; - case 564: -#line 3001 "util/configparser.y" + case 570: +#line 3025 "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) @@ -6231,11 +6282,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6235 "util/configparser.c" +#line 6286 "util/configparser.c" break; - case 565: -#line 3011 "util/configparser.y" + case 571: +#line 3035 "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) @@ -6244,11 +6295,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6248 "util/configparser.c" +#line 6299 "util/configparser.c" break; - case 566: -#line 3021 "util/configparser.y" + case 572: +#line 3045 "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) @@ -6257,47 +6308,47 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6261 "util/configparser.c" +#line 6312 "util/configparser.c" break; - case 567: -#line 3031 "util/configparser.y" + case 573: +#line 3055 "util/configparser.y" { OUTYY(("\nP(python:)\n")); } -#line 6269 "util/configparser.c" +#line 6320 "util/configparser.c" break; - case 571: -#line 3040 "util/configparser.y" + case 577: +#line 3064 "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 6279 "util/configparser.c" +#line 6330 "util/configparser.c" break; - case 572: -#line 3046 "util/configparser.y" + case 578: +#line 3070 "util/configparser.y" { OUTYY(("\nP(dynlib:)\n")); } -#line 6287 "util/configparser.c" +#line 6338 "util/configparser.c" break; - case 576: -#line 3055 "util/configparser.y" + case 582: +#line 3079 "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 6297 "util/configparser.c" +#line 6348 "util/configparser.c" break; - case 577: -#line 3061 "util/configparser.y" + case 583: +#line 3085 "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) @@ -6306,21 +6357,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6310 "util/configparser.c" +#line 6361 "util/configparser.c" break; - case 578: -#line 3071 "util/configparser.y" + case 584: +#line 3095 "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 6320 "util/configparser.c" +#line 6371 "util/configparser.c" break; - case 579: -#line 3078 "util/configparser.y" + case 585: +#line 3102 "util/configparser.y" { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -6328,30 +6379,30 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 6332 "util/configparser.c" +#line 6383 "util/configparser.c" break; - case 580: -#line 3087 "util/configparser.y" + case 586: +#line 3111 "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 6343 "util/configparser.c" +#line 6394 "util/configparser.c" break; - case 581: -#line 3095 "util/configparser.y" + case 587: +#line 3119 "util/configparser.y" { OUTYY(("\nP(dnscrypt:)\n")); } -#line 6351 "util/configparser.c" +#line 6402 "util/configparser.c" break; - case 594: -#line 3111 "util/configparser.y" + case 600: +#line 3135 "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) @@ -6359,11 +6410,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 6363 "util/configparser.c" +#line 6414 "util/configparser.c" break; - case 595: -#line 3121 "util/configparser.y" + case 601: +#line 3145 "util/configparser.y" { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6371,21 +6422,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 6375 "util/configparser.c" +#line 6426 "util/configparser.c" break; - case 596: -#line 3130 "util/configparser.y" + case 602: +#line 3154 "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 6385 "util/configparser.c" +#line 6436 "util/configparser.c" break; - case 597: -#line 3137 "util/configparser.y" + case 603: +#line 3161 "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))) @@ -6393,21 +6444,21 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-provider-cert"); } -#line 6397 "util/configparser.c" +#line 6448 "util/configparser.c" break; - case 598: -#line 3146 "util/configparser.y" + case 604: +#line 3170 "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 6407 "util/configparser.c" +#line 6458 "util/configparser.c" break; - case 599: -#line 3153 "util/configparser.y" + case 605: +#line 3177 "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))) @@ -6415,22 +6466,22 @@ yyreduce: if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) fatal_exit("out of memory adding dnscrypt-secret-key"); } -#line 6419 "util/configparser.c" +#line 6470 "util/configparser.c" break; - case 600: -#line 3162 "util/configparser.y" + case 606: +#line 3186 "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 6430 "util/configparser.c" +#line 6481 "util/configparser.c" break; - case 601: -#line 3170 "util/configparser.y" + case 607: +#line 3194 "util/configparser.y" { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6442,22 +6493,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6446 "util/configparser.c" +#line 6497 "util/configparser.c" break; - case 602: -#line 3183 "util/configparser.y" + case 608: +#line 3207 "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 6457 "util/configparser.c" +#line 6508 "util/configparser.c" break; - case 603: -#line 3191 "util/configparser.y" + case 609: +#line 3215 "util/configparser.y" { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -6469,19 +6520,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 6473 "util/configparser.c" +#line 6524 "util/configparser.c" break; - case 604: -#line 3204 "util/configparser.y" + case 610: +#line 3228 "util/configparser.y" { OUTYY(("\nP(cachedb:)\n")); } -#line 6481 "util/configparser.c" +#line 6532 "util/configparser.c" break; - case 613: -#line 3215 "util/configparser.y" + case 619: +#line 3239 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -6492,11 +6543,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6496 "util/configparser.c" +#line 6547 "util/configparser.c" break; - case 614: -#line 3227 "util/configparser.y" + case 620: +#line 3251 "util/configparser.y" { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -6507,11 +6558,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6511 "util/configparser.c" +#line 6562 "util/configparser.c" break; - case 615: -#line 3239 "util/configparser.y" + case 621: +#line 3263 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -6522,11 +6573,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6526 "util/configparser.c" +#line 6577 "util/configparser.c" break; - case 616: -#line 3251 "util/configparser.y" + case 622: +#line 3275 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -6540,11 +6591,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6544 "util/configparser.c" +#line 6595 "util/configparser.c" break; - case 617: -#line 3266 "util/configparser.y" + case 623: +#line 3290 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -6556,11 +6607,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6560 "util/configparser.c" +#line 6611 "util/configparser.c" break; - case 618: -#line 3279 "util/configparser.y" + case 624: +#line 3303 "util/configparser.y" { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_expire_records:%s)\n", (yyvsp[0].str))); @@ -6572,11 +6623,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 6576 "util/configparser.c" +#line 6627 "util/configparser.c" break; - case 619: -#line 3292 "util/configparser.y" + case 625: +#line 3316 "util/configparser.y" { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -6586,19 +6637,19 @@ yyreduce: fatal_exit("out of memory adding tcp connection limit"); } } -#line 6590 "util/configparser.c" +#line 6641 "util/configparser.c" break; - case 620: -#line 3303 "util/configparser.y" + case 626: +#line 3327 "util/configparser.y" { OUTYY(("\nP(ipset:)\n")); } -#line 6598 "util/configparser.c" +#line 6649 "util/configparser.c" break; - case 625: -#line 3312 "util/configparser.y" + case 631: +#line 3336 "util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v4:%s)\n", (yyvsp[0].str))); @@ -6612,11 +6663,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6616 "util/configparser.c" +#line 6667 "util/configparser.c" break; - case 626: -#line 3327 "util/configparser.y" + case 632: +#line 3351 "util/configparser.y" { #ifdef USE_IPSET OUTYY(("P(name-v6:%s)\n", (yyvsp[0].str))); @@ -6630,11 +6681,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 6634 "util/configparser.c" +#line 6685 "util/configparser.c" break; -#line 6638 "util/configparser.c" +#line 6689 "util/configparser.c" default: break; } @@ -6866,7 +6917,7 @@ yyreturn: #endif return yyresult; } -#line 3341 "util/configparser.y" +#line 3365 "util/configparser.y" /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 539377e8e747..74f0169ce5b9 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -194,158 +194,161 @@ extern int yydebug; VAR_HTTP_QUERY_BUFFER_SIZE = 400, VAR_HTTP_RESPONSE_BUFFER_SIZE = 401, VAR_HTTP_NODELAY = 402, - VAR_STUB_FIRST = 403, - VAR_MINIMAL_RESPONSES = 404, - VAR_RRSET_ROUNDROBIN = 405, - VAR_MAX_UDP_SIZE = 406, - VAR_DELAY_CLOSE = 407, - VAR_UNBLOCK_LAN_ZONES = 408, - VAR_INSECURE_LAN_ZONES = 409, - VAR_INFRA_CACHE_MIN_RTT = 410, - VAR_DNS64_PREFIX = 411, - VAR_DNS64_SYNTHALL = 412, - VAR_DNS64_IGNORE_AAAA = 413, - VAR_DNSTAP = 414, - VAR_DNSTAP_ENABLE = 415, - VAR_DNSTAP_SOCKET_PATH = 416, - VAR_DNSTAP_IP = 417, - VAR_DNSTAP_TLS = 418, - VAR_DNSTAP_TLS_SERVER_NAME = 419, - VAR_DNSTAP_TLS_CERT_BUNDLE = 420, - VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 421, - VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 422, - VAR_DNSTAP_SEND_IDENTITY = 423, - VAR_DNSTAP_SEND_VERSION = 424, - VAR_DNSTAP_BIDIRECTIONAL = 425, - VAR_DNSTAP_IDENTITY = 426, - VAR_DNSTAP_VERSION = 427, - VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 428, - VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 429, - VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 430, - VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 431, - VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 432, - VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 433, - VAR_RESPONSE_IP_TAG = 434, - VAR_RESPONSE_IP = 435, - VAR_RESPONSE_IP_DATA = 436, - VAR_HARDEN_ALGO_DOWNGRADE = 437, - VAR_IP_TRANSPARENT = 438, - VAR_IP_DSCP = 439, - VAR_DISABLE_DNSSEC_LAME_CHECK = 440, - VAR_IP_RATELIMIT = 441, - VAR_IP_RATELIMIT_SLABS = 442, - VAR_IP_RATELIMIT_SIZE = 443, - VAR_RATELIMIT = 444, - VAR_RATELIMIT_SLABS = 445, - VAR_RATELIMIT_SIZE = 446, - VAR_RATELIMIT_FOR_DOMAIN = 447, - VAR_RATELIMIT_BELOW_DOMAIN = 448, - VAR_IP_RATELIMIT_FACTOR = 449, - VAR_RATELIMIT_FACTOR = 450, - VAR_SEND_CLIENT_SUBNET = 451, - VAR_CLIENT_SUBNET_ZONE = 452, - VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 453, - VAR_CLIENT_SUBNET_OPCODE = 454, - VAR_MAX_CLIENT_SUBNET_IPV4 = 455, - VAR_MAX_CLIENT_SUBNET_IPV6 = 456, - VAR_MIN_CLIENT_SUBNET_IPV4 = 457, - VAR_MIN_CLIENT_SUBNET_IPV6 = 458, - VAR_MAX_ECS_TREE_SIZE_IPV4 = 459, - VAR_MAX_ECS_TREE_SIZE_IPV6 = 460, - VAR_CAPS_WHITELIST = 461, - VAR_CACHE_MAX_NEGATIVE_TTL = 462, - VAR_PERMIT_SMALL_HOLDDOWN = 463, - VAR_QNAME_MINIMISATION = 464, - VAR_QNAME_MINIMISATION_STRICT = 465, - VAR_IP_FREEBIND = 466, - VAR_DEFINE_TAG = 467, - VAR_LOCAL_ZONE_TAG = 468, - VAR_ACCESS_CONTROL_TAG = 469, - VAR_LOCAL_ZONE_OVERRIDE = 470, - VAR_ACCESS_CONTROL_TAG_ACTION = 471, - VAR_ACCESS_CONTROL_TAG_DATA = 472, - VAR_VIEW = 473, - VAR_ACCESS_CONTROL_VIEW = 474, - VAR_VIEW_FIRST = 475, - VAR_SERVE_EXPIRED = 476, - VAR_SERVE_EXPIRED_TTL = 477, - VAR_SERVE_EXPIRED_TTL_RESET = 478, - VAR_SERVE_EXPIRED_REPLY_TTL = 479, - VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 480, - VAR_FAKE_DSA = 481, - VAR_FAKE_SHA1 = 482, - VAR_LOG_IDENTITY = 483, - VAR_HIDE_TRUSTANCHOR = 484, - VAR_TRUST_ANCHOR_SIGNALING = 485, - VAR_AGGRESSIVE_NSEC = 486, - VAR_USE_SYSTEMD = 487, - VAR_SHM_ENABLE = 488, - VAR_SHM_KEY = 489, - VAR_ROOT_KEY_SENTINEL = 490, - VAR_DNSCRYPT = 491, - VAR_DNSCRYPT_ENABLE = 492, - VAR_DNSCRYPT_PORT = 493, - VAR_DNSCRYPT_PROVIDER = 494, - VAR_DNSCRYPT_SECRET_KEY = 495, - VAR_DNSCRYPT_PROVIDER_CERT = 496, - VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 497, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 498, - VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 499, - VAR_DNSCRYPT_NONCE_CACHE_SIZE = 500, - VAR_DNSCRYPT_NONCE_CACHE_SLABS = 501, - VAR_IPSECMOD_ENABLED = 502, - VAR_IPSECMOD_HOOK = 503, - VAR_IPSECMOD_IGNORE_BOGUS = 504, - VAR_IPSECMOD_MAX_TTL = 505, - VAR_IPSECMOD_WHITELIST = 506, - VAR_IPSECMOD_STRICT = 507, - VAR_CACHEDB = 508, - VAR_CACHEDB_BACKEND = 509, - VAR_CACHEDB_SECRETSEED = 510, - VAR_CACHEDB_REDISHOST = 511, - VAR_CACHEDB_REDISPORT = 512, - VAR_CACHEDB_REDISTIMEOUT = 513, - VAR_CACHEDB_REDISEXPIRERECORDS = 514, - VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 515, - VAR_FOR_UPSTREAM = 516, - VAR_AUTH_ZONE = 517, - VAR_ZONEFILE = 518, - VAR_MASTER = 519, - VAR_URL = 520, - VAR_FOR_DOWNSTREAM = 521, - VAR_FALLBACK_ENABLED = 522, - VAR_TLS_ADDITIONAL_PORT = 523, - VAR_LOW_RTT = 524, - VAR_LOW_RTT_PERMIL = 525, - VAR_FAST_SERVER_PERMIL = 526, - VAR_FAST_SERVER_NUM = 527, - VAR_ALLOW_NOTIFY = 528, - VAR_TLS_WIN_CERT = 529, - VAR_TCP_CONNECTION_LIMIT = 530, - VAR_FORWARD_NO_CACHE = 531, - VAR_STUB_NO_CACHE = 532, - VAR_LOG_SERVFAIL = 533, - VAR_DENY_ANY = 534, - VAR_UNKNOWN_SERVER_TIME_LIMIT = 535, - VAR_LOG_TAG_QUERYREPLY = 536, - VAR_STREAM_WAIT_SIZE = 537, - VAR_TLS_CIPHERS = 538, - VAR_TLS_CIPHERSUITES = 539, - VAR_TLS_USE_SNI = 540, - VAR_IPSET = 541, - VAR_IPSET_NAME_V4 = 542, - VAR_IPSET_NAME_V6 = 543, - VAR_TLS_SESSION_TICKET_KEYS = 544, - VAR_RPZ = 545, - VAR_TAGS = 546, - VAR_RPZ_ACTION_OVERRIDE = 547, - VAR_RPZ_CNAME_OVERRIDE = 548, - VAR_RPZ_LOG = 549, - VAR_RPZ_LOG_NAME = 550, - VAR_DYNLIB = 551, - VAR_DYNLIB_FILE = 552, - VAR_EDNS_CLIENT_TAG = 553, - VAR_EDNS_CLIENT_TAG_OPCODE = 554 + VAR_HTTP_NOTLS_DOWNSTREAM = 403, + VAR_STUB_FIRST = 404, + VAR_MINIMAL_RESPONSES = 405, + VAR_RRSET_ROUNDROBIN = 406, + VAR_MAX_UDP_SIZE = 407, + VAR_DELAY_CLOSE = 408, + VAR_UDP_CONNECT = 409, + VAR_UNBLOCK_LAN_ZONES = 410, + VAR_INSECURE_LAN_ZONES = 411, + VAR_INFRA_CACHE_MIN_RTT = 412, + VAR_INFRA_KEEP_PROBING = 413, + VAR_DNS64_PREFIX = 414, + VAR_DNS64_SYNTHALL = 415, + VAR_DNS64_IGNORE_AAAA = 416, + VAR_DNSTAP = 417, + VAR_DNSTAP_ENABLE = 418, + VAR_DNSTAP_SOCKET_PATH = 419, + VAR_DNSTAP_IP = 420, + VAR_DNSTAP_TLS = 421, + VAR_DNSTAP_TLS_SERVER_NAME = 422, + VAR_DNSTAP_TLS_CERT_BUNDLE = 423, + VAR_DNSTAP_TLS_CLIENT_KEY_FILE = 424, + VAR_DNSTAP_TLS_CLIENT_CERT_FILE = 425, + VAR_DNSTAP_SEND_IDENTITY = 426, + VAR_DNSTAP_SEND_VERSION = 427, + VAR_DNSTAP_BIDIRECTIONAL = 428, + VAR_DNSTAP_IDENTITY = 429, + VAR_DNSTAP_VERSION = 430, + VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES = 431, + VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES = 432, + VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES = 433, + VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES = 434, + VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 435, + VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 436, + VAR_RESPONSE_IP_TAG = 437, + VAR_RESPONSE_IP = 438, + VAR_RESPONSE_IP_DATA = 439, + VAR_HARDEN_ALGO_DOWNGRADE = 440, + VAR_IP_TRANSPARENT = 441, + VAR_IP_DSCP = 442, + VAR_DISABLE_DNSSEC_LAME_CHECK = 443, + VAR_IP_RATELIMIT = 444, + VAR_IP_RATELIMIT_SLABS = 445, + VAR_IP_RATELIMIT_SIZE = 446, + VAR_RATELIMIT = 447, + VAR_RATELIMIT_SLABS = 448, + VAR_RATELIMIT_SIZE = 449, + VAR_RATELIMIT_FOR_DOMAIN = 450, + VAR_RATELIMIT_BELOW_DOMAIN = 451, + VAR_IP_RATELIMIT_FACTOR = 452, + VAR_RATELIMIT_FACTOR = 453, + VAR_SEND_CLIENT_SUBNET = 454, + VAR_CLIENT_SUBNET_ZONE = 455, + VAR_CLIENT_SUBNET_ALWAYS_FORWARD = 456, + VAR_CLIENT_SUBNET_OPCODE = 457, + VAR_MAX_CLIENT_SUBNET_IPV4 = 458, + VAR_MAX_CLIENT_SUBNET_IPV6 = 459, + VAR_MIN_CLIENT_SUBNET_IPV4 = 460, + VAR_MIN_CLIENT_SUBNET_IPV6 = 461, + VAR_MAX_ECS_TREE_SIZE_IPV4 = 462, + VAR_MAX_ECS_TREE_SIZE_IPV6 = 463, + VAR_CAPS_WHITELIST = 464, + VAR_CACHE_MAX_NEGATIVE_TTL = 465, + VAR_PERMIT_SMALL_HOLDDOWN = 466, + VAR_QNAME_MINIMISATION = 467, + VAR_QNAME_MINIMISATION_STRICT = 468, + VAR_IP_FREEBIND = 469, + VAR_DEFINE_TAG = 470, + VAR_LOCAL_ZONE_TAG = 471, + VAR_ACCESS_CONTROL_TAG = 472, + VAR_LOCAL_ZONE_OVERRIDE = 473, + VAR_ACCESS_CONTROL_TAG_ACTION = 474, + VAR_ACCESS_CONTROL_TAG_DATA = 475, + VAR_VIEW = 476, + VAR_ACCESS_CONTROL_VIEW = 477, + VAR_VIEW_FIRST = 478, + VAR_SERVE_EXPIRED = 479, + VAR_SERVE_EXPIRED_TTL = 480, + VAR_SERVE_EXPIRED_TTL_RESET = 481, + VAR_SERVE_EXPIRED_REPLY_TTL = 482, + VAR_SERVE_EXPIRED_CLIENT_TIMEOUT = 483, + VAR_FAKE_DSA = 484, + VAR_FAKE_SHA1 = 485, + VAR_LOG_IDENTITY = 486, + VAR_HIDE_TRUSTANCHOR = 487, + VAR_TRUST_ANCHOR_SIGNALING = 488, + VAR_AGGRESSIVE_NSEC = 489, + VAR_USE_SYSTEMD = 490, + VAR_SHM_ENABLE = 491, + VAR_SHM_KEY = 492, + VAR_ROOT_KEY_SENTINEL = 493, + VAR_DNSCRYPT = 494, + VAR_DNSCRYPT_ENABLE = 495, + VAR_DNSCRYPT_PORT = 496, + VAR_DNSCRYPT_PROVIDER = 497, + VAR_DNSCRYPT_SECRET_KEY = 498, + VAR_DNSCRYPT_PROVIDER_CERT = 499, + VAR_DNSCRYPT_PROVIDER_CERT_ROTATED = 500, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE = 501, + VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS = 502, + VAR_DNSCRYPT_NONCE_CACHE_SIZE = 503, + VAR_DNSCRYPT_NONCE_CACHE_SLABS = 504, + VAR_IPSECMOD_ENABLED = 505, + VAR_IPSECMOD_HOOK = 506, + VAR_IPSECMOD_IGNORE_BOGUS = 507, + VAR_IPSECMOD_MAX_TTL = 508, + VAR_IPSECMOD_WHITELIST = 509, + VAR_IPSECMOD_STRICT = 510, + VAR_CACHEDB = 511, + VAR_CACHEDB_BACKEND = 512, + VAR_CACHEDB_SECRETSEED = 513, + VAR_CACHEDB_REDISHOST = 514, + VAR_CACHEDB_REDISPORT = 515, + VAR_CACHEDB_REDISTIMEOUT = 516, + VAR_CACHEDB_REDISEXPIRERECORDS = 517, + VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 518, + VAR_FOR_UPSTREAM = 519, + VAR_AUTH_ZONE = 520, + VAR_ZONEFILE = 521, + VAR_MASTER = 522, + VAR_URL = 523, + VAR_FOR_DOWNSTREAM = 524, + VAR_FALLBACK_ENABLED = 525, + VAR_TLS_ADDITIONAL_PORT = 526, + VAR_LOW_RTT = 527, + VAR_LOW_RTT_PERMIL = 528, + VAR_FAST_SERVER_PERMIL = 529, + VAR_FAST_SERVER_NUM = 530, + VAR_ALLOW_NOTIFY = 531, + VAR_TLS_WIN_CERT = 532, + VAR_TCP_CONNECTION_LIMIT = 533, + VAR_FORWARD_NO_CACHE = 534, + VAR_STUB_NO_CACHE = 535, + VAR_LOG_SERVFAIL = 536, + VAR_DENY_ANY = 537, + VAR_UNKNOWN_SERVER_TIME_LIMIT = 538, + VAR_LOG_TAG_QUERYREPLY = 539, + VAR_STREAM_WAIT_SIZE = 540, + VAR_TLS_CIPHERS = 541, + VAR_TLS_CIPHERSUITES = 542, + VAR_TLS_USE_SNI = 543, + VAR_IPSET = 544, + VAR_IPSET_NAME_V4 = 545, + VAR_IPSET_NAME_V6 = 546, + VAR_TLS_SESSION_TICKET_KEYS = 547, + VAR_RPZ = 548, + VAR_TAGS = 549, + VAR_RPZ_ACTION_OVERRIDE = 550, + VAR_RPZ_CNAME_OVERRIDE = 551, + VAR_RPZ_LOG = 552, + VAR_RPZ_LOG_NAME = 553, + VAR_DYNLIB = 554, + VAR_DYNLIB_FILE = 555, + VAR_EDNS_CLIENT_STRING = 556, + VAR_EDNS_CLIENT_STRING_OPCODE = 557 }; #endif /* Tokens. */ @@ -494,158 +497,161 @@ extern int yydebug; #define VAR_HTTP_QUERY_BUFFER_SIZE 400 #define VAR_HTTP_RESPONSE_BUFFER_SIZE 401 #define VAR_HTTP_NODELAY 402 -#define VAR_STUB_FIRST 403 -#define VAR_MINIMAL_RESPONSES 404 -#define VAR_RRSET_ROUNDROBIN 405 -#define VAR_MAX_UDP_SIZE 406 -#define VAR_DELAY_CLOSE 407 -#define VAR_UNBLOCK_LAN_ZONES 408 -#define VAR_INSECURE_LAN_ZONES 409 -#define VAR_INFRA_CACHE_MIN_RTT 410 -#define VAR_DNS64_PREFIX 411 -#define VAR_DNS64_SYNTHALL 412 -#define VAR_DNS64_IGNORE_AAAA 413 -#define VAR_DNSTAP 414 -#define VAR_DNSTAP_ENABLE 415 -#define VAR_DNSTAP_SOCKET_PATH 416 -#define VAR_DNSTAP_IP 417 -#define VAR_DNSTAP_TLS 418 -#define VAR_DNSTAP_TLS_SERVER_NAME 419 -#define VAR_DNSTAP_TLS_CERT_BUNDLE 420 -#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 421 -#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 422 -#define VAR_DNSTAP_SEND_IDENTITY 423 -#define VAR_DNSTAP_SEND_VERSION 424 -#define VAR_DNSTAP_BIDIRECTIONAL 425 -#define VAR_DNSTAP_IDENTITY 426 -#define VAR_DNSTAP_VERSION 427 -#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 428 -#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 429 -#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 430 -#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 431 -#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 432 -#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 433 -#define VAR_RESPONSE_IP_TAG 434 -#define VAR_RESPONSE_IP 435 -#define VAR_RESPONSE_IP_DATA 436 -#define VAR_HARDEN_ALGO_DOWNGRADE 437 -#define VAR_IP_TRANSPARENT 438 -#define VAR_IP_DSCP 439 -#define VAR_DISABLE_DNSSEC_LAME_CHECK 440 -#define VAR_IP_RATELIMIT 441 -#define VAR_IP_RATELIMIT_SLABS 442 -#define VAR_IP_RATELIMIT_SIZE 443 -#define VAR_RATELIMIT 444 -#define VAR_RATELIMIT_SLABS 445 -#define VAR_RATELIMIT_SIZE 446 -#define VAR_RATELIMIT_FOR_DOMAIN 447 -#define VAR_RATELIMIT_BELOW_DOMAIN 448 -#define VAR_IP_RATELIMIT_FACTOR 449 -#define VAR_RATELIMIT_FACTOR 450 -#define VAR_SEND_CLIENT_SUBNET 451 -#define VAR_CLIENT_SUBNET_ZONE 452 -#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 453 -#define VAR_CLIENT_SUBNET_OPCODE 454 -#define VAR_MAX_CLIENT_SUBNET_IPV4 455 -#define VAR_MAX_CLIENT_SUBNET_IPV6 456 -#define VAR_MIN_CLIENT_SUBNET_IPV4 457 -#define VAR_MIN_CLIENT_SUBNET_IPV6 458 -#define VAR_MAX_ECS_TREE_SIZE_IPV4 459 -#define VAR_MAX_ECS_TREE_SIZE_IPV6 460 -#define VAR_CAPS_WHITELIST 461 -#define VAR_CACHE_MAX_NEGATIVE_TTL 462 -#define VAR_PERMIT_SMALL_HOLDDOWN 463 -#define VAR_QNAME_MINIMISATION 464 -#define VAR_QNAME_MINIMISATION_STRICT 465 -#define VAR_IP_FREEBIND 466 -#define VAR_DEFINE_TAG 467 -#define VAR_LOCAL_ZONE_TAG 468 -#define VAR_ACCESS_CONTROL_TAG 469 -#define VAR_LOCAL_ZONE_OVERRIDE 470 -#define VAR_ACCESS_CONTROL_TAG_ACTION 471 -#define VAR_ACCESS_CONTROL_TAG_DATA 472 -#define VAR_VIEW 473 -#define VAR_ACCESS_CONTROL_VIEW 474 -#define VAR_VIEW_FIRST 475 -#define VAR_SERVE_EXPIRED 476 -#define VAR_SERVE_EXPIRED_TTL 477 -#define VAR_SERVE_EXPIRED_TTL_RESET 478 -#define VAR_SERVE_EXPIRED_REPLY_TTL 479 -#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 480 -#define VAR_FAKE_DSA 481 -#define VAR_FAKE_SHA1 482 -#define VAR_LOG_IDENTITY 483 -#define VAR_HIDE_TRUSTANCHOR 484 -#define VAR_TRUST_ANCHOR_SIGNALING 485 -#define VAR_AGGRESSIVE_NSEC 486 -#define VAR_USE_SYSTEMD 487 -#define VAR_SHM_ENABLE 488 -#define VAR_SHM_KEY 489 -#define VAR_ROOT_KEY_SENTINEL 490 -#define VAR_DNSCRYPT 491 -#define VAR_DNSCRYPT_ENABLE 492 -#define VAR_DNSCRYPT_PORT 493 -#define VAR_DNSCRYPT_PROVIDER 494 -#define VAR_DNSCRYPT_SECRET_KEY 495 -#define VAR_DNSCRYPT_PROVIDER_CERT 496 -#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 497 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 498 -#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 499 -#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 500 -#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 501 -#define VAR_IPSECMOD_ENABLED 502 -#define VAR_IPSECMOD_HOOK 503 -#define VAR_IPSECMOD_IGNORE_BOGUS 504 -#define VAR_IPSECMOD_MAX_TTL 505 -#define VAR_IPSECMOD_WHITELIST 506 -#define VAR_IPSECMOD_STRICT 507 -#define VAR_CACHEDB 508 -#define VAR_CACHEDB_BACKEND 509 -#define VAR_CACHEDB_SECRETSEED 510 -#define VAR_CACHEDB_REDISHOST 511 -#define VAR_CACHEDB_REDISPORT 512 -#define VAR_CACHEDB_REDISTIMEOUT 513 -#define VAR_CACHEDB_REDISEXPIRERECORDS 514 -#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 515 -#define VAR_FOR_UPSTREAM 516 -#define VAR_AUTH_ZONE 517 -#define VAR_ZONEFILE 518 -#define VAR_MASTER 519 -#define VAR_URL 520 -#define VAR_FOR_DOWNSTREAM 521 -#define VAR_FALLBACK_ENABLED 522 -#define VAR_TLS_ADDITIONAL_PORT 523 -#define VAR_LOW_RTT 524 -#define VAR_LOW_RTT_PERMIL 525 -#define VAR_FAST_SERVER_PERMIL 526 -#define VAR_FAST_SERVER_NUM 527 -#define VAR_ALLOW_NOTIFY 528 -#define VAR_TLS_WIN_CERT 529 -#define VAR_TCP_CONNECTION_LIMIT 530 -#define VAR_FORWARD_NO_CACHE 531 -#define VAR_STUB_NO_CACHE 532 -#define VAR_LOG_SERVFAIL 533 -#define VAR_DENY_ANY 534 -#define VAR_UNKNOWN_SERVER_TIME_LIMIT 535 -#define VAR_LOG_TAG_QUERYREPLY 536 -#define VAR_STREAM_WAIT_SIZE 537 -#define VAR_TLS_CIPHERS 538 -#define VAR_TLS_CIPHERSUITES 539 -#define VAR_TLS_USE_SNI 540 -#define VAR_IPSET 541 -#define VAR_IPSET_NAME_V4 542 -#define VAR_IPSET_NAME_V6 543 -#define VAR_TLS_SESSION_TICKET_KEYS 544 -#define VAR_RPZ 545 -#define VAR_TAGS 546 -#define VAR_RPZ_ACTION_OVERRIDE 547 -#define VAR_RPZ_CNAME_OVERRIDE 548 -#define VAR_RPZ_LOG 549 -#define VAR_RPZ_LOG_NAME 550 -#define VAR_DYNLIB 551 -#define VAR_DYNLIB_FILE 552 -#define VAR_EDNS_CLIENT_TAG 553 -#define VAR_EDNS_CLIENT_TAG_OPCODE 554 +#define VAR_HTTP_NOTLS_DOWNSTREAM 403 +#define VAR_STUB_FIRST 404 +#define VAR_MINIMAL_RESPONSES 405 +#define VAR_RRSET_ROUNDROBIN 406 +#define VAR_MAX_UDP_SIZE 407 +#define VAR_DELAY_CLOSE 408 +#define VAR_UDP_CONNECT 409 +#define VAR_UNBLOCK_LAN_ZONES 410 +#define VAR_INSECURE_LAN_ZONES 411 +#define VAR_INFRA_CACHE_MIN_RTT 412 +#define VAR_INFRA_KEEP_PROBING 413 +#define VAR_DNS64_PREFIX 414 +#define VAR_DNS64_SYNTHALL 415 +#define VAR_DNS64_IGNORE_AAAA 416 +#define VAR_DNSTAP 417 +#define VAR_DNSTAP_ENABLE 418 +#define VAR_DNSTAP_SOCKET_PATH 419 +#define VAR_DNSTAP_IP 420 +#define VAR_DNSTAP_TLS 421 +#define VAR_DNSTAP_TLS_SERVER_NAME 422 +#define VAR_DNSTAP_TLS_CERT_BUNDLE 423 +#define VAR_DNSTAP_TLS_CLIENT_KEY_FILE 424 +#define VAR_DNSTAP_TLS_CLIENT_CERT_FILE 425 +#define VAR_DNSTAP_SEND_IDENTITY 426 +#define VAR_DNSTAP_SEND_VERSION 427 +#define VAR_DNSTAP_BIDIRECTIONAL 428 +#define VAR_DNSTAP_IDENTITY 429 +#define VAR_DNSTAP_VERSION 430 +#define VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES 431 +#define VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES 432 +#define VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES 433 +#define VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES 434 +#define VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES 435 +#define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 436 +#define VAR_RESPONSE_IP_TAG 437 +#define VAR_RESPONSE_IP 438 +#define VAR_RESPONSE_IP_DATA 439 +#define VAR_HARDEN_ALGO_DOWNGRADE 440 +#define VAR_IP_TRANSPARENT 441 +#define VAR_IP_DSCP 442 +#define VAR_DISABLE_DNSSEC_LAME_CHECK 443 +#define VAR_IP_RATELIMIT 444 +#define VAR_IP_RATELIMIT_SLABS 445 +#define VAR_IP_RATELIMIT_SIZE 446 +#define VAR_RATELIMIT 447 +#define VAR_RATELIMIT_SLABS 448 +#define VAR_RATELIMIT_SIZE 449 +#define VAR_RATELIMIT_FOR_DOMAIN 450 +#define VAR_RATELIMIT_BELOW_DOMAIN 451 +#define VAR_IP_RATELIMIT_FACTOR 452 +#define VAR_RATELIMIT_FACTOR 453 +#define VAR_SEND_CLIENT_SUBNET 454 +#define VAR_CLIENT_SUBNET_ZONE 455 +#define VAR_CLIENT_SUBNET_ALWAYS_FORWARD 456 +#define VAR_CLIENT_SUBNET_OPCODE 457 +#define VAR_MAX_CLIENT_SUBNET_IPV4 458 +#define VAR_MAX_CLIENT_SUBNET_IPV6 459 +#define VAR_MIN_CLIENT_SUBNET_IPV4 460 +#define VAR_MIN_CLIENT_SUBNET_IPV6 461 +#define VAR_MAX_ECS_TREE_SIZE_IPV4 462 +#define VAR_MAX_ECS_TREE_SIZE_IPV6 463 +#define VAR_CAPS_WHITELIST 464 +#define VAR_CACHE_MAX_NEGATIVE_TTL 465 +#define VAR_PERMIT_SMALL_HOLDDOWN 466 +#define VAR_QNAME_MINIMISATION 467 +#define VAR_QNAME_MINIMISATION_STRICT 468 +#define VAR_IP_FREEBIND 469 +#define VAR_DEFINE_TAG 470 +#define VAR_LOCAL_ZONE_TAG 471 +#define VAR_ACCESS_CONTROL_TAG 472 +#define VAR_LOCAL_ZONE_OVERRIDE 473 +#define VAR_ACCESS_CONTROL_TAG_ACTION 474 +#define VAR_ACCESS_CONTROL_TAG_DATA 475 +#define VAR_VIEW 476 +#define VAR_ACCESS_CONTROL_VIEW 477 +#define VAR_VIEW_FIRST 478 +#define VAR_SERVE_EXPIRED 479 +#define VAR_SERVE_EXPIRED_TTL 480 +#define VAR_SERVE_EXPIRED_TTL_RESET 481 +#define VAR_SERVE_EXPIRED_REPLY_TTL 482 +#define VAR_SERVE_EXPIRED_CLIENT_TIMEOUT 483 +#define VAR_FAKE_DSA 484 +#define VAR_FAKE_SHA1 485 +#define VAR_LOG_IDENTITY 486 +#define VAR_HIDE_TRUSTANCHOR 487 +#define VAR_TRUST_ANCHOR_SIGNALING 488 +#define VAR_AGGRESSIVE_NSEC 489 +#define VAR_USE_SYSTEMD 490 +#define VAR_SHM_ENABLE 491 +#define VAR_SHM_KEY 492 +#define VAR_ROOT_KEY_SENTINEL 493 +#define VAR_DNSCRYPT 494 +#define VAR_DNSCRYPT_ENABLE 495 +#define VAR_DNSCRYPT_PORT 496 +#define VAR_DNSCRYPT_PROVIDER 497 +#define VAR_DNSCRYPT_SECRET_KEY 498 +#define VAR_DNSCRYPT_PROVIDER_CERT 499 +#define VAR_DNSCRYPT_PROVIDER_CERT_ROTATED 500 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE 501 +#define VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS 502 +#define VAR_DNSCRYPT_NONCE_CACHE_SIZE 503 +#define VAR_DNSCRYPT_NONCE_CACHE_SLABS 504 +#define VAR_IPSECMOD_ENABLED 505 +#define VAR_IPSECMOD_HOOK 506 +#define VAR_IPSECMOD_IGNORE_BOGUS 507 +#define VAR_IPSECMOD_MAX_TTL 508 +#define VAR_IPSECMOD_WHITELIST 509 +#define VAR_IPSECMOD_STRICT 510 +#define VAR_CACHEDB 511 +#define VAR_CACHEDB_BACKEND 512 +#define VAR_CACHEDB_SECRETSEED 513 +#define VAR_CACHEDB_REDISHOST 514 +#define VAR_CACHEDB_REDISPORT 515 +#define VAR_CACHEDB_REDISTIMEOUT 516 +#define VAR_CACHEDB_REDISEXPIRERECORDS 517 +#define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 518 +#define VAR_FOR_UPSTREAM 519 +#define VAR_AUTH_ZONE 520 +#define VAR_ZONEFILE 521 +#define VAR_MASTER 522 +#define VAR_URL 523 +#define VAR_FOR_DOWNSTREAM 524 +#define VAR_FALLBACK_ENABLED 525 +#define VAR_TLS_ADDITIONAL_PORT 526 +#define VAR_LOW_RTT 527 +#define VAR_LOW_RTT_PERMIL 528 +#define VAR_FAST_SERVER_PERMIL 529 +#define VAR_FAST_SERVER_NUM 530 +#define VAR_ALLOW_NOTIFY 531 +#define VAR_TLS_WIN_CERT 532 +#define VAR_TCP_CONNECTION_LIMIT 533 +#define VAR_FORWARD_NO_CACHE 534 +#define VAR_STUB_NO_CACHE 535 +#define VAR_LOG_SERVFAIL 536 +#define VAR_DENY_ANY 537 +#define VAR_UNKNOWN_SERVER_TIME_LIMIT 538 +#define VAR_LOG_TAG_QUERYREPLY 539 +#define VAR_STREAM_WAIT_SIZE 540 +#define VAR_TLS_CIPHERS 541 +#define VAR_TLS_CIPHERSUITES 542 +#define VAR_TLS_USE_SNI 543 +#define VAR_IPSET 544 +#define VAR_IPSET_NAME_V4 545 +#define VAR_IPSET_NAME_V6 546 +#define VAR_TLS_SESSION_TICKET_KEYS 547 +#define VAR_RPZ 548 +#define VAR_TAGS 549 +#define VAR_RPZ_ACTION_OVERRIDE 550 +#define VAR_RPZ_CNAME_OVERRIDE 551 +#define VAR_RPZ_LOG 552 +#define VAR_RPZ_LOG_NAME 553 +#define VAR_DYNLIB 554 +#define VAR_DYNLIB_FILE 555 +#define VAR_EDNS_CLIENT_STRING 556 +#define VAR_EDNS_CLIENT_STRING_OPCODE 557 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -655,7 +661,7 @@ union YYSTYPE char* str; -#line 659 "util/configparser.h" +#line 665 "util/configparser.h" }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index 43a886f2403a..4d6b5e3fba31 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -114,11 +114,11 @@ extern struct config_parser_state* cfg_parser; %token VAR_STUB_SSL_UPSTREAM VAR_FORWARD_SSL_UPSTREAM VAR_TLS_CERT_BUNDLE %token VAR_HTTPS_PORT VAR_HTTP_ENDPOINT VAR_HTTP_MAX_STREAMS %token VAR_HTTP_QUERY_BUFFER_SIZE VAR_HTTP_RESPONSE_BUFFER_SIZE -%token VAR_HTTP_NODELAY +%token VAR_HTTP_NODELAY VAR_HTTP_NOTLS_DOWNSTREAM %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN -%token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE +%token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE VAR_UDP_CONNECT %token VAR_UNBLOCK_LAN_ZONES VAR_INSECURE_LAN_ZONES -%token VAR_INFRA_CACHE_MIN_RTT +%token VAR_INFRA_CACHE_MIN_RTT VAR_INFRA_KEEP_PROBING %token VAR_DNS64_PREFIX VAR_DNS64_SYNTHALL VAR_DNS64_IGNORE_AAAA %token VAR_DNSTAP VAR_DNSTAP_ENABLE VAR_DNSTAP_SOCKET_PATH VAR_DNSTAP_IP %token VAR_DNSTAP_TLS VAR_DNSTAP_TLS_SERVER_NAME VAR_DNSTAP_TLS_CERT_BUNDLE @@ -178,7 +178,8 @@ extern struct config_parser_state* cfg_parser; %token VAR_IPSET VAR_IPSET_NAME_V4 VAR_IPSET_NAME_V6 %token VAR_TLS_SESSION_TICKET_KEYS VAR_RPZ VAR_TAGS VAR_RPZ_ACTION_OVERRIDE %token VAR_RPZ_CNAME_OVERRIDE VAR_RPZ_LOG VAR_RPZ_LOG_NAME -%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_TAG VAR_EDNS_CLIENT_TAG_OPCODE +%token VAR_DYNLIB VAR_DYNLIB_FILE VAR_EDNS_CLIENT_STRING +%token VAR_EDNS_CLIENT_STRING_OPCODE %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -249,14 +250,14 @@ content_server: server_num_threads | server_verbosity | server_port | server_ssl_service_key | server_ssl_service_pem | server_ssl_port | server_https_port | server_http_endpoint | server_http_max_streams | server_http_query_buffer_size | server_http_response_buffer_size | - server_http_nodelay | + server_http_nodelay | server_http_notls_downstream | server_minimal_responses | server_rrset_roundrobin | server_max_udp_size | - server_so_reuseport | server_delay_close | + server_so_reuseport | server_delay_close | server_udp_connect | server_unblock_lan_zones | server_insecure_lan_zones | server_dns64_prefix | server_dns64_synthall | server_dns64_ignore_aaaa | server_infra_cache_min_rtt | server_harden_algo_downgrade | server_ip_transparent | server_ip_ratelimit | server_ratelimit | - server_ip_dscp | + server_ip_dscp | server_infra_keep_probing | server_ip_ratelimit_slabs | server_ratelimit_slabs | server_ip_ratelimit_size | server_ratelimit_size | server_ratelimit_for_domain | @@ -291,8 +292,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_unknown_server_time_limit | server_log_tag_queryreply | server_stream_wait_size | server_tls_ciphers | server_tls_ciphersuites | server_tls_session_ticket_keys | - server_tls_use_sni | server_edns_client_tag | - server_edns_client_tag_opcode + server_tls_use_sni | server_edns_client_string | + server_edns_client_string_opcode ; stubstart: VAR_STUB_ZONE { @@ -982,6 +983,7 @@ server_https_port: VAR_HTTPS_PORT STRING_ARG if(atoi($2) == 0) yyerror("port number expected"); else cfg_parser->cfg->https_port = atoi($2); + free($2); }; server_http_endpoint: VAR_HTTP_ENDPOINT STRING_ARG { @@ -1030,6 +1032,14 @@ server_http_nodelay: VAR_HTTP_NODELAY STRING_ARG yyerror("expected yes or no."); else cfg_parser->cfg->http_nodelay = (strcmp($2, "yes")==0); free($2); + } +server_http_notls_downstream: VAR_HTTP_NOTLS_DOWNSTREAM STRING_ARG + { + OUTYY(("P(server_http_notls_downstream:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->http_notls_downstream = (strcmp($2, "yes")==0); + free($2); }; server_use_systemd: VAR_USE_SYSTEMD STRING_ARG { @@ -1434,6 +1444,15 @@ server_delay_close: VAR_DELAY_CLOSE STRING_ARG free($2); } ; +server_udp_connect: VAR_UDP_CONNECT STRING_ARG + { + OUTYY(("P(server_udp_connect:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->udp_connect = (strcmp($2, "yes")==0); + free($2); + } + ; server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG { OUTYY(("P(server_unblock_lan_zones:%s)\n", $2)); @@ -1531,6 +1550,16 @@ server_infra_cache_min_rtt: VAR_INFRA_CACHE_MIN_RTT STRING_ARG free($2); } ; +server_infra_keep_probing: VAR_INFRA_KEEP_PROBING STRING_ARG + { + OUTYY(("P(server_infra_keep_probing:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->infra_keep_probing = + (strcmp($2, "yes")==0); + free($2); + } + ; server_target_fetch_policy: VAR_TARGET_FETCH_POLICY STRING_ARG { OUTYY(("P(server_target_fetch_policy:%s)\n", $2)); @@ -2465,29 +2494,24 @@ server_ipsecmod_strict: VAR_IPSECMOD_STRICT STRING_ARG #endif } ; -server_edns_client_tag: VAR_EDNS_CLIENT_TAG STRING_ARG STRING_ARG +server_edns_client_string: VAR_EDNS_CLIENT_STRING STRING_ARG STRING_ARG { - int tag_data; - OUTYY(("P(server_edns_client_tag:%s %s)\n", $2, $3)); - tag_data = atoi($3); - if(tag_data > 65535 || tag_data < 0 || - (tag_data == 0 && (strlen($3) != 1 || $3[0] != '0'))) - yyerror("edns-client-tag data invalid, needs to be a " - "number from 0 to 65535"); + OUTYY(("P(server_edns_client_string:%s %s)\n", $2, $3)); if(!cfg_str2list_insert( - &cfg_parser->cfg->edns_client_tags, $2, $3)) + &cfg_parser->cfg->edns_client_strings, $2, $3)) fatal_exit("out of memory adding " - "edns-client-tag"); + "edns-client-string"); } ; -server_edns_client_tag_opcode: VAR_EDNS_CLIENT_TAG_OPCODE STRING_ARG +server_edns_client_string_opcode: VAR_EDNS_CLIENT_STRING_OPCODE STRING_ARG { - OUTYY(("P(edns_client_tag_opcode:%s)\n", $2)); + OUTYY(("P(edns_client_string_opcode:%s)\n", $2)); if(atoi($2) == 0 && strcmp($2, "0") != 0) yyerror("option code expected"); else if(atoi($2) > 65535 || atoi($2) < 0) yyerror("option code must be in interval [0, 65535]"); - else cfg_parser->cfg->edns_client_tag_opcode = atoi($2); + else cfg_parser->cfg->edns_client_string_opcode = atoi($2); + free($2); } ; diff --git a/util/data/msgencode.c b/util/data/msgencode.c index be69f628a507..1746cfbb8fab 100644 --- a/util/data/msgencode.c +++ b/util/data/msgencode.c @@ -624,6 +624,9 @@ positive_answer(struct reply_info* rep, uint16_t qtype) { for(i=0;i<rep->an_numrrsets; i++) { if(ntohs(rep->rrsets[i]->rk.type) == qtype) { + /* for priming queries, type NS, include addresses */ + if(qtype == LDNS_RR_TYPE_NS) + return 0; /* in case it is a wildcard with DNSSEC, there will * be NSEC/NSEC3 records in the authority section * that we cannot remove */ diff --git a/util/data/msgreply.h b/util/data/msgreply.h index 8d75f9b12f3a..385780268a3c 100644 --- a/util/data/msgreply.h +++ b/util/data/msgreply.h @@ -552,7 +552,7 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code); * @param rep: Reply info. Could be NULL. * @param rcode: return code. * @param edns: edns data of the reply. - * @param repinfo: comm_reply. NULL. + * @param repinfo: comm_reply. Reply information for a communication point. * @param region: region to store data. * @return false on failure (a callback function returned an error). */ diff --git a/util/edns.c b/util/edns.c index c83a4a545fe3..ddbb46e892ce 100644 --- a/util/edns.c +++ b/util/edns.c @@ -48,81 +48,84 @@ #include "util/data/msgparse.h" #include "util/data/msgreply.h" -struct edns_tags* edns_tags_create(void) +struct edns_strings* edns_strings_create(void) { - struct edns_tags* edns_tags = calloc(1, sizeof(struct edns_tags)); - if(!edns_tags) + struct edns_strings* edns_strings = calloc(1, + sizeof(struct edns_strings)); + if(!edns_strings) return NULL; - if(!(edns_tags->region = regional_create())) { - edns_tags_delete(edns_tags); + if(!(edns_strings->region = regional_create())) { + edns_strings_delete(edns_strings); return NULL; } - return edns_tags; + return edns_strings; } -void edns_tags_delete(struct edns_tags* edns_tags) +void edns_strings_delete(struct edns_strings* edns_strings) { - if(!edns_tags) + if(!edns_strings) return; - regional_destroy(edns_tags->region); - free(edns_tags); + regional_destroy(edns_strings->region); + free(edns_strings); } static int -edns_tags_client_insert(struct edns_tags* edns_tags, +edns_strings_client_insert(struct edns_strings* edns_strings, struct sockaddr_storage* addr, socklen_t addrlen, int net, - uint16_t tag_data) + const char* string) { - struct edns_tag_addr* eta = regional_alloc_zero(edns_tags->region, - sizeof(struct edns_tag_addr)); - if(!eta) + struct edns_string_addr* esa = regional_alloc_zero(edns_strings->region, + sizeof(struct edns_string_addr)); + if(!esa) return 0; - eta->tag_data = tag_data; - if(!addr_tree_insert(&edns_tags->client_tags, &eta->node, addr, addrlen, - net)) { - verbose(VERB_QUERY, "duplicate EDNS client tag ignored."); + esa->string_len = strlen(string); + esa->string = regional_alloc_init(edns_strings->region, string, + esa->string_len); + if(!esa->string) + return 0; + if(!addr_tree_insert(&edns_strings->client_strings, &esa->node, addr, + addrlen, net)) { + verbose(VERB_QUERY, "duplicate EDNS client string ignored."); } return 1; } -int edns_tags_apply_cfg(struct edns_tags* edns_tags, +int edns_strings_apply_cfg(struct edns_strings* edns_strings, struct config_file* config) { struct config_str2list* c; - regional_free_all(edns_tags->region); - addr_tree_init(&edns_tags->client_tags); + regional_free_all(edns_strings->region); + addr_tree_init(&edns_strings->client_strings); - for(c=config->edns_client_tags; c; c=c->next) { + for(c=config->edns_client_strings; c; c=c->next) { struct sockaddr_storage addr; socklen_t addrlen; int net; - uint16_t tag_data; log_assert(c->str && c->str2); if(!netblockstrtoaddr(c->str, UNBOUND_DNS_PORT, &addr, &addrlen, &net)) { - log_err("cannot parse EDNS client tag IP netblock: %s", - c->str); + log_err("cannot parse EDNS client string IP netblock: " + "%s", c->str); return 0; } - tag_data = atoi(c->str2); /* validated in config parser */ - if(!edns_tags_client_insert(edns_tags, &addr, addrlen, net, - tag_data)) { - log_err("out of memory while adding EDNS tags"); + if(!edns_strings_client_insert(edns_strings, &addr, addrlen, + net, c->str2)) { + log_err("out of memory while adding EDNS strings"); return 0; } } - edns_tags->client_tag_opcode = config->edns_client_tag_opcode; + edns_strings->client_string_opcode = config->edns_client_string_opcode; - addr_tree_init_parents(&edns_tags->client_tags); + addr_tree_init_parents(&edns_strings->client_strings); return 1; } -struct edns_tag_addr* -edns_tag_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, +struct edns_string_addr* +edns_string_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, socklen_t addrlen) { - return (struct edns_tag_addr*)addr_tree_lookup(tree, addr, addrlen); + return (struct edns_string_addr*)addr_tree_lookup(tree, addr, addrlen); } static int edns_keepalive(struct edns_data* edns_out, struct edns_data* edns_in, diff --git a/util/edns.h b/util/edns.h index cf9f8707e808..11742eb5b723 100644 --- a/util/edns.h +++ b/util/edns.h @@ -50,58 +50,60 @@ struct comm_point; struct regional; /** - * Structure containing all EDNS tags. + * Structure containing all EDNS strings. */ -struct edns_tags { - /** Tree of EDNS client tags to use in upstream queries, per address - * prefix. Contains nodes of type edns_tag_addr. */ - rbtree_type client_tags; - /** EDNS opcode to use for client tags */ - uint16_t client_tag_opcode; +struct edns_strings { + /** Tree of EDNS client strings to use in upstream queries, per address + * prefix. Contains nodes of type edns_string_addr. */ + rbtree_type client_strings; + /** EDNS opcode to use for client strings */ + uint16_t client_string_opcode; /** region to allocate tree nodes in */ struct regional* region; }; /** - * EDNS tag. Node of rbtree, containing tag and prefix. + * EDNS string. Node of rbtree, containing string and prefix. */ -struct edns_tag_addr { +struct edns_string_addr { /** node in address tree, used for tree lookups. Need to be the first * member of this struct. */ struct addr_tree_node node; - /** tag data, in host byte ordering */ - uint16_t tag_data; + /** string, ascii format */ + uint8_t* string; + /** length of string */ + size_t string_len; }; /** - * Create structure to hold EDNS tags - * @return: newly created edns_tags, NULL on alloc failure. + * Create structure to hold EDNS strings + * @return: newly created edns_strings, NULL on alloc failure. */ -struct edns_tags* edns_tags_create(void); +struct edns_strings* edns_strings_create(void); -/** Delete EDNS tags structure - * @param edns_tags: struct to delete +/** Delete EDNS strings structure + * @param edns_strings: struct to delete */ -void edns_tags_delete(struct edns_tags* edns_tags); +void edns_strings_delete(struct edns_strings* edns_strings); /** - * Add configured EDNS tags - * @param edns_tags: edns tags to apply config to - * @param config: struct containing EDNS tags configuration + * Add configured EDNS strings + * @param edns_strings: edns strings to apply config to + * @param config: struct containing EDNS strings configuration * @return 0 on error */ -int edns_tags_apply_cfg(struct edns_tags* edns_tags, +int edns_strings_apply_cfg(struct edns_strings* edns_strings, struct config_file* config); /** - * Find tag for address. - * @param tree: tree containing EDNS tags per address prefix. + * Find string for address. + * @param tree: tree containing EDNS strings per address prefix. * @param addr: address to use for tree lookup * @param addrlen: length of address * @return: matching tree node, NULL otherwise */ -struct edns_tag_addr* -edns_tag_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, +struct edns_string_addr* +edns_string_addr_lookup(rbtree_type* tree, struct sockaddr_storage* addr, socklen_t addrlen); /** diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c index 7d15d107561a..a9e9d3a03239 100644 --- a/util/fptr_wlist.c +++ b/util/fptr_wlist.c @@ -229,6 +229,8 @@ fptr_whitelist_rbtree_cmp(int (*fptr) (const void *, const void *)) else if(fptr == &fwd_cmp) return 1; else if(fptr == &pending_cmp) return 1; else if(fptr == &serviced_cmp) return 1; + else if(fptr == &reuse_cmp) return 1; + else if(fptr == &reuse_id_cmp) return 1; else if(fptr == &name_tree_compare) return 1; else if(fptr == &order_lock_cmp) return 1; else if(fptr == &codeline_cmp) return 1; diff --git a/util/iana_ports.inc b/util/iana_ports.inc index fa25869d3b56..d9978f92eda0 100644 --- a/util/iana_ports.inc +++ b/util/iana_ports.inc @@ -5290,6 +5290,7 @@ 22005, 22273, 22305, +22333, 22335, 22343, 22347, diff --git a/util/module.h b/util/module.h index 1eed213008c2..7b833f8ade19 100644 --- a/util/module.h +++ b/util/module.h @@ -520,8 +520,8 @@ struct module_env { struct edns_known_option* edns_known_options; /* Number of known edns options */ size_t edns_known_options_num; - /** EDNS client tag information */ - struct edns_tags* edns_tags; + /** EDNS client string information */ + struct edns_strings* edns_strings; /* Make every mesh state unique, do not aggregate mesh states. */ int unique_mesh; diff --git a/util/netevent.c b/util/netevent.c index 545f09742c7c..8bbad15920a2 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -341,10 +341,15 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, if(sldns_buffer_remaining(packet) == 0) log_err("error: send empty UDP packet"); #endif - log_assert(addr && addrlen > 0); - sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), - sldns_buffer_remaining(packet), 0, - addr, addrlen); + if(addr) { + log_assert(addr && addrlen > 0); + sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), + sldns_buffer_remaining(packet), 0, + addr, addrlen); + } else { + sent = send(c->fd, (void*)sldns_buffer_begin(packet), + sldns_buffer_remaining(packet), 0); + } if(sent == -1) { /* try again and block, waiting for IO to complete, * we want to send the answer, and we will wait for @@ -574,6 +579,32 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, #endif /* AF_INET6 && IPV6_PKTINFO && HAVE_SENDMSG */ } +/** return true is UDP receive error needs to be logged */ +static int udp_recv_needs_log(int err) +{ + switch(err) { + case ECONNREFUSED: +# ifdef ENETUNREACH + case ENETUNREACH: +# endif +# ifdef EHOSTDOWN + case EHOSTDOWN: +# endif +# ifdef EHOSTUNREACH + case EHOSTUNREACH: +# endif +# ifdef ENETDOWN + case ENETDOWN: +# endif + if(verbosity >= VERB_ALGO) + return 1; + return 0; + default: + break; + } + return 1; +} + void comm_point_udp_ancil_callback(int fd, short event, void* arg) { @@ -616,7 +647,8 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg) msg.msg_flags = 0; rcv = recvmsg(fd, &msg, 0); if(rcv == -1) { - if(errno != EAGAIN && errno != EINTR) { + if(errno != EAGAIN && errno != EINTR + && udp_recv_needs_log(errno)) { log_err("recvmsg failed: %s", strerror(errno)); } return; @@ -697,7 +729,8 @@ comm_point_udp_callback(int fd, short event, void* arg) (struct sockaddr*)&rep.addr, &rep.addrlen); if(rcv == -1) { #ifndef USE_WINSOCK - if(errno != EAGAIN && errno != EINTR) + if(errno != EAGAIN && errno != EINTR + && udp_recv_needs_log(errno)) log_err("recvfrom %d failed: %s", fd, strerror(errno)); #else @@ -965,6 +998,10 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) /* clear leftover flags from previous use, and then set the * correct event base for the event structure for libevent */ ub_event_free(c_hdl->ev->ev); + if((c_hdl->type == comm_tcp && c_hdl->tcp_req_info) || + c_hdl->type == comm_local || c_hdl->type == comm_raw) + c_hdl->tcp_do_toggle_rw = 0; + else c_hdl->tcp_do_toggle_rw = 1; if(c_hdl->type == comm_http) { #ifdef HAVE_NGHTTP2 @@ -978,6 +1015,10 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg) log_warn("failed to submit http2 settings"); return; } + if(!c->ssl) { + c_hdl->tcp_do_toggle_rw = 0; + c_hdl->use_h2 = 1; + } #endif c_hdl->ev->ev = ub_event_new(c_hdl->ev->base->eb->base, -1, UB_EV_PERSIST | UB_EV_READ | UB_EV_TIMEOUT, @@ -1042,6 +1083,8 @@ reclaim_tcp_handler(struct comm_point* c) comm_point_start_listening(c->tcp_parent, -1, -1); } } + c->tcp_more_read_again = NULL; + c->tcp_more_write_again = NULL; } /** do the callback when writing is done */ @@ -1049,16 +1092,27 @@ static void tcp_callback_writer(struct comm_point* c) { log_assert(c->type == comm_tcp); - sldns_buffer_clear(c->buffer); + if(!c->tcp_write_and_read) { + sldns_buffer_clear(c->buffer); + c->tcp_byte_count = 0; + } if(c->tcp_do_toggle_rw) c->tcp_is_reading = 1; - c->tcp_byte_count = 0; /* switch from listening(write) to listening(read) */ if(c->tcp_req_info) { tcp_req_info_handle_writedone(c->tcp_req_info); } else { comm_point_stop_listening(c); - comm_point_start_listening(c, -1, c->tcp_timeout_msec); + if(c->tcp_write_and_read) { + fptr_ok(fptr_whitelist_comm_point(c->callback)); + if( (*c->callback)(c, c->cb_arg, NETEVENT_PKT_WRITTEN, + &c->repinfo) ) { + comm_point_start_listening(c, -1, + c->tcp_timeout_msec); + } + } else { + comm_point_start_listening(c, -1, c->tcp_timeout_msec); + } } } @@ -1361,10 +1415,28 @@ ssl_handle_write(struct comm_point* c) } /* ignore return, if fails we may simply block */ (void)SSL_set_mode(c->ssl, (long)SSL_MODE_ENABLE_PARTIAL_WRITE); - if(c->tcp_byte_count < sizeof(uint16_t)) { - uint16_t len = htons(sldns_buffer_limit(c->buffer)); + if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) { + uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(c->buffer)); ERR_clear_error(); - if(sizeof(uint16_t)+sldns_buffer_remaining(c->buffer) < + if(c->tcp_write_and_read) { + if(c->tcp_write_pkt_len + 2 < LDNS_RR_BUF_SIZE) { + /* combine the tcp length and the query for + * write, this emulates writev */ + uint8_t buf[LDNS_RR_BUF_SIZE]; + memmove(buf, &len, sizeof(uint16_t)); + memmove(buf+sizeof(uint16_t), + c->tcp_write_pkt, + c->tcp_write_pkt_len); + r = SSL_write(c->ssl, + (void*)(buf+c->tcp_write_byte_count), + c->tcp_write_pkt_len + 2 - + c->tcp_write_byte_count); + } else { + r = SSL_write(c->ssl, + (void*)(((uint8_t*)&len)+c->tcp_write_byte_count), + (int)(sizeof(uint16_t)-c->tcp_write_byte_count)); + } + } else if(sizeof(uint16_t)+sldns_buffer_remaining(c->buffer) < LDNS_RR_BUF_SIZE) { /* combine the tcp length and the query for write, * this emulates writev */ @@ -1406,20 +1478,32 @@ ssl_handle_write(struct comm_point* c) log_crypto_err("could not SSL_write"); return 0; } - c->tcp_byte_count += r; - if(c->tcp_byte_count < sizeof(uint16_t)) - return 1; - sldns_buffer_set_position(c->buffer, c->tcp_byte_count - - sizeof(uint16_t)); - if(sldns_buffer_remaining(c->buffer) == 0) { + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + if(c->tcp_write_byte_count < sizeof(uint16_t)) + return 1; + } else { + c->tcp_byte_count += r; + if(c->tcp_byte_count < sizeof(uint16_t)) + return 1; + sldns_buffer_set_position(c->buffer, c->tcp_byte_count - + sizeof(uint16_t)); + } + if((!c->tcp_write_and_read && sldns_buffer_remaining(c->buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); return 1; } } - log_assert(sldns_buffer_remaining(c->buffer) > 0); + log_assert(c->tcp_write_and_read || sldns_buffer_remaining(c->buffer) > 0); + log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2); ERR_clear_error(); - r = SSL_write(c->ssl, (void*)sldns_buffer_current(c->buffer), - (int)sldns_buffer_remaining(c->buffer)); + if(c->tcp_write_and_read) { + r = SSL_write(c->ssl, (void*)(c->tcp_write_pkt + c->tcp_write_byte_count - 2), + (int)(c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count)); + } else { + r = SSL_write(c->ssl, (void*)sldns_buffer_current(c->buffer), + (int)sldns_buffer_remaining(c->buffer)); + } if(r <= 0) { int want = SSL_get_error(c->ssl, r); if(want == SSL_ERROR_ZERO_RETURN) { @@ -1444,9 +1528,13 @@ ssl_handle_write(struct comm_point* c) log_crypto_err("could not SSL_write"); return 0; } - sldns_buffer_skip(c->buffer, (ssize_t)r); + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + } else { + sldns_buffer_skip(c->buffer, (ssize_t)r); + } - if(sldns_buffer_remaining(c->buffer) == 0) { + if((!c->tcp_write_and_read && sldns_buffer_remaining(c->buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); } return 1; @@ -1458,9 +1546,17 @@ ssl_handle_write(struct comm_point* c) /** handle ssl tcp connection with dns contents */ static int -ssl_handle_it(struct comm_point* c) +ssl_handle_it(struct comm_point* c, int is_write) { - if(c->tcp_is_reading) + /* handle case where renegotiation wants read during write call + * or write during read calls */ + if(is_write && c->ssl_shake_state == comm_ssl_shake_hs_write) + return ssl_handle_read(c); + else if(!is_write && c->ssl_shake_state == comm_ssl_shake_hs_read) + return ssl_handle_write(c); + /* handle read events for read operation and write events for a + * write operation */ + else if(!is_write) return ssl_handle_read(c); return ssl_handle_write(c); } @@ -1477,8 +1573,8 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok) ssize_t r; log_assert(c->type == comm_tcp || c->type == comm_local); if(c->ssl) - return ssl_handle_it(c); - if(!c->tcp_is_reading) + return ssl_handle_it(c, 0); + if(!c->tcp_is_reading && !c->tcp_write_and_read) return 0; log_assert(fd != -1); @@ -1581,10 +1677,10 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) #else buffer = c->buffer; #endif - if(c->tcp_is_reading && !c->ssl) + if(c->tcp_is_reading && !c->ssl && !c->tcp_write_and_read) return 0; log_assert(fd != -1); - if(c->tcp_byte_count == 0 && c->tcp_check_nb_connect) { + if(((!c->tcp_write_and_read && c->tcp_byte_count == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == 0)) && c->tcp_check_nb_connect) { /* check for pending error from nonblocking connect */ /* from Stevens, unix network programming, vol1, 3rd ed, p450*/ int error = 0; @@ -1625,7 +1721,7 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) } } if(c->ssl) - return ssl_handle_it(c); + return ssl_handle_it(c, 1); #ifdef USE_MSG_FASTOPEN /* Only try this on first use of a connection that uses tfo, @@ -1634,15 +1730,22 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) if(c->tcp_do_fastopen == 1) { /* this form of sendmsg() does both a connect() and send() so need to look for various flavours of error*/ - uint16_t len = htons(sldns_buffer_limit(buffer)); + uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer)); struct msghdr msg; struct iovec iov[2]; c->tcp_do_fastopen = 0; memset(&msg, 0, sizeof(msg)); - iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; - iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; - iov[1].iov_base = sldns_buffer_begin(buffer); - iov[1].iov_len = sldns_buffer_limit(buffer); + if(c->tcp_write_and_read) { + iov[0].iov_base = (uint8_t*)&len + c->tcp_write_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_write_byte_count; + iov[1].iov_base = c->tcp_write_pkt; + iov[1].iov_len = c->tcp_write_pkt_len; + } else { + iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; + iov[1].iov_base = sldns_buffer_begin(buffer); + 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; @@ -1688,12 +1791,18 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) } } else { - c->tcp_byte_count += r; - if(c->tcp_byte_count < sizeof(uint16_t)) - return 1; - sldns_buffer_set_position(buffer, c->tcp_byte_count - - sizeof(uint16_t)); - if(sldns_buffer_remaining(buffer) == 0) { + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + if(c->tcp_write_byte_count < sizeof(uint16_t)) + return 1; + } else { + c->tcp_byte_count += r; + if(c->tcp_byte_count < sizeof(uint16_t)) + return 1; + sldns_buffer_set_position(buffer, c->tcp_byte_count - + sizeof(uint16_t)); + } + if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); return 1; } @@ -1701,19 +1810,31 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) } #endif /* USE_MSG_FASTOPEN */ - if(c->tcp_byte_count < sizeof(uint16_t)) { - uint16_t len = htons(sldns_buffer_limit(buffer)); + if((c->tcp_write_and_read?c->tcp_write_byte_count:c->tcp_byte_count) < sizeof(uint16_t)) { + uint16_t len = htons(c->tcp_write_and_read?c->tcp_write_pkt_len:sldns_buffer_limit(buffer)); #ifdef HAVE_WRITEV struct iovec iov[2]; - iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; - iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; - iov[1].iov_base = sldns_buffer_begin(buffer); - iov[1].iov_len = sldns_buffer_limit(buffer); + if(c->tcp_write_and_read) { + iov[0].iov_base = (uint8_t*)&len + c->tcp_write_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_write_byte_count; + iov[1].iov_base = c->tcp_write_pkt; + iov[1].iov_len = c->tcp_write_pkt_len; + } else { + iov[0].iov_base = (uint8_t*)&len + c->tcp_byte_count; + iov[0].iov_len = sizeof(uint16_t) - c->tcp_byte_count; + iov[1].iov_base = sldns_buffer_begin(buffer); + iov[1].iov_len = sldns_buffer_limit(buffer); + } log_assert(iov[0].iov_len > 0); r = writev(fd, iov, 2); #else /* HAVE_WRITEV */ - r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_byte_count), - sizeof(uint16_t)-c->tcp_byte_count, 0); + if(c->tcp_write_and_read) { + r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_write_byte_count), + sizeof(uint16_t)-c->tcp_write_byte_count, 0); + } else { + r = send(fd, (void*)(((uint8_t*)&len)+c->tcp_byte_count), + sizeof(uint16_t)-c->tcp_byte_count, 0); + } #endif /* HAVE_WRITEV */ if(r == -1) { #ifndef USE_WINSOCK @@ -1752,19 +1873,31 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) #endif return 0; } - c->tcp_byte_count += r; - if(c->tcp_byte_count < sizeof(uint16_t)) - return 1; - sldns_buffer_set_position(buffer, c->tcp_byte_count - - sizeof(uint16_t)); - if(sldns_buffer_remaining(buffer) == 0) { + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + if(c->tcp_write_byte_count < sizeof(uint16_t)) + return 1; + } else { + c->tcp_byte_count += r; + if(c->tcp_byte_count < sizeof(uint16_t)) + return 1; + sldns_buffer_set_position(buffer, c->tcp_byte_count - + sizeof(uint16_t)); + } + if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); return 1; } } - log_assert(sldns_buffer_remaining(buffer) > 0); - r = send(fd, (void*)sldns_buffer_current(buffer), - sldns_buffer_remaining(buffer), 0); + log_assert(c->tcp_write_and_read || sldns_buffer_remaining(buffer) > 0); + log_assert(!c->tcp_write_and_read || c->tcp_write_byte_count < c->tcp_write_pkt_len + 2); + if(c->tcp_write_and_read) { + r = send(fd, (void*)c->tcp_write_pkt + c->tcp_write_byte_count - 2, + c->tcp_write_pkt_len + 2 - c->tcp_write_byte_count, 0); + } else { + r = send(fd, (void*)sldns_buffer_current(buffer), + sldns_buffer_remaining(buffer), 0); + } if(r == -1) { #ifndef USE_WINSOCK if(errno == EINTR || errno == EAGAIN) @@ -1787,9 +1920,13 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) &c->repinfo.addr, c->repinfo.addrlen); return 0; } - sldns_buffer_skip(buffer, r); + if(c->tcp_write_and_read) { + c->tcp_write_byte_count += r; + } else { + sldns_buffer_skip(buffer, r); + } - if(sldns_buffer_remaining(buffer) == 0) { + if((!c->tcp_write_and_read && sldns_buffer_remaining(buffer) == 0) || (c->tcp_write_and_read && c->tcp_write_byte_count == c->tcp_write_pkt_len + 2)) { tcp_callback_writer(c); } @@ -1819,6 +1956,54 @@ tcp_req_info_read_again(int fd, struct comm_point* c) } } +/** read again to drain buffers when there could be more to read */ +static void +tcp_more_read_again(int fd, struct comm_point* c) +{ + /* if the packet is done, but another one could be waiting on + * the connection, the callback signals this, and we try again */ + /* this continues until the read routines get EAGAIN or so, + * and thus does not call the callback, and the bool is 0 */ + int* moreread = c->tcp_more_read_again; + while(moreread && *moreread) { + *moreread = 0; + if(!comm_point_tcp_handle_read(fd, c, 0)) { + reclaim_tcp_handler(c); + if(!c->tcp_do_close) { + fptr_ok(fptr_whitelist_comm_point( + c->callback)); + (void)(*c->callback)(c, c->cb_arg, + NETEVENT_CLOSED, NULL); + } + return; + } + } +} + +/** write again to fill up when there could be more to write */ +static void +tcp_more_write_again(int fd, struct comm_point* c) +{ + /* if the packet is done, but another is waiting to be written, + * the callback signals it and we try again. */ + /* this continues until the write routines get EAGAIN or so, + * and thus does not call the callback, and the bool is 0 */ + int* morewrite = c->tcp_more_write_again; + while(morewrite && *morewrite) { + *morewrite = 0; + if(!comm_point_tcp_handle_write(fd, c)) { + reclaim_tcp_handler(c); + if(!c->tcp_do_close) { + fptr_ok(fptr_whitelist_comm_point( + c->callback)); + (void)(*c->callback)(c, c->cb_arg, + NETEVENT_CLOSED, NULL); + } + return; + } + } +} + void comm_point_tcp_handle_callback(int fd, short event, void* arg) { @@ -1839,7 +2024,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } return; @@ -1857,34 +2042,46 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) } return; } - if(event&UB_EV_READ) { + if(event&UB_EV_READ +#ifdef USE_MSG_FASTOPEN + && !(c->tcp_do_fastopen && (event&UB_EV_WRITE)) +#endif + ) { int has_tcpq = (c->tcp_req_info != NULL); + int* moreread = c->tcp_more_read_again; if(!comm_point_tcp_handle_read(fd, c, 0)) { reclaim_tcp_handler(c); if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } + return; } if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again) tcp_req_info_read_again(fd, c); + if(moreread && *moreread) + tcp_more_read_again(fd, c); return; } if(event&UB_EV_WRITE) { int has_tcpq = (c->tcp_req_info != NULL); + int* morewrite = c->tcp_more_write_again; if(!comm_point_tcp_handle_write(fd, c)) { reclaim_tcp_handler(c); if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } + return; } if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again) tcp_req_info_read_again(fd, c); + if(morewrite && *morewrite) + tcp_more_write_again(fd, c); return; } log_err("Ignored event %d for tcphdl.", event); @@ -2359,48 +2556,76 @@ int http2_stream_close_cb(nghttp2_session* ATTR_UNUSED(session), ssize_t http2_recv_cb(nghttp2_session* ATTR_UNUSED(session), uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg) { -#ifdef HAVE_SSL struct http2_session* h2_session = (struct http2_session*)cb_arg; - int r; + ssize_t ret; log_assert(h2_session->c->type == comm_http); log_assert(h2_session->c->h2_session); - if(!h2_session->c->ssl) - return 0; +#ifdef HAVE_SSL + if(h2_session->c->ssl) { + int r; + ERR_clear_error(); + r = SSL_read(h2_session->c->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->c->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + return NGHTTP2_ERR_EOF; + } else if(want == SSL_ERROR_WANT_READ) { + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_WANT_WRITE) { + h2_session->c->ssl_shake_state = comm_ssl_shake_hs_write; + comm_point_listen_for_rw(h2_session->c, 0, 1); + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_SYSCALL) { +#ifdef ECONNRESET + if(errno == ECONNRESET && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; +#endif + if(errno != 0) + log_err("SSL_read syscall: %s", + strerror(errno)); + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + log_crypto_err("could not SSL_read"); + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + return r; + } +#endif /* HAVE_SSL */ - ERR_clear_error(); - r = SSL_read(h2_session->c->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->c->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { - return NGHTTP2_ERR_EOF; - } else if(want == SSL_ERROR_WANT_READ) { - return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_WANT_WRITE) { - h2_session->c->ssl_shake_state = comm_ssl_shake_hs_write; - comm_point_listen_for_rw(h2_session->c, 0, 1); + ret = recv(h2_session->c->fd, buf, len, 0); + if(ret == 0) { + return NGHTTP2_ERR_EOF; + } else if(ret < 0) { +#ifndef USE_WINSOCK + if(errno == EINTR || errno == EAGAIN) return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_SYSCALL) { #ifdef ECONNRESET - if(errno == ECONNRESET && verbosity < 2) - return NGHTTP2_ERR_CALLBACK_FAILURE; + if(errno == ECONNRESET && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; #endif - if(errno != 0) - log_err("SSL_read syscall: %s", - strerror(errno)); + log_err_addr("could not http2 recv: %s", strerror(errno), + &h2_session->c->repinfo.addr, + h2_session->c->repinfo.addrlen); +#else /* USE_WINSOCK */ + if(WSAGetLastError() == WSAECONNRESET) return NGHTTP2_ERR_CALLBACK_FAILURE; + if(WSAGetLastError() == WSAEINPROGRESS) + return NGHTTP2_ERR_WOULDBLOCK; + if(WSAGetLastError() == WSAEWOULDBLOCK) { + ub_winsock_tcp_wouldblock(h2_session->c->ev->ev, + UB_EV_READ); + return NGHTTP2_ERR_WOULDBLOCK; } - log_crypto_err("could not SSL_read"); + log_err_addr("could not http2 recv: %s", + wsa_strerror(WSAGetLastError()), + &h2_session->c->repinfo.addr, + h2_session->c->repinfo.addrlen); +#endif return NGHTTP2_ERR_CALLBACK_FAILURE; } - return r; -#else - (void)buf; - (void)len; - (void)cb_arg; - return -1; -#endif + return ret; } #endif /* HAVE_NGHTTP2 */ @@ -2411,15 +2636,17 @@ comm_point_http2_handle_read(int ATTR_UNUSED(fd), struct comm_point* c) #ifdef HAVE_NGHTTP2 int ret; log_assert(c->h2_session); - log_assert(c->ssl); /* reading until recv cb returns NGHTTP2_ERR_WOULDBLOCK */ ret = nghttp2_session_recv(c->h2_session->session); if(ret) { if(ret != NGHTTP2_ERR_EOF && ret != NGHTTP2_ERR_CALLBACK_FAILURE) { - verbose(VERB_QUERY, "http2: session_recv failed, " - "error: %s", nghttp2_strerror(ret)); + char a[256]; + addr_to_str(&c->repinfo.addr, c->repinfo.addrlen, + a, sizeof(a)); + verbose(VERB_QUERY, "http2: session_recv from %s failed, " + "error: %s", a, nghttp2_strerror(ret)); } return 0; } @@ -2648,47 +2875,81 @@ http_write_more(int fd, struct comm_point* c) ssize_t http2_send_cb(nghttp2_session* ATTR_UNUSED(session), const uint8_t* buf, size_t len, int ATTR_UNUSED(flags), void* cb_arg) { -#ifdef HAVE_SSL - int r; + ssize_t ret; struct http2_session* h2_session = (struct http2_session*)cb_arg; log_assert(h2_session->c->type == comm_http); log_assert(h2_session->c->h2_session); - if(!h2_session->c->ssl) - return 0; - - ERR_clear_error(); - r = SSL_write(h2_session->c->ssl, buf, len); - if(r <= 0) { - int want = SSL_get_error(h2_session->c->ssl, r); - if(want == SSL_ERROR_ZERO_RETURN) { +#ifdef HAVE_SSL + if(h2_session->c->ssl) { + int r; + ERR_clear_error(); + r = SSL_write(h2_session->c->ssl, buf, len); + if(r <= 0) { + int want = SSL_get_error(h2_session->c->ssl, r); + if(want == SSL_ERROR_ZERO_RETURN) { + return NGHTTP2_ERR_CALLBACK_FAILURE; + } else if(want == SSL_ERROR_WANT_READ) { + h2_session->c->ssl_shake_state = comm_ssl_shake_hs_read; + comm_point_listen_for_rw(h2_session->c, 1, 0); + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_WANT_WRITE) { + return NGHTTP2_ERR_WOULDBLOCK; + } else if(want == SSL_ERROR_SYSCALL) { +#ifdef EPIPE + if(errno == EPIPE && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; +#endif + if(errno != 0) + log_err("SSL_write syscall: %s", + strerror(errno)); + return NGHTTP2_ERR_CALLBACK_FAILURE; + } + log_crypto_err("could not SSL_write"); return NGHTTP2_ERR_CALLBACK_FAILURE; - } else if(want == SSL_ERROR_WANT_READ) { - h2_session->c->ssl_shake_state = comm_ssl_shake_hs_read; - comm_point_listen_for_rw(h2_session->c, 1, 0); - return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_WANT_WRITE) { + } + return r; + } +#endif /* HAVE_SSL */ + + ret = send(h2_session->c->fd, buf, len, 0); + if(ret == 0) { + return NGHTTP2_ERR_CALLBACK_FAILURE; + } else if(ret < 0) { +#ifndef USE_WINSOCK + if(errno == EINTR || errno == EAGAIN) return NGHTTP2_ERR_WOULDBLOCK; - } else if(want == SSL_ERROR_SYSCALL) { #ifdef EPIPE - if(errno == EPIPE && verbosity < 2) - return NGHTTP2_ERR_CALLBACK_FAILURE; + if(errno == EPIPE && verbosity < 2) + return NGHTTP2_ERR_CALLBACK_FAILURE; #endif - if(errno != 0) - log_err("SSL_write syscall: %s", - strerror(errno)); +#ifdef ECONNRESET + if(errno == ECONNRESET && verbosity < 2) 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); +#else /* USE_WINSOCK */ + if(WSAGetLastError() == WSAENOTCONN) + return NGHTTP2_ERR_WOULDBLOCK; + if(WSAGetLastError() == WSAEINPROGRESS) + return NGHTTP2_ERR_WOULDBLOCK; + if(WSAGetLastError() == WSAEWOULDBLOCK) { + ub_winsock_tcp_wouldblock(h2_session->c->ev->ev, + UB_EV_WRITE); + return NGHTTP2_ERR_WOULDBLOCK; } - log_crypto_err("could not SSL_write"); + if(WSAGetLastError() == WSAECONNRESET && verbosity < 2) + 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); +#endif return NGHTTP2_ERR_CALLBACK_FAILURE; } - return r; -#else - (void)buf; - (void)len; - (void)cb_arg; - return -1; -#endif + return ret; } #endif /* HAVE_NGHTTP2 */ @@ -2699,7 +2960,6 @@ comm_point_http2_handle_write(int ATTR_UNUSED(fd), struct comm_point* c) #ifdef HAVE_NGHTTP2 int ret; log_assert(c->h2_session); - log_assert(c->ssl); ret = nghttp2_session_send(c->h2_session->session); if(ret) { @@ -2811,7 +3071,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg) if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } } @@ -2823,7 +3083,7 @@ comm_point_http_handle_callback(int fd, short event, void* arg) if(!c->tcp_do_close) { fptr_ok(fptr_whitelist_comm_point( c->callback)); - (void)(*c->callback)(c, c->cb_arg, + (void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED, NULL); } } @@ -3555,6 +3815,7 @@ comm_point_close(struct comm_point* c) if(!c) return; if(c->fd != -1) { + verbose(5, "comm_point_close of %d: event_del", c->fd); if(ub_event_del(c->ev->ev) != 0) { log_err("could not event_del on close"); } @@ -3736,12 +3997,20 @@ comm_point_start_listening(struct comm_point* c, int newfd, int msec) } if(c->type == comm_tcp || c->type == comm_http) { ub_event_del_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE); - if(c->tcp_is_reading) + if(c->tcp_write_and_read) { + verbose(5, "startlistening %d mode rw", (newfd==-1?c->fd:newfd)); + ub_event_add_bits(c->ev->ev, UB_EV_READ|UB_EV_WRITE); + } else if(c->tcp_is_reading) { + verbose(5, "startlistening %d mode r", (newfd==-1?c->fd:newfd)); ub_event_add_bits(c->ev->ev, UB_EV_READ); - else ub_event_add_bits(c->ev->ev, UB_EV_WRITE); + } else { + verbose(5, "startlistening %d mode w", (newfd==-1?c->fd:newfd)); + ub_event_add_bits(c->ev->ev, UB_EV_WRITE); + } } if(newfd != -1) { - if(c->fd != -1) { + if(c->fd != -1 && c->fd != newfd) { + verbose(5, "cpsl close of fd %d for %d", c->fd, newfd); sock_close(c->fd); } c->fd = newfd; diff --git a/util/netevent.h b/util/netevent.h index 6986f881b38a..daa954b6492f 100644 --- a/util/netevent.h +++ b/util/netevent.h @@ -95,6 +95,9 @@ typedef int comm_point_callback_type(struct comm_point*, void*, int, #define NETEVENT_CAPSFAIL -3 /** to pass done transfer to callback function; http file is complete */ #define NETEVENT_DONE -4 +/** to pass write of the write packet is done to callback function + * used when tcp_write_and_read is enabled */ +#define NETEVENT_PKT_WRITTEN -5 /** timeout to slow accept calls when not possible, in msec. */ #define NETEVENT_SLOW_ACCEPT_TIME 2000 @@ -276,6 +279,44 @@ struct comm_point { and after read/write completes. No callback is done. */ int tcp_do_close; + /** flag that indicates the stream is both written and read from. */ + int tcp_write_and_read; + + /** byte count for written length over write channel, for when + * tcp_write_and_read is enabled. When tcp_write_and_read is enabled, + * this is the counter for writing, the one for reading is in the + * commpoint.buffer sldns buffer. The counter counts from 0 to + * 2+tcp_write_pkt_len, and includes the tcp length bytes. */ + size_t tcp_write_byte_count; + + /** packet to write currently over the write channel. for when + * tcp_write_and_read is enabled. When tcp_write_and_read is enabled, + * this is the buffer for the written packet, the commpoint.buffer + * sldns buffer is the buffer for the received packet. */ + uint8_t* tcp_write_pkt; + /** length of tcp_write_pkt in bytes */ + size_t tcp_write_pkt_len; + + /** if set try to read another packet again (over connection with + * multiple packets), once set, tries once, then zero again, + * so set it in the packet complete section. + * The pointer itself has to be set before the callback is invoked, + * when you set things up, and continue to exist also after the + * commpoint is closed and deleted in your callback. So that after + * the callback cleans up netevent can see what it has to do. + * Or leave NULL if it is not used at all. */ + int* tcp_more_read_again; + + /** if set try to write another packet (over connection with + * multiple packets), once set, tries once, then zero again, + * so set it in the packet complete section. + * The pointer itself has to be set before the callback is invoked, + * when you set things up, and continue to exist also after the + * commpoint is closed and deleted in your callback. So that after + * the callback cleans up netevent can see what it has to do. + * Or leave NULL if it is not used at all. */ + int* tcp_more_write_again; + /** if set, read/write completes: read/write state of tcp is toggled. buffer reset/bytecount reset. @@ -589,7 +630,8 @@ void comm_point_drop_reply(struct comm_reply* repinfo); * Send an udp message over a commpoint. * @param c: commpoint to send it from. * @param packet: what to send. - * @param addr: where to send it to. + * @param addr: where to send it to. If NULL, send is performed, + * for connected sockets, to the connected address. * @param addrlen: length of addr. * @return: false on a failure. */ diff --git a/util/regional.c b/util/regional.c index ff36d0e21241..bd67ecf50af3 100644 --- a/util/regional.c +++ b/util/regional.c @@ -80,18 +80,39 @@ regional_init(struct regional* r) r->total_large = 0; } -struct regional* -regional_create_custom(size_t size) +/** + * Create a new region, with custom first block and large-object sizes. + * @param size: length of first block. + * @param large_object_size: outside of chunk allocation threshold. + * @return: newly allocated regional. + */ +static struct regional* +regional_create_custom_large_object(size_t size, size_t large_object_size) { - struct regional* r = (struct regional*)malloc(size); + struct regional* r; size = ALIGN_UP(size, ALIGNMENT); + r = (struct regional*)malloc(size); log_assert(sizeof(struct regional) <= size); if(!r) return NULL; r->first_size = size; + r->large_object_size = large_object_size; regional_init(r); return r; } +struct regional* +regional_create_custom(size_t size) +{ + return regional_create_custom_large_object(size, + REGIONAL_LARGE_OBJECT_SIZE); +} + +struct regional* +regional_create_nochunk(size_t size) +{ + return regional_create_custom_large_object(size, 0); +} + void regional_free_all(struct regional *r) { @@ -134,7 +155,7 @@ regional_alloc(struct regional *r, size_t size) malloc and ALIGN_UP */ a = ALIGN_UP(size, ALIGNMENT); /* large objects */ - if(a > REGIONAL_LARGE_OBJECT_SIZE) { + if(a > r->large_object_size) { s = malloc(ALIGNMENT + size); if(!s) return NULL; r->total_large += ALIGNMENT+size; @@ -219,7 +240,7 @@ regional_log_stats(struct regional *r) /* some basic assertions put here (non time critical code) */ log_assert(ALIGNMENT >= sizeof(char*)); log_assert(REGIONAL_CHUNK_SIZE > ALIGNMENT); - log_assert(REGIONAL_CHUNK_SIZE-ALIGNMENT > REGIONAL_LARGE_OBJECT_SIZE); + log_assert(REGIONAL_CHUNK_SIZE-ALIGNMENT > r->large_object_size); log_assert(REGIONAL_CHUNK_SIZE >= sizeof(struct regional)); /* debug print */ log_info("regional %u chunks, %u large", diff --git a/util/regional.h b/util/regional.h index e8b2cb8d00ca..b439897d52e0 100644 --- a/util/regional.h +++ b/util/regional.h @@ -74,6 +74,11 @@ struct regional size_t available; /** current chunk data position. */ char* data; + /** threshold for outside of chunk allocations */ + size_t large_object_size; + /** padding for sizeof8 alignment of sizeof(struct regional) + * for 32bit systems */ + size_t padding; }; /** @@ -88,6 +93,14 @@ struct regional* regional_create(void); * @return: newly allocated regional. */ struct regional* regional_create_custom(size_t size); + +/** + * Create a new region, with custom settings, that will allocate everything + * outside the region chunk. + * @param size: length of first block. + * @return: newly allocated regional. + */ +struct regional* regional_create_nochunk(size_t size); /** * Free all memory associated with regional. Only keeps the first block with diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c index 65bca8b69d6e..15cccf017b4e 100644 --- a/validator/val_secalgo.c +++ b/validator/val_secalgo.c @@ -990,6 +990,7 @@ static SECKEYPublicKey* nss_buf2ecdsa(unsigned char* key, size_t len, int algo) return pk; } +#if defined(USE_DSA) && defined(USE_SHA1) static SECKEYPublicKey* nss_buf2dsa(unsigned char* key, size_t len) { SECKEYPublicKey* pk; @@ -1050,6 +1051,7 @@ static SECKEYPublicKey* nss_buf2dsa(unsigned char* key, size_t len) } return pk; } +#endif /* USE_DSA && USE_SHA1 */ static SECKEYPublicKey* nss_buf2rsa(unsigned char* key, size_t len) { |