diff --git a/Makefile.in b/Makefile.in index af5b10f65..03a63476a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -744,7 +744,10 @@ listen_dnsport.lo listen_dnsport.o: $(srcdir)/services/listen_dnsport.c config.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h \ - $(srcdir)/sldns/sbuffer.h + $(srcdir)/sldns/sbuffer.h $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ + $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/services/modstack.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h localzone.lo localzone.o: $(srcdir)/services/localzone.c config.h $(srcdir)/services/localzone.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h \ @@ -762,7 +765,8 @@ mesh.lo mesh.o: $(srcdir)/services/mesh.c config.h $(srcdir)/services/mesh.h $(s $(srcdir)/util/data/msgencode.h $(srcdir)/util/timehist.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ $(srcdir)/util/alloc.h $(srcdir)/util/config_file.h $(srcdir)/util/edns.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/sldns/wire2str.h $(srcdir)/services/localzone.h $(srcdir)/util/storage/dnstree.h \ - $(srcdir)/services/view.h $(srcdir)/util/data/dname.h $(srcdir)/respip/respip.h + $(srcdir)/services/view.h $(srcdir)/util/data/dname.h $(srcdir)/respip/respip.h \ + $(srcdir)/services/listen_dnsport.h modstack.lo modstack.o: $(srcdir)/services/modstack.c config.h $(srcdir)/services/modstack.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ @@ -870,13 +874,13 @@ netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/neteve $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \ $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h $(srcdir)/dnstap/dnstap.h \ - \ + $(srcdir)/services/listen_dnsport.h \ net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/sldns/wire2str.h \ + $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h \ + $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \ random.lo random.o: $(srcdir)/util/random.c config.h $(srcdir)/util/random.h $(srcdir)/util/log.h rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ @@ -890,10 +894,10 @@ rtt.lo rtt.o: $(srcdir)/util/rtt.c config.h $(srcdir)/util/rtt.h $(srcdir)/itera $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h -edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/config_file.h $(srcdir)/util/netevent.h \ - $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/util/regional.h \ - $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ - $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ +edns.lo edns.o: $(srcdir)/util/edns.c config.h $(srcdir)/util/edns.h $(srcdir)/util/config_file.h \ + $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ + $(srcdir)/util/regional.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ + $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h dnstree.lo dnstree.o: $(srcdir)/util/storage/dnstree.c config.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ @@ -1071,8 +1075,7 @@ unitlruhash.lo unitlruhash.o: $(srcdir)/testcode/unitlruhash.c config.h $(srcdir $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \ - $(srcdir)/util/log.h \ - $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ + $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \ $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h $(srcdir)/util/timehist.h $(srcdir)/iterator/iterator.h \ $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \ @@ -1182,7 +1185,8 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rtt.h $(srcdir)/services/authzone.h $(srcdir)/validator/val_kcache.h \ - $(srcdir)/validator/val_neg.h + $(srcdir)/validator/val_neg.h \ + unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \ $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ $(srcdir)/daemon/remote.h \ @@ -1276,7 +1280,8 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rtt.h $(srcdir)/services/authzone.h $(srcdir)/validator/val_kcache.h \ - $(srcdir)/validator/val_neg.h + $(srcdir)/validator/val_neg.h \ + replay.lo replay.o: $(srcdir)/testcode/replay.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/config_file.h $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \ $(srcdir)/testcode/testpkts.h $(srcdir)/util/rbtree.h \ diff --git a/aclocal.m4 b/aclocal.m4 index 002c4723b..dd1b8658c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9390,7 +9390,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9421,7 +9421,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/compat/arc4random.c b/compat/arc4random.c index bcef0ec90..b536d3143 100644 --- a/compat/arc4random.c +++ b/compat/arc4random.c @@ -140,6 +140,7 @@ nodevrandom: static inline void _rs_init(u_char *buf, size_t n) { + assert(buf); if (n < KEYSZ + IVSZ) return; diff --git a/config.guess b/config.guess index 2e9ad7fe8..7ea49fadc 100755 --- a/config.guess +++ b/config.guess @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2016 Free Software Foundation, Inc. diff --git a/config.h.in b/config.h.in index f1853ba38..7c3309683 100644 --- a/config.h.in +++ b/config.h.in @@ -69,6 +69,9 @@ /* Define to 1 if you have the `CRYPTO_cleanup_all_ex_data' function. */ #undef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA +/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */ +#undef HAVE_CRYPTO_THREADID_SET_CALLBACK + /* Define to 1 if you have the `ctime_r' function. */ #undef HAVE_CTIME_R @@ -178,6 +181,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_EVENT_H +/* Define to 1 if you have the `EVP_aes_256_cbc' function. */ +#undef HAVE_EVP_AES_256_CBC + /* Define to 1 if you have the `EVP_cleanup' function. */ #undef HAVE_EVP_CLEANUP @@ -187,6 +193,9 @@ /* Define to 1 if you have the `EVP_dss1' function. */ #undef HAVE_EVP_DSS1 +/* Define to 1 if you have the `EVP_EncryptInit_ex' function. */ +#undef HAVE_EVP_ENCRYPTINIT_EX + /* Define to 1 if you have the `EVP_MD_CTX_new' function. */ #undef HAVE_EVP_MD_CTX_NEW @@ -259,6 +268,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_HIREDIS_HIREDIS_H +/* Define to 1 if you have the `HMAC_Init_ex' function. */ +#undef HAVE_HMAC_INIT_EX + /* If you have HMAC_Update */ #undef HAVE_HMAC_UPDATE @@ -451,9 +463,15 @@ /* Define if you have the SSL libraries installed. */ #undef HAVE_SSL +/* Define to 1 if you have the `SSL_CTX_set_ciphersuites' function. */ +#undef HAVE_SSL_CTX_SET_CIPHERSUITES + /* Define to 1 if you have the `SSL_CTX_set_security_level' function. */ #undef HAVE_SSL_CTX_SET_SECURITY_LEVEL +/* Define to 1 if you have the `SSL_CTX_set_tlsext_ticket_key_cb' function. */ +#undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_CB + /* Define to 1 if you have the `SSL_get0_peername' function. */ #undef HAVE_SSL_GET0_PEERNAME @@ -948,7 +966,9 @@ #ifndef UNBOUND_DEBUG +# ifndef NDEBUG # define NDEBUG +# endif #endif /** Use small-ldns codebase */ diff --git a/config.sub b/config.sub index cc69b0676..ba15a57a5 100755 --- a/config.sub +++ b/config.sub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/sh # Configuration validation subroutine script. # Copyright 1992-2016 Free Software Foundation, Inc. diff --git a/configure b/configure index 480cc3fbf..b4c91f8d5 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.8.4. +# Generated by GNU Autoconf 2.69 for unbound 1.9.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.8.4' -PACKAGE_STRING='unbound 1.8.4' +PACKAGE_VERSION='1.9.2' +PACKAGE_STRING='unbound 1.9.2' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -694,9 +694,6 @@ swig SWIG_LIB SWIG PC_PY_DEPENDENCY -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG PY_MAJOR_VERSION PYTHON_SITE_PKG PYTHON_LDFLAGS @@ -710,6 +707,9 @@ PTHREAD_CC ax_pthread_config RUNTIME_PATH LIBOBJS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG LT_SYS_LIBRARY_PATH OTOOL64 OTOOL @@ -892,10 +892,10 @@ CPP YACC YFLAGS LT_SYS_LIBRARY_PATH -PYTHON_VERSION PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR +PYTHON_VERSION SYSTEMD_CFLAGS SYSTEMD_LIBS SYSTEMD_DAEMON_CFLAGS @@ -1440,7 +1440,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.8.4 to adapt to many kinds of systems. +\`configure' configures unbound 1.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.8.4:";; + short | recursive ) echo "Configuration of unbound 1.9.2:";; esac cat <<\_ACEOF @@ -1638,15 +1638,15 @@ Some influential environment variables: default value of `-d' given by some make applications. LT_SYS_LIBRARY_PATH User-defined run-time library search path. - PYTHON_VERSION - The installed Python version to use, for example '2.3'. This - string will be appended to the Python interpreter canonical - name. PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + PYTHON_VERSION + The installed Python version to use, for example '2.3'. This + string will be appended to the Python interpreter canonical + name. SYSTEMD_CFLAGS C compiler flags for SYSTEMD, overriding pkg-config SYSTEMD_LIBS @@ -1722,7 +1722,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.8.4 +unbound configure 1.9.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2431,7 +2431,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.8.4, which was +It was created by unbound $as_me 1.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2781,14 +2781,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu UNBOUND_VERSION_MAJOR=1 -UNBOUND_VERSION_MINOR=8 +UNBOUND_VERSION_MINOR=9 -UNBOUND_VERSION_MICRO=4 +UNBOUND_VERSION_MICRO=2 -LIBUNBOUND_CURRENT=8 -LIBUNBOUND_REVISION=4 -LIBUNBOUND_AGE=0 +LIBUNBOUND_CURRENT=9 +LIBUNBOUND_REVISION=2 +LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 # 1.0.2 had 0:14:0 @@ -2854,7 +2854,9 @@ LIBUNBOUND_AGE=0 # 1.8.1 had 8:1:0 # 1.8.2 had 8:2:0 # 1.8.3 had 8:3:0 -# 1.8.4 had 8:4:0 +# 1.9.0 had 9:0:1 # add ub_ctx_set_tls +# 1.9.1 had 9:1:1 +# 1.9.2 had 9:2:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -14558,6 +14560,127 @@ CC=$lt_save_CC + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + # Checks for header files. for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.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 do : @@ -17015,126 +17138,6 @@ $as_echo "#define HAVE_PYTHON 1" >>confdefs.h CPPFLAGS="$PYTHON_CPPFLAGS" fi ub_have_python=yes - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"python\${PY_MAJOR_VERSION}\"\""; } >&5 ($PKG_CONFIG --exists --print-errors ""python${PY_MAJOR_VERSION}"") 2>&5 @@ -17993,7 +17996,7 @@ fi done -for ac_func in OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify +for ac_func in OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify SSL_CTX_set_tlsext_ticket_key_cb EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -18009,7 +18012,7 @@ done # these check_funcs need -lssl BAKLIBS="$LIBS" LIBS="-lssl $LIBS" -for ac_func in OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host +for ac_func in OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -21148,7 +21151,7 @@ _ACEOF -version=1.8.4 +version=1.9.2 date=`date +'%b %e, %Y'` @@ -21667,7 +21670,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.8.4, which was +This file was extended by unbound $as_me 1.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21733,7 +21736,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.8.4 +unbound config.status 1.9.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d5385d39a..ea1783b70 100644 --- a/configure.ac +++ b/configure.ac @@ -10,16 +10,16 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) -m4_define([VERSION_MINOR],[8]) -m4_define([VERSION_MICRO],[4]) +m4_define([VERSION_MINOR],[9]) +m4_define([VERSION_MICRO],[2]) AC_INIT(unbound, m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]), unbound-bugs@nlnetlabs.nl, unbound) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) -LIBUNBOUND_CURRENT=8 -LIBUNBOUND_REVISION=4 -LIBUNBOUND_AGE=0 +LIBUNBOUND_CURRENT=9 +LIBUNBOUND_REVISION=2 +LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 # 1.0.2 had 0:14:0 @@ -85,7 +85,9 @@ LIBUNBOUND_AGE=0 # 1.8.1 had 8:1:0 # 1.8.2 had 8:2:0 # 1.8.3 had 8:3:0 -# 1.8.4 had 8:4:0 +# 1.9.0 had 9:0:1 # add ub_ctx_set_tls +# 1.9.1 had 9:1:1 +# 1.9.2 had 9:2:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -382,6 +384,8 @@ AC_CHECK_PROG(doxygen, doxygen, doxygen) AC_CHECK_TOOL(STRIP, strip) 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/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],,, [AC_INCLUDES_DEFAULT]) @@ -641,7 +645,6 @@ if test x_$ub_test_python != x_no; then CPPFLAGS="$PYTHON_CPPFLAGS" fi ub_have_python=yes - PKG_PROG_PKG_CONFIG PKG_CHECK_EXISTS(["python${PY_MAJOR_VERSION}"], [PC_PY_DEPENDENCY="python${PY_MAJOR_VERSION}"], [PC_PY_DEPENDENCY="python"]) @@ -781,12 +784,12 @@ else AC_MSG_RESULT([no]) fi AC_CHECK_HEADERS([openssl/conf.h openssl/engine.h openssl/bn.h openssl/dh.h openssl/dsa.h openssl/rsa.h],,, [AC_INCLUDES_DEFAULT]) -AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify]) +AC_CHECK_FUNCS([OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new OpenSSL_add_all_digests OPENSSL_init_crypto EVP_cleanup ERR_load_crypto_strings CRYPTO_cleanup_all_ex_data ERR_free_strings RAND_cleanup DSA_SIG_set0 EVP_dss1 EVP_DigestVerify SSL_CTX_set_tlsext_ticket_key_cb EVP_aes_256_cbc EVP_EncryptInit_ex HMAC_Init_ex CRYPTO_THREADID_set_callback]) # these check_funcs need -lssl BAKLIBS="$LIBS" LIBS="-lssl $LIBS" -AC_CHECK_FUNCS([OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host]) +AC_CHECK_FUNCS([OPENSSL_init_ssl SSL_CTX_set_security_level SSL_set1_host SSL_get0_peername X509_VERIFY_PARAM_set1_host SSL_CTX_set_ciphersuites]) LIBS="$BAKLIBS" AC_CHECK_DECLS([SSL_COMP_get_compression_methods,sk_SSL_COMP_pop_free,SSL_CTX_set_ecdh_auto], [], [], [ @@ -1650,7 +1653,9 @@ AHX_CONFIG_EXT_FLAGS dnl includes [ #ifndef UNBOUND_DEBUG +# ifndef NDEBUG # define NDEBUG +# endif #endif /** Use small-ldns codebase */ diff --git a/contrib/README b/contrib/README index 2b5e75424..262ccc7db 100644 --- a/contrib/README +++ b/contrib/README @@ -38,3 +38,5 @@ distribution but may be helpful. * unbound-querycachedb.py: utility to show data stored in cachedb backend for a particular query name and type. It requires dnspython and (for redis backend) redis Python modules. +* unbound-fuzzme.patch: adds unbound-fuzzme program that parses a packet from + stdin. Used with fuzzers, patch from Jacob Hoffman-Andrews. diff --git a/contrib/fastrpz.patch b/contrib/fastrpz.patch index c49191a0b..0291ea3d8 100644 --- a/contrib/fastrpz.patch +++ b/contrib/fastrpz.patch @@ -3,7 +3,7 @@ Author: fastrpz@farsightsecurity.com --- Index: unboundfastrpz/Makefile.in =================================================================== ---- unboundfastrpz/Makefile.in (revision 4987) +--- unboundfastrpz/Makefile.in (revision 5073) +++ unboundfastrpz/Makefile.in (working copy) @@ -23,6 +23,8 @@ CHECKLOCK_OBJ=@CHECKLOCK_OBJ@ @@ -46,9 +46,9 @@ Index: unboundfastrpz/Makefile.in pythonmod/interface.h \ Index: unboundfastrpz/config.h.in =================================================================== ---- unboundfastrpz/config.h.in (revision 4987) +--- unboundfastrpz/config.h.in (revision 5073) +++ unboundfastrpz/config.h.in (working copy) -@@ -1275,4 +1275,11 @@ +@@ -1293,4 +1293,11 @@ /** the version of unbound-control that this software implements */ #define UNBOUND_CONTROL_VERSION 1 @@ -63,7 +63,7 @@ Index: unboundfastrpz/config.h.in +#undef ENABLE_FASTRPZ Index: unboundfastrpz/configure.ac =================================================================== ---- unboundfastrpz/configure.ac (revision 4987) +--- unboundfastrpz/configure.ac (revision 5073) +++ unboundfastrpz/configure.ac (working copy) @@ -6,6 +6,7 @@ sinclude(acx_python.m4) @@ -73,7 +73,7 @@ Index: unboundfastrpz/configure.ac sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing -@@ -1573,6 +1574,9 @@ +@@ -1575,6 +1576,9 @@ ;; esac @@ -85,7 +85,7 @@ Index: unboundfastrpz/configure.ac # on Solaris, it does not work ($? is changed sources, $^ lists dependencies). Index: unboundfastrpz/daemon/daemon.c =================================================================== ---- unboundfastrpz/daemon/daemon.c (revision 4987) +--- unboundfastrpz/daemon/daemon.c (revision 5073) +++ unboundfastrpz/daemon/daemon.c (working copy) @@ -91,6 +91,9 @@ #include "sldns/keyraw.h" @@ -124,7 +124,7 @@ Index: unboundfastrpz/daemon/daemon.c Index: unboundfastrpz/daemon/daemon.h =================================================================== ---- unboundfastrpz/daemon/daemon.h (revision 4987) +--- unboundfastrpz/daemon/daemon.h (revision 5073) +++ unboundfastrpz/daemon/daemon.h (working copy) @@ -136,6 +136,11 @@ /** the dnscrypt environment */ @@ -140,7 +140,7 @@ Index: unboundfastrpz/daemon/daemon.h /** Index: unboundfastrpz/daemon/worker.c =================================================================== ---- unboundfastrpz/daemon/worker.c (revision 4987) +--- unboundfastrpz/daemon/worker.c (revision 5073) +++ unboundfastrpz/daemon/worker.c (working copy) @@ -75,6 +75,9 @@ #include "libunbound/context.h" @@ -268,9 +268,9 @@ Index: unboundfastrpz/daemon/worker.c verbose(VERB_ALGO, "answer norec from cache -- " Index: unboundfastrpz/doc/unbound.conf.5.in =================================================================== ---- unboundfastrpz/doc/unbound.conf.5.in (revision 4987) +--- unboundfastrpz/doc/unbound.conf.5.in (revision 5073) +++ unboundfastrpz/doc/unbound.conf.5.in (working copy) -@@ -1745,6 +1745,81 @@ +@@ -1781,6 +1781,81 @@ used by dns64 processing instead. Can be entered multiple times, list a new domain for which it applies, one per line. Applies also to names underneath the name given. @@ -2885,7 +2885,7 @@ Index: unboundfastrpz/fastrpz/rpz.m4 +]) Index: unboundfastrpz/iterator/iterator.c =================================================================== ---- unboundfastrpz/iterator/iterator.c (revision 4987) +--- unboundfastrpz/iterator/iterator.c (revision 5073) +++ unboundfastrpz/iterator/iterator.c (working copy) @@ -68,6 +68,9 @@ #include "sldns/str2wire.h" @@ -2972,7 +2972,7 @@ Index: unboundfastrpz/iterator/iterator.c if(type == RESPONSE_TYPE_CNAME) { uint8_t* sname = 0; size_t slen = 0; -@@ -2695,6 +2733,62 @@ +@@ -2694,6 +2732,62 @@ sock_list_insert(&qstate->reply_origin, &qstate->reply->addr, qstate->reply->addrlen, qstate->region); @@ -3035,7 +3035,7 @@ Index: unboundfastrpz/iterator/iterator.c if(iq->minimisation_state != DONOT_MINIMISE_STATE && !(iq->chase_flags & BIT_RD)) { if(FLAGS_GET_RCODE(iq->response->rep->flags) != -@@ -3441,6 +3535,10 @@ +@@ -3440,6 +3534,10 @@ * but only if we did recursion. The nonrecursion referral * from cache does not need to be stored in the msg cache. */ if(!qstate->no_cache_store && qstate->query_flags&BIT_RD) { @@ -3046,7 +3046,7 @@ Index: unboundfastrpz/iterator/iterator.c iter_dns_store(qstate->env, &qstate->qinfo, iq->response->rep, 0, qstate->prefetch_leeway, iq->dp&&iq->dp->has_parent_side_NS, -@@ -3447,6 +3545,34 @@ +@@ -3446,6 +3544,34 @@ qstate->region, qstate->query_flags); } } @@ -3083,7 +3083,7 @@ Index: unboundfastrpz/iterator/iterator.c return 0; Index: unboundfastrpz/iterator/iterator.h =================================================================== ---- unboundfastrpz/iterator/iterator.h (revision 4987) +--- unboundfastrpz/iterator/iterator.h (revision 5073) +++ unboundfastrpz/iterator/iterator.h (working copy) @@ -386,6 +386,16 @@ */ @@ -3104,7 +3104,7 @@ Index: unboundfastrpz/iterator/iterator.h * the QNAME minimisation QTYPE is blocked. */ Index: unboundfastrpz/services/cache/dns.c =================================================================== ---- unboundfastrpz/services/cache/dns.c (revision 4987) +--- unboundfastrpz/services/cache/dns.c (revision 5073) +++ unboundfastrpz/services/cache/dns.c (working copy) @@ -939,6 +939,14 @@ struct regional* region, uint32_t flags) @@ -3123,7 +3123,7 @@ Index: unboundfastrpz/services/cache/dns.c if(!rep) Index: unboundfastrpz/services/mesh.c =================================================================== ---- unboundfastrpz/services/mesh.c (revision 4987) +--- unboundfastrpz/services/mesh.c (revision 5073) +++ unboundfastrpz/services/mesh.c (working copy) @@ -60,6 +60,9 @@ #include "sldns/wire2str.h" @@ -3133,9 +3133,9 @@ Index: unboundfastrpz/services/mesh.c +#include "fastrpz/rpz.h" +#endif #include "respip/respip.h" + #include "services/listen_dnsport.h" - /** subtract timers and the values do not overflow or become negative */ -@@ -1057,6 +1060,13 @@ +@@ -1072,6 +1075,13 @@ else secure = 0; if(!rep && rcode == LDNS_RCODE_NOERROR) rcode = LDNS_RCODE_SERVFAIL; @@ -3149,7 +3149,7 @@ Index: unboundfastrpz/services/mesh.c /* 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 -@@ -1230,6 +1240,7 @@ +@@ -1247,6 +1257,7 @@ key.s.is_valrec = valrec; key.s.qinfo = *qinfo; key.s.query_flags = qflags; @@ -3157,7 +3157,7 @@ Index: unboundfastrpz/services/mesh.c /* We are searching for a similar mesh state when we DO want to * aggregate the state. Thus unique is set to NULL. (default when we * desire aggregation).*/ -@@ -1276,6 +1287,10 @@ +@@ -1293,6 +1304,10 @@ if(!r) return 0; r->query_reply = *rep; @@ -3170,9 +3170,9 @@ Index: unboundfastrpz/services/mesh.c r->edns.opt_list = edns_opt_copy_region(edns->opt_list, Index: unboundfastrpz/util/config_file.c =================================================================== ---- unboundfastrpz/util/config_file.c (revision 4987) +--- unboundfastrpz/util/config_file.c (revision 5073) +++ unboundfastrpz/util/config_file.c (working copy) -@@ -1401,6 +1401,8 @@ +@@ -1418,6 +1418,8 @@ free(cfg->dnstap_socket_path); free(cfg->dnstap_identity); free(cfg->dnstap_version); @@ -3183,9 +3183,9 @@ Index: unboundfastrpz/util/config_file.c #ifdef USE_IPSECMOD Index: unboundfastrpz/util/config_file.h =================================================================== ---- unboundfastrpz/util/config_file.h (revision 4987) +--- unboundfastrpz/util/config_file.h (revision 5073) +++ unboundfastrpz/util/config_file.h (working copy) -@@ -480,6 +480,11 @@ +@@ -490,6 +490,11 @@ /** true to disable DNSSEC lameness check in iterator */ int disable_dnssec_lame_check; @@ -3199,9 +3199,9 @@ Index: unboundfastrpz/util/config_file.h /** number of slabs for ip_ratelimit cache */ Index: unboundfastrpz/util/configlexer.lex =================================================================== ---- unboundfastrpz/util/configlexer.lex (revision 4987) +--- unboundfastrpz/util/configlexer.lex (revision 5073) +++ unboundfastrpz/util/configlexer.lex (working copy) -@@ -434,6 +434,10 @@ +@@ -439,6 +439,10 @@ YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } dnstap-log-forwarder-response-messages{COLON} { YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } @@ -3214,7 +3214,7 @@ Index: unboundfastrpz/util/configlexer.lex ratelimit{COLON} { YDVAR(1, VAR_RATELIMIT) } Index: unboundfastrpz/util/configparser.y =================================================================== ---- unboundfastrpz/util/configparser.y (revision 4987) +--- unboundfastrpz/util/configparser.y (revision 5073) +++ unboundfastrpz/util/configparser.y (working copy) @@ -125,6 +125,7 @@ %token VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES @@ -3224,7 +3224,7 @@ Index: unboundfastrpz/util/configparser.y %token VAR_RESPONSE_IP_TAG VAR_RESPONSE_IP VAR_RESPONSE_IP_DATA %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT %token VAR_DISABLE_DNSSEC_LAME_CHECK -@@ -168,7 +169,7 @@ +@@ -170,7 +171,7 @@ %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -3233,8 +3233,8 @@ Index: unboundfastrpz/util/configparser.y forwardstart contents_forward | pythonstart contents_py | rcstart contents_rc | dtstart contents_dt | viewstart contents_view | dnscstart contents_dnsc | cachedbstart contents_cachedb | -@@ -2639,6 +2640,50 @@ - (strcmp($2, "yes")==0); +@@ -2708,6 +2709,50 @@ + free($2); } ; +rpzstart: VAR_RPZ @@ -3286,7 +3286,7 @@ Index: unboundfastrpz/util/configparser.y OUTYY(("\nP(python:)\n")); Index: unboundfastrpz/util/data/msgencode.c =================================================================== ---- unboundfastrpz/util/data/msgencode.c (revision 4987) +--- unboundfastrpz/util/data/msgencode.c (revision 5073) +++ unboundfastrpz/util/data/msgencode.c (working copy) @@ -590,6 +590,35 @@ return RETVAL_OK; @@ -3346,7 +3346,7 @@ Index: unboundfastrpz/util/data/msgencode.c return 1; Index: unboundfastrpz/util/data/packed_rrset.c =================================================================== ---- unboundfastrpz/util/data/packed_rrset.c (revision 4987) +--- unboundfastrpz/util/data/packed_rrset.c (revision 5073) +++ unboundfastrpz/util/data/packed_rrset.c (working copy) @@ -255,6 +255,10 @@ case sec_status_insecure: return "sec_status_insecure"; @@ -3361,7 +3361,7 @@ Index: unboundfastrpz/util/data/packed_rrset.c } Index: unboundfastrpz/util/data/packed_rrset.h =================================================================== ---- unboundfastrpz/util/data/packed_rrset.h (revision 4987) +--- unboundfastrpz/util/data/packed_rrset.h (revision 5073) +++ unboundfastrpz/util/data/packed_rrset.h (working copy) @@ -193,7 +193,15 @@ sec_status_secure_sentinel_fail, @@ -3382,9 +3382,9 @@ Index: unboundfastrpz/util/data/packed_rrset.h /** Index: unboundfastrpz/util/netevent.c =================================================================== ---- unboundfastrpz/util/netevent.c (revision 4987) +--- unboundfastrpz/util/netevent.c (revision 5073) +++ unboundfastrpz/util/netevent.c (working copy) -@@ -56,6 +56,9 @@ +@@ -57,6 +57,9 @@ #ifdef HAVE_OPENSSL_ERR_H #include #endif @@ -3394,7 +3394,7 @@ Index: unboundfastrpz/util/netevent.c /* -------- Start of local definitions -------- */ /** if CMSG_ALIGN is not defined on this platform, a workaround */ -@@ -588,6 +591,9 @@ +@@ -590,6 +593,9 @@ struct cmsghdr* cmsg; #endif /* S_SPLINT_S */ @@ -3404,7 +3404,7 @@ Index: unboundfastrpz/util/netevent.c rep.c = (struct comm_point*)arg; log_assert(rep.c->type == comm_udp); -@@ -677,6 +683,9 @@ +@@ -679,6 +685,9 @@ int i; struct sldns_buffer *buffer; @@ -3414,7 +3414,7 @@ Index: unboundfastrpz/util/netevent.c rep.c = (struct comm_point*)arg; log_assert(rep.c->type == comm_udp); -@@ -720,6 +729,9 @@ +@@ -722,6 +731,9 @@ (void)comm_point_send_udp_msg(rep.c, buffer, (struct sockaddr*)&rep.addr, rep.addrlen); } @@ -3424,9 +3424,9 @@ Index: unboundfastrpz/util/netevent.c if(!rep.c || rep.c->fd != fd) /* commpoint closed to -1 or reused for another UDP port. Note rep.c cannot be reused with TCP fd. */ break; -@@ -3035,6 +3047,9 @@ - comm_point_start_listening(repinfo->c, -1, - repinfo->c->tcp_timeout_msec); +@@ -3108,6 +3120,9 @@ + repinfo->c->tcp_timeout_msec); + } } +#ifdef ENABLE_FASTRPZ + rpz_end(repinfo); @@ -3434,7 +3434,7 @@ Index: unboundfastrpz/util/netevent.c } void -@@ -3044,6 +3059,9 @@ +@@ -3117,6 +3132,9 @@ return; log_assert(repinfo && repinfo->c); log_assert(repinfo->c->type != comm_tcp_accept); @@ -3443,8 +3443,8 @@ Index: unboundfastrpz/util/netevent.c +#endif if(repinfo->c->type == comm_udp) return; - reclaim_tcp_handler(repinfo->c); -@@ -3063,6 +3081,9 @@ + if(repinfo->c->tcp_req_info) +@@ -3138,6 +3156,9 @@ { verbose(VERB_ALGO, "comm point start listening %d", c->fd==-1?newfd:c->fd); @@ -3456,7 +3456,7 @@ Index: unboundfastrpz/util/netevent.c return; Index: unboundfastrpz/util/netevent.h =================================================================== ---- unboundfastrpz/util/netevent.h (revision 4987) +--- unboundfastrpz/util/netevent.h (revision 5073) +++ unboundfastrpz/util/netevent.h (working copy) @@ -120,6 +120,10 @@ /** return type 0 (none), 4(IP4), 6(IP6) */ @@ -3471,7 +3471,7 @@ Index: unboundfastrpz/util/netevent.h uint8_t nmkey[crypto_box_BEFORENMBYTES]; Index: unboundfastrpz/validator/validator.c =================================================================== ---- unboundfastrpz/validator/validator.c (revision 4987) +--- unboundfastrpz/validator/validator.c (revision 5073) +++ unboundfastrpz/validator/validator.c (working copy) @@ -2755,6 +2755,12 @@ default: diff --git a/contrib/libunbound.so.conf b/contrib/libunbound.so.conf index 3b78fca7f..7cf26fee4 100644 --- a/contrib/libunbound.so.conf +++ b/contrib/libunbound.so.conf @@ -14,6 +14,7 @@ int ub_ctx_set_option(ub_ctx*, string, string); int ub_ctx_get_option(ub_ctx*, string, +string*); int ub_ctx_config(ub_ctx*, string); int ub_ctx_set_fwd(ub_ctx*, string); +int ub_ctx_set_tls(ub_ctx*, bool(int)); int ub_ctx_set_stub(ub_ctx*, string, string, bool(int)); int ub_ctx_resolvconf(ub_ctx*, string); int ub_ctx_hosts(ub_ctx*, string); diff --git a/contrib/unbound-fuzzme.patch b/contrib/unbound-fuzzme.patch new file mode 100644 index 000000000..a2f3e1db3 --- /dev/null +++ b/contrib/unbound-fuzzme.patch @@ -0,0 +1,148 @@ +>From cc9b927f8f29d989ddb8415fe6508a538546abca Mon Sep 17 00:00:00 2001 +From: Jacob Hoffman-Andrews +Date: Wed, 2 Jan 2019 22:52:51 -0800 +Subject: [PATCH] Add unbound-fuzzme. + +This is a small program that simply parses a packet provided on stdout, +for the purposes of fuzzing. +--- + .gitignore | 1 + + Makefile.in | 22 ++++++++++++++++++++-- + smallapp/unbound-fuzzme.c | 38 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 59 insertions(+), 2 deletions(-) + create mode 100644 smallapp/unbound-fuzzme.c + +diff --git a/.gitignore b/.gitignore +index f4527fd8..6163f905 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -24,6 +24,7 @@ + /unbound-checkconf + /unbound-control + /unbound-control-setup ++/unbound-fuzzme + /unbound-host + /unbound.h + /asynclook +diff --git a/Makefile.in b/Makefile.in +index af5b10f6..dacf1ab5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -177,6 +177,10 @@ shm_main.lo remote.lo stats.lo unbound.lo \ + worker.lo @WIN_DAEMON_OBJ@ + DAEMON_OBJ_LINK=$(DAEMON_OBJ) $(COMMON_OBJ_ALL_SYMBOLS) $(SLDNS_OBJ) \ + $(COMPAT_OBJ) @WIN_DAEMON_OBJ_LINK@ ++FUZZME_SRC=smallapp/unbound-fuzzme.c ++FUZZME_OBJ=unbound-fuzzme.lo ++FUZZME_OBJ_LINK=$(FUZZME_OBJ) worker_cb.lo $(COMMON_OBJ_ALL_SYMBOLS) $(SLDNS_OBJ) \ ++$(COMPAT_OBJ) + CHECKCONF_SRC=smallapp/unbound-checkconf.c smallapp/worker_cb.c + CHECKCONF_OBJ=unbound-checkconf.lo worker_cb.lo + CHECKCONF_OBJ_LINK=$(CHECKCONF_OBJ) $(COMMON_OBJ_ALL_SYMBOLS) $(SLDNS_OBJ) \ +@@ -252,6 +256,7 @@ RSRC_OBJ=rsrc_svcinst.o rsrc_svcuninst.o rsrc_anchorupd.o rsrc_unbound.o \ + rsrc_unbound_checkconf.o + + ALL_SRC=$(COMMON_SRC) $(UNITTEST_SRC) $(DAEMON_SRC) \ ++ $(FUZZME_SRC) \ + $(TESTBOUND_SRC) $(LOCKVERIFY_SRC) $(PKTVIEW_SRC) \ + $(MEMSTATS_SRC) $(CHECKCONF_SRC) $(LIBUNBOUND_SRC) $(HOST_SRC) \ + $(ASYNCLOOK_SRC) $(STREAMTCP_SRC) $(PERF_SRC) $(DELAYER_SRC) \ +@@ -259,6 +264,7 @@ ALL_SRC=$(COMMON_SRC) $(UNITTEST_SRC) $(DAEMON_SRC) \ + $(PYTHONMOD_SRC) $(PYUNBOUND_SRC) $(WIN_DAEMON_THE_SRC)\ + $(SVCINST_SRC) $(SVCUNINST_SRC) $(ANCHORUPD_SRC) $(SLDNS_SRC) + ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \ ++ $(FUZZME_OBJ) \ + $(TESTBOUND_OBJ) $(LOCKVERIFY_OBJ) $(PKTVIEW_OBJ) \ + $(MEMSTATS_OBJ) $(CHECKCONF_OBJ) $(LIBUNBOUND_OBJ) $(HOST_OBJ) \ + $(ASYNCLOOK_OBJ) $(STREAMTCP_OBJ) $(PERF_OBJ) $(DELAYER_OBJ) \ +@@ -274,7 +280,7 @@ LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFL + + all: $(COMMON_OBJ) $(ALLTARGET) + +-alltargets: unbound$(EXEEXT) unbound-checkconf$(EXEEXT) lib unbound-host$(EXEEXT) unbound-control$(EXEEXT) unbound-anchor$(EXEEXT) unbound-control-setup $(WINAPPS) $(PYUNBOUND_TARGET) ++alltargets: unbound$(EXEEXT) unbound-checkconf$(EXEEXT) lib unbound-host$(EXEEXT) unbound-control$(EXEEXT) unbound-anchor$(EXEEXT) unbound-control-setup unbound-fuzzme$(EXEEXT) $(WINAPPS) $(PYUNBOUND_TARGET) + + # compat with BSD make, register suffix, and an implicit rule to actualise it. + .SUFFIXES: .lo +@@ -325,6 +331,9 @@ libunbound.la: $(LIBUNBOUND_OBJ_LINK) + unbound$(EXEEXT): $(DAEMON_OBJ_LINK) libunbound.la + $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) + ++unbound-fuzzme$(EXEEXT): $(FUZZME_OBJ_LINK) libunbound.la ++ $(LINK) -o $@ $(FUZZME_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) ++ + unbound-checkconf$(EXEEXT): $(CHECKCONF_OBJ_LINK) libunbound.la + $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS) + +@@ -447,7 +456,7 @@ util/configparser.c util/configparser.h: $(srcdir)/util/configparser.y + + clean: + rm -f *.o *.d *.lo *~ tags +- rm -f unbound$(EXEEXT) unbound-checkconf$(EXEEXT) unbound-host$(EXEEXT) unbound-control$(EXEEXT) unbound-anchor$(EXEEXT) unbound-control-setup libunbound.la unbound.h ++ rm -f unbound$(EXEEXT) unbound-checkconf$(EXEEXT) unbound-fuzzme$(EXEEXT) unbound-host$(EXEEXT) unbound-control$(EXEEXT) unbound-anchor$(EXEEXT) unbound-control-setup libunbound.la unbound.h + rm -f $(ALL_SRC:.c=.lint) + rm -f _unbound.la libunbound/python/libunbound_wrap.c libunbound/python/unbound.py pythonmod/interface.h pythonmod/unboundmodule.py + rm -rf autom4te.cache .libs build doc/html doc/xml +@@ -1183,6 +1192,15 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s + $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/util/rtt.h $(srcdir)/services/authzone.h $(srcdir)/validator/val_kcache.h \ + $(srcdir)/validator/val_neg.h ++unbound-fuzzme.lo unbound-fuzzme.o: $(srcdir)/smallapp/unbound-fuzzme.c \ ++ $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ ++ $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h \ ++ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h \ ++ $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h $(srcdir)/services/cache/rrset.h \ ++ $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ ++ $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/fptr_wlist.h \ ++ $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \ ++ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h + unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \ + $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ + $(srcdir)/daemon/remote.h \ +diff --git a/smallapp/unbound-fuzzme.c b/smallapp/unbound-fuzzme.c +new file mode 100644 +index 00000000..74ae5204 +--- /dev/null ++++ b/smallapp/unbound-fuzzme.c +@@ -0,0 +1,38 @@ ++/* ++ * unbound-fuzzme.c - parse a packet provided on stdin (for fuzzing). ++ * ++ */ ++#include "config.h" ++#include "util/regional.h" ++#include "util/fptr_wlist.h" ++#include "sldns/sbuffer.h" ++ ++#define SZ 10000 ++ ++int main() { ++ char buffer[SZ]; ++ size_t n_read = fread(buffer, 1, SZ, stdin); ++ if (n_read == SZ) { ++ printf("input too big\n"); ++ return 1; ++ } ++ sldns_buffer *pkt = sldns_buffer_new(n_read); ++ sldns_buffer_init_frm_data(pkt, buffer, n_read); ++ ++ struct regional *region = regional_create(); ++ ++ struct msg_parse* prs; ++ struct edns_data edns; ++ prs = (struct msg_parse*)malloc(sizeof(struct msg_parse)); ++ if(!prs) { ++ printf("out of memory on incoming message\n"); ++ return 1; ++ } ++ memset(prs, 0, sizeof(*prs)); ++ memset(&edns, 0, sizeof(edns)); ++ sldns_buffer_set_position(pkt, 0); ++ if(parse_packet(pkt, prs, region) != LDNS_RCODE_NOERROR) { ++ printf("parse error\n"); ++ return 1; ++ } ++} +-- +2.17.1 + diff --git a/contrib/unbound.init b/contrib/unbound.init index 747f94e93..cccadeccf 100644 --- a/contrib/unbound.init +++ b/contrib/unbound.init @@ -39,13 +39,13 @@ start() { # setup root jail if [ -s /etc/localtime ]; then [ -d ${rootdir}/etc ] || mkdir -p ${rootdir}/etc ; - if [ ! -e ${rootdir}/etc/localtime ] || /usr/bin/cmp -s /etc/localtime ${rootdir}/etc/localtime; then + if [ ! -e ${rootdir}/etc/localtime ] || ! /usr/bin/cmp -s /etc/localtime ${rootdir}/etc/localtime; then cp -fp /etc/localtime ${rootdir}/etc/localtime fi; fi; if [ -s /etc/resolv.conf ]; then [ -d ${rootdir}/etc ] || mkdir -p ${rootdir}/etc ; - if [ ! -e ${rootdir}/etc/resolv.conf ] || /usr/bin/cmp -s /etc/resolv.conf ${rootdir}/etc/resolv.conf; then + if [ ! -e ${rootdir}/etc/resolv.conf ] || ! /usr/bin/cmp -s /etc/resolv.conf ${rootdir}/etc/resolv.conf; then cp -fp /etc/resolv.conf ${rootdir}/etc/resolv.conf fi; fi; diff --git a/daemon/daemon.c b/daemon/daemon.c index 4c3d5f1c1..7461a26e2 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -749,6 +749,7 @@ daemon_delete(struct daemon* daemon) free(daemon->pidfile); free(daemon->env); #ifdef HAVE_SSL + listen_sslctx_delete_ticket_keys(); SSL_CTX_free((SSL_CTX*)daemon->listen_sslctx); SSL_CTX_free((SSL_CTX*)daemon->connect_sslctx); #endif @@ -769,7 +770,7 @@ daemon_delete(struct daemon* daemon) # endif # ifdef HAVE_OPENSSL_CONFIG EVP_cleanup(); -# if OPENSSL_VERSION_NUMBER < 0x10100000 +# if (OPENSSL_VERSION_NUMBER < 0x10100000) && !defined(OPENSSL_NO_ENGINE) ENGINE_cleanup(); # endif CONF_modules_free(); diff --git a/daemon/remote.c b/daemon/remote.c index 2c3e7ce5b..1689154f5 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -789,7 +789,8 @@ print_longnum(RES* ssl, const char* desc, size_t x) /** print mem stats */ static int -print_mem(RES* ssl, struct worker* worker, struct daemon* daemon) +print_mem(RES* ssl, struct worker* worker, struct daemon* daemon, + struct ub_stats_info* s) { size_t msg, rrset, val, iter, respip; #ifdef CLIENT_SUBNET @@ -847,6 +848,9 @@ print_mem(RES* ssl, struct worker* worker, struct daemon* daemon) dnscrypt_nonce)) return 0; #endif /* USE_DNSCRYPT */ + if(!print_longnum(ssl, "mem.streamwait"SQ, + (size_t)s->svr.mem_stream_wait)) + return 0; return 1; } @@ -969,6 +973,8 @@ print_ext(RES* ssl, struct ub_stats_info* s) (unsigned long)s->svr.qtcp_outgoing)) return 0; if(!ssl_printf(ssl, "num.query.tls"SQ"%lu\n", (unsigned long)s->svr.qtls)) return 0; + if(!ssl_printf(ssl, "num.query.tls.resume"SQ"%lu\n", + (unsigned long)s->svr.qtls_resume)) return 0; if(!ssl_printf(ssl, "num.query.ipv6"SQ"%lu\n", (unsigned long)s->svr.qipv6)) return 0; /* flags */ @@ -1088,7 +1094,7 @@ do_stats(RES* ssl, struct daemon_remote* rc, int reset) if(!print_uptime(ssl, rc->worker, reset)) return; if(daemon->cfg->stat_extended) { - if(!print_mem(ssl, rc->worker, daemon)) + if(!print_mem(ssl, rc->worker, daemon, &total)) return; if(!print_hist(ssl, &total)) return; @@ -1981,7 +1987,7 @@ parse_delegpt(RES* ssl, char* args, uint8_t* nm, int allow_names) return NULL; } } else { -#ifndef HAVE_SSL_SET1_HOST +#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST) if(auth_name) log_err("no name verification functionality in " "ssl library, ignored name for %s", todo); diff --git a/daemon/stats.c b/daemon/stats.c index cff01d903..504b0efcc 100644 --- a/daemon/stats.c +++ b/daemon/stats.c @@ -66,6 +66,9 @@ #ifdef CLIENT_SUBNET #include "edns-subnet/subnetmod.h" #endif +#ifdef HAVE_SSL +#include +#endif /** add timers and the values do not overflow or become negative */ static void @@ -328,6 +331,8 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset) } lock_rw_unlock(&worker->env.auth_zones->lock); } + s->svr.mem_stream_wait = + (long long)tcp_req_info_get_stream_buffer_size(); /* Set neg cache usage numbers */ set_neg_cache_stats(worker, &s->svr, reset); @@ -412,6 +417,7 @@ void server_stats_add(struct ub_stats_info* total, struct ub_stats_info* a) total->svr.qtcp += a->svr.qtcp; total->svr.qtcp_outgoing += a->svr.qtcp_outgoing; total->svr.qtls += a->svr.qtls; + total->svr.qtls_resume += a->svr.qtls_resume; total->svr.qipv6 += a->svr.qipv6; total->svr.qbit_QR += a->svr.qbit_QR; total->svr.qbit_AA += a->svr.qbit_AA; @@ -468,8 +474,13 @@ void server_stats_insquery(struct ub_server_stats* stats, struct comm_point* c, stats->qopcode[ LDNS_OPCODE_WIRE(sldns_buffer_begin(c->buffer)) ]++; if(c->type != comm_udp) { stats->qtcp++; - if(c->ssl != NULL) + if(c->ssl != NULL) { stats->qtls++; +#ifdef HAVE_SSL + if(SSL_session_reused(c->ssl)) + stats->qtls_resume++; +#endif + } } if(repinfo && addr_is_ip6(&repinfo->addr, repinfo->addrlen)) stats->qipv6++; diff --git a/daemon/unbound.c b/daemon/unbound.c index 020e45303..6cc8225f5 100644 --- a/daemon/unbound.c +++ b/daemon/unbound.c @@ -67,6 +67,7 @@ #ifdef HAVE_GRP_H #include #endif +#include #ifndef S_SPLINT_S /* splint chokes on this system header file */ @@ -430,6 +431,24 @@ perform_setup(struct daemon* daemon, struct config_file* cfg, int debug_mode, if(!(daemon->listen_sslctx = listen_sslctx_create( cfg->ssl_service_key, cfg->ssl_service_pem, NULL))) fatal_exit("could not set up listen SSL_CTX"); + if(cfg->tls_ciphers && cfg->tls_ciphers[0]) { + if (!SSL_CTX_set_cipher_list(daemon->listen_sslctx, cfg->tls_ciphers)) { + fatal_exit("failed to set tls-cipher %s", cfg->tls_ciphers); + } + } +#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES + if(cfg->tls_ciphersuites && cfg->tls_ciphersuites[0]) { + if (!SSL_CTX_set_ciphersuites(daemon->listen_sslctx, cfg->tls_ciphersuites)) { + fatal_exit("failed to set tls-ciphersuites %s", cfg->tls_ciphersuites); + } + } +#endif + if(cfg->tls_session_ticket_keys.first && + cfg->tls_session_ticket_keys.first->str[0] != 0) { + if(!listen_sslctx_setup_ticket_keys(daemon->listen_sslctx, cfg->tls_session_ticket_keys.first)) { + fatal_exit("could not set session ticket SSL_CTX"); + } + } } if(!(daemon->connect_sslctx = connect_sslctx_create(NULL, NULL, cfg->tls_cert_bundle, cfg->tls_win_cert))) diff --git a/daemon/worker.c b/daemon/worker.c index f40d1cc2f..fc93817a0 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -660,10 +660,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo, if(!reply_check_cname_chain(qinfo, rep)) { /* cname chain invalid, redo iterator steps */ verbose(VERB_ALGO, "Cache reply: cname chain broken"); - bail_out: - rrset_array_unlock_touch(worker->env.rrset_cache, - worker->scratchpad, rep->ref, rep->rrset_count); - return 0; + goto bail_out; } } /* check security status of the cached answer */ @@ -758,6 +755,11 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo, } /* go and return this buffer to the client */ return 1; + +bail_out: + rrset_array_unlock_touch(worker->env.rrset_cache, + worker->scratchpad, rep->ref, rep->rrset_count); + return 0; } /** Reply to client and perform prefetch to keep cache up to date. @@ -1088,7 +1090,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error, struct ub_packed_rrset_key* alias_rrset = NULL; struct reply_info* partial_rep = NULL; struct query_info* lookup_qinfo = &qinfo; - struct query_info qinfo_tmp; /* placeholdoer for lookup_qinfo */ + struct query_info qinfo_tmp; /* placeholder for lookup_qinfo */ struct respip_client_info* cinfo = NULL, cinfo_tmp; memset(&qinfo, 0, sizeof(qinfo)); @@ -1171,7 +1173,7 @@ worker_handle_request(struct comm_point* c, void* arg, int error, /* check if this query should be dropped based on source ip rate limiting */ if(!infra_ip_ratelimit_inc(worker->env.infra_cache, repinfo, - *worker->env.now)) { + *worker->env.now, c->buffer)) { /* See if we are passed through with slip factor */ if(worker->env.cfg->ip_ratelimit_factor != 0 && ub_random_max(worker->env.rnd, @@ -1559,8 +1561,17 @@ send_reply_rc: if(worker->env.cfg->log_replies) { struct timeval tv = {0, 0}; - log_reply_info(0, &qinfo, &repinfo->addr, repinfo->addrlen, - tv, 1, c->buffer); + if(qinfo.local_alias && qinfo.local_alias->rrset && + qinfo.local_alias->rrset->rk.dname) { + /* log original qname, before the local alias was + * used to resolve that CNAME to something else */ + qinfo.qname = qinfo.local_alias->rrset->rk.dname; + log_reply_info(0, &qinfo, &repinfo->addr, repinfo->addrlen, + tv, 1, c->buffer); + } else { + log_reply_info(0, &qinfo, &repinfo->addr, repinfo->addrlen, + tv, 1, c->buffer); + } } #ifdef USE_DNSCRYPT if(!dnsc_handle_uncurved_request(repinfo)) { diff --git a/doc/Changelog b/doc/Changelog index 9e05a0768..2c76f7a2e 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,249 @@ +4 April 2019: Wouter + - Fix spelling error in log output for event method. + +3 April 2019: Wouter + - Move goto label in answer_from_cache to the end of the function + where it is more visible. + - Fix auth-zone NSEC3 response for wildcard nodata answers, + include the closest encloser in the answer. + +2 April 2019: Wouter + - Fix auth-zone NSEC3 response for empty nonterminals with exact + match nsec3 records. + - Fix for out of bounds integers, thanks to OSTIF audit. It is in + allocation debug code. + - Fix for auth zone nsec3 ent fix for wildcard nodata. + +25 March 2019: Wouter + - Fix that tls-session-ticket-keys: "" on its own in unbound.conf + disables the tls session ticker key calls into the OpenSSL API. + - Fix crash if tls-servic-pem not filled in when necessary. + +21 March 2019: Wouter + - Fix #4240: Fix whitespace cleanup in example.conf. + +19 March 2019: Wouter + - add type CAA to libpyunbound (accessing libunbound from python). + +18 March 2019: Wouter + - Add log message, at verbosity 4, that says the query is encrypted + with TLS, if that is enabled for the query. + - Fix #4239: set NOTIMPL when deny-any is enabled, for RFC8482. + +7 March 2019: Wouter + - Fix for #4233: guard use of NDEBUG, so that it can be passed in + CFLAGS into configure. + +5 March 2019: Wouter + - Tag release 1.9.1rc1. Which became 1.9.1 on 12 March 2019. Trunk + has 1.9.2 in development. + +1 March 2019: Wouter + - output forwarder log in ssl_req_order test. + +28 February 2019: Wouter + - Remove memory leak on pythonmod python2 script file init. + - Remove swig gcc8 python function cast warnings, they are ignored. + - Print correct module that failed when module-config is wrong. + +27 February 2019: Wouter + - Fix #4229: Unbound man pages lack information, about access-control + order and local zone tags, and elements in views. + - Fix #14: contrib/unbound.init: Fix wrong comparison judgment + before copying. + - Fix for python module on Windows, fix fopen. + +25 February 2019: Wouter + - Fix #4227: pair event del and add for libevent for tcp_req_info. + +21 February 2019: Wouter + - Fix the error for unknown module in module-config is understandable, + and explains it was not compiled in and where to see the list. + - In example.conf explain where to put cachedb module in module-config. + - In man page and example config explain that most modules have to + be listed at the start of module-config. + +20 February 2019: Wouter + - Fix pythonmod include and sockaddr_un ifdefs for compile on + Windows, and for libunbound. + +18 February 2019: Wouter + - Print query name with ip_ratelimit exceeded log lines. + - Spaces instead of tabs in that log message. + - Print query name and IP address when domain rate limit exceeded. + +14 February 2019: Wouter + - Fix capsforid canonical sort qsort callback. + +11 February 2019: Wouter + - Note default for module-config in man page. + - Fix recursion lame test for qname minimisation asked queries, + that were not present in the set of prepared answers. + - Fix #13: Remove left-over requirements on OpenSSL >= 1.1.0 for + cert name matching, from man page. + - make depend, with newer gcc, nicer layout. + +7 February 2019: Wouter + - Fix #4206: OpenSSL 1.0.2 hostname verification for FreeBSD 11.2. + - Fix that qname minimisation does not skip a label when missing + nameserver targets need to be fetched. + - Fix #4225: clients seem to erroneously receive no answer with + DNS-over-TLS and qname-minimisation. + +4 February 2019: Wouter + - Fix that log-replies prints the correct name for local-alias + names, for names that have a CNAME in local-data configuration. + It logs the original query name, not the target of the CNAME. + - Add local-zone type inform_redirect, which logs like type inform, + and redirects like type redirect. + - Perform canonical sort for 0x20 capsforid compare of replies, + this sorts rrsets in the authority and additional section before + comparison, so that out of order rrsets do not cause failure. + +31 January 2019: Wouter + - Set ub_ctx_set_tls call signature in ltrace config file for + libunbound in contrib/libunbound.so.conf. + - improve documentation for tls-service-key and forward-first. + - #10: fixed pkg-config operations, PKG_PROG_PKG_CONFIG moved out of + conditional section, fixes systemd builds, from Enrico Scholz. + - #9: For openssl 1.0.2 use the CRYPTO_THREADID locking callbacks, + still supports the set_id_callback previous API. And for 1.1.0 + no locking callbacks are needed. + - #8: Fix OpenSSL without ENGINE support compilation. + - Wipe TLS session key data from memory on exit. + +30 January 2019: Ralph + - Fix case in which query timeout can result in marking delegation + as edns_lame_known. + +29 January 2019: Wouter + - Fix spelling of tls-ciphers in example.conf.in. + - Fix #4224: auth_xfr_notify.rpl test broken due to typo + - Fix locking for libunbound context setup with broken port config. + +28 January 2019: Wouter + - ub_ctx_set_tls call for libunbound that enables DoT for the machines + set with ub_ctx_set_fwd. Patch from Florian Obser. + - Set build system for added call in the libunbound API. + - List example config for root zone copy locally hosted with auth-zone + as suggested from draft-ietf-dnsop-7706-bis-02. But with updated + B root address. + - set version to 1.9.0 for release. And this was released with the + spelling for tls-ciphers fix as 1.9.0 on Feb 5. Trunk has 1.9.1 in + development. + +25 January 2019: Wouter + - Fix that tcp for auth zone and outgoing does not remove and + then gets the ssl read again applied to the deleted commpoint. + - updated contrib/fastrpz.patch to cleanly diff. + - no lock when threads disabled in tcp request buffer count. + - remove compile warnings from libnettle compile. + - output of newer lex 2.6.1 and bison 3.0.5. + +24 January 2019: Wouter + - Newer aclocal and libtoolize used for generating configure scripts, + aclocal 1.16.1 and libtoolize 2.4.6. + - Fix unit test for python 3.7 new keyword 'async'. + - clang analysis fixes, assert arc4random buffer in init, + no check for already checked delegation pointer in iterator, + in testcode check for NULL packet matches, in perf do not copy + from NULL start list when growing capacity. Adjust host and file + only when present in test header read to please checker. In + testcode for unknown macro operand give zero result. Initialise the + passed argv array in test code. In test code add EDNS data + segment copy only when nonempty. + - Patch from Florian Obser fixes some compiler warnings: + include mini_event.h to have a prototype for mini_ev_cmp + include edns.h to have a prototype for apply_edns_options + sldns_wire2str_edns_keepalive_print is only called in the wire2str, + module declare it static to get rid of compiler warning: + no previous prototype for function + infra_find_ip_ratedata() is only called in the infra module, + declare it static to get rid of compiler warning: + no previous prototype for function + do not shadow local variable buf in authzone + auth_chunks_delete and az_nsec3_findnode are only called in the + authzone module, declare them static to get rid of compiler warning: + no previous prototype for function... + copy_rrset() is only called in the respip module, declare it + static to get rid of compiler warning: + no previous prototype for function 'copy_rrset' + no need for another variable "r"; gets rid of compiler warning: + declaration shadows a local variable in libunbound.c + no need for another variable "ns"; gets rid of compiler warning: + declaration shadows a local variable in iterator.c + - Moved includes and make depend. + +23 January 2019: Wouter + - Patch from Manabu Sonoda with tls-ciphers and tls-ciphersuites + options for unbound.conf. + - Fixes for the patch, and man page entry. + - Fix configure to detect SSL_CTX_set_ciphersuites, for better + library compatibility when compiling. + - Patch for TLS session resumption from Manabu Sonoda, + enable with tls-session-ticket-keys in unbound.conf. + - Fixes for patch (includes, declarations, warnings). Free at end + and keep config options in order read from file to keep the first + one as the first one. + - Fix for IXFR fallback to reset counter when IXFR does not timeout. + +22 January 2019: Wouter + - Fix space calculation for tcp req buffer size. + - Doc for stream-wait-size and unit test. + - unbound-control stats has mem.streamwait that counts TCP and TLS + waiting result buffers. + - Fix for #4219: secondaries not updated after serial change, unbound + falls back to AXFR after IXFR gives several timeout failures. + - Fix that auth zone after IXFR fallback tries the same master. + +21 January 2019: Wouter + - Fix tcp idle timeout test, for difference in the tcp reply code. + - Unit test for tcp request reorder and timeouts. + - Unit tests for ssl out of order processing. + - Fix that multiple dns fragments can be carried in one TLS frame. + - Add stream-wait-size: 4m config option to limit the maximum + memory used by waiting tcp and tls stream replies. This avoids + a denial of service where these replies use up all of the memory. + +17 January 2019: Wouter + - For caps-for-id fallback, use the whitelist to avoid timeout + starting a fallback sequence for it. + - increase mesh max activation count for capsforid long fetches. + +16 January 2019: Ralph + - Get ready for the DNS flag day: remove EDNS lame procedure, do not + re-query without EDNS after timeout. + +15 January 2019: Wouter + - In the out of order processing, reset byte count for (potential) + partial read. + - Review fixes in out of order processing. + +14 January 2019: Wouter + - streamtcp option -a send queries consecutively and prints answers + as they arrive. + - Fix for out of order processing administration quit cleanup. + - unit test for tcp out of order processing. + +11 January 2019: Wouter + - Initial commit for out-of-order processing for TCP and TLS. + +9 January 2019: Wouter + - Log query name for looping module errors. + +8 January 2019: Wouter + - Fix syntax in comment of local alias processing. + - Fix NSEC3 record that is returned in wildcard replies from + auth-zone zones with NSEC3 and wildcards. + +7 January 2019: Wouter + - On FreeBSD warn if systcl settings do not allow server TCP FASTOPEN, + and server tcp fastopen is enabled at compile time. + - Document interaction between the tls-upstream option in the server + section and forward-tls-upstream option in the forward-zone sections. + - Add contrib/unbound-fuzzme.patch from Jacob Hoffman-Andrews, + the patch adds a program used for fuzzing. + 12 December 2018: Wouter - Fix for crash in dns64 module if response is null. diff --git a/doc/example.conf.in b/doc/example.conf.in index d0b0dd44e..c78156fe1 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -123,6 +123,9 @@ server: # Suggested values are 512 to 4096. Default is 4096. 65536 disables it. # max-udp-size: 4096 + # max memory to use for stream(tcp and tls) waiting result buffers. + # stream-wait-size: 4m + # buffer size for handling DNS data. No messages larger than this # size can be sent or received, by UDP or TCP. In bytes. # msg-buffer-size: 65552 @@ -472,6 +475,9 @@ server: # module configuration of the server. A string with identifiers # separated by spaces. Syntax: "[dns64] [validator] iterator" + # most modules have to be listed at the beginning of the line, + # except cachedb(just before iterator), and python (at the beginning, + # or, just before the iterator). # module-config: "validator iterator" # File with trusted keys, kept uptodate using RFC5011 probes, @@ -486,7 +492,7 @@ server: # trust anchor signaling sends a RFC8145 key tag query after priming. # trust-anchor-signaling: yes - + # Root key trust anchor sentinel (draft-ietf-dnsop-kskroll-sentinel) # root-key-sentinel: yes @@ -670,6 +676,7 @@ server: # o typetransparent resolves normally for other types and other names # o inform acts like transparent, but logs client IP address # o inform_deny drops queries and logs client IP address + # o inform_redirect redirects queries and logs client IP address # o always_transparent, always_refuse, always_nxdomain, resolve in # that way but ignore local data for that name # o noview breaks out of that view towards global local-zones. @@ -712,6 +719,19 @@ server: # tls-service-pem: "path/to/publiccertfile.pem" # tls-port: 853 + # cipher setting for TLSv1.2 + # tls-ciphers: "DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256" + # cipher setting for TLSv1.3 + # tls-ciphersuites: "TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_AES_128_CCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256" + + # Add the secret file for TLS Session Ticket. + # Secret file must be 80 bytes of random data. + # First key use to encrypt and decrypt TLS session tickets. + # Other keys use to decrypt only. + # requires restart to take effect. + # tls-session-ticket-keys: "path/to/secret_file1" + # tls-session-ticket-keys: "path/to/secret_file2" + # request upstream over TLS (with plain DNS inside the TLS stream). # Default is no. Can be turned on and off with unbound-control. # tls-upstream: no @@ -773,7 +793,7 @@ server: # fast-server-permil: 0 # the number of servers that will be used in the fast server selection. # fast-server-num: 3 - + # Specific options for ipsecmod. unbound needs to be configured with # --enable-ipsecmod for these to take effect. # @@ -806,6 +826,8 @@ server: # Python config section. To enable: # o use --with-pythonmodule to configure before compiling. # o list python in the module-config string (above) to enable. +# It can be at the start, it gets validated results, or just before +# the iterator and process before DNSSEC validation. # o and give a python-script to run. python: # Script file to load @@ -890,15 +912,25 @@ remote-control: # notifies. # auth-zone: # name: "." +# master: 199.9.14.201 # b.root-servers.net +# master: 192.33.4.12 # c.root-servers.net +# master: 199.7.91.13 # d.root-servers.net +# master: 192.5.5.241 # f.root-servers.net +# master: 192.112.36.4 # g.root-servers.net +# master: 193.0.14.129 # k.root-servers.net +# master: 192.0.47.132 # xfr.cjr.dns.icann.org +# master: 192.0.32.132 # xfr.lax.dns.icann.org +# master: 2001:500:200::b # b.root-servers.net +# master: 2001:500:2::c # c.root-servers.net +# master: 2001:500:2d::d # d.root-servers.net +# master: 2001:500:2f::f # f.root-servers.net +# master: 2001:500:12::d0d # g.root-servers.net +# master: 2001:7fd::1 # k.root-servers.net +# master: 2620:0:2830:202::132 # xfr.cjr.dns.icann.org +# master: 2620:0:2d0:202::132 # xfr.lax.dns.icann.org +# fallback-enabled: yes # for-downstream: no # for-upstream: yes -# fallback-enabled: yes -# master: b.root-servers.net -# master: c.root-servers.net -# master: e.root-servers.net -# master: f.root-servers.net -# master: g.root-servers.net -# master: k.root-servers.net # auth-zone: # name: "example.org" # for-downstream: yes @@ -946,7 +978,7 @@ remote-control: # Enable external backend DB as auxiliary cache. Specify the backend name # (default is "testframe", which has no use other than for debugging and # testing) and backend-specific options. The 'cachedb' module must be -# included in module-config. +# included in module-config, just before the iterator module. # cachedb: # backend: "testframe" # # secret seed string to calculate hashed keys diff --git a/doc/libunbound.3.in b/doc/libunbound.3.in index 1f48d9de6..5bd4ad8a1 100644 --- a/doc/libunbound.3.in +++ b/doc/libunbound.3.in @@ -20,6 +20,7 @@ .B ub_ctx_config, .B ub_ctx_set_fwd, .B ub_ctx_set_stub, +.B ub_ctx_set_tls, .B ub_ctx_resolvconf, .B ub_ctx_hosts, .B ub_ctx_add_ta, @@ -72,6 +73,9 @@ \fIint\fR isprime); .LP \fIint\fR +\fBub_ctx_set_tls\fR(\fIstruct ub_ctx*\fR ctx, \fIint\fR tls); +.LP +\fIint\fR \fBub_ctx_resolvconf\fR(\fIstruct ub_ctx*\fR ctx, \fIchar*\fR fname); .LP \fIint\fR @@ -227,6 +231,12 @@ for different zones, or to add multiple addresses for a particular zone. At this time it is only possible to set configuration before the first resolve is done. .TP +.B ub_ctx_set_tls +Enable DNS over TLS (DoT) for machines set with +.B ub_ctx_set_fwd. +At this time it is only possible to set configuration before the +first resolve is done. +.TP .B ub_ctx_resolvconf By default the root servers are queried and full resolver mode is used, but you can use this call to read the list of nameservers to use from the diff --git a/doc/unbound-control.8.in b/doc/unbound-control.8.in index da042c816..6ea40009c 100644 --- a/doc/unbound-control.8.in +++ b/doc/unbound-control.8.in @@ -499,6 +499,10 @@ Memory in bytes in use by the iterator module. Memory in bytes in use by the validator module. Includes the key cache and negative cache. .TP +.I mem.streamwait +Memory in bytes in used by the TCP and TLS stream wait buffers. These are +answers waiting to be written back to the clients. +.TP .I histogram...to.. Shows a histogram, summed over all threads. Every element counts the recursive queries whose reply time fit between the lower and upper bound. @@ -534,6 +538,10 @@ other servers. Number of queries that were made using TLS towards the unbound server. These are also counted in num.query.tcp, because TLS uses TCP. .TP +.I num.query.tls.resume +Number of TLS session resumptions, these are queries over TLS towards +the unbound server where the client negotiated a TLS session resumption key. +.TP .I num.query.ipv6 Number of queries that were made using IPv6 towards the unbound server. .TP diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 0acce72ac..0567c4d34 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -207,6 +207,16 @@ Maximum UDP response size (not applied to TCP response). 65536 disables the udp response size maximum, and uses the choice from the client, always. Suggested values are 512 to 4096. Default is 4096. .TP +.B stream\-wait\-size: \fI +Number of bytes size maximum to use for waiting stream buffers. Default is +4 megabytes. A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, +megabytes or gigabytes (1024*1024 bytes in a megabyte). As TCP and TLS streams +queue up multiple results, the amount of memory used for these buffers does +not exceed this number, otherwise the responses are dropped. This manages +the total memory usage of the server (under heavy use), the number of requests +that can be queued up per connection is also limited, with further requests +waiting in TCP buffers. +.TP .B msg\-buffer\-size: \fI Number of bytes size of the message buffers. Default is 65552 bytes, enough for 64 Kb packets, the maximum DNS message size. No message larger than this @@ -440,20 +450,23 @@ TCP wireformat. The other server must support this (see \fBtls\-service\-key\fR). If you enable this, also configure a tls\-cert\-bundle or use tls\-win\-cert to load CA certs, otherwise the connections cannot be authenticated. +This option enables TLS for all of them, but if you do not set this you can +configure TLS specifically for some forward zones with forward\-tls\-upstream. And also with stub\-tls\-upstream. .TP .B ssl\-upstream: \fI Alternate syntax for \fBtls\-upstream\fR. If both are present in the config file the last is used. .TP .B tls\-service\-key: \fI -If enabled, the server provides TLS service on its TCP sockets. The clients -have to use tls\-upstream: yes. The file is the private key for the TLS -session. The public certificate is in the tls\-service\-pem file. Default -is "", turned off. Requires a restart (a reload is not enough) if changed, -because the private key is read while root permissions are held and before -chroot (if any). Normal DNS TCP service is not provided and gives errors, -this service is best run with a different \fBport:\fR config or \fI@port\fR -suffixes in the \fBinterface\fR config. +If enabled, the server provides TLS service on the TCP ports marked +implicitly or explicitly for TLS service with tls\-port. The file must +contain the private key for the TLS session, the public certificate is in +the tls\-service\-pem file and it must also be specified if tls\-service\-key +is specified. The default is "", turned off. Enabling or disabling +this service requires a restart (a reload is not enough), because the +key is read while root permissions are held and before chroot (if any). +The ports enabled implicitly or explicitly via \fBtls\-port:\fR do not provide +normal DNS TCP service. .TP .B ssl\-service\-key: \fI Alternate syntax for \fBtls\-service\-key\fR. @@ -492,6 +505,27 @@ List portnumbers as tls\-additional\-port, and when interfaces are defined, eg. with the @port suffix, as this port number, they provide dns over TLS service. Can list multiple, each on a new statement. .TP +.B tls-session-ticket-keys: \fI +If not "", lists files with 80 bytes of random contents that are used to +perform TLS session resumption for clients using the unbound server. +These files contain the secret key for the TLS session tickets. +First key use to encrypt and decrypt TLS session tickets. +Other keys use to decrypt only. With this you can roll over to new keys, +by generating a new first file and allowing decrypt of the old file by +listing it after the first file for some time, after the wait clients are not +using the old key any more and the old key can be removed. +One way to create the file is dd if=/dev/random bs=1 count=80 of=ticket.dat +The first 16 bytes should be different from the old one if you create a second key, that is the name used to identify the key. Then there is 32 bytes random +data for an AES key and then 32 bytes random data for the HMAC key. +.TP +.B tls\-ciphers: \fI +Set the list of ciphers to allow when serving TLS. Use "" for defaults, +and that is the default. +.TP +.B tls\-ciphersuites: \fI +Set the list of ciphersuites to allow when serving TLS. This is for newer +TLS 1.3 connections. Use "" for defaults, and that is the default. +.TP .B use\-systemd: \fI Enable or disable systemd socket activation. Default is no. @@ -512,6 +546,7 @@ classless network block. The action can be \fIdeny\fR, \fIrefuse\fR, \fIallow\fR, \fIallow_setrd\fR, \fIallow_snoop\fR, \fIdeny_non_local\fR or \fIrefuse_non_local\fR. The most specific netblock match is used, if none match \fIdeny\fR is used. +The order of the access\-control statements therefore does not matter. .IP The action \fIdeny\fR stops queries from hosts from that netblock. .IP @@ -896,6 +931,12 @@ Setting this to "iterator" will result in a non\-validating server. Setting this to "validator iterator" will turn on DNSSEC validation. The ordering of the modules is important. You must also set trust\-anchors for validation to be useful. +The default is "validator iterator". When the server is built with +EDNS client subnet support the default is "subnetcache validator iterator". +Most modules that need to be listed here have to be listed at the beginning +of the line. The cachedb module has to be listed just before the iterator. +The python module can be listed in different places, it then processes the +output of the module it is just before. .TP .B trust\-anchor\-file: \fI File with trusted keys for validation. Both DS and DNSKEY entries can appear @@ -1107,7 +1148,7 @@ address space are not validated. This is usually required whenever Configure a local zone. The type determines the answer to give if there is no match from local\-data. The types are deny, refuse, static, transparent, redirect, nodefault, typetransparent, inform, inform_deny, -always_transparent, always_refuse, always_nxdomain, noview, +inform_redirect, always_transparent, always_refuse, always_nxdomain, noview, and are explained below. After that the default settings are listed. Use local\-data: to enter data into the local zone. Answers for local zones are authoritative DNS answers. By default the zones are class IN. @@ -1168,6 +1209,10 @@ looking up infected names are logged, eg. to run antivirus on them. The query is dropped, like 'deny', and logged, like 'inform'. Ie. find infected machines without answering the queries. .TP 10 +\h'5'\fIinform_redirect\fR +The query is redirected, like 'redirect', and logged, like 'inform'. +Ie. answer queries with fixed data and also log the machines that ask. +.TP 10 \h'5'\fIalways_transparent\fR Like transparent, but ignores local data and resolves normally. .TP 10 @@ -1323,7 +1368,8 @@ TTL can be inserted like this: "2001:DB8::4 7200 www.example.com" Assign tags to localzones. Tagged localzones will only be applied when the used access-control element has a matching tag. Tags must be defined in \fIdefine\-tags\fR. Enclose list of tags in quotes ("") and put spaces between -tags. +tags. When there are multiple tags it checks if the intersection of the +list of tags for the query and local\-zone\-tag is non-empty. .TP 5 .B local\-zone\-override: \fI Override the localzone type for queries from addresses matching netblock. @@ -1581,13 +1627,11 @@ the '@' and '#', the '@' comes first. At high verbosity it logs the TLS certificate, with TLS enabled. If you leave out the '#' and auth name from the forward\-addr, any name is accepted. The cert must also match a CA from the tls\-cert\-bundle. -The cert name match code needs OpenSSL 1.1.0 or later to be enabled. .TP .B forward\-first: \fI -If enabled, a query is attempted without the forward clause if it fails. -The data could not be retrieved and would have caused SERVFAIL because -the servers are unreachable, instead it is tried without this clause. -The default is no. +If a forwarded query is met with a SERVFAIL error, and this option is +enabled, unbound will fall back to normal recursive resolution for this +query as if no query forwarding had been specified. The default is "no". .TP .B forward\-tls\-upstream: \fI Enabled or disable whether the queries to this forwarder use TLS for transport. @@ -1682,7 +1726,9 @@ data (eg. from the master servers). There may be multiple .B view: clauses. Each with a \fBname:\fR and zero or more \fBlocal\-zone\fR and -\fBlocal\-data\fR elements. View can be mapped to requests by specifying the +\fBlocal\-data\fR elements. Views can also contain view\-first, +response\-ip, response\-ip\-data and local\-data\-ptr elements. +View can be mapped to requests by specifying the view name in an \fBaccess\-control\-view\fR element. Options from matching views will override global options. Global options will be used if no matching view is found, or when the matching view does not have the option specified. diff --git a/install-sh b/install-sh index 0b0fdcbba..ea4c8234c 100755 --- a/install-sh +++ b/install-sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/sh # install - install a program, script, or datafile scriptversion=2013-12-25.23; # UTC diff --git a/iterator/iter_fwd.c b/iterator/iter_fwd.c index 4eb0eb718..ea3d70e07 100644 --- a/iterator/iter_fwd.c +++ b/iterator/iter_fwd.c @@ -239,7 +239,7 @@ read_fwds_addr(struct config_stub* s, struct delegpt* dp) s->name, p->str); return 0; } -#ifndef HAVE_SSL_SET1_HOST +#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST) if(tls_auth_name) log_err("no name verification functionality in " "ssl library, ignored name for %s", p->str); diff --git a/iterator/iter_hints.c b/iterator/iter_hints.c index 0b35a9d9e..60e518122 100644 --- a/iterator/iter_hints.c +++ b/iterator/iter_hints.c @@ -252,7 +252,7 @@ read_stubs_addr(struct config_stub* s, struct delegpt* dp) s->name, p->str); return 0; } -#ifndef HAVE_SSL_SET1_HOST +#if ! defined(HAVE_SSL_SET1_HOST) && ! defined(HAVE_X509_VERIFY_PARAM_SET1_HOST) if(auth_name) log_err("no name verification functionality in " "ssl library, ignored name for %s", p->str); diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c index 4ac8efd0d..be7965a60 100644 --- a/iterator/iter_utils.c +++ b/iterator/iter_utils.c @@ -882,10 +882,35 @@ rrset_equal(struct ub_packed_rrset_key* k1, struct ub_packed_rrset_key* k2) return 1; } +/** compare rrsets and sort canonically. Compares rrset name, type, class. + * return 0 if equal, +1 if x > y, and -1 if x < y. + */ +static int +rrset_canonical_sort_cmp(const void* x, const void* y) +{ + struct ub_packed_rrset_key* rrx = *(struct ub_packed_rrset_key**)x; + struct ub_packed_rrset_key* rry = *(struct ub_packed_rrset_key**)y; + int r = dname_canonical_compare(rrx->rk.dname, rry->rk.dname); + if(r != 0) + return r; + if(rrx->rk.type != rry->rk.type) { + if(ntohs(rrx->rk.type) > ntohs(rry->rk.type)) + return 1; + else return -1; + } + if(rrx->rk.rrset_class != rry->rk.rrset_class) { + if(ntohs(rrx->rk.rrset_class) > ntohs(rry->rk.rrset_class)) + return 1; + else return -1; + } + return 0; +} + int reply_equal(struct reply_info* p, struct reply_info* q, struct regional* region) { size_t i; + struct ub_packed_rrset_key** sorted_p, **sorted_q; if(p->flags != q->flags || p->qdcount != q->qdcount || /* do not check TTL, this may differ */ @@ -899,16 +924,43 @@ reply_equal(struct reply_info* p, struct reply_info* q, struct regional* region) p->ar_numrrsets != q->ar_numrrsets || p->rrset_count != q->rrset_count) return 0; + /* sort the rrsets in the authority and additional sections before + * compare, the query and answer sections are ordered in the sequence + * they should have (eg. one after the other for aliases). */ + sorted_p = (struct ub_packed_rrset_key**)regional_alloc_init( + region, p->rrsets, sizeof(*sorted_p)*p->rrset_count); + if(!sorted_p) return 0; + log_assert(p->an_numrrsets + p->ns_numrrsets + p->ar_numrrsets <= + p->rrset_count); + qsort(sorted_p + p->an_numrrsets, p->ns_numrrsets, + sizeof(*sorted_p), rrset_canonical_sort_cmp); + qsort(sorted_p + p->an_numrrsets + p->ns_numrrsets, p->ar_numrrsets, + sizeof(*sorted_p), rrset_canonical_sort_cmp); + + sorted_q = (struct ub_packed_rrset_key**)regional_alloc_init( + region, q->rrsets, sizeof(*sorted_q)*q->rrset_count); + if(!sorted_q) { + regional_free_all(region); + return 0; + } + log_assert(q->an_numrrsets + q->ns_numrrsets + q->ar_numrrsets <= + q->rrset_count); + qsort(sorted_q + q->an_numrrsets, q->ns_numrrsets, + sizeof(*sorted_q), rrset_canonical_sort_cmp); + qsort(sorted_q + q->an_numrrsets + q->ns_numrrsets, q->ar_numrrsets, + sizeof(*sorted_q), rrset_canonical_sort_cmp); + + /* compare the rrsets */ for(i=0; irrset_count; i++) { - if(!rrset_equal(p->rrsets[i], q->rrsets[i])) { - if(!rrset_canonical_equal(region, p->rrsets[i], - q->rrsets[i])) { + if(!rrset_equal(sorted_p[i], sorted_q[i])) { + if(!rrset_canonical_equal(region, sorted_p[i], + sorted_q[i])) { regional_free_all(region); return 0; } - regional_free_all(region); } } + regional_free_all(region); return 1; } diff --git a/iterator/iterator.c b/iterator/iterator.c index f66381b40..c73fb5177 100644 --- a/iterator/iterator.c +++ b/iterator/iterator.c @@ -1448,7 +1448,8 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq, * now will also exceed the rate, keeping cache fresh */ (void)infra_ratelimit_inc(qstate->env->infra_cache, iq->dp->name, iq->dp->namelen, - *qstate->env->now); + *qstate->env->now, &qstate->qinfo, + qstate->reply); /* see if we are passed through with slip factor */ if(qstate->env->cfg->ratelimit_factor != 0 && ub_random_max(qstate->env->rnd, @@ -1882,7 +1883,6 @@ processLastResort(struct module_qstate* qstate, struct iter_qstate* iq, struct delegpt* p = hints_lookup_root(qstate->env->hints, iq->qchase.qclass); if(p) { - struct delegpt_ns* ns; struct delegpt_addr* a; iq->chase_flags &= ~BIT_RD; /* go to authorities */ for(ns = p->nslist; ns; ns=ns->next) { @@ -2106,6 +2106,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, struct delegpt_addr* target; struct outbound_entry* outq; int auth_fallback = 0; + uint8_t* qout_orig = NULL; + size_t qout_orig_len = 0; /* NOTE: a request will encounter this state for each target it * needs to send a query to. That is, at least one per referral, @@ -2179,6 +2181,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, int labdiff = qchaselabs - dname_count_labels(iq->qinfo_out.qname); + qout_orig = iq->qinfo_out.qname; + qout_orig_len = iq->qinfo_out.qname_len; iq->qinfo_out.qname = iq->qchase.qname; iq->qinfo_out.qname_len = iq->qchase.qname_len; iq->minimise_count++; @@ -2299,7 +2303,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, errinf(qstate, "auth zone lookup failed, fallback is off"); return error_response(qstate, id, LDNS_RCODE_SERVFAIL); } - if(iq->dp && iq->dp->auth_dp) { + if(iq->dp->auth_dp) { /* we wanted to fallback, but had no delegpt, only the * auth zone generated delegpt, create an actual one */ iq->auth_zone_avoid = 1; @@ -2331,6 +2335,13 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, /* wait to get all targets, we want to try em */ verbose(VERB_ALGO, "wait for all targets for fallback"); qstate->ext_state[id] = module_wait_reply; + /* undo qname minimise step because we'll get back here + * to do it again */ + if(qout_orig && iq->minimise_count > 0) { + iq->minimise_count--; + iq->qinfo_out.qname = qout_orig; + iq->qinfo_out.qname_len = qout_orig_len; + } return 0; } /* did we do enough fallback queries already? */ @@ -2464,13 +2475,21 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq, iq->num_current_queries); qstate->ext_state[id] = module_wait_reply; } + /* undo qname minimise step because we'll get back here + * to do it again */ + if(qout_orig && iq->minimise_count > 0) { + iq->minimise_count--; + iq->qinfo_out.qname = qout_orig; + iq->qinfo_out.qname_len = qout_orig_len; + } return 0; } /* if not forwarding, check ratelimits per delegationpoint name */ if(!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok) { if(!infra_ratelimit_inc(qstate->env->infra_cache, iq->dp->name, - iq->dp->namelen, *qstate->env->now)) { + iq->dp->namelen, *qstate->env->now, &qstate->qinfo, + qstate->reply)) { lock_basic_lock(&ie->queries_ratelimit_lock); ie->num_queries_ratelimited++; lock_basic_unlock(&ie->queries_ratelimit_lock); @@ -3571,7 +3590,7 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq, if(event == module_event_noreply || event == module_event_error) { if(event == module_event_noreply && iq->sent_count >= 3 && qstate->env->cfg->use_caps_bits_for_id && - !iq->caps_fallback) { + !iq->caps_fallback && !is_caps_whitelisted(ie, iq)) { /* start fallback */ iq->caps_fallback = 1; iq->caps_server = 0; diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c index 31adbd54d..5f5a8a102 100644 --- a/libunbound/libunbound.c +++ b/libunbound/libunbound.c @@ -724,7 +724,7 @@ ub_resolve_event(struct ub_ctx* ctx, const char* name, int rrtype, *async_id = 0; lock_basic_lock(&ctx->cfglock); if(!ctx->finalized) { - int r = context_finalize(ctx); + r = context_finalize(ctx); if(r) { lock_basic_unlock(&ctx->cfglock); return r; @@ -966,6 +966,19 @@ ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr) return UB_NOERROR; } +int ub_ctx_set_tls(struct ub_ctx* ctx, int tls) +{ + lock_basic_lock(&ctx->cfglock); + if(ctx->finalized) { + lock_basic_unlock(&ctx->cfglock); + errno=EINVAL; + return UB_AFTERFINAL; + } + ctx->env->cfg->ssl_upstream = tls; + lock_basic_unlock(&ctx->cfglock); + return UB_NOERROR; +} + int ub_ctx_set_stub(struct ub_ctx* ctx, const char* zone, const char* addr, int isprime) { diff --git a/libunbound/libworker.c b/libunbound/libworker.c index a886f9a88..01621927e 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -222,11 +222,10 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb) } numports = cfg_condense_ports(cfg, &ports); if(numports == 0) { - int locked = !w->is_bg || w->is_bg_thread; - libworker_delete(w); - if(locked) { + if(!w->is_bg || w->is_bg_thread) { lock_basic_unlock(&ctx->cfglock); } + libworker_delete(w); return NULL; } w->back = outside_network_create(w->base, cfg->msg_buffer_size, diff --git a/libunbound/python/libunbound.i b/libunbound/python/libunbound.i index 84a536929..a2b361d4c 100644 --- a/libunbound/python/libunbound.i +++ b/libunbound/python/libunbound.i @@ -33,12 +33,26 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +%begin %{ +/* store state of warning output, restored at later pop */ +#pragma GCC diagnostic push +/* ignore gcc8 METH_NOARGS function cast warnings for swig function pointers */ +#pragma GCC diagnostic ignored "-Wcast-function-type" +%} %module unbound %{ +/* restore state of warning output, remove the functioncast ignore */ +#pragma GCC diagnostic pop #include + #ifdef HAVE_SYS_SOCKET_H #include + #endif + #ifdef HAVE_NETINET_IN_H #include + #endif + #ifdef HAVE_ARPA_INET_H #include + #endif #include "libunbound/unbound.h" %} @@ -108,7 +122,7 @@ %inline %{ void ub_ctx_free_dbg (struct ub_ctx* c) { - printf("******** UB_CTX free 0x%lX ************\n", (long unsigned int)c); + printf("******** UB_CTX free 0x%p ************\n", c); ub_ctx_delete(c); } @@ -228,6 +242,7 @@ RR_TYPE_MAILA = 254, /** any type (wildcard) */ RR_TYPE_ANY = 255, + RR_TYPE_CAA = 257, /* RFC 4431, 5074, DNSSEC Lookaside Validation */ RR_TYPE_DLV = 32769, @@ -648,7 +663,7 @@ Result: ['74.125.43.147', '74.125.43.99', '74.125.43.103', '74.125.43.104'] %inline %{ void ub_resolve_free_dbg (struct ub_result* r) { - printf("******** UB_RESOLVE free 0x%lX ************\n", (long unsigned int)r); + printf("******** UB_RESOLVE free 0x%p ************\n", r); ub_resolve_free(r); } %} diff --git a/libunbound/ubsyms.def b/libunbound/ubsyms.def index 0d8e6af91..0ace984fa 100644 --- a/libunbound/ubsyms.def +++ b/libunbound/ubsyms.def @@ -20,6 +20,7 @@ ub_ctx_set_event ub_ctx_set_fwd ub_ctx_set_option ub_ctx_set_stub +ub_ctx_set_tls ub_ctx_trustedkeys ub_ctx_zone_add ub_ctx_zone_remove diff --git a/libunbound/unbound.h b/libunbound/unbound.h index 90766b062..682ba5530 100644 --- a/libunbound/unbound.h +++ b/libunbound/unbound.h @@ -309,6 +309,17 @@ int ub_ctx_config(struct ub_ctx* ctx, const char* fname); */ int ub_ctx_set_fwd(struct ub_ctx* ctx, const char* addr); +/** + * Use DNS over TLS to send queries to machines set with ub_ctx_set_fwd(). + * + * @param ctx: context. + * At this time it is only possible to set configuration before the + * first resolve is done. + * @param tls: enable or disable DNS over TLS + * @return 0 if OK, else error. + */ +int ub_ctx_set_tls(struct ub_ctx* ctx, int tls); + /** * Add a stub zone, with given address to send to. This is for custom * root hints or pointing to a local authoritative dns server. @@ -770,6 +781,10 @@ struct ub_server_stats { /** number of queries answered from edns-subnet specific data, and * the answer was from the edns-subnet cache. */ long long num_query_subnet_cache; + /** number of bytes in the stream wait buffers */ + long long mem_stream_wait; + /** number of TLS connection resume */ + long long qtls_resume; }; /** diff --git a/ltmain.sh b/ltmain.sh index 0f0a2da3f..7f3523d33 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -2124,7 +2124,7 @@ fi # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -7272,10 +7272,12 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff --git a/pythonmod/interface.i b/pythonmod/interface.i index 5f2559bac..f9fd07b51 100644 --- a/pythonmod/interface.i +++ b/pythonmod/interface.i @@ -1,19 +1,37 @@ /* * interface.i: unbound python module */ +%begin %{ +/* store state of warning output, restored at later pop */ +#pragma GCC diagnostic push +/* ignore gcc8 METH_NOARGS function cast warnings for swig function pointers */ +#pragma GCC diagnostic ignored "-Wcast-function-type" +%} %module unboundmodule %{ +/* restore state of warning output, remove the functioncast ignore */ +#pragma GCC diagnostic pop /** * \file * This is the interface between the unbound server and a python module * called to perform operations on queries. */ #include + #ifdef HAVE_SYS_SOCKET_H #include + #endif + #ifdef HAVE_NETINET_IN_H #include + #endif + #ifdef HAVE_ARPA_INET_H #include + #endif + #ifdef HAVE_NETDB_H #include + #endif + #ifdef HAVE_SYS_UN_H #include + #endif #include #include "config.h" #include "util/log.h" @@ -449,7 +467,9 @@ struct sockaddr_storage {}; switch (ss->ss_family) { case AF_INET: return sizeof(struct sockaddr_in); case AF_INET6: return sizeof(struct sockaddr_in6); +#ifdef HAVE_SYS_UN_H case AF_UNIX: return sizeof(struct sockaddr_un); +#endif default: return 0; } @@ -515,10 +535,12 @@ struct sockaddr_storage {}; return PyBytes_FromStringAndSize((const char *)raw, sizeof(*raw)); } +#ifdef HAVE_SYS_UN_H if (ss->ss_family == AF_UNIX) { const struct sockaddr_un *sa = (struct sockaddr_un *)ss; return PyBytes_FromString(sa->sun_path); } +#endif return Py_None; } diff --git a/pythonmod/pythonmod.c b/pythonmod/pythonmod.c index a668ecc23..9009a28da 100644 --- a/pythonmod/pythonmod.c +++ b/pythonmod/pythonmod.c @@ -247,6 +247,9 @@ int pythonmod_init(struct module_env* env, int id) PyObject* py_init_arg, *res; PyGILState_STATE gil; int init_standard = 1; +#if PY_MAJOR_VERSION < 3 + PyObject* PyFileObject = NULL; +#endif struct pythonmod_env* pe = (struct pythonmod_env*)calloc(1, sizeof(struct pythonmod_env)); if (!pe) @@ -307,7 +310,15 @@ int pythonmod_init(struct module_env* env, int id) } /* Check Python file load */ - if ((script_py = fopen(pe->fname, "r")) == NULL) + /* uses python to open the file, this works on other platforms, + * eg. Windows, to open the file in the correct mode for python */ +#if PY_MAJOR_VERSION < 3 + PyFileObject = PyFile_FromString((char*)pe->fname, "r"); + script_py = PyFile_AsFile(PyFileObject); +#else + script_py = _Py_fopen(pe->fname, "r"); +#endif + if (script_py == NULL) { log_err("pythonmod: can't open file %s for reading", pe->fname); PyGILState_Release(gil); @@ -343,7 +354,11 @@ int pythonmod_init(struct module_env* env, int id) PyGILState_Release(gil); return 0; } +#if PY_MAJOR_VERSION < 3 + Py_XDECREF(PyFileObject); +#else fclose(script_py); +#endif if ((pe->func_init = PyDict_GetItemString(pe->dict, "init_standard")) == NULL) { @@ -517,8 +532,7 @@ void pythonmod_clear(struct module_qstate* qstate, int id) return; pq = (struct pythonmod_qstate*)qstate->minfo[id]; - verbose(VERB_ALGO, "pythonmod: clear, id: %d, pq:%lX", id, - (unsigned long int)pq); + verbose(VERB_ALGO, "pythonmod: clear, id: %d, pq:%p", id, pq); if(pq != NULL) { PyGILState_STATE gil = PyGILState_Ensure(); @@ -534,8 +548,7 @@ void pythonmod_clear(struct module_qstate* qstate, int id) size_t pythonmod_get_mem(struct module_env* env, int id) { struct pythonmod_env* pe = (struct pythonmod_env*)env->modinfo[id]; - verbose(VERB_ALGO, "pythonmod: get_mem, id: %d, pe:%lX", id, - (unsigned long int)pe); + verbose(VERB_ALGO, "pythonmod: get_mem, id: %d, pe:%p", id, pe); if(!pe) return 0; return sizeof(*pe); diff --git a/respip/respip.c b/respip/respip.c index aea528f15..d61877b55 100644 --- a/respip/respip.c +++ b/respip/respip.c @@ -183,6 +183,8 @@ respip_action_cfg(struct respip_set* set, const char* ipstr, action = respip_inform; else if(strcmp(actnstr, "inform_deny") == 0) action = respip_inform_deny; + else if(strcmp(actnstr, "inform_redirect") == 0) + action = respip_inform_redirect; else if(strcmp(actnstr, "always_transparent") == 0) action = respip_always_transparent; else if(strcmp(actnstr, "always_refuse") == 0) @@ -245,7 +247,8 @@ respip_enter_rr(struct regional* region, struct resp_addr* raddr, struct packed_rrset_data* pd; struct sockaddr* sa; int ret; - if(raddr->action != respip_redirect) { + if(raddr->action != respip_redirect + && raddr->action != respip_inform_redirect) { log_err("cannot parse response-ip-data %s: response-ip " "action for %s is not redirect", rrstr, netblock); return 0; @@ -451,7 +454,7 @@ respip_views_apply_cfg(struct views* vs, struct config_file* cfg, * This function returns the copied rrset key on success, and NULL on memory * allocation failure. */ -struct ub_packed_rrset_key* +static struct ub_packed_rrset_key* copy_rrset(const struct ub_packed_rrset_key* key, struct regional* region) { struct ub_packed_rrset_key* ck = regional_alloc(region, @@ -750,7 +753,8 @@ respip_nodata_answer(uint16_t qtype, enum respip_action action, *new_repp = new_rep; return 1; } else if(action == respip_static || action == respip_redirect || - action == respip_always_nxdomain) { + action == respip_always_nxdomain || + action == respip_inform_redirect) { /* Since we don't know about other types of the owner name, * we generally return NOERROR/NODATA unless an NXDOMAIN action * is explicitly specified. */ diff --git a/services/authzone.c b/services/authzone.c index e30858d43..d62467c9f 100644 --- a/services/authzone.c +++ b/services/authzone.c @@ -88,6 +88,9 @@ #define AUTH_HTTPS_PORT 443 /* max depth for nested $INCLUDEs */ #define MAX_INCLUDE_DEPTH 10 +/** number of timeouts before we fallback from IXFR to AXFR, + * because some versions of servers (eg. dnsmasq) drop IXFR packets. */ +#define NUM_TIMEOUTS_FALLBACK_IXFR 3 /** pick up nextprobe task to start waiting to perform transfer actions */ static void xfr_set_timeout(struct auth_xfer* xfr, struct module_env* env, @@ -1979,7 +1982,7 @@ int auth_zones_apply_cfg(struct auth_zones* az, struct config_file* cfg, * @param at: transfer structure with chunks list. The chunks and their * data are freed. */ -void +static void auth_chunks_delete(struct auth_transfer* at) { if(at->chunks_first) { @@ -2618,7 +2621,7 @@ az_nsec3_hashname(struct auth_zone* z, uint8_t* hashname, size_t* hashnmlen, } /** Find the datanode that covers the nsec3hash-name */ -struct auth_data* +static struct auth_data* az_nsec3_findnode(struct auth_zone* z, uint8_t* hashnm, size_t hashnmlen) { struct query_info qinfo; @@ -2743,13 +2746,16 @@ az_nsec3_insert(struct auth_zone* z, struct regional* region, * that is an exact match that should exist for it. * If that does not exist, a higher exact match + nxproof is enabled * (for some sort of opt-out empty nonterminal cases). + * nodataproof: search for exact match and include that instead. + * ceproof: include ce proof NSEC3 (omitted for wildcard replies). * nxproof: include denial of the qname. * wcproof: include denial of wildcard (wildcard.ce). */ static int az_add_nsec3_proof(struct auth_zone* z, struct regional* region, struct dns_msg* msg, uint8_t* cenm, size_t cenmlen, uint8_t* qname, - size_t qname_len, int nxproof, int wcproof) + size_t qname_len, int nodataproof, int ceproof, int nxproof, + int wcproof) { int algo; size_t iter, saltlen; @@ -2760,12 +2766,27 @@ az_add_nsec3_proof(struct auth_zone* z, struct regional* region, /* find parameters of nsec3 proof */ if(!az_nsec3_param(z, &algo, &iter, &salt, &saltlen)) return 1; /* no nsec3 */ + if(nodataproof) { + /* see if the node has a hash of itself for the nodata + * proof nsec3, this has to be an exact match nsec3. */ + struct auth_data* match; + match = az_nsec3_find_exact(z, qname, qname_len, algo, + iter, salt, saltlen); + if(match) { + if(!az_nsec3_insert(z, region, msg, match)) + return 0; + /* only nodata NSEC3 needed, no CE or others. */ + return 1; + } + } /* find ce that has an NSEC3 */ - node = az_nsec3_find_ce(z, &cenm, &cenmlen, &no_exact_ce, - algo, iter, salt, saltlen); - if(no_exact_ce) nxproof = 1; - if(!az_nsec3_insert(z, region, msg, node)) - return 0; + if(ceproof) { + node = az_nsec3_find_ce(z, &cenm, &cenmlen, &no_exact_ce, + algo, iter, salt, saltlen); + if(no_exact_ce) nxproof = 1; + if(!az_nsec3_insert(z, region, msg, node)) + return 0; + } if(nxproof) { uint8_t* nx; @@ -2910,7 +2931,7 @@ az_generate_notype_answer(struct auth_zone* z, struct regional* region, /* DNSSEC denial NSEC3 */ if(!az_add_nsec3_proof(z, region, msg, node->name, node->namelen, msg->qinfo.qname, - msg->qinfo.qname_len, 0, 0)) + msg->qinfo.qname_len, 1, 1, 0, 0)) return 0; } return 1; @@ -2937,7 +2958,7 @@ az_generate_referral_answer(struct auth_zone* z, struct regional* region, } else { if(!az_add_nsec3_proof(z, region, msg, ce->name, ce->namelen, msg->qinfo.qname, - msg->qinfo.qname_len, 0, 0)) + msg->qinfo.qname_len, 1, 1, 0, 0)) return 0; } } @@ -2976,6 +2997,7 @@ az_generate_wildcard_answer(struct auth_zone* z, struct query_info* qinfo, struct auth_data* wildcard, struct auth_data* node) { struct auth_rrset* rrset, *nsec; + int insert_ce = 0; if((rrset=az_domain_rrset(wildcard, qinfo->qtype)) != NULL) { /* wildcard has type, add it */ if(!msg_add_rrset_an(z, region, msg, wildcard, rrset)) @@ -3002,15 +3024,22 @@ az_generate_wildcard_answer(struct auth_zone* z, struct query_info* qinfo, /* call other notype routine for dnssec notype denials */ if(!az_generate_notype_answer(z, region, msg, wildcard)) return 0; + /* because the notype, there is no positive data with an + * RRSIG that indicates the wildcard position. Thus the + * wildcard qname denial needs to have a CE nsec3. */ + insert_ce = 1; } /* ce and node for dnssec denial of wildcard original name */ if((nsec=az_find_nsec_cover(z, &node)) != NULL) { if(!msg_add_rrset_ns(z, region, msg, node, nsec)) return 0; } else if(ce) { - if(!az_add_nsec3_proof(z, region, msg, ce->name, - ce->namelen, msg->qinfo.qname, - msg->qinfo.qname_len, 1, 0)) + uint8_t* wildup = wildcard->name; + size_t wilduplen= wildcard->namelen; + dname_remove_label(&wildup, &wilduplen); + if(!az_add_nsec3_proof(z, region, msg, wildup, + wilduplen, msg->qinfo.qname, + msg->qinfo.qname_len, 0, insert_ce, 1, 0)) return 0; } @@ -3036,7 +3065,7 @@ az_generate_nxdomain_answer(struct auth_zone* z, struct regional* region, } else if(ce) { if(!az_add_nsec3_proof(z, region, msg, ce->name, ce->namelen, msg->qinfo.qname, - msg->qinfo.qname_len, 1, 1)) + msg->qinfo.qname_len, 0, 1, 1, 1)) return 0; } return 1; @@ -4988,12 +5017,12 @@ xfr_transfer_lookup_host(struct auth_xfer* xfr, struct module_env* env) qinfo.qtype = LDNS_RR_TYPE_AAAA; qinfo.local_alias = NULL; if(verbosity >= VERB_ALGO) { - char buf[512]; + char buf1[512]; char buf2[LDNS_MAX_DOMAINLEN+1]; dname_str(xfr->name, buf2); - snprintf(buf, sizeof(buf), "auth zone %s: master lookup" + snprintf(buf1, sizeof(buf1), "auth zone %s: master lookup" " for task_transfer", buf2); - log_query_info(VERB_ALGO, buf, &qinfo); + log_query_info(VERB_ALGO, buf1, &qinfo); } edns.edns_present = 1; edns.ext_rcode = 0; @@ -5630,15 +5659,33 @@ auth_xfer_transfer_tcp_callback(struct comm_point* c, void* arg, int err, * and continue task_transfer*/ verbose(VERB_ALGO, "xfr stopped, connection lost to %s", xfr->task_transfer->master->host); + + /* see if IXFR caused the failure, if so, try AXFR */ + if(xfr->task_transfer->on_ixfr) { + xfr->task_transfer->ixfr_possible_timeout_count++; + if(xfr->task_transfer->ixfr_possible_timeout_count >= + NUM_TIMEOUTS_FALLBACK_IXFR) { + verbose(VERB_ALGO, "xfr to %s, fallback " + "from IXFR to AXFR (because of timeouts)", + xfr->task_transfer->master->host); + xfr->task_transfer->ixfr_fail = 1; + gonextonfail = 0; + } + } + failed: /* delete transferred data from list */ auth_chunks_delete(xfr->task_transfer); comm_point_delete(xfr->task_transfer->cp); xfr->task_transfer->cp = NULL; - xfr_transfer_nextmaster(xfr); + if(gonextonfail) + xfr_transfer_nextmaster(xfr); xfr_transfer_nexttarget_or_end(xfr, env); return 0; } + /* note that IXFR worked without timeout */ + if(xfr->task_transfer->on_ixfr) + xfr->task_transfer->ixfr_possible_timeout_count = 0; /* handle returned packet */ /* if it fails, cleanup and end this transfer */ @@ -6010,12 +6057,12 @@ xfr_probe_lookup_host(struct auth_xfer* xfr, struct module_env* env) qinfo.qtype = LDNS_RR_TYPE_AAAA; qinfo.local_alias = NULL; if(verbosity >= VERB_ALGO) { - char buf[512]; + char buf1[512]; char buf2[LDNS_MAX_DOMAINLEN+1]; dname_str(xfr->name, buf2); - snprintf(buf, sizeof(buf), "auth zone %s: master lookup" + snprintf(buf1, sizeof(buf1), "auth zone %s: master lookup" " for task_probe", buf2); - log_query_info(VERB_ALGO, buf, &qinfo); + log_query_info(VERB_ALGO, buf1, &qinfo); } edns.edns_present = 1; edns.ext_rcode = 0; diff --git a/services/authzone.h b/services/authzone.h index 243f3e4a0..4706803a8 100644 --- a/services/authzone.h +++ b/services/authzone.h @@ -378,6 +378,8 @@ struct auth_transfer { * data or add of duplicate data). Flag is cleared once the retry * with axfr is done. */ int ixfr_fail; + /** we saw an ixfr-indicating timeout, count of them */ + int ixfr_possible_timeout_count; /** we are doing IXFR right now */ int on_ixfr; /** did we detect the current AXFR/IXFR serial number yet, 0 not yet, diff --git a/services/cache/dns.c b/services/cache/dns.c index 47611ac5a..088efbcf8 100644 --- a/services/cache/dns.c +++ b/services/cache/dns.c @@ -728,6 +728,8 @@ fill_any(struct module_env* env, if(!msg) { return NULL; } + /* set NOTIMPL for RFC 8482 */ + msg->rep->flags |= LDNS_RCODE_NOTIMPL; msg->rep->security = sec_status_indeterminate; return msg; } diff --git a/services/cache/infra.c b/services/cache/infra.c index 489f93949..c2484a9f1 100644 --- a/services/cache/infra.c +++ b/services/cache/infra.c @@ -41,6 +41,8 @@ #include "config.h" #include "sldns/rrdef.h" #include "sldns/str2wire.h" +#include "sldns/sbuffer.h" +#include "sldns/wire2str.h" #include "services/cache/infra.h" #include "util/storage/slabhash.h" #include "util/storage/lookup3.h" @@ -808,7 +810,7 @@ static struct lruhash_entry* infra_find_ratedata(struct infra_cache* infra, } /** find data item in array for ip addresses */ -struct lruhash_entry* infra_find_ip_ratedata(struct infra_cache* infra, +static struct lruhash_entry* infra_find_ip_ratedata(struct infra_cache* infra, struct comm_reply* repinfo, int wr) { struct ip_rate_key key; @@ -907,7 +909,8 @@ int infra_rate_max(void* data, time_t now) } int infra_ratelimit_inc(struct infra_cache* infra, uint8_t* name, - size_t namelen, time_t timenow) + size_t namelen, time_t timenow, struct query_info* qinfo, + struct comm_reply* replylist) { int lim, max; struct lruhash_entry* entry; @@ -930,9 +933,19 @@ int infra_ratelimit_inc(struct infra_cache* infra, uint8_t* name, lock_rw_unlock(&entry->lock); if(premax < lim && max >= lim) { - char buf[257]; + char buf[257], qnm[257], ts[12], cs[12], ip[128]; dname_str(name, buf); - verbose(VERB_OPS, "ratelimit exceeded %s %d", buf, lim); + dname_str(qinfo->qname, qnm); + sldns_wire2str_type_buf(qinfo->qtype, ts, sizeof(ts)); + sldns_wire2str_class_buf(qinfo->qclass, cs, sizeof(cs)); + ip[0]=0; + if(replylist) { + addr_to_str((struct sockaddr_storage *)&replylist->addr, + replylist->addrlen, ip, sizeof(ip)); + verbose(VERB_OPS, "ratelimit exceeded %s %d query %s %s %s from %s", buf, lim, qnm, cs, ts, ip); + } else { + verbose(VERB_OPS, "ratelimit exceeded %s %d query %s %s %s", buf, lim, qnm, cs, ts); + } } return (max < lim); } @@ -991,7 +1004,7 @@ infra_get_mem(struct infra_cache* infra) } int infra_ip_ratelimit_inc(struct infra_cache* infra, - struct comm_reply* repinfo, time_t timenow) + struct comm_reply* repinfo, time_t timenow, struct sldns_buffer* buffer) { int max; struct lruhash_entry* entry; @@ -1010,11 +1023,28 @@ int infra_ip_ratelimit_inc(struct infra_cache* infra, lock_rw_unlock(&entry->lock); if(premax < infra_ip_ratelimit && max >= infra_ip_ratelimit) { - char client_ip[128]; + char client_ip[128], qnm[LDNS_MAX_DOMAINLEN+1+12+12]; addr_to_str((struct sockaddr_storage *)&repinfo->addr, repinfo->addrlen, client_ip, sizeof(client_ip)); - verbose(VERB_OPS, "ip_ratelimit exceeded %s %d", - client_ip, infra_ip_ratelimit); + qnm[0]=0; + if(sldns_buffer_limit(buffer)>LDNS_HEADER_SIZE && + LDNS_QDCOUNT(sldns_buffer_begin(buffer))!=0) { + (void)sldns_wire2str_rrquestion_buf( + sldns_buffer_at(buffer, LDNS_HEADER_SIZE), + sldns_buffer_limit(buffer)-LDNS_HEADER_SIZE, + qnm, sizeof(qnm)); + if(strlen(qnm)>0 && qnm[strlen(qnm)-1]=='\n') + qnm[strlen(qnm)-1] = 0; /*remove newline*/ + if(strchr(qnm, '\t')) + *strchr(qnm, '\t') = ' '; + if(strchr(qnm, '\t')) + *strchr(qnm, '\t') = ' '; + verbose(VERB_OPS, "ip_ratelimit exceeded %s %d %s", + client_ip, infra_ip_ratelimit, qnm); + } else { + verbose(VERB_OPS, "ip_ratelimit exceeded %s %d (no query name)", + client_ip, infra_ip_ratelimit); + } } return (max <= infra_ip_ratelimit); } diff --git a/services/cache/infra.h b/services/cache/infra.h index 10db796bf..e33f2a6c0 100644 --- a/services/cache/infra.h +++ b/services/cache/infra.h @@ -366,12 +366,15 @@ long long infra_get_host_rto(struct infra_cache* infra, * @param name: zone name * @param namelen: zone name length * @param timenow: what time it is now. + * @param qinfo: for logging, query name. + * @param replylist: for logging, querier's address (if any). * @return 1 if it could be incremented. 0 if the increment overshot the * ratelimit or if in the previous second the ratelimit was exceeded. * Failures like alloc failures are not returned (probably as 1). */ int infra_ratelimit_inc(struct infra_cache* infra, uint8_t* name, - size_t namelen, time_t timenow); + size_t namelen, time_t timenow, struct query_info* qinfo, + struct comm_reply* replylist); /** * Decrement the query rate counter for a delegation point. @@ -410,10 +413,12 @@ int infra_find_ratelimit(struct infra_cache* infra, uint8_t* name, * @param infra: infra cache * @param repinfo: information about client * @param timenow: what time it is now. + * @param buffer: with query for logging. * @return 1 if it could be incremented. 0 if the increment overshot the * ratelimit and the query should be dropped. */ int infra_ip_ratelimit_inc(struct infra_cache* infra, - struct comm_reply* repinfo, time_t timenow); + struct comm_reply* repinfo, time_t timenow, + struct sldns_buffer* buffer); /** * Get memory used by the infra cache. diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index efc0c3e18..e74d1abcf 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -53,6 +53,9 @@ #include "util/config_file.h" #include "util/net_help.h" #include "sldns/sbuffer.h" +#include "services/mesh.h" +#include "util/fptr_wlist.h" +#include "util/locks.h" #ifdef HAVE_NETDB_H #include @@ -70,6 +73,18 @@ /** 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; +#endif +/** size (in bytes) of stream wait buffers */ +static size_t stream_wait_count = 0; +/** is the lock initialised for stream wait buffers */ +static int stream_wait_lock_inited = 0; + /** * Debug print of the getaddrinfo returned address. * @param addr: the address returned. @@ -838,7 +853,11 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, disabled, except when verbosity enabled for debugging */ if(errno != ENOPROTOOPT || verbosity >= 3) #endif - log_err("Setting TCP Fast Open as server failed: %s", strerror(errno)); + if(errno == EPERM) { + log_warn("Setting TCP Fast Open as server failed: %s ; this could likely be because sysctl net.inet.tcp.fastopen.enabled, net.inet.tcp.fastopen.server_enable, or net.ipv4.tcp_fastopen is disabled", strerror(errno)); + } else { + log_err("Setting TCP Fast Open as server failed: %s", strerror(errno)); + } } #endif return s; @@ -1260,6 +1279,10 @@ listen_create(struct comm_base* base, struct listen_port* ports, free(front); return NULL; } + if(!stream_wait_lock_inited) { + lock_basic_init(&stream_wait_count_lock); + stream_wait_lock_inited = 1; + } /* create comm points as needed */ while(ports) { @@ -1272,11 +1295,13 @@ listen_create(struct comm_base* base, struct listen_port* ports, ports->ftype == listen_type_tcp_dnscrypt) cp = comm_point_create_tcp(base, ports->fd, tcp_accept_count, tcp_idle_timeout, - tcp_conn_limit, bufsize, cb, cb_arg); + tcp_conn_limit, bufsize, front->udp_buff, + cb, cb_arg); else if(ports->ftype == listen_type_ssl) { cp = comm_point_create_tcp(base, ports->fd, tcp_accept_count, tcp_idle_timeout, - tcp_conn_limit, bufsize, cb, cb_arg); + tcp_conn_limit, bufsize, front->udp_buff, + cb, cb_arg); cp->ssl = sslctx; } else if(ports->ftype == listen_type_udpancil || ports->ftype == listen_type_udpancil_dnscrypt) @@ -1347,6 +1372,10 @@ listen_delete(struct listen_dnsport* front) #endif sldns_buffer_free(front->udp_buff); free(front); + if(stream_wait_lock_inited) { + stream_wait_lock_inited = 0; + lock_basic_destroy(&stream_wait_count_lock); + } } struct listen_port* @@ -1504,3 +1533,377 @@ void listen_start_accept(struct listen_dnsport* listen) } } +struct tcp_req_info* +tcp_req_info_create(struct sldns_buffer* spoolbuf) +{ + struct tcp_req_info* req = (struct tcp_req_info*)malloc(sizeof(*req)); + if(!req) { + log_err("malloc failure for new stream outoforder processing structure"); + return NULL; + } + memset(req, 0, sizeof(*req)); + req->spool_buffer = spoolbuf; + return req; +} + +void +tcp_req_info_delete(struct tcp_req_info* req) +{ + if(!req) return; + tcp_req_info_clear(req); + /* cp is pointer back to commpoint that owns this struct and + * called delete on us */ + /* spool_buffer is shared udp buffer, not deleted here */ + free(req); +} + +void tcp_req_info_clear(struct tcp_req_info* req) +{ + struct tcp_req_open_item* open, *nopen; + struct tcp_req_done_item* item, *nitem; + if(!req) return; + + /* free outstanding request mesh reply entries */ + open = req->open_req_list; + while(open) { + nopen = open->next; + mesh_state_remove_reply(open->mesh, open->mesh_state, req->cp); + free(open); + open = nopen; + } + req->open_req_list = NULL; + req->num_open_req = 0; + + /* free pending writable result packets */ + item = req->done_req_list; + while(item) { + nitem = item->next; + lock_basic_lock(&stream_wait_count_lock); + stream_wait_count -= (sizeof(struct tcp_req_done_item) + +item->len); + lock_basic_unlock(&stream_wait_count_lock); + free(item->buf); + free(item); + item = nitem; + } + req->done_req_list = NULL; + req->num_done_req = 0; + req->read_is_closed = 0; +} + +void +tcp_req_info_remove_mesh_state(struct tcp_req_info* req, struct mesh_state* m) +{ + struct tcp_req_open_item* open, *prev = NULL; + if(!req || !m) return; + open = req->open_req_list; + while(open) { + if(open->mesh_state == m) { + struct tcp_req_open_item* next; + if(prev) prev->next = open->next; + else req->open_req_list = open->next; + /* caller has to manage the mesh state reply entry */ + next = open->next; + free(open); + req->num_open_req --; + + /* prev = prev; */ + open = next; + continue; + } + prev = open; + open = open->next; + } +} + +/** setup listening for read or write */ +static void +tcp_req_info_setup_listen(struct tcp_req_info* req) +{ + int wr = 0; + int rd = 0; + + if(req->cp->tcp_byte_count != 0) { + /* cannot change, halfway through */ + return; + } + + 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) + rd = 1; + + if(wr) { + req->cp->tcp_is_reading = 0; + comm_point_stop_listening(req->cp); + comm_point_start_listening(req->cp, -1, + req->cp->tcp_timeout_msec); + } else if(rd) { + req->cp->tcp_is_reading = 1; + comm_point_stop_listening(req->cp); + comm_point_start_listening(req->cp, -1, + req->cp->tcp_timeout_msec); + /* and also read it (from SSL stack buffers), so + * no event read event is expected since the remainder of + * the TLS frame is sitting in the buffers. */ + req->read_again = 1; + } else { + comm_point_stop_listening(req->cp); + comm_point_start_listening(req->cp, -1, + req->cp->tcp_timeout_msec); + comm_point_listen_for_rw(req->cp, 0, 0); + } +} + +/** remove first item from list of pending results */ +static struct tcp_req_done_item* +tcp_req_info_pop_done(struct tcp_req_info* req) +{ + struct tcp_req_done_item* item; + log_assert(req->num_done_req > 0 && req->done_req_list); + item = req->done_req_list; + lock_basic_lock(&stream_wait_count_lock); + stream_wait_count -= (sizeof(struct tcp_req_done_item)+item->len); + lock_basic_unlock(&stream_wait_count_lock); + req->done_req_list = req->done_req_list->next; + req->num_done_req --; + return item; +} + +/** Send given buffer and setup to write */ +static void +tcp_req_info_start_write_buf(struct tcp_req_info* req, uint8_t* buf, + size_t len) +{ + sldns_buffer_clear(req->cp->buffer); + sldns_buffer_write(req->cp->buffer, buf, len); + sldns_buffer_flip(req->cp->buffer); + + req->cp->tcp_is_reading = 0; /* we are now writing */ +} + +/** pick up the next result and start writing it to the channel */ +static void +tcp_req_pickup_next_result(struct tcp_req_info* req) +{ + if(req->num_done_req > 0) { + /* unlist the done item from the list of pending results */ + struct tcp_req_done_item* item = tcp_req_info_pop_done(req); + tcp_req_info_start_write_buf(req, item->buf, item->len); + free(item->buf); + free(item); + } +} + +/** the read channel has closed */ +int +tcp_req_info_handle_read_close(struct tcp_req_info* req) +{ + verbose(VERB_ALGO, "tcp channel read side closed %d", req->cp->fd); + /* reset byte count for (potential) partial read */ + req->cp->tcp_byte_count = 0; + /* if we still have results to write, pick up next and write it */ + if(req->num_done_req != 0) { + tcp_req_pickup_next_result(req); + tcp_req_info_setup_listen(req); + return 1; + } + /* if nothing to do, this closes the connection */ + if(req->num_open_req == 0 && req->num_done_req == 0) + return 0; + /* otherwise, we must be waiting for dns resolve, wait with timeout */ + req->read_is_closed = 1; + tcp_req_info_setup_listen(req); + return 1; +} + +void +tcp_req_info_handle_writedone(struct tcp_req_info* req) +{ + /* back to reading state, we finished this write event */ + sldns_buffer_clear(req->cp->buffer); + if(req->num_done_req == 0 && req->read_is_closed) { + /* no more to write and nothing to read, close it */ + comm_point_drop_reply(&req->cp->repinfo); + return; + } + req->cp->tcp_is_reading = 1; + /* see if another result needs writing */ + tcp_req_pickup_next_result(req); + + /* see if there is more to write, if not stop_listening for writing */ + /* see if new requests are allowed, if so, start_listening + * for reading */ + tcp_req_info_setup_listen(req); +} + +void +tcp_req_info_handle_readdone(struct tcp_req_info* req) +{ + struct comm_point* c = req->cp; + + /* we want to read up several requests, unless there are + * pending answers */ + + req->is_drop = 0; + req->is_reply = 0; + req->in_worker_handle = 1; + /* handle the current request */ + /* this calls the worker handle request routine that could give + * a cache response, or localdata response, or drop the reply, + * or schedule a mesh entry for later */ + fptr_ok(fptr_whitelist_comm_point(c->callback)); + if( (*c->callback)(c, c->cb_arg, NETEVENT_NOERROR, &c->repinfo) ) { + req->in_worker_handle = 0; + /* there is an answer, put it up. It is already in the + * c->buffer, just send it. */ + /* since we were just reading a query, the channel is + * clear to write to */ + send_it: + c->tcp_is_reading = 0; + comm_point_stop_listening(c); + comm_point_start_listening(c, -1, c->tcp_timeout_msec); + return; + } + req->in_worker_handle = 0; + /* it should be waiting in the mesh for recursion. + * If mesh failed to add a new entry and called commpoint_drop_reply. + * Then the mesh state has been cleared. */ + if(req->is_drop) { + /* we can now call drop_reply without recursing into ourselves + * whilst in the callback */ + /* we have to close the stream because there is no reply, + * no servfail to send, but the query needs an action, for + * a stream that is close the connection */ + sldns_buffer_clear(c->buffer); + comm_point_drop_reply(&c->repinfo); + return; + } + /* If mesh failed(mallocfail) and called commpoint_send_reply with + * something like servfail then we pick up that reply below. */ + if(req->is_reply) { + /* reply from mesh is in the spool_buffer */ + sldns_buffer_clear(c->buffer); + sldns_buffer_write(c->buffer, + sldns_buffer_begin(req->spool_buffer), + sldns_buffer_limit(req->spool_buffer)); + sldns_buffer_flip(c->buffer); + goto send_it; + } + + sldns_buffer_clear(c->buffer); + /* if pending answers, pick up an answer and start sending it */ + tcp_req_pickup_next_result(req); + + /* if answers pending, start sending answers */ + /* read more requests if we can have more requests */ + tcp_req_info_setup_listen(req); +} + +int +tcp_req_info_add_meshstate(struct tcp_req_info* req, + struct mesh_area* mesh, struct mesh_state* m) +{ + struct tcp_req_open_item* item; + log_assert(req && mesh && m); + item = (struct tcp_req_open_item*)malloc(sizeof(*item)); + if(!item) return 0; + item->next = req->open_req_list; + item->mesh = mesh; + item->mesh_state = m; + req->open_req_list = item; + req->num_open_req++; + return 1; +} + +/** Add a result to the result list. At the end. */ +static int +tcp_req_info_add_result(struct tcp_req_info* req, uint8_t* buf, size_t len) +{ + struct tcp_req_done_item* last = NULL; + struct tcp_req_done_item* item; + size_t space; + + /* see if we have space */ + space = sizeof(struct tcp_req_done_item) + len; + lock_basic_lock(&stream_wait_count_lock); + if(stream_wait_count + space > stream_wait_max) { + lock_basic_unlock(&stream_wait_count_lock); + verbose(VERB_ALGO, "drop stream reply, no space left, in stream-wait-size"); + return 0; + } + stream_wait_count += space; + lock_basic_unlock(&stream_wait_count_lock); + + /* find last element */ + last = req->done_req_list; + while(last && last->next) + last = last->next; + + /* create new element */ + item = (struct tcp_req_done_item*)malloc(sizeof(*item)); + if(!item) { + log_err("malloc failure, for stream result list"); + return 0; + } + item->next = NULL; + item->len = len; + item->buf = memdup(buf, len); + if(!item->buf) { + free(item); + log_err("malloc failure, adding reply to stream result list"); + return 0; + } + + /* link in */ + if(last) last->next = item; + else req->done_req_list = item; + req->num_done_req++; + return 1; +} + +void +tcp_req_info_send_reply(struct tcp_req_info* req) +{ + if(req->in_worker_handle) { + /* It is in the right buffer to answer straight away */ + req->is_reply = 1; + return; + } + /* now that the query has been handled, that mesh_reply entry + * should be removed, from the tcp_req_info list, + * the mesh state cleanup removes then with region_cleanup and + * replies_sent true. */ + /* see if we can send it straight away (we are not doing + * anything else). If so, copy to buffer and start */ + if(req->cp->tcp_is_reading && req->cp->tcp_byte_count == 0) { + /* buffer is free, and was ready to read new query into, + * but we are now going to use it to send this answer */ + tcp_req_info_start_write_buf(req, + sldns_buffer_begin(req->spool_buffer), + sldns_buffer_limit(req->spool_buffer)); + /* switch to listen to write events */ + comm_point_stop_listening(req->cp); + comm_point_start_listening(req->cp, -1, + req->cp->tcp_timeout_msec); + return; + } + /* queue up the answer behind the others already pending */ + if(!tcp_req_info_add_result(req, sldns_buffer_begin(req->spool_buffer), + sldns_buffer_limit(req->spool_buffer))) { + /* drop the connection, we are out of resources */ + comm_point_drop_reply(&req->cp->repinfo); + } +} + +size_t tcp_req_info_get_stream_buffer_size(void) +{ + size_t s; + if(!stream_wait_lock_inited) + return stream_wait_count; + lock_basic_lock(&stream_wait_count_lock); + s = stream_wait_count; + lock_basic_unlock(&stream_wait_count_lock); + return s; +} diff --git a/services/listen_dnsport.h b/services/listen_dnsport.h index 46b432d4b..ad84d8322 100644 --- a/services/listen_dnsport.h +++ b/services/listen_dnsport.h @@ -237,4 +237,134 @@ int create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto, */ int create_local_accept_sock(const char* path, int* noproto, int use_systemd); +/** + * TCP request info. List of requests outstanding on the channel, that + * are asked for but not yet answered back. + */ +struct tcp_req_info { + /** the TCP comm point for this. Its buffer is used for read/write */ + struct comm_point* cp; + /** the buffer to use to spool reply from mesh into, + * it can then be copied to the result list and written. + * it is a pointer to the shared udp buffer. */ + struct sldns_buffer* spool_buffer; + /** are we in worker_handle function call (for recursion callback)*/ + int in_worker_handle; + /** is the comm point dropped (by worker handle). + * That means we have to disconnect the channel. */ + int is_drop; + /** is the comm point set to send_reply (by mesh new client in worker + * handle), if so answer is available in c.buffer */ + int is_reply; + /** read channel has closed, just write pending results */ + int read_is_closed; + /** read again */ + int read_again; + /** number of outstanding requests */ + int num_open_req; + /** list of outstanding requests */ + struct tcp_req_open_item* open_req_list; + /** number of pending writeable results */ + int num_done_req; + /** list of pending writable result packets, malloced one at a time */ + struct tcp_req_done_item* done_req_list; +}; + +/** + * List of open items in TCP channel + */ +struct tcp_req_open_item { + /** next in list */ + struct tcp_req_open_item* next; + /** the mesh area of the mesh_state */ + struct mesh_area* mesh; + /** the mesh state */ + struct mesh_state* mesh_state; +}; + +/** + * List of done items in TCP channel + */ +struct tcp_req_done_item { + /** next in list */ + struct tcp_req_done_item* next; + /** the buffer with packet contents */ + uint8_t* buf; + /** length of the buffer */ + size_t len; +}; + +/** + * Create tcp request info structure that keeps track of open + * requests on the TCP channel that are resolved at the same time, + * and the pending results that have to get written back to that client. + * @param spoolbuf: shared buffer + * @return new structure or NULL on alloc failure. + */ +struct tcp_req_info* tcp_req_info_create(struct sldns_buffer* spoolbuf); + +/** + * Delete tcp request structure. Called by owning commpoint. + * Removes mesh entry references and stored results from the lists. + * @param req: the tcp request info + */ +void tcp_req_info_delete(struct tcp_req_info* req); + +/** + * Clear tcp request structure. Removes list entries, sets it up ready + * for the next connection. + * @param req: tcp request info structure. + */ +void tcp_req_info_clear(struct tcp_req_info* req); + +/** + * Remove mesh state entry from list in tcp_req_info. + * caller has to manage the mesh state reply entry in the mesh state. + * @param req: the tcp req info that has the entry removed from the list. + * @param m: the state removed from the list. + */ +void tcp_req_info_remove_mesh_state(struct tcp_req_info* req, + struct mesh_state* m); + +/** + * Handle write done of the last result packet + * @param req: the tcp req info. + */ +void tcp_req_info_handle_writedone(struct tcp_req_info* req); + +/** + * Handle read done of a new request from the client + * @param req: the tcp req info. + */ +void tcp_req_info_handle_readdone(struct tcp_req_info* req); + +/** + * Add mesh state to the tcp req list of open requests. + * So the comm_reply can be removed off the mesh reply list when + * the tcp channel has to be closed (for other reasons then that that + * request was done, eg. channel closed by client or some format error). + * @param req: tcp req info structure. It keeps track of the simultaneous + * requests and results on a tcp (or TLS) channel. + * @param mesh: mesh area for the state. + * @param m: mesh state to add. + * @return 0 on failure (malloc failure). + */ +int tcp_req_info_add_meshstate(struct tcp_req_info* req, + struct mesh_area* mesh, struct mesh_state* m); + +/** + * Send reply on tcp simultaneous answer channel. May queue it up. + * @param req: request info structure. + */ +void tcp_req_info_send_reply(struct tcp_req_info* req); + +/** the read channel has closed + * @param req: request. remaining queries are looked up and answered. + * @return zero if nothing to do, just close the tcp. + */ +int tcp_req_info_handle_read_close(struct tcp_req_info* req); + +/** get the size of currently used tcp stream wait buffers (in bytes) */ +size_t tcp_req_info_get_stream_buffer_size(void); + #endif /* LISTEN_DNSPORT_H */ diff --git a/services/localzone.c b/services/localzone.c index 902a29f21..6295b17e2 100644 --- a/services/localzone.c +++ b/services/localzone.c @@ -464,7 +464,8 @@ lz_enter_rr_into_zone(struct local_zone* z, const char* rrstr) return 0; } log_assert(z->dclass == rrclass); - if(z->type == local_zone_redirect && + if((z->type == local_zone_redirect || + z->type == local_zone_inform_redirect) && query_dname_compare(z->name, nm) != 0) { log_err("local-data in redirect zone must reside at top of zone" ", not at %s", rrstr); @@ -481,7 +482,8 @@ lz_enter_rr_into_zone(struct local_zone* z, const char* rrstr) /* Reject it if we would end up having CNAME and other data (including * another CNAME) for a redirect zone. */ - if(z->type == local_zone_redirect && node->rrsets) { + if((z->type == local_zone_redirect || + z->type == local_zone_inform_redirect) && node->rrsets) { const char* othertype = NULL; if (rrtype == LDNS_RR_TYPE_CNAME) othertype = "other"; @@ -1323,7 +1325,8 @@ local_data_answer(struct local_zone* z, struct module_env* env, key.name = qinfo->qname; key.namelen = qinfo->qname_len; key.namelabs = labs; - if(lz_type == local_zone_redirect) { + if(lz_type == local_zone_redirect || + lz_type == local_zone_inform_redirect) { key.name = z->name; key.namelen = z->namelen; key.namelabs = z->namelabs; @@ -1355,7 +1358,8 @@ local_data_answer(struct local_zone* z, struct module_env* env, return 0; /* Special case for alias matching. See local_data_answer(). */ - if(lz_type == local_zone_redirect && + if((lz_type == local_zone_redirect || + lz_type == local_zone_inform_redirect) && qinfo->qtype != LDNS_RR_TYPE_CNAME && lr->rrset->rk.type == htons(LDNS_RR_TYPE_CNAME)) { qinfo->local_alias = @@ -1370,7 +1374,8 @@ local_data_answer(struct local_zone* z, struct module_env* env, qinfo->local_alias->rrset->rk.dname_len = qinfo->qname_len; return 1; } - if(lz_type == local_zone_redirect) { + if(lz_type == local_zone_redirect || + lz_type == local_zone_inform_redirect) { /* convert rrset name to query name; like a wildcard */ struct ub_packed_rrset_key r = *lr->rrset; r.rk.dname = qinfo->qname; @@ -1442,6 +1447,7 @@ lz_zone_answer(struct local_zone* z, struct module_env* env, return 1; } else if(lz_type == local_zone_static || lz_type == local_zone_redirect || + lz_type == local_zone_inform_redirect || lz_type == local_zone_always_nxdomain) { /* for static, reply nodata or nxdomain * for redirect, reply nodata */ @@ -1450,7 +1456,8 @@ lz_zone_answer(struct local_zone* z, struct module_env* env, * or using closest match for NSEC. * or using closest match for returning delegation downwards */ - int rcode = (ld || lz_type == local_zone_redirect)? + int rcode = (ld || lz_type == local_zone_redirect || + lz_type == local_zone_inform_redirect)? LDNS_RCODE_NOERROR:LDNS_RCODE_NXDOMAIN; if(z->soa) return local_encode(qinfo, env, edns, repinfo, buf, temp, @@ -1624,7 +1631,9 @@ local_zones_answer(struct local_zones* zones, struct module_env* env, } } if((env->cfg->log_local_actions || - lzt == local_zone_inform || lzt == local_zone_inform_deny) + lzt == local_zone_inform || + lzt == local_zone_inform_deny || + lzt == local_zone_inform_redirect) && repinfo) lz_inform_print(z, qinfo, repinfo); @@ -1656,6 +1665,7 @@ const char* local_zone_type2str(enum localzone_type t) case local_zone_nodefault: return "nodefault"; case local_zone_inform: return "inform"; case local_zone_inform_deny: return "inform_deny"; + case local_zone_inform_redirect: return "inform_redirect"; case local_zone_always_transparent: return "always_transparent"; case local_zone_always_refuse: return "always_refuse"; case local_zone_always_nxdomain: return "always_nxdomain"; @@ -1682,6 +1692,8 @@ int local_zone_str2type(const char* type, enum localzone_type* t) *t = local_zone_inform; else if(strcmp(type, "inform_deny") == 0) *t = local_zone_inform_deny; + else if(strcmp(type, "inform_redirect") == 0) + *t = local_zone_inform_redirect; else if(strcmp(type, "always_transparent") == 0) *t = local_zone_always_transparent; else if(strcmp(type, "always_refuse") == 0) diff --git a/services/localzone.h b/services/localzone.h index dd7aa584c..1d6caeff2 100644 --- a/services/localzone.h +++ b/services/localzone.h @@ -83,6 +83,8 @@ enum localzone_type { local_zone_inform, /** log client address, and block (drop) */ local_zone_inform_deny, + /** log client address, and direct */ + local_zone_inform_redirect, /** resolve normally, even when there is local data */ local_zone_always_transparent, /** answer with error, even when there is local data */ @@ -491,6 +493,8 @@ enum respip_action { respip_inform = local_zone_inform, /** log query source and don't answer query */ respip_inform_deny = local_zone_inform_deny, + /** log query source and redirect */ + respip_inform_redirect = local_zone_inform_redirect, /** resolve normally, even when there is response-ip data */ respip_always_transparent = local_zone_always_transparent, /** answer with 'refused' response */ diff --git a/services/mesh.c b/services/mesh.c index c6bb9ef2b..bee0f76a4 100644 --- a/services/mesh.c +++ b/services/mesh.c @@ -61,6 +61,7 @@ #include "services/localzone.h" #include "util/data/dname.h" #include "respip/respip.h" +#include "services/listen_dnsport.h" /** subtract timers and the values do not overflow or become negative */ static void @@ -429,6 +430,7 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo, /* add reply to s */ if(!mesh_state_add_reply(s, edns, rep, qid, qflags, qinfo)) { log_err("mesh_new_client: out of memory; SERVFAIL"); + servfail_mem: if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, &s->s, NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch)) edns->opt_list = NULL; @@ -439,6 +441,12 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo, mesh_state_delete(&s->s); return; } + if(rep->c->tcp_req_info) { + if(!tcp_req_info_add_meshstate(rep->c->tcp_req_info, mesh, s)) { + log_err("mesh_new_client: out of memory add tcpreqinfo"); + goto servfail_mem; + } + } /* update statistics */ if(was_detached) { log_assert(mesh->num_detached_states > 0); @@ -732,9 +740,13 @@ mesh_state_cleanup(struct mesh_state* mstate) mesh = mstate->s.env->mesh; /* drop unsent replies */ if(!mstate->replies_sent) { - struct mesh_reply* rep; + struct mesh_reply* rep = mstate->reply_list; struct mesh_cb* cb; - for(rep=mstate->reply_list; rep; rep=rep->next) { + /* in tcp_req_info, the mstates linked are removed, but + * the reply_list is now NULL, so the remove-from-empty-list + * takes no time and also it does not do the mesh accounting */ + mstate->reply_list = NULL; + for(; rep; rep=rep->next) { comm_point_drop_reply(&rep->query_reply); mesh->num_reply_addrs--; } @@ -1031,11 +1043,14 @@ mesh_do_callback(struct mesh_state* m, int rcode, struct reply_info* rep, * @param rcode: if not 0, error code. * @param rep: reply to send (or NULL if rcode is set). * @param r: reply entry + * @param r_buffer: buffer to use for reply entry. * @param prev: previous reply, already has its answer encoded in buffer. + * @param prev_buffer: buffer for previous reply. */ static void mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, - struct mesh_reply* r, struct mesh_reply* prev) + struct mesh_reply* r, struct sldns_buffer* r_buffer, + struct mesh_reply* prev, struct sldns_buffer* prev_buffer) { struct timeval end_time; struct timeval duration; @@ -1063,7 +1078,7 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, * 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->qflags == r->qflags && + if(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 && @@ -1071,13 +1086,11 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, edns_opt_list_compare(prev->edns.opt_list, r->edns.opt_list) == 0) { /* if the previous reply is identical to this one, fix ID */ - if(prev->query_reply.c->buffer != r->query_reply.c->buffer) - sldns_buffer_copy(r->query_reply.c->buffer, - prev->query_reply.c->buffer); - sldns_buffer_write_at(r->query_reply.c->buffer, 0, - &r->qid, sizeof(uint16_t)); - sldns_buffer_write_at(r->query_reply.c->buffer, 12, - r->qname, m->s.qinfo.qname_len); + if(prev_buffer != r_buffer) + sldns_buffer_copy(r_buffer, prev_buffer); + 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); comm_point_send_reply(&r->query_reply); } else if(rcode) { m->s.qinfo.qname = r->qname; @@ -1091,8 +1104,8 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, &r->edns, NULL, m->s.region)) r->edns.opt_list = NULL; } - error_encode(r->query_reply.c->buffer, rcode, &m->s.qinfo, - r->qid, r->qflags, &r->edns); + error_encode(r_buffer, rcode, &m->s.qinfo, r->qid, + r->qflags, &r->edns); comm_point_send_reply(&r->query_reply); } else { size_t udp_size = r->edns.udp_size; @@ -1108,16 +1121,15 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, m->s.env->cfg, r->query_reply.c, m->s.region) || !reply_info_answer_encode(&m->s.qinfo, rep, r->qid, - r->qflags, r->query_reply.c->buffer, 0, 1, - m->s.env->scratch, udp_size, &r->edns, - (int)(r->edns.bits & EDNS_DO), secure)) + r->qflags, r_buffer, 0, 1, m->s.env->scratch, + udp_size, &r->edns, (int)(r->edns.bits & EDNS_DO), + 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)) r->edns.opt_list = NULL; - error_encode(r->query_reply.c->buffer, - LDNS_RCODE_SERVFAIL, &m->s.qinfo, r->qid, - r->qflags, &r->edns); + error_encode(r_buffer, LDNS_RCODE_SERVFAIL, + &m->s.qinfo, r->qid, r->qflags, &r->edns); } r->edns = edns_bak; comm_point_send_reply(&r->query_reply); @@ -1132,19 +1144,17 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep, timeval_add(&m->s.env->mesh->replies_sum_wait, &duration); timehist_insert(m->s.env->mesh->histogram, &duration); if(m->s.env->cfg->stat_extended) { - uint16_t rc = FLAGS_GET_RCODE(sldns_buffer_read_u16_at(r-> - query_reply.c->buffer, 2)); + uint16_t rc = FLAGS_GET_RCODE(sldns_buffer_read_u16_at( + r_buffer, 2)); if(secure) m->s.env->mesh->ans_secure++; m->s.env->mesh->ans_rcode[ rc ] ++; - if(rc == 0 && LDNS_ANCOUNT(sldns_buffer_begin(r-> - query_reply.c->buffer)) == 0) + if(rc == 0 && LDNS_ANCOUNT(sldns_buffer_begin(r_buffer)) == 0) m->s.env->mesh->ans_nodata++; } /* Log reply sent */ if(m->s.env->cfg->log_replies) { log_reply_info(0, &m->s.qinfo, &r->query_reply.addr, - r->query_reply.addrlen, duration, 0, - r->query_reply.c->buffer); + r->query_reply.addrlen, duration, 0, r_buffer); } } @@ -1152,6 +1162,7 @@ void mesh_query_done(struct mesh_state* mstate) { struct mesh_reply* r; struct mesh_reply* prev = NULL; + struct sldns_buffer* prev_buffer = NULL; struct mesh_cb* c; struct reply_info* rep = (mstate->s.return_msg? mstate->s.return_msg->rep:NULL); @@ -1180,9 +1191,15 @@ void mesh_query_done(struct mesh_state* mstate) if(mstate->s.is_drop) comm_point_drop_reply(&r->query_reply); else { + struct sldns_buffer* 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; mesh_send_reply(mstate, mstate->s.return_rcode, rep, - r, prev); + r, r_buffer, prev, prev_buffer); + if(r->query_reply.c->tcp_req_info) + tcp_req_info_remove_mesh_state(r->query_reply.c->tcp_req_info, mstate); prev = r; + prev_buffer = r_buffer; } } mstate->replies_sent = 1; @@ -1392,7 +1409,7 @@ mesh_continue(struct mesh_area* mesh, struct mesh_state* mstate, /* module is looping. Stop it. */ log_err("internal error: looping module (%s) stopped", mesh->mods.mod[mstate->s.curmod]->name); - log_query_info(VERB_QUERY, "pass error for qstate", + log_query_info(0, "pass error for qstate", &mstate->s.qinfo); s = module_error; } @@ -1613,3 +1630,38 @@ void mesh_list_remove(struct mesh_state* m, struct mesh_state** fp, m->prev->next = m->next; else *fp = m->next; } + +void mesh_state_remove_reply(struct mesh_area* mesh, struct mesh_state* m, + struct comm_point* cp) +{ + struct mesh_reply* n, *prev = NULL; + n = m->reply_list; + /* when in mesh_cleanup, it sets the reply_list to NULL, so that + * there is no accounting twice */ + if(!n) return; /* nothing to remove, also no accounting needed */ + while(n) { + if(n->query_reply.c == cp) { + /* unlink it */ + if(prev) prev->next = n->next; + else m->reply_list = n->next; + /* delete it, but allocated in m region */ + mesh->num_reply_addrs--; + + /* prev = prev; */ + n = n->next; + continue; + } + prev = n; + n = n->next; + } + /* it was not detached (because it had a reply list), could be now */ + if(!m->reply_list && !m->cb_list + && m->super_set.count == 0) { + mesh->num_detached_states++; + } + /* if not replies any more in mstate, it is no longer a reply_state */ + if(!m->reply_list && !m->cb_list) { + log_assert(mesh->num_reply_states > 0); + mesh->num_reply_states--; + } +} diff --git a/services/mesh.h b/services/mesh.h index b4ce03e7e..a2622844b 100644 --- a/services/mesh.h +++ b/services/mesh.h @@ -65,7 +65,7 @@ struct respip_client_info; * Maximum number of mesh state activations. Any more is likely an * infinite loop in the module. It is then terminated. */ -#define MESH_MAX_ACTIVATION 3000 +#define MESH_MAX_ACTIVATION 10000 /** * Max number of references-to-references-to-references.. search size. @@ -633,4 +633,14 @@ void mesh_list_insert(struct mesh_state* m, struct mesh_state** fp, void mesh_list_remove(struct mesh_state* m, struct mesh_state** fp, struct mesh_state** lp); +/** + * Remove mesh reply entry from the reply entry list. Searches for + * the comm_point pointer. + * @param mesh: to update the counters. + * @param m: the mesh state. + * @param cp: the comm_point to remove from the list. + */ +void mesh_state_remove_reply(struct mesh_area* mesh, struct mesh_state* m, + struct comm_point* cp); + #endif /* SERVICES_MESH_H */ diff --git a/services/modstack.c b/services/modstack.c index 136245a96..05b949d1e 100644 --- a/services/modstack.c +++ b/services/modstack.c @@ -113,8 +113,14 @@ modstack_config(struct module_stack* stack, const char* module_conf) for(i=0; inum; i++) { stack->mod[i] = module_factory(&module_conf); if(!stack->mod[i]) { - log_err("Unknown value for next module: '%s'", - module_conf); + char md[256]; + snprintf(md, sizeof(md), "%s", module_conf); + if(strchr(md, ' ')) *(strchr(md, ' ')) = 0; + if(strchr(md, '\t')) *(strchr(md, '\t')) = 0; + log_err("Unknown value in module-config, module: '%s'." + " This module is not present (not compiled in)," + " See the list of linked modules with unbound -h", + md); return 0; } } diff --git a/services/outside_network.c b/services/outside_network.c index 1badb5116..3347c38e7 100644 --- a/services/outside_network.c +++ b/services/outside_network.c @@ -364,6 +364,8 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len) comm_point_close(pend->c); return 0; } + verbose(VERB_ALGO, "the query is using TLS encryption, for %s", + (w->tls_auth_name?w->tls_auth_name:"an unauthenticated connection")); #ifdef USE_WINSOCK comm_point_tcp_win_bio_cb(pend->c, pend->c->ssl); #endif @@ -404,6 +406,8 @@ outnet_tcp_take_into_use(struct waiting_tcp* w, uint8_t* pkt, size_t pkt_len) } SSL_set_verify(pend->c->ssl, SSL_VERIFY_PEER, NULL); } +#else + verbose(VERB_ALGO, "the query has an auth_name, but libssl has no call to perform TLS authentication"); #endif /* HAVE_SSL_SET1_HOST */ } w->pkt = NULL; @@ -1506,7 +1510,6 @@ serviced_delete(struct serviced_query* sq) /* clear up the pending query */ if(sq->status == serviced_query_UDP_EDNS || sq->status == serviced_query_UDP || - sq->status == serviced_query_PROBE_EDNS || sq->status == serviced_query_UDP_EDNS_FRAG || sq->status == serviced_query_UDP_EDNS_fallback) { struct pending* p = (struct pending*)sq->pending; @@ -1633,15 +1636,7 @@ serviced_udp_send(struct serviced_query* sq, sldns_buffer* buff) sq->last_rtt = rtt; verbose(VERB_ALGO, "EDNS lookup known=%d vs=%d", edns_lame_known, vs); if(sq->status == serviced_initial) { - if(edns_lame_known == 0 && rtt > 5000 && rtt < 10001) { - /* perform EDNS lame probe - check if server is - * EDNS lame (EDNS queries to it are dropped) */ - verbose(VERB_ALGO, "serviced query: send probe to see " - " if use of EDNS causes timeouts"); - /* even 700 msec may be too small */ - rtt = 1000; - sq->status = serviced_query_PROBE_EDNS; - } else if(vs != -1) { + if(vs != -1) { sq->status = serviced_query_UDP_EDNS; } else { sq->status = serviced_query_UDP; @@ -1973,17 +1968,10 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, struct serviced_query* sq = (struct serviced_query*)arg; struct outside_network* outnet = sq->outnet; struct timeval now = *sq->outnet->now_tv; - int fallback_tcp = 0; sq->pending = NULL; /* removed after callback */ if(error == NETEVENT_TIMEOUT) { int rto = 0; - if(sq->status == serviced_query_PROBE_EDNS) { - /* non-EDNS probe failed; we do not know its status, - * keep trying with EDNS, timeout may not be caused - * by EDNS. */ - sq->status = serviced_query_UDP_EDNS; - } if(sq->status == serviced_query_UDP_EDNS && sq->last_rtt < 5000) { /* fallback to 1480/1280 */ sq->status = serviced_query_UDP_EDNS_FRAG; @@ -2011,14 +1999,8 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, } return 0; } - if(rto >= RTT_MAX_TIMEOUT) { - /* fallback_tcp = 1; */ - /* UDP does not work, fallback to TCP below */ - } else { - serviced_callbacks(sq, NETEVENT_TIMEOUT, c, rep); - return 0; - } - } else if(error != NETEVENT_NOERROR) { + } + if(error != NETEVENT_NOERROR) { /* udp returns error (due to no ID or interface available) */ serviced_callbacks(sq, error, c, rep); return 0; @@ -2031,9 +2013,8 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, sq->zone, sq->zonelen, sq->qbuf, sq->qbuflen, &sq->last_sent_time, sq->outnet->now_tv, c->buffer); #endif - if(!fallback_tcp) { - if( (sq->status == serviced_query_UDP_EDNS - ||sq->status == serviced_query_UDP_EDNS_FRAG) + if( (sq->status == serviced_query_UDP_EDNS + ||sq->status == serviced_query_UDP_EDNS_FRAG) && (LDNS_RCODE_WIRE(sldns_buffer_begin(c->buffer)) == LDNS_RCODE_FORMERR || LDNS_RCODE_WIRE( sldns_buffer_begin(c->buffer)) == LDNS_RCODE_NOTIMPL @@ -2047,19 +2028,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, serviced_callbacks(sq, NETEVENT_CLOSED, c, rep); } return 0; - } else if(sq->status == serviced_query_PROBE_EDNS) { - /* probe without EDNS succeeds, so we conclude that this - * host likely has EDNS packets dropped */ - log_addr(VERB_DETAIL, "timeouts, concluded that connection to " - "host drops EDNS packets", &sq->addr, sq->addrlen); - /* only store noEDNS in cache if domain is noDNSSEC */ - if(!sq->want_dnssec) - if(!infra_edns_update(outnet->infra, &sq->addr, sq->addrlen, - sq->zone, sq->zonelen, -1, (time_t)now.tv_sec)) { - log_err("Out of memory caching no edns for host"); - } - sq->status = serviced_query_UDP; - } else if(sq->status == serviced_query_UDP_EDNS && + } else if(sq->status == serviced_query_UDP_EDNS && !sq->edns_lame_known) { /* now we know that edns queries received answers store that */ log_addr(VERB_ALGO, "serviced query: EDNS works for", @@ -2069,7 +2038,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, log_err("Out of memory caching edns works"); } sq->edns_lame_known = 1; - } else if(sq->status == serviced_query_UDP_EDNS_fallback && + } else if(sq->status == serviced_query_UDP_EDNS_fallback && !sq->edns_lame_known && (LDNS_RCODE_WIRE( sldns_buffer_begin(c->buffer)) == LDNS_RCODE_NOERROR || LDNS_RCODE_WIRE(sldns_buffer_begin(c->buffer)) == @@ -2087,12 +2056,12 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, } } else { log_addr(VERB_ALGO, "serviced query: EDNS fails, but " - "not stored because need DNSSEC for", &sq->addr, + "not stored because need DNSSEC for", &sq->addr, sq->addrlen); } sq->status = serviced_query_UDP; - } - if(now.tv_sec > sq->last_sent_time.tv_sec || + } + if(now.tv_sec > sq->last_sent_time.tv_sec || (now.tv_sec == sq->last_sent_time.tv_sec && now.tv_usec > sq->last_sent_time.tv_usec)) { /* convert from microseconds to milliseconds */ @@ -2108,11 +2077,10 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error, sq->last_rtt, (time_t)now.tv_sec)) log_err("out of memory noting rtt."); } - } - } /* end of if_!fallback_tcp */ + } /* perform TC flag check and TCP fallback after updating our * cache entries for EDNS status and RTT times */ - if(LDNS_TC_WIRE(sldns_buffer_begin(c->buffer)) || fallback_tcp) { + if(LDNS_TC_WIRE(sldns_buffer_begin(c->buffer))) { /* fallback to TCP */ /* this discards partial UDP contents */ if(sq->status == serviced_query_UDP_EDNS || @@ -2539,7 +2507,6 @@ serviced_get_mem(struct serviced_query* sq) s += sizeof(*sb); if(sq->status == serviced_query_UDP_EDNS || sq->status == serviced_query_UDP || - sq->status == serviced_query_PROBE_EDNS || sq->status == serviced_query_UDP_EDNS_FRAG || sq->status == serviced_query_UDP_EDNS_fallback) { s += sizeof(struct pending); diff --git a/services/outside_network.h b/services/outside_network.h index 01a307417..48ef03edb 100644 --- a/services/outside_network.h +++ b/services/outside_network.h @@ -359,8 +359,6 @@ struct serviced_query { serviced_query_TCP_EDNS, /** TCP without EDNS sent */ serviced_query_TCP, - /** probe to test EDNS lameness (EDNS is dropped) */ - serviced_query_PROBE_EDNS, /** probe to test noEDNS0 (EDNS gives FORMERRorNOTIMP) */ serviced_query_UDP_EDNS_fallback, /** probe to test TCP noEDNS0 (EDNS gives FORMERRorNOTIMP) */ diff --git a/sldns/wire2str.c b/sldns/wire2str.c index 832239f9b..01ec84b3c 100644 --- a/sldns/wire2str.c +++ b/sldns/wire2str.c @@ -1908,8 +1908,8 @@ int sldns_wire2str_edns_subnet_print(char** s, size_t* sl, uint8_t* data, return w; } -int sldns_wire2str_edns_keepalive_print(char** s, size_t* sl, uint8_t* data, - size_t len) +static int sldns_wire2str_edns_keepalive_print(char** s, size_t* sl, + uint8_t* data, size_t len) { int w = 0; uint16_t timeout; diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c index b947198ef..3ea6aa033 100644 --- a/smallapp/unbound-control.c +++ b/smallapp/unbound-control.c @@ -247,7 +247,8 @@ static void print_uptime(struct ub_shm_stat_info* shm_stat) } /** print memory usage */ -static void print_mem(struct ub_shm_stat_info* shm_stat) +static void print_mem(struct ub_shm_stat_info* shm_stat, + struct ub_stats_info* s) { PR_LL("mem.cache.rrset", shm_stat->mem.rrset); PR_LL("mem.cache.message", shm_stat->mem.msg); @@ -266,6 +267,7 @@ static void print_mem(struct ub_shm_stat_info* shm_stat) PR_LL("mem.cache.dnscrypt_nonce", shm_stat->mem.dnscrypt_nonce); #endif + PR_LL("mem.streamwait", s->svr.mem_stream_wait); } /** print histogram */ @@ -328,6 +330,7 @@ static void print_extended(struct ub_stats_info* s) PR_UL("num.query.tcp", s->svr.qtcp); PR_UL("num.query.tcpout", s->svr.qtcp_outgoing); PR_UL("num.query.tls", s->svr.qtls); + PR_UL("num.query.tls_resume", s->svr.qtls_resume); PR_UL("num.query.ipv6", s->svr.qipv6); /* flags */ @@ -399,7 +402,7 @@ static void do_stats_shm(struct config_file* cfg, struct ub_stats_info* stats, pr_stats("total", &stats[0]); print_uptime(shm_stat); if(cfg->stat_extended) { - print_mem(shm_stat); + print_mem(shm_stat, &stats[0]); print_hist(stats); print_extended(stats); } diff --git a/testcode/fake_event.c b/testcode/fake_event.c index 777ed7355..4fb9bc8ed 100644 --- a/testcode/fake_event.c +++ b/testcode/fake_event.c @@ -385,7 +385,7 @@ answer_callback_from_entry(struct replay_runtime* runtime, repinfo.addrlen = pend->addrlen; memcpy(&repinfo.addr, &pend->addr, pend->addrlen); if(!pend->serviced) { - if(entry->reply_list->next && + if(entry && entry->reply_list->next && pend->tcp_pkt_counter < count_reply_packets(entry)) { /* go to next packet next time */ pend->tcp_pkt_counter++; @@ -509,7 +509,7 @@ fake_pending_callback(struct replay_runtime* runtime, repinfo.addrlen = p->addrlen; memcpy(&repinfo.addr, &p->addr, p->addrlen); if(!p->serviced) { - if(todo->match->reply_list->next && !error && + if(todo->match && todo->match->reply_list->next && !error && p->tcp_pkt_counter < count_reply_packets(todo->match)) { /* go to next packet next time */ p->tcp_pkt_counter++; @@ -1802,4 +1802,24 @@ int outnet_tcp_connect(int ATTR_UNUSED(s), struct sockaddr_storage* ATTR_UNUSED( return 0; } +int tcp_req_info_add_meshstate(struct tcp_req_info* ATTR_UNUSED(req), + struct mesh_area* ATTR_UNUSED(mesh), struct mesh_state* ATTR_UNUSED(m)) +{ + log_assert(0); + return 0; +} + +void +tcp_req_info_remove_mesh_state(struct tcp_req_info* ATTR_UNUSED(req), + struct mesh_state* ATTR_UNUSED(m)) +{ + log_assert(0); +} + +size_t +tcp_req_info_get_stream_buffer_size(void) +{ + return 0; +} + /*********** End of Dummy routines ***********/ diff --git a/testcode/perf.c b/testcode/perf.c index 32a5307ed..d6d2b0529 100644 --- a/testcode/perf.c +++ b/testcode/perf.c @@ -513,10 +513,12 @@ qlist_grow_capacity(struct perfinfo* info) uint8_t** d = (uint8_t**)calloc(sizeof(uint8_t*), newcap); size_t* l = (size_t*)calloc(sizeof(size_t), newcap); if(!d || !l) fatal_exit("out of memory"); - memcpy(d, info->qlist_data, sizeof(uint8_t*)* - info->qlist_capacity); - memcpy(l, info->qlist_len, sizeof(size_t)* - info->qlist_capacity); + if(info->qlist_data && info->qlist_capacity) + memcpy(d, info->qlist_data, sizeof(uint8_t*)* + info->qlist_capacity); + if(info->qlist_len && info->qlist_capacity) + memcpy(l, info->qlist_len, sizeof(size_t)* + info->qlist_capacity); free(info->qlist_data); free(info->qlist_len); info->qlist_data = d; diff --git a/testcode/petal.c b/testcode/petal.c index e1f5f4341..a733017a4 100644 --- a/testcode/petal.c +++ b/testcode/petal.c @@ -323,9 +323,9 @@ file_name_is_safe(char* s) return 1; } -/** adjust host and filename */ +/** adjust host */ static void -adjust_host_file(char* host, char* file) +adjust_host(char* host) { size_t i, len; /* remove a port number if present */ @@ -335,6 +335,13 @@ adjust_host_file(char* host, char* file) len = strlen(host); for(i=0; i 0) { + memset(&rfd, 0, sizeof(rfd)); + memset(&tv, 0, sizeof(tv)); + FD_ZERO(&rfd); + FD_SET(fd, &rfd); + if(wait_all) waittv = NULL; + else waittv = &tv; + ret = select(fd+1, &rfd, NULL, NULL, waittv); + if(ret < 0) { + if(errno == EINTR || errno == EAGAIN) continue; + perror("select() failed"); + exit(1); + } + if(ret == 0) { + if(wait_all) continue; + return; + } + (*num_answers) -= 1; + recv_one(fd, udp, ssl, buf); + } +} + static int get_random(void) { int r; @@ -278,12 +319,12 @@ static int get_random(void) /** send the TCP queries and print answers */ static void -send_em(const char* svr, int udp, int usessl, int noanswer, int delay, - int num, char** qs) +send_em(const char* svr, int udp, int usessl, int noanswer, int onarrival, + int delay, int num, char** qs) { sldns_buffer* buf = sldns_buffer_new(65553); int fd = open_svr(svr, udp); - int i; + int i, wait_results = 0; SSL_CTX* ctx = NULL; SSL* ssl = NULL; if(!buf) fatal_exit("out of memory"); @@ -325,9 +366,15 @@ send_em(const char* svr, int udp, int usessl, int noanswer, int delay, write_q(fd, udp, ssl, buf, (uint16_t)get_random(), qs[i], qs[i+1], qs[i+2]); /* print at least one result */ - if(!noanswer) + if(onarrival) { + wait_results += 1; /* one more answer to fetch */ + print_any_answers(fd, udp, ssl, buf, &wait_results, 0); + } else if(!noanswer) { recv_one(fd, udp, ssl, buf); + } } + if(onarrival) + print_any_answers(fd, udp, ssl, buf, &wait_results, 1); if(usessl) { SSL_shutdown(ssl); @@ -368,6 +415,7 @@ int main(int argc, char** argv) const char* svr = "127.0.0.1"; int udp = 0; int noanswer = 0; + int onarrival = 0; int usessl = 0; int delay = 0; @@ -394,11 +442,14 @@ int main(int argc, char** argv) if(argc == 1) { usage(argv); } - while( (c=getopt(argc, argv, "f:hnsud:")) != -1) { + while( (c=getopt(argc, argv, "af:hnsud:")) != -1) { switch(c) { case 'f': svr = optarg; break; + case 'a': + onarrival = 1; + break; case 'n': noanswer = 1; break; @@ -446,7 +497,7 @@ int main(int argc, char** argv) (void)OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL); #endif } - send_em(svr, udp, usessl, noanswer, delay, argc, argv); + send_em(svr, udp, usessl, noanswer, onarrival, delay, argc, argv); checklock_stop(); #ifdef USE_WINSOCK WSACleanup(); diff --git a/testcode/testbound.c b/testcode/testbound.c index cea74c593..246bc6735 100644 --- a/testcode/testbound.c +++ b/testcode/testbound.c @@ -344,6 +344,7 @@ 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)); log_init(NULL, 0, NULL); /* determine commandline options for the daemon */ diff --git a/testcode/testpkts.c b/testcode/testpkts.c index 1d89c38fc..6c90567aa 100644 --- a/testcode/testpkts.c +++ b/testcode/testpkts.c @@ -513,7 +513,8 @@ add_edns(uint8_t* pktbuf, size_t pktsize, int do_flag, uint8_t *ednsdata, if(*pktlen + sizeof(edns) + ednslen > pktsize) error("not enough space for EDNS OPT record"); memmove(pktbuf+*pktlen, edns, sizeof(edns)); - memmove(pktbuf+*pktlen+sizeof(edns), ednsdata, ednslen); + if(ednsdata && ednslen) + memmove(pktbuf+*pktlen+sizeof(edns), ednsdata, ednslen); sldns_write_uint16(pktbuf+10, LDNS_ARCOUNT(pktbuf)+1); *pktlen += (sizeof(edns) + ednslen); } diff --git a/testdata/auth_nsec3_ent.rpl b/testdata/auth_nsec3_ent.rpl new file mode 100644 index 000000000..5730c8d52 --- /dev/null +++ b/testdata/auth_nsec3_ent.rpl @@ -0,0 +1,224 @@ +; config options +server: + target-fetch-policy: "0 0 0 0 0" + +auth-zone: + name: "unbound-auth-test.nlnetlabs.nl." + ## zonefile (or none). + ## zonefile: "example.com.zone" + ## master by IP address or hostname + ## can list multiple masters, each on one line. + ## master: + ## url for http fetch + ## url: + ## queries from downstream clients get authoritative answers. + ## for-downstream: yes + for-downstream: yes + ## queries are used to fetch authoritative answers from this zone, + ## instead of unbound itself sending queries there. + ## for-upstream: yes + for-upstream: yes + ## on failures with for-upstream, fallback to sending queries to + ## the authority servers + ## fallback-enabled: no + + ## this line generates zonefile: \n"/tmp/xxx.example.com"\n + zonefile: +TEMPFILE_NAME unbound-auth-test.nlnetlabs.nl + ## this is the inline file /tmp/xxx.unbound-auth-test.nlnetlabs.nl + ## the tempfiles are deleted when the testrun is over. +TEMPFILE_CONTENTS unbound-auth-test.nlnetlabs.nl +;; Zone: unbound-auth-test.nlnetlabs.nl. +; +unbound-auth-test.nlnetlabs.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 1554201247 14400 3600 604800 3600 +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG SOA 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. NLFcC2oet+HC+1dhT4D/2JJFIcMiRtTM81KwvT7u8ybF3iDE4bnyrILvQk8DsizpYKwk+D3J3tMC3TV5+//qFw== +; +unbound-auth-test.nlnetlabs.nl. 3600 IN NS ns.nlnetlabs.nl. +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NS 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. Gm0UF77ljiInG4/HZ6Tkzx7z9N45WwwmbBt9KxeN3z1BkdBLiy10Du71ZBFLP71b+USs1rv5SJQ0hteZFbl8sg== +unbound-auth-test.nlnetlabs.nl. 3600 IN DNSKEY 256 3 13 S3Da9HqpFj0pEbI8WXOdkvN3vgZ6qxNSz4XyKkmWWAG28kq5T+/lWp36DUDvnMI9wJNuixzUHtgZ6oZoAaVrPg== ;{id = 15486 (zsk), size = 256b} +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG DNSKEY 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. 1cLFaDb6kP8KnRJujW1ieHUdS5Tgdv59TCZ+FloCRJMJBwQAow6UKAIY7HHlTb8IHTajyUrjlxX/dN8S/5VwuA== +unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3PARAM 1 0 1 - +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3PARAM 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. GWgtJArNpfJ4ifoinUBUVRTlkk0CMemdozhMKY13dk3EQMP0jb4g49PcTAgEP2dBUs9efttQVQQpmFPyTGfN1w== +tvdhfml24jp7cott1qijj9812qu9ibh3.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - 41pcah2j3fr8k99gj5pveh4igrjfc871 NS SOA RRSIG DNSKEY NSEC3PARAM ;{ flags: -, from: unbound-auth-test.nlnetlabs.nl. to: b.b.unbound-auth-test.nlnetlabs.nl.} +tvdhfml24jp7cott1qijj9812qu9ibh3.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. DzwQTaZj4j29eHXEKllIFcq4yNWA7VMqkh8+gCrBO+GEek9+hGxL6ANsU0Hv6glyBmPDeYUZcy4xy0EEj1R4hQ== +; +;; Empty nonterminal: b.unbound-auth-test.nlnetlabs.nl. +apejmh1fqds9gir0nnsf4d5gtno10tg1.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - dbs0aj50410urbvt3ghfr644n7h06gs5 ;{ flags: -, from: b.unbound-auth-test.nlnetlabs.nl. to: c.b.unbound-auth-test.nlnetlabs.nl.} +apejmh1fqds9gir0nnsf4d5gtno10tg1.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. m9B0W8xDZF6ml/m8OujrZZBiF1O0wAeKciK/5FMT/hCjHR0hMrbXBPg/ZntpVJD/Pko2HcBvWKu87U721yTHyQ== +; +;; Empty nonterminal: a.b.unbound-auth-test.nlnetlabs.nl. +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - tvdhfml24jp7cott1qijj9812qu9ibh3 ;{ flags: -, from: a.b.unbound-auth-test.nlnetlabs.nl. to: unbound-auth-test.nlnetlabs.nl.} +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. Jr1oPPs+DGBVV13n4gG4AGVFsleItluLbtCIyQDcYZEA+e5JMkrLzfW3rXqXaUSUauR4iEu5FmTfs4GTsumdUw== +; +*.a.b.unbound-auth-test.nlnetlabs.nl. 3600 IN TXT "*.a.b" +*.a.b.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG TXT 13 5 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. NrMUaNzZp88lXit/HLL/iDBHspDSfoM//K+/0VwUYRZjmVJQQHCHtHBGgR4NgrLi3ffvCAWq2LNGxDm+YMSl3g== +jrtu61ssgd18lfjglqrbbs5b2vmbh6cl.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - k8r2bchsbehs5dbu5d6ivjfnmjb3jc8s TXT RRSIG ;{ flags: -, from: *.a.b.unbound-auth-test.nlnetlabs.nl. to: *.c.b.unbound-auth-test.nlnetlabs.nl.} +jrtu61ssgd18lfjglqrbbs5b2vmbh6cl.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. kLIhE9+iz1OybJwXbtRJZst+Mk5u4OAtpZGWSwJUfqD6dXAk+h6msKAR18jpPeL7cCjXjIAKIv3x4oYRkl+uKw== +; +;; Empty nonterminal: b.b.unbound-auth-test.nlnetlabs.nl. +41pcah2j3fr8k99gj5pveh4igrjfc871.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - apejmh1fqds9gir0nnsf4d5gtno10tg1 ;{ flags: -, from: b.b.unbound-auth-test.nlnetlabs.nl. to: b.unbound-auth-test.nlnetlabs.nl.} +41pcah2j3fr8k99gj5pveh4igrjfc871.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. XlIjnuF313w0GXn6vymrAcsyuxZSaN6IShFjxQ5T2HUFePHBNvtRkL+TtMQZNlR8nTR3+MWcON0cOZIGjVCCjg== +; +*.b.b.unbound-auth-test.nlnetlabs.nl. 3600 IN TXT "*.b.b" +*.b.b.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG TXT 13 5 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. FkS3ceWpoHyOKaa8OtywIl148Bwo0vkzBd263vqYe0puhuRa6IvNEk5ERdwfWt9eNEq+6IlizPT/dYxA2fXYXA== +ft7dasbom0copm9e2ak9k151dj08kjfs.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - jrtu61ssgd18lfjglqrbbs5b2vmbh6cl TXT RRSIG ;{ flags: -, from: *.b.b.unbound-auth-test.nlnetlabs.nl. to: *.a.b.unbound-auth-test.nlnetlabs.nl.} +ft7dasbom0copm9e2ak9k151dj08kjfs.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. 5QhLGohTRLQSGC8vstzDjqcwfrbOnLUG2OelSjvsZFy1smsWUxJBCQXQdx1+JX7xamZHlZESQtS+cELuZUqpvA== +; +;; Empty nonterminal: c.b.unbound-auth-test.nlnetlabs.nl. +dbs0aj50410urbvt3ghfr644n7h06gs5.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - ft7dasbom0copm9e2ak9k151dj08kjfs ;{ flags: -, from: c.b.unbound-auth-test.nlnetlabs.nl. to: *.b.b.unbound-auth-test.nlnetlabs.nl.} +dbs0aj50410urbvt3ghfr644n7h06gs5.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. hjk1foJWW68JK3O1Ktf0ZogoXVrMDw3mHVBBYTrpaBKX1gWR5icmJiOCYZWYx3z88PUnGkfH+kx4oDUjioqN+Q== +; +*.c.b.unbound-auth-test.nlnetlabs.nl. 3600 IN TXT "*.c.b" +*.c.b.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG TXT 13 5 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. b7rFR5tlx5Y5SQqNdYBtfD6DrkNx9h79GCmnZfWrUzRz+A256k2v08IPRJDK+WxEHuYHjfNnVWxjRr9M1OW2Iw== +k8r2bchsbehs5dbu5d6ivjfnmjb3jc8s.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - toqivctpt4pdcp5g19neqt19fvtgbgeu TXT RRSIG ;{ flags: -, from: *.c.b.unbound-auth-test.nlnetlabs.nl. to: a.b.unbound-auth-test.nlnetlabs.nl.} +k8r2bchsbehs5dbu5d6ivjfnmjb3jc8s.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. 34BS1ajedCNdfXgUfxTyiAK1ichfFLshhJ3TnfplrUps0UsZaQLEG+EIlP4wTBtro2c6V8YCSmOuxuce4gYoDw== +; +TEMPFILE_END + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test authority zone with NSEC3 empty nonterminal +; with exact match NSEC3 in existence (eg. not a CE-proof) + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION ANSWER +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.44 +ENTRY_END +RANGE_END + +; ns.example.net. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.44 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.net. IN NS +SECTION ANSWER +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +ns.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN A +SECTION ANSWER +ns.example.net. IN A 1.2.3.44 +SECTION AUTHORITY +example.net. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN AAAA +SECTION AUTHORITY +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +www.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +a.b.unbound-auth-test.nlnetlabs.nl. IN TXT +ENTRY_END + +; recursion happens here. +STEP 20 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR AA RD RA DO NOERROR +SECTION QUESTION +a.b.unbound-auth-test.nlnetlabs.nl. IN TXT +SECTION ANSWER +SECTION AUTHORITY +unbound-auth-test.nlnetlabs.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 1554201247 14400 3600 604800 3600 +unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG SOA 13 3 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. NLFcC2oet+HC+1dhT4D/2JJFIcMiRtTM81KwvT7u8ybF3iDE4bnyrILv Qk8DsizpYKwk+D3J3tMC3TV5+//qFw== +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN NSEC3 1 0 1 - TVDHFML24JP7COTT1QIJJ9812QU9IBH3 +toqivctpt4pdcp5g19neqt19fvtgbgeu.unbound-auth-test.nlnetlabs.nl. 3600 IN RRSIG NSEC3 13 4 3600 20190430103407 20190402103407 15486 unbound-auth-test.nlnetlabs.nl. Jr1oPPs+DGBVV13n4gG4AGVFsleItluLbtCIyQDcYZEA+e5JMkrLzfW3 rXqXaUSUauR4iEu5FmTfs4GTsumdUw== +ENTRY_END + +SCENARIO_END diff --git a/testdata/auth_nsec3_wild.rpl b/testdata/auth_nsec3_wild.rpl new file mode 100644 index 000000000..1aeeebacc --- /dev/null +++ b/testdata/auth_nsec3_wild.rpl @@ -0,0 +1,230 @@ +; config options +server: + target-fetch-policy: "0 0 0 0 0" + +auth-zone: + name: "test-ns-signed.dev.internet.nl." + ## zonefile (or none). + ## zonefile: "example.com.zone" + ## master by IP address or hostname + ## can list multiple masters, each on one line. + ## master: + ## url for http fetch + ## url: + ## queries from downstream clients get authoritative answers. + ## for-downstream: yes + for-downstream: yes + ## queries are used to fetch authoritative answers from this zone, + ## instead of unbound itself sending queries there. + ## for-upstream: yes + for-upstream: yes + ## on failures with for-upstream, fallback to sending queries to + ## the authority servers + ## fallback-enabled: no + + ## this line generates zonefile: \n"/tmp/xxx.example.com"\n + zonefile: +TEMPFILE_NAME test-ns-signed.dev.internet.nl + ## this is the inline file /tmp/xxx.test-ns-signed.dev.internet.nl + ## the tempfiles are deleted when the testrun is over. +TEMPFILE_CONTENTS test-ns-signed.dev.internet.nl +test-ns-signed.dev.internet.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 4 14400 3600 604800 3600 +test-ns-signed.dev.internet.nl. 3600 IN RRSIG SOA 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. ybb0Hc7NC+QOFEEv4cX2+Umlk+miiOAHmeP2Uwvg6lqfxkk+3g7yWBEKMinXjLKz0odWZ6fki6M/3yBPQX8SV0OCRY5gYvAHAjbxAIHozIM+5iwOkRQhNF1DRgQ3BLjL93f6T5e5Z4y1812iOpu4GYswXW/UTOZACXz2UiaCPAg= +test-ns-signed.dev.internet.nl. 3600 IN NS ns.test-ns-signed.dev.internet.nl. +test-ns-signed.dev.internet.nl. 3600 IN RRSIG NS 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. KqiwTF3hKm1ZHGbgx6MVzZYHlS1p7+Xrikx4izMHFbWiD6ki6lrJBJsnH9j/hH1cwHxjXslOeJh0hdBdbn8la0meZPsebOyUbEjoLPzRLzKNLDBuA4BUJnRGQJy21CX7XooXAMAmR8YFipO8CojI9EogU2m2o9YkfbpacFWQoTk= +test-ns-signed.dev.internet.nl. 3600 IN DNSKEY 256 3 8 AwEAAc6c8tpMXBSOFLu/9n4aUUDK43wN4B7A2UDqZi0IOkyptxWCFghleyZeeN5uq6p9MoUt8lS73mFmIYC0ux5zBO3uVaJQ9u+00qRAEVg/RgBwa58y2f/zNtFV/f7mBSPcPTiEjUh0bwHSiTvUn/8JkrvjyAcbQMO0YOsRof5q6tzl ;{id = 32784 (zsk), size = 1024b} +test-ns-signed.dev.internet.nl. 3600 IN DNSKEY 257 3 8 AwEAAdC0hBJP1U8lbZ6JFXn0ouK6VipiraN7I8oog62SuEd/fqAupys7A/Ih6WK/UoJorjlnccEL8euNMaS4kNogvoBrFx8ciIWKcbot5mtwc4WDr3cnR+HIZNCUFVkIxsMqE7HCD0yn0zhkB60shED+ZHs8zpyU+cjnsOSizxOnIY+F ;{id = 54502 (ksk), size = 1024b} +test-ns-signed.dev.internet.nl. 3600 IN RRSIG DNSKEY 8 4 3600 20190205132351 20190108132351 54502 test-ns-signed.dev.internet.nl. X3qN+plfjf45FA4pr/tcUqUCR9ajDqwtNe4TS19WOJogVL/Gf/N5/ToOCrs3s+a7VrJl58WvSJquDM8xAS8f4oJggKgHFhopce8tMTGRxkRvJo4y+tt3vCveh/zjHLAnbOaBGA4CJ/IPhRqzHzcX/SjSv0EACWd6XpQIWogRv6c= +test-ns-signed.dev.internet.nl. 3600 IN NSEC3PARAM 1 0 1 - +test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3PARAM 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. A/1xUGO46uIz+9vjPGfWVD99akwU9bd/UlnVG9LPfoTzG7TMWSoZ4ksg8k8ub8K1TrkDmQokNHSW0Gt6qwoRh17c+p1h/SFlDVL83wgTc4NqG43OQjgGU9RV035XU+VESlO3lavifhlu8rHWBJTlhiXcMGq6H+zvoz4sx9p5GNM= +93stp7o7i5n9gb83uu7vv6h8qltk14ig.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - fee0c2kfhi6bnljce6vehaenqq3pbupu NS SOA RRSIG DNSKEY NSEC3PARAM +93stp7o7i5n9gb83uu7vv6h8qltk14ig.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. YoTRDQ7sSvERcY1WwAH4oRRR7DmaAwA8/H70jdMeSU4wsnM/VM03kDcc2sgq5edmHiZoTWnq7nEb/1Y7Ro0YrqTUQdYFZvXi6UjZQrKI9nqAGnhdXZWlZJHmYpn2+2Emd+bYHkwvKaPnfnnKjUoGVBH8Hly0HBYKPUF1/viquB0= +kl94uofq16t2vlq0bmampf6e4o9k5hbi.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - 7ag3p2pfrvq09dpn63cvga8ub1rnrrg1 +kl94uofq16t2vlq0bmampf6e4o9k5hbi.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. NI5zJ/k1kPVZ1abms5OoME/wazb77Ltduyk6ZevAnt4tKydZYwSsjEd0Ixknw9xnakCABn5rAYEXctARN0KCwCkNHR7TYlTAJT14hlDYjbad2u2HT9L1kzAnfj3BeLZl/LRADeMbTtzrkTSF3Dnezurb94fMnUnKt2hPfQfj560= +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. WIb3ISP1nlafbyWoWa4z7sG5IS+V86PyvEMHdD/64hgsFkrCu483XK7VNnBz28SL/631JXA1R19O+UxeWhTUyctp8QSt6cEZcMPY8b7yG97rNFNvhSw75rSXXt+JwgIYHPHQV5oqPtVmEpQM5SfJd+hs+Nn1bJcWB3UaESNNAMQ= +*.a.b.test-ns-signed.dev.internet.nl. 3600 IN TXT "a" +*.a.b.test-ns-signed.dev.internet.nl. 3600 IN RRSIG TXT 8 6 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. eNcJkQXdTO1z21od0sXbgqtABhhr/9tNC/Zx8zYbhXkfj7rufN71yk9xqgu6TG0MeJV26ISrqIGRVFJFmTRvO1LLxoKkEPhqe+08nqRztxXZajCV+dDeFoGIDcXJg6tAxB+MJznkKDtZPpIWvyt1WwdYfcMrGtE9AmR3K1/P/xE= +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - 93stp7o7i5n9gb83uu7vv6h8qltk14ig TXT RRSIG +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. gtxoiTa3FRUqoRLvkWSxmWQ+DfijVd26gpKH3+GmGIcNB/sr/Cf8kERRwVVHvgzYIcvdJcys5b2LUXnZJwcdAlx7efZPWgNZzWxJrw6ES25LCWJOrp31isWn9FlAZGIbnpyEXxD2apBSmtyPnKbTgU6lHHS9jrsYHu4G8Zouv3k= +ns.test-ns-signed.dev.internet.nl. 3600 IN A 185.49.141.11 +ns.test-ns-signed.dev.internet.nl. 3600 IN RRSIG A 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. F9sXEVAmlRn+/84WbuvegiCwstNxMDMQLl0Obv2CTPpee4U6psbmXrlzczjjjkE6aLjsIHYdcXCzEWTrmukT+V9jzaGPRJvxNvC0ASWyzggAoh0Z++Hl4cVa9587o6I9ODayehFI9Pgdem+RVdb4zlWuzi9FmKXgeTlgWN54tPg= +ns.test-ns-signed.dev.internet.nl. 3600 IN AAAA 2a04:b900:0:100::11 +ns.test-ns-signed.dev.internet.nl. 3600 IN RRSIG AAAA 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. F1XRrx/QgfzJ1RS7d0m23QoIPx1G8WL1SrlTOm7pk5vWTL07w7HEw2TETblkjnitJGKfN9ebsIum/cDPUZc3UqLkguP2UCWpePnlllTJuwmG0Z+wyINIR4xF4PQlqttvzThBkD2JKWb/o0W8dQyXTj+jJ1vCZ0NjjA2N4+iJIQE= +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - kl94uofq16t2vlq0bmampf6e4o9k5hbi A AAAA RRSIG +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. xLysIqn3r3rdHE3GvwVjZwUyuFClhkhgrQdwyc66RuHKE3MfSuhVr9cHTCJzhipF5TwQTbUpLOr74r99bzdiIY8Xkgjy2M0nc76v1ObSGJdPPjGTevbhDOnavUURwOR/q0NqqO2iPrgFjOVMZ+8uwRJtCty2iAVZfVG+qDzs8hU= +TEMPFILE_END + +stub-zone: + name: "." + stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET. +CONFIG_END + +SCENARIO_BEGIN Test authority zone with NSEC3 wildcard + +; K.ROOT-SERVERS.NET. +RANGE_BEGIN 0 100 + ADDRESS 193.0.14.129 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +. IN NS +SECTION ANSWER +. IN NS K.ROOT-SERVERS.NET. +SECTION ADDITIONAL +K.ROOT-SERVERS.NET. IN A 193.0.14.129 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION AUTHORITY +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END +RANGE_END + +; a.gtld-servers.net. +RANGE_BEGIN 0 100 + ADDRESS 192.5.6.30 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +com. IN NS +SECTION ANSWER +com. IN NS a.gtld-servers.net. +SECTION ADDITIONAL +a.gtld-servers.net. IN A 192.5.6.30 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode subdomain +ADJUST copy_id copy_query +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION AUTHORITY +example.com. IN NS ns.example.com. +SECTION ADDITIONAL +ns.example.com. IN A 1.2.3.44 +ENTRY_END +RANGE_END + +; ns.example.net. +RANGE_BEGIN 0 100 + ADDRESS 1.2.3.44 +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.net. IN NS +SECTION ANSWER +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +ns.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN A +SECTION ANSWER +ns.example.net. IN A 1.2.3.44 +SECTION AUTHORITY +example.net. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.net. IN AAAA +SECTION AUTHORITY +example.net. IN NS ns.example.net. +SECTION ADDITIONAL +www.example.net. IN A 1.2.3.44 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +example.com. IN NS +SECTION ANSWER +example.com. IN NS ns.example.net. +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +www.example.com. IN A +SECTION ANSWER +www.example.com. IN A 10.20.30.40 +ENTRY_END +RANGE_END + +STEP 1 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN TXT +ENTRY_END + +; recursion happens here. +STEP 20 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR AA RD RA DO NOERROR +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN TXT +SECTION ANSWER +something.a.b.test-ns-signed.dev.internet.nl. IN TXT "a" +something.a.b.test-ns-signed.dev.internet.nl. 3600 IN RRSIG TXT 8 6 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. eNcJkQXdTO1z21od0sXbgqtABhhr/9tNC/Zx8zYbhXkfj7rufN71yk9xqgu6TG0MeJV26ISrqIGRVFJFmTRvO1LLxoKkEPhqe+08nqRztxXZajCV+dDeFoGIDcXJg6tAxB+MJznkKDtZPpIWvyt1WwdYfcMrGtE9AmR3K1/P/xE= +SECTION AUTHORITY +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - KL94UOFQ16T2VLQ0BMAMPF6E4O9K5HBI A AAAA RRSIG +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. xLysIqn3r3rdHE3GvwVjZwUyuFClhkhgrQdwyc66RuHKE3MfSuhVr9cHTCJzhipF5TwQTbUpLOr74r99bzdiIY8Xkgjy2M0nc76v1ObSGJdPPjGTevbhDOnavUURwOR/q0NqqO2iPrgFjOVMZ+8uwRJtCty2iAVZfVG+qDzs8hU= +ENTRY_END + +; Check that the reply for a wildcard nodata answer contains the NSEC3s. +; qname denial NSEC3, closest encloser NSEC3, and type bitmap NSEC3. +STEP 30 QUERY +ENTRY_BEGIN +REPLY RD DO +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN AAAA +ENTRY_END + +STEP 40 CHECK_ANSWER +ENTRY_BEGIN +MATCH all +REPLY QR AA RD RA DO NOERROR +SECTION QUESTION +something.a.b.test-ns-signed.dev.internet.nl. IN AAAA +SECTION ANSWER +SECTION AUTHORITY +test-ns-signed.dev.internet.nl. 3600 IN SOA ns.nlnetlabs.nl. ralph.nlnetlabs.nl. 4 14400 3600 604800 3600 +test-ns-signed.dev.internet.nl. 3600 IN RRSIG SOA 8 4 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. ybb0Hc7NC+QOFEEv4cX2+Umlk+miiOAHmeP2Uwvg6lqfxkk+3g7yWBEKMinXjLKz0odWZ6fki6M/3yBPQX8SV0OCRY5gYvAHAjbxAIHozIM+5iwOkRQhNF1DRgQ3BLjL93f6T5e5Z4y1812iOpu4GYswXW/UTOZACXz2UiaCPAg= ;{id = 32784} +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - 93stp7o7i5n9gb83uu7vv6h8qltk14ig TXT RRSIG +7ag3p2pfrvq09dpn63cvga8ub1rnrrg1.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. gtxoiTa3FRUqoRLvkWSxmWQ+DfijVd26gpKH3+GmGIcNB/sr/Cf8kERRwVVHvgzYIcvdJcys5b2LUXnZJwcdAlx7efZPWgNZzWxJrw6ES25LCWJOrp31isWn9FlAZGIbnpyEXxD2apBSmtyPnKbTgU6lHHS9jrsYHu4G8Zouv3k= ;{id = 32784} +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv +fee0c2kfhi6bnljce6vehaenqq3pbupu.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. WIb3ISP1nlafbyWoWa4z7sG5IS+V86PyvEMHdD/64hgsFkrCu483XK7VNnBz28SL/631JXA1R19O+UxeWhTUyctp8QSt6cEZcMPY8b7yG97rNFNvhSw75rSXXt+JwgIYHPHQV5oqPtVmEpQM5SfJd+hs+Nn1bJcWB3UaESNNAMQ= ;{id = 32784} +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN NSEC3 1 0 1 - kl94uofq16t2vlq0bmampf6e4o9k5hbi A AAAA RRSIG +i6pi4e3o98e7vtkpjfhqn7g77d3mjcnv.test-ns-signed.dev.internet.nl. 3600 IN RRSIG NSEC3 8 5 3600 20190205132351 20190108132351 32784 test-ns-signed.dev.internet.nl. xLysIqn3r3rdHE3GvwVjZwUyuFClhkhgrQdwyc66RuHKE3MfSuhVr9cHTCJzhipF5TwQTbUpLOr74r99bzdiIY8Xkgjy2M0nc76v1ObSGJdPPjGTevbhDOnavUURwOR/q0NqqO2iPrgFjOVMZ+8uwRJtCty2iAVZfVG+qDzs8hU= ;{id = 32784} +ENTRY_END + +SCENARIO_END diff --git a/testdata/auth_xfr_notify.rpl b/testdata/auth_xfr_notify.rpl index 3603a223f..d7af5ae50 100644 --- a/testdata/auth_xfr_notify.rpl +++ b/testdata/auth_xfr_notify.rpl @@ -195,7 +195,7 @@ ENTRY_END RANGE_END ; lookups for notify hostnames. -STEP 1 TIME_PASSES ELAPSED 0 +STEP 1 TIME_PASSES ELAPSE 0 ; now the query STEP 2 QUERY diff --git a/testdata/edns_cache.tdir/edns_cache.conf b/testdata/edns_cache.tdir/edns_cache.conf index 101b9751f..baeee5f54 100644 --- a/testdata/edns_cache.tdir/edns_cache.conf +++ b/testdata/edns_cache.tdir/edns_cache.conf @@ -12,9 +12,6 @@ server: stub-zone: name: "example.net" stub-addr: "127.0.0.1@@STUB2_PORT@" -stub-zone: - name: "example.com" - stub-addr: "127.0.0.1@@STUB2_PORT@" # a k a root hints stub-zone: name: "." diff --git a/testdata/edns_cache.tdir/edns_cache.stub1 b/testdata/edns_cache.tdir/edns_cache.stub1 index 23653c3b3..2cce1bd65 100644 --- a/testdata/edns_cache.tdir/edns_cache.stub1 +++ b/testdata/edns_cache.tdir/edns_cache.stub1 @@ -17,17 +17,6 @@ SECTION ADDITIONAL root.server. IN A 127.0.0.1 ENTRY_END -; referral to example.com -ENTRY_BEGIN -MATCH opcode subdomain -REPLY QR NOERROR -ADJUST copy_id copy_query -SECTION QUESTION -example.com. IN A -SECTION AUTHORITY -example.com. IN NS netdns.example.net. -ENTRY_END - ; referral to example.net ENTRY_BEGIN MATCH opcode subdomain diff --git a/testdata/edns_cache.tdir/edns_cache.stub2 b/testdata/edns_cache.tdir/edns_cache.stub2 index f70eb98e7..549560aa0 100644 --- a/testdata/edns_cache.tdir/edns_cache.stub2 +++ b/testdata/edns_cache.tdir/edns_cache.stub2 @@ -1,5 +1,5 @@ ; nameserver test file -$ORIGIN example.com. +$ORIGIN example.net. $TTL 3600 ENTRY_BEGIN @@ -7,9 +7,9 @@ MATCH opcode qtype qname noedns REPLY QR AA NOERROR ADJUST copy_id SECTION QUESTION -www.example.com. IN A +www.example.net. IN A SECTION ANSWER -www.example.com. IN A 10.20.30.40 +www.example.net. IN A 10.20.30.40 ENTRY_END ENTRY_BEGIN diff --git a/testdata/edns_cache.tdir/edns_cache.test b/testdata/edns_cache.tdir/edns_cache.test index 53931ded2..d154d5277 100644 --- a/testdata/edns_cache.tdir/edns_cache.test +++ b/testdata/edns_cache.tdir/edns_cache.test @@ -11,8 +11,8 @@ PRE="../.." # do the test echo "> dig netdns.example.net." dig @::1 -p $UNBOUND_PORT netdns.example.net. | tee outfile -echo "> dig www.example.com." -dig @::1 -p $UNBOUND_PORT www.example.com. | tee outfile +echo "> dig www.example.net." +dig @::1 -p $UNBOUND_PORT www.example.net. | tee outfile echo "> cat stub1.log" cat stub1.log echo "> cat stub2.log" diff --git a/testdata/edns_lame.tdir/edns_lame.conf b/testdata/edns_lame.tdir/edns_lame.conf deleted file mode 100644 index 9cd19c0d9..000000000 --- a/testdata/edns_lame.tdir/edns_lame.conf +++ /dev/null @@ -1,15 +0,0 @@ -server: - verbosity: 2 - # num-threads: 1 - interface: 127.0.0.1 - port: @PORT@ - use-syslog: no - directory: "" - pidfile: "unbound.pid" - chroot: "" - username: "" - do-not-query-localhost: no -forward-zone: - name: "." - forward-addr: "127.0.0.1@@TOPORT@" - diff --git a/testdata/edns_lame.tdir/edns_lame.dsc b/testdata/edns_lame.tdir/edns_lame.dsc deleted file mode 100644 index 83f972562..000000000 --- a/testdata/edns_lame.tdir/edns_lame.dsc +++ /dev/null @@ -1,16 +0,0 @@ -BaseName: edns_lame -Version: 1.0 -Description: Forward UDP but EDNS packets time out -CreationDate: Mon Sep 29 16:39:15 CEST 2008 -Maintainer: dr. W.C.A. Wijngaards -Category: -Component: -CmdDepends: -Depends: -Help: -Pre: edns_lame.pre -Post: edns_lame.post -Test: edns_lame.test -AuxFiles: -Passed: -Failure: diff --git a/testdata/edns_lame.tdir/edns_lame.test b/testdata/edns_lame.tdir/edns_lame.test deleted file mode 100644 index 92d669267..000000000 --- a/testdata/edns_lame.tdir/edns_lame.test +++ /dev/null @@ -1,24 +0,0 @@ -# #-- edns_lame.test --# -# source the master var file when it's there -[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master -# use .tpkg.var.test for in test variable passing -[ -f .tpkg.var.test ] && source .tpkg.var.test - -PRE="../.." -# do the test -echo "> dig www.example.com." -dig @localhost -p $UNBOUND_PORT www.example.com. | tee outfile -echo "> dig www.example.com." -dig @localhost -p $UNBOUND_PORT www.example.com. | tee outfile -echo "> cat logfiles" -cat fwd.log -cat unbound.log -echo "> check answer" -if grep "10.20.30.40" outfile; then - echo "OK" -else - echo "Not OK" - exit 1 -fi - -exit 0 diff --git a/testdata/edns_lame.tdir/edns_lame.testns b/testdata/edns_lame.tdir/edns_lame.testns deleted file mode 100644 index cd248c3b3..000000000 --- a/testdata/edns_lame.tdir/edns_lame.testns +++ /dev/null @@ -1,14 +0,0 @@ -; nameserver test file -$ORIGIN example.com. -$TTL 3600 - -ENTRY_BEGIN -MATCH opcode qtype qname noedns -REPLY QR AA NOERROR -ADJUST copy_id -SECTION QUESTION -www IN A -SECTION ANSWER -www IN A 10.20.30.40 -ENTRY_END - diff --git a/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.post b/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.post index e6dda048d..897f8cf70 100644 --- a/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.post +++ b/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.post @@ -8,3 +8,4 @@ . ../common.sh kill_pid $FWD_PID kill_pid $UNBOUND_PID +cat unbound.log diff --git a/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.test b/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.test index 67354d014..de4250c3e 100644 --- a/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.test +++ b/testdata/fwd_compress_c00c.tdir/fwd_compress_c00c.test @@ -6,9 +6,9 @@ # check what sort of netcat we have if nc -h 2>&1 | grep "q secs"; then - ncopt="-q 3 -w 2" + ncopt="-q 3 -i 2" else - ncopt="-w 2" + ncopt="-i 2" fi PRE="../.." diff --git a/testdata/iter_ranoaa_lame.rpl b/testdata/iter_ranoaa_lame.rpl index efb38a590..4808b25a9 100644 --- a/testdata/iter_ranoaa_lame.rpl +++ b/testdata/iter_ranoaa_lame.rpl @@ -153,6 +153,16 @@ SECTION AUTHORITY example.net. IN NS ns.example.net. ENTRY_END +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR NOERROR +SECTION QUESTION +ns.example.com. IN A +SECTION ANSWER +ns.example.com. IN A 1.2.3.55 +ENTRY_END + ENTRY_BEGIN MATCH opcode qtype qname ADJUST copy_id diff --git a/testdata/iter_reclame_two.rpl b/testdata/iter_reclame_two.rpl index f30edd941..de4ef4165 100644 --- a/testdata/iter_reclame_two.rpl +++ b/testdata/iter_reclame_two.rpl @@ -105,6 +105,26 @@ lame.example.com. IN AAAA SECTION ANSWER ENTRY_END +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR RA NOERROR +SECTION QUESTION +ns.example.com. IN A +SECTION ANSWER +ns.example.com. IN A 1.2.3.4 +ENTRY_END + +ENTRY_BEGIN +MATCH opcode qtype qname +ADJUST copy_id +REPLY QR RA NOERROR +SECTION QUESTION +lame.example.com. IN A +SECTION ANSWER +lame.example.com. IN A 1.2.3.5 +ENTRY_END + ENTRY_BEGIN MATCH opcode qtype qname ADJUST copy_id diff --git a/testdata/pylib.tdir/pylib.lookup.py b/testdata/pylib.tdir/pylib.lookup.py index 5f69c58ab..114bb49a0 100755 --- a/testdata/pylib.tdir/pylib.lookup.py +++ b/testdata/pylib.tdir/pylib.lookup.py @@ -12,7 +12,7 @@ qname = "www.example.com" qtype = unbound.RR_TYPE_A qclass = unbound.RR_CLASS_IN -def create_context(config_file="ub.lookup.conf", async=False): +def create_context(config_file="ub.lookup.conf", asyncflag=False): """ Create an unbound context to use for testing. @@ -22,7 +22,7 @@ def create_context(config_file="ub.lookup.conf", async=False): if status != 0: print("read config failed with status: {}".format(status)) sys.exit(1) - ctx.set_async(async) + ctx.set_async(asyncflag) return ctx @@ -132,10 +132,10 @@ def test_ratelimit_bg_off(ctx): test_resolve(create_context()) -test_async_resolve(create_context(async=True)) +test_async_resolve(create_context(asyncflag=True)) test_ratelimit_fg_on(create_context()) test_ratelimit_fg_off(create_context()) -test_ratelimit_bg_on(create_context(async=True)) -test_ratelimit_bg_off(create_context(async=True)) +test_ratelimit_bg_on(create_context(asyncflag=True)) +test_ratelimit_bg_off(create_context(asyncflag=True)) sys.exit(0) diff --git a/testdata/ssl_req_order.tdir/ssl_req_order.conf b/testdata/ssl_req_order.tdir/ssl_req_order.conf new file mode 100644 index 000000000..3b2e2b1b4 --- /dev/null +++ b/testdata/ssl_req_order.tdir/ssl_req_order.conf @@ -0,0 +1,25 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + ssl-port: @PORT@ + ssl-service-key: "unbound_server.key" + ssl-service-pem: "unbound_server.pem" + + 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" + tcp-upstream: yes + local-zone: "drop.net" deny + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/ssl_req_order.tdir/ssl_req_order.dsc b/testdata/ssl_req_order.tdir/ssl_req_order.dsc new file mode 100644 index 000000000..2259d0c08 --- /dev/null +++ b/testdata/ssl_req_order.tdir/ssl_req_order.dsc @@ -0,0 +1,16 @@ +BaseName: ssl_req_order +Version: 1.0 +Description: Test ssl request order processing. +CreationDate: Mon Jan 21 14:11:00 CET 2018 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: ssl_req_order.pre +Post: ssl_req_order.post +Test: ssl_req_order.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/ssl_req_order.tdir/ssl_req_order.post b/testdata/ssl_req_order.tdir/ssl_req_order.post new file mode 100644 index 000000000..45067e10f --- /dev/null +++ b/testdata/ssl_req_order.tdir/ssl_req_order.post @@ -0,0 +1,12 @@ +# #-- ssl_req_order.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID +cat unbound.log +cat fwd.log diff --git a/testdata/ssl_req_order.tdir/ssl_req_order.pre b/testdata/ssl_req_order.tdir/ssl_req_order.pre new file mode 100644 index 000000000..5fb118501 --- /dev/null +++ b/testdata/ssl_req_order.tdir/ssl_req_order.pre @@ -0,0 +1,31 @@ +# #-- ssl_req_order.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +. ../common.sh +get_random_port 2 +UNBOUND_PORT=$RND_PORT +FWD_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT ssl_req_order.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'/' < ssl_req_order.conf > ub.conf +# start unbound in the background +PRE="../.." +$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/ssl_req_order.tdir/ssl_req_order.test b/testdata/ssl_req_order.tdir/ssl_req_order.test new file mode 100644 index 000000000..65981d16c --- /dev/null +++ b/testdata/ssl_req_order.tdir/ssl_req_order.test @@ -0,0 +1,341 @@ +# #-- ssl_req_order.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) + +# this test query should just work (server is up) +echo "> query www1.example.net." +$PRE/streamtcp -s -f 127.0.0.1@$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/streamtcp -s -f 127.0.0.1@$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/streamtcp -a -s -f 127.0.0.1@$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/streamtcp -a -s -f 127.0.0.1@$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/streamtcp -a -s -f 127.0.0.1@$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/streamtcp -a -s -f 127.0.0.1@$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. - a100.example.com." +$PRE/streamtcp -a -s -f 127.0.0.1@$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 a91.a.example.com. A IN a92.a.example.com. A IN a93.a.example.com. A IN a94.a.example.com. A IN a95.a.example.com. A IN a96.a.example.com. A IN a97.a.example.com. A IN a98.a.example.com. A IN a99.a.example.com. A IN a100.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 +grep "a.example.com. IN A" outfile + +echo "" +echo "> query www5.example.net. www3.example.net. www.drop.net." +$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.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 fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/ssl_req_order.tdir/ssl_req_order.testns b/testdata/ssl_req_order.tdir/ssl_req_order.testns new file mode 100644 index 000000000..c53941b67 --- /dev/null +++ b/testdata/ssl_req_order.tdir/ssl_req_order.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/ssl_req_order.tdir/unbound_server.key b/testdata/ssl_req_order.tdir/unbound_server.key new file mode 100644 index 000000000..4256c421d --- /dev/null +++ b/testdata/ssl_req_order.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/ssl_req_order.tdir/unbound_server.pem b/testdata/ssl_req_order.tdir/unbound_server.pem new file mode 100644 index 000000000..aeda3ff11 --- /dev/null +++ b/testdata/ssl_req_order.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/ssl_req_timeout.tdir/ssl_req_timeout.conf b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.conf new file mode 100644 index 000000000..c461db299 --- /dev/null +++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.conf @@ -0,0 +1,25 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + ssl-port: @PORT@ + ssl-service-key: "unbound_server.key" + ssl-service-pem: "unbound_server.pem" + + 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" + tcp-idle-timeout: 2000 + local-zone: "drop.net" deny + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.dsc b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.dsc new file mode 100644 index 000000000..1e933274b --- /dev/null +++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.dsc @@ -0,0 +1,16 @@ +BaseName: ssl_req_timeout +Version: 1.0 +Description: Test ssl request order timeouts. +CreationDate: Mon Jan 21 11:23:00 CET 2018 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: ssl_req_timeout.pre +Post: ssl_req_timeout.post +Test: ssl_req_timeout.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.post b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.post new file mode 100644 index 000000000..e170f4b6e --- /dev/null +++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.post @@ -0,0 +1,12 @@ +# #-- ssl_req_timeout.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID +cat fwd.log +cat unbound.log diff --git a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.pre b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.pre new file mode 100644 index 000000000..b13de5b3a --- /dev/null +++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.pre @@ -0,0 +1,31 @@ +# #-- ssl_req_timeout.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +. ../common.sh +get_random_port 2 +UNBOUND_PORT=$RND_PORT +FWD_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT ssl_req_timeout.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'/' < ssl_req_timeout.conf > ub.conf +# start unbound in the background +PRE="../.." +$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/ssl_req_timeout.tdir/ssl_req_timeout.test b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test new file mode 100644 index 000000000..5223fc985 --- /dev/null +++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test @@ -0,0 +1,136 @@ +# #-- ssl_req_timeout.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) +# check what sort of netcat we have +if nc -h 2>&1 | grep "q secs"; then + ncopt="-q 3 -i 4" +else + ncopt="-i 4" +fi + +# this test query should just work (server is up) +echo "> query www1.example.net." +$PRE/streamtcp -s -f 127.0.0.1@$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 that are answered immediately and then the timeout +echo "> query www1.example.net. www2.example.net. www3.example.net. www.example.com." +$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN www.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 +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 "stream closed" outfile; 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 + +# multiple requests that are waiting for answers and then the timeout +echo "> query www2.example.com. www2.example.com. www3.example.com." +$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN www2.example.com A IN www3.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 +if grep "stream closed" outfile; 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 + +# wait a bit +sleep 2 + +# echo a couple requests to the other side and then wait for the timeout. +# this creates waiting answers in the reply queue. +echo "> nc www.example.net www2.example.net www3.example.net" +( echo "0021eb410100000100000000000003777777076578616d706c65036e657400000100010022eb41010000010000000000000477777732076578616d706c65036e657400000100010022eb41010000010000000000000477777733076578616d706c65036e65740000010001" | xxd -r -p ; sleep 10 ; echo "") | nc $ncopt --ssl 127.0.0.1 $UNBOUND_PORT | xxd | tee outfile + +echo "OK" +exit 0 diff --git a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.testns b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.testns new file mode 100644 index 000000000..694600974 --- /dev/null +++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.testns @@ -0,0 +1,63 @@ +; nameserver test file +$ORIGIN example.com. +$TTL 3600 + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=4 +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 sleep=4 +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 sleep=4 +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 diff --git a/testdata/ssl_req_timeout.tdir/unbound_server.key b/testdata/ssl_req_timeout.tdir/unbound_server.key new file mode 100644 index 000000000..4256c421d --- /dev/null +++ b/testdata/ssl_req_timeout.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/ssl_req_timeout.tdir/unbound_server.pem b/testdata/ssl_req_timeout.tdir/unbound_server.pem new file mode 100644 index 000000000..aeda3ff11 --- /dev/null +++ b/testdata/ssl_req_timeout.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/stream_ssl.tdir/stream_ssl.post b/testdata/stream_ssl.tdir/stream_ssl.post index 4cdbe7267..eed0c0e1b 100644 --- a/testdata/stream_ssl.tdir/stream_ssl.post +++ b/testdata/stream_ssl.tdir/stream_ssl.post @@ -8,3 +8,5 @@ . ../common.sh kill_pid $UNBOUNDSERV_PID kill_pid $UNBOUNDCLIE_PID +cat unboundserv.log +cat unboundclie.log diff --git a/testdata/stream_ssl.tdir/stream_ssl.serv.conf b/testdata/stream_ssl.tdir/stream_ssl.serv.conf index 9dd169ff7..c77e39fc5 100644 --- a/testdata/stream_ssl.tdir/stream_ssl.serv.conf +++ b/testdata/stream_ssl.tdir/stream_ssl.serv.conf @@ -13,7 +13,8 @@ server: ssl-port: @SERVPORT@ ssl-service-key: "unbound_server.key" ssl-service-pem: "unbound_server.pem" - + tls-session-ticket-keys: "ticket1.dat" + tls-session-ticket-keys: "ticket2.dat" # no other queries should reach here. forward-zone: name: "." diff --git a/testdata/stream_ssl.tdir/ticket1.dat b/testdata/stream_ssl.tdir/ticket1.dat new file mode 100644 index 000000000..1cc7902af --- /dev/null +++ b/testdata/stream_ssl.tdir/ticket1.dat @@ -0,0 +1 @@ +XÁ„d¨,f}¼Œš;òJ‚qéÌŒÍ ¨ñs%Ã[)œMÎï½éo“Á¶@ðÓÙ5n_wÛ¿ô›ÃÃÅI¢KæâCºšÓúÊè" \ No newline at end of file diff --git a/testdata/stream_ssl.tdir/ticket2.dat b/testdata/stream_ssl.tdir/ticket2.dat new file mode 100644 index 000000000..7cb5ddff7 --- /dev/null +++ b/testdata/stream_ssl.tdir/ticket2.dat @@ -0,0 +1 @@ +s×߶|ÜNü*Ô2a{IiÒ6ù™'õÐÝ ²Äi9I½ÛÅ+ȵj"WzëÙ)s0“ˆ÷ÔD%õh ³H€“O£é…´K©ëò @ \ No newline at end of file diff --git a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.testns b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.testns index 14647723f..2e240b087 100644 --- a/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.testns +++ b/testdata/tcp_idle_timeout.tdir/tcp_idle_timeout.testns @@ -13,7 +13,7 @@ ENTRY_END ENTRY_BEGIN MATCH TCP opcode qtype qname REPLY QR AA NOERROR -ADJUST copy_id sleep=2 +ADJUST copy_id SECTION QUESTION www IN A SECTION ANSWER diff --git a/testdata/tcp_req_order.tdir/tcp_req_order.conf b/testdata/tcp_req_order.tdir/tcp_req_order.conf new file mode 100644 index 000000000..40d6f55c8 --- /dev/null +++ b/testdata/tcp_req_order.tdir/tcp_req_order.conf @@ -0,0 +1,22 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + + 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" + tcp-upstream: yes + local-zone: "drop.net" deny + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_req_order.tdir/tcp_req_order.dsc b/testdata/tcp_req_order.tdir/tcp_req_order.dsc new file mode 100644 index 000000000..f24e90073 --- /dev/null +++ b/testdata/tcp_req_order.tdir/tcp_req_order.dsc @@ -0,0 +1,16 @@ +BaseName: tcp_req_order +Version: 1.0 +Description: Test tcp request order processing. +CreationDate: Mon Jan 14 13:34:00 CET 2018 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tcp_req_order.pre +Post: tcp_req_order.post +Test: tcp_req_order.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tcp_req_order.tdir/tcp_req_order.post b/testdata/tcp_req_order.tdir/tcp_req_order.post new file mode 100644 index 000000000..43372764c --- /dev/null +++ b/testdata/tcp_req_order.tdir/tcp_req_order.post @@ -0,0 +1,11 @@ +# #-- tcp_req_order.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID +cat unbound.log diff --git a/testdata/tcp_req_order.tdir/tcp_req_order.pre b/testdata/tcp_req_order.tdir/tcp_req_order.pre new file mode 100644 index 000000000..b2191f065 --- /dev/null +++ b/testdata/tcp_req_order.tdir/tcp_req_order.pre @@ -0,0 +1,31 @@ +# #-- tcp_req_order.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +. ../common.sh +get_random_port 2 +UNBOUND_PORT=$RND_PORT +FWD_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT tcp_req_order.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'/' < tcp_req_order.conf > ub.conf +# start unbound in the background +PRE="../.." +$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/tcp_req_order.tdir/tcp_req_order.test b/testdata/tcp_req_order.tdir/tcp_req_order.test new file mode 100644 index 000000000..ecbde306f --- /dev/null +++ b/testdata/tcp_req_order.tdir/tcp_req_order.test @@ -0,0 +1,341 @@ +# #-- tcp_req_order.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) + +# this test query should just work (server is up) +echo "> query www1.example.net." +$PRE/streamtcp -f 127.0.0.1@$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/streamtcp -f 127.0.0.1@$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/streamtcp -a -f 127.0.0.1@$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/streamtcp -a -f 127.0.0.1@$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/streamtcp -a -f 127.0.0.1@$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/streamtcp -a -f 127.0.0.1@$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. - a100.example.com." +$PRE/streamtcp -a -f 127.0.0.1@$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 a91.a.example.com. A IN a92.a.example.com. A IN a93.a.example.com. A IN a94.a.example.com. A IN a95.a.example.com. A IN a96.a.example.com. A IN a97.a.example.com. A IN a98.a.example.com. A IN a99.a.example.com. A IN a100.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 +grep "a.example.com. IN A" outfile + +echo "" +echo "> query www5.example.net. www3.example.net. www.drop.net." +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.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 fwd.log + cat unbound.log + echo "Not OK" + exit 1 +fi + +echo "OK" +exit 0 diff --git a/testdata/tcp_req_order.tdir/tcp_req_order.testns b/testdata/tcp_req_order.tdir/tcp_req_order.testns new file mode 100644 index 000000000..c53941b67 --- /dev/null +++ b/testdata/tcp_req_order.tdir/tcp_req_order.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/tcp_req_size.tdir/tcp_req_size.conf b/testdata/tcp_req_size.tdir/tcp_req_size.conf new file mode 100644 index 000000000..d8d63ae90 --- /dev/null +++ b/testdata/tcp_req_size.tdir/tcp_req_size.conf @@ -0,0 +1,25 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + + # extremely low number to make connections fail + stream-wait-size: 10 + + 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" + tcp-upstream: yes + local-zone: "drop.net" deny + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_req_size.tdir/tcp_req_size.dsc b/testdata/tcp_req_size.tdir/tcp_req_size.dsc new file mode 100644 index 000000000..1b7ca143c --- /dev/null +++ b/testdata/tcp_req_size.tdir/tcp_req_size.dsc @@ -0,0 +1,16 @@ +BaseName: tcp_req_size +Version: 1.0 +Description: Test tcp request wait size. +CreationDate: Tue Jan 22 09:37:00 CET 2018 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tcp_req_size.pre +Post: tcp_req_size.post +Test: tcp_req_size.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/edns_lame.tdir/edns_lame.post b/testdata/tcp_req_size.tdir/tcp_req_size.post similarity index 86% rename from testdata/edns_lame.tdir/edns_lame.post rename to testdata/tcp_req_size.tdir/tcp_req_size.post index f71e3c424..16fd73642 100644 --- a/testdata/edns_lame.tdir/edns_lame.post +++ b/testdata/tcp_req_size.tdir/tcp_req_size.post @@ -1,4 +1,4 @@ -# #-- edns_lame.post --# +# #-- tcp_req_size.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 @@ -8,3 +8,4 @@ . ../common.sh kill_pid $FWD_PID kill_pid $UNBOUND_PID +cat unbound.log diff --git a/testdata/edns_lame.tdir/edns_lame.pre b/testdata/tcp_req_size.tdir/tcp_req_size.pre similarity index 80% rename from testdata/edns_lame.tdir/edns_lame.pre rename to testdata/tcp_req_size.tdir/tcp_req_size.pre index d8c2c076f..66469170c 100644 --- a/testdata/edns_lame.tdir/edns_lame.pre +++ b/testdata/tcp_req_size.tdir/tcp_req_size.pre @@ -1,4 +1,4 @@ -# #-- edns_lame.pre--# +# #-- tcp_req_size.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 @@ -13,18 +13,19 @@ echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test # start forwarder get_ldns_testns -$LDNS_TESTNS -p $FWD_PORT -v edns_lame.testns >fwd.log 2>&1 & +$LDNS_TESTNS -p $FWD_PORT tcp_req_size.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'/' < edns_lame.conf > ub.conf +sed -e 's/@PORT\@/'$UNBOUND_PORT'/' -e 's/@TOPORT\@/'$FWD_PORT'/' < tcp_req_size.conf > ub.conf # start unbound in the background PRE="../.." -$PRE/unbound -d -vvvv -c ub.conf >unbound.log 2>&1 & +$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/tcp_req_size.tdir/tcp_req_size.test b/testdata/tcp_req_size.tdir/tcp_req_size.test new file mode 100644 index 000000000..0260b2117 --- /dev/null +++ b/testdata/tcp_req_size.tdir/tcp_req_size.test @@ -0,0 +1,100 @@ +# #-- tcp_req_size.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) + +# this test query should just work (server is up) +echo "> query www1.example.net." +$PRE/streamtcp -f 127.0.0.1@$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" + +# out of order requests, the example.com elements take 2 seconds to wait. +# www3.example.com present twice, answered twice. +# this queues one answer in the wait buffers, and that exceeds the buffer. +echo "" +echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net." +$PRE/streamtcp -a -f 127.0.0.1@$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 "stream closed" outfile; 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" +exit 0 diff --git a/testdata/tcp_req_size.tdir/tcp_req_size.testns b/testdata/tcp_req_size.tdir/tcp_req_size.testns new file mode 100644 index 000000000..88219e51f --- /dev/null +++ b/testdata/tcp_req_size.tdir/tcp_req_size.testns @@ -0,0 +1,63 @@ +; 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 sleep=1 +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 diff --git a/testdata/tcp_req_timeout.tdir/tcp_req_timeout.conf b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.conf new file mode 100644 index 000000000..45db9e17f --- /dev/null +++ b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.conf @@ -0,0 +1,22 @@ +server: + verbosity: 2 + # num-threads: 1 + interface: 127.0.0.1 + port: @PORT@ + use-syslog: no + directory: . + pidfile: "unbound.pid" + chroot: "" + username: "" + do-not-query-localhost: no + + 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" + tcp-idle-timeout: 2000 + local-zone: "drop.net" deny + +forward-zone: + name: "." + forward-addr: "127.0.0.1@@TOPORT@" diff --git a/testdata/tcp_req_timeout.tdir/tcp_req_timeout.dsc b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.dsc new file mode 100644 index 000000000..fb11517f3 --- /dev/null +++ b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.dsc @@ -0,0 +1,16 @@ +BaseName: tcp_req_timeout +Version: 1.0 +Description: Test tcp request order timeouts. +CreationDate: Mon Jan 21 11:23:00 CET 2018 +Maintainer: Wouter Wijngaards +Category: +Component: +CmdDepends: +Depends: +Help: +Pre: tcp_req_timeout.pre +Post: tcp_req_timeout.post +Test: tcp_req_timeout.test +AuxFiles: +Passed: +Failure: diff --git a/testdata/tcp_req_timeout.tdir/tcp_req_timeout.post b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.post new file mode 100644 index 000000000..7e8309238 --- /dev/null +++ b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.post @@ -0,0 +1,12 @@ +# #-- tcp_req_timeout.post --# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# source the test var file when it's there +[ -f .tpkg.var.test ] && source .tpkg.var.test +# +# do your teardown here +. ../common.sh +kill_pid $FWD_PID +kill_pid $UNBOUND_PID +cat fwd.log +cat unbound.log diff --git a/testdata/tcp_req_timeout.tdir/tcp_req_timeout.pre b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.pre new file mode 100644 index 000000000..d6cfe97ae --- /dev/null +++ b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.pre @@ -0,0 +1,31 @@ +# #-- tcp_req_timeout.pre--# +# source the master var file when it's there +[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master +# use .tpkg.var.test for in test variable passing +[ -f .tpkg.var.test ] && source .tpkg.var.test + +. ../common.sh +get_random_port 2 +UNBOUND_PORT=$RND_PORT +FWD_PORT=$(($RND_PORT + 1)) +echo "UNBOUND_PORT=$UNBOUND_PORT" >> .tpkg.var.test +echo "FWD_PORT=$FWD_PORT" >> .tpkg.var.test + +# start forwarder +get_ldns_testns +$LDNS_TESTNS -p $FWD_PORT tcp_req_timeout.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'/' < tcp_req_timeout.conf > ub.conf +# start unbound in the background +PRE="../.." +$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/tcp_req_timeout.tdir/tcp_req_timeout.test b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.test new file mode 100644 index 000000000..831f8a854 --- /dev/null +++ b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.test @@ -0,0 +1,136 @@ +# #-- tcp_req_timeout.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) +# check what sort of netcat we have +if nc -h 2>&1 | grep "q secs"; then + ncopt="-q 3 -i 4" +else + ncopt="-i 4" +fi + +# this test query should just work (server is up) +echo "> query www1.example.net." +$PRE/streamtcp -f 127.0.0.1@$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 that are answered immediately and then the timeout +echo "> query www1.example.net. www2.example.net. www3.example.net. www.example.com." +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN www.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 +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 "stream closed" outfile; 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 + +# multiple requests that are waiting for answers and then the timeout +echo "> query www2.example.com. www2.example.com. www3.example.com." +$PRE/streamtcp -a -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN www2.example.com A IN www3.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 +if grep "stream closed" outfile; 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 + +# wait a bit +sleep 2 + +# echo a couple requests to the other side and then wait for the timeout. +# this creates waiting answers in the reply queue. +echo "> nc www.example.net www2.example.net www3.example.net" +( echo "0021eb410100000100000000000003777777076578616d706c65036e657400000100010022eb41010000010000000000000477777732076578616d706c65036e657400000100010022eb41010000010000000000000477777733076578616d706c65036e65740000010001" | xxd -r -p ; sleep 10 ; echo "") | nc $ncopt 127.0.0.1 $UNBOUND_PORT | xxd | tee outfile + +echo "OK" +exit 0 diff --git a/testdata/tcp_req_timeout.tdir/tcp_req_timeout.testns b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.testns new file mode 100644 index 000000000..694600974 --- /dev/null +++ b/testdata/tcp_req_timeout.tdir/tcp_req_timeout.testns @@ -0,0 +1,63 @@ +; nameserver test file +$ORIGIN example.com. +$TTL 3600 + +ENTRY_BEGIN +MATCH opcode qtype qname +REPLY QR AA NOERROR +ADJUST copy_id sleep=4 +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 sleep=4 +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 sleep=4 +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 diff --git a/util/alloc.c b/util/alloc.c index 908b1f423..7e9618931 100644 --- a/util/alloc.c +++ b/util/alloc.c @@ -376,6 +376,7 @@ void *unbound_stat_malloc(size_t size) { void* res; if(size == 0) size = 1; + log_assert(size <= SIZE_MAX-16); res = malloc(size+16); if(!res) return NULL; unbound_mem_alloc += size; @@ -398,6 +399,7 @@ void *unbound_stat_calloc(size_t nmemb, size_t size) if(nmemb != 0 && INT_MAX/nmemb < size) return NULL; /* integer overflow check */ s = (nmemb*size==0)?(size_t)1:nmemb*size; + log_assert(s <= SIZE_MAX-16); res = calloc(1, s+16); if(!res) return NULL; log_info("stat %p=calloc(%u, %u)", res+16, (unsigned)nmemb, (unsigned)size); @@ -447,6 +449,7 @@ void *unbound_stat_realloc(void *ptr, size_t size) /* nothing changes */ return ptr; } + log_assert(size <= SIZE_MAX-16); res = malloc(size+16); if(!res) return NULL; unbound_mem_alloc += size; @@ -521,7 +524,9 @@ void *unbound_stat_malloc_lite(size_t size, const char* file, int line, const char* func) { /* [prefix .. len .. actual data .. suffix] */ - void* res = malloc(size+lite_pad*2+sizeof(size_t)); + void* res; + log_assert(size <= SIZE_MAX-(lite_pad*2+sizeof(size_t))); + res = malloc(size+lite_pad*2+sizeof(size_t)); if(!res) return NULL; memmove(res, lite_pre, lite_pad); memmove(res+lite_pad, &size, sizeof(size_t)); @@ -538,6 +543,7 @@ void *unbound_stat_calloc_lite(size_t nmemb, size_t size, const char* file, if(nmemb != 0 && INT_MAX/nmemb < size) return NULL; /* integer overflow check */ req = nmemb * size; + log_assert(req <= SIZE_MAX-(lite_pad*2+sizeof(size_t))); res = malloc(req+lite_pad*2+sizeof(size_t)); if(!res) return NULL; memmove(res, lite_pre, lite_pad); diff --git a/util/config_file.c b/util/config_file.c index ae2ebe89e..9b60254d7 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -76,6 +76,8 @@ uid_t cfg_uid = (uid_t)-1; gid_t cfg_gid = (gid_t)-1; /** for debug allow small timeout values for fast rollovers */ int autr_permit_small_holddown = 0; +/** size (in bytes) of stream wait buffers max */ +size_t stream_wait_max = 4 * 1024 * 1024; /** global config during parsing */ struct config_parser_state* cfg_parser = 0; @@ -140,6 +142,7 @@ config_create(void) cfg->outgoing_num_tcp = 2; /* leaves 64-52=12 for: 4if,1stop,thread4 */ cfg->incoming_num_tcp = 2; #endif + cfg->stream_wait_size = 4 * 1024 * 1024; cfg->edns_buffer_size = 4096; /* 4k from rfc recommendation */ cfg->msg_buffer_size = 65552; /* 64 k + a small margin */ cfg->msg_cache_size = 4 * 1024 * 1024; @@ -484,6 +487,9 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_STRLIST("additional-tls-port:", tls_additional_port) else S_STRLIST("tls-additional-ports:", tls_additional_port) else S_STRLIST("tls-additional-port:", tls_additional_port) + else S_STRLIST_APPEND("tls-session-ticket-keys:", tls_session_ticket_keys) + else S_STR("tls-ciphers:", tls_ciphers) + else S_STR("tls-ciphersuites:", tls_ciphersuites) else S_YNO("interface-automatic:", if_automatic) else S_YNO("use-systemd:", use_systemd) else S_YNO("do-daemonize:", do_daemonize) @@ -491,6 +497,7 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_NUMBER_NONZERO("outgoing-range:", outgoing_num_ports) else S_SIZET_OR_ZERO("outgoing-num-tcp:", outgoing_num_tcp) else S_SIZET_OR_ZERO("incoming-num-tcp:", incoming_num_tcp) + else S_MEMSIZE("stream-wait-size:", stream_wait_size) else S_SIZET_NONZERO("edns-buffer-size:", edns_buffer_size) else S_SIZET_NONZERO("msg-buffer-size:", msg_buffer_size) else S_MEMSIZE("msg-cache-size:", msg_cache_size) @@ -877,6 +884,7 @@ config_get_option(struct config_file* cfg, const char* opt, else O_DEC(opt, "outgoing-range", outgoing_num_ports) else O_DEC(opt, "outgoing-num-tcp", outgoing_num_tcp) else O_DEC(opt, "incoming-num-tcp", incoming_num_tcp) + else O_MEM(opt, "stream-wait-size", stream_wait_size) else O_DEC(opt, "edns-buffer-size", edns_buffer_size) else O_DEC(opt, "msg-buffer-size", msg_buffer_size) else O_MEM(opt, "msg-cache-size", msg_cache_size) @@ -919,6 +927,9 @@ config_get_option(struct config_file* cfg, const char* opt, else O_STR(opt, "tls-cert-bundle", tls_cert_bundle) else O_YNO(opt, "tls-win-cert", tls_win_cert) else O_LST(opt, "tls-additional-port", tls_additional_port) + else O_LST(opt, "tls-session-ticket-keys", tls_session_ticket_keys.first) + else O_STR(opt, "tls-ciphers", tls_ciphers) + else O_STR(opt, "tls-ciphersuites", tls_ciphersuites) else O_YNO(opt, "use-systemd", use_systemd) else O_YNO(opt, "do-daemonize", do_daemonize) else O_STR(opt, "chroot", chrootdir) @@ -1353,6 +1364,9 @@ config_delete(struct config_file* cfg) free(cfg->ssl_service_pem); free(cfg->tls_cert_bundle); config_delstrlist(cfg->tls_additional_port); + config_delstrlist(cfg->tls_session_ticket_keys.first); + free(cfg->tls_ciphers); + free(cfg->tls_ciphersuites); free(cfg->log_identity); config_del_strarray(cfg->ifs, cfg->num_ifs); config_del_strarray(cfg->out_ifs, cfg->num_out_ifs); @@ -1910,6 +1924,7 @@ config_apply(struct config_file* config) UNKNOWN_SERVER_NICENESS = config->unknown_server_time_limit; log_set_time_asc(config->log_time_ascii); autr_permit_small_holddown = config->permit_small_holddown; + stream_wait_max = config->stream_wait_size; } void config_lookup_uid(struct config_file* cfg) diff --git a/util/config_file.h b/util/config_file.h index b211dbaba..3cffdbff9 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -120,6 +120,12 @@ struct config_file { int tls_win_cert; /** additional tls ports */ struct config_strlist* tls_additional_port; + /** secret key used to encrypt and decrypt TLS session ticket */ + struct config_strlist_head tls_session_ticket_keys; + /** TLS ciphers */ + char* tls_ciphers; + /** TLS chiphersuites (TLSv1.3) */ + char* tls_ciphersuites; /** outgoing port range number of ports (per thread) */ int outgoing_num_ports; @@ -132,6 +138,8 @@ struct config_file { /** EDNS buffer size to use */ size_t edns_buffer_size; + /** size of the stream wait buffers, max */ + size_t stream_wait_size; /** number of bytes buffer size for DNS messages */ size_t msg_buffer_size; /** size of the message cache */ @@ -575,6 +583,8 @@ extern uid_t cfg_uid; extern gid_t cfg_gid; /** debug and enable small timeouts */ extern int autr_permit_small_holddown; +/** size (in bytes) of stream wait buffers max */ +extern size_t stream_wait_max; /** * Stub config options diff --git a/util/configlexer.c b/util/configlexer.c index 568723ae2..2d9be6217 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -363,8 +363,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 287 -#define YY_END_OF_BUFFER 288 +#define YY_NUM_RULES 291 +#define YY_END_OF_BUFFER 292 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -372,322 +372,328 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[2859] = +static yyconst flex_int16_t yy_accept[2905] = { 0, - 1, 1, 269, 269, 273, 273, 277, 277, 281, 281, - 1, 1, 288, 285, 1, 267, 267, 286, 2, 286, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 269, 270, 270, 271, 286, 273, 274, 274, - 275, 286, 280, 277, 278, 278, 279, 286, 281, 282, - 282, 283, 286, 284, 268, 2, 272, 286, 284, 285, - 0, 1, 2, 2, 2, 2, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 1, 1, 273, 273, 277, 277, 281, 281, 285, 285, + 1, 1, 292, 289, 1, 271, 271, 290, 2, 290, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 273, 274, 274, 275, 290, 277, 278, 278, + 279, 290, 284, 281, 282, 282, 283, 290, 285, 286, + 286, 287, 290, 288, 272, 2, 276, 290, 288, 289, + 0, 1, 2, 2, 2, 2, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 269, - 0, 273, 0, 280, 0, 277, 281, 0, 284, 0, - 2, 2, 284, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 273, + 0, 277, 0, 284, 0, 281, 285, 0, 288, 0, + 2, 2, 288, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 284, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 288, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 110, 285, 285, - 285, 285, 285, 285, 285, 284, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 114, + 289, 289, 289, 289, 289, 289, 289, 288, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 92, 285, - 285, 285, 285, 285, 285, 8, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 115, - 285, 284, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 96, 289, 289, 289, 289, 289, 289, 8, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 119, 289, 288, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 284, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 51, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 210, - 285, 14, 15, 285, 18, 17, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 288, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 54, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 214, 289, 14, 15, 289, 18, + 17, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 109, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 194, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 3, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 284, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 113, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 198, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 3, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 260, 285, 285, 259, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 276, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 54, 285, 234, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 55, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 288, 289, 289, 289, 289, 289, 289, 289, 264, + 289, 289, 263, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 280, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 57, 289, 238, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 58, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 183, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 20, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 134, 285, 285, 276, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 90, 285, 285, 285, 285, 285, 285, 285, 242, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 187, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 20, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 138, 289, 289, + 280, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 94, 289, 289, 289, 289, 289, 289, 289, 246, - 285, 155, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 133, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 89, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 31, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 159, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 137, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 93, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 32, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 52, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 108, 285, 285, 285, 285, 285, 107, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 53, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 156, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 31, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 32, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 55, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 112, 289, 289, 289, 289, 289, + 111, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 56, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 160, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 42, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 225, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 46, 285, 47, 285, - 285, 285, 285, 93, 285, 94, 285, 285, 285, 285, - 91, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 45, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 229, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 49, 289, 50, 289, 289, 289, 289, 289, 97, 289, + 98, 289, 289, 289, 289, 95, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 7, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 203, 285, 285, 285, 285, - 136, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 43, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 175, 285, 174, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 7, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 207, 289, 289, 289, 289, 140, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 46, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 16, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 56, 285, 285, 285, - 285, 285, 285, 285, 285, 182, 285, 285, 285, 285, - 285, 96, 285, 95, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 166, 285, 285, 285, 285, 285, 285, 285, - 285, 116, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 179, 289, 178, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 16, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 59, 289, 289, 289, 289, 289, 289, + 289, 289, 186, 289, 289, 289, 289, 289, 289, 100, + 289, 99, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 170, 289, 289, 289, 289, 289, 289, 289, - 285, 74, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 78, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 50, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 169, 170, 285, 285, 285, 236, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 6, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 120, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 78, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 82, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 53, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 173, 174, 289, 289, 289, 240, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 240, 285, 285, 285, 261, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 40, 285, 285, 285, - 285, 285, 285, 285, 285, 162, 285, 285, 285, 111, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 187, 285, 163, 285, 285, 285, 200, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 41, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 6, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 244, 289, 289, 289, 265, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 41, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 43, 289, 289, 289, 289, 289, 289, 289, 289, 166, + 289, 289, 289, 115, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 191, 289, 167, 289, 289, 289, - 285, 285, 285, 113, 101, 285, 102, 285, 285, 285, - 100, 285, 285, 285, 285, 285, 285, 285, 285, 131, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 224, 285, 285, 285, 285, 285, 285, 285, 285, - 164, 285, 285, 285, 285, 285, 167, 285, 173, 285, - 285, 285, 285, 285, 199, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 88, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 48, 285, 285, 285, 25, 285, 285, 285, 285, + 204, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 44, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 117, 105, 289, + 106, 289, 289, 289, 104, 289, 289, 289, 289, 289, + 289, 289, 289, 135, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 228, 289, 289, 289, 289, + 289, 289, 289, 289, 168, 289, 289, 289, 289, 289, + 171, 289, 177, 289, 289, 289, 289, 289, 203, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 92, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 19, 285, 285, 285, 285, 26, - 35, 285, 141, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 63, 65, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 244, 285, 285, - 285, 211, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 103, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 130, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 255, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 51, 289, 289, 289, 25, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 19, + 289, 289, 289, 289, 289, 289, 26, 35, 289, 145, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 67, + 69, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 248, 289, 289, 289, 215, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 107, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 135, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 193, - 285, 285, 285, 285, 285, 285, 285, 285, 264, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 152, 285, - 285, 285, 285, 285, 285, 285, 97, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 147, 285, 157, 285, 285, 285, - 285, 285, 119, 285, 285, 285, 285, 285, 84, 285, - 285, 285, 285, 185, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 134, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 259, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 139, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 197, 289, 289, 289, + 289, 289, 289, 289, 289, 268, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 156, 289, 289, 289, 289, + 289, 289, 289, 289, 101, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 201, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 216, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 112, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 151, 285, 285, 285, 285, 285, - 66, 67, 285, 285, 285, 285, 285, 49, 285, 285, - 285, 285, 285, 73, 158, 285, 176, 285, 204, 285, - 285, 168, 237, 285, 285, 285, 285, 285, 59, 285, - 160, 285, 285, 285, 285, 285, 9, 285, 285, 285, - 87, 285, 285, 285, 285, 229, 285, 285, 285, 184, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, + 289, 289, 289, 289, 151, 289, 161, 289, 289, 289, + 289, 289, 123, 289, 289, 289, 289, 289, 88, 289, + 289, 289, 289, 189, 289, 289, 289, 289, 289, 289, + 205, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 220, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 116, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 155, 289, 289, 289, 289, 289, + 70, 71, 289, 289, 289, 289, 289, 52, 289, 289, + 289, 289, 289, 77, 162, 289, 180, 289, 208, 289, + 289, 172, 241, 289, 289, 289, 289, 289, 63, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 150, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 137, 285, 243, 285, 285, 285, 285, - 215, 285, 285, 285, 285, 285, 285, 285, 285, 195, - 285, 285, 285, 285, 235, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 258, - 285, 159, 285, 285, 285, 285, 285, 285, 285, 58, + 164, 289, 289, 289, 289, 289, 9, 289, 289, 289, + 91, 289, 289, 289, 289, 233, 289, 289, 289, 188, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 154, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 141, 289, 247, 289, + 289, 289, 289, 219, 289, 289, 289, 289, 289, 289, + 289, 289, 199, 289, 289, 289, 289, 239, 289, 289, - 60, 285, 285, 285, 285, 285, 285, 285, 86, 285, - 285, 285, 285, 227, 285, 285, 285, 239, 285, 285, - 285, 285, 285, 285, 285, 189, 33, 27, 29, 285, - 285, 285, 285, 285, 285, 285, 285, 34, 28, 30, - 285, 285, 285, 285, 285, 285, 285, 83, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 191, 188, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 57, 285, 285, 114, 285, 104, 285, 285, 285, - 285, 285, 285, 285, 285, 132, 13, 285, 285, 285, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 262, 289, 163, 289, 289, 289, 289, 289, + 289, 289, 62, 64, 289, 289, 289, 289, 289, 289, + 289, 90, 289, 289, 289, 289, 231, 289, 289, 289, + 243, 289, 289, 289, 289, 289, 289, 289, 193, 33, + 27, 29, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 34, 289, 28, 30, 289, 289, 289, 289, 289, + 289, 289, 289, 87, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 253, 285, 256, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 12, - 285, 285, 21, 285, 285, 285, 233, 285, 285, 285, - 241, 285, 61, 285, 197, 285, 285, 190, 285, 285, - 285, 285, 285, 285, 22, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 146, 145, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 192, 186, - 285, 202, 285, 285, 245, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 68, + 289, 195, 192, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 61, 289, 289, + 118, 289, 108, 289, 289, 289, 289, 289, 289, 289, + 289, 136, 13, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 257, 289, 260, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 12, 289, 289, 21, 289, + 289, 289, 237, 289, 289, 289, 245, 289, 65, 289, + 201, 289, 289, 194, 289, 289, 60, 289, 289, 289, + 289, 22, 289, 42, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 150, 149, 289, 289, - 285, 285, 285, 228, 285, 285, 285, 285, 172, 285, - 285, 285, 285, 196, 285, 285, 285, 285, 285, 285, - 285, 285, 262, 263, 143, 62, 285, 285, 153, 285, - 285, 98, 99, 285, 285, 285, 138, 285, 140, 285, - 177, 285, 285, 285, 285, 144, 285, 285, 205, 285, - 285, 285, 285, 285, 285, 285, 121, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 212, 285, - 285, 285, 23, 285, 238, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 178, 285, 285, 226, - 285, 257, 285, 171, 285, 285, 285, 285, 44, 285, + 289, 289, 289, 289, 289, 289, 289, 196, 190, 289, + 206, 289, 289, 249, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 72, 289, + 289, 289, 232, 289, 289, 289, 289, 176, 289, 289, + 289, 289, 200, 289, 289, 289, 289, 289, 289, 289, + 289, 266, 267, 147, 66, 289, 289, 157, 289, 289, + 102, 103, 289, 289, 289, 289, 142, 289, 144, 289, + 181, 289, 289, 289, 289, 148, 289, 289, 209, 289, + 289, 289, 289, 289, 289, 289, 125, 289, 289, 289, - 285, 285, 285, 4, 285, 285, 120, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 208, 36, 37, 285, 285, 285, 285, 285, - 285, 285, 246, 285, 285, 285, 285, 285, 285, 214, - 285, 285, 285, 181, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 71, 285, 45, 232, 285, 209, 285, - 285, 285, 285, 11, 285, 285, 285, 285, 285, 285, - 285, 179, 75, 285, 39, 285, 285, 285, 285, 285, - 285, 285, 149, 285, 285, 285, 285, 285, 123, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 213, 117, + 289, 289, 289, 289, 289, 289, 289, 289, 216, 289, + 289, 289, 23, 289, 242, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 182, 289, 289, 230, + 289, 261, 289, 175, 289, 289, 289, 289, 47, 289, + 289, 289, 289, 4, 289, 289, 124, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 212, 36, 37, 289, 289, 289, 289, + 289, 289, 289, 250, 289, 289, 289, 289, 289, 289, + 218, 289, 289, 289, 185, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 75, 289, 48, 236, 289, 213, - 285, 285, 105, 106, 285, 285, 285, 77, 81, 76, - 285, 69, 285, 285, 285, 285, 285, 10, 285, 285, - 285, 230, 285, 285, 266, 38, 285, 285, 285, 285, - 148, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 82, - 80, 285, 70, 254, 285, 285, 285, 285, 285, 285, - 285, 165, 285, 285, 285, 180, 285, 285, 285, 285, - 285, 285, 285, 139, 64, 285, 285, 285, 285, 285, - 247, 285, 285, 285, 285, 285, 285, 285, 118, 285, - 79, 124, 125, 128, 129, 126, 127, 72, 285, 231, + 289, 289, 289, 289, 11, 289, 289, 289, 289, 289, + 289, 289, 183, 79, 289, 39, 289, 289, 289, 289, + 289, 289, 289, 289, 153, 289, 289, 289, 289, 289, + 127, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 217, 121, 289, 289, 109, 110, 289, 289, 289, 81, + 85, 80, 289, 73, 289, 289, 289, 289, 289, 10, + 289, 289, 289, 234, 289, 289, 270, 38, 289, 289, + 289, 289, 289, 152, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 86, 84, 289, 74, 258, 289, 289, 289, - 285, 142, 285, 285, 285, 285, 285, 207, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 154, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 85, 285, 206, 285, 223, 251, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 5, 285, 198, 285, 285, 252, 285, 285, 285, 285, - 285, 285, 285, 285, 24, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 122, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 161, 285, + 289, 289, 289, 289, 169, 289, 289, 289, 184, 289, + 289, 289, 289, 289, 289, 289, 289, 143, 68, 289, + 289, 289, 289, 289, 251, 289, 289, 289, 289, 289, + 289, 289, 122, 289, 83, 128, 129, 132, 133, 130, + 131, 76, 289, 235, 289, 289, 146, 289, 289, 289, + 289, 289, 211, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 158, 40, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 89, 289, 210, 289, 227, 255, 289, 289, 289, 289, - 285, 285, 285, 285, 285, 285, 285, 285, 248, 285, - 285, 285, 285, 285, 285, 285, 285, 285, 285, 285, - 285, 285, 285, 285, 285, 285, 265, 285, 285, 219, - 285, 285, 285, 285, 285, 249, 285, 285, 285, 285, - 285, 285, 250, 285, 285, 285, 217, 285, 220, 221, - 285, 285, 285, 285, 285, 218, 222, 0 + 289, 289, 289, 289, 289, 289, 5, 289, 202, 289, + 289, 256, 289, 289, 289, 289, 289, 289, 289, 289, + 24, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 126, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 165, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 252, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 269, 289, 289, 223, 289, 289, 289, 289, + 289, 253, 289, 289, 289, 289, 289, 289, 254, 289, + 289, 289, 221, 289, 224, 225, 289, 289, 289, 289, + + 289, 222, 226, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -730,647 +736,657 @@ static yyconst YY_CHAR yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_uint16_t yy_base[2873] = +static yyconst flex_uint16_t yy_base[2919] = { 0, 0, 0, 38, 41, 44, 46, 59, 65, 71, 77, - 90, 112, 2379, 2266, 81, 5585, 5585, 5585, 96, 52, + 90, 112, 2146, 1869, 81, 5674, 5674, 5674, 96, 52, 106, 63, 107, 111, 70, 128, 130, 133, 57, 88, 76, 135, 141, 117, 148, 145, 160, 164, 185, 176, - 191, 152, 2238, 5585, 5585, 5585, 107, 2112, 5585, 5585, - 5585, 165, 1772, 1584, 5585, 5585, 5585, 211, 1467, 5585, - 5585, 5585, 180, 1048, 5585, 217, 5585, 221, 168, 918, + 191, 152, 1830, 5674, 5674, 5674, 107, 1790, 5674, 5674, + 5674, 165, 1674, 1331, 5674, 5674, 5674, 211, 1221, 5674, + 5674, 5674, 180, 1211, 5674, 217, 5674, 221, 168, 962, 225, 189, 0, 232, 0, 0, 226, 189, 85, 221, 114, 227, 234, 156, 219, 235, 239, 236, 238, 132, 246, 242, 241, 252, 244, 247, 266, 243, 258, 273, 275, 187, 277, 278, 267, 274, 280, 283, 287, 289, 295, 297, 298, 299, 304, 305, 306, 311, 307, 315, - 309, 313, 330, 318, 329, 325, 320, 335, 336, 338, - 339, 340, 343, 346, 342, 349, 350, 359, 351, 806, - 372, 771, 377, 699, 381, 549, 355, 385, 198, 389, - 393, 0, 385, 373, 395, 387, 391, 392, 257, 390, - 394, 396, 397, 399, 401, 414, 403, 412, 420, 422, - 426, 423, 430, 433, 434, 435, 436, 418, 447, 445, - 450, 442, 451, 453, 454, 457, 458, 473, 459, 460, - 409, 467, 475, 477, 484, 469, 487, 488, 485, 492, + 309, 313, 330, 318, 329, 325, 320, 335, 336, 339, + 340, 343, 345, 342, 346, 350, 349, 355, 357, 907, + 373, 754, 376, 671, 382, 632, 365, 386, 198, 390, + 394, 0, 386, 374, 396, 388, 392, 393, 257, 391, + 395, 397, 398, 400, 402, 415, 404, 413, 421, 423, + 427, 424, 431, 434, 435, 436, 437, 419, 448, 446, + 451, 443, 452, 454, 455, 458, 459, 474, 460, 461, + 410, 468, 476, 478, 485, 470, 488, 489, 486, 493, - 490, 500, 502, 498, 499, 501, 503, 504, 508, 509, - 511, 513, 516, 514, 515, 519, 521, 520, 528, 522, - 533, 534, 541, 536, 540, 543, 551, 554, 546, 555, - 547, 557, 560, 563, 564, 572, 567, 568, 570, 573, - 574, 576, 577, 578, 579, 587, 594, 590, 596, 598, - 589, 599, 600, 603, 606, 580, 615, 607, 619, 611, - 623, 608, 624, 627, 616, 622, 630, 631, 629, 640, - 636, 645, 641, 648, 647, 652, 644, 660, 646, 655, - 656, 657, 658, 661, 662, 663, 665, 671, 669, 675, - 674, 682, 681, 679, 692, 685, 688, 690, 693, 697, + 491, 501, 503, 499, 500, 502, 504, 505, 509, 510, + 512, 514, 517, 515, 516, 520, 522, 521, 529, 523, + 534, 535, 542, 537, 538, 544, 541, 555, 556, 547, + 558, 551, 559, 560, 565, 568, 575, 570, 567, 571, + 579, 574, 577, 578, 582, 580, 594, 601, 592, 599, + 602, 600, 605, 606, 607, 608, 584, 617, 610, 581, + 622, 628, 612, 626, 631, 618, 614, 633, 635, 637, + 644, 640, 647, 643, 648, 649, 650, 652, 661, 656, + 659, 658, 660, 662, 664, 665, 668, 666, 674, 669, + 678, 680, 688, 686, 685, 698, 690, 691, 695, 701, - 689, 703, 705, 717, 718, 713, 719, 720, 722, 724, - 727, 725, 728, 735, 736, 737, 738, 739, 747, 742, - 744, 751, 750, 752, 761, 746, 765, 767, 759, 769, - 770, 792, 777, 775, 772, 785, 780, 5585, 798, 788, - 818, 789, 790, 825, 803, 805, 810, 807, 814, 812, - 841, 816, 827, 836, 844, 828, 839, 840, 843, 849, - 846, 862, 852, 845, 855, 857, 869, 864, 866, 868, - 877, 870, 872, 876, 879, 878, 778, 881, 883, 886, - 887, 891, 894, 895, 897, 899, 896, 910, 904, 921, - 903, 916, 923, 920, 911, 928, 926, 930, 932, 933, + 693, 708, 702, 723, 712, 724, 713, 705, 694, 719, + 732, 729, 735, 737, 738, 739, 740, 741, 742, 750, + 745, 748, 755, 758, 762, 766, 746, 772, 747, 776, + 770, 774, 781, 803, 778, 768, 780, 782, 785, 5674, + 808, 786, 828, 792, 787, 815, 810, 812, 801, 817, + 825, 818, 829, 813, 821, 835, 851, 836, 838, 846, + 848, 852, 850, 860, 861, 853, 856, 864, 875, 867, + 870, 871, 882, 874, 872, 877, 881, 883, 887, 896, + 889, 897, 884, 898, 901, 904, 902, 908, 905, 909, + 912, 926, 906, 923, 928, 925, 931, 933, 935, 936, - 942, 937, 938, 940, 943, 944, 946, 950, 951, 952, - 954, 956, 960, 957, 967, 958, 965, 972, 5585, 974, - 976, 977, 978, 979, 980, 5585, 982, 981, 984, 989, - 994, 996, 988, 991, 1004, 1013, 1006, 1008, 1016, 995, - 1014, 1017, 1020, 1018, 1023, 1021, 1024, 1027, 1025, 1045, - 1030, 1032, 1031, 1033, 1038, 1056, 1037, 1040, 1057, 1058, - 1063, 1073, 1066, 1076, 1068, 1049, 1080, 1070, 1083, 1075, - 1077, 1085, 1086, 1087, 1088, 1092, 1094, 1096, 1097, 5585, - 1098, 1102, 1110, 1108, 1099, 1112, 1115, 1117, 1116, 1118, - 1123, 1119, 1125, 1127, 1130, 1128, 1141, 1137, 1139, 1138, + 937, 938, 946, 943, 942, 944, 949, 953, 955, 959, + 952, 945, 961, 966, 970, 967, 975, 977, 960, 983, + 5674, 985, 968, 980, 978, 990, 991, 5674, 993, 992, + 994, 1001, 996, 1004, 997, 1000, 1007, 1022, 999, 1006, + 1023, 1020, 1021, 783, 1024, 1025, 1027, 1028, 1030, 1031, + 1033, 1036, 1053, 1037, 1040, 1038, 1039, 1044, 1046, 1065, + 1048, 1051, 1062, 1066, 1077, 1064, 1081, 1068, 1076, 1085, + 1083, 1087, 1089, 1090, 1092, 1093, 1094, 1095, 1097, 1098, + 1099, 1103, 5674, 1101, 1111, 1119, 1118, 1105, 1121, 1122, + 1123, 1124, 1125, 1126, 1131, 1127, 1144, 1134, 1137, 1147, - 1143, 1145, 1144, 1146, 1148, 1157, 1153, 1160, 1168, 1169, - 1171, 1173, 1180, 1154, 1176, 1177, 1178, 1181, 1183, 1185, - 1161, 1187, 1188, 1199, 1191, 1194, 1196, 1198, 1208, 1200, - 1203, 1207, 1204, 1213, 1209, 1211, 1220, 1221, 1223, 1230, - 1228, 1226, 1232, 1234, 1240, 1241, 1231, 1233, 1242, 1244, - 1245, 1248, 1253, 1254, 1255, 1256, 1260, 1259, 1267, 1264, - 1262, 1273, 1275, 1266, 1277, 1285, 1278, 1287, 1286, 1288, - 1296, 1292, 1294, 1282, 1303, 1298, 1299, 1304, 1310, 1306, - 1311, 1314, 1321, 1324, 1312, 1316, 1322, 1327, 1326, 1330, - 1331, 1332, 1333, 1334, 1336, 1335, 1339, 1340, 1342, 1343, + 1145, 1148, 1132, 1150, 1153, 1152, 1154, 1156, 1167, 1162, + 1160, 1169, 1177, 1179, 1181, 1182, 1164, 1183, 1184, 1174, + 1187, 1188, 1192, 1190, 1196, 1194, 1205, 1200, 1201, 1202, + 1203, 1212, 1209, 1208, 1217, 1210, 1226, 1216, 1230, 1231, + 1218, 1224, 1243, 1233, 1238, 1240, 1245, 1246, 1247, 1248, + 1251, 1253, 1254, 1256, 1255, 1258, 1259, 1262, 1263, 1265, + 1270, 1277, 1272, 1273, 1280, 1284, 1285, 1286, 1293, 1290, + 1294, 1296, 1292, 1307, 1291, 1298, 1302, 1314, 1305, 1309, + 1310, 1313, 1323, 1320, 1325, 1334, 1326, 1312, 1336, 1329, + 1339, 1335, 1340, 1342, 1343, 1344, 1351, 1346, 1347, 1352, - 1347, 1352, 1356, 1357, 1359, 1360, 1363, 1364, 1365, 1366, - 1368, 1371, 1372, 1376, 1374, 1375, 1377, 1389, 1381, 1388, - 1390, 1392, 1395, 1398, 1396, 1404, 1402, 1406, 1408, 1410, - 1412, 1411, 1414, 1415, 1422, 1416, 1425, 1427, 1429, 1428, - 1432, 1435, 1438, 1439, 5585, 1433, 1446, 1441, 1447, 1445, - 1450, 1453, 1460, 1455, 1458, 1456, 1459, 1462, 1464, 5585, - 1466, 5585, 5585, 1468, 5585, 5585, 1470, 1472, 1477, 1487, - 1488, 1494, 1490, 1480, 1492, 1496, 1503, 1517, 1499, 1502, - 1507, 1505, 1508, 1510, 1513, 1514, 1512, 1531, 1528, 1534, - 1538, 1539, 1540, 1526, 1542, 1544, 1547, 1548, 1549, 1553, + 1354, 1355, 1349, 1359, 1357, 1376, 1361, 1365, 1363, 1366, + 1374, 1379, 1380, 1381, 1383, 1384, 1386, 1387, 1389, 1390, + 1394, 1392, 1407, 1395, 1391, 1404, 1408, 1413, 1414, 1419, + 1420, 1398, 1422, 1423, 1426, 1427, 1430, 1428, 1431, 1435, + 1437, 1438, 1441, 1443, 1444, 1446, 1449, 1453, 1454, 5674, + 1448, 1461, 1459, 1460, 1462, 1466, 1468, 1475, 1470, 1473, + 1471, 1472, 1476, 1483, 5674, 1484, 5674, 5674, 1477, 5674, + 5674, 1481, 1487, 1482, 1500, 1506, 1508, 1501, 1485, 1510, + 1511, 1519, 1532, 1515, 1514, 1522, 1516, 1518, 1526, 1523, + 1527, 1537, 1542, 1548, 1546, 1554, 1545, 1517, 1538, 1556, - 1551, 1554, 1557, 1558, 1500, 1567, 1569, 1560, 1577, 5585, - 1573, 1585, 1586, 1582, 1589, 1581, 1588, 1590, 1591, 1592, - 1595, 1596, 1593, 1563, 1597, 1601, 1608, 1604, 5585, 1605, - 1607, 1613, 1611, 1619, 1621, 1615, 1617, 1624, 1628, 1627, - 1630, 1631, 1633, 5585, 1632, 1638, 1635, 1640, 1641, 1647, - 1648, 1649, 1650, 1651, 1653, 1654, 1658, 1665, 1652, 1663, - 1664, 1666, 1673, 1674, 1676, 1685, 1669, 1678, 1682, 1686, - 1690, 1691, 1698, 1693, 1700, 1695, 1703, 1705, 1704, 1701, - 1709, 1713, 1696, 1722, 1716, 1724, 1714, 1725, 1734, 1719, - 1731, 1726, 1735, 1737, 1733, 1741, 1742, 1746, 1747, 1749, + 1555, 1558, 1561, 1562, 1564, 1566, 1567, 1565, 1570, 1571, + 1578, 1576, 1574, 1590, 5674, 1586, 1594, 1598, 1595, 1602, + 1601, 1597, 1599, 1605, 1606, 1609, 1608, 1610, 1612, 1616, + 1618, 1623, 1619, 5674, 1621, 1622, 1627, 1628, 1633, 1634, + 1635, 1620, 1640, 1642, 1643, 1644, 1646, 1647, 5674, 1585, + 1652, 1648, 1654, 1655, 1660, 1661, 1656, 1663, 1664, 1665, + 1667, 1666, 1668, 1685, 1677, 1682, 1672, 1675, 1690, 1692, + 1693, 1700, 1695, 1701, 1697, 1703, 1702, 1704, 1705, 1707, + 1714, 1709, 1718, 1713, 1725, 1734, 1716, 1721, 1729, 1730, + 1731, 1736, 1738, 1739, 1743, 1744, 1751, 1746, 1748, 1750, - 1750, 5585, 1751, 1752, 5585, 1753, 1755, 1777, 1756, 1758, - 1759, 1761, 1764, 1779, 1763, 1770, 1785, 1781, 1797, 1787, - 1799, 1792, 1800, 1804, 1794, 1802, 1806, 1765, 1816, 1817, - 1813, 1819, 1824, 1821, 1822, 1826, 1845, 1825, 1827, 1828, - 1835, 1829, 1831, 1840, 1838, 1839, 1849, 1834, 1850, 5585, - 1861, 1857, 1856, 1863, 1872, 1862, 1869, 1870, 1873, 1874, - 1883, 1878, 1880, 1881, 1884, 1889, 1885, 1894, 1891, 1892, - 1896, 1893, 1913, 5585, 1895, 5585, 1898, 1897, 1908, 1909, - 1914, 1915, 1916, 1919, 1920, 1922, 1928, 1939, 1934, 5585, - 1926, 1941, 1944, 1943, 1936, 1918, 1937, 1949, 1951, 1958, + 1753, 1755, 1756, 1759, 1764, 1760, 1767, 1769, 1762, 5674, + 1770, 1772, 5674, 1773, 1775, 1797, 1776, 1779, 1780, 1785, + 1778, 1788, 1789, 1791, 1807, 1801, 1817, 1809, 1810, 1819, + 1820, 1821, 1822, 1824, 1827, 1831, 1838, 1839, 1799, 1847, + 1846, 1828, 1829, 1843, 1862, 1844, 1849, 1851, 1852, 1857, + 1855, 1859, 1866, 1853, 1871, 1874, 1875, 5674, 1883, 1884, + 1878, 1885, 1892, 1889, 1891, 1893, 1895, 1896, 1905, 1900, + 1901, 1903, 1906, 1907, 1911, 1913, 1914, 1915, 1916, 1917, + 1933, 5674, 1919, 5674, 1918, 1928, 1930, 1929, 1936, 1937, + 1939, 1940, 1941, 1938, 1950, 1959, 1942, 5674, 1956, 1963, - 1953, 1960, 1956, 1957, 1963, 1964, 1961, 1965, 1967, 1971, - 5585, 1974, 1975, 1976, 1985, 1987, 1981, 1984, 1989, 1988, - 1993, 1994, 1995, 1996, 2003, 2005, 2008, 2010, 2011, 2007, - 5585, 2000, 2004, 2023, 2020, 2021, 2022, 2025, 2026, 2027, - 2031, 2032, 2033, 2041, 2042, 2039, 2043, 2046, 2034, 2037, - 2047, 2060, 2050, 2055, 2057, 2058, 5585, 2061, 2063, 124, - 2065, 2066, 2070, 2067, 2069, 2074, 2071, 2090, 2092, 2088, - 2075, 2089, 2085, 2087, 2095, 2096, 2097, 2098, 2102, 2103, - 5585, 2107, 2104, 2108, 2109, 2113, 2110, 2115, 5585, 2127, - 2132, 2114, 2125, 2133, 2123, 2135, 2138, 2140, 2142, 2145, + 1960, 1965, 1966, 1958, 1967, 1969, 1971, 1976, 1973, 1981, + 1974, 1979, 1983, 1984, 1987, 1990, 1991, 1992, 5674, 1999, + 1994, 2001, 2008, 1998, 2006, 2009, 2011, 2012, 2016, 2017, + 2018, 2019, 2020, 2029, 2030, 2021, 2032, 2035, 2031, 5674, + 2028, 2039, 2047, 2043, 2045, 2042, 2049, 2050, 2052, 2053, + 2054, 2057, 2060, 2061, 2069, 2070, 2062, 2066, 2074, 2067, + 2076, 2079, 2082, 2081, 2083, 2084, 2085, 5674, 2087, 2089, + 124, 2093, 2094, 2096, 2095, 2102, 2098, 2101, 2118, 2119, + 2115, 2114, 2117, 2123, 2124, 2125, 2126, 2127, 2128, 2129, + 2131, 5674, 2105, 2133, 2134, 2136, 2139, 2140, 2143, 5674, - 2146, 5585, 2149, 2150, 2152, 2151, 2153, 2160, 2154, 2161, - 2162, 2166, 2167, 2168, 2173, 2169, 2170, 2172, 2174, 2178, - 2175, 2182, 2186, 2187, 5585, 2194, 2191, 2195, 2197, 2199, - 2198, 2213, 2200, 2201, 2208, 2222, 2224, 2214, 2209, 2226, - 2230, 2211, 2225, 2241, 2239, 2240, 2248, 2236, 2250, 2253, - 2242, 2228, 2252, 2254, 2255, 2259, 2263, 2270, 2271, 2267, - 2275, 2268, 2289, 2278, 2269, 5585, 2283, 2285, 2291, 2292, - 2299, 2294, 2297, 2296, 2295, 2303, 2305, 2306, 2307, 2308, - 2311, 2317, 2312, 2315, 2318, 2320, 2327, 2329, 2331, 5585, - 2332, 2334, 2336, 2338, 2341, 2344, 2345, 2347, 2348, 2349, + 2153, 2156, 2142, 2155, 2163, 2158, 2164, 2165, 2167, 2172, + 2168, 2171, 5674, 2175, 2178, 2180, 2181, 2182, 2184, 2189, + 2191, 2192, 2193, 2196, 2194, 2195, 2199, 2197, 2200, 2204, + 2213, 2203, 2205, 2210, 2214, 5674, 2226, 2215, 2224, 2217, + 2228, 2227, 2241, 2231, 2234, 2236, 2242, 2251, 2244, 2238, + 2252, 2253, 2258, 2262, 2261, 2267, 2268, 2265, 2269, 2275, + 2277, 2278, 2279, 2283, 2281, 2284, 2285, 2286, 2293, 2294, + 2291, 2302, 2300, 2307, 2305, 2310, 5674, 2311, 2312, 2295, + 2317, 2325, 2322, 2323, 2329, 2330, 2331, 2332, 2333, 2334, + 2335, 2338, 2336, 2337, 2342, 2349, 2347, 2353, 2357, 2358, - 2351, 2353, 2354, 2356, 2358, 2359, 2360, 5585, 2364, 2366, - 2372, 2374, 2375, 2378, 2384, 2381, 2379, 2387, 2388, 2389, - 5585, 2396, 2398, 2394, 2406, 2401, 2403, 2404, 2408, 2391, - 5585, 2405, 2409, 2418, 2419, 2414, 5585, 2423, 2416, 2421, - 2426, 2428, 2427, 2433, 2424, 2429, 2431, 2435, 2447, 2437, - 2443, 5585, 2439, 2456, 2451, 2452, 2457, 2453, 2459, 2462, - 2463, 2464, 2470, 2478, 2475, 2476, 2473, 2481, 2482, 2483, - 2485, 2486, 2489, 5585, 2490, 2493, 2494, 2495, 2497, 2498, - 2499, 2508, 2505, 2506, 2510, 2513, 2514, 2515, 2521, 2520, - 2530, 2519, 2522, 2532, 2523, 2536, 2539, 2540, 2547, 2549, + 5674, 2359, 2361, 2363, 2364, 2370, 2365, 2372, 2374, 2376, + 2377, 2378, 2380, 2383, 2384, 2386, 2388, 2391, 2390, 2389, + 5674, 2394, 2395, 2396, 2404, 2405, 2411, 2412, 2414, 2418, + 2402, 2419, 2421, 2422, 5674, 2430, 2432, 2429, 2433, 2431, + 2436, 2437, 2439, 2441, 5674, 2442, 2443, 2450, 2451, 2446, + 5674, 2453, 2449, 2454, 2456, 2457, 2458, 2459, 2464, 2465, + 2467, 2470, 2473, 2477, 2478, 5674, 2479, 2487, 2488, 2480, + 2491, 2482, 2492, 2493, 2497, 2501, 2495, 2510, 2512, 2513, + 2514, 2494, 2517, 2518, 2519, 2521, 2522, 5674, 2515, 2525, + 2527, 2530, 2528, 2534, 2536, 2544, 2539, 2540, 2546, 2541, - 2550, 2552, 5585, 2555, 2544, 2556, 2546, 2557, 2558, 2559, - 2561, 2563, 2567, 2569, 2568, 2570, 2578, 2585, 2576, 2580, - 2586, 2587, 2588, 2590, 2591, 2592, 2593, 2600, 2598, 2599, - 2607, 2602, 2608, 2615, 2604, 2613, 2616, 2617, 2619, 2618, - 2622, 2626, 2628, 2629, 2643, 2640, 2620, 2634, 2644, 2638, - 2646, 5585, 2649, 2655, 2630, 2656, 2658, 2659, 2661, 2663, - 2669, 2660, 2668, 2662, 2677, 2675, 5585, 2676, 5585, 2678, - 2679, 2687, 2689, 5585, 2691, 5585, 2692, 2697, 2685, 2693, - 5585, 2700, 2698, 2702, 2704, 2706, 2707, 2708, 2714, 2712, - 2710, 2716, 2719, 2717, 2722, 2724, 2723, 2727, 2732, 2733, + 2547, 2548, 2549, 2550, 2553, 2561, 2563, 2564, 2566, 2568, + 2569, 2570, 2577, 2582, 2583, 2585, 5674, 2588, 2589, 2591, + 2578, 2580, 2592, 2595, 2597, 2599, 2601, 2603, 2604, 2605, + 2612, 2616, 2613, 2620, 2617, 2622, 2614, 2625, 2626, 2627, + 2628, 2635, 2632, 2631, 2640, 2639, 2638, 2648, 2643, 2649, + 2650, 2651, 2652, 2653, 2656, 2654, 2660, 2661, 2665, 2667, + 2675, 2676, 2677, 2678, 2681, 5674, 2680, 2682, 2684, 2690, + 2693, 2694, 2696, 2698, 2703, 2688, 2695, 2705, 2715, 2711, + 5674, 2712, 5674, 2714, 2716, 2717, 2726, 2719, 5674, 2723, + 5674, 2724, 2729, 2731, 2732, 5674, 2733, 2734, 2737, 2740, - 2734, 2737, 2739, 2742, 2743, 2744, 5585, 2748, 2745, 2751, - 2752, 2754, 2755, 2756, 2761, 2758, 2764, 2760, 2770, 2767, - 2774, 2777, 2779, 2781, 2789, 5585, 2785, 2791, 2786, 2788, - 5585, 2792, 2793, 2795, 2802, 2798, 2800, 2804, 2806, 2807, - 2810, 2811, 2820, 2821, 2824, 2816, 2827, 2814, 2830, 2834, - 2835, 2836, 2841, 2849, 2845, 2844, 2846, 2847, 2848, 2851, - 2858, 2859, 2855, 2862, 2861, 2865, 2872, 2869, 2863, 2867, - 2873, 2875, 2876, 2879, 2882, 2883, 2878, 2880, 2885, 2886, - 5585, 2897, 2888, 2901, 2902, 2894, 2904, 2892, 2905, 2910, - 2911, 2913, 2912, 2914, 5585, 2917, 5585, 2915, 2922, 2928, + 2738, 2742, 2743, 2744, 2745, 2750, 2752, 2756, 2755, 2757, + 2760, 2761, 2764, 2766, 2768, 2772, 2765, 2777, 2773, 2775, + 2783, 2782, 2784, 5674, 2791, 2788, 2793, 2792, 2794, 2796, + 2797, 2799, 2800, 2802, 2805, 2810, 2803, 2816, 2819, 2831, + 2809, 2832, 5674, 2813, 2834, 2817, 2835, 5674, 2837, 2828, + 2838, 2843, 2840, 2830, 2845, 2846, 2850, 2847, 2853, 2858, + 2862, 2863, 2857, 2865, 2855, 2869, 2877, 2874, 2881, 2883, + 2891, 2887, 2875, 2878, 2867, 2889, 2890, 2900, 2901, 2897, + 2904, 2899, 2903, 2906, 2907, 2910, 2911, 2913, 2915, 2916, + 2914, 2919, 2923, 2918, 2920, 2921, 2924, 5674, 2937, 2927, - 2934, 2929, 2931, 2935, 2943, 2939, 2936, 2945, 2946, 2944, - 2948, 2947, 2953, 2957, 2958, 2960, 2962, 2959, 2965, 2968, - 2970, 2971, 2973, 5585, 2974, 2975, 2976, 2980, 2981, 2983, - 2991, 2989, 2982, 2994, 2995, 3003, 5585, 3004, 3011, 3007, - 3009, 3016, 3012, 3020, 3021, 5585, 3019, 3022, 3029, 3024, - 3031, 5585, 3030, 5585, 3026, 3028, 3033, 3035, 3042, 3043, - 3032, 3048, 3057, 3050, 3049, 3052, 3053, 3054, 3064, 3059, - 3060, 3061, 5585, 3066, 3068, 3071, 3073, 3077, 3080, 3074, - 3084, 5585, 3086, 3090, 3087, 3091, 3092, 3094, 3095, 3097, - 3096, 3098, 3099, 3100, 3119, 3102, 3105, 3115, 3117, 3122, + 2934, 2941, 2943, 2946, 2925, 2944, 2948, 2950, 2952, 2954, + 2951, 5674, 2953, 5674, 2955, 2961, 2970, 2972, 2974, 2975, + 2976, 2978, 2981, 2982, 2983, 2984, 2985, 2987, 2990, 2991, + 2996, 2997, 2998, 3012, 2995, 3000, 3002, 3007, 3009, 3014, + 5674, 3016, 3017, 3018, 3022, 3023, 3024, 3027, 3031, 3030, + 3033, 3034, 3045, 5674, 3036, 3053, 3037, 3057, 3064, 3046, + 3065, 3060, 5674, 3049, 3061, 3068, 3063, 3070, 3077, 5674, + 3072, 5674, 3067, 3074, 3081, 3078, 3082, 3083, 3084, 3085, + 3091, 3094, 3103, 3092, 3100, 3101, 3102, 3104, 3113, 3106, + 3108, 3109, 5674, 3111, 3114, 3118, 3125, 3126, 3132, 3129, - 3127, 5585, 3124, 3128, 3136, 3132, 3133, 3138, 3139, 3134, - 3135, 3141, 3143, 3144, 3146, 3148, 3147, 3151, 3158, 3150, - 3153, 3164, 3171, 3152, 3166, 3172, 3169, 3174, 3177, 3178, - 3182, 3184, 3175, 3187, 3196, 3190, 3192, 3199, 3200, 3207, - 3202, 5585, 3209, 3194, 3214, 3206, 3215, 3217, 3219, 3227, - 3210, 3225, 3226, 3234, 3230, 5585, 3238, 3233, 3239, 3240, - 3242, 3249, 3235, 3236, 3248, 3253, 3254, 3258, 3255, 3260, - 3261, 3264, 3265, 5585, 5585, 3267, 3268, 3270, 5585, 3272, - 3271, 3283, 3274, 3276, 3284, 3287, 3286, 3278, 3288, 3290, - 3291, 5585, 3296, 3306, 3298, 3302, 3311, 3314, 3313, 3310, + 3116, 5674, 3133, 3136, 3123, 3140, 3141, 3144, 3145, 3146, + 3149, 3150, 3147, 3151, 3163, 3155, 3154, 3158, 3169, 3170, + 3175, 5674, 3176, 3156, 3183, 3179, 3180, 3182, 3185, 3186, + 3187, 3189, 3190, 3191, 3193, 3198, 3197, 3194, 3195, 3200, + 3201, 3214, 3211, 3203, 3215, 3219, 3218, 3221, 3225, 3226, + 3229, 3231, 3222, 3233, 3236, 3240, 3243, 3245, 3246, 3253, + 3248, 5674, 3255, 3252, 3260, 3256, 3259, 3258, 3265, 3269, + 3271, 3267, 3268, 3278, 3273, 5674, 3280, 3275, 3292, 3286, + 3276, 3301, 3296, 3282, 3277, 3300, 3303, 3306, 3304, 3308, + 3309, 3312, 3313, 5674, 5674, 3315, 3316, 3317, 5674, 3318, - 3317, 3303, 3319, 3320, 3321, 3322, 3325, 3327, 3335, 3330, - 3331, 3333, 5585, 3334, 3336, 3341, 5585, 3339, 3343, 3342, - 3352, 3345, 3359, 3349, 3367, 3357, 3362, 3364, 3368, 3370, - 3377, 3372, 3374, 3381, 3382, 3385, 3375, 3393, 3395, 3402, - 3403, 3404, 3373, 3400, 3406, 3413, 5585, 3408, 3410, 3409, - 3411, 3422, 3412, 3423, 3415, 5585, 3419, 3424, 3425, 5585, - 3426, 3432, 3438, 3440, 3428, 3441, 3444, 3442, 3445, 3446, - 5585, 3449, 5585, 3453, 3452, 3457, 5585, 3459, 3460, 3461, - 3463, 3465, 3468, 3470, 3477, 3467, 3469, 3479, 3480, 3481, - 3483, 3490, 3482, 5585, 3491, 3486, 3489, 3493, 3500, 3495, + 3319, 3328, 3321, 3323, 3331, 3325, 3334, 3335, 3336, 3338, + 3339, 5674, 3342, 3351, 3348, 3349, 3358, 3359, 3363, 3360, + 3357, 3350, 3354, 3367, 3369, 3371, 3374, 3375, 3383, 3378, + 3380, 3381, 5674, 3382, 3384, 3390, 5674, 3387, 3388, 3391, + 3399, 3394, 3407, 3404, 3410, 3396, 3412, 3413, 3414, 3416, + 3418, 3427, 3422, 3423, 3425, 3429, 3431, 5674, 3433, 3434, + 3439, 3441, 3444, 3452, 3453, 3454, 3449, 3455, 3456, 3463, + 5674, 3458, 3461, 3462, 3464, 3472, 3469, 3473, 3471, 5674, + 3476, 3477, 3479, 5674, 3478, 3485, 3493, 3495, 3480, 3503, + 3498, 3482, 3499, 3501, 5674, 3502, 5674, 3506, 3508, 3511, - 3501, 3505, 3502, 5585, 5585, 3512, 5585, 3513, 3508, 3514, - 5585, 3506, 3517, 3525, 3518, 3526, 3532, 3529, 3533, 5585, - 3536, 3520, 3537, 3539, 3523, 3542, 3545, 3546, 3547, 3549, - 3550, 5585, 3551, 3553, 3560, 3552, 3555, 3563, 3562, 3561, - 5585, 3572, 3574, 3568, 3578, 3580, 5585, 3579, 5585, 3582, - 3584, 3585, 3589, 3590, 5585, 3592, 3596, 3599, 3595, 3601, - 3602, 3603, 3607, 3605, 3611, 3619, 3615, 3614, 3616, 5585, - 3617, 3618, 3626, 3628, 3622, 3630, 3639, 3635, 3641, 3638, - 3645, 3647, 3648, 3651, 3653, 3655, 3656, 3642, 3666, 3661, - 3657, 5585, 3668, 3671, 3672, 5585, 3673, 3674, 3679, 3675, + 5674, 3513, 3514, 3516, 3518, 3515, 3522, 3523, 3530, 3519, + 3531, 3532, 3533, 3534, 3536, 3543, 3535, 5674, 3544, 3542, + 3546, 3547, 3553, 3551, 3554, 3559, 3557, 5674, 5674, 3566, + 5674, 3558, 3567, 3568, 5674, 3571, 3573, 3578, 3574, 3576, + 3579, 3589, 3582, 5674, 3585, 3580, 3593, 3595, 3596, 3597, + 3598, 3599, 3601, 3603, 3602, 5674, 3605, 3607, 3613, 3606, + 3614, 3620, 3626, 3615, 5674, 3628, 3630, 3622, 3636, 3637, + 5674, 3629, 5674, 3639, 3642, 3643, 3645, 3646, 5674, 3648, + 3649, 3653, 3654, 3656, 3658, 3659, 3662, 3666, 3668, 3675, + 3671, 3670, 3673, 5674, 3672, 3678, 3686, 3689, 3679, 3677, - 3681, 3682, 3683, 3685, 5585, 3684, 3689, 3687, 3690, 5585, - 5585, 3702, 5585, 3703, 3688, 3691, 3704, 3705, 3707, 3713, - 3710, 3715, 3717, 3720, 3718, 3725, 3732, 3733, 3734, 3737, - 3735, 3729, 5585, 5585, 3742, 3744, 3739, 3747, 3750, 3752, - 3753, 3760, 3756, 3757, 3763, 3767, 3774, 5585, 3765, 3755, - 3773, 5585, 3766, 3776, 3778, 3779, 3780, 3782, 3783, 3787, - 3784, 3789, 3790, 3792, 3793, 3796, 3797, 3798, 3803, 3807, - 5585, 3808, 3809, 3810, 3812, 3813, 3814, 3817, 3819, 3820, - 5585, 3824, 3823, 3827, 3832, 3826, 3834, 3842, 3849, 3851, - 3844, 3852, 3853, 3846, 3857, 3861, 5585, 3862, 3860, 3863, + 3693, 3695, 3696, 3699, 3702, 3704, 3705, 3708, 3703, 3710, + 3711, 3714, 3724, 3717, 3720, 5674, 3721, 3725, 3729, 5674, + 3727, 3728, 3736, 3738, 3731, 3739, 3742, 3741, 3744, 5674, + 3750, 3751, 3746, 3747, 3756, 3760, 5674, 5674, 3764, 5674, + 3765, 3753, 3767, 3754, 3743, 3775, 3774, 3777, 3779, 3780, + 3781, 3787, 3788, 3795, 3796, 3797, 3800, 3674, 3793, 5674, + 5674, 3805, 3806, 3802, 3809, 3814, 3798, 3812, 3822, 3818, + 3819, 3825, 3826, 3833, 5674, 3834, 3817, 3835, 5674, 3828, + 3836, 3829, 3840, 3842, 3843, 3844, 3846, 3850, 3848, 3851, + 3849, 3857, 3858, 3859, 3865, 3862, 3867, 5674, 3868, 3870, - 3864, 3869, 3871, 3872, 3874, 3875, 3878, 3879, 3881, 3885, - 3888, 3882, 3889, 3890, 3892, 5585, 3895, 3902, 3897, 3906, - 3899, 3903, 3907, 3912, 3915, 3908, 3918, 3919, 3921, 5585, - 3922, 3923, 3924, 3925, 3931, 3926, 3932, 3934, 5585, 3936, - 3937, 3941, 3940, 3943, 3950, 3944, 3956, 3952, 5585, 3955, - 3959, 3960, 3961, 3962, 3963, 3966, 5585, 3968, 3974, 3970, - 3982, 3977, 3987, 3978, 3980, 3988, 3990, 3991, 3993, 3994, - 3992, 3995, 4010, 4007, 5585, 3996, 5585, 4008, 4012, 4015, - 4018, 4014, 5585, 4021, 4022, 4024, 4020, 4030, 5585, 4028, - 4025, 4029, 4031, 5585, 4042, 4046, 4032, 4047, 4049, 4053, + 3871, 3872, 3873, 3874, 3879, 3882, 3881, 5674, 3883, 3885, + 3888, 3886, 3887, 3892, 3903, 3907, 3909, 3896, 3910, 3912, + 3915, 3917, 3914, 5674, 3920, 3918, 3921, 3922, 3929, 3931, + 3926, 3933, 3935, 3937, 3939, 3942, 3944, 3949, 3946, 3950, + 3951, 3952, 5674, 3956, 3958, 3955, 3963, 3964, 3966, 3967, + 3968, 3976, 3973, 3978, 3977, 3980, 5674, 3981, 3983, 3985, + 3986, 3988, 3989, 3994, 3995, 5674, 3998, 3991, 4005, 3999, + 4002, 4003, 4007, 4015, 4014, 5674, 4018, 4019, 4020, 4021, + 4022, 4023, 4026, 4027, 5674, 4032, 4033, 4036, 4045, 4029, + 4047, 4043, 4049, 4040, 4042, 4056, 4052, 4057, 4058, 4060, - 5585, 4056, 4057, 4058, 4067, 4068, 4065, 4066, 4069, 4071, - 4072, 4073, 4074, 5585, 4077, 4076, 4085, 4082, 4088, 4078, - 4089, 4091, 4094, 5585, 4095, 4096, 4099, 4101, 4102, 4103, - 4104, 4111, 4108, 4110, 5585, 4113, 4112, 4124, 4122, 4125, - 5585, 5585, 4120, 4131, 4133, 4121, 4137, 5585, 4135, 4146, - 4141, 4143, 4145, 5585, 5585, 4149, 5585, 4126, 5585, 4150, - 4151, 5585, 5585, 4152, 4155, 4156, 4158, 4160, 5585, 4166, - 5585, 4168, 4169, 4171, 4172, 4173, 5585, 4174, 4176, 4180, - 5585, 4175, 4183, 4182, 4186, 5585, 4190, 4185, 4191, 5585, - 4195, 4198, 4202, 4203, 4210, 4192, 4199, 4205, 4211, 4215, + 4062, 4070, 4074, 4071, 5674, 4063, 5674, 4072, 4077, 4079, + 4084, 4080, 5674, 4082, 4087, 4089, 4086, 4090, 5674, 4092, + 4091, 4094, 4096, 5674, 4110, 4106, 4095, 4105, 4119, 4120, + 5674, 4123, 4124, 4125, 4132, 4134, 4136, 4129, 4137, 4133, + 4139, 4097, 4140, 5674, 4142, 4144, 4149, 4150, 4151, 4152, + 4154, 4157, 4161, 5674, 4159, 4162, 4163, 4165, 4166, 4167, + 4168, 4175, 4171, 4176, 5674, 4180, 4181, 4184, 4185, 4112, + 5674, 5674, 4188, 4189, 4192, 4191, 4197, 5674, 4199, 4206, + 4201, 4205, 4207, 5674, 5674, 4209, 5674, 4210, 5674, 4211, + 4214, 5674, 5674, 4215, 4212, 4218, 4219, 4222, 5674, 4227, - 4218, 4220, 4222, 4223, 4224, 4226, 4228, 4231, 4232, 4230, - 4233, 4237, 4239, 4241, 4234, 4026, 4245, 4247, 4248, 4251, - 4252, 4255, 4256, 4258, 4259, 4260, 4261, 4262, 4263, 4266, - 4268, 4274, 5585, 4269, 4270, 4277, 4278, 4280, 4286, 4288, - 4296, 4298, 4301, 5585, 4303, 5585, 4305, 4290, 3825, 4299, - 5585, 4307, 4310, 4309, 4312, 4311, 4313, 4316, 4314, 5585, - 4322, 4317, 4326, 4324, 5585, 4329, 4337, 4325, 4330, 4340, - 4341, 4342, 4344, 4345, 4346, 4350, 4352, 4359, 4354, 4355, - 4357, 4358, 4364, 4366, 4368, 4367, 4375, 4377, 4381, 5585, - 4371, 5585, 4378, 4382, 4383, 4385, 4388, 4389, 4391, 5585, + 5674, 4235, 4231, 4233, 4234, 4236, 5674, 4239, 4240, 4243, + 5674, 4237, 4250, 4245, 4247, 5674, 4254, 4248, 4251, 5674, + 4259, 4265, 4261, 4268, 4255, 4270, 4271, 4272, 4274, 4276, + 4278, 4281, 4283, 4286, 4287, 4288, 4289, 4294, 4291, 4296, + 4297, 4299, 4301, 4302, 4307, 4310, 4311, 4304, 4312, 4313, + 4314, 4318, 4320, 4324, 4327, 4328, 4329, 4330, 4332, 4333, + 4335, 4338, 4342, 4331, 4341, 5674, 4336, 4343, 4347, 4358, + 4348, 4359, 4363, 4353, 4367, 4371, 5674, 4373, 5674, 4375, + 4360, 4369, 4377, 5674, 4379, 4382, 4381, 4384, 4383, 4385, + 4388, 4386, 5674, 4390, 4391, 4393, 4395, 5674, 4398, 4409, - 5585, 4392, 4394, 4399, 4396, 4400, 4403, 4404, 5585, 4406, - 4413, 4415, 4407, 5585, 4416, 4419, 4423, 5585, 4425, 4427, - 4424, 4429, 4430, 4432, 4434, 5585, 5585, 5585, 5585, 4440, - 4431, 4438, 4442, 4445, 4447, 4449, 4446, 5585, 5585, 5585, - 4452, 4450, 4458, 4459, 4460, 4462, 4465, 5585, 4466, 4469, - 4470, 4468, 4477, 4485, 4480, 4486, 4472, 4478, 4488, 4489, - 4492, 4495, 4497, 4499, 4501, 5585, 5585, 4503, 4505, 4506, - 4513, 4514, 4515, 4517, 4518, 4521, 4523, 4524, 4525, 4529, - 4528, 5585, 4530, 4538, 5585, 4531, 5585, 4537, 4544, 4527, - 4546, 4547, 4548, 4550, 4552, 5585, 5585, 4536, 4553, 4558, + 4397, 4401, 4410, 4411, 4412, 4414, 4418, 4416, 4421, 4423, + 4431, 4424, 4428, 4427, 4433, 4429, 4436, 4439, 4445, 4441, + 4448, 4452, 5674, 4453, 5674, 4454, 4455, 4457, 4458, 4459, + 4460, 4462, 5674, 5674, 4465, 4467, 4476, 4468, 4461, 4487, + 4473, 5674, 4482, 4484, 4490, 4491, 5674, 4492, 4493, 4495, + 5674, 4496, 4499, 4500, 4502, 4466, 4503, 4506, 5674, 5674, + 5674, 5674, 4509, 4507, 4517, 4511, 4514, 4521, 4522, 4526, + 4518, 5674, 4535, 5674, 5674, 4523, 4532, 4536, 4538, 4539, + 4540, 4542, 4541, 5674, 4545, 4548, 4552, 4546, 4555, 4563, + 4558, 4564, 4556, 4566, 4573, 4570, 4571, 4568, 4576, 4578, - 4563, 4560, 4565, 4554, 4567, 4564, 5585, 4570, 5585, 4568, - 4571, 4581, 4572, 4582, 4584, 4592, 4590, 4587, 4591, 5585, - 4593, 4594, 5585, 4599, 4598, 4600, 5585, 4604, 4609, 4611, - 5585, 4614, 5585, 4617, 5585, 4601, 4624, 5585, 4606, 4619, - 4628, 4630, 4622, 4631, 5585, 4632, 4634, 4635, 4638, 4639, - 4641, 4642, 4643, 4645, 4652, 4648, 4649, 5585, 5585, 4657, - 4658, 4660, 4662, 4663, 4670, 4665, 4667, 4673, 5585, 5585, - 4674, 5585, 4668, 4675, 5585, 4666, 4683, 4677, 4684, 4685, - 4687, 4688, 4693, 4696, 4697, 4710, 4698, 4700, 4711, 4713, - 4718, 4720, 4706, 4723, 4716, 4701, 4724, 4725, 4726, 5585, + 4580, 5674, 5674, 4582, 4586, 4587, 4594, 4591, 4592, 4604, + 4599, 4600, 4601, 4602, 4606, 4607, 4608, 5674, 4611, 4615, + 5674, 4609, 5674, 4619, 4622, 4613, 4623, 4625, 4626, 4628, + 4630, 5674, 5674, 4632, 4633, 4637, 4641, 4638, 4643, 4644, + 4646, 4642, 5674, 4647, 5674, 4648, 4650, 4664, 4649, 4666, + 4671, 4673, 4670, 4672, 4676, 5674, 4675, 4677, 5674, 4678, + 4679, 4683, 5674, 4685, 4688, 4692, 5674, 4695, 5674, 4697, + 5674, 4689, 4705, 5674, 4700, 4701, 5674, 4707, 4711, 4655, + 4703, 5674, 4708, 5674, 4712, 4714, 4717, 4722, 4715, 4724, + 4725, 4719, 4727, 4734, 4736, 4729, 5674, 5674, 4745, 4731, - 4730, 4731, 4732, 5585, 4738, 4735, 4740, 4743, 5585, 4752, - 4744, 4747, 4749, 5585, 4741, 4755, 4757, 4760, 4762, 4771, - 4763, 4764, 5585, 5585, 5585, 5585, 4767, 4768, 5585, 4772, - 4775, 5585, 5585, 4774, 4779, 4778, 5585, 4780, 5585, 4782, - 5585, 4784, 4785, 4793, 4791, 5585, 4796, 4804, 5585, 4807, - 4810, 4812, 4813, 4795, 4783, 4814, 5585, 4823, 4816, 4820, - 4827, 4818, 4824, 4828, 4829, 4837, 4830, 4835, 5585, 4832, - 4838, 4839, 5585, 4841, 5585, 4843, 4844, 4842, 4849, 4848, - 4850, 4852, 4861, 4854, 4863, 4865, 5585, 4868, 4871, 5585, - 4872, 5585, 4874, 5585, 4875, 4876, 4878, 4877, 5585, 4886, + 4740, 4742, 4743, 4752, 4747, 4751, 4757, 5674, 5674, 4748, + 5674, 4750, 4761, 5674, 4759, 4763, 4765, 4768, 4767, 4769, + 4774, 4771, 4775, 4778, 4793, 4776, 4780, 4790, 4796, 4798, + 4800, 4802, 4803, 4804, 4781, 4805, 4806, 4809, 5674, 4811, + 4812, 4813, 5674, 4817, 4820, 4822, 4823, 5674, 4833, 4825, + 4830, 4835, 5674, 4819, 4841, 4838, 4836, 4843, 4852, 4847, + 4848, 5674, 5674, 5674, 5674, 4850, 4853, 5674, 4854, 4855, + 5674, 5674, 4856, 4859, 4862, 4870, 5674, 4861, 5674, 4865, + 5674, 4869, 4872, 4875, 4878, 5674, 4879, 4888, 5674, 4891, + 4894, 4896, 4897, 4880, 4866, 4898, 5674, 4905, 4902, 4904, - 4879, 4881, 4883, 5585, 4887, 4889, 5585, 4890, 4896, 4898, - 4901, 4905, 4907, 4908, 4909, 4916, 4911, 4912, 4913, 4915, - 4919, 4920, 5585, 5585, 5585, 4923, 4927, 4934, 4932, 4936, - 4943, 4938, 5585, 4940, 4941, 4942, 4950, 4948, 4952, 5585, - 4954, 4949, 4955, 5585, 4958, 4960, 4962, 4963, 4969, 4971, - 4973, 4976, 4978, 5585, 4980, 5585, 5585, 4981, 5585, 4982, - 4984, 4985, 4986, 5585, 4989, 4991, 4990, 4992, 4994, 4995, - 4997, 5585, 5585, 4999, 5585, 5009, 5003, 5018, 5011, 5013, - 5016, 5019, 5585, 5020, 5022, 5025, 5026, 5027, 5585, 5028, - 5029, 5031, 5032, 5035, 5034, 5037, 5039, 5041, 5585, 5585, + 4911, 4883, 4908, 4912, 4913, 4920, 4915, 4919, 5674, 4916, + 4921, 4922, 5674, 4924, 5674, 4925, 4926, 4928, 4934, 4930, + 4933, 4937, 4944, 4927, 4948, 4941, 5674, 4951, 4955, 5674, + 4956, 5674, 4958, 5674, 4959, 4962, 4963, 4961, 5674, 4965, + 4967, 4968, 4969, 5674, 4970, 4972, 5674, 4976, 4973, 4983, + 4985, 4974, 4990, 4992, 4993, 4980, 5004, 4996, 4999, 4997, + 5006, 5007, 5012, 5674, 5674, 5674, 5008, 5001, 5022, 5019, + 5023, 5030, 5014, 5674, 5028, 5029, 5025, 5037, 5035, 5039, + 5674, 5041, 5027, 5036, 5674, 5043, 5048, 5049, 5050, 5051, + 5058, 5060, 5062, 5063, 5674, 5066, 5674, 5674, 5055, 5674, - 5043, 5044, 5585, 5585, 5059, 5062, 5045, 5585, 5585, 5585, - 5065, 5585, 5067, 5071, 5075, 5079, 5070, 5585, 5081, 5078, - 5083, 5585, 5082, 5085, 5585, 5585, 5086, 5088, 5047, 5089, - 5585, 5090, 5091, 5094, 5099, 5102, 5103, 5105, 5107, 5112, - 5115, 5113, 5114, 5120, 5117, 5121, 5123, 5125, 5127, 5585, - 5585, 5131, 5585, 5585, 5134, 5136, 5140, 5144, 5146, 5148, - 5150, 5585, 5128, 5152, 5153, 5585, 5155, 5156, 5157, 5160, - 5158, 5161, 5163, 5585, 5585, 5164, 5165, 5166, 5174, 5167, - 5585, 5177, 5184, 5169, 5181, 5179, 5187, 5188, 5585, 5191, - 5585, 5585, 5585, 5585, 5585, 5585, 5585, 5585, 5190, 5585, + 5067, 5069, 5070, 5071, 5674, 5076, 5073, 5077, 5079, 5081, + 5082, 5078, 5674, 5674, 5085, 5674, 5094, 5090, 5086, 5102, + 5098, 5099, 5104, 5106, 5674, 5105, 5108, 5109, 5112, 5113, + 5674, 5115, 5116, 5117, 5118, 5121, 5120, 5126, 5127, 5129, + 5674, 5674, 5122, 5132, 5674, 5674, 5131, 5141, 5146, 5674, + 5674, 5674, 5152, 5674, 5154, 5158, 5162, 5166, 5157, 5674, + 5168, 5147, 5169, 5674, 5170, 5172, 5674, 5674, 5149, 5173, + 5177, 5176, 5178, 5674, 5179, 5182, 5186, 5189, 5195, 5184, + 5196, 5198, 5206, 5208, 5190, 5203, 5192, 5204, 5211, 5212, + 5220, 5217, 5674, 5674, 5224, 5674, 5674, 5226, 5228, 5230, - 5195, 5585, 5189, 5199, 5196, 5197, 5201, 5585, 5202, 5203, - 5211, 5207, 5213, 5218, 5210, 5220, 5222, 5221, 5224, 5226, - 5227, 5230, 5585, 5229, 5231, 5233, 5235, 5246, 5252, 5255, - 5257, 5242, 5238, 5259, 5260, 5263, 5247, 5264, 5273, 5266, - 5269, 5271, 5274, 5276, 5585, 5277, 5585, 5278, 5585, 5585, - 5282, 5283, 5286, 5285, 5297, 5301, 5288, 5287, 5290, 5299, - 5585, 5303, 5585, 5305, 5306, 5585, 5307, 5308, 5311, 5312, - 5315, 5314, 5316, 5317, 5585, 5318, 5320, 5332, 5324, 5340, - 5337, 5341, 5342, 5343, 5326, 5350, 5349, 5352, 5585, 5353, - 5355, 5356, 5358, 5359, 5366, 5361, 5362, 5364, 5585, 5368, + 5233, 5235, 5237, 5239, 5674, 5240, 5242, 5243, 5674, 5245, + 5247, 5244, 5248, 5250, 5251, 5253, 5255, 5674, 5674, 5256, + 5257, 5258, 5265, 5267, 5674, 5269, 5276, 5273, 5275, 5271, + 5277, 5278, 5674, 5281, 5674, 5674, 5674, 5674, 5674, 5674, + 5674, 5674, 5279, 5674, 5289, 5292, 5674, 5283, 5293, 5297, + 5298, 5286, 5674, 5299, 5303, 5304, 5305, 5308, 5310, 5312, + 5313, 5315, 5319, 5316, 5321, 5317, 5320, 5674, 5674, 5328, + 5324, 5327, 5330, 5346, 5347, 5350, 5352, 5334, 5337, 5355, + 5354, 5356, 5343, 5360, 5369, 5362, 5364, 5366, 5367, 5371, + 5674, 5372, 5674, 5373, 5674, 5674, 5378, 5379, 5374, 5381, - 5370, 5371, 5369, 5372, 5373, 5383, 5385, 5381, 5585, 5387, - 5392, 5389, 5395, 5397, 5399, 5400, 5401, 5403, 5405, 5234, - 5412, 5409, 5414, 5406, 5417, 5415, 5585, 5419, 5423, 5585, - 5424, 5426, 5427, 5428, 5432, 5585, 5436, 5430, 5437, 5438, - 5441, 5443, 5585, 5445, 5452, 5448, 5585, 5453, 5585, 5585, - 5454, 5457, 5460, 5462, 5464, 5585, 5585, 5585, 5493, 5500, - 5507, 5514, 5521, 88, 5528, 5535, 5542, 5549, 5556, 5563, - 5570, 5577 + 5389, 5394, 5385, 5390, 5392, 5396, 5674, 5393, 5674, 5398, + 5397, 5674, 5402, 5404, 5405, 5406, 5407, 5408, 5410, 5416, + 5674, 5414, 5417, 5426, 5418, 5434, 5429, 5433, 5435, 5437, + 5431, 5445, 5441, 5444, 5674, 5447, 5448, 5214, 5449, 5452, + 5459, 5454, 5456, 5457, 5674, 5461, 5463, 5465, 5455, 5462, + 5464, 5478, 5480, 5476, 5674, 5466, 5482, 5484, 5486, 5490, + 5488, 5494, 5495, 5497, 5499, 5329, 5506, 5500, 5502, 5498, + 5508, 5510, 5674, 5512, 5515, 5674, 5516, 5518, 5519, 5520, + 5524, 5674, 5527, 5522, 5528, 5530, 5533, 5535, 5674, 5537, + 5544, 5545, 5674, 5546, 5674, 5674, 5548, 5540, 5549, 5555, + + 5557, 5674, 5674, 5674, 5582, 5589, 5596, 5603, 5610, 88, + 5617, 5624, 5631, 5638, 5645, 5652, 5659, 5666 } ; -static yyconst flex_int16_t yy_def[2873] = +static yyconst flex_int16_t yy_def[2919] = { 0, - 2858, 1, 2859, 2859, 2860, 2860, 2861, 2861, 2862, 2862, - 2863, 2863, 2858, 2864, 2858, 2858, 2858, 2858, 2865, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2866, 2858, 2858, 2858, 2866, 2867, 2858, 2858, - 2858, 2867, 2868, 2858, 2858, 2858, 2858, 2868, 2869, 2858, - 2858, 2858, 2869, 2870, 2858, 2871, 2858, 2870, 2870, 2864, - 2864, 2858, 2872, 2865, 2872, 2865, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2904, 1, 2905, 2905, 2906, 2906, 2907, 2907, 2908, 2908, + 2909, 2909, 2904, 2910, 2904, 2904, 2904, 2904, 2911, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2912, 2904, 2904, 2904, 2912, 2913, 2904, 2904, + 2904, 2913, 2914, 2904, 2904, 2904, 2904, 2914, 2915, 2904, + 2904, 2904, 2915, 2916, 2904, 2917, 2904, 2916, 2916, 2910, + 2910, 2904, 2918, 2911, 2918, 2911, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2866, - 2866, 2867, 2867, 2868, 2868, 2858, 2869, 2869, 2870, 2870, - 2871, 2871, 2870, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2912, + 2912, 2913, 2913, 2914, 2914, 2904, 2915, 2915, 2916, 2916, + 2917, 2917, 2916, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2870, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2916, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2870, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2916, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2870, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2916, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2870, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2858, 2858, 2864, 2858, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2916, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2904, 2904, 2910, 2904, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2870, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2858, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2916, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2870, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2916, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2858, 2864, - 2864, 2864, 2864, 2858, 2864, 2858, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2858, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2858, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2904, 2910, 2910, 2910, 2904, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2858, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2904, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2904, 2910, 2910, 2910, - 2864, 2864, 2864, 2858, 2858, 2864, 2858, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2904, 2910, + 2904, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2858, - 2858, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2904, 2910, 2904, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2858, 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2864, 2864, 2858, 2858, 2864, 2858, 2864, 2858, 2864, - 2864, 2858, 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2904, 2910, 2904, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2904, 2904, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2910, 2904, 2904, 2910, 2904, 2910, 2904, 2910, + 2910, 2904, 2904, 2910, 2910, 2910, 2910, 2910, 2904, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2858, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, + 2904, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2904, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2910, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2858, 2858, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2858, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2858, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2858, 2858, 2864, 2864, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2904, + 2904, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2904, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2858, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2858, 2864, 2858, 2864, 2858, 2864, 2864, 2858, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2858, - 2864, 2858, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, + 2910, 2904, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2904, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2904, 2910, 2904, 2910, + 2904, 2910, 2910, 2904, 2910, 2910, 2904, 2910, 2910, 2910, + 2910, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2904, 2910, 2910, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2858, 2858, 2858, 2864, 2864, 2858, 2864, - 2864, 2858, 2858, 2864, 2864, 2864, 2858, 2864, 2858, 2864, - 2858, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2858, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2858, - 2864, 2858, 2864, 2858, 2864, 2864, 2864, 2864, 2858, 2864, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2904, 2910, + 2904, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2904, 2904, 2904, 2904, 2910, 2910, 2904, 2910, 2910, + 2904, 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2904, 2910, + 2904, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, - 2864, 2864, 2864, 2858, 2864, 2864, 2858, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2858, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2864, 2858, 2858, 2864, 2858, 2864, - 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2858, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2858, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2904, + 2910, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2904, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2904, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2904, 2904, 2910, 2904, - 2864, 2864, 2858, 2858, 2864, 2864, 2864, 2858, 2858, 2858, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2858, 2864, 2864, 2858, 2858, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, - 2858, 2864, 2858, 2858, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2858, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2858, 2858, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2864, 2858, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2904, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2904, 2910, 2910, 2904, 2904, 2910, 2910, 2910, 2904, + 2904, 2904, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2904, + 2910, 2910, 2910, 2904, 2910, 2910, 2904, 2904, 2910, 2910, + 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2904, 2910, 2904, 2904, 2910, 2910, 2910, - 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2858, 2864, 2858, 2858, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2858, 2864, 2858, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2904, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2910, 2904, 2910, 2910, 2904, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2904, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2904, 2910, 2904, 2904, 2910, 2910, 2910, 2910, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, 2864, - 2864, 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2858, - 2864, 2864, 2864, 2864, 2864, 2858, 2864, 2864, 2864, 2864, - 2864, 2864, 2858, 2864, 2864, 2864, 2858, 2864, 2858, 2858, - 2864, 2864, 2864, 2864, 2864, 2858, 2858, 0, 2858, 2858, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, - 2858, 2858 + 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, 2904, 2910, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2904, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, 2910, + 2910, 2910, 2904, 2910, 2910, 2904, 2910, 2910, 2910, 2910, + 2910, 2904, 2910, 2910, 2910, 2910, 2910, 2910, 2904, 2910, + 2910, 2910, 2904, 2910, 2904, 2904, 2910, 2910, 2910, 2910, + + 2910, 2904, 2904, 0, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904 } ; -static yyconst flex_uint16_t yy_nxt[5626] = +static yyconst flex_uint16_t yy_nxt[5715] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 14, 18, 20, 21, 22, 23, 24, 25, 26, @@ -1402,7 +1418,7 @@ static yyconst flex_uint16_t yy_nxt[5626] = 160, 71, 71, 172, 71, 71, 71, 71, 165, 71, 71, 182, 164, 161, 166, 71, 167, 168, 169, 174, 71, 71, 173, 170, 175, 179, 176, 177, 180, 71, - 71, 248, 188, 181, 178, 183, 71, 71, 71, 184, + 71, 249, 188, 181, 178, 183, 71, 71, 71, 184, 71, 71, 185, 71, 193, 191, 71, 199, 194, 196, 71, 198, 71, 200, 197, 186, 187, 189, 71, 202, @@ -1410,590 +1426,600 @@ static yyconst flex_uint16_t yy_nxt[5626] = 71, 203, 71, 208, 71, 211, 71, 209, 71, 205, 204, 71, 213, 71, 224, 207, 222, 216, 71, 210, 212, 214, 71, 71, 221, 217, 218, 215, 71, 71, - 223, 71, 71, 71, 225, 71, 71, 219, 231, 71, - 235, 220, 71, 71, 71, 227, 226, 232, 148, 230, - 228, 234, 71, 229, 236, 140, 140, 238, 239, 233, - 142, 237, 144, 142, 144, 144, 71, 144, 147, 147, - 149, 241, 149, 149, 75, 149, 75, 75, 150, 75, + 223, 225, 71, 71, 226, 71, 71, 219, 71, 71, + 232, 220, 71, 71, 236, 228, 227, 235, 71, 233, + 71, 229, 231, 239, 230, 237, 140, 140, 148, 142, + 238, 234, 142, 144, 240, 144, 144, 71, 144, 147, + 147, 149, 242, 149, 149, 75, 149, 75, 75, 150, - 71, 240, 242, 71, 71, 71, 152, 71, 71, 71, - 71, 249, 71, 246, 71, 252, 71, 243, 244, 245, - 247, 255, 71, 254, 251, 71, 250, 71, 256, 260, - 258, 71, 253, 71, 259, 71, 71, 261, 292, 71, - 264, 257, 262, 71, 269, 265, 71, 71, 71, 71, - 266, 274, 271, 272, 275, 71, 267, 268, 71, 263, - 71, 273, 277, 71, 71, 270, 71, 71, 278, 279, - 71, 71, 71, 71, 293, 284, 285, 290, 281, 280, - 71, 282, 71, 276, 295, 283, 71, 286, 71, 294, - 71, 297, 287, 291, 299, 300, 296, 71, 71, 303, + 75, 71, 241, 243, 71, 71, 71, 152, 71, 71, + 71, 71, 250, 71, 247, 71, 253, 71, 244, 245, + 246, 248, 256, 71, 255, 252, 71, 251, 71, 257, + 261, 259, 71, 254, 71, 260, 71, 71, 262, 293, + 71, 265, 258, 263, 71, 270, 266, 71, 71, 71, + 71, 267, 275, 272, 273, 276, 71, 268, 269, 71, + 264, 71, 274, 278, 71, 71, 271, 71, 71, 279, + 280, 71, 71, 71, 71, 294, 285, 286, 291, 282, + 281, 71, 283, 71, 277, 296, 284, 71, 287, 71, + 295, 71, 298, 288, 292, 300, 301, 297, 71, 71, - 71, 71, 298, 71, 288, 71, 289, 305, 304, 306, - 301, 71, 71, 71, 71, 71, 71, 71, 307, 302, - 309, 71, 71, 311, 71, 308, 71, 71, 71, 71, - 313, 315, 71, 71, 71, 71, 310, 314, 316, 320, - 324, 71, 317, 312, 318, 322, 71, 71, 327, 71, - 146, 321, 319, 71, 71, 329, 71, 323, 331, 71, - 71, 332, 334, 330, 71, 325, 326, 71, 71, 328, - 71, 339, 335, 71, 337, 338, 71, 71, 333, 341, - 71, 71, 342, 71, 336, 71, 150, 71, 345, 71, - 71, 71, 71, 71, 352, 340, 350, 348, 346, 343, + 304, 71, 71, 299, 71, 289, 71, 290, 306, 305, + 307, 302, 71, 71, 71, 71, 71, 71, 71, 308, + 303, 310, 71, 71, 312, 71, 309, 71, 71, 71, + 71, 314, 316, 71, 71, 71, 71, 311, 315, 317, + 321, 325, 71, 318, 313, 319, 323, 71, 71, 328, + 71, 71, 322, 320, 71, 71, 330, 71, 324, 331, + 71, 332, 333, 334, 71, 336, 326, 327, 71, 71, + 329, 71, 71, 71, 339, 341, 337, 340, 71, 335, + 71, 71, 343, 71, 71, 344, 338, 71, 71, 347, + 71, 71, 150, 71, 71, 71, 367, 71, 350, 342, - 71, 353, 71, 71, 344, 356, 347, 71, 354, 71, - 349, 71, 71, 71, 355, 351, 71, 357, 362, 71, - 71, 71, 363, 364, 71, 366, 358, 361, 71, 71, - 360, 359, 71, 367, 365, 71, 71, 71, 369, 368, - 71, 370, 71, 71, 71, 371, 373, 376, 374, 71, - 372, 375, 378, 71, 71, 380, 379, 71, 71, 71, - 71, 71, 384, 377, 381, 71, 383, 385, 71, 71, - 71, 71, 390, 71, 71, 71, 71, 391, 71, 386, - 393, 382, 71, 389, 71, 395, 387, 71, 71, 399, - 388, 397, 71, 392, 71, 71, 394, 400, 71, 398, + 352, 354, 345, 346, 348, 71, 349, 71, 355, 358, + 356, 351, 71, 71, 71, 71, 353, 357, 71, 71, + 71, 71, 364, 71, 365, 71, 366, 71, 359, 363, + 71, 71, 360, 146, 362, 71, 368, 361, 369, 71, + 371, 71, 374, 370, 71, 372, 71, 373, 71, 375, + 71, 378, 376, 71, 380, 382, 71, 71, 381, 377, + 71, 71, 71, 71, 385, 71, 383, 379, 387, 71, + 386, 71, 71, 71, 71, 71, 392, 71, 71, 71, + 393, 71, 71, 384, 145, 395, 391, 71, 397, 388, + 389, 71, 390, 71, 399, 401, 394, 396, 71, 71, - 396, 71, 71, 71, 401, 71, 71, 408, 410, 411, - 71, 412, 145, 414, 402, 415, 71, 403, 71, 409, - 417, 418, 404, 405, 406, 407, 71, 413, 416, 419, - 71, 71, 71, 71, 420, 71, 426, 71, 71, 428, - 71, 71, 424, 421, 425, 427, 422, 423, 71, 71, - 71, 71, 71, 430, 435, 71, 429, 71, 438, 71, - 71, 431, 437, 71, 71, 71, 450, 434, 439, 432, - 440, 433, 71, 444, 71, 436, 441, 442, 71, 443, - 71, 445, 71, 71, 143, 71, 452, 451, 71, 449, - 71, 71, 453, 71, 446, 516, 454, 447, 71, 448, + 398, 71, 402, 71, 71, 400, 71, 71, 71, 416, + 403, 71, 410, 412, 71, 71, 426, 413, 71, 414, + 404, 71, 411, 405, 421, 71, 71, 418, 406, 407, + 408, 409, 71, 425, 417, 415, 71, 71, 419, 420, + 422, 427, 71, 423, 428, 71, 424, 429, 71, 430, + 71, 71, 71, 71, 71, 71, 432, 437, 71, 71, + 71, 71, 440, 71, 433, 431, 439, 143, 71, 451, + 436, 71, 434, 446, 435, 71, 441, 453, 438, 71, + 442, 71, 444, 71, 445, 71, 443, 71, 447, 71, + 452, 71, 454, 71, 71, 71, 71, 455, 71, 71, - 464, 71, 71, 71, 455, 71, 456, 466, 457, 463, - 462, 71, 478, 465, 467, 469, 71, 477, 150, 141, - 71, 458, 481, 71, 459, 71, 460, 71, 461, 71, - 468, 71, 479, 470, 471, 484, 485, 480, 71, 482, - 71, 71, 483, 472, 486, 473, 474, 475, 487, 71, - 476, 491, 71, 71, 71, 488, 71, 71, 71, 71, - 489, 492, 71, 490, 493, 71, 500, 497, 71, 499, - 71, 496, 494, 495, 498, 71, 504, 71, 501, 71, - 502, 71, 71, 71, 503, 71, 507, 508, 509, 71, - 71, 71, 71, 514, 71, 506, 71, 519, 517, 71, + 71, 448, 466, 456, 449, 71, 450, 457, 467, 481, + 468, 465, 469, 472, 71, 458, 71, 459, 589, 460, + 480, 71, 482, 71, 470, 150, 71, 483, 71, 484, + 71, 71, 461, 486, 71, 462, 490, 463, 71, 464, + 471, 71, 71, 473, 474, 487, 485, 488, 71, 71, + 489, 71, 491, 475, 492, 476, 477, 478, 494, 71, + 479, 71, 493, 71, 71, 71, 71, 502, 495, 71, + 500, 497, 496, 71, 71, 503, 499, 71, 501, 498, + 71, 505, 507, 71, 71, 71, 504, 71, 71, 510, + 71, 506, 511, 512, 71, 71, 71, 71, 517, 509, - 71, 511, 505, 510, 71, 512, 513, 71, 71, 71, - 71, 515, 71, 518, 529, 521, 71, 71, 520, 525, - 522, 528, 524, 71, 71, 523, 531, 530, 532, 71, - 526, 71, 527, 71, 71, 534, 71, 533, 536, 71, - 535, 71, 538, 71, 537, 71, 71, 542, 540, 543, - 71, 71, 539, 71, 544, 71, 71, 71, 541, 71, - 549, 547, 548, 71, 71, 71, 545, 71, 550, 71, - 71, 71, 555, 71, 546, 551, 559, 556, 71, 554, - 71, 558, 557, 553, 552, 71, 561, 71, 562, 71, - 71, 71, 71, 71, 71, 71, 572, 71, 564, 560, + 71, 514, 71, 522, 519, 508, 515, 513, 516, 71, + 71, 71, 524, 520, 71, 71, 518, 71, 71, 71, + 141, 71, 71, 532, 528, 71, 533, 525, 521, 523, + 531, 527, 526, 535, 534, 529, 71, 530, 71, 71, + 536, 71, 537, 539, 71, 538, 71, 541, 71, 71, + 71, 71, 545, 546, 543, 71, 71, 71, 71, 71, + 547, 542, 71, 544, 540, 71, 71, 550, 71, 552, + 548, 551, 71, 71, 71, 71, 556, 553, 549, 71, + 71, 71, 558, 71, 554, 555, 557, 559, 71, 561, + 71, 71, 560, 71, 563, 562, 71, 564, 71, 565, - 565, 71, 71, 574, 71, 567, 575, 71, 71, 71, - 563, 571, 566, 568, 570, 569, 573, 71, 576, 71, - 579, 71, 584, 582, 581, 577, 71, 71, 578, 71, - 71, 71, 585, 71, 71, 588, 71, 71, 71, 580, - 71, 589, 591, 71, 71, 71, 71, 583, 604, 590, - 71, 71, 586, 71, 587, 608, 592, 593, 71, 594, - 603, 150, 71, 602, 595, 605, 596, 606, 609, 71, - 71, 71, 597, 607, 598, 610, 71, 599, 600, 71, - 613, 71, 618, 71, 601, 612, 71, 611, 71, 71, - 71, 614, 616, 71, 619, 615, 71, 621, 71, 71, + 568, 567, 566, 71, 71, 71, 71, 71, 575, 71, + 71, 577, 71, 71, 71, 578, 570, 71, 576, 71, + 71, 574, 584, 569, 571, 573, 572, 579, 580, 582, + 585, 581, 583, 71, 71, 71, 71, 71, 71, 588, + 71, 71, 591, 71, 71, 592, 71, 587, 594, 71, + 71, 71, 71, 71, 586, 608, 593, 71, 590, 71, + 595, 71, 597, 611, 71, 596, 71, 598, 607, 615, + 606, 609, 599, 610, 600, 71, 614, 71, 71, 71, + 601, 71, 602, 612, 618, 603, 604, 613, 617, 71, + 71, 616, 605, 620, 71, 619, 71, 621, 71, 624, - 71, 71, 623, 622, 617, 71, 627, 71, 620, 71, - 71, 71, 71, 624, 628, 150, 631, 634, 625, 633, - 632, 71, 626, 71, 630, 71, 629, 636, 71, 71, - 71, 71, 71, 635, 643, 641, 71, 646, 71, 645, - 71, 71, 638, 71, 637, 639, 644, 640, 648, 642, - 71, 71, 71, 647, 71, 650, 71, 71, 71, 71, - 654, 71, 649, 653, 659, 651, 71, 71, 655, 660, - 71, 652, 662, 71, 71, 656, 664, 658, 657, 661, - 663, 71, 71, 665, 71, 666, 71, 667, 668, 71, - 71, 71, 669, 71, 71, 670, 71, 675, 71, 673, + 71, 626, 71, 71, 622, 71, 71, 71, 71, 623, + 71, 71, 71, 632, 71, 628, 71, 627, 71, 633, + 629, 625, 636, 637, 150, 630, 639, 635, 638, 631, + 634, 71, 71, 641, 71, 71, 71, 71, 71, 71, + 71, 651, 646, 640, 71, 71, 648, 71, 649, 643, + 71, 644, 647, 642, 653, 645, 650, 71, 71, 656, + 71, 71, 652, 71, 655, 71, 71, 71, 659, 71, + 654, 658, 667, 71, 664, 71, 660, 71, 657, 665, + 71, 668, 71, 661, 669, 663, 662, 71, 666, 672, + 71, 670, 71, 671, 71, 71, 71, 71, 673, 674, - 71, 71, 672, 674, 71, 677, 678, 71, 679, 71, - 671, 71, 71, 71, 681, 683, 71, 71, 684, 676, - 71, 71, 71, 686, 71, 680, 71, 690, 687, 692, - 685, 682, 688, 71, 71, 689, 71, 696, 693, 71, - 691, 71, 698, 71, 71, 71, 71, 71, 694, 699, - 697, 695, 701, 71, 71, 71, 702, 71, 71, 703, - 704, 71, 706, 708, 705, 710, 71, 71, 71, 71, - 707, 700, 71, 71, 716, 71, 711, 71, 718, 71, - 71, 709, 714, 717, 715, 713, 71, 712, 71, 719, - 71, 71, 723, 720, 725, 71, 724, 721, 71, 71, + 71, 71, 675, 71, 678, 71, 676, 71, 677, 71, + 679, 682, 683, 71, 71, 71, 71, 684, 71, 688, + 686, 71, 71, 71, 150, 71, 680, 689, 681, 71, + 71, 71, 685, 691, 148, 690, 687, 71, 692, 71, + 695, 694, 693, 71, 71, 699, 71, 696, 697, 698, + 701, 71, 700, 71, 703, 702, 71, 704, 71, 71, + 71, 71, 707, 706, 71, 708, 71, 71, 71, 71, + 715, 71, 71, 711, 713, 71, 71, 709, 71, 705, + 712, 716, 710, 71, 721, 71, 71, 719, 714, 723, + 71, 722, 718, 71, 717, 720, 724, 71, 71, 71, - 71, 71, 726, 728, 722, 71, 727, 71, 729, 71, - 734, 71, 71, 740, 732, 733, 71, 71, 730, 71, - 731, 736, 737, 71, 71, 71, 738, 71, 743, 71, - 735, 747, 742, 744, 71, 71, 741, 71, 745, 71, - 71, 739, 749, 71, 71, 71, 71, 71, 71, 71, - 746, 755, 71, 71, 748, 71, 71, 750, 756, 763, - 71, 751, 752, 757, 753, 71, 754, 758, 761, 71, - 71, 759, 71, 71, 760, 762, 71, 71, 71, 71, - 768, 71, 765, 764, 71, 71, 774, 71, 71, 71, - 71, 766, 767, 775, 71, 769, 770, 771, 773, 777, + 728, 730, 725, 71, 71, 71, 71, 71, 729, 71, + 732, 71, 731, 727, 733, 71, 726, 735, 71, 734, + 71, 739, 71, 71, 736, 71, 71, 71, 742, 743, + 745, 741, 146, 71, 737, 738, 71, 740, 71, 71, + 750, 748, 71, 747, 744, 746, 749, 71, 71, 71, + 751, 752, 71, 71, 754, 71, 71, 71, 760, 71, + 71, 753, 71, 761, 71, 71, 755, 71, 71, 762, + 71, 756, 71, 757, 71, 758, 71, 759, 71, 71, + 763, 766, 764, 769, 767, 768, 765, 71, 770, 71, + 771, 774, 71, 71, 71, 772, 71, 71, 773, 71, - 772, 71, 71, 71, 778, 71, 776, 779, 71, 71, - 780, 71, 783, 784, 786, 71, 782, 71, 785, 71, - 781, 71, 787, 71, 71, 71, 789, 150, 71, 71, - 790, 795, 794, 788, 792, 71, 793, 791, 71, 796, - 71, 71, 71, 797, 802, 71, 71, 798, 71, 803, - 805, 71, 71, 808, 71, 799, 800, 804, 71, 71, - 71, 806, 801, 71, 810, 807, 71, 814, 71, 71, - 811, 71, 71, 71, 809, 71, 815, 71, 816, 71, - 148, 71, 820, 71, 813, 71, 821, 817, 812, 822, - 71, 828, 827, 71, 825, 819, 823, 818, 826, 824, + 71, 782, 71, 71, 71, 71, 783, 71, 71, 776, + 775, 71, 777, 781, 778, 779, 780, 71, 785, 786, + 71, 71, 784, 789, 788, 787, 71, 71, 791, 796, + 790, 792, 71, 71, 793, 71, 71, 794, 795, 71, + 71, 150, 797, 71, 71, 798, 802, 803, 71, 800, + 71, 71, 804, 799, 71, 801, 71, 71, 810, 71, + 806, 71, 71, 811, 805, 813, 71, 71, 816, 807, + 808, 812, 71, 71, 71, 71, 814, 818, 809, 71, + 815, 71, 822, 71, 71, 71, 71, 819, 71, 71, + 71, 823, 817, 824, 71, 71, 71, 71, 71, 821, - 71, 71, 831, 71, 830, 71, 829, 71, 832, 71, - 837, 834, 71, 71, 833, 71, 71, 845, 71, 835, - 71, 71, 850, 71, 849, 71, 71, 71, 852, 836, - 71, 838, 839, 851, 840, 871, 846, 841, 847, 71, - 853, 71, 842, 848, 71, 854, 855, 71, 843, 844, - 856, 71, 71, 71, 858, 71, 857, 71, 860, 861, - 71, 71, 71, 865, 71, 859, 71, 71, 868, 864, - 71, 71, 874, 71, 872, 890, 71, 862, 867, 863, - 71, 866, 71, 870, 875, 146, 71, 873, 869, 876, - 71, 877, 878, 879, 71, 71, 881, 882, 71, 71, + 71, 828, 825, 835, 820, 829, 836, 834, 830, 827, + 826, 837, 833, 71, 71, 831, 842, 838, 832, 71, + 839, 71, 840, 71, 71, 841, 845, 71, 71, 71, + 71, 71, 71, 853, 857, 71, 71, 843, 858, 71, + 71, 860, 867, 859, 844, 71, 846, 847, 854, 848, + 71, 71, 849, 855, 856, 71, 862, 850, 71, 71, + 866, 71, 864, 851, 852, 861, 863, 71, 71, 71, + 868, 71, 865, 869, 71, 71, 873, 71, 71, 71, + 71, 876, 872, 71, 71, 880, 882, 71, 870, 71, + 871, 71, 874, 875, 881, 878, 877, 883, 71, 71, - 880, 71, 71, 71, 71, 71, 71, 883, 71, 71, - 71, 884, 885, 887, 71, 893, 888, 71, 71, 891, - 71, 71, 892, 886, 71, 889, 71, 895, 71, 896, - 71, 897, 71, 898, 71, 899, 894, 71, 903, 900, - 71, 71, 901, 71, 71, 71, 71, 910, 71, 908, - 911, 71, 906, 71, 71, 902, 904, 909, 913, 905, - 71, 71, 71, 71, 71, 71, 71, 71, 907, 912, - 920, 71, 923, 919, 924, 914, 71, 71, 71, 71, - 915, 916, 71, 918, 917, 921, 71, 71, 925, 71, - 922, 71, 928, 927, 930, 71, 926, 931, 71, 71, + 918, 886, 884, 71, 885, 887, 879, 71, 71, 889, + 71, 71, 71, 888, 71, 71, 891, 890, 71, 71, + 892, 71, 71, 71, 898, 71, 893, 895, 896, 71, + 901, 71, 71, 71, 71, 71, 71, 894, 899, 900, + 71, 71, 897, 903, 904, 905, 71, 71, 71, 907, + 906, 902, 908, 71, 911, 71, 71, 71, 910, 71, + 71, 71, 909, 916, 919, 71, 914, 71, 71, 71, + 912, 917, 921, 71, 71, 913, 71, 71, 71, 71, + 71, 71, 920, 915, 929, 71, 927, 145, 71, 922, + 71, 925, 932, 923, 924, 71, 926, 930, 71, 933, - 933, 929, 932, 71, 71, 938, 71, 940, 71, 71, - 942, 71, 943, 71, 71, 934, 71, 71, 71, 935, - 939, 944, 71, 951, 937, 936, 71, 71, 941, 71, - 949, 948, 71, 945, 946, 71, 950, 71, 71, 71, - 952, 955, 947, 957, 71, 953, 71, 71, 71, 960, - 150, 954, 956, 959, 71, 71, 963, 958, 962, 71, - 71, 961, 71, 71, 71, 71, 71, 966, 71, 71, - 978, 71, 71, 981, 71, 979, 71, 71, 71, 969, - 965, 964, 967, 71, 999, 145, 970, 980, 968, 971, - 71, 984, 71, 972, 71, 973, 983, 985, 71, 974, + 931, 928, 936, 71, 935, 71, 71, 934, 71, 937, + 71, 939, 940, 71, 71, 71, 71, 71, 71, 938, + 71, 949, 71, 942, 944, 951, 71, 71, 941, 71, + 943, 71, 953, 955, 71, 945, 950, 947, 71, 946, + 948, 954, 71, 71, 71, 962, 952, 71, 959, 71, + 961, 71, 71, 956, 957, 963, 71, 71, 966, 71, + 968, 71, 958, 71, 71, 960, 71, 971, 150, 71, + 965, 970, 71, 71, 964, 71, 973, 71, 974, 967, + 71, 969, 71, 71, 972, 71, 71, 977, 71, 71, + 989, 71, 71, 71, 978, 975, 990, 992, 71, 980, - 71, 975, 982, 986, 988, 71, 976, 71, 987, 989, - 71, 977, 71, 71, 990, 71, 991, 71, 993, 71, - 992, 996, 995, 1000, 1001, 1002, 71, 1003, 994, 71, - 71, 1004, 71, 998, 71, 71, 997, 71, 71, 71, - 71, 71, 71, 1019, 71, 1016, 1025, 71, 71, 1020, - 1015, 71, 71, 71, 1006, 1017, 1005, 1007, 71, 1008, - 1018, 1021, 71, 71, 1009, 1022, 1010, 1026, 1027, 71, - 71, 1023, 1011, 1028, 71, 71, 71, 1012, 1013, 1031, - 1032, 1024, 71, 71, 1014, 71, 71, 71, 1029, 1030, - 1037, 71, 1034, 71, 71, 1035, 71, 71, 71, 1040, + 976, 71, 71, 143, 71, 994, 981, 979, 991, 982, + 71, 1013, 71, 983, 71, 984, 993, 995, 996, 985, + 71, 986, 71, 71, 999, 997, 987, 1002, 998, 1000, + 71, 988, 71, 71, 71, 71, 1001, 71, 1004, 1006, + 71, 71, 71, 141, 71, 1011, 1012, 1003, 1005, 1007, + 1010, 71, 71, 1015, 1009, 1014, 71, 71, 1008, 71, + 71, 1017, 71, 1016, 71, 71, 71, 1027, 71, 1026, + 71, 1030, 71, 1031, 1018, 71, 1019, 1029, 1028, 71, + 1032, 1020, 71, 1021, 71, 1034, 1036, 71, 71, 1022, + 1038, 71, 1037, 1033, 1023, 1024, 71, 71, 71, 1042, - 1038, 1033, 71, 1036, 71, 71, 71, 71, 71, 71, - 71, 71, 1039, 1045, 1046, 1047, 1042, 1041, 1043, 1044, - 1049, 71, 71, 1048, 1050, 1051, 71, 71, 71, 71, - 1052, 71, 71, 71, 1057, 71, 1054, 1058, 1059, 71, - 1053, 71, 1061, 1056, 1060, 1055, 1062, 71, 1065, 71, - 71, 1071, 71, 1066, 71, 1064, 71, 71, 1067, 1069, - 1063, 1068, 71, 1070, 71, 1075, 71, 1077, 1072, 71, - 71, 71, 1078, 71, 71, 1073, 71, 71, 71, 1074, - 71, 1080, 1081, 1083, 71, 1084, 1076, 71, 71, 71, - 1082, 1079, 1089, 1086, 71, 1088, 1085, 71, 71, 1090, + 1039, 1025, 71, 1035, 71, 71, 71, 1043, 71, 71, + 1040, 1041, 1048, 71, 71, 1045, 71, 1046, 71, 71, + 71, 1051, 1049, 1044, 71, 1047, 71, 71, 71, 71, + 71, 71, 71, 1050, 1053, 1058, 1056, 1057, 1055, 1052, + 1060, 71, 71, 71, 1054, 1062, 71, 1059, 1061, 71, + 71, 71, 71, 71, 71, 71, 1065, 1068, 1069, 1070, + 1071, 1063, 1064, 71, 1072, 1067, 1073, 1066, 1074, 71, + 1076, 71, 71, 71, 1078, 1077, 71, 1079, 71, 71, + 71, 1080, 71, 1086, 71, 1075, 71, 71, 1088, 71, + 1089, 1082, 71, 1081, 71, 1084, 71, 71, 1083, 1085, - 71, 71, 71, 1091, 1087, 1093, 71, 71, 71, 71, - 1099, 1097, 1100, 71, 1104, 1092, 71, 71, 71, 1094, - 71, 71, 1098, 71, 71, 1095, 1101, 1096, 1102, 1103, - 1107, 1105, 1108, 71, 71, 71, 71, 1106, 71, 71, - 71, 1111, 1112, 1109, 71, 71, 71, 71, 1117, 1118, - 71, 1113, 71, 1110, 71, 71, 71, 1115, 1121, 71, - 71, 1120, 1114, 71, 1123, 1116, 1122, 1119, 71, 1125, - 71, 71, 1124, 71, 71, 1131, 71, 1127, 71, 71, - 71, 1126, 71, 71, 71, 1135, 1137, 71, 71, 1128, - 1142, 1136, 1132, 1130, 1133, 1134, 1129, 1139, 71, 1140, + 71, 1091, 1092, 71, 71, 71, 1087, 71, 1094, 1095, + 1101, 71, 71, 1090, 71, 1100, 1093, 1096, 1097, 71, + 1099, 71, 71, 1098, 71, 71, 1105, 1104, 1102, 71, + 71, 71, 71, 71, 71, 1109, 1111, 1112, 1116, 1113, + 1103, 71, 71, 71, 71, 71, 1110, 1106, 71, 1107, + 1114, 1108, 71, 1115, 1119, 71, 71, 1121, 71, 1117, + 71, 1120, 71, 71, 1122, 71, 71, 71, 1125, 1126, + 71, 1123, 1118, 71, 71, 71, 1131, 1132, 1127, 71, + 71, 1124, 71, 71, 1134, 1129, 1135, 71, 1128, 71, + 1133, 1139, 71, 1130, 71, 71, 71, 71, 71, 1136, - 71, 71, 71, 71, 1138, 71, 1141, 1143, 71, 71, - 71, 71, 1144, 1146, 1145, 71, 71, 71, 1149, 1152, - 71, 71, 71, 71, 1147, 143, 71, 71, 71, 1148, - 1150, 1153, 1156, 1158, 1164, 1151, 71, 1155, 71, 1154, - 71, 1162, 1159, 1157, 1160, 71, 71, 1161, 71, 1166, - 1163, 71, 1165, 71, 1167, 71, 1169, 1168, 71, 71, - 1171, 1174, 71, 71, 71, 71, 71, 71, 1175, 1172, - 1176, 1178, 1170, 71, 71, 71, 1180, 1179, 1173, 71, - 71, 71, 71, 71, 1177, 71, 71, 71, 71, 1181, - 1182, 71, 1184, 1186, 1187, 71, 1185, 1191, 1183, 71, + 71, 1145, 71, 1137, 1138, 1141, 71, 71, 71, 71, + 1151, 71, 1140, 1149, 71, 71, 1142, 1166, 71, 1144, + 1146, 1148, 1147, 1143, 1150, 1153, 1154, 71, 71, 1156, + 71, 71, 71, 1155, 1152, 1157, 71, 71, 71, 71, + 71, 71, 71, 1160, 71, 2904, 71, 71, 1163, 71, + 1158, 1159, 71, 71, 1161, 71, 71, 1164, 1170, 1162, + 1167, 1172, 1178, 1165, 1169, 1168, 71, 1176, 71, 71, + 1173, 71, 1174, 1171, 1177, 1175, 71, 71, 71, 1180, + 71, 71, 1179, 1183, 71, 71, 1182, 1188, 71, 1181, + 1185, 71, 1186, 71, 71, 71, 1189, 71, 1190, 1184, - 71, 1196, 1188, 1192, 71, 1190, 1189, 71, 71, 1195, - 71, 71, 71, 71, 71, 1193, 1198, 1200, 1197, 1194, - 1202, 71, 71, 1201, 71, 1203, 71, 71, 1205, 1218, - 1199, 1215, 1204, 1216, 1206, 71, 1207, 71, 71, 71, - 1214, 71, 1208, 71, 1217, 1209, 1210, 1219, 1220, 71, - 1211, 141, 71, 71, 71, 71, 1212, 1221, 1222, 1229, - 1213, 71, 1223, 71, 1225, 71, 71, 71, 71, 1226, - 1224, 1227, 71, 1232, 1230, 1228, 71, 1235, 1236, 71, - 71, 71, 71, 71, 71, 1237, 1233, 1231, 71, 1245, - 1239, 71, 1238, 1246, 1234, 1240, 71, 1241, 71, 1242, + 1192, 1193, 71, 1187, 71, 71, 71, 71, 71, 71, + 71, 1194, 71, 71, 1191, 1200, 71, 71, 71, 1195, + 1196, 1198, 1199, 71, 1201, 1197, 71, 71, 71, 1202, + 71, 1206, 1205, 1210, 1203, 1204, 1209, 71, 1207, 71, + 71, 71, 1211, 1208, 71, 1212, 1214, 71, 1216, 71, + 1213, 71, 1215, 1217, 71, 71, 1221, 71, 2904, 1230, + 1229, 1219, 1220, 1218, 71, 71, 71, 1231, 1234, 1222, + 1228, 71, 1223, 1224, 71, 71, 1232, 1225, 71, 1237, + 71, 71, 71, 1226, 1233, 1235, 1236, 1227, 71, 1239, + 71, 71, 71, 1240, 71, 1241, 71, 71, 71, 71, - 1247, 1243, 71, 1244, 71, 71, 1251, 71, 71, 71, - 71, 1252, 71, 1248, 1250, 1254, 71, 1256, 71, 71, - 71, 71, 1249, 1255, 71, 71, 1261, 1259, 71, 1253, - 71, 71, 1267, 71, 1260, 1257, 1266, 1258, 1262, 1263, - 71, 1269, 71, 1264, 71, 71, 1270, 71, 1271, 71, - 1274, 71, 1272, 1265, 71, 1268, 1276, 71, 71, 1277, - 71, 71, 71, 1281, 71, 1278, 71, 71, 1273, 71, - 1283, 71, 71, 71, 1275, 1287, 1285, 71, 2858, 71, - 1288, 1286, 1279, 1280, 1289, 71, 1282, 71, 71, 1284, - 1290, 71, 71, 1292, 71, 1291, 1293, 71, 1294, 1295, + 1249, 1250, 1246, 1238, 71, 1244, 71, 71, 71, 1251, + 1243, 1242, 1247, 71, 1245, 71, 1259, 1248, 71, 1252, + 71, 1258, 1253, 71, 71, 71, 1263, 1254, 1261, 1255, + 71, 1256, 1265, 1257, 1260, 71, 71, 1266, 71, 1264, + 1262, 1268, 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 1270, 1275, 1273, 71, 1269, 1267, 1277, 1281, + 71, 1274, 71, 1271, 1272, 1276, 71, 1280, 1278, 1283, + 71, 71, 71, 1284, 71, 1285, 71, 71, 71, 1286, + 1279, 1282, 1289, 71, 1291, 71, 1288, 71, 1292, 71, + 71, 71, 1296, 71, 1293, 1287, 71, 71, 1290, 71, - 71, 71, 71, 1300, 71, 1301, 1297, 71, 1298, 71, - 1296, 71, 1302, 1303, 71, 1299, 71, 71, 71, 71, - 1307, 71, 71, 1304, 1308, 1311, 1312, 71, 1306, 71, - 1314, 71, 71, 1313, 71, 1305, 71, 71, 1309, 71, - 71, 71, 71, 1315, 71, 1310, 71, 1321, 71, 1316, - 71, 1318, 71, 1325, 1317, 1319, 71, 1322, 1320, 1326, - 71, 1328, 1324, 1330, 71, 71, 71, 1323, 1331, 71, - 71, 1329, 71, 1327, 1333, 71, 71, 71, 1334, 1341, - 1335, 1339, 1332, 71, 1340, 1343, 71, 1336, 71, 71, - 1337, 71, 1344, 1338, 71, 71, 71, 1342, 71, 71, + 1298, 71, 71, 71, 71, 1302, 1300, 71, 71, 71, + 1304, 1294, 1295, 1301, 1306, 71, 1297, 71, 71, 1299, + 1303, 2904, 1307, 1305, 71, 71, 1308, 71, 1311, 1309, + 1310, 71, 71, 1313, 71, 71, 1312, 1317, 1314, 1318, + 1320, 1315, 71, 71, 71, 71, 71, 1319, 1316, 71, + 71, 1324, 71, 1321, 71, 71, 71, 1328, 1329, 71, + 1331, 1323, 71, 71, 71, 1330, 71, 71, 1322, 71, + 71, 71, 71, 1338, 1325, 1326, 1332, 71, 71, 1327, + 71, 1335, 1333, 71, 1336, 1343, 71, 1334, 1342, 1337, + 71, 71, 71, 71, 1347, 71, 1345, 1339, 1341, 1348, - 1345, 1349, 71, 71, 1351, 1346, 71, 71, 71, 1356, - 71, 71, 71, 1348, 1357, 1360, 1350, 1353, 71, 71, - 1347, 71, 1352, 71, 1354, 1355, 71, 71, 71, 1358, - 1361, 1359, 71, 71, 71, 71, 71, 1363, 1362, 1367, - 1368, 1364, 1365, 71, 1371, 71, 1372, 1366, 1369, 71, - 1370, 1373, 71, 71, 1377, 1374, 1378, 71, 1376, 71, - 71, 1382, 71, 71, 1379, 71, 1380, 1381, 71, 71, - 71, 71, 71, 1375, 71, 1388, 71, 1384, 1383, 1387, - 71, 71, 71, 71, 1385, 1394, 1386, 1391, 1390, 71, - 1395, 71, 1396, 71, 1399, 1392, 1389, 1397, 71, 71, + 71, 71, 1350, 1340, 71, 71, 71, 71, 71, 1352, + 71, 1346, 1351, 1344, 71, 1356, 1358, 1360, 1357, 1349, + 1353, 1354, 1359, 71, 1355, 71, 71, 71, 71, 1361, + 71, 71, 71, 1364, 71, 71, 1366, 1362, 71, 1368, + 71, 71, 1370, 71, 1373, 1374, 1363, 71, 1365, 71, + 1367, 1377, 71, 71, 71, 1369, 1371, 71, 1372, 71, + 71, 71, 71, 71, 1378, 1375, 71, 1384, 1376, 1381, + 1385, 1386, 1379, 1380, 71, 1382, 71, 71, 1389, 71, + 1383, 71, 71, 71, 1394, 1388, 2904, 1391, 1393, 1395, + 71, 71, 1387, 71, 1390, 71, 71, 1396, 71, 1397, - 71, 71, 1393, 71, 71, 71, 71, 1407, 1403, 1398, - 1402, 71, 71, 71, 1410, 71, 1408, 71, 1400, 1401, - 71, 71, 1413, 1404, 1406, 1405, 71, 1412, 71, 71, - 71, 71, 71, 71, 1411, 71, 1414, 1426, 1409, 71, - 1421, 71, 71, 71, 1422, 1415, 1418, 71, 1416, 1417, - 1420, 71, 1419, 71, 1423, 1424, 71, 71, 1425, 71, - 1427, 1430, 71, 1435, 1429, 1431, 1428, 1433, 71, 71, - 1437, 71, 71, 71, 71, 71, 71, 1438, 1432, 1439, - 1440, 71, 71, 1434, 1445, 1436, 1441, 1446, 71, 71, - 71, 71, 71, 1442, 2858, 1444, 1451, 1449, 71, 1443, + 1398, 71, 71, 1392, 71, 71, 1399, 1402, 71, 1401, + 71, 1405, 71, 1400, 71, 1404, 71, 71, 71, 1411, + 1403, 1408, 1407, 1413, 1412, 71, 71, 71, 1414, 71, + 71, 1409, 1406, 71, 1416, 71, 1419, 1410, 71, 71, + 71, 71, 1424, 1420, 71, 71, 1415, 1427, 71, 1417, + 1425, 71, 71, 71, 1418, 1430, 71, 1429, 1421, 1423, + 1422, 71, 71, 71, 71, 71, 71, 71, 1438, 71, + 1426, 1428, 2904, 71, 71, 1431, 1439, 1441, 71, 1435, + 71, 1432, 1433, 1434, 1437, 1442, 1440, 1436, 71, 71, + 71, 71, 1443, 71, 71, 71, 1447, 71, 1450, 1445, - 71, 1450, 71, 1452, 71, 71, 71, 1447, 1453, 1454, - 71, 71, 1448, 71, 1455, 71, 1457, 71, 1460, 71, - 71, 71, 1456, 71, 1459, 71, 1463, 71, 1464, 71, - 71, 1458, 71, 1468, 1461, 71, 71, 71, 1466, 1473, - 71, 1462, 1471, 1465, 1469, 71, 71, 71, 1476, 1474, - 71, 1472, 71, 1470, 1467, 71, 71, 71, 71, 1479, - 1482, 71, 1481, 1478, 71, 71, 1475, 71, 71, 71, - 1489, 71, 1477, 71, 71, 1480, 1483, 71, 1484, 1490, - 71, 1487, 1493, 71, 1485, 1486, 1498, 71, 1494, 1496, - 71, 1491, 71, 1488, 71, 1497, 1500, 1492, 71, 71, + 1448, 71, 1444, 71, 1446, 1454, 71, 71, 71, 71, + 1451, 71, 1455, 1449, 1456, 1457, 71, 1452, 71, 1453, + 1458, 1459, 1462, 1463, 71, 71, 1460, 71, 71, 71, + 71, 1467, 71, 1468, 1466, 1470, 71, 71, 1461, 71, + 1471, 1472, 71, 1464, 71, 71, 71, 71, 1465, 1475, + 71, 71, 1469, 71, 1478, 71, 71, 71, 71, 1477, + 1473, 1474, 1482, 71, 1484, 71, 1479, 1476, 71, 71, + 71, 1488, 1483, 71, 71, 1481, 1480, 71, 71, 71, + 1493, 71, 1491, 1485, 1486, 71, 71, 1489, 71, 1494, + 71, 1496, 1490, 1487, 1492, 71, 71, 71, 1495, 1498, - 1495, 71, 71, 1502, 71, 71, 71, 1504, 71, 1507, - 1505, 71, 1501, 71, 1499, 71, 1508, 71, 1503, 71, - 71, 1513, 1512, 71, 71, 1509, 2858, 71, 1519, 71, - 1506, 1510, 1511, 71, 71, 1514, 1516, 71, 1521, 1517, - 71, 1525, 1520, 71, 1515, 1522, 1524, 71, 71, 71, - 1527, 1518, 1523, 1526, 71, 1528, 1529, 71, 71, 71, - 71, 71, 71, 1530, 71, 1536, 1537, 1535, 71, 1539, - 1531, 71, 71, 1538, 71, 71, 71, 1532, 71, 1533, - 71, 1534, 71, 1541, 1542, 71, 71, 1543, 71, 71, - 1551, 71, 71, 71, 1544, 71, 71, 1540, 71, 71, + 1499, 71, 1501, 1502, 71, 71, 71, 71, 1497, 71, + 71, 1509, 71, 71, 1500, 71, 71, 1510, 71, 1503, + 1504, 1507, 71, 71, 1505, 1506, 71, 1513, 1514, 71, + 71, 1516, 71, 1511, 1508, 1512, 1515, 1517, 1518, 1520, + 1521, 71, 1519, 71, 71, 71, 1522, 71, 71, 1523, + 71, 71, 1527, 71, 1524, 1525, 71, 1528, 71, 71, + 71, 1530, 1532, 71, 1533, 1526, 71, 1529, 71, 1539, + 71, 71, 1534, 1531, 1536, 71, 71, 1537, 71, 1541, + 71, 1540, 71, 1542, 1545, 1544, 1535, 71, 71, 1538, + 71, 71, 1546, 1543, 71, 1547, 71, 1548, 1549, 1553, - 1545, 71, 1547, 1548, 1549, 71, 1546, 71, 1550, 1556, - 71, 1552, 1554, 1553, 71, 71, 1559, 71, 71, 1558, - 1555, 1557, 1560, 71, 71, 71, 71, 71, 71, 1562, - 71, 1561, 1564, 1566, 1567, 71, 1563, 1568, 1573, 1565, - 1574, 71, 71, 1569, 71, 1570, 1575, 71, 71, 71, - 1571, 1578, 71, 1572, 1576, 1579, 71, 71, 71, 71, - 71, 71, 1577, 1582, 1583, 1580, 71, 1591, 1581, 1586, - 71, 71, 71, 71, 1592, 71, 1584, 1585, 71, 1588, - 1590, 71, 1589, 71, 71, 1587, 71, 71, 71, 71, - 1601, 1594, 1593, 71, 71, 71, 71, 1596, 1598, 1595, + 71, 1551, 71, 71, 71, 1550, 1555, 1556, 1557, 1552, + 71, 1559, 71, 71, 71, 1558, 71, 71, 1562, 71, + 71, 1561, 1554, 71, 71, 1563, 71, 71, 71, 71, + 1571, 71, 71, 71, 71, 1560, 71, 71, 71, 1569, + 71, 1564, 1567, 1568, 1565, 1570, 1566, 71, 1574, 1576, + 71, 1572, 1578, 1573, 71, 1579, 71, 71, 1575, 71, + 1577, 71, 1582, 71, 71, 71, 71, 71, 71, 2904, + 1584, 1580, 1586, 1581, 71, 1583, 1587, 1593, 1585, 1588, + 1589, 1590, 1594, 71, 1595, 71, 1591, 71, 71, 71, + 1599, 71, 1598, 1592, 71, 71, 71, 71, 71, 1596, - 1597, 1604, 71, 1603, 71, 1605, 1600, 71, 71, 1602, - 1612, 1607, 1599, 1609, 1608, 1613, 71, 71, 1615, 1606, - 71, 1617, 71, 1618, 71, 71, 1611, 1620, 1610, 71, - 1619, 1614, 71, 71, 71, 71, 1624, 71, 1616, 71, - 1621, 71, 71, 71, 71, 71, 71, 1626, 71, 1623, - 1625, 1628, 1622, 1627, 1631, 71, 71, 1632, 1629, 1635, - 1630, 71, 71, 71, 1637, 71, 71, 71, 1633, 1634, - 71, 1643, 71, 71, 71, 1636, 1638, 71, 1647, 71, - 1642, 71, 1639, 1640, 71, 1641, 71, 71, 1649, 1645, - 71, 1650, 1646, 71, 1644, 1651, 1653, 71, 1652, 71, + 71, 1602, 1603, 71, 71, 1611, 1597, 1600, 71, 71, + 71, 71, 1606, 71, 1601, 71, 1605, 1604, 1608, 1610, + 71, 1609, 71, 1607, 1612, 71, 1614, 71, 1613, 71, + 71, 71, 1621, 1615, 1616, 71, 71, 71, 1617, 1618, + 71, 1625, 1624, 71, 71, 1623, 71, 71, 1620, 71, + 71, 1622, 1632, 1627, 1619, 1626, 1628, 1633, 71, 71, + 1635, 1629, 71, 1634, 1639, 1631, 71, 1630, 1636, 1637, + 71, 1638, 1640, 71, 71, 1644, 71, 71, 71, 1641, + 71, 71, 1642, 71, 1648, 71, 1646, 71, 1643, 1645, + 71, 71, 1647, 1649, 71, 71, 71, 71, 71, 1650, - 71, 1648, 1656, 71, 71, 71, 1660, 71, 71, 71, - 71, 71, 71, 71, 1655, 71, 1658, 1662, 71, 1657, - 1654, 1663, 1661, 1664, 1659, 2858, 1667, 1668, 71, 1671, - 71, 1665, 71, 1666, 1670, 71, 1669, 71, 1672, 1673, - 71, 71, 1674, 1676, 1677, 71, 71, 71, 71, 71, - 1675, 71, 71, 1679, 71, 1680, 71, 71, 1678, 71, - 71, 71, 1685, 71, 71, 71, 71, 1681, 1686, 1689, - 1682, 71, 1683, 1687, 1684, 1688, 1694, 71, 1695, 71, - 1690, 1693, 71, 1692, 71, 71, 1696, 71, 71, 1700, - 71, 71, 1703, 1691, 1704, 71, 1705, 71, 1697, 1707, + 1653, 1660, 1652, 1658, 71, 71, 1651, 71, 1654, 1655, + 1661, 1656, 1657, 71, 71, 71, 71, 71, 1662, 71, + 1667, 71, 71, 1671, 71, 1659, 71, 71, 2904, 71, + 1666, 71, 1664, 1663, 1665, 1673, 71, 1669, 71, 71, + 1670, 1668, 71, 1674, 1675, 71, 71, 1672, 1680, 71, + 1676, 1677, 1678, 71, 71, 1681, 1684, 71, 71, 71, + 71, 1679, 71, 71, 71, 1682, 1686, 71, 71, 71, + 1691, 71, 1685, 1683, 1687, 1688, 71, 1694, 1699, 1689, + 1692, 1695, 71, 71, 1690, 1693, 1696, 1697, 71, 71, + 1700, 1701, 71, 71, 1698, 71, 71, 1703, 71, 71, - 71, 1698, 1699, 71, 1701, 71, 1702, 71, 1706, 71, - 1708, 1711, 71, 71, 1713, 71, 1715, 1712, 1714, 71, - 71, 1717, 71, 71, 1709, 1716, 1710, 71, 71, 1720, - 71, 1719, 71, 1721, 1722, 1723, 1724, 1725, 71, 71, - 71, 1729, 1726, 71, 1718, 1731, 71, 71, 71, 71, - 1732, 71, 71, 71, 1734, 71, 1737, 1738, 1727, 1728, - 1733, 71, 71, 1730, 1735, 1741, 71, 71, 71, 1739, - 1736, 71, 1743, 71, 71, 1746, 1747, 71, 71, 1749, - 71, 71, 1740, 71, 71, 71, 1755, 71, 1744, 71, - 1754, 71, 1751, 1742, 1752, 1745, 71, 71, 1748, 71, + 71, 1704, 71, 71, 71, 1702, 71, 71, 71, 1709, + 71, 71, 1713, 71, 71, 1710, 71, 1714, 1719, 1705, + 1707, 1708, 1706, 1711, 71, 1712, 1718, 71, 71, 1717, + 1715, 71, 71, 1716, 71, 71, 1724, 1720, 71, 71, + 1727, 1728, 71, 1729, 71, 1731, 71, 1721, 1722, 71, + 1732, 1723, 1725, 71, 1726, 1730, 71, 1735, 71, 71, + 1737, 71, 1739, 1736, 1738, 71, 71, 1741, 71, 71, + 1744, 71, 71, 71, 1733, 1743, 1746, 1734, 71, 1745, + 71, 71, 71, 1740, 71, 1753, 71, 1755, 71, 71, + 71, 71, 1756, 71, 1742, 71, 1747, 1748, 1749, 71, - 71, 71, 1761, 71, 71, 1753, 1750, 1758, 1759, 71, - 1756, 71, 1757, 1765, 1764, 71, 71, 1760, 1768, 71, - 1763, 1769, 1767, 71, 71, 1770, 71, 71, 1771, 1762, - 71, 1766, 71, 71, 71, 71, 1773, 1776, 71, 1772, - 71, 1779, 1780, 71, 71, 1775, 71, 71, 71, 71, - 1783, 1774, 71, 1777, 71, 71, 71, 1792, 71, 1782, - 1789, 1790, 71, 1781, 1778, 71, 1784, 1785, 1786, 1787, - 71, 1788, 71, 1794, 1791, 71, 1793, 71, 1795, 1796, - 71, 71, 1799, 71, 1802, 71, 71, 71, 71, 1798, - 71, 1797, 1804, 1805, 71, 71, 1806, 2858, 71, 1808, + 1751, 1752, 1757, 1750, 1760, 71, 1754, 1758, 1761, 71, + 1759, 1764, 1765, 71, 71, 1763, 71, 71, 1762, 71, + 1767, 71, 71, 1770, 1771, 71, 71, 1773, 71, 71, + 71, 71, 71, 1779, 71, 1778, 71, 1768, 71, 1775, + 1776, 71, 1766, 1769, 71, 1782, 1772, 71, 71, 71, + 1785, 71, 71, 1777, 1774, 71, 1783, 1780, 1789, 1781, + 1788, 71, 71, 71, 71, 1792, 1793, 71, 1787, 1791, + 71, 71, 71, 71, 1784, 1794, 71, 1786, 1795, 1796, + 71, 1790, 71, 1797, 71, 1800, 1798, 71, 71, 1803, + 1804, 71, 1799, 71, 71, 71, 71, 71, 1807, 2904, - 1803, 1800, 1807, 1801, 1809, 1810, 71, 1811, 71, 1812, - 1814, 1815, 1816, 71, 1813, 71, 71, 71, 1817, 71, - 1819, 71, 71, 71, 71, 71, 71, 1821, 71, 1824, - 1826, 1818, 71, 1820, 1822, 71, 71, 71, 71, 71, - 1827, 71, 1831, 1830, 1828, 71, 1832, 1825, 1836, 1823, - 1833, 71, 1834, 71, 71, 71, 1829, 71, 71, 71, - 1838, 1835, 71, 1837, 1839, 71, 71, 1841, 1840, 1842, - 71, 1844, 71, 71, 71, 1848, 71, 1843, 71, 1847, - 71, 71, 71, 71, 1845, 1846, 1850, 1849, 1851, 1852, - 71, 1854, 71, 71, 71, 71, 71, 1859, 1857, 71, + 71, 71, 1801, 71, 71, 1813, 1816, 71, 1806, 71, + 1814, 1805, 71, 1802, 1808, 1809, 1810, 71, 1811, 1812, + 71, 1815, 1820, 71, 1817, 71, 71, 71, 1818, 71, + 1821, 71, 1824, 1819, 1827, 71, 71, 1830, 71, 1822, + 71, 1829, 71, 1831, 71, 1823, 71, 71, 1832, 1825, + 1828, 1826, 71, 1837, 71, 1833, 1838, 71, 1834, 1839, + 1841, 1842, 71, 1835, 1840, 71, 71, 71, 71, 71, + 1846, 71, 1836, 1844, 71, 71, 71, 71, 1848, 1851, + 1853, 1845, 71, 1847, 71, 71, 71, 1849, 1843, 71, + 71, 71, 71, 71, 1858, 71, 1854, 1857, 71, 1859, - 1853, 1858, 71, 71, 71, 1861, 71, 1865, 71, 1860, - 1855, 1864, 1856, 71, 71, 71, 1862, 1863, 71, 71, - 1867, 71, 1866, 1869, 1871, 71, 71, 71, 1870, 1872, - 71, 71, 1877, 71, 1875, 1868, 71, 1873, 71, 71, - 1879, 1881, 71, 1874, 1876, 71, 71, 1880, 1878, 71, - 71, 1885, 71, 1884, 1882, 71, 1883, 1887, 71, 71, - 71, 1886, 71, 71, 71, 71, 71, 1888, 71, 1893, - 1889, 1890, 1897, 71, 71, 71, 71, 1892, 1896, 1900, - 1901, 71, 1894, 1898, 1895, 71, 1891, 71, 1899, 1904, - 1903, 71, 71, 71, 1902, 71, 1906, 71, 71, 1905, + 1865, 1855, 1850, 2904, 1852, 1860, 71, 1861, 71, 1856, + 1863, 71, 71, 1862, 71, 71, 71, 1864, 1866, 71, + 1868, 71, 1869, 1867, 71, 1871, 71, 71, 71, 71, + 1875, 71, 71, 1870, 1874, 71, 71, 1876, 1872, 1873, + 1877, 1878, 1879, 71, 71, 71, 71, 71, 71, 71, + 1886, 1884, 1880, 1881, 1885, 71, 71, 71, 1888, 71, + 71, 1892, 1887, 1882, 71, 1883, 71, 71, 1891, 1889, + 71, 71, 71, 1890, 1899, 1893, 1894, 1896, 1898, 71, + 71, 71, 2904, 1897, 71, 1904, 71, 71, 1895, 71, + 1906, 71, 71, 71, 1907, 71, 1900, 1901, 71, 1902, - 1907, 1908, 71, 71, 1912, 71, 1910, 1914, 71, 71, - 1911, 1916, 71, 1909, 71, 71, 71, 1919, 71, 1918, - 71, 1920, 1913, 1915, 71, 1921, 1924, 71, 71, 71, - 71, 71, 71, 1925, 1917, 71, 1922, 1927, 1930, 71, - 1926, 71, 1931, 71, 1923, 1929, 1934, 2858, 71, 1928, - 1932, 71, 71, 1935, 71, 71, 1936, 1939, 71, 1937, - 71, 71, 1941, 1933, 71, 1942, 71, 1938, 71, 71, - 71, 1946, 1940, 1948, 71, 1943, 1947, 1944, 1949, 71, - 1945, 71, 1951, 1950, 71, 71, 71, 71, 71, 1953, - 1954, 1957, 71, 1952, 71, 71, 71, 71, 71, 1955, + 1903, 1908, 71, 1909, 1905, 1910, 71, 1912, 71, 71, + 71, 71, 71, 1911, 71, 71, 71, 1913, 71, 71, + 71, 1920, 1915, 1916, 1917, 1924, 71, 71, 71, 2904, + 1914, 1919, 1923, 71, 1921, 71, 1927, 1925, 1922, 71, + 1918, 71, 71, 71, 1928, 1931, 1930, 1926, 1929, 71, + 71, 1935, 71, 1932, 1933, 71, 71, 1934, 71, 71, + 1939, 71, 71, 1941, 1937, 1943, 71, 71, 1938, 71, + 1936, 71, 71, 1946, 1945, 71, 1942, 1947, 1940, 71, + 1948, 71, 1951, 71, 71, 71, 71, 71, 71, 1952, + 71, 71, 71, 1944, 1954, 2017, 1953, 1949, 1957, 71, - 71, 71, 71, 71, 71, 1965, 1958, 1956, 1966, 1963, - 1961, 1960, 1959, 1962, 1964, 71, 71, 71, 71, 1971, - 71, 1967, 1969, 71, 1970, 1975, 71, 1977, 71, 1974, - 71, 71, 1976, 71, 1968, 1972, 1980, 1979, 71, 1982, - 1984, 1985, 71, 1973, 1983, 71, 71, 71, 71, 1978, - 71, 1981, 71, 1986, 1989, 71, 1987, 71, 1990, 1994, - 71, 1993, 1988, 71, 1995, 71, 71, 1998, 71, 71, - 71, 2000, 1991, 71, 1999, 2001, 71, 1996, 71, 71, - 71, 2003, 2004, 1992, 1997, 2002, 71, 71, 2005, 71, - 2006, 71, 71, 71, 2008, 71, 71, 71, 2011, 2014, + 1961, 1950, 71, 1958, 1955, 1956, 71, 1959, 71, 71, + 1960, 1963, 71, 1962, 1966, 71, 71, 71, 71, 1968, + 1964, 71, 1969, 71, 71, 1970, 1973, 71, 1965, 1967, + 71, 1975, 1971, 71, 71, 1972, 1976, 71, 71, 1977, + 71, 71, 71, 1980, 71, 1978, 1979, 1981, 1974, 71, + 1985, 71, 71, 1982, 71, 71, 71, 71, 1984, 71, + 71, 1983, 1986, 71, 71, 1994, 71, 71, 1989, 71, + 1987, 1988, 1990, 71, 1995, 1991, 1992, 71, 71, 1993, + 71, 2003, 1996, 1997, 1999, 2002, 2005, 71, 71, 2000, + 71, 2007, 71, 71, 71, 2001, 1998, 2004, 2009, 2006, - 71, 2015, 71, 71, 2007, 71, 71, 2010, 2017, 71, - 71, 71, 2013, 2012, 2009, 2021, 71, 2016, 2019, 2024, - 71, 71, 71, 71, 2022, 71, 71, 71, 2020, 2025, - 71, 2018, 71, 71, 2023, 2035, 71, 71, 71, 71, - 71, 2026, 2027, 2036, 2032, 71, 2030, 71, 2028, 2272, - 2029, 2031, 2034, 2038, 2033, 71, 2040, 71, 2037, 71, - 2039, 2041, 71, 2042, 71, 71, 71, 2045, 2046, 2048, - 71, 2047, 2043, 71, 71, 71, 71, 71, 2044, 2049, - 2050, 2054, 71, 2055, 71, 71, 2057, 71, 71, 2053, - 2059, 71, 71, 2051, 71, 71, 2052, 2062, 71, 2061, + 71, 71, 2012, 2014, 2015, 2010, 71, 2013, 71, 71, + 71, 71, 2008, 71, 2011, 71, 2016, 2019, 71, 71, + 2020, 2024, 71, 2026, 2023, 71, 2018, 71, 2025, 2028, + 71, 71, 71, 2030, 2021, 71, 2029, 2031, 71, 71, + 2033, 71, 71, 2027, 2032, 2022, 71, 71, 71, 71, + 2035, 2034, 2036, 71, 2038, 71, 71, 71, 2044, 71, + 2041, 71, 71, 71, 71, 2039, 2037, 2045, 2040, 2047, + 71, 71, 71, 2043, 2042, 71, 2046, 2051, 71, 2054, + 71, 71, 2049, 71, 71, 71, 71, 71, 2048, 2055, + 2050, 2052, 71, 2053, 71, 71, 71, 2065, 71, 71, - 2063, 71, 71, 71, 2056, 71, 2058, 2060, 71, 2064, - 71, 2065, 71, 2068, 2069, 71, 71, 2066, 2071, 71, - 71, 71, 2073, 2074, 2067, 71, 2075, 2077, 71, 2070, - 2072, 71, 71, 2081, 71, 71, 71, 71, 71, 71, - 2078, 2076, 2085, 2086, 71, 71, 2079, 71, 2090, 71, - 71, 2080, 2084, 71, 71, 2082, 71, 71, 2087, 2083, - 2088, 2092, 2089, 71, 2095, 71, 2096, 2093, 71, 71, - 2091, 2097, 71, 71, 71, 71, 71, 2100, 2101, 71, - 2099, 71, 2094, 71, 2105, 2098, 2106, 71, 2103, 2109, - 71, 71, 2107, 71, 2111, 71, 2112, 2104, 2108, 2102, + 71, 71, 2056, 2057, 2066, 71, 2060, 2062, 2058, 71, + 2059, 2064, 2067, 2061, 2068, 2063, 71, 2070, 2069, 2071, + 71, 2072, 71, 71, 2073, 71, 2075, 71, 71, 2078, + 71, 71, 2079, 71, 71, 71, 2074, 2076, 2080, 71, + 2077, 2084, 71, 2085, 71, 2087, 71, 2083, 71, 2089, + 71, 2081, 71, 2904, 2082, 71, 2092, 71, 2086, 71, + 2091, 2093, 71, 71, 71, 71, 2088, 2090, 71, 71, + 2099, 71, 2095, 2094, 2098, 2101, 71, 71, 2096, 71, + 71, 71, 2105, 2104, 2097, 2103, 71, 2100, 2107, 71, + 71, 71, 2111, 71, 71, 2102, 71, 2106, 71, 71, - 71, 71, 2120, 71, 71, 71, 71, 71, 71, 71, - 2858, 2110, 2115, 2116, 2114, 2117, 2118, 2121, 2113, 2119, - 71, 71, 2126, 71, 2122, 71, 2125, 71, 71, 2123, - 2124, 71, 2127, 71, 71, 71, 2133, 71, 71, 71, - 2128, 71, 71, 71, 71, 71, 2242, 2129, 2134, 2130, - 2131, 2132, 2135, 2136, 2137, 71, 2139, 2138, 2140, 71, - 71, 2144, 71, 2858, 2141, 2142, 71, 2145, 2146, 71, - 71, 71, 2143, 2147, 2149, 2150, 2148, 2151, 71, 71, - 71, 71, 71, 2153, 71, 71, 71, 71, 2157, 71, - 71, 71, 2159, 2152, 2158, 71, 2154, 2160, 71, 2155, + 2116, 71, 71, 2115, 71, 2108, 2109, 71, 71, 2110, + 2120, 71, 71, 2114, 2112, 71, 71, 2125, 71, 2113, + 71, 2117, 2118, 2119, 2121, 2122, 2123, 71, 71, 2126, + 2127, 71, 71, 71, 71, 71, 71, 2130, 2131, 71, + 71, 2124, 71, 2129, 2135, 71, 71, 2128, 2133, 71, + 2137, 2138, 2140, 71, 2142, 71, 71, 2134, 71, 2132, + 71, 2143, 71, 2141, 2139, 71, 2136, 2144, 2146, 71, + 71, 71, 2147, 71, 2148, 71, 71, 2153, 2145, 2149, + 2150, 2154, 2151, 71, 71, 71, 2159, 71, 2155, 2152, + 71, 2158, 71, 71, 2157, 71, 2156, 71, 2160, 71, - 2161, 71, 71, 2165, 71, 2156, 2164, 71, 71, 71, - 2162, 2163, 71, 2167, 71, 71, 71, 71, 2174, 2171, - 2166, 71, 2173, 71, 71, 71, 71, 2175, 2170, 2168, - 2178, 2179, 2169, 71, 71, 71, 2172, 71, 71, 71, - 2181, 2176, 2177, 2180, 71, 2183, 71, 2182, 71, 2184, - 71, 2186, 2187, 2188, 71, 2190, 71, 2193, 71, 71, - 2185, 2192, 71, 71, 71, 71, 2189, 2191, 71, 71, - 2196, 71, 2200, 71, 2198, 2202, 2199, 2194, 2201, 71, - 2195, 71, 71, 2203, 71, 71, 71, 71, 71, 71, - 2211, 2206, 2209, 71, 2197, 71, 71, 2210, 71, 71, + 71, 2166, 71, 71, 71, 71, 2161, 71, 71, 71, + 71, 2164, 2168, 2162, 2167, 2163, 2165, 2169, 71, 71, + 2170, 2172, 2171, 71, 2174, 71, 2173, 2214, 2175, 2189, + 2176, 2177, 71, 71, 2178, 2179, 71, 71, 71, 2182, + 2180, 2183, 71, 2181, 2904, 71, 71, 71, 2184, 71, + 71, 2186, 71, 71, 2190, 71, 2185, 71, 2187, 2191, + 2192, 2193, 71, 71, 71, 71, 2188, 71, 2194, 2198, + 71, 2197, 71, 2195, 71, 71, 71, 2200, 71, 71, + 71, 71, 2207, 2204, 71, 2196, 2206, 2199, 71, 71, + 2208, 2212, 2203, 71, 71, 2201, 2202, 71, 71, 2211, - 2204, 2208, 2214, 71, 71, 71, 2207, 2205, 71, 2217, - 2218, 71, 71, 2212, 2213, 71, 71, 2215, 71, 2222, - 2219, 2220, 2216, 71, 71, 2221, 2223, 2226, 71, 2225, - 2227, 71, 2228, 71, 2229, 71, 71, 71, 2224, 71, - 2232, 71, 2233, 71, 71, 71, 71, 71, 2230, 2238, - 71, 2239, 71, 2240, 71, 2231, 2234, 2235, 71, 2241, - 71, 71, 2237, 2236, 71, 71, 2245, 2248, 71, 71, - 2243, 71, 71, 71, 71, 71, 71, 2255, 2249, 71, - 2244, 71, 71, 71, 2246, 2247, 2252, 71, 2256, 2254, - 71, 71, 2251, 71, 2262, 2858, 2257, 2250, 2253, 71, + 2205, 71, 71, 2216, 71, 71, 2213, 2209, 2217, 2210, + 71, 2219, 71, 2221, 71, 2215, 2220, 2223, 71, 71, + 71, 2225, 71, 71, 71, 71, 2222, 71, 71, 2224, + 2218, 71, 71, 2229, 2233, 71, 2231, 2232, 2227, 2234, + 71, 2226, 2235, 2228, 71, 2236, 71, 71, 71, 71, + 71, 2230, 71, 71, 2239, 2242, 71, 2244, 71, 2243, + 71, 71, 2237, 71, 71, 2241, 2247, 71, 71, 2238, + 2254, 2240, 71, 2250, 71, 2246, 2245, 2251, 71, 2252, + 2248, 71, 2249, 71, 71, 71, 2253, 71, 2259, 71, + 2260, 71, 2258, 2261, 71, 2262, 71, 2255, 2256, 71, - 2259, 71, 2258, 71, 2264, 2260, 2265, 2263, 2266, 71, - 2267, 71, 71, 2261, 71, 2268, 71, 2269, 71, 2270, - 71, 2271, 71, 71, 71, 71, 71, 71, 2281, 71, - 71, 2273, 2858, 2278, 2282, 71, 2285, 71, 71, 71, - 2274, 2275, 71, 71, 2276, 2277, 2279, 2280, 2284, 2287, - 71, 2286, 2283, 71, 71, 71, 2288, 71, 71, 71, - 2290, 2289, 2296, 71, 2297, 71, 2298, 71, 71, 2291, - 71, 71, 71, 2292, 2294, 2293, 2302, 71, 2295, 71, - 71, 71, 2306, 2300, 71, 2299, 2305, 2307, 71, 2301, - 71, 71, 2308, 2309, 71, 71, 71, 2303, 71, 2304, + 71, 71, 71, 2266, 71, 2257, 2265, 71, 2267, 71, + 71, 2263, 71, 2272, 71, 71, 2268, 71, 2264, 2274, + 71, 2269, 2275, 71, 71, 71, 71, 71, 2271, 2277, + 2270, 71, 2278, 71, 2273, 2276, 2281, 71, 2279, 2284, + 71, 71, 71, 71, 71, 71, 71, 2280, 71, 71, + 2285, 71, 2291, 2282, 71, 71, 71, 2283, 2288, 2293, + 71, 71, 2290, 2287, 2292, 2302, 71, 2295, 2286, 2294, + 2289, 71, 71, 71, 2298, 2299, 71, 2300, 2296, 2303, + 71, 2301, 71, 2297, 71, 2304, 71, 2305, 71, 2306, + 71, 2307, 71, 2308, 71, 71, 71, 71, 71, 71, - 2311, 71, 71, 2310, 71, 71, 2315, 71, 2313, 71, - 2319, 2320, 71, 71, 2312, 2323, 71, 71, 2314, 71, - 71, 2324, 2316, 2317, 2321, 2318, 71, 2327, 71, 71, - 2326, 2322, 71, 2328, 2325, 2331, 71, 71, 71, 2333, - 71, 2335, 71, 71, 71, 71, 2338, 71, 2336, 2329, - 2332, 71, 2330, 71, 2339, 71, 2334, 2337, 71, 71, - 71, 2345, 71, 71, 2341, 71, 2340, 2343, 2342, 2344, - 2347, 71, 71, 71, 2346, 71, 2349, 2348, 71, 71, - 2350, 71, 71, 71, 2352, 71, 2353, 2355, 2356, 2358, - 71, 71, 2351, 71, 2354, 2364, 2357, 2359, 71, 71, + 2317, 71, 2318, 71, 71, 2314, 71, 2321, 71, 2309, + 71, 71, 2310, 2311, 71, 2320, 2312, 2313, 2315, 2316, + 2322, 2323, 71, 71, 71, 71, 2319, 71, 2324, 71, + 2326, 71, 2325, 2332, 71, 2333, 71, 71, 2334, 2327, + 71, 71, 71, 2328, 71, 2329, 71, 2330, 2331, 71, + 2904, 2338, 71, 2343, 71, 2335, 2336, 2341, 71, 2337, + 2342, 71, 2339, 2344, 2345, 71, 71, 71, 71, 2340, + 71, 71, 71, 71, 71, 71, 2347, 2351, 71, 71, + 71, 71, 2349, 2355, 2372, 2346, 71, 2348, 2356, 71, + 2360, 2350, 2358, 2352, 2353, 71, 2357, 71, 2354, 2359, - 2360, 71, 71, 2362, 2361, 71, 2366, 2365, 71, 2363, - 71, 2369, 71, 2370, 71, 2368, 71, 2372, 71, 71, - 2374, 2858, 2373, 2367, 2378, 2375, 71, 71, 71, 2371, - 71, 71, 2376, 2377, 71, 2379, 71, 71, 71, 2380, - 71, 71, 71, 71, 71, 2381, 2383, 2384, 2386, 71, - 71, 71, 2382, 2385, 2387, 2389, 2388, 71, 2391, 71, - 71, 71, 2390, 71, 2395, 71, 71, 71, 2397, 2393, - 2394, 71, 2392, 71, 2396, 2400, 71, 71, 71, 2404, - 71, 71, 2403, 71, 71, 71, 2398, 2402, 2408, 2411, - 2399, 2412, 2401, 2409, 71, 71, 2405, 71, 2406, 2413, + 71, 2362, 2363, 71, 71, 71, 71, 2367, 71, 71, + 2361, 2369, 71, 71, 2371, 71, 71, 2364, 2374, 71, + 71, 2368, 71, 2375, 71, 2365, 2366, 71, 2373, 2377, + 71, 71, 2370, 2904, 71, 71, 71, 2378, 2382, 71, + 2379, 2385, 2376, 2380, 2381, 71, 2383, 2384, 71, 71, + 2386, 71, 71, 71, 71, 71, 2388, 2904, 71, 71, + 2389, 71, 2392, 2387, 2391, 71, 2394, 2397, 71, 71, + 2395, 71, 2390, 2393, 2396, 2398, 71, 71, 2399, 71, + 2403, 71, 2400, 71, 71, 2405, 71, 2401, 2404, 71, + 2408, 71, 2409, 71, 2407, 71, 2406, 2402, 2411, 71, - 71, 2407, 2414, 71, 71, 71, 71, 71, 2415, 2416, - 2410, 71, 71, 71, 71, 2417, 2419, 71, 2422, 71, - 2418, 2423, 71, 2424, 71, 2420, 2425, 71, 2421, 2426, - 71, 2428, 71, 2431, 2427, 71, 2429, 71, 2434, 2430, - 2432, 71, 2433, 71, 71, 71, 2437, 71, 71, 2438, - 2439, 71, 71, 2441, 71, 71, 71, 2435, 71, 2445, - 2446, 71, 71, 2436, 2448, 71, 2447, 2440, 2442, 2449, - 71, 71, 2444, 71, 2443, 71, 71, 2454, 71, 71, - 71, 71, 2453, 71, 2456, 2457, 71, 71, 71, 2459, - 71, 2460, 2458, 2451, 2450, 2452, 71, 71, 71, 2462, + 71, 2413, 2904, 2412, 71, 71, 2414, 71, 2410, 2415, + 2416, 2417, 71, 71, 71, 71, 2418, 71, 2419, 71, + 71, 71, 71, 2420, 71, 2423, 71, 2422, 71, 2425, + 2421, 2426, 71, 2424, 2427, 71, 71, 2428, 71, 71, + 2429, 71, 2434, 71, 2430, 71, 71, 2432, 2433, 2431, + 71, 71, 2435, 2439, 71, 71, 71, 71, 2443, 71, + 71, 71, 71, 71, 2436, 2441, 2437, 2447, 71, 2438, + 2440, 2473, 2442, 2450, 2444, 2445, 2448, 71, 2451, 71, + 2452, 2446, 2453, 71, 71, 71, 71, 2449, 71, 71, + 71, 71, 71, 2454, 2455, 2458, 71, 2456, 71, 2461, - 71, 71, 2465, 2455, 2461, 2469, 71, 2463, 2464, 71, - 71, 71, 2475, 71, 71, 2468, 2466, 2472, 2471, 71, - 2467, 2858, 2473, 71, 71, 2476, 71, 2477, 2470, 71, - 2474, 71, 2478, 71, 2479, 2480, 71, 71, 71, 71, - 2483, 2481, 2487, 71, 71, 71, 2484, 2488, 71, 2482, - 2490, 71, 2492, 71, 71, 2491, 71, 71, 2485, 2486, - 71, 2493, 71, 2489, 2494, 71, 2495, 2499, 71, 2496, - 71, 2497, 2498, 71, 2500, 71, 71, 71, 2503, 2507, - 71, 71, 2501, 2504, 71, 71, 2506, 71, 71, 2505, - 2502, 71, 71, 71, 2509, 71, 71, 71, 71, 2508, + 2462, 71, 71, 2457, 2463, 71, 2459, 2464, 71, 2465, + 71, 2460, 2467, 71, 71, 2470, 71, 2468, 71, 2471, + 71, 71, 2466, 2472, 71, 71, 2477, 71, 71, 2474, + 71, 2478, 71, 2469, 2479, 71, 2481, 71, 71, 2475, + 71, 2485, 71, 2480, 71, 2476, 2487, 71, 2486, 71, + 2483, 2482, 2488, 71, 2484, 71, 71, 2489, 71, 2494, + 71, 71, 2493, 71, 71, 71, 2498, 2490, 2496, 2497, + 71, 2499, 71, 2491, 71, 2492, 71, 2500, 71, 2502, + 71, 71, 71, 2509, 71, 2495, 2505, 71, 71, 71, + 2904, 71, 2515, 71, 71, 2503, 2504, 2501, 2506, 2511, - 2510, 2512, 2516, 2517, 71, 2514, 71, 2518, 71, 71, - 2858, 2513, 2511, 2519, 2520, 2528, 2515, 71, 2521, 2523, - 71, 2522, 2524, 71, 2525, 71, 71, 71, 2527, 71, - 2530, 71, 2529, 71, 2531, 2526, 71, 71, 2532, 2533, - 71, 71, 71, 71, 2538, 71, 2536, 2540, 71, 2534, - 71, 71, 71, 2544, 71, 71, 71, 71, 2535, 2547, - 2537, 71, 71, 71, 2541, 71, 2542, 71, 2539, 2545, - 2546, 2548, 2543, 2551, 71, 2554, 71, 2549, 71, 2552, - 2556, 71, 2550, 2557, 71, 71, 2559, 71, 71, 71, - 71, 71, 71, 2553, 71, 2563, 71, 2555, 2564, 71, + 2512, 2508, 2507, 71, 2516, 2513, 71, 2510, 2514, 71, + 2517, 71, 2518, 71, 2519, 71, 71, 71, 71, 71, + 2523, 2521, 71, 2527, 71, 71, 71, 2524, 2528, 2530, + 71, 2520, 71, 71, 2532, 71, 71, 2522, 71, 2525, + 2531, 2533, 2526, 71, 2529, 2534, 71, 2535, 71, 71, + 2538, 71, 2536, 2539, 71, 2540, 71, 2537, 2541, 2543, + 71, 71, 2547, 71, 2544, 71, 71, 71, 71, 71, + 2546, 2542, 71, 2545, 71, 71, 2549, 2554, 71, 71, + 2550, 2552, 71, 71, 2548, 71, 2555, 2557, 71, 2559, + 2558, 71, 71, 71, 2551, 2553, 71, 2561, 2569, 2556, - 71, 2568, 71, 71, 2560, 2561, 2558, 2562, 2570, 71, - 2572, 71, 2565, 2573, 71, 2567, 2569, 2566, 71, 2575, - 71, 71, 71, 2579, 71, 71, 71, 2583, 71, 71, - 2577, 2571, 71, 71, 2585, 2584, 71, 2581, 2574, 2576, - 71, 2588, 2578, 2580, 2589, 71, 2582, 71, 2586, 71, - 2591, 71, 2590, 71, 71, 71, 71, 2596, 2593, 2594, - 2587, 71, 71, 71, 2599, 71, 2600, 71, 71, 2592, - 2603, 71, 2604, 71, 2595, 71, 71, 2602, 2597, 2598, - 2605, 2601, 71, 2608, 71, 2609, 71, 2607, 2610, 71, - 2606, 71, 2612, 71, 71, 71, 2611, 71, 71, 71, + 2560, 71, 2562, 2564, 71, 2563, 2565, 71, 2566, 71, + 71, 71, 2571, 2568, 2575, 71, 2570, 71, 71, 2567, + 2572, 71, 2573, 2574, 71, 71, 71, 2579, 71, 71, + 2577, 2581, 71, 71, 71, 71, 2585, 71, 71, 71, + 71, 71, 2576, 71, 2578, 2588, 71, 71, 2582, 2583, + 71, 2586, 2587, 2580, 71, 2584, 2589, 71, 2592, 2590, + 2595, 71, 2593, 2597, 71, 2591, 2594, 2598, 71, 71, + 2600, 71, 71, 2596, 71, 71, 71, 2605, 71, 2604, + 71, 71, 71, 71, 2609, 71, 71, 71, 2601, 71, + 2599, 2602, 2603, 71, 2611, 2613, 71, 2614, 71, 2610, - 2617, 2618, 71, 71, 71, 71, 2622, 71, 71, 2858, - 71, 2625, 71, 2613, 2621, 2624, 71, 2614, 2619, 2615, - 2616, 2626, 71, 2620, 71, 2628, 71, 2623, 2631, 71, - 2627, 71, 71, 71, 2630, 71, 2629, 2632, 71, 71, - 71, 71, 71, 2635, 71, 71, 2637, 71, 71, 2638, - 71, 2636, 71, 2633, 71, 2634, 71, 71, 71, 2647, - 71, 2639, 2652, 2643, 2640, 2641, 2642, 2644, 2645, 2669, - 2649, 2650, 71, 2646, 2651, 71, 2648, 2653, 71, 2654, - 71, 2655, 2656, 71, 71, 2657, 2658, 2661, 71, 2659, - 2660, 71, 71, 2662, 71, 71, 71, 2666, 71, 71, + 2606, 2608, 2616, 71, 2607, 71, 71, 2615, 2612, 71, + 71, 2621, 71, 2620, 71, 2619, 2618, 71, 2625, 71, + 71, 71, 2617, 2626, 2623, 71, 2627, 71, 2622, 2630, + 2624, 2631, 71, 2628, 2629, 71, 71, 2633, 71, 2632, + 71, 71, 71, 71, 2638, 2634, 2635, 2636, 71, 71, + 71, 2641, 71, 2642, 71, 2645, 71, 2637, 2644, 2643, + 2646, 71, 71, 71, 71, 2639, 2640, 2647, 71, 2649, + 2650, 71, 2651, 71, 2652, 71, 71, 2648, 2654, 71, + 71, 2653, 71, 71, 71, 2659, 71, 2655, 2660, 71, + 71, 71, 71, 2664, 71, 71, 2666, 2667, 71, 71, - 2665, 71, 71, 71, 71, 2668, 2667, 71, 2673, 2663, - 2664, 2674, 71, 2672, 2675, 71, 71, 2670, 71, 2680, - 71, 2671, 2682, 2677, 2681, 71, 71, 71, 71, 2678, - 71, 2676, 2679, 71, 71, 2686, 71, 2689, 71, 2687, - 71, 71, 2684, 2691, 71, 2690, 2692, 71, 2693, 71, - 2699, 2683, 2694, 71, 2685, 2688, 2695, 71, 2696, 71, - 2697, 71, 2698, 71, 2700, 71, 71, 2702, 71, 71, - 71, 71, 2706, 71, 71, 2708, 71, 71, 71, 71, - 71, 2710, 71, 2704, 2703, 2705, 2701, 71, 2712, 2707, - 71, 2715, 71, 2714, 71, 2709, 2716, 71, 2713, 2717, + 2661, 2663, 2656, 71, 2657, 2658, 2668, 71, 2669, 2671, + 2662, 71, 71, 2670, 2665, 71, 2674, 71, 71, 71, + 2673, 71, 71, 2672, 2675, 71, 71, 2678, 71, 71, + 71, 71, 2680, 71, 71, 71, 2681, 2679, 2676, 71, + 71, 2677, 71, 2693, 71, 71, 2904, 2690, 2682, 2686, + 2683, 2684, 2685, 2694, 71, 2691, 2687, 2688, 2692, 71, + 71, 2689, 71, 2695, 2696, 71, 2697, 71, 2698, 2699, + 71, 71, 2700, 2701, 2704, 71, 2702, 2703, 2706, 71, + 2705, 71, 71, 71, 2709, 71, 71, 2710, 2708, 71, + 71, 71, 71, 2711, 2712, 71, 2707, 71, 2713, 71, - 71, 71, 71, 71, 71, 2711, 2722, 2723, 71, 71, - 71, 2718, 71, 2726, 71, 71, 71, 2720, 2719, 2721, - 71, 2725, 2732, 71, 71, 2724, 71, 2730, 2728, 2731, - 2727, 71, 2734, 71, 71, 71, 2735, 71, 2729, 71, - 71, 2733, 71, 71, 71, 2745, 71, 71, 71, 2829, - 2738, 71, 2736, 2737, 2740, 71, 2743, 2746, 2747, 71, - 71, 2741, 2739, 2742, 2744, 71, 2748, 2749, 71, 2750, - 71, 2752, 71, 71, 2751, 2753, 71, 71, 2754, 71, - 2758, 2755, 71, 2761, 71, 2756, 71, 71, 2763, 71, - 71, 71, 2757, 2759, 2766, 71, 71, 2767, 71, 71, + 2717, 2718, 71, 71, 2716, 71, 2714, 2719, 71, 71, + 2715, 71, 2720, 2724, 2721, 2726, 71, 71, 2725, 71, + 2722, 71, 2730, 2723, 71, 71, 2729, 71, 2727, 2731, + 71, 2728, 2733, 71, 2848, 2734, 2735, 71, 2736, 71, + 2737, 71, 2738, 71, 2732, 2739, 71, 2740, 71, 2741, + 71, 2742, 71, 71, 2744, 71, 71, 71, 71, 2747, + 71, 71, 2743, 71, 71, 2751, 71, 2753, 71, 71, + 71, 71, 2748, 2755, 2749, 2750, 2745, 2746, 71, 2757, + 71, 2752, 71, 2760, 71, 2759, 71, 2754, 71, 71, + 71, 71, 71, 2762, 71, 2767, 71, 2756, 2758, 71, - 71, 71, 2760, 71, 2770, 2764, 2762, 2768, 2771, 2765, - 71, 2775, 71, 2773, 71, 2772, 71, 2769, 71, 71, - 71, 71, 2774, 2778, 71, 71, 2780, 71, 71, 71, - 71, 71, 2777, 71, 2785, 2786, 2776, 71, 2782, 71, - 2779, 2783, 2790, 2781, 2789, 71, 2784, 2791, 2858, 2787, - 71, 2792, 2788, 71, 71, 71, 71, 2797, 2796, 2793, - 2794, 2795, 71, 71, 2799, 71, 71, 2798, 71, 71, - 2800, 71, 71, 2805, 71, 71, 2802, 71, 2808, 71, - 2809, 71, 71, 71, 71, 71, 71, 2801, 2807, 2812, - 2803, 2804, 2810, 2806, 71, 2811, 71, 2816, 71, 2815, + 2761, 2768, 71, 2763, 2769, 71, 71, 2765, 2764, 2766, + 71, 71, 71, 2774, 2772, 2771, 71, 71, 71, 2770, + 2778, 71, 2777, 71, 2780, 71, 71, 2776, 71, 71, + 71, 2773, 71, 71, 71, 2775, 2779, 71, 2781, 2791, + 71, 71, 71, 71, 2875, 2782, 2783, 71, 2784, 2786, + 71, 2787, 2792, 2788, 2785, 2789, 71, 2790, 2793, 71, + 71, 2794, 2795, 71, 2796, 71, 2797, 71, 71, 71, + 2798, 2799, 2800, 71, 2801, 71, 2804, 71, 2807, 71, + 71, 2802, 71, 2809, 71, 71, 71, 71, 2803, 2805, + 2812, 71, 71, 2813, 71, 2814, 2816, 2806, 71, 2808, - 71, 2813, 71, 2817, 2814, 71, 2820, 2818, 71, 2822, - 71, 2823, 71, 71, 71, 2827, 71, 2824, 71, 71, - 2825, 2821, 71, 2828, 2830, 71, 2819, 71, 71, 2831, - 71, 2836, 71, 2826, 2832, 2834, 71, 71, 2833, 71, - 71, 71, 2838, 71, 2839, 71, 2842, 2835, 2843, 71, - 71, 71, 2846, 2847, 71, 2837, 71, 2849, 71, 2840, - 2841, 71, 2844, 2848, 2850, 71, 71, 71, 2851, 2845, - 71, 2852, 2853, 71, 2856, 71, 2857, 71, 2858, 2858, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2854, - 2858, 2858, 2855, 43, 43, 43, 43, 43, 43, 43, + 2810, 2817, 71, 71, 2811, 71, 71, 71, 2821, 71, + 71, 71, 2818, 2815, 2824, 71, 2819, 71, 71, 71, + 71, 71, 2826, 71, 2820, 2823, 2822, 71, 2831, 71, + 71, 71, 2828, 2829, 2832, 2825, 2836, 2827, 2835, 71, + 2830, 2837, 71, 2838, 71, 2833, 71, 71, 71, 2834, + 71, 2839, 2843, 2840, 71, 2841, 2845, 71, 71, 2844, + 71, 71, 71, 2842, 2846, 71, 2851, 71, 71, 71, + 71, 2854, 71, 2855, 71, 71, 71, 71, 71, 71, + 2847, 2849, 2853, 2858, 2850, 2856, 2852, 2859, 2857, 71, + 2861, 71, 2862, 71, 2860, 71, 2866, 71, 2863, 71, - 48, 48, 48, 48, 48, 48, 48, 53, 53, 53, - 53, 53, 53, 53, 59, 59, 59, 59, 59, 59, - 59, 64, 64, 64, 64, 64, 64, 64, 74, 74, - 2858, 74, 74, 74, 74, 140, 140, 2858, 2858, 2858, - 140, 140, 142, 142, 2858, 2858, 142, 2858, 142, 144, - 2858, 2858, 2858, 2858, 2858, 144, 147, 147, 2858, 2858, - 2858, 147, 147, 149, 2858, 2858, 2858, 2858, 2858, 149, - 151, 151, 2858, 151, 151, 151, 151, 75, 75, 2858, - 75, 75, 75, 75, 13, 2858, 2858, 2858, 2858, 2858, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, + 2868, 71, 2864, 71, 2869, 2865, 2870, 71, 71, 2873, + 71, 71, 71, 71, 2871, 71, 2867, 2874, 2876, 71, + 2877, 71, 2878, 71, 2882, 71, 2880, 2872, 71, 71, + 2879, 71, 71, 71, 2884, 71, 2885, 71, 2888, 2889, + 71, 71, 2881, 71, 2892, 2893, 71, 2883, 71, 2895, + 71, 2886, 2887, 71, 2890, 2894, 2896, 71, 71, 71, + 2891, 71, 71, 2904, 2898, 2897, 2899, 2902, 71, 2903, + 71, 2904, 2900, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2901, 43, 43, 43, 43, 43, 43, 43, 48, + 48, 48, 48, 48, 48, 48, 53, 53, 53, 53, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, - 2858, 2858, 2858, 2858, 2858 + 53, 53, 53, 59, 59, 59, 59, 59, 59, 59, + 64, 64, 64, 64, 64, 64, 64, 74, 74, 2904, + 74, 74, 74, 74, 140, 140, 2904, 2904, 2904, 140, + 140, 142, 142, 2904, 2904, 142, 2904, 142, 144, 2904, + 2904, 2904, 2904, 2904, 144, 147, 147, 2904, 2904, 2904, + 147, 147, 149, 2904, 2904, 2904, 2904, 2904, 149, 151, + 151, 2904, 151, 151, 151, 151, 75, 75, 2904, 75, + 75, 75, 75, 13, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + + 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2904, 2904 } ; -static yyconst flex_int16_t yy_chk[5626] = +static yyconst flex_int16_t yy_chk[5715] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -2003,13 +2029,13 @@ static yyconst flex_int16_t yy_chk[5626] = 5, 3, 6, 20, 4, 20, 20, 5, 20, 6, 7, 7, 7, 7, 20, 7, 8, 8, 8, 8, 29, 8, 7, 9, 9, 9, 22, 22, 8, 10, - 10, 10, 15, 25, 9, 29, 15, 25, 2864, 31, + 10, 10, 15, 25, 9, 29, 15, 25, 2910, 31, 10, 11, 11, 11, 11, 11, 11, 19, 79, 19, 19, 30, 19, 11, 31, 79, 30, 25, 19, 19, 47, 47, 11, 12, 12, 12, 12, 12, 12, 21, 23, 23, 21, 21, 24, 12, 21, 81, 23, 24, - 34, 21, 23, 24, 12, 23, 24, 960, 24, 24, + 34, 21, 23, 24, 12, 23, 24, 971, 24, 24, 21, 26, 26, 27, 27, 90, 28, 81, 32, 32, 28, 34, 27, 28, 33, 33, 26, 32, 36, 33, 28, 35, 28, 32, 90, 42, 35, 32, 52, 84, @@ -2033,587 +2059,597 @@ static yyconst flex_int16_t yy_chk[5626] = 119, 111, 121, 116, 118, 118, 122, 116, 120, 113, 112, 124, 120, 127, 127, 115, 125, 121, 126, 117, 119, 120, 125, 123, 124, 122, 123, 120, 128, 129, - 126, 130, 131, 132, 127, 135, 133, 123, 133, 134, - 135, 123, 136, 137, 139, 129, 128, 133, 147, 132, - 130, 134, 138, 131, 136, 141, 141, 138, 139, 133, - 143, 137, 145, 143, 145, 145, 154, 145, 148, 148, - 150, 154, 150, 150, 151, 150, 151, 151, 153, 151, + 126, 127, 130, 131, 127, 134, 132, 123, 133, 135, + 133, 123, 137, 136, 135, 129, 128, 134, 138, 133, + 139, 130, 132, 138, 131, 136, 141, 141, 147, 143, + 137, 133, 143, 145, 139, 145, 145, 154, 145, 148, + 148, 150, 154, 150, 150, 151, 150, 151, 151, 153, - 156, 153, 155, 160, 157, 158, 151, 161, 155, 162, - 163, 160, 164, 158, 165, 163, 167, 155, 156, 157, - 158, 166, 191, 165, 162, 168, 161, 166, 166, 170, - 168, 178, 164, 169, 169, 170, 172, 171, 191, 171, - 172, 167, 171, 173, 173, 172, 174, 175, 176, 177, - 172, 178, 175, 176, 179, 182, 172, 172, 180, 171, - 179, 177, 180, 181, 183, 174, 184, 185, 181, 182, - 186, 187, 189, 190, 192, 186, 187, 189, 184, 183, - 192, 184, 196, 179, 194, 185, 188, 188, 193, 193, - 194, 195, 188, 190, 197, 198, 194, 195, 199, 200, + 151, 156, 153, 155, 160, 157, 158, 151, 161, 155, + 162, 163, 160, 164, 158, 165, 163, 167, 155, 156, + 157, 158, 166, 191, 165, 162, 168, 161, 166, 166, + 170, 168, 178, 164, 169, 169, 170, 172, 171, 191, + 171, 172, 167, 171, 173, 173, 172, 174, 175, 176, + 177, 172, 178, 175, 176, 179, 182, 172, 172, 180, + 171, 179, 177, 180, 181, 183, 174, 184, 185, 181, + 182, 186, 187, 189, 190, 192, 186, 187, 189, 184, + 183, 192, 184, 196, 179, 194, 185, 188, 188, 193, + 193, 194, 195, 188, 190, 197, 198, 194, 195, 199, - 197, 198, 196, 201, 188, 200, 188, 202, 201, 203, - 198, 204, 205, 202, 206, 203, 207, 208, 204, 199, - 206, 209, 210, 208, 211, 205, 212, 214, 215, 213, - 210, 212, 216, 218, 217, 220, 207, 211, 213, 217, - 221, 219, 214, 209, 215, 219, 221, 222, 223, 224, - 146, 218, 216, 225, 223, 225, 226, 220, 227, 229, - 231, 228, 230, 226, 227, 222, 222, 228, 230, 224, - 232, 235, 231, 233, 233, 234, 234, 235, 229, 236, - 237, 238, 237, 239, 232, 236, 240, 241, 239, 242, - 243, 244, 245, 256, 246, 235, 244, 242, 240, 237, + 200, 197, 198, 196, 201, 188, 200, 188, 202, 201, + 203, 198, 204, 205, 202, 206, 203, 207, 208, 204, + 199, 206, 209, 210, 208, 211, 205, 212, 214, 215, + 213, 210, 212, 216, 218, 217, 220, 207, 211, 213, + 217, 221, 219, 214, 209, 215, 219, 221, 222, 223, + 224, 225, 218, 216, 227, 223, 225, 226, 220, 226, + 230, 227, 228, 229, 232, 231, 222, 222, 228, 229, + 224, 231, 233, 234, 234, 236, 232, 235, 235, 230, + 239, 236, 237, 238, 240, 238, 233, 242, 237, 240, + 243, 244, 241, 246, 260, 245, 260, 257, 243, 236, - 246, 247, 251, 248, 238, 250, 241, 247, 248, 249, - 243, 250, 252, 253, 249, 245, 254, 251, 256, 255, - 258, 262, 257, 258, 260, 260, 252, 255, 257, 265, - 254, 253, 259, 261, 259, 266, 261, 263, 263, 262, - 264, 264, 269, 267, 268, 265, 267, 270, 268, 271, - 266, 269, 272, 270, 273, 274, 273, 277, 272, 279, - 275, 274, 277, 271, 275, 276, 276, 278, 280, 281, - 282, 283, 283, 278, 284, 285, 286, 284, 287, 279, - 286, 275, 289, 282, 288, 288, 280, 291, 290, 292, - 281, 290, 294, 285, 293, 292, 287, 293, 296, 291, + 245, 247, 238, 239, 241, 249, 242, 247, 248, 251, + 249, 244, 250, 252, 248, 251, 246, 250, 253, 254, + 255, 256, 257, 259, 258, 263, 259, 267, 252, 256, + 258, 266, 253, 146, 255, 261, 261, 254, 262, 264, + 264, 262, 267, 263, 265, 265, 268, 266, 269, 268, + 270, 271, 269, 272, 273, 275, 274, 271, 274, 270, + 273, 275, 276, 277, 277, 278, 276, 272, 279, 280, + 278, 282, 281, 283, 279, 284, 284, 285, 286, 288, + 285, 287, 290, 276, 144, 287, 283, 289, 289, 280, + 281, 291, 282, 292, 291, 293, 286, 288, 295, 294, - 289, 297, 301, 298, 294, 295, 299, 296, 298, 299, - 300, 299, 144, 300, 295, 301, 302, 295, 303, 297, - 303, 303, 295, 295, 295, 295, 306, 299, 302, 304, - 304, 305, 307, 308, 305, 309, 310, 310, 312, 312, - 311, 313, 308, 306, 309, 311, 306, 307, 314, 315, - 316, 317, 318, 314, 319, 320, 313, 321, 322, 326, - 319, 315, 321, 323, 322, 324, 329, 318, 323, 316, - 324, 317, 329, 326, 325, 320, 324, 325, 327, 325, - 328, 327, 330, 331, 142, 335, 331, 330, 334, 328, - 333, 377, 331, 337, 327, 377, 331, 327, 336, 327, + 290, 293, 294, 297, 298, 292, 301, 309, 299, 301, + 295, 296, 297, 299, 300, 303, 309, 300, 308, 300, + 296, 302, 298, 296, 305, 305, 307, 303, 296, 296, + 296, 296, 310, 308, 302, 300, 304, 306, 304, 304, + 306, 310, 312, 307, 311, 311, 307, 312, 313, 313, + 314, 315, 316, 317, 318, 319, 315, 320, 321, 327, + 329, 322, 323, 320, 316, 314, 322, 142, 323, 329, + 319, 324, 317, 327, 318, 325, 324, 331, 321, 326, + 325, 336, 326, 331, 326, 328, 325, 332, 328, 330, + 330, 335, 332, 337, 333, 338, 444, 333, 339, 342, - 335, 340, 342, 343, 331, 332, 332, 337, 332, 334, - 333, 339, 343, 336, 339, 340, 345, 342, 346, 140, - 348, 332, 345, 347, 332, 350, 332, 349, 332, 352, - 339, 341, 344, 341, 341, 348, 349, 344, 344, 346, - 353, 356, 347, 341, 350, 341, 341, 341, 351, 354, - 341, 355, 357, 358, 351, 352, 359, 355, 364, 361, - 353, 355, 360, 354, 356, 363, 363, 360, 365, 362, - 366, 359, 357, 358, 361, 362, 367, 368, 364, 369, - 365, 370, 367, 372, 366, 373, 370, 371, 371, 374, - 371, 376, 375, 376, 378, 369, 379, 379, 378, 380, + 345, 328, 336, 333, 328, 344, 328, 333, 337, 345, + 338, 335, 339, 342, 349, 333, 334, 334, 444, 334, + 344, 341, 346, 347, 341, 348, 354, 346, 346, 347, + 350, 352, 334, 349, 355, 334, 353, 334, 351, 334, + 341, 343, 353, 343, 343, 350, 348, 351, 356, 358, + 352, 359, 354, 343, 355, 343, 343, 343, 357, 360, + 343, 361, 356, 363, 357, 362, 366, 364, 357, 367, + 362, 359, 358, 364, 365, 365, 361, 368, 363, 360, + 370, 367, 369, 371, 372, 375, 366, 374, 369, 372, + 376, 368, 373, 373, 377, 373, 378, 383, 378, 371, - 381, 373, 368, 372, 382, 374, 375, 383, 384, 387, - 385, 376, 386, 378, 387, 381, 391, 389, 380, 385, - 382, 386, 384, 388, 395, 383, 389, 388, 390, 392, - 385, 70, 385, 394, 390, 392, 393, 391, 394, 397, - 393, 396, 396, 398, 395, 399, 400, 400, 398, 401, - 402, 403, 397, 404, 402, 401, 405, 406, 399, 407, - 407, 405, 406, 408, 409, 410, 403, 411, 407, 412, - 414, 416, 412, 413, 404, 408, 416, 413, 417, 411, - 415, 415, 414, 410, 409, 418, 418, 420, 420, 421, - 422, 423, 424, 425, 428, 427, 430, 429, 422, 417, + 379, 375, 381, 381, 379, 370, 376, 374, 377, 380, + 382, 384, 383, 380, 385, 387, 378, 386, 389, 393, + 140, 388, 390, 389, 387, 391, 390, 384, 380, 382, + 388, 386, 385, 392, 391, 387, 394, 387, 396, 392, + 393, 395, 394, 396, 397, 395, 398, 398, 399, 400, + 401, 402, 402, 403, 400, 405, 404, 406, 412, 403, + 404, 399, 407, 401, 397, 411, 408, 407, 409, 409, + 405, 408, 410, 419, 413, 70, 412, 409, 406, 414, + 416, 423, 414, 415, 410, 411, 413, 415, 417, 417, + 418, 425, 416, 424, 419, 418, 420, 420, 422, 422, - 423, 433, 430, 432, 434, 425, 433, 431, 440, 432, - 421, 429, 424, 427, 428, 427, 431, 435, 434, 437, - 436, 438, 440, 439, 438, 435, 436, 441, 435, 439, - 442, 444, 441, 443, 446, 444, 445, 447, 449, 437, - 448, 445, 447, 451, 453, 452, 454, 439, 453, 446, - 457, 455, 442, 458, 443, 457, 448, 449, 450, 450, - 452, 64, 466, 451, 450, 454, 450, 455, 458, 456, - 459, 460, 450, 456, 450, 459, 461, 450, 450, 463, - 462, 465, 466, 468, 450, 461, 462, 460, 470, 464, - 471, 462, 464, 467, 467, 463, 469, 469, 472, 473, + 425, 424, 423, 426, 427, 430, 429, 431, 432, 433, + 435, 434, 439, 436, 432, 435, 427, 434, 433, 440, + 437, 431, 440, 426, 429, 430, 429, 436, 437, 438, + 441, 437, 439, 442, 443, 438, 441, 445, 446, 443, + 447, 448, 446, 449, 450, 447, 451, 442, 449, 452, + 454, 456, 457, 455, 441, 456, 448, 458, 445, 459, + 450, 461, 452, 459, 462, 451, 453, 453, 455, 462, + 454, 457, 453, 458, 453, 463, 461, 466, 460, 464, + 453, 468, 453, 460, 465, 453, 453, 460, 464, 469, + 465, 463, 453, 466, 467, 465, 471, 467, 470, 470, - 474, 475, 471, 470, 465, 476, 475, 477, 468, 478, - 479, 481, 485, 472, 476, 482, 479, 483, 473, 482, - 481, 484, 474, 483, 478, 486, 477, 485, 487, 489, - 488, 490, 492, 484, 492, 490, 491, 495, 493, 494, - 494, 496, 487, 495, 486, 488, 493, 489, 497, 491, - 498, 500, 499, 496, 497, 499, 501, 503, 502, 504, - 503, 505, 498, 502, 506, 500, 507, 514, 504, 506, - 506, 501, 508, 508, 521, 504, 510, 505, 504, 507, - 509, 509, 510, 511, 511, 512, 512, 513, 514, 515, - 516, 517, 515, 513, 518, 516, 519, 521, 520, 519, + 472, 472, 473, 474, 468, 475, 476, 477, 478, 469, + 479, 480, 481, 478, 484, 474, 482, 473, 488, 479, + 475, 471, 482, 484, 485, 476, 486, 481, 485, 477, + 480, 487, 486, 488, 489, 490, 491, 492, 493, 494, + 496, 498, 493, 487, 495, 503, 495, 498, 496, 490, + 499, 491, 494, 489, 500, 492, 497, 497, 501, 503, + 500, 502, 499, 504, 502, 506, 505, 507, 506, 508, + 501, 505, 511, 511, 509, 510, 507, 517, 504, 509, + 509, 512, 512, 507, 513, 508, 507, 520, 510, 516, + 513, 514, 514, 515, 515, 516, 518, 519, 517, 518, - 522, 523, 518, 520, 525, 523, 524, 526, 525, 527, - 517, 528, 524, 530, 527, 529, 531, 533, 530, 522, - 532, 529, 535, 532, 536, 526, 534, 534, 532, 536, - 531, 528, 532, 537, 538, 533, 539, 540, 537, 542, - 535, 541, 542, 540, 547, 543, 548, 544, 538, 543, - 541, 539, 544, 545, 546, 549, 545, 550, 551, 546, - 547, 552, 549, 551, 548, 553, 553, 554, 555, 556, - 550, 543, 558, 557, 559, 561, 554, 560, 561, 564, - 559, 552, 557, 560, 558, 556, 562, 555, 563, 562, - 565, 567, 566, 563, 568, 574, 567, 564, 566, 569, + 521, 522, 519, 524, 522, 523, 520, 526, 521, 525, + 523, 526, 527, 528, 529, 530, 531, 528, 527, 532, + 530, 534, 533, 536, 64, 532, 524, 533, 525, 538, + 535, 541, 529, 535, 59, 534, 531, 542, 535, 537, + 537, 536, 535, 539, 540, 541, 544, 538, 539, 540, + 543, 545, 542, 546, 545, 544, 543, 546, 547, 548, + 549, 550, 548, 547, 551, 549, 552, 553, 555, 554, + 556, 556, 557, 552, 554, 558, 559, 550, 560, 546, + 553, 557, 551, 561, 562, 563, 564, 560, 555, 564, + 562, 563, 559, 565, 558, 561, 565, 566, 567, 568, - 568, 570, 569, 571, 565, 572, 570, 573, 571, 571, - 575, 576, 577, 580, 574, 574, 575, 578, 572, 580, - 573, 577, 578, 579, 581, 585, 579, 582, 583, 586, - 576, 586, 582, 583, 583, 587, 581, 584, 584, 589, - 588, 579, 588, 590, 591, 592, 593, 594, 596, 595, - 585, 594, 597, 598, 587, 599, 600, 589, 595, 602, - 601, 590, 591, 596, 592, 602, 593, 597, 600, 603, - 604, 598, 605, 606, 599, 601, 607, 608, 609, 610, - 607, 611, 604, 603, 612, 613, 613, 615, 616, 614, - 617, 605, 606, 614, 619, 608, 609, 610, 612, 616, + 569, 571, 566, 570, 575, 573, 569, 571, 570, 572, + 573, 576, 572, 568, 574, 577, 567, 575, 579, 574, + 574, 578, 580, 581, 576, 588, 582, 578, 581, 582, + 583, 580, 54, 584, 577, 577, 583, 579, 585, 587, + 587, 586, 590, 585, 582, 584, 586, 586, 592, 589, + 588, 589, 591, 593, 591, 594, 595, 596, 597, 598, + 599, 590, 603, 598, 597, 600, 592, 601, 602, 599, + 605, 593, 604, 594, 607, 595, 609, 596, 608, 610, + 600, 603, 601, 606, 604, 605, 602, 611, 607, 606, + 608, 611, 612, 613, 614, 609, 615, 616, 610, 617, - 611, 620, 618, 621, 617, 622, 615, 618, 623, 625, - 619, 624, 622, 623, 625, 627, 621, 626, 624, 628, - 620, 629, 626, 630, 632, 631, 628, 633, 634, 636, - 629, 634, 633, 627, 631, 635, 632, 630, 637, 635, - 638, 640, 639, 636, 641, 641, 646, 637, 642, 642, - 643, 643, 644, 647, 648, 638, 639, 642, 650, 647, - 649, 644, 640, 651, 649, 646, 652, 653, 654, 656, - 650, 655, 657, 653, 648, 658, 654, 659, 655, 661, - 59, 664, 659, 667, 652, 668, 659, 656, 651, 659, - 669, 668, 667, 674, 661, 658, 659, 657, 664, 659, + 618, 618, 619, 620, 625, 622, 619, 621, 624, 613, + 612, 632, 614, 617, 615, 615, 616, 626, 621, 622, + 623, 627, 620, 625, 624, 623, 628, 629, 627, 632, + 626, 628, 630, 631, 629, 633, 634, 630, 631, 635, + 636, 638, 633, 637, 639, 634, 638, 639, 640, 636, + 641, 642, 640, 635, 643, 637, 644, 645, 646, 646, + 642, 651, 647, 647, 641, 648, 648, 649, 652, 643, + 644, 647, 653, 654, 652, 655, 649, 654, 645, 656, + 651, 657, 658, 659, 661, 662, 660, 655, 658, 663, + 669, 659, 653, 660, 672, 674, 664, 666, 679, 657, - 670, 671, 671, 673, 670, 675, 669, 672, 672, 676, - 677, 674, 679, 705, 673, 680, 677, 679, 682, 675, - 681, 683, 684, 684, 683, 687, 685, 686, 686, 676, - 678, 678, 678, 685, 678, 705, 680, 678, 681, 694, - 687, 689, 678, 682, 688, 688, 689, 690, 678, 678, - 690, 691, 692, 693, 692, 695, 691, 696, 694, 695, - 697, 698, 699, 699, 701, 693, 700, 702, 702, 698, - 703, 704, 708, 708, 706, 724, 724, 696, 701, 697, - 706, 700, 707, 704, 709, 54, 711, 707, 703, 709, - 709, 711, 712, 713, 716, 714, 715, 716, 712, 713, + 673, 664, 661, 672, 656, 664, 673, 669, 664, 663, + 662, 674, 666, 675, 678, 664, 679, 675, 664, 676, + 676, 677, 677, 680, 681, 678, 682, 685, 684, 687, + 698, 688, 682, 684, 688, 686, 690, 680, 689, 689, + 691, 691, 698, 690, 681, 683, 683, 683, 685, 683, + 692, 699, 683, 686, 687, 693, 693, 683, 697, 695, + 697, 694, 695, 683, 683, 692, 694, 696, 701, 700, + 699, 702, 696, 700, 703, 704, 704, 705, 708, 706, + 707, 707, 703, 709, 710, 711, 713, 713, 701, 712, + 702, 711, 705, 706, 712, 709, 708, 714, 750, 716, - 714, 717, 715, 718, 719, 720, 723, 717, 721, 722, - 725, 718, 719, 721, 726, 727, 722, 728, 730, 725, - 731, 727, 726, 720, 733, 723, 732, 730, 736, 731, - 737, 732, 734, 733, 735, 734, 728, 738, 738, 735, - 740, 739, 736, 741, 742, 745, 743, 745, 747, 743, - 746, 746, 741, 748, 749, 737, 739, 743, 748, 740, - 750, 751, 752, 753, 754, 759, 755, 756, 742, 747, - 755, 757, 758, 754, 759, 749, 760, 761, 758, 762, - 750, 751, 767, 753, 752, 756, 763, 764, 760, 765, - 757, 768, 763, 762, 765, 769, 761, 766, 766, 770, + 750, 717, 714, 714, 716, 718, 710, 717, 719, 720, + 722, 718, 723, 719, 721, 720, 722, 721, 724, 725, + 723, 727, 726, 728, 729, 729, 724, 726, 727, 730, + 732, 731, 733, 742, 735, 736, 732, 725, 730, 731, + 737, 738, 728, 735, 736, 737, 739, 740, 741, 739, + 738, 733, 740, 743, 743, 744, 745, 746, 742, 747, + 748, 752, 741, 748, 751, 751, 746, 753, 754, 757, + 744, 748, 753, 755, 756, 745, 758, 759, 760, 762, + 761, 763, 752, 747, 761, 767, 759, 53, 768, 754, + 765, 757, 764, 755, 756, 766, 758, 762, 764, 765, - 768, 764, 767, 771, 772, 773, 774, 775, 776, 783, - 777, 773, 778, 775, 780, 769, 777, 779, 778, 770, - 774, 779, 781, 785, 772, 771, 782, 787, 776, 785, - 783, 782, 790, 780, 781, 784, 784, 786, 788, 792, - 786, 789, 781, 791, 791, 787, 795, 789, 793, 794, - 794, 788, 790, 793, 796, 797, 797, 792, 796, 798, - 799, 795, 800, 801, 803, 804, 806, 800, 807, 809, - 809, 810, 811, 812, 812, 810, 815, 813, 828, 804, - 799, 798, 801, 816, 828, 53, 806, 811, 803, 807, - 808, 815, 814, 808, 818, 808, 814, 816, 817, 808, + 763, 760, 768, 769, 767, 770, 771, 766, 773, 769, + 775, 771, 772, 772, 774, 777, 776, 778, 779, 770, + 780, 781, 782, 774, 776, 783, 784, 781, 773, 787, + 775, 783, 785, 787, 788, 777, 782, 779, 785, 778, + 780, 786, 789, 790, 791, 793, 784, 786, 790, 792, + 792, 793, 794, 788, 789, 794, 795, 796, 797, 798, + 799, 799, 789, 800, 797, 791, 801, 802, 802, 803, + 796, 801, 804, 806, 795, 809, 804, 805, 805, 798, + 807, 800, 808, 811, 803, 812, 814, 808, 815, 817, + 817, 821, 818, 819, 809, 806, 818, 820, 820, 812, - 820, 808, 813, 817, 819, 822, 808, 825, 818, 819, - 819, 808, 821, 823, 820, 826, 821, 824, 823, 827, - 822, 825, 824, 829, 830, 831, 831, 832, 823, 829, - 830, 833, 832, 827, 834, 835, 826, 833, 838, 836, - 839, 840, 842, 842, 843, 839, 848, 848, 841, 843, - 838, 845, 846, 844, 835, 840, 834, 836, 837, 837, - 841, 844, 847, 849, 837, 845, 837, 849, 851, 853, - 852, 846, 837, 852, 851, 856, 854, 837, 837, 855, - 856, 847, 857, 858, 837, 855, 859, 860, 853, 854, - 861, 862, 858, 863, 864, 859, 861, 865, 867, 864, + 807, 822, 823, 48, 824, 822, 814, 811, 819, 815, + 816, 839, 839, 816, 826, 816, 821, 823, 824, 816, + 825, 816, 828, 829, 827, 825, 816, 829, 826, 827, + 827, 816, 830, 831, 832, 833, 828, 834, 831, 832, + 835, 842, 843, 43, 836, 837, 838, 830, 831, 833, + 836, 837, 838, 841, 835, 840, 844, 846, 834, 841, + 840, 843, 847, 842, 848, 849, 854, 847, 851, 846, + 850, 850, 852, 851, 844, 845, 845, 849, 848, 853, + 852, 845, 14, 845, 855, 854, 856, 856, 857, 845, + 859, 861, 857, 853, 845, 845, 859, 860, 862, 863, - 862, 857, 866, 860, 869, 870, 872, 868, 875, 871, - 878, 877, 863, 869, 870, 871, 866, 865, 867, 868, - 873, 879, 880, 872, 875, 877, 873, 881, 882, 883, - 878, 896, 884, 885, 883, 886, 880, 884, 885, 891, - 879, 887, 887, 882, 886, 881, 888, 889, 892, 895, - 897, 896, 888, 892, 892, 891, 894, 893, 893, 894, - 889, 893, 898, 895, 899, 900, 901, 902, 897, 903, - 904, 900, 903, 902, 907, 898, 905, 906, 908, 899, - 909, 905, 906, 908, 910, 909, 901, 912, 913, 914, - 907, 904, 915, 912, 917, 914, 910, 918, 915, 916, + 860, 845, 864, 855, 865, 863, 866, 864, 867, 868, + 861, 862, 869, 870, 871, 866, 872, 867, 869, 873, + 874, 872, 870, 865, 875, 868, 876, 877, 878, 879, + 880, 885, 883, 871, 874, 879, 877, 878, 876, 873, + 881, 886, 888, 887, 875, 885, 881, 880, 883, 889, + 890, 894, 891, 892, 893, 897, 888, 891, 892, 893, + 894, 886, 887, 895, 895, 890, 896, 889, 897, 899, + 900, 904, 896, 901, 901, 900, 900, 901, 902, 903, + 905, 902, 906, 908, 907, 899, 909, 911, 910, 908, + 911, 904, 912, 903, 910, 906, 913, 914, 905, 907, - 916, 920, 919, 917, 913, 919, 921, 922, 923, 924, - 925, 923, 926, 932, 930, 918, 925, 933, 926, 920, - 930, 927, 924, 928, 929, 921, 927, 922, 928, 929, - 934, 932, 935, 935, 936, 937, 934, 933, 938, 939, - 940, 938, 939, 936, 941, 942, 943, 949, 944, 945, - 950, 940, 946, 937, 944, 945, 947, 942, 948, 948, - 951, 947, 941, 953, 950, 943, 949, 946, 954, 952, - 955, 956, 951, 952, 958, 959, 959, 954, 961, 962, - 964, 953, 965, 963, 967, 964, 966, 966, 971, 955, - 971, 965, 961, 958, 962, 963, 956, 968, 973, 969, + 915, 913, 914, 916, 917, 918, 909, 921, 916, 917, + 924, 924, 920, 912, 922, 923, 915, 918, 920, 925, + 922, 923, 926, 921, 927, 928, 928, 927, 925, 929, + 930, 931, 932, 933, 936, 932, 934, 935, 939, 936, + 926, 941, 934, 935, 939, 937, 933, 929, 938, 930, + 937, 931, 942, 938, 943, 946, 944, 945, 945, 941, + 943, 944, 947, 948, 946, 949, 950, 951, 949, 950, + 952, 947, 942, 953, 954, 957, 955, 956, 951, 958, + 960, 948, 955, 956, 958, 953, 959, 959, 952, 961, + 957, 963, 962, 954, 964, 963, 965, 966, 967, 960, - 974, 970, 972, 968, 967, 969, 970, 972, 975, 976, - 977, 978, 973, 975, 974, 979, 980, 983, 978, 982, - 982, 984, 985, 987, 976, 48, 986, 992, 988, 977, - 979, 983, 986, 988, 992, 980, 995, 985, 993, 984, - 990, 990, 988, 987, 988, 991, 994, 988, 996, 994, - 991, 997, 993, 998, 995, 999, 997, 996, 1000, 1001, - 999, 1003, 1003, 1004, 1006, 1005, 1007, 1009, 1004, 1000, - 1005, 1007, 998, 1008, 1010, 1011, 1009, 1008, 1001, 1012, - 1013, 1014, 1016, 1017, 1006, 1018, 1015, 1019, 1021, 1010, - 1011, 1020, 1013, 1015, 1016, 1022, 1014, 1020, 1012, 1023, + 969, 970, 970, 961, 962, 965, 972, 973, 975, 974, + 977, 977, 964, 975, 978, 976, 966, 993, 993, 969, + 972, 974, 973, 967, 976, 979, 980, 982, 981, 982, + 983, 979, 980, 981, 978, 983, 984, 985, 986, 987, + 988, 989, 990, 986, 991, 13, 994, 995, 989, 996, + 984, 985, 997, 998, 987, 1003, 999, 990, 997, 988, + 994, 999, 1003, 991, 996, 995, 1001, 1001, 1004, 1002, + 999, 1006, 999, 998, 1002, 999, 1005, 1007, 1008, 1005, + 1009, 1011, 1004, 1008, 1012, 1010, 1007, 1014, 1014, 1006, + 1010, 1015, 1011, 1016, 1017, 1018, 1015, 1019, 1016, 1009, - 1024, 1026, 1017, 1021, 1027, 1019, 1018, 1026, 1028, 1024, - 1029, 1031, 1030, 1033, 1034, 1022, 1028, 1030, 1027, 1023, - 1032, 1035, 1039, 1031, 1042, 1032, 1032, 1038, 1034, 1042, - 1029, 1039, 1033, 1040, 1035, 1036, 1036, 1037, 1043, 1040, - 1038, 1052, 1037, 1041, 1041, 1037, 1037, 1043, 1044, 1048, - 1037, 43, 1045, 1046, 1044, 1051, 1037, 1045, 1046, 1052, - 1037, 1047, 1047, 1049, 1049, 1053, 1050, 1054, 1055, 1050, - 1048, 1050, 1056, 1055, 1053, 1051, 1057, 1058, 1059, 14, - 1060, 1062, 1065, 1058, 1059, 1060, 1056, 1054, 1061, 1064, - 1062, 1064, 1061, 1065, 1057, 1062, 1067, 1062, 1068, 1062, + 1018, 1019, 1020, 1012, 1021, 1022, 1023, 1025, 1026, 1024, + 1028, 1020, 1027, 1029, 1017, 1026, 1032, 1030, 1033, 1021, + 1022, 1024, 1025, 1034, 1027, 1023, 1031, 1035, 1038, 1028, + 1040, 1032, 1031, 1037, 1029, 1030, 1035, 1039, 1033, 1037, + 1042, 1041, 1038, 1034, 1044, 1039, 1041, 1045, 1043, 1046, + 1040, 1050, 1042, 1043, 1043, 1047, 1047, 1049, 0, 1051, + 1050, 1045, 1046, 1044, 1048, 1051, 1052, 1052, 1055, 1048, + 1049, 1053, 1048, 1048, 1055, 1054, 1053, 1048, 1058, 1058, + 1056, 1057, 1059, 1048, 1054, 1056, 1057, 1048, 1060, 1060, + 1061, 1062, 1063, 1061, 1065, 1061, 1064, 1066, 1067, 1068, - 1067, 1062, 1063, 1063, 1069, 1070, 1071, 1072, 1075, 1074, - 1073, 1071, 1071, 1068, 1070, 1073, 1076, 1075, 1077, 1078, - 1079, 1080, 1069, 1074, 1081, 1083, 1080, 1078, 1084, 1072, - 1082, 1085, 1086, 1086, 1079, 1076, 1085, 1077, 1081, 1082, - 1087, 1088, 1088, 1083, 1089, 1091, 1089, 1092, 1091, 1093, - 1094, 1094, 1092, 1084, 1095, 1087, 1096, 1096, 1097, 1097, - 1098, 1099, 1100, 1101, 1101, 1098, 1102, 1103, 1093, 1104, - 1103, 1105, 1106, 1107, 1095, 1107, 1105, 1109, 13, 1110, - 1109, 1106, 1099, 1100, 1110, 1111, 1102, 1112, 1113, 1104, - 1111, 1114, 1117, 1113, 1116, 1112, 1114, 1115, 1115, 1116, + 1069, 1070, 1066, 1059, 1071, 1064, 1069, 1070, 1080, 1071, + 1063, 1062, 1067, 1073, 1065, 1072, 1075, 1068, 1075, 1072, + 1074, 1074, 1073, 1076, 1078, 1079, 1080, 1073, 1078, 1073, + 1081, 1073, 1082, 1073, 1076, 1083, 1084, 1082, 1082, 1081, + 1079, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1093, + 1094, 1092, 1086, 1091, 1089, 1095, 1085, 1083, 1093, 1097, + 1097, 1090, 1096, 1087, 1088, 1092, 1098, 1096, 1094, 1099, + 1099, 1100, 1102, 1100, 1103, 1102, 1104, 1105, 1107, 1103, + 1095, 1098, 1106, 1106, 1108, 1108, 1105, 1109, 1109, 1110, + 1111, 1112, 1113, 1113, 1110, 1104, 1114, 1115, 1107, 1116, - 1118, 1119, 1120, 1122, 1130, 1123, 1118, 1124, 1119, 1122, - 1117, 1123, 1124, 1125, 1126, 1120, 1127, 1128, 1132, 1125, - 1129, 1129, 1133, 1126, 1130, 1134, 1135, 1136, 1128, 1139, - 1138, 1134, 1135, 1136, 1140, 1127, 1138, 1145, 1132, 1141, - 1143, 1142, 1146, 1139, 1147, 1133, 1144, 1144, 1148, 1139, - 1150, 1141, 1153, 1148, 1140, 1142, 1151, 1145, 1143, 1149, - 1149, 1151, 1147, 1154, 1155, 1156, 1158, 1146, 1154, 1154, - 1157, 1153, 1159, 1150, 1156, 1160, 1161, 1162, 1157, 1162, - 1158, 1161, 1155, 1163, 1161, 1164, 1167, 1159, 1165, 1166, - 1160, 1164, 1165, 1160, 1168, 1169, 1170, 1163, 1171, 1172, + 1115, 1117, 1120, 1119, 1118, 1119, 1117, 1122, 1123, 1124, + 1122, 1111, 1112, 1118, 1124, 1131, 1114, 1125, 1126, 1116, + 1120, 0, 1125, 1123, 1127, 1128, 1126, 1129, 1129, 1127, + 1128, 1130, 1132, 1131, 1133, 1134, 1130, 1136, 1132, 1137, + 1139, 1133, 1138, 1136, 1140, 1137, 1139, 1138, 1134, 1141, + 1142, 1143, 1143, 1140, 1144, 1146, 1147, 1148, 1149, 1150, + 1152, 1142, 1153, 1148, 1149, 1150, 1152, 1154, 1141, 1155, + 1156, 1157, 1158, 1158, 1144, 1146, 1153, 1159, 1160, 1147, + 1161, 1155, 1153, 1162, 1156, 1163, 1163, 1154, 1162, 1157, + 1164, 1165, 1167, 1170, 1168, 1172, 1165, 1159, 1161, 1168, - 1166, 1170, 1173, 1175, 1172, 1167, 1176, 1177, 1178, 1178, - 1179, 1180, 1181, 1169, 1179, 1182, 1171, 1175, 1183, 1184, - 1168, 1182, 1173, 1185, 1176, 1177, 1186, 1187, 1188, 1180, - 1183, 1181, 1192, 1190, 1189, 1193, 1195, 1185, 1184, 1189, - 1190, 1186, 1187, 1191, 1193, 1194, 1194, 1188, 1191, 1196, - 1192, 1195, 1197, 1198, 1199, 1196, 1200, 1205, 1198, 1207, - 1199, 1205, 1200, 1201, 1201, 1202, 1202, 1204, 1204, 1206, - 1208, 1209, 1210, 1197, 1211, 1211, 1212, 1207, 1206, 1210, - 1213, 1215, 1214, 1216, 1208, 1217, 1209, 1214, 1213, 1219, - 1217, 1217, 1218, 1220, 1220, 1215, 1212, 1218, 1218, 1221, + 1168, 1169, 1170, 1160, 1171, 1173, 1174, 1182, 1177, 1172, + 1175, 1167, 1171, 1164, 1176, 1175, 1176, 1178, 1175, 1169, + 1173, 1174, 1177, 1178, 1174, 1179, 1180, 1181, 1189, 1179, + 1183, 1184, 1185, 1182, 1186, 1187, 1184, 1180, 1190, 1186, + 1191, 1193, 1189, 1192, 1192, 1193, 1181, 1194, 1183, 1195, + 1185, 1196, 1197, 1198, 1200, 1187, 1190, 1196, 1191, 1199, + 1201, 1202, 1203, 1204, 1197, 1194, 1205, 1203, 1195, 1200, + 1204, 1205, 1198, 1199, 1206, 1201, 1207, 1208, 1208, 1209, + 1202, 1210, 1211, 1212, 1213, 1207, 0, 1210, 1212, 1214, + 1213, 1221, 1206, 1222, 1209, 1214, 1215, 1215, 1216, 1216, - 1222, 1223, 1216, 1224, 1225, 1226, 1227, 1228, 1224, 1219, - 1223, 1229, 1230, 1228, 1231, 1232, 1229, 1235, 1221, 1222, - 1231, 1233, 1234, 1225, 1227, 1226, 1236, 1233, 1234, 1237, - 1238, 1240, 1239, 1247, 1232, 1241, 1235, 1247, 1230, 1242, - 1242, 1243, 1244, 1255, 1243, 1236, 1239, 1248, 1237, 1238, - 1241, 1250, 1240, 1246, 1244, 1245, 1245, 1249, 1246, 1251, - 1248, 1251, 1253, 1255, 1250, 1251, 1249, 1253, 1254, 1256, - 1257, 1257, 1258, 1262, 1259, 1264, 1260, 1258, 1251, 1259, - 1260, 1263, 1261, 1254, 1265, 1256, 1261, 1266, 1266, 1268, - 1265, 1270, 1271, 1262, 0, 1264, 1273, 1271, 1279, 1263, + 1218, 1218, 1219, 1211, 1220, 1223, 1219, 1222, 1224, 1221, + 1225, 1225, 1226, 1220, 1227, 1224, 1228, 1229, 1230, 1231, + 1223, 1228, 1227, 1232, 1231, 1231, 1233, 1237, 1232, 1232, + 1235, 1229, 1226, 1234, 1234, 1236, 1237, 1230, 1238, 1239, + 1240, 1241, 1242, 1238, 1244, 1243, 1233, 1245, 1242, 1235, + 1243, 1247, 1246, 1245, 1236, 1248, 1249, 1247, 1239, 1241, + 1240, 1248, 1250, 1251, 1252, 1253, 1254, 1256, 1256, 1255, + 1244, 1246, 0, 1257, 1258, 1249, 1257, 1259, 1259, 1253, + 1260, 1250, 1251, 1252, 1255, 1260, 1258, 1254, 1261, 1262, + 1263, 1264, 1261, 1267, 1265, 1268, 1265, 1269, 1267, 1263, - 1272, 1272, 1273, 1275, 1275, 1277, 1280, 1268, 1277, 1278, - 1278, 1283, 1270, 1282, 1279, 1284, 1282, 1285, 1285, 1286, - 1287, 1288, 1280, 1291, 1284, 1290, 1288, 1289, 1289, 1292, - 1294, 1283, 1293, 1293, 1286, 1295, 1297, 1296, 1291, 1298, - 1298, 1287, 1296, 1290, 1294, 1299, 1300, 1301, 1301, 1299, - 1302, 1297, 1303, 1295, 1292, 1304, 1305, 1306, 1309, 1304, - 1308, 1308, 1306, 1303, 1310, 1311, 1300, 1312, 1313, 1314, - 1314, 1316, 1302, 1318, 1315, 1305, 1309, 1317, 1310, 1315, - 1320, 1312, 1318, 1319, 1311, 1311, 1323, 1321, 1319, 1321, - 1322, 1316, 1323, 1313, 1324, 1322, 1325, 1317, 1327, 1329, + 1265, 1276, 1262, 1270, 1264, 1271, 1271, 1272, 1277, 1273, + 1268, 1274, 1272, 1265, 1273, 1274, 1275, 1269, 1278, 1270, + 1275, 1276, 1279, 1280, 1280, 1282, 1277, 1284, 1279, 1285, + 1286, 1286, 1288, 1287, 1285, 1290, 1290, 1292, 1278, 1287, + 1292, 1293, 1293, 1282, 1294, 1295, 1297, 1298, 1284, 1297, + 1299, 1301, 1288, 1300, 1300, 1302, 1303, 1304, 1305, 1299, + 1294, 1295, 1304, 1306, 1306, 1307, 1301, 1298, 1309, 1308, + 1310, 1310, 1305, 1311, 1312, 1303, 1302, 1313, 1317, 1314, + 1315, 1315, 1313, 1307, 1308, 1316, 1319, 1311, 1320, 1316, + 1318, 1318, 1312, 1309, 1314, 1322, 1321, 1323, 1317, 1320, - 1320, 1330, 1325, 1328, 1328, 1332, 1333, 1330, 1334, 1334, - 1332, 1336, 1327, 1337, 1324, 1335, 1335, 1338, 1329, 1339, - 1340, 1340, 1339, 1341, 1342, 1336, 0, 1348, 1344, 1346, - 1333, 1337, 1338, 1343, 1344, 1341, 1343, 1345, 1346, 1343, - 1347, 1350, 1345, 1349, 1342, 1347, 1349, 1350, 1351, 1352, - 1352, 1343, 1348, 1351, 1353, 1353, 1354, 1356, 1355, 1357, - 1358, 1359, 1354, 1355, 1360, 1361, 1362, 1360, 1363, 1364, - 1356, 1361, 1362, 1363, 1365, 1364, 1369, 1357, 1366, 1358, - 1370, 1359, 1368, 1366, 1367, 1367, 1371, 1368, 1372, 1373, - 1376, 1377, 1374, 1378, 1369, 1375, 1376, 1365, 1379, 1380, + 1321, 1326, 1323, 1325, 1325, 1328, 1327, 1329, 1319, 1330, + 1331, 1331, 1332, 1333, 1322, 1334, 1337, 1332, 1335, 1326, + 1327, 1329, 1341, 1336, 1328, 1328, 1344, 1335, 1336, 1338, + 1346, 1338, 1339, 1333, 1330, 1334, 1337, 1339, 1340, 1342, + 1344, 1350, 1341, 1354, 1340, 1342, 1345, 1345, 1347, 1346, + 1349, 1351, 1351, 1353, 1347, 1349, 1352, 1352, 1355, 1356, + 1358, 1354, 1356, 1357, 1357, 1350, 1359, 1353, 1365, 1361, + 1363, 1360, 1358, 1355, 1360, 1361, 1362, 1360, 1364, 1363, + 1375, 1362, 1366, 1364, 1367, 1366, 1359, 1368, 1373, 1360, + 1367, 1374, 1368, 1365, 1369, 1369, 1370, 1370, 1371, 1375, - 1370, 1383, 1372, 1373, 1374, 1388, 1371, 1386, 1375, 1382, - 1382, 1377, 1379, 1378, 1384, 1385, 1385, 1387, 1389, 1384, - 1380, 1383, 1386, 1390, 1391, 1393, 1392, 1394, 1398, 1388, - 1396, 1387, 1390, 1392, 1393, 1399, 1389, 1393, 1399, 1391, - 1400, 1400, 1402, 1394, 1403, 1396, 1401, 1401, 1404, 1407, - 1396, 1404, 1406, 1398, 1402, 1405, 1405, 1410, 1408, 1409, - 1412, 1411, 1403, 1408, 1409, 1406, 1413, 1416, 1407, 1412, - 1414, 1415, 1418, 1416, 1417, 1417, 1410, 1411, 1419, 1414, - 1415, 1420, 1414, 1421, 1422, 1413, 1423, 1425, 1426, 1427, - 1427, 1419, 1418, 1428, 1429, 1433, 1430, 1421, 1423, 1420, + 1372, 1373, 1376, 1377, 1371, 1372, 1377, 1378, 1379, 1374, + 1380, 1381, 1382, 1378, 1379, 1380, 1383, 1381, 1384, 1384, + 1385, 1383, 1376, 1386, 1387, 1385, 1388, 1391, 1389, 1390, + 1393, 1394, 1392, 1395, 1396, 1382, 1393, 1397, 1405, 1391, + 1400, 1386, 1389, 1390, 1387, 1392, 1388, 1401, 1396, 1399, + 1399, 1394, 1401, 1395, 1402, 1402, 1403, 1406, 1397, 1404, + 1400, 1407, 1405, 1408, 1411, 1409, 1413, 1410, 1415, 0, + 1407, 1403, 1409, 1404, 1416, 1406, 1410, 1416, 1408, 1410, + 1411, 1413, 1417, 1417, 1418, 1418, 1413, 1419, 1420, 1421, + 1422, 1422, 1421, 1415, 1423, 1424, 1425, 1426, 1427, 1419, - 1422, 1430, 1432, 1429, 1431, 1431, 1426, 1434, 1435, 1428, - 1436, 1432, 1425, 1433, 1432, 1436, 1436, 1438, 1439, 1431, - 1440, 1441, 1441, 1442, 1439, 1443, 1435, 1444, 1434, 1442, - 1443, 1438, 1447, 1444, 1445, 1448, 1449, 1450, 1440, 1455, - 1445, 1456, 1449, 1453, 1451, 1461, 1457, 1451, 1458, 1448, - 1450, 1453, 1447, 1451, 1457, 1459, 1460, 1458, 1455, 1461, - 1456, 1462, 1465, 1464, 1463, 1466, 1467, 1468, 1459, 1460, - 1463, 1469, 1470, 1471, 1472, 1462, 1464, 1469, 1474, 1474, - 1468, 1475, 1465, 1466, 1476, 1467, 1477, 1480, 1476, 1471, - 1478, 1477, 1472, 1479, 1470, 1478, 1480, 1481, 1479, 1483, + 1428, 1425, 1426, 1429, 1430, 1433, 1420, 1423, 1435, 1431, + 1432, 1433, 1429, 1436, 1424, 1437, 1428, 1427, 1431, 1432, + 1438, 1431, 1439, 1430, 1434, 1434, 1436, 1440, 1435, 1442, + 1443, 1444, 1444, 1437, 1438, 1445, 1446, 1447, 1439, 1440, + 1448, 1448, 1447, 1450, 1449, 1446, 1451, 1452, 1443, 1455, + 1457, 1445, 1453, 1449, 1442, 1448, 1449, 1453, 1453, 1460, + 1456, 1450, 1464, 1455, 1460, 1452, 1456, 1451, 1457, 1458, + 1458, 1459, 1461, 1462, 1465, 1466, 1467, 1459, 1461, 1462, + 1473, 1466, 1464, 1468, 1469, 1471, 1468, 1474, 1465, 1467, + 1469, 1476, 1468, 1471, 1475, 1477, 1478, 1479, 1480, 1473, - 1485, 1475, 1484, 1484, 1486, 1487, 1488, 1488, 1489, 1491, - 1490, 1492, 1493, 1494, 1483, 1496, 1486, 1490, 1497, 1485, - 1481, 1491, 1489, 1492, 1487, 0, 1495, 1496, 1498, 1499, - 1499, 1493, 1495, 1494, 1498, 1500, 1497, 1503, 1500, 1501, - 1501, 1504, 1503, 1505, 1506, 1506, 1507, 1510, 1511, 1505, - 1504, 1508, 1509, 1508, 1512, 1509, 1513, 1514, 1507, 1515, - 1517, 1516, 1514, 1520, 1518, 1524, 1521, 1510, 1515, 1518, - 1511, 1519, 1512, 1516, 1513, 1517, 1522, 1522, 1523, 1525, - 1519, 1521, 1527, 1520, 1523, 1526, 1524, 1528, 1533, 1528, - 1529, 1530, 1530, 1519, 1531, 1531, 1532, 1532, 1525, 1534, + 1476, 1482, 1475, 1481, 1481, 1484, 1474, 1482, 1477, 1478, + 1483, 1479, 1480, 1485, 1486, 1487, 1483, 1488, 1484, 1490, + 1489, 1491, 1492, 1494, 1494, 1481, 1489, 1495, 0, 1501, + 1488, 1496, 1486, 1485, 1487, 1496, 1505, 1491, 1497, 1498, + 1492, 1490, 1500, 1497, 1498, 1499, 1503, 1495, 1504, 1504, + 1499, 1500, 1501, 1506, 1507, 1505, 1508, 1508, 1509, 1510, + 1513, 1503, 1511, 1512, 1514, 1506, 1510, 1517, 1516, 1524, + 1515, 1518, 1509, 1507, 1511, 1512, 1515, 1518, 1524, 1513, + 1516, 1519, 1519, 1520, 1514, 1517, 1520, 1521, 1521, 1523, + 1525, 1526, 1526, 1527, 1523, 1528, 1525, 1528, 1529, 1530, - 1534, 1526, 1527, 1536, 1529, 1537, 1529, 1544, 1533, 1535, - 1535, 1538, 1538, 1539, 1540, 1541, 1543, 1539, 1541, 1546, - 1540, 1545, 1543, 1551, 1536, 1544, 1537, 1545, 1547, 1548, - 1548, 1547, 1549, 1549, 1550, 1551, 1551, 1551, 1552, 1553, - 1550, 1554, 1551, 1555, 1546, 1557, 1558, 1554, 1563, 1564, - 1557, 1557, 1559, 1560, 1559, 1561, 1562, 1563, 1552, 1553, - 1558, 1565, 1562, 1555, 1560, 1566, 1566, 1567, 1569, 1564, - 1561, 1568, 1568, 1570, 1571, 1571, 1572, 1572, 1573, 1576, - 1576, 1577, 1565, 1578, 1581, 1580, 1583, 1583, 1569, 1584, - 1582, 1588, 1578, 1567, 1580, 1570, 1582, 1585, 1573, 1587, + 1531, 1529, 1532, 1533, 1534, 1527, 1535, 1538, 1539, 1534, + 1537, 1536, 1538, 1540, 1541, 1535, 1544, 1539, 1543, 1530, + 1532, 1533, 1531, 1536, 1543, 1537, 1542, 1542, 1545, 1541, + 1539, 1547, 1546, 1540, 1548, 1553, 1548, 1544, 1549, 1550, + 1550, 1551, 1551, 1552, 1552, 1554, 1554, 1545, 1546, 1555, + 1555, 1547, 1549, 1556, 1549, 1553, 1557, 1558, 1558, 1559, + 1560, 1561, 1563, 1559, 1561, 1564, 1560, 1565, 1563, 1566, + 1568, 1568, 1567, 1565, 1556, 1567, 1570, 1557, 1569, 1569, + 1572, 1573, 1570, 1564, 1571, 1574, 1575, 1577, 1578, 1581, + 1585, 1574, 1577, 1577, 1566, 1584, 1571, 1571, 1571, 1580, - 1586, 1589, 1589, 1590, 1591, 1581, 1577, 1586, 1587, 1593, - 1584, 1595, 1585, 1594, 1593, 1596, 1602, 1588, 1597, 1594, - 1591, 1598, 1596, 1600, 1597, 1599, 1599, 1598, 1600, 1590, - 1601, 1595, 1603, 1604, 1605, 1606, 1602, 1605, 1607, 1601, - 1608, 1608, 1609, 1610, 1611, 1604, 1612, 1614, 1609, 1615, - 1612, 1603, 1618, 1606, 1616, 1620, 1619, 1622, 1622, 1611, - 1619, 1620, 1624, 1610, 1607, 1621, 1612, 1614, 1615, 1616, - 1626, 1618, 1623, 1624, 1621, 1627, 1623, 1628, 1624, 1625, - 1625, 1629, 1628, 1630, 1631, 1632, 1643, 1633, 1637, 1627, - 1631, 1626, 1633, 1634, 1634, 1635, 1635, 0, 1636, 1637, + 1572, 1573, 1578, 1571, 1581, 1579, 1575, 1579, 1582, 1583, + 1580, 1585, 1586, 1586, 1582, 1584, 1587, 1589, 1583, 1588, + 1588, 1590, 1591, 1591, 1592, 1592, 1593, 1596, 1596, 1597, + 1598, 1600, 1601, 1603, 1603, 1602, 1604, 1589, 1606, 1598, + 1600, 1602, 1587, 1590, 1605, 1606, 1593, 1607, 1608, 1609, + 1609, 1610, 1611, 1601, 1597, 1613, 1607, 1604, 1614, 1605, + 1613, 1615, 1616, 1622, 1614, 1617, 1618, 1623, 1611, 1616, + 1621, 1617, 1618, 1620, 1608, 1619, 1619, 1610, 1620, 1621, + 1624, 1615, 1625, 1622, 1626, 1625, 1623, 1627, 1628, 1628, + 1629, 1630, 1624, 1631, 1632, 1634, 1629, 1635, 1632, 0, - 1632, 1629, 1636, 1630, 1637, 1638, 1638, 1639, 1639, 1640, - 1641, 1642, 1643, 1644, 1640, 1640, 1641, 1642, 1644, 1645, - 1646, 1648, 1650, 1649, 1651, 1653, 1646, 1649, 1655, 1652, - 1654, 1645, 1657, 1648, 1650, 1652, 1654, 1658, 1659, 1661, - 1655, 1665, 1661, 1659, 1657, 1662, 1662, 1653, 1666, 1651, - 1663, 1663, 1664, 1664, 1666, 1668, 1658, 1667, 1669, 1670, - 1668, 1665, 1672, 1667, 1669, 1675, 1674, 1672, 1670, 1674, - 1676, 1676, 1678, 1679, 1680, 1681, 1681, 1675, 1682, 1680, - 1686, 1683, 1687, 1684, 1678, 1679, 1683, 1682, 1684, 1685, - 1685, 1687, 1688, 1689, 1690, 1693, 1691, 1692, 1690, 1696, + 1638, 1639, 1626, 1636, 1640, 1639, 1642, 1642, 1631, 1646, + 1640, 1630, 1641, 1627, 1632, 1634, 1635, 1644, 1636, 1638, + 1643, 1641, 1645, 1645, 1643, 1647, 1648, 1649, 1644, 1650, + 1646, 1651, 1649, 1644, 1652, 1653, 1654, 1655, 1655, 1647, + 1652, 1654, 1656, 1656, 1657, 1648, 1659, 1660, 1657, 1650, + 1653, 1651, 1661, 1662, 1662, 1659, 1663, 1663, 1660, 1664, + 1665, 1666, 1667, 1660, 1664, 1664, 1665, 1666, 1668, 1669, + 1670, 1672, 1661, 1668, 1673, 1674, 1670, 1675, 1673, 1676, + 1678, 1669, 1677, 1672, 1679, 1676, 1678, 1674, 1667, 1681, + 1682, 1685, 1683, 1689, 1685, 1692, 1679, 1683, 1686, 1686, - 1686, 1691, 1697, 1692, 1695, 1695, 1698, 1698, 1700, 1693, - 1688, 1697, 1689, 1699, 1701, 1703, 1695, 1696, 1702, 1712, - 1700, 1709, 1699, 1702, 1706, 1706, 1708, 1710, 1703, 1708, - 1713, 1715, 1714, 1722, 1712, 1701, 1725, 1709, 1714, 1716, - 1716, 1718, 1718, 1710, 1713, 1717, 1719, 1717, 1715, 1721, - 1723, 1723, 1724, 1722, 1719, 1726, 1721, 1725, 1727, 1728, - 1729, 1724, 1730, 1731, 1733, 1736, 1734, 1726, 1737, 1731, - 1727, 1728, 1735, 1735, 1740, 1739, 1738, 1730, 1734, 1738, - 1739, 1744, 1731, 1736, 1733, 1742, 1729, 1743, 1737, 1743, - 1742, 1745, 1748, 1746, 1740, 1750, 1745, 1751, 1752, 1744, + 1692, 1681, 1675, 0, 1677, 1687, 1687, 1688, 1688, 1682, + 1690, 1691, 1693, 1689, 1694, 1696, 1690, 1691, 1693, 1698, + 1696, 1699, 1698, 1694, 1700, 1700, 1702, 1703, 1706, 1704, + 1705, 1705, 1710, 1699, 1704, 1707, 1708, 1706, 1702, 1703, + 1707, 1708, 1709, 1709, 1711, 1712, 1713, 1714, 1717, 1715, + 1716, 1714, 1710, 1711, 1715, 1720, 1716, 1719, 1719, 1721, + 1722, 1722, 1717, 1712, 1724, 1713, 1723, 1725, 1721, 1719, + 1727, 1732, 1726, 1720, 1732, 1723, 1724, 1726, 1730, 1730, + 1733, 1734, 0, 1727, 1736, 1738, 1737, 1739, 1725, 1740, + 1740, 1738, 1741, 1746, 1741, 1743, 1733, 1734, 1745, 1736, - 1746, 1748, 1753, 1754, 1753, 1756, 1751, 1756, 1759, 1757, - 1752, 1758, 1758, 1750, 1760, 1761, 1762, 1761, 1764, 1760, - 1763, 1762, 1754, 1757, 1765, 1763, 1766, 1768, 1767, 1769, - 1771, 1772, 1766, 1767, 1759, 1775, 1764, 1769, 1773, 1773, - 1768, 1774, 1774, 1776, 1765, 1772, 1777, 0, 1778, 1771, - 1775, 1780, 1777, 1778, 1779, 1788, 1779, 1781, 1781, 1780, - 1782, 1783, 1783, 1776, 1784, 1784, 1785, 1780, 1786, 1787, - 1791, 1787, 1782, 1789, 1790, 1785, 1788, 1786, 1789, 1789, - 1786, 1793, 1791, 1790, 1794, 1795, 1797, 1798, 1800, 1794, - 1795, 1799, 1799, 1793, 1801, 1802, 1803, 1806, 1804, 1797, + 1737, 1742, 1742, 1743, 1739, 1745, 1747, 1747, 1748, 1749, + 1750, 1751, 1752, 1746, 1753, 1755, 1754, 1748, 1757, 1760, + 1758, 1755, 1750, 1751, 1752, 1759, 1759, 1761, 1764, 0, + 1749, 1754, 1758, 1762, 1755, 1768, 1762, 1760, 1757, 1763, + 1753, 1766, 1772, 1767, 1763, 1767, 1766, 1761, 1764, 1769, + 1770, 1772, 1774, 1768, 1769, 1775, 1776, 1770, 1777, 1778, + 1777, 1780, 1781, 1780, 1775, 1782, 1782, 1783, 1776, 1784, + 1774, 1785, 1786, 1785, 1784, 1787, 1781, 1786, 1778, 1788, + 1787, 1789, 1790, 1792, 1791, 1795, 1793, 1858, 1790, 1791, + 1800, 1796, 1799, 1783, 1793, 1858, 1792, 1788, 1797, 1797, - 1808, 1815, 1807, 1809, 1816, 1808, 1800, 1798, 1809, 1806, - 1803, 1802, 1801, 1804, 1807, 1812, 1814, 1817, 1818, 1816, - 1819, 1812, 1814, 1821, 1815, 1820, 1820, 1822, 1822, 1819, - 1823, 1825, 1821, 1824, 1812, 1817, 1825, 1824, 1826, 1827, - 1828, 1829, 1832, 1818, 1827, 1827, 1828, 1829, 1831, 1823, - 1830, 1826, 1837, 1830, 1835, 1835, 1831, 1836, 1836, 1838, - 1838, 1837, 1832, 1839, 1839, 1840, 1841, 1842, 1850, 1843, - 1844, 1844, 1836, 1842, 1843, 1845, 1845, 1840, 1849, 1853, - 1846, 1847, 1849, 1836, 1841, 1846, 1851, 1847, 1850, 1854, - 1851, 1855, 1856, 1857, 1854, 1858, 1859, 1861, 1857, 1860, + 1801, 1789, 1798, 1798, 1795, 1796, 1801, 1799, 1802, 1803, + 1800, 1803, 1804, 1802, 1805, 1805, 1809, 1806, 1807, 1807, + 1804, 1808, 1808, 1810, 1811, 1809, 1811, 1812, 1804, 1806, + 1814, 1813, 1810, 1815, 1817, 1810, 1813, 1813, 1818, 1814, + 1821, 1822, 1819, 1818, 1825, 1815, 1817, 1819, 1812, 1823, + 1824, 1824, 1826, 1821, 1828, 1827, 1845, 1829, 1823, 1833, + 1834, 1822, 1825, 1831, 1832, 1834, 1842, 1844, 1828, 1835, + 1826, 1827, 1829, 1836, 1835, 1831, 1832, 1839, 1841, 1833, + 1843, 1845, 1836, 1839, 1841, 1844, 1847, 1847, 1846, 1842, + 1848, 1849, 1849, 1850, 1851, 1843, 1839, 1846, 1851, 1848, - 1860, 1861, 1862, 1863, 1853, 1864, 1865, 1856, 1863, 1866, - 1867, 1868, 1859, 1858, 1855, 1867, 1869, 1862, 1865, 1870, - 1870, 1872, 1873, 1874, 1868, 1875, 1876, 1877, 1866, 1872, - 1878, 1864, 1879, 1880, 1869, 1883, 1883, 1882, 2149, 1886, - 1884, 1873, 1874, 1884, 1879, 1885, 1877, 1887, 1875, 2149, - 1876, 1878, 1882, 1886, 1880, 1888, 1888, 1891, 1885, 1894, - 1887, 1889, 1889, 1890, 1890, 1892, 1893, 1893, 1894, 1895, - 1895, 1894, 1891, 1899, 1896, 1898, 1900, 1901, 1892, 1896, - 1898, 1902, 1902, 1903, 1903, 1904, 1905, 1905, 1906, 1901, - 1907, 1907, 1908, 1899, 1909, 1912, 1900, 1910, 1910, 1909, + 1852, 1853, 1854, 1855, 1856, 1852, 1859, 1854, 1854, 1855, + 1856, 1867, 1850, 1857, 1853, 1864, 1857, 1862, 1862, 1863, + 1863, 1865, 1865, 1867, 1864, 1868, 1859, 1866, 1866, 1869, + 1877, 1870, 1871, 1871, 1863, 1869, 1870, 1872, 1872, 1873, + 1874, 1880, 1882, 1868, 1873, 1863, 1874, 1876, 1878, 1881, + 1877, 1876, 1878, 1883, 1881, 1884, 1885, 1886, 1887, 1887, + 1884, 1889, 1891, 1888, 1890, 1882, 1880, 1888, 1883, 1890, + 1892, 1893, 1894, 1886, 1885, 1896, 1889, 1894, 1895, 1897, + 1897, 1899, 1892, 1900, 1901, 1902, 1903, 1904, 1891, 1899, + 1893, 1895, 1905, 1896, 1907, 1906, 1909, 1910, 1910, 1912, - 1911, 1911, 1913, 1914, 1904, 1915, 1906, 1908, 1917, 1912, - 1919, 1913, 1921, 1917, 1918, 1918, 1922, 1914, 1920, 1920, - 1923, 1926, 1922, 1923, 1915, 1924, 1924, 1925, 1925, 1919, - 1921, 1927, 1928, 1929, 1929, 1931, 1932, 1933, 1934, 1936, - 1926, 1924, 1934, 1935, 1935, 1937, 1927, 1938, 1940, 1940, - 1941, 1928, 1933, 1943, 1942, 1931, 1944, 1946, 1936, 1932, - 1937, 1942, 1938, 1945, 1945, 1948, 1946, 1943, 1950, 1947, - 1941, 1947, 1951, 1952, 1953, 1954, 1955, 1951, 1952, 1956, - 1950, 1958, 1944, 1960, 1956, 1948, 1958, 1959, 1954, 1961, - 1962, 1964, 1959, 1965, 1963, 1961, 1964, 1955, 1960, 1953, + 1913, 1911, 1900, 1901, 1911, 1914, 1904, 1906, 1902, 1918, + 1903, 1909, 1912, 1905, 1913, 1907, 1915, 1915, 1914, 1916, + 1916, 1917, 1917, 1919, 1918, 1920, 1920, 1923, 1921, 1922, + 1922, 1926, 1923, 1925, 1927, 1928, 1919, 1921, 1925, 1931, + 1921, 1929, 1929, 1930, 1930, 1932, 1932, 1928, 1933, 1934, + 1934, 1926, 1935, 0, 1927, 1936, 1937, 1937, 1931, 1939, + 1936, 1938, 1938, 1940, 1941, 1942, 1933, 1935, 1946, 1944, + 1945, 1945, 1940, 1939, 1944, 1947, 1947, 1948, 1941, 1949, + 1950, 1951, 1951, 1950, 1942, 1949, 1953, 1946, 1952, 1952, + 1955, 1954, 1956, 1956, 1958, 1948, 1959, 1951, 1960, 1961, - 1963, 1966, 1972, 1967, 1968, 1971, 1969, 1970, 1972, 1976, - 0, 1962, 1967, 1968, 1966, 1969, 1970, 1973, 1965, 1971, - 1974, 1978, 1980, 1973, 1974, 1979, 1979, 1982, 1980, 1976, - 1978, 1981, 1981, 1987, 1984, 1985, 1986, 1986, 1991, 2116, - 1981, 1990, 1992, 1988, 1993, 1997, 2116, 1982, 1987, 1982, - 1984, 1985, 1988, 1990, 1991, 1995, 1993, 1992, 1995, 1996, - 1998, 1999, 1999, 0, 1996, 1997, 2000, 2000, 2002, 2002, - 2003, 2004, 1998, 2003, 2005, 2006, 2004, 2007, 2007, 2008, - 2005, 2006, 2009, 2009, 2010, 2011, 2012, 2013, 2013, 2016, - 2015, 2020, 2016, 2008, 2015, 2018, 2010, 2017, 2017, 2011, + 1962, 1962, 1963, 1961, 1968, 1953, 1954, 1964, 1965, 1955, + 1967, 1967, 1970, 1960, 1958, 1971, 1972, 1972, 1969, 1959, + 1973, 1963, 1964, 1965, 1968, 1969, 1970, 1975, 1974, 1973, + 1974, 1977, 1978, 1979, 1980, 1981, 1982, 1978, 1979, 1983, + 1984, 1971, 1990, 1977, 1983, 1986, 1987, 1975, 1981, 1988, + 1986, 1987, 1989, 1994, 1991, 1995, 1992, 1982, 1989, 1980, + 1991, 1992, 1993, 1990, 1988, 1997, 1984, 1993, 1995, 1996, + 1998, 1999, 1996, 2000, 1997, 2001, 2006, 2002, 1994, 1998, + 1999, 2003, 2000, 2002, 2004, 2008, 2010, 2003, 2004, 2001, + 2009, 2009, 2010, 2012, 2008, 2014, 2006, 2011, 2011, 2017, - 2018, 2019, 2021, 2022, 2022, 2012, 2021, 2023, 2025, 2026, - 2019, 2020, 2027, 2025, 2028, 2029, 2030, 2031, 2032, 2029, - 2023, 2033, 2031, 2034, 2032, 2037, 2036, 2033, 2028, 2026, - 2037, 2038, 2027, 2043, 2046, 2039, 2030, 2038, 2040, 2058, - 2040, 2034, 2036, 2039, 2044, 2044, 2045, 2043, 2049, 2045, - 2047, 2047, 2049, 2050, 2051, 2052, 2052, 2058, 2053, 2050, - 2046, 2056, 2056, 2060, 2061, 2064, 2051, 2053, 2065, 2066, - 2064, 2067, 2068, 2068, 2066, 2072, 2067, 2060, 2070, 2070, - 2061, 2072, 2073, 2073, 2074, 2075, 2076, 2078, 2082, 2079, - 2083, 2076, 2080, 2080, 2065, 2084, 2083, 2082, 2088, 2085, + 2015, 2016, 2016, 2018, 2021, 2020, 2011, 2022, 2027, 2023, + 2042, 2014, 2018, 2012, 2017, 2012, 2015, 2020, 2028, 2026, + 2021, 2023, 2022, 2025, 2026, 2070, 2025, 2070, 2027, 2042, + 2028, 2029, 2029, 2030, 2030, 2032, 2032, 2033, 2034, 2035, + 2033, 2036, 2038, 2034, 0, 2035, 2040, 2036, 2037, 2037, + 2039, 2039, 2041, 2043, 2043, 2045, 2038, 2046, 2040, 2045, + 2046, 2047, 2047, 2048, 2049, 2050, 2041, 2051, 2048, 2052, + 2052, 2051, 2055, 2049, 2053, 2056, 2057, 2055, 2058, 2059, + 2060, 2061, 2062, 2059, 2063, 2050, 2061, 2053, 2062, 2064, + 2063, 2068, 2058, 2066, 2067, 2056, 2057, 2068, 2069, 2067, - 2074, 2079, 2087, 2087, 2089, 2096, 2078, 2075, 2091, 2091, - 2092, 2092, 2097, 2084, 2085, 2093, 2094, 2088, 2098, 2096, - 2093, 2094, 2089, 2095, 2099, 2095, 2097, 2100, 2100, 2099, - 2101, 2101, 2102, 2102, 2103, 2103, 2104, 2105, 2098, 2106, - 2106, 2107, 2107, 2110, 2108, 2109, 2111, 2115, 2104, 2112, - 2112, 2113, 2113, 2114, 2114, 2105, 2108, 2109, 2117, 2115, - 2118, 2119, 2111, 2110, 2120, 2121, 2119, 2122, 2122, 2123, - 2117, 2124, 2125, 2126, 2127, 2128, 2129, 2129, 2123, 2130, - 2118, 2131, 2134, 2135, 2120, 2121, 2126, 2132, 2130, 2128, - 2136, 2137, 2125, 2138, 2137, 0, 2131, 2124, 2127, 2139, + 2060, 2073, 2074, 2074, 2076, 2075, 2069, 2064, 2075, 2066, + 2077, 2077, 2079, 2080, 2081, 2073, 2079, 2082, 2082, 2080, + 2083, 2086, 2086, 2088, 2090, 2095, 2081, 2091, 2094, 2083, + 2076, 2096, 2097, 2094, 2098, 2098, 2096, 2097, 2090, 2100, + 2100, 2088, 2102, 2091, 2103, 2103, 2104, 2105, 2102, 2106, + 2112, 2095, 2108, 2109, 2106, 2110, 2110, 2113, 2114, 2112, + 2115, 2118, 2104, 2113, 2119, 2109, 2117, 2117, 2125, 2105, + 2125, 2108, 2121, 2121, 2123, 2115, 2114, 2122, 2122, 2123, + 2118, 2124, 2119, 2126, 2127, 2128, 2124, 2129, 2130, 2130, + 2131, 2131, 2129, 2132, 2132, 2133, 2133, 2126, 2127, 2134, - 2134, 2140, 2132, 2148, 2139, 2135, 2140, 2138, 2141, 2141, - 2142, 2142, 2150, 2136, 2143, 2143, 2145, 2145, 2147, 2147, - 2152, 2148, 2154, 2153, 2156, 2155, 2157, 2159, 2159, 2158, - 2162, 2150, 0, 2156, 2161, 2161, 2164, 2164, 2168, 2163, - 2152, 2153, 2166, 2169, 2154, 2155, 2157, 2158, 2163, 2167, - 2167, 2166, 2162, 2170, 2171, 2172, 2168, 2173, 2174, 2175, - 2170, 2169, 2176, 2176, 2177, 2177, 2178, 2179, 2180, 2171, - 2181, 2182, 2178, 2172, 2174, 2173, 2182, 2183, 2175, 2184, - 2186, 2185, 2186, 2180, 2191, 2179, 2185, 2187, 2187, 2181, - 2188, 2193, 2188, 2189, 2189, 2194, 2195, 2183, 2196, 2184, + 2135, 2136, 2137, 2137, 2139, 2128, 2136, 2138, 2138, 2140, + 2141, 2134, 2142, 2143, 2143, 2144, 2139, 2148, 2135, 2145, + 2145, 2140, 2146, 2146, 2147, 2149, 2150, 2151, 2142, 2148, + 2141, 2152, 2149, 2153, 2144, 2147, 2152, 2154, 2150, 2155, + 2155, 2156, 2157, 2158, 2164, 2159, 2160, 2151, 2161, 2167, + 2156, 2162, 2162, 2153, 2165, 2163, 2168, 2154, 2159, 2164, + 2169, 2171, 2161, 2158, 2163, 2174, 2174, 2167, 2157, 2165, + 2160, 2170, 2172, 2181, 2170, 2171, 2173, 2172, 2168, 2175, + 2175, 2173, 2182, 2169, 2176, 2176, 2178, 2178, 2180, 2180, + 2183, 2181, 2185, 2182, 2187, 2186, 2189, 2188, 2190, 2192, - 2193, 2197, 2198, 2191, 2199, 2202, 2197, 2203, 2195, 2205, - 2203, 2204, 2204, 2206, 2194, 2207, 2207, 2208, 2196, 2210, - 2213, 2208, 2198, 2199, 2205, 2202, 2211, 2212, 2212, 2215, - 2211, 2206, 2216, 2213, 2210, 2217, 2217, 2221, 2219, 2220, - 2220, 2222, 2222, 2223, 2231, 2224, 2225, 2225, 2223, 2215, - 2219, 2232, 2216, 2230, 2230, 2233, 2221, 2224, 2234, 2237, - 2235, 2236, 2236, 2242, 2232, 2241, 2231, 2234, 2233, 2235, - 2241, 2243, 2244, 2245, 2237, 2246, 2243, 2242, 2247, 2249, - 2244, 2252, 2250, 2251, 2246, 2257, 2247, 2250, 2251, 2253, - 2253, 2258, 2245, 2255, 2249, 2259, 2252, 2254, 2254, 2256, + 2192, 2191, 2194, 2194, 2195, 2189, 2196, 2197, 2197, 2183, + 2201, 2199, 2185, 2186, 2202, 2196, 2187, 2188, 2190, 2191, + 2199, 2200, 2200, 2203, 2204, 2205, 2195, 2206, 2201, 2208, + 2203, 2207, 2202, 2209, 2209, 2210, 2210, 2212, 2211, 2204, + 2214, 2213, 2216, 2205, 2211, 2206, 2215, 2207, 2208, 2217, + 0, 2215, 2218, 2220, 2220, 2212, 2213, 2218, 2219, 2214, + 2219, 2221, 2216, 2221, 2222, 2222, 2224, 2226, 2227, 2217, + 2228, 2229, 2230, 2231, 2239, 2232, 2226, 2230, 2235, 2256, + 2236, 2238, 2228, 2236, 2256, 2224, 2241, 2227, 2237, 2237, + 2241, 2229, 2239, 2231, 2232, 2243, 2238, 2244, 2235, 2240, - 2255, 2259, 2260, 2257, 2256, 2261, 2261, 2260, 2262, 2258, - 2263, 2264, 2264, 2265, 2265, 2263, 2268, 2269, 2269, 2270, - 2271, 0, 2270, 2262, 2274, 2271, 2271, 2272, 2273, 2268, - 2274, 2275, 2272, 2273, 2276, 2275, 2277, 2278, 2279, 2276, - 2290, 2281, 2280, 2283, 2286, 2277, 2279, 2280, 2283, 2298, - 2288, 2284, 2278, 2281, 2284, 2288, 2286, 2289, 2290, 2291, - 2292, 2293, 2289, 2294, 2294, 2295, 2299, 2304, 2298, 2292, - 2293, 2300, 2291, 2302, 2295, 2301, 2301, 2306, 2303, 2305, - 2305, 2310, 2304, 2308, 2311, 2313, 2299, 2303, 2311, 2314, - 2300, 2315, 2302, 2312, 2312, 2314, 2306, 2315, 2308, 2316, + 2240, 2244, 2245, 2245, 2246, 2248, 2249, 2250, 2250, 2252, + 2243, 2253, 2253, 2254, 2255, 2255, 2257, 2246, 2258, 2258, + 2264, 2252, 2263, 2263, 2266, 2248, 2249, 2267, 2257, 2265, + 2265, 2271, 2254, 0, 2268, 2269, 2276, 2266, 2270, 2270, + 2267, 2276, 2264, 2268, 2269, 2277, 2271, 2273, 2273, 2278, + 2277, 2279, 2280, 2281, 2283, 2282, 2279, 0, 2285, 2288, + 2280, 2286, 2283, 2278, 2282, 2287, 2286, 2289, 2289, 2293, + 2287, 2291, 2281, 2285, 2288, 2290, 2290, 2292, 2291, 2294, + 2295, 2298, 2292, 2296, 2297, 2297, 2295, 2293, 2296, 2299, + 2300, 2300, 2301, 2301, 2299, 2304, 2298, 2294, 2305, 2305, - 2318, 2310, 2317, 2317, 2319, 2316, 2321, 2322, 2318, 2319, - 2313, 2325, 2324, 2326, 2336, 2321, 2324, 2328, 2328, 2339, - 2322, 2329, 2329, 2330, 2330, 2325, 2332, 2332, 2326, 2334, - 2334, 2337, 2340, 2340, 2336, 2343, 2337, 2337, 2343, 2339, - 2341, 2341, 2342, 2342, 2344, 2346, 2347, 2347, 2348, 2348, - 2349, 2349, 2350, 2351, 2351, 2352, 2353, 2344, 2354, 2355, - 2356, 2356, 2357, 2346, 2360, 2355, 2357, 2350, 2352, 2360, - 2360, 2361, 2354, 2362, 2353, 2363, 2364, 2365, 2366, 2376, - 2367, 2373, 2364, 2365, 2367, 2368, 2368, 2371, 2374, 2373, - 2378, 2374, 2371, 2362, 2361, 2363, 2377, 2379, 2380, 2377, + 2306, 2307, 0, 2306, 2308, 2309, 2307, 2307, 2304, 2308, + 2309, 2310, 2311, 2312, 2313, 2314, 2311, 2310, 2312, 2315, + 2316, 2317, 2322, 2313, 2319, 2316, 2326, 2315, 2320, 2319, + 2314, 2320, 2324, 2317, 2322, 2325, 2327, 2324, 2328, 2329, + 2325, 2330, 2330, 2331, 2326, 2334, 2335, 2328, 2329, 2327, + 2336, 2338, 2331, 2337, 2337, 2342, 2339, 2340, 2341, 2341, + 2344, 2346, 2349, 2347, 2334, 2339, 2335, 2347, 2380, 2336, + 2338, 2380, 2340, 2350, 2342, 2344, 2348, 2348, 2351, 2350, + 2352, 2346, 2353, 2353, 2351, 2354, 2352, 2349, 2357, 2355, + 2358, 2360, 2361, 2354, 2355, 2360, 2362, 2357, 2364, 2364, - 2381, 2382, 2379, 2366, 2376, 2383, 2383, 2378, 2378, 2384, - 2385, 2387, 2388, 2388, 2396, 2382, 2380, 2386, 2385, 2393, - 2381, 0, 2386, 2386, 2389, 2389, 2390, 2390, 2384, 2395, - 2387, 2391, 2391, 2392, 2392, 2393, 2394, 2397, 2398, 2399, - 2396, 2394, 2401, 2401, 2402, 2403, 2397, 2402, 2406, 2395, - 2405, 2405, 2407, 2407, 2415, 2406, 2408, 2411, 2398, 2399, - 2412, 2408, 2413, 2403, 2410, 2410, 2411, 2416, 2416, 2412, - 2417, 2413, 2415, 2418, 2417, 2419, 2421, 2422, 2420, 2427, - 2427, 2428, 2418, 2420, 2420, 2430, 2422, 2434, 2431, 2421, - 2419, 2436, 2435, 2438, 2430, 2440, 2455, 2442, 2443, 2428, + 2365, 2365, 2372, 2358, 2366, 2366, 2361, 2368, 2368, 2370, + 2370, 2362, 2373, 2375, 2376, 2376, 2381, 2373, 2373, 2378, + 2378, 2383, 2372, 2379, 2379, 2385, 2386, 2386, 2389, 2381, + 2387, 2387, 2392, 2375, 2388, 2388, 2390, 2390, 2391, 2383, + 2393, 2394, 2396, 2389, 2400, 2385, 2396, 2394, 2395, 2395, + 2392, 2391, 2399, 2401, 2393, 2402, 2403, 2399, 2399, 2404, + 2405, 2410, 2403, 2412, 2406, 2404, 2410, 2400, 2406, 2407, + 2407, 2412, 2415, 2401, 2413, 2402, 2416, 2413, 2417, 2416, + 2419, 2418, 2420, 2422, 2422, 2405, 2418, 2421, 2423, 2426, + 0, 2424, 2427, 2427, 2435, 2417, 2417, 2415, 2419, 2424, - 2431, 2435, 2442, 2443, 2445, 2438, 2444, 2444, 2454, 2447, - 0, 2436, 2434, 2445, 2447, 2455, 2440, 2448, 2448, 2450, - 2450, 2448, 2451, 2451, 2452, 2452, 2453, 2456, 2454, 2459, - 2458, 2462, 2456, 2460, 2459, 2453, 2458, 2463, 2460, 2461, - 2461, 2464, 2465, 2467, 2466, 2470, 2464, 2468, 2468, 2462, - 2466, 2471, 2472, 2474, 2474, 2478, 2476, 2477, 2463, 2478, - 2465, 2480, 2479, 2481, 2470, 2482, 2471, 2484, 2467, 2476, - 2477, 2479, 2472, 2482, 2483, 2485, 2485, 2480, 2486, 2483, - 2488, 2488, 2481, 2489, 2489, 2491, 2493, 2493, 2495, 2496, - 2498, 2497, 2501, 2484, 2502, 2498, 2503, 2486, 2500, 2500, + 2425, 2421, 2420, 2428, 2428, 2425, 2425, 2423, 2426, 2429, + 2429, 2430, 2430, 2431, 2431, 2432, 2433, 2434, 2436, 2437, + 2435, 2433, 2438, 2440, 2440, 2441, 2442, 2436, 2441, 2444, + 2444, 2432, 2454, 2445, 2446, 2446, 2447, 2434, 2450, 2437, + 2445, 2447, 2438, 2451, 2442, 2449, 2449, 2450, 2452, 2457, + 2454, 2456, 2451, 2455, 2455, 2456, 2458, 2452, 2457, 2459, + 2460, 2461, 2466, 2466, 2459, 2459, 2467, 2469, 2470, 2473, + 2461, 2458, 2474, 2460, 2478, 2475, 2469, 2476, 2480, 2495, + 2470, 2474, 2482, 2476, 2467, 2483, 2478, 2482, 2484, 2484, + 2483, 2485, 2487, 2494, 2473, 2475, 2502, 2487, 2495, 2480, - 2505, 2505, 2506, 2508, 2495, 2496, 2491, 2497, 2508, 2509, - 2510, 2510, 2501, 2511, 2511, 2503, 2506, 2502, 2512, 2513, - 2513, 2514, 2515, 2516, 2517, 2518, 2519, 2520, 2520, 2516, - 2514, 2509, 2521, 2522, 2522, 2521, 2526, 2518, 2512, 2513, - 2527, 2528, 2515, 2517, 2529, 2529, 2519, 2528, 2526, 2530, - 2531, 2532, 2530, 2534, 2535, 2536, 2531, 2537, 2534, 2535, - 2527, 2538, 2542, 2537, 2539, 2539, 2541, 2541, 2543, 2532, - 2545, 2545, 2546, 2546, 2536, 2547, 2548, 2543, 2538, 2538, - 2547, 2542, 2549, 2550, 2550, 2551, 2551, 2549, 2552, 2552, - 2548, 2553, 2555, 2555, 2558, 2560, 2553, 2561, 2562, 2563, + 2485, 2488, 2488, 2490, 2490, 2488, 2491, 2491, 2492, 2492, + 2493, 2496, 2498, 2494, 2502, 2499, 2496, 2500, 2498, 2493, + 2499, 2503, 2500, 2501, 2501, 2504, 2505, 2506, 2507, 2510, + 2504, 2508, 2508, 2506, 2511, 2512, 2514, 2514, 2516, 2517, + 2524, 2518, 2503, 2520, 2505, 2518, 2521, 2519, 2510, 2511, + 2522, 2516, 2517, 2507, 2526, 2512, 2519, 2523, 2522, 2520, + 2525, 2525, 2523, 2528, 2528, 2521, 2524, 2529, 2529, 2531, + 2533, 2533, 2535, 2526, 2538, 2536, 2537, 2540, 2540, 2538, + 2541, 2542, 2543, 2545, 2545, 2546, 2549, 2552, 2535, 2548, + 2531, 2536, 2537, 2556, 2548, 2550, 2550, 2551, 2551, 2546, - 2563, 2565, 2565, 2567, 2566, 2568, 2569, 2569, 2570, 0, - 2571, 2574, 2574, 2558, 2568, 2571, 2577, 2560, 2566, 2561, - 2562, 2576, 2576, 2567, 2579, 2578, 2580, 2570, 2581, 2581, - 2577, 2578, 2582, 2584, 2580, 2585, 2579, 2582, 2586, 2587, - 2588, 2590, 2591, 2586, 2592, 2593, 2588, 2595, 2594, 2590, - 2596, 2587, 2597, 2584, 2598, 2585, 2601, 2602, 2607, 2598, - 2629, 2591, 2607, 2595, 2592, 2593, 2594, 2596, 2596, 2629, - 2602, 2605, 2605, 2597, 2606, 2606, 2601, 2611, 2611, 2613, - 2613, 2614, 2614, 2617, 2614, 2615, 2615, 2617, 2615, 2616, - 2616, 2620, 2616, 2619, 2619, 2623, 2621, 2624, 2624, 2627, + 2541, 2543, 2553, 2553, 2542, 2554, 2555, 2552, 2549, 2558, + 2560, 2557, 2559, 2556, 2568, 2555, 2554, 2557, 2561, 2561, + 2562, 2567, 2553, 2562, 2559, 2563, 2563, 2573, 2558, 2569, + 2560, 2570, 2570, 2567, 2568, 2569, 2571, 2572, 2577, 2571, + 2583, 2575, 2576, 2572, 2578, 2573, 2575, 2576, 2579, 2584, + 2578, 2580, 2580, 2582, 2582, 2586, 2586, 2577, 2584, 2583, + 2587, 2587, 2588, 2589, 2590, 2579, 2579, 2588, 2599, 2590, + 2591, 2591, 2592, 2592, 2593, 2593, 2594, 2589, 2596, 2596, + 2601, 2594, 2602, 2603, 2604, 2604, 2607, 2599, 2606, 2606, + 2608, 2612, 2609, 2610, 2610, 2611, 2612, 2615, 2615, 2619, - 2623, 2628, 2630, 2632, 2633, 2628, 2627, 2634, 2634, 2620, - 2621, 2635, 2635, 2633, 2636, 2636, 2637, 2630, 2638, 2640, - 2639, 2632, 2641, 2638, 2640, 2640, 2642, 2643, 2641, 2639, - 2645, 2637, 2639, 2644, 2646, 2645, 2647, 2648, 2648, 2646, - 2649, 2663, 2643, 2652, 2652, 2649, 2655, 2655, 2656, 2656, - 2663, 2642, 2657, 2657, 2644, 2647, 2658, 2658, 2659, 2659, - 2660, 2660, 2661, 2661, 2664, 2664, 2665, 2667, 2667, 2668, - 2669, 2671, 2671, 2670, 2672, 2673, 2673, 2676, 2677, 2678, - 2680, 2677, 2684, 2669, 2668, 2670, 2665, 2679, 2679, 2672, - 2682, 2683, 2686, 2682, 2685, 2676, 2684, 2683, 2680, 2685, + 2607, 2609, 2601, 2618, 2602, 2603, 2617, 2617, 2618, 2620, + 2608, 2621, 2622, 2619, 2611, 2620, 2623, 2623, 2626, 2624, + 2622, 2627, 2628, 2621, 2624, 2629, 2630, 2628, 2632, 2633, + 2634, 2635, 2630, 2637, 2636, 2643, 2632, 2629, 2626, 2638, + 2639, 2627, 2640, 2647, 2647, 2644, 0, 2640, 2633, 2637, + 2634, 2635, 2636, 2648, 2648, 2643, 2638, 2638, 2644, 2649, + 2662, 2639, 2669, 2649, 2653, 2653, 2655, 2655, 2656, 2656, + 2659, 2656, 2657, 2657, 2659, 2657, 2658, 2658, 2662, 2658, + 2661, 2661, 2663, 2665, 2666, 2666, 2670, 2669, 2665, 2672, + 2671, 2673, 2675, 2670, 2671, 2676, 2663, 2680, 2672, 2677, - 2687, 2688, 2703, 2699, 2690, 2678, 2699, 2701, 2701, 2705, - 2706, 2686, 2704, 2705, 2707, 2709, 2710, 2688, 2687, 2690, - 2712, 2704, 2712, 2715, 2711, 2703, 2713, 2710, 2707, 2711, - 2706, 2714, 2714, 2716, 2718, 2717, 2715, 2719, 2709, 2720, - 2721, 2713, 2724, 2722, 2725, 2726, 2726, 2820, 2727, 2820, - 2718, 2733, 2716, 2717, 2720, 2732, 2724, 2727, 2728, 2728, - 2737, 2721, 2719, 2722, 2725, 2729, 2729, 2730, 2730, 2731, - 2731, 2733, 2734, 2735, 2732, 2734, 2736, 2738, 2735, 2740, - 2739, 2736, 2741, 2742, 2742, 2737, 2739, 2743, 2744, 2744, - 2746, 2748, 2738, 2740, 2751, 2751, 2752, 2752, 2754, 2753, + 2677, 2678, 2678, 2685, 2676, 2687, 2673, 2679, 2679, 2681, + 2675, 2682, 2680, 2683, 2681, 2684, 2686, 2688, 2683, 2683, + 2682, 2684, 2688, 2682, 2689, 2690, 2687, 2838, 2685, 2689, + 2692, 2686, 2691, 2691, 2838, 2692, 2695, 2695, 2698, 2698, + 2699, 2699, 2700, 2700, 2690, 2701, 2701, 2702, 2702, 2703, + 2703, 2704, 2704, 2706, 2707, 2707, 2708, 2712, 2710, 2711, + 2711, 2713, 2706, 2714, 2715, 2715, 2716, 2717, 2717, 2720, + 2721, 2722, 2712, 2721, 2713, 2714, 2708, 2710, 2723, 2723, + 2724, 2716, 2726, 2727, 2730, 2726, 2728, 2720, 2729, 2727, + 2731, 2732, 2743, 2729, 2734, 2743, 2748, 2722, 2724, 2752, - 2758, 2757, 2741, 2759, 2755, 2746, 2743, 2753, 2756, 2748, - 2755, 2760, 2760, 2758, 2756, 2757, 2762, 2754, 2764, 2765, - 2767, 2768, 2759, 2765, 2769, 2770, 2768, 2772, 2771, 2773, - 2774, 2776, 2764, 2777, 2773, 2774, 2762, 2779, 2770, 2785, - 2767, 2771, 2779, 2769, 2778, 2778, 2772, 2780, 0, 2776, - 2781, 2781, 2777, 2780, 2782, 2783, 2784, 2786, 2785, 2782, - 2783, 2784, 2787, 2786, 2788, 2788, 2790, 2787, 2791, 2792, - 2790, 2793, 2794, 2795, 2796, 2797, 2792, 2798, 2798, 2795, - 2800, 2800, 2803, 2801, 2802, 2804, 2805, 2791, 2797, 2802, - 2793, 2794, 2801, 2796, 2808, 2801, 2806, 2806, 2807, 2805, + 2728, 2745, 2745, 2730, 2746, 2746, 2749, 2732, 2731, 2734, + 2750, 2751, 2754, 2752, 2750, 2749, 2755, 2756, 2757, 2748, + 2757, 2758, 2756, 2759, 2759, 2760, 2761, 2755, 2762, 2764, + 2766, 2751, 2763, 2767, 2765, 2754, 2758, 2771, 2760, 2772, + 2772, 2770, 2866, 2773, 2866, 2761, 2762, 2778, 2763, 2765, + 2779, 2766, 2773, 2767, 2764, 2770, 2783, 2771, 2774, 2774, + 2775, 2775, 2776, 2776, 2777, 2777, 2778, 2781, 2780, 2782, + 2779, 2780, 2781, 2784, 2782, 2786, 2785, 2787, 2788, 2788, + 2789, 2783, 2785, 2790, 2790, 2792, 2794, 2799, 2784, 2786, + 2797, 2797, 2798, 2798, 2800, 2799, 2801, 2787, 2803, 2789, - 2810, 2803, 2812, 2807, 2804, 2811, 2811, 2808, 2813, 2813, - 2814, 2814, 2815, 2816, 2817, 2818, 2818, 2815, 2819, 2824, - 2816, 2812, 2822, 2819, 2821, 2821, 2810, 2823, 2826, 2822, - 2825, 2828, 2828, 2817, 2823, 2825, 2829, 2831, 2824, 2832, - 2833, 2834, 2831, 2838, 2832, 2835, 2835, 2826, 2837, 2837, - 2839, 2840, 2840, 2841, 2841, 2829, 2842, 2844, 2844, 2833, - 2834, 2846, 2838, 2842, 2845, 2845, 2848, 2851, 2846, 2839, - 2852, 2848, 2851, 2853, 2854, 2854, 2855, 2855, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 2852, - 0, 0, 2853, 2859, 2859, 2859, 2859, 2859, 2859, 2859, + 2792, 2802, 2801, 2804, 2794, 2805, 2808, 2802, 2806, 2806, + 2811, 2810, 2803, 2800, 2811, 2813, 2804, 2814, 2815, 2816, + 2817, 2818, 2814, 2819, 2805, 2810, 2808, 2822, 2819, 2820, + 2823, 2825, 2816, 2817, 2820, 2813, 2825, 2815, 2824, 2824, + 2818, 2826, 2827, 2827, 2831, 2822, 2828, 2826, 2829, 2823, + 2830, 2828, 2832, 2829, 2833, 2830, 2834, 2834, 2832, 2833, + 2836, 2837, 2839, 2831, 2836, 2840, 2841, 2842, 2849, 2843, + 2844, 2844, 2841, 2846, 2846, 2850, 2847, 2851, 2848, 2856, + 2837, 2839, 2843, 2848, 2840, 2847, 2842, 2849, 2847, 2854, + 2851, 2852, 2852, 2853, 2850, 2857, 2857, 2858, 2853, 2859, - 2860, 2860, 2860, 2860, 2860, 2860, 2860, 2861, 2861, 2861, - 2861, 2861, 2861, 2861, 2862, 2862, 2862, 2862, 2862, 2862, - 2862, 2863, 2863, 2863, 2863, 2863, 2863, 2863, 2865, 2865, - 0, 2865, 2865, 2865, 2865, 2866, 2866, 0, 0, 0, - 2866, 2866, 2867, 2867, 0, 0, 2867, 0, 2867, 2868, - 0, 0, 0, 0, 0, 2868, 2869, 2869, 0, 0, - 0, 2869, 2869, 2870, 0, 0, 0, 0, 0, 2870, - 2871, 2871, 0, 2871, 2871, 2871, 2871, 2872, 2872, 0, - 2872, 2872, 2872, 2872, 2858, 2858, 2858, 2858, 2858, 2858, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, + 2859, 2861, 2854, 2860, 2860, 2856, 2861, 2862, 2863, 2864, + 2864, 2870, 2865, 2868, 2862, 2869, 2858, 2865, 2867, 2867, + 2868, 2871, 2869, 2872, 2874, 2874, 2871, 2863, 2875, 2877, + 2870, 2878, 2879, 2880, 2877, 2884, 2878, 2881, 2881, 2883, + 2883, 2885, 2872, 2886, 2886, 2887, 2887, 2875, 2888, 2890, + 2890, 2879, 2880, 2898, 2884, 2888, 2891, 2891, 2892, 2894, + 2885, 2897, 2899, 0, 2894, 2892, 2897, 2900, 2900, 2901, + 2901, 0, 2898, 0, 0, 0, 0, 0, 0, 0, + 0, 2899, 2905, 2905, 2905, 2905, 2905, 2905, 2905, 2906, + 2906, 2906, 2906, 2906, 2906, 2906, 2907, 2907, 2907, 2907, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, - 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, 2858, - 2858, 2858, 2858, 2858, 2858 + 2907, 2907, 2907, 2908, 2908, 2908, 2908, 2908, 2908, 2908, + 2909, 2909, 2909, 2909, 2909, 2909, 2909, 2911, 2911, 0, + 2911, 2911, 2911, 2911, 2912, 2912, 0, 0, 0, 2912, + 2912, 2913, 2913, 0, 0, 2913, 0, 2913, 2914, 0, + 0, 0, 0, 0, 2914, 2915, 2915, 0, 0, 0, + 2915, 2915, 2916, 0, 0, 0, 0, 0, 2916, 2917, + 2917, 0, 2917, 2917, 2917, 2917, 2918, 2918, 0, 2918, + 2918, 2918, 2918, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + + 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, 2904, + 2904, 2904, 2904, 2904 } ; static yy_state_type yy_last_accepting_state; @@ -2822,7 +2858,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 2824 "" +#line 2860 "" #define INITIAL 0 #define quotedstring 1 @@ -3045,7 +3081,7 @@ YY_DECL { #line 205 "./util/configlexer.lex" -#line 3047 "" +#line 3083 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -3078,13 +3114,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 >= 2859 ) + if ( yy_current_state >= 2905 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 5585 ); + while ( yy_base[yy_current_state] != 5674 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3309,1182 +3345,1202 @@ YY_RULE_SETUP case 40: YY_RULE_SETUP #line 248 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSTEMD) } +{ YDVAR(1, VAR_TLS_SESSION_TICKET_KEYS) } YY_BREAK case 41: YY_RULE_SETUP #line 249 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_DAEMONIZE) } +{ YDVAR(1, VAR_TLS_CIPHERS) } YY_BREAK case 42: YY_RULE_SETUP #line 250 "./util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE) } +{ YDVAR(1, VAR_TLS_CIPHERSUITES) } YY_BREAK case 43: YY_RULE_SETUP #line 251 "./util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE) } +{ YDVAR(1, VAR_USE_SYSTEMD) } YY_BREAK case 44: YY_RULE_SETUP #line 252 "./util/configlexer.lex" -{ YDVAR(1, VAR_OUTGOING_INTERFACE) } +{ YDVAR(1, VAR_DO_DAEMONIZE) } YY_BREAK case 45: YY_RULE_SETUP #line 253 "./util/configlexer.lex" -{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } +{ YDVAR(1, VAR_INTERFACE) } YY_BREAK case 46: YY_RULE_SETUP #line 254 "./util/configlexer.lex" -{ YDVAR(1, VAR_SO_RCVBUF) } +{ YDVAR(1, VAR_INTERFACE) } YY_BREAK case 47: YY_RULE_SETUP #line 255 "./util/configlexer.lex" -{ YDVAR(1, VAR_SO_SNDBUF) } +{ YDVAR(1, VAR_OUTGOING_INTERFACE) } YY_BREAK case 48: YY_RULE_SETUP #line 256 "./util/configlexer.lex" -{ YDVAR(1, VAR_SO_REUSEPORT) } +{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) } YY_BREAK case 49: YY_RULE_SETUP #line 257 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_TRANSPARENT) } +{ YDVAR(1, VAR_SO_RCVBUF) } YY_BREAK case 50: YY_RULE_SETUP #line 258 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_FREEBIND) } +{ YDVAR(1, VAR_SO_SNDBUF) } YY_BREAK case 51: YY_RULE_SETUP #line 259 "./util/configlexer.lex" -{ YDVAR(1, VAR_CHROOT) } +{ YDVAR(1, VAR_SO_REUSEPORT) } YY_BREAK case 52: YY_RULE_SETUP #line 260 "./util/configlexer.lex" -{ YDVAR(1, VAR_USERNAME) } +{ YDVAR(1, VAR_IP_TRANSPARENT) } YY_BREAK case 53: YY_RULE_SETUP #line 261 "./util/configlexer.lex" -{ YDVAR(1, VAR_DIRECTORY) } +{ YDVAR(1, VAR_IP_FREEBIND) } YY_BREAK case 54: YY_RULE_SETUP #line 262 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOGFILE) } +{ YDVAR(1, VAR_CHROOT) } YY_BREAK case 55: YY_RULE_SETUP #line 263 "./util/configlexer.lex" -{ YDVAR(1, VAR_PIDFILE) } +{ YDVAR(1, VAR_USERNAME) } YY_BREAK case 56: YY_RULE_SETUP #line 264 "./util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_HINTS) } +{ YDVAR(1, VAR_DIRECTORY) } YY_BREAK case 57: YY_RULE_SETUP #line 265 "./util/configlexer.lex" -{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } +{ YDVAR(1, VAR_LOGFILE) } YY_BREAK case 58: YY_RULE_SETUP #line 266 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } +{ YDVAR(1, VAR_PIDFILE) } YY_BREAK case 59: YY_RULE_SETUP #line 267 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SIZE) } +{ YDVAR(1, VAR_ROOT_HINTS) } YY_BREAK case 60: YY_RULE_SETUP #line 268 "./util/configlexer.lex" -{ YDVAR(1, VAR_MSG_CACHE_SLABS) } +{ YDVAR(1, VAR_STREAM_WAIT_SIZE) } YY_BREAK case 61: YY_RULE_SETUP #line 269 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } +{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) } YY_BREAK case 62: YY_RULE_SETUP #line 270 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } +{ YDVAR(1, VAR_MSG_BUFFER_SIZE) } YY_BREAK case 63: YY_RULE_SETUP #line 271 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_TTL) } +{ YDVAR(1, VAR_MSG_CACHE_SIZE) } YY_BREAK case 64: YY_RULE_SETUP #line 272 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } +{ YDVAR(1, VAR_MSG_CACHE_SLABS) } YY_BREAK case 65: YY_RULE_SETUP #line 273 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHE_MIN_TTL) } +{ YDVAR(1, VAR_RRSET_CACHE_SIZE) } YY_BREAK case 66: YY_RULE_SETUP #line 274 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_HOST_TTL) } +{ YDVAR(1, VAR_RRSET_CACHE_SLABS) } YY_BREAK case 67: YY_RULE_SETUP #line 275 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_LAME_TTL) } +{ YDVAR(1, VAR_CACHE_MAX_TTL) } YY_BREAK case 68: YY_RULE_SETUP #line 276 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } +{ YDVAR(1, VAR_CACHE_MAX_NEGATIVE_TTL) } YY_BREAK case 69: YY_RULE_SETUP #line 277 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } +{ YDVAR(1, VAR_CACHE_MIN_TTL) } YY_BREAK case 70: YY_RULE_SETUP #line 278 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } +{ YDVAR(1, VAR_INFRA_HOST_TTL) } YY_BREAK case 71: YY_RULE_SETUP #line 279 "./util/configlexer.lex" -{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } +{ YDVAR(1, VAR_INFRA_LAME_TTL) } YY_BREAK case 72: YY_RULE_SETUP #line 280 "./util/configlexer.lex" -{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } +{ YDVAR(1, VAR_INFRA_CACHE_SLABS) } YY_BREAK case 73: YY_RULE_SETUP #line 281 "./util/configlexer.lex" -{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } +{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) } YY_BREAK case 74: YY_RULE_SETUP #line 282 "./util/configlexer.lex" -{ YDVAR(1, VAR_DELAY_CLOSE) } +{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) } YY_BREAK case 75: YY_RULE_SETUP #line 283 "./util/configlexer.lex" -{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } +{ YDVAR(1, VAR_INFRA_CACHE_MIN_RTT) } YY_BREAK case 76: YY_RULE_SETUP #line 284 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } +{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) } YY_BREAK case 77: YY_RULE_SETUP #line 285 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } +{ YDVAR(1, VAR_JOSTLE_TIMEOUT) } YY_BREAK case 78: YY_RULE_SETUP #line 286 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_GLUE) } +{ YDVAR(1, VAR_DELAY_CLOSE) } YY_BREAK case 79: YY_RULE_SETUP #line 287 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } +{ YDVAR(1, VAR_TARGET_FETCH_POLICY) } YY_BREAK case 80: YY_RULE_SETUP #line 288 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } +{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) } YY_BREAK case 81: YY_RULE_SETUP #line 289 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } +{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) } YY_BREAK case 82: YY_RULE_SETUP #line 290 "./util/configlexer.lex" -{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } +{ YDVAR(1, VAR_HARDEN_GLUE) } YY_BREAK case 83: YY_RULE_SETUP #line 291 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } +{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) } YY_BREAK case 84: YY_RULE_SETUP #line 292 "./util/configlexer.lex" -{ YDVAR(1, VAR_CAPS_WHITELIST) } +{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) } YY_BREAK case 85: YY_RULE_SETUP #line 293 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } +{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) } YY_BREAK case 86: YY_RULE_SETUP #line 294 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_ADDRESS) } +{ YDVAR(1, VAR_HARDEN_ALGO_DOWNGRADE) } YY_BREAK case 87: YY_RULE_SETUP #line 295 "./util/configlexer.lex" -{ YDVAR(1, VAR_PRIVATE_DOMAIN) } +{ YDVAR(1, VAR_USE_CAPS_FOR_ID) } YY_BREAK case 88: YY_RULE_SETUP #line 296 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH_KEY) } +{ YDVAR(1, VAR_CAPS_WHITELIST) } YY_BREAK case 89: YY_RULE_SETUP #line 297 "./util/configlexer.lex" -{ YDVAR(1, VAR_PREFETCH) } +{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) } YY_BREAK case 90: YY_RULE_SETUP #line 298 "./util/configlexer.lex" -{ YDVAR(1, VAR_DENY_ANY) } +{ YDVAR(1, VAR_PRIVATE_ADDRESS) } YY_BREAK case 91: YY_RULE_SETUP #line 299 "./util/configlexer.lex" -{ YDVAR(0, VAR_STUB_ZONE) } +{ YDVAR(1, VAR_PRIVATE_DOMAIN) } YY_BREAK case 92: YY_RULE_SETUP #line 300 "./util/configlexer.lex" -{ YDVAR(1, VAR_NAME) } +{ YDVAR(1, VAR_PREFETCH_KEY) } YY_BREAK case 93: YY_RULE_SETUP #line 301 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_ADDR) } +{ YDVAR(1, VAR_PREFETCH) } YY_BREAK case 94: YY_RULE_SETUP #line 302 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_HOST) } +{ YDVAR(1, VAR_DENY_ANY) } YY_BREAK case 95: YY_RULE_SETUP #line 303 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_PRIME) } +{ YDVAR(0, VAR_STUB_ZONE) } YY_BREAK case 96: YY_RULE_SETUP #line 304 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_FIRST) } +{ YDVAR(1, VAR_NAME) } YY_BREAK case 97: YY_RULE_SETUP #line 305 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_NO_CACHE) } +{ YDVAR(1, VAR_STUB_ADDR) } YY_BREAK case 98: YY_RULE_SETUP #line 306 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } +{ YDVAR(1, VAR_STUB_HOST) } YY_BREAK case 99: YY_RULE_SETUP #line 307 "./util/configlexer.lex" -{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } +{ YDVAR(1, VAR_STUB_PRIME) } YY_BREAK case 100: YY_RULE_SETUP #line 308 "./util/configlexer.lex" -{ YDVAR(0, VAR_FORWARD_ZONE) } +{ YDVAR(1, VAR_STUB_FIRST) } YY_BREAK case 101: YY_RULE_SETUP #line 309 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_ADDR) } +{ YDVAR(1, VAR_STUB_NO_CACHE) } YY_BREAK case 102: YY_RULE_SETUP #line 310 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_HOST) } +{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 103: YY_RULE_SETUP #line 311 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_FIRST) } +{ YDVAR(1, VAR_STUB_SSL_UPSTREAM) } YY_BREAK case 104: YY_RULE_SETUP #line 312 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_NO_CACHE) } +{ YDVAR(0, VAR_FORWARD_ZONE) } YY_BREAK case 105: YY_RULE_SETUP #line 313 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } +{ YDVAR(1, VAR_FORWARD_ADDR) } YY_BREAK case 106: YY_RULE_SETUP #line 314 "./util/configlexer.lex" -{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } +{ YDVAR(1, VAR_FORWARD_HOST) } YY_BREAK case 107: YY_RULE_SETUP #line 315 "./util/configlexer.lex" -{ YDVAR(0, VAR_AUTH_ZONE) } +{ YDVAR(1, VAR_FORWARD_FIRST) } YY_BREAK case 108: YY_RULE_SETUP #line 316 "./util/configlexer.lex" -{ YDVAR(1, VAR_ZONEFILE) } +{ YDVAR(1, VAR_FORWARD_NO_CACHE) } YY_BREAK case 109: YY_RULE_SETUP #line 317 "./util/configlexer.lex" -{ YDVAR(1, VAR_MASTER) } +{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 110: YY_RULE_SETUP #line 318 "./util/configlexer.lex" -{ YDVAR(1, VAR_URL) } +{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) } YY_BREAK case 111: YY_RULE_SETUP #line 319 "./util/configlexer.lex" -{ YDVAR(1, VAR_ALLOW_NOTIFY) } +{ YDVAR(0, VAR_AUTH_ZONE) } YY_BREAK case 112: YY_RULE_SETUP #line 320 "./util/configlexer.lex" -{ YDVAR(1, VAR_FOR_DOWNSTREAM) } +{ YDVAR(1, VAR_ZONEFILE) } YY_BREAK case 113: YY_RULE_SETUP #line 321 "./util/configlexer.lex" -{ YDVAR(1, VAR_FOR_UPSTREAM) } +{ YDVAR(1, VAR_MASTER) } YY_BREAK case 114: YY_RULE_SETUP #line 322 "./util/configlexer.lex" -{ YDVAR(1, VAR_FALLBACK_ENABLED) } +{ YDVAR(1, VAR_URL) } YY_BREAK case 115: YY_RULE_SETUP #line 323 "./util/configlexer.lex" -{ YDVAR(0, VAR_VIEW) } +{ YDVAR(1, VAR_ALLOW_NOTIFY) } YY_BREAK case 116: YY_RULE_SETUP #line 324 "./util/configlexer.lex" -{ YDVAR(1, VAR_VIEW_FIRST) } +{ YDVAR(1, VAR_FOR_DOWNSTREAM) } YY_BREAK case 117: YY_RULE_SETUP #line 325 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } +{ YDVAR(1, VAR_FOR_UPSTREAM) } YY_BREAK case 118: YY_RULE_SETUP #line 326 "./util/configlexer.lex" -{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } +{ YDVAR(1, VAR_FALLBACK_ENABLED) } YY_BREAK case 119: YY_RULE_SETUP #line 327 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL) } +{ YDVAR(0, VAR_VIEW) } YY_BREAK case 120: YY_RULE_SETUP #line 328 "./util/configlexer.lex" -{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } +{ YDVAR(1, VAR_VIEW_FIRST) } YY_BREAK case 121: YY_RULE_SETUP #line 329 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } +{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) } YY_BREAK case 122: YY_RULE_SETUP #line 330 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } +{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) } YY_BREAK case 123: YY_RULE_SETUP #line 331 "./util/configlexer.lex" -{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } +{ YDVAR(2, VAR_ACCESS_CONTROL) } YY_BREAK case 124: YY_RULE_SETUP #line 332 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) } YY_BREAK case 125: YY_RULE_SETUP #line 333 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) } YY_BREAK case 126: YY_RULE_SETUP #line 334 "./util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } +{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) } YY_BREAK case 127: YY_RULE_SETUP #line 335 "./util/configlexer.lex" -{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } +{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) } YY_BREAK case 128: YY_RULE_SETUP #line 336 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) } YY_BREAK case 129: YY_RULE_SETUP #line 337 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } +{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) } YY_BREAK case 130: YY_RULE_SETUP #line 338 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_IDENTITY) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV4) } YY_BREAK case 131: YY_RULE_SETUP #line 339 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_VERSION) } +{ YDVAR(1, VAR_MIN_CLIENT_SUBNET_IPV6) } YY_BREAK case 132: YY_RULE_SETUP #line 340 "./util/configlexer.lex" -{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV4) } YY_BREAK case 133: YY_RULE_SETUP #line 341 "./util/configlexer.lex" -{ YDVAR(1, VAR_IDENTITY) } +{ YDVAR(1, VAR_MAX_ECS_TREE_SIZE_IPV6) } YY_BREAK case 134: YY_RULE_SETUP #line 342 "./util/configlexer.lex" -{ YDVAR(1, VAR_VERSION) } +{ YDVAR(1, VAR_HIDE_IDENTITY) } YY_BREAK case 135: YY_RULE_SETUP #line 343 "./util/configlexer.lex" -{ YDVAR(1, VAR_MODULE_CONF) } +{ YDVAR(1, VAR_HIDE_VERSION) } YY_BREAK case 136: YY_RULE_SETUP #line 344 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR) } +{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) } YY_BREAK case 137: YY_RULE_SETUP #line 345 "./util/configlexer.lex" -{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } +{ YDVAR(1, VAR_IDENTITY) } YY_BREAK case 138: YY_RULE_SETUP #line 346 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_VERSION) } YY_BREAK case 139: YY_RULE_SETUP #line 347 "./util/configlexer.lex" -{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } +{ YDVAR(1, VAR_MODULE_CONF) } YY_BREAK case 140: YY_RULE_SETUP #line 348 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } +{ YDVAR(1, VAR_DLV_ANCHOR) } YY_BREAK case 141: YY_RULE_SETUP #line 349 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR) } +{ YDVAR(1, VAR_DLV_ANCHOR_FILE) } YY_BREAK case 142: YY_RULE_SETUP #line 350 "./util/configlexer.lex" -{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } +{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) } YY_BREAK case 143: YY_RULE_SETUP #line 351 "./util/configlexer.lex" -{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } +{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) } YY_BREAK case 144: YY_RULE_SETUP #line 352 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } +{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) } YY_BREAK case 145: YY_RULE_SETUP #line 353 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } +{ YDVAR(1, VAR_TRUST_ANCHOR) } YY_BREAK case 146: YY_RULE_SETUP #line 354 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } +{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) } YY_BREAK case 147: YY_RULE_SETUP #line 355 "./util/configlexer.lex" -{ YDVAR(1, VAR_BOGUS_TTL) } +{ YDVAR(1, VAR_ROOT_KEY_SENTINEL) } YY_BREAK case 148: YY_RULE_SETUP #line 356 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } +{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) } YY_BREAK case 149: YY_RULE_SETUP #line 357 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) } YY_BREAK case 150: YY_RULE_SETUP #line 358 "./util/configlexer.lex" -{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } +{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) } YY_BREAK case 151: YY_RULE_SETUP #line 359 "./util/configlexer.lex" -{ YDVAR(1, VAR_IGNORE_CD_FLAG) } +{ YDVAR(1, VAR_BOGUS_TTL) } YY_BREAK case 152: YY_RULE_SETUP #line 360 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED) } +{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) } YY_BREAK case 153: YY_RULE_SETUP #line 361 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } +{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) } YY_BREAK case 154: YY_RULE_SETUP #line 362 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } +{ YDVAR(1, VAR_AGGRESSIVE_NSEC) } YY_BREAK case 155: YY_RULE_SETUP #line 363 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_DSA) } +{ YDVAR(1, VAR_IGNORE_CD_FLAG) } YY_BREAK case 156: YY_RULE_SETUP #line 364 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAKE_SHA1) } +{ YDVAR(1, VAR_SERVE_EXPIRED) } YY_BREAK case 157: YY_RULE_SETUP #line 365 "./util/configlexer.lex" -{ YDVAR(1, VAR_VAL_LOG_LEVEL) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL) } YY_BREAK case 158: YY_RULE_SETUP #line 366 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SIZE) } +{ YDVAR(1, VAR_SERVE_EXPIRED_TTL_RESET) } YY_BREAK case 159: YY_RULE_SETUP #line 367 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEY_CACHE_SLABS) } +{ YDVAR(1, VAR_FAKE_DSA) } YY_BREAK case 160: YY_RULE_SETUP #line 368 "./util/configlexer.lex" -{ YDVAR(1, VAR_NEG_CACHE_SIZE) } +{ YDVAR(1, VAR_FAKE_SHA1) } YY_BREAK case 161: YY_RULE_SETUP #line 369 "./util/configlexer.lex" -{ - YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } +{ YDVAR(1, VAR_VAL_LOG_LEVEL) } YY_BREAK case 162: YY_RULE_SETUP -#line 371 "./util/configlexer.lex" -{ YDVAR(1, VAR_ADD_HOLDDOWN) } +#line 370 "./util/configlexer.lex" +{ YDVAR(1, VAR_KEY_CACHE_SIZE) } YY_BREAK case 163: YY_RULE_SETUP -#line 372 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEL_HOLDDOWN) } +#line 371 "./util/configlexer.lex" +{ YDVAR(1, VAR_KEY_CACHE_SLABS) } YY_BREAK case 164: YY_RULE_SETUP -#line 373 "./util/configlexer.lex" -{ YDVAR(1, VAR_KEEP_MISSING) } +#line 372 "./util/configlexer.lex" +{ YDVAR(1, VAR_NEG_CACHE_SIZE) } YY_BREAK case 165: YY_RULE_SETUP -#line 374 "./util/configlexer.lex" -{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } +#line 373 "./util/configlexer.lex" +{ + YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) } YY_BREAK case 166: YY_RULE_SETUP #line 375 "./util/configlexer.lex" -{ YDVAR(1, VAR_USE_SYSLOG) } +{ YDVAR(1, VAR_ADD_HOLDDOWN) } YY_BREAK case 167: YY_RULE_SETUP #line 376 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_IDENTITY) } +{ YDVAR(1, VAR_DEL_HOLDDOWN) } YY_BREAK case 168: YY_RULE_SETUP #line 377 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TIME_ASCII) } +{ YDVAR(1, VAR_KEEP_MISSING) } YY_BREAK case 169: YY_RULE_SETUP #line 378 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_QUERIES) } +{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) } YY_BREAK case 170: YY_RULE_SETUP #line 379 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_REPLIES) } +{ YDVAR(1, VAR_USE_SYSLOG) } YY_BREAK case 171: YY_RULE_SETUP #line 380 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } +{ YDVAR(1, VAR_LOG_IDENTITY) } YY_BREAK case 172: YY_RULE_SETUP #line 381 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } +{ YDVAR(1, VAR_LOG_TIME_ASCII) } YY_BREAK case 173: YY_RULE_SETUP #line 382 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOG_SERVFAIL) } +{ YDVAR(1, VAR_LOG_QUERIES) } YY_BREAK case 174: YY_RULE_SETUP #line 383 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE) } +{ YDVAR(1, VAR_LOG_REPLIES) } YY_BREAK case 175: YY_RULE_SETUP #line 384 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA) } +{ YDVAR(1, VAR_LOG_TAG_QUERYREPLY) } YY_BREAK case 176: YY_RULE_SETUP #line 385 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOCAL_DATA_PTR) } +{ YDVAR(1, VAR_LOG_LOCAL_ACTIONS) } YY_BREAK case 177: YY_RULE_SETUP #line 386 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } +{ YDVAR(1, VAR_LOG_SERVFAIL) } YY_BREAK case 178: YY_RULE_SETUP #line 387 "./util/configlexer.lex" -{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } +{ YDVAR(2, VAR_LOCAL_ZONE) } YY_BREAK case 179: YY_RULE_SETUP #line 388 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_INTERVAL) } +{ YDVAR(1, VAR_LOCAL_DATA) } YY_BREAK case 180: YY_RULE_SETUP #line 389 "./util/configlexer.lex" -{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } +{ YDVAR(1, VAR_LOCAL_DATA_PTR) } YY_BREAK case 181: YY_RULE_SETUP #line 390 "./util/configlexer.lex" -{ YDVAR(1, VAR_EXTENDED_STATISTICS) } +{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) } YY_BREAK case 182: YY_RULE_SETUP #line 391 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_ENABLE) } +{ YDVAR(1, VAR_INSECURE_LAN_ZONES) } YY_BREAK case 183: YY_RULE_SETUP #line 392 "./util/configlexer.lex" -{ YDVAR(1, VAR_SHM_KEY) } +{ YDVAR(1, VAR_STATISTICS_INTERVAL) } YY_BREAK case 184: YY_RULE_SETUP #line 393 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) } YY_BREAK case 185: YY_RULE_SETUP #line 394 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(1, VAR_EXTENDED_STATISTICS) } YY_BREAK case 186: YY_RULE_SETUP #line 395 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 187: YY_RULE_SETUP #line 396 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 188: YY_RULE_SETUP #line 397 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 189: YY_RULE_SETUP #line 398 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 190: YY_RULE_SETUP #line 399 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 191: YY_RULE_SETUP #line 400 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 192: YY_RULE_SETUP #line 401 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 193: YY_RULE_SETUP #line 402 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 194: YY_RULE_SETUP #line 403 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 195: YY_RULE_SETUP #line 404 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 196: YY_RULE_SETUP #line 405 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 197: YY_RULE_SETUP #line 406 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 198: YY_RULE_SETUP #line 407 "./util/configlexer.lex" -{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 199: YY_RULE_SETUP #line 408 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 200: YY_RULE_SETUP #line 409 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 201: YY_RULE_SETUP #line 410 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 202: YY_RULE_SETUP #line 411 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } +{ YDVAR(1, VAR_UNKNOWN_SERVER_TIME_LIMIT) } YY_BREAK case 203: YY_RULE_SETUP #line 412 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 204: YY_RULE_SETUP #line 413 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 205: YY_RULE_SETUP #line 414 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 206: YY_RULE_SETUP #line 415 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(1, VAR_DNS64_IGNORE_AAAA) } YY_BREAK case 207: YY_RULE_SETUP #line 416 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 208: YY_RULE_SETUP #line 417 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 209: YY_RULE_SETUP #line 418 "./util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 210: YY_RULE_SETUP #line 419 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 211: YY_RULE_SETUP #line 420 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 212: YY_RULE_SETUP #line 421 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 213: YY_RULE_SETUP #line 422 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 214: YY_RULE_SETUP #line 423 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 215: YY_RULE_SETUP #line 424 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 216: YY_RULE_SETUP #line 425 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 217: YY_RULE_SETUP #line 426 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 218: YY_RULE_SETUP -#line 428 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } +#line 427 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 219: YY_RULE_SETUP -#line 430 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } +#line 428 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 220: YY_RULE_SETUP -#line 432 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } +#line 429 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 221: YY_RULE_SETUP -#line 434 "./util/configlexer.lex" +#line 430 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 222: YY_RULE_SETUP -#line 436 "./util/configlexer.lex" +#line 432 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 223: YY_RULE_SETUP -#line 438 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 434 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 224: YY_RULE_SETUP -#line 439 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +#line 436 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 225: YY_RULE_SETUP -#line 440 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +#line 438 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 226: YY_RULE_SETUP -#line 441 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +#line 440 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 227: YY_RULE_SETUP #line 442 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 228: YY_RULE_SETUP #line 443 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 229: YY_RULE_SETUP #line 444 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 230: YY_RULE_SETUP #line 445 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 231: YY_RULE_SETUP #line 446 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 232: YY_RULE_SETUP #line 447 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 233: YY_RULE_SETUP #line 448 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 234: YY_RULE_SETUP #line 449 "./util/configlexer.lex" -{ YDVAR(1, VAR_LOW_RTT) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 235: YY_RULE_SETUP #line 450 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_NUM) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 236: YY_RULE_SETUP #line 451 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } YY_BREAK case 237: YY_RULE_SETUP #line 452 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } YY_BREAK case 238: YY_RULE_SETUP #line 453 "./util/configlexer.lex" -{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } +{ YDVAR(1, VAR_LOW_RTT) } YY_BREAK case 239: YY_RULE_SETUP #line 454 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_TAG) } +{ YDVAR(1, VAR_FAST_SERVER_NUM) } YY_BREAK case 240: YY_RULE_SETUP #line 455 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 241: YY_RULE_SETUP #line 456 "./util/configlexer.lex" -{ YDVAR(2, VAR_RESPONSE_IP_DATA) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 242: YY_RULE_SETUP #line 457 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSCRYPT) } +{ YDVAR(1, VAR_FAST_SERVER_PERMIL) } YY_BREAK case 243: YY_RULE_SETUP #line 458 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } +{ YDVAR(2, VAR_RESPONSE_IP_TAG) } YY_BREAK case 244: YY_RULE_SETUP #line 459 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PORT) } +{ YDVAR(2, VAR_RESPONSE_IP) } YY_BREAK case 245: YY_RULE_SETUP #line 460 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } +{ YDVAR(2, VAR_RESPONSE_IP_DATA) } YY_BREAK case 246: YY_RULE_SETUP #line 461 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } +{ YDVAR(0, VAR_DNSCRYPT) } YY_BREAK case 247: YY_RULE_SETUP #line 462 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } +{ YDVAR(1, VAR_DNSCRYPT_ENABLE) } YY_BREAK case 248: YY_RULE_SETUP #line 463 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } +{ YDVAR(1, VAR_DNSCRYPT_PORT) } YY_BREAK case 249: YY_RULE_SETUP #line 464 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) } YY_BREAK case 250: YY_RULE_SETUP -#line 466 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } +#line 465 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) } YY_BREAK case 251: YY_RULE_SETUP -#line 468 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } +#line 466 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) } YY_BREAK case 252: YY_RULE_SETUP -#line 469 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } +#line 467 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) } YY_BREAK case 253: YY_RULE_SETUP -#line 470 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_ENABLED) } +#line 468 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) } YY_BREAK case 254: YY_RULE_SETUP -#line 471 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } +#line 470 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) } YY_BREAK case 255: YY_RULE_SETUP #line 472 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_HOOK) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) } YY_BREAK case 256: YY_RULE_SETUP #line 473 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } +{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) } YY_BREAK case 257: YY_RULE_SETUP #line 474 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } +{ YDVAR(1, VAR_IPSECMOD_ENABLED) } YY_BREAK case 258: YY_RULE_SETUP #line 475 "./util/configlexer.lex" -{ YDVAR(1, VAR_IPSECMOD_STRICT) } +{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) } YY_BREAK case 259: YY_RULE_SETUP #line 476 "./util/configlexer.lex" -{ YDVAR(0, VAR_CACHEDB) } +{ YDVAR(1, VAR_IPSECMOD_HOOK) } YY_BREAK case 260: YY_RULE_SETUP #line 477 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_BACKEND) } +{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) } YY_BREAK case 261: YY_RULE_SETUP #line 478 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } +{ YDVAR(1, VAR_IPSECMOD_WHITELIST) } YY_BREAK case 262: YY_RULE_SETUP #line 479 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISHOST) } +{ YDVAR(1, VAR_IPSECMOD_STRICT) } YY_BREAK case 263: YY_RULE_SETUP #line 480 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISPORT) } +{ YDVAR(0, VAR_CACHEDB) } YY_BREAK case 264: YY_RULE_SETUP #line 481 "./util/configlexer.lex" -{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } +{ YDVAR(1, VAR_CACHEDB_BACKEND) } YY_BREAK case 265: YY_RULE_SETUP #line 482 "./util/configlexer.lex" -{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } +{ YDVAR(1, VAR_CACHEDB_SECRETSEED) } YY_BREAK case 266: YY_RULE_SETUP #line 483 "./util/configlexer.lex" -{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } +{ YDVAR(1, VAR_CACHEDB_REDISHOST) } YY_BREAK case 267: -/* rule 267 can match eol */ YY_RULE_SETUP #line 484 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_REDISPORT) } + YY_BREAK +case 268: +YY_RULE_SETUP +#line 485 "./util/configlexer.lex" +{ YDVAR(1, VAR_CACHEDB_REDISTIMEOUT) } + YY_BREAK +case 269: +YY_RULE_SETUP +#line 486 "./util/configlexer.lex" +{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) } + YY_BREAK +case 270: +YY_RULE_SETUP +#line 487 "./util/configlexer.lex" +{ YDVAR(2, VAR_TCP_CONNECTION_LIMIT) } + YY_BREAK +case 271: +/* rule 271 can match eol */ +YY_RULE_SETUP +#line 488 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 268: +case 272: YY_RULE_SETUP -#line 487 "./util/configlexer.lex" +#line 491 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 488 "./util/configlexer.lex" +#line 492 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 269: +case 273: YY_RULE_SETUP -#line 493 "./util/configlexer.lex" +#line 497 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 270: -/* rule 270 can match eol */ +case 274: +/* rule 274 can match eol */ YY_RULE_SETUP -#line 494 "./util/configlexer.lex" +#line 498 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 271: +case 275: YY_RULE_SETUP -#line 496 "./util/configlexer.lex" +#line 500 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -4497,34 +4553,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 272: +case 276: YY_RULE_SETUP -#line 508 "./util/configlexer.lex" +#line 512 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 509 "./util/configlexer.lex" +#line 513 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 273: +case 277: YY_RULE_SETUP -#line 514 "./util/configlexer.lex" +#line 518 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 274: -/* rule 274 can match eol */ +case 278: +/* rule 278 can match eol */ YY_RULE_SETUP -#line 515 "./util/configlexer.lex" +#line 519 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 275: +case 279: YY_RULE_SETUP -#line 517 "./util/configlexer.lex" +#line 521 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -4537,38 +4593,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 276: +case 280: YY_RULE_SETUP -#line 529 "./util/configlexer.lex" +#line 533 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 531 "./util/configlexer.lex" +#line 535 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 277: +case 281: YY_RULE_SETUP -#line 535 "./util/configlexer.lex" +#line 539 "./util/configlexer.lex" { LEXOUT(("ISP ")); /* ignore */ } YY_BREAK -case 278: -/* rule 278 can match eol */ +case 282: +/* rule 282 can match eol */ YY_RULE_SETUP -#line 536 "./util/configlexer.lex" +#line 540 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++;} YY_BREAK -case 279: +case 283: YY_RULE_SETUP -#line 537 "./util/configlexer.lex" +#line 541 "./util/configlexer.lex" { LEXOUT(("IQS ")); BEGIN(include_quoted); } YY_BREAK -case 280: +case 284: YY_RULE_SETUP -#line 538 "./util/configlexer.lex" +#line 542 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -4576,27 +4632,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 543 "./util/configlexer.lex" +#line 547 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 281: +case 285: YY_RULE_SETUP -#line 547 "./util/configlexer.lex" +#line 551 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 282: -/* rule 282 can match eol */ +case 286: +/* rule 286 can match eol */ YY_RULE_SETUP -#line 548 "./util/configlexer.lex" +#line 552 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 283: +case 287: YY_RULE_SETUP -#line 550 "./util/configlexer.lex" +#line 554 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -4606,7 +4662,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 556 "./util/configlexer.lex" +#line 560 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -4618,33 +4674,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 284: +case 288: YY_RULE_SETUP -#line 567 "./util/configlexer.lex" +#line 571 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 285: +case 289: YY_RULE_SETUP -#line 571 "./util/configlexer.lex" +#line 575 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 286: +case 290: YY_RULE_SETUP -#line 575 "./util/configlexer.lex" +#line 579 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 287: +case 291: YY_RULE_SETUP -#line 579 "./util/configlexer.lex" +#line 583 "./util/configlexer.lex" ECHO; YY_BREAK -#line 4646 "" +#line 4702 "" case YY_END_OF_BUFFER: { @@ -4935,7 +4991,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 >= 2859 ) + if ( yy_current_state >= 2905 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; @@ -4963,11 +5019,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 >= 2859 ) + if ( yy_current_state >= 2905 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 2858); + yy_is_jam = (yy_current_state == 2904); return yy_is_jam ? 0 : yy_current_state; } @@ -5374,10 +5430,10 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = (yy_size_t) _yybytes_len + 2; + n = (yy_size_t) (_yybytes_len + 2); buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -5606,7 +5662,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 579 "./util/configlexer.lex" +#line 583 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 2920cda87..16b5bc547 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -245,6 +245,9 @@ additional-ssl-port{COLON} { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } additional-tls-port{COLON} { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } tls-additional-ports{COLON} { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } tls-additional-port{COLON} { YDVAR(1, VAR_TLS_ADDITIONAL_PORT) } +tls-session-ticket-keys{COLON} { YDVAR(1, VAR_TLS_SESSION_TICKET_KEYS) } +tls-ciphers{COLON} { YDVAR(1, VAR_TLS_CIPHERS) } +tls-ciphersuites{COLON} { YDVAR(1, VAR_TLS_CIPHERSUITES) } use-systemd{COLON} { YDVAR(1, VAR_USE_SYSTEMD) } do-daemonize{COLON} { YDVAR(1, VAR_DO_DAEMONIZE) } interface{COLON} { YDVAR(1, VAR_INTERFACE) } @@ -262,6 +265,7 @@ directory{COLON} { YDVAR(1, VAR_DIRECTORY) } logfile{COLON} { YDVAR(1, VAR_LOGFILE) } pidfile{COLON} { YDVAR(1, VAR_PIDFILE) } root-hints{COLON} { YDVAR(1, VAR_ROOT_HINTS) } +stream-wait-size{COLON} { YDVAR(1, VAR_STREAM_WAIT_SIZE) } edns-buffer-size{COLON} { YDVAR(1, VAR_EDNS_BUFFER_SIZE) } msg-buffer-size{COLON} { YDVAR(1, VAR_MSG_BUFFER_SIZE) } msg-cache-size{COLON} { YDVAR(1, VAR_MSG_CACHE_SIZE) } diff --git a/util/configparser.c b/util/configparser.c index 679fcf1c3..9253702bc 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ +/* A Bison parser, made by GNU Bison 3.0.5. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.4" +#define YYBISON_VERSION "3.0.5" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -385,7 +385,11 @@ extern int yydebug; VAR_LOG_SERVFAIL = 514, VAR_DENY_ANY = 515, VAR_UNKNOWN_SERVER_TIME_LIMIT = 516, - VAR_LOG_TAG_QUERYREPLY = 517 + VAR_LOG_TAG_QUERYREPLY = 517, + VAR_STREAM_WAIT_SIZE = 518, + VAR_TLS_CIPHERS = 519, + VAR_TLS_CIPHERSUITES = 520, + VAR_TLS_SESSION_TICKET_KEYS = 521 }; #endif /* Tokens. */ @@ -649,6 +653,10 @@ extern int yydebug; #define VAR_DENY_ANY 515 #define VAR_UNKNOWN_SERVER_TIME_LIMIT 516 #define VAR_LOG_TAG_QUERYREPLY 517 +#define VAR_STREAM_WAIT_SIZE 518 +#define VAR_TLS_CIPHERS 519 +#define VAR_TLS_CIPHERSUITES 520 +#define VAR_TLS_SESSION_TICKET_KEYS 521 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -659,7 +667,7 @@ union YYSTYPE char* str; -#line 663 "util/configparser.c" /* yacc.c:355 */ +#line 671 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -676,7 +684,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 680 "util/configparser.c" /* yacc.c:358 */ +#line 688 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -918,21 +926,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 528 +#define YYLAST 536 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 263 +#define YYNTOKENS 267 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 282 +#define YYNNTS 286 /* YYNRULES -- Number of rules. */ -#define YYNRULES 541 +#define YYNRULES 549 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 811 +#define YYNSTATES 823 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 517 +#define YYMAXUTOK 521 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -992,68 +1000,69 @@ static const yytype_uint16 yytranslate[] = 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, 256, 257, 258, 259, 260, 261, 262 + 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266 }; #if YYDEBUG /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 170, 170, 170, 171, 171, 172, 172, 173, 173, - 173, 174, 174, 175, 179, 184, 185, 186, 186, 186, - 187, 187, 188, 188, 189, 189, 190, 190, 190, 191, - 191, 192, 192, 192, 193, 193, 193, 194, 194, 195, - 195, 196, 196, 197, 197, 198, 198, 199, 199, 200, - 200, 201, 201, 202, 202, 202, 203, 203, 203, 204, - 204, 204, 205, 205, 206, 206, 207, 207, 208, 208, - 209, 209, 209, 210, 210, 211, 211, 212, 212, 212, - 213, 213, 214, 214, 215, 215, 216, 216, 216, 217, - 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, - 222, 222, 223, 223, 224, 224, 224, 225, 225, 225, - 226, 226, 226, 227, 227, 227, 227, 228, 229, 229, - 229, 230, 230, 230, 231, 231, 232, 232, 233, 233, - 233, 234, 234, 235, 235, 235, 236, 236, 237, 237, - 238, 239, 239, 240, 240, 241, 241, 242, 243, 243, - 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, - 248, 249, 249, 250, 250, 251, 251, 252, 252, 253, - 253, 254, 254, 254, 255, 255, 255, 256, 256, 256, - 257, 257, 258, 259, 259, 260, 260, 261, 261, 262, - 262, 263, 263, 263, 264, 264, 264, 265, 265, 265, - 266, 266, 268, 280, 281, 282, 282, 282, 282, 282, - 283, 283, 285, 297, 298, 299, 299, 299, 299, 300, - 300, 302, 316, 317, 318, 318, 318, 318, 319, 319, - 319, 321, 337, 338, 339, 339, 339, 339, 340, 340, - 340, 341, 343, 352, 361, 372, 381, 390, 399, 410, - 419, 430, 443, 458, 469, 486, 503, 520, 537, 552, - 567, 580, 595, 604, 613, 622, 631, 640, 649, 658, - 667, 676, 685, 694, 703, 712, 725, 734, 747, 756, - 765, 774, 781, 788, 797, 804, 813, 821, 830, 839, - 853, 862, 871, 880, 889, 898, 907, 914, 921, 947, - 955, 962, 969, 976, 983, 991, 999, 1007, 1014, 1025, - 1036, 1043, 1052, 1061, 1070, 1077, 1084, 1092, 1100, 1110, - 1120, 1130, 1143, 1154, 1162, 1175, 1184, 1193, 1202, 1212, - 1222, 1230, 1243, 1252, 1260, 1269, 1277, 1290, 1299, 1306, - 1316, 1326, 1336, 1346, 1356, 1366, 1376, 1386, 1393, 1400, - 1407, 1416, 1425, 1434, 1443, 1450, 1460, 1480, 1487, 1505, - 1518, 1531, 1540, 1549, 1558, 1567, 1577, 1587, 1598, 1607, - 1616, 1625, 1634, 1647, 1660, 1669, 1676, 1685, 1694, 1703, - 1712, 1720, 1733, 1741, 1772, 1779, 1794, 1804, 1814, 1821, - 1828, 1835, 1844, 1852, 1866, 1887, 1908, 1920, 1932, 1944, - 1953, 1974, 1984, 1993, 2001, 2009, 2022, 2035, 2050, 2065, - 2074, 2083, 2089, 2098, 2107, 2117, 2127, 2140, 2153, 2165, - 2179, 2191, 2205, 2215, 2222, 2229, 2238, 2247, 2257, 2267, - 2277, 2284, 2291, 2300, 2309, 2319, 2329, 2336, 2343, 2350, - 2358, 2368, 2378, 2388, 2398, 2430, 2440, 2448, 2456, 2471, - 2480, 2485, 2486, 2487, 2487, 2487, 2488, 2488, 2488, 2489, - 2489, 2491, 2501, 2510, 2517, 2524, 2531, 2538, 2545, 2552, - 2557, 2558, 2559, 2559, 2560, 2560, 2561, 2561, 2562, 2563, - 2564, 2565, 2566, 2567, 2569, 2578, 2585, 2594, 2603, 2610, - 2617, 2627, 2637, 2647, 2657, 2667, 2677, 2682, 2683, 2684, - 2686, 2692, 2702, 2709, 2718, 2726, 2731, 2732, 2734, 2734, - 2734, 2735, 2735, 2736, 2737, 2738, 2739, 2740, 2742, 2752, - 2761, 2768, 2777, 2784, 2793, 2801, 2814, 2822, 2835, 2840, - 2841, 2842, 2842, 2843, 2843, 2843, 2845, 2860, 2875, 2887, - 2902, 2915 + 0, 172, 172, 172, 173, 173, 174, 174, 175, 175, + 175, 176, 176, 177, 181, 186, 187, 188, 188, 188, + 189, 189, 190, 190, 191, 191, 192, 192, 192, 193, + 193, 194, 194, 194, 195, 195, 195, 196, 196, 197, + 197, 198, 198, 199, 199, 200, 200, 201, 201, 202, + 202, 203, 203, 204, 204, 204, 205, 205, 205, 206, + 206, 206, 207, 207, 208, 208, 209, 209, 210, 210, + 211, 211, 211, 212, 212, 213, 213, 214, 214, 214, + 215, 215, 216, 216, 217, 217, 218, 218, 218, 219, + 219, 220, 220, 221, 221, 222, 222, 223, 223, 224, + 224, 224, 225, 225, 226, 226, 226, 227, 227, 227, + 228, 228, 228, 229, 229, 229, 229, 230, 231, 231, + 231, 232, 232, 232, 233, 233, 234, 234, 235, 235, + 235, 236, 236, 237, 237, 237, 238, 238, 239, 239, + 240, 241, 241, 242, 242, 243, 243, 244, 245, 245, + 246, 246, 247, 247, 248, 248, 249, 249, 250, 250, + 250, 251, 251, 252, 252, 253, 253, 254, 254, 255, + 255, 256, 256, 256, 257, 257, 257, 258, 258, 258, + 259, 259, 260, 261, 261, 262, 262, 263, 263, 264, + 264, 265, 265, 265, 266, 266, 266, 267, 267, 267, + 268, 268, 269, 269, 270, 270, 272, 284, 285, 286, + 286, 286, 286, 286, 287, 287, 289, 301, 302, 303, + 303, 303, 303, 304, 304, 306, 320, 321, 322, 322, + 322, 322, 323, 323, 323, 325, 341, 342, 343, 343, + 343, 343, 344, 344, 344, 345, 347, 356, 365, 376, + 385, 394, 403, 414, 423, 434, 447, 462, 473, 490, + 507, 524, 541, 556, 571, 584, 599, 608, 617, 626, + 635, 644, 653, 662, 671, 680, 689, 698, 707, 716, + 729, 738, 751, 760, 769, 778, 785, 792, 801, 808, + 817, 825, 832, 839, 847, 856, 865, 879, 888, 897, + 906, 915, 924, 933, 940, 947, 973, 981, 988, 995, + 1002, 1009, 1017, 1025, 1033, 1040, 1051, 1062, 1069, 1078, + 1087, 1096, 1103, 1110, 1118, 1126, 1136, 1146, 1156, 1164, + 1177, 1188, 1196, 1209, 1218, 1227, 1236, 1246, 1256, 1264, + 1277, 1286, 1294, 1303, 1311, 1324, 1333, 1340, 1350, 1360, + 1370, 1380, 1390, 1400, 1410, 1420, 1427, 1434, 1441, 1450, + 1459, 1468, 1477, 1484, 1494, 1514, 1521, 1539, 1552, 1565, + 1574, 1583, 1592, 1601, 1611, 1621, 1632, 1641, 1650, 1659, + 1668, 1681, 1694, 1703, 1710, 1719, 1728, 1737, 1746, 1754, + 1767, 1775, 1808, 1815, 1830, 1840, 1850, 1857, 1864, 1871, + 1880, 1888, 1902, 1923, 1944, 1956, 1968, 1980, 1989, 2010, + 2020, 2029, 2037, 2045, 2058, 2071, 2086, 2101, 2110, 2119, + 2125, 2134, 2143, 2153, 2163, 2176, 2189, 2201, 2215, 2227, + 2241, 2251, 2258, 2265, 2274, 2283, 2293, 2303, 2313, 2320, + 2327, 2336, 2345, 2355, 2365, 2372, 2379, 2386, 2394, 2404, + 2414, 2424, 2434, 2466, 2476, 2484, 2492, 2507, 2516, 2521, + 2522, 2523, 2523, 2523, 2524, 2524, 2524, 2525, 2525, 2527, + 2537, 2546, 2553, 2560, 2567, 2574, 2581, 2588, 2593, 2594, + 2595, 2595, 2596, 2596, 2597, 2597, 2598, 2599, 2600, 2601, + 2602, 2603, 2605, 2614, 2621, 2630, 2639, 2646, 2653, 2663, + 2673, 2683, 2693, 2703, 2713, 2718, 2719, 2720, 2722, 2728, + 2738, 2745, 2754, 2762, 2767, 2768, 2770, 2770, 2770, 2771, + 2771, 2772, 2773, 2774, 2775, 2776, 2778, 2788, 2797, 2804, + 2813, 2820, 2829, 2837, 2850, 2858, 2871, 2876, 2877, 2878, + 2878, 2879, 2879, 2879, 2881, 2896, 2911, 2923, 2938, 2951 }; #endif @@ -1158,15 +1167,17 @@ static const char *const yytname[] = "VAR_FAST_SERVER_PERMIL", "VAR_FAST_SERVER_NUM", "VAR_ALLOW_NOTIFY", "VAR_TLS_WIN_CERT", "VAR_TCP_CONNECTION_LIMIT", "VAR_FORWARD_NO_CACHE", "VAR_STUB_NO_CACHE", "VAR_LOG_SERVFAIL", "VAR_DENY_ANY", - "VAR_UNKNOWN_SERVER_TIME_LIMIT", "VAR_LOG_TAG_QUERYREPLY", "$accept", - "toplevelvars", "toplevelvar", "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", "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", + "VAR_UNKNOWN_SERVER_TIME_LIMIT", "VAR_LOG_TAG_QUERYREPLY", + "VAR_STREAM_WAIT_SIZE", "VAR_TLS_CIPHERS", "VAR_TLS_CIPHERSUITES", + "VAR_TLS_SESSION_TICKET_KEYS", "$accept", "toplevelvars", "toplevelvar", + "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", "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", "server_client_subnet_always_forward", "server_client_subnet_opcode", "server_max_client_subnet_ipv4", "server_max_client_subnet_ipv6", "server_min_client_subnet_ipv4", "server_min_client_subnet_ipv6", @@ -1182,46 +1193,49 @@ static const char *const yytname[] = "server_ssl_upstream", "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", "server_tls_cert_bundle", "server_tls_win_cert", "server_tls_additional_port", - "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_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_target_fetch_policy", "server_harden_short_bufsize", - "server_harden_large_queries", "server_harden_glue", - "server_harden_dnssec_stripped", "server_harden_below_nxdomain", - "server_harden_referral_path", "server_harden_algo_downgrade", - "server_use_caps_for_id", "server_caps_whitelist", - "server_private_address", "server_private_domain", "server_prefetch", - "server_prefetch_key", "server_deny_any", - "server_unwanted_reply_threshold", "server_do_not_query_address", - "server_do_not_query_localhost", "server_access_control", - "server_module_conf", "server_val_override_date", - "server_val_sig_skew_min", "server_val_sig_skew_max", - "server_cache_max_ttl", "server_cache_max_negative_ttl", - "server_cache_min_ttl", "server_bogus_ttl", - "server_val_clean_additional", "server_val_permissive_mode", - "server_aggressive_nsec", "server_ignore_cd_flag", - "server_serve_expired", "server_serve_expired_ttl", - "server_serve_expired_ttl_reset", "server_fake_dsa", "server_fake_sha1", - "server_val_log_level", "server_val_nsec3_keysize_iterations", - "server_add_holddown", "server_del_holddown", "server_keep_missing", + "server_tls_ciphers", "server_tls_ciphersuites", + "server_tls_session_ticket_keys", "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_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_target_fetch_policy", + "server_harden_short_bufsize", "server_harden_large_queries", + "server_harden_glue", "server_harden_dnssec_stripped", + "server_harden_below_nxdomain", "server_harden_referral_path", + "server_harden_algo_downgrade", "server_use_caps_for_id", + "server_caps_whitelist", "server_private_address", + "server_private_domain", "server_prefetch", "server_prefetch_key", + "server_deny_any", "server_unwanted_reply_threshold", + "server_do_not_query_address", "server_do_not_query_localhost", + "server_access_control", "server_module_conf", + "server_val_override_date", "server_val_sig_skew_min", + "server_val_sig_skew_max", "server_cache_max_ttl", + "server_cache_max_negative_ttl", "server_cache_min_ttl", + "server_bogus_ttl", "server_val_clean_additional", + "server_val_permissive_mode", "server_aggressive_nsec", + "server_ignore_cd_flag", "server_serve_expired", + "server_serve_expired_ttl", "server_serve_expired_ttl_reset", + "server_fake_dsa", "server_fake_sha1", "server_val_log_level", + "server_val_nsec3_keysize_iterations", "server_add_holddown", + "server_del_holddown", "server_keep_missing", "server_permit_small_holddown", "server_key_cache_size", "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone", "server_local_data", "server_local_data_ptr", "server_minimal_responses", @@ -1306,7 +1320,7 @@ static const yytype_uint16 yytoknum[] = 485, 486, 487, 488, 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 + 515, 516, 517, 518, 519, 520, 521 }; # endif @@ -1326,26 +1340,27 @@ static const yytype_int16 yypact[] = { -154, 212, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, -154, -154, -154, -12, 102, 98, 147, 39, 219, - 111, -80, 75, -153, 22, 23, 24, 28, 29, 30, + -154, -154, -154, -154, -12, 102, 98, 166, 39, 213, + 142, -80, 52, -153, 22, 23, 24, 28, 29, 30, 78, 79, 80, 84, 88, 89, 114, 115, 116, 118, - 129, 130, 132, 133, 134, 136, 141, 182, 196, 197, - 199, 200, 201, 203, 204, 205, 206, 214, 215, 218, - 220, 221, 222, 223, 225, 235, 236, 242, 243, 244, - 245, 247, 248, 249, 250, 251, 265, 266, 267, 268, - 269, 270, 272, 278, 279, 280, 281, 282, 294, 295, - 297, 298, 299, 300, 301, 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, 342, 343, 344, 346, 347, 348, 349, - 351, 352, 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, 405, 406, 407, 408, 409, 410, 411, 412, - 413, 414, 415, 416, 417, 418, 419, 421, 422, 423, - 424, 425, 426, 427, 428, 429, 430, 431, 432, -154, + 129, 130, 132, 133, 134, 136, 141, 180, 182, 196, + 197, 200, 201, 203, 204, 205, 206, 214, 215, 216, + 217, 218, 220, 221, 222, 223, 225, 245, 247, 248, + 249, 250, 251, 253, 254, 255, 256, 257, 258, 259, + 272, 278, 279, 280, 281, 282, 297, 306, 307, 308, + 309, 310, 311, 313, 314, 315, 316, 317, 318, 319, + 320, 323, 324, 325, 326, 327, 328, 329, 330, 331, + 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, + 342, 343, 344, 346, 347, 348, 349, 351, 352, 354, + 355, 356, 357, 358, 359, 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, 405, 406, + 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, + 417, 418, 419, 421, 422, 423, 424, 425, 426, 427, + 428, 429, 430, 431, 432, 433, 434, 435, 436, 438, + 439, 440, 441, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, @@ -1364,48 +1379,48 @@ static const yytype_int16 yypact[] = -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, -154, -154, -154, -154, 433, 434, 435, 436, 438, - 439, 440, -154, -154, -154, -154, -154, -154, -154, -154, - 441, 442, 443, 444, 446, 447, -154, -154, -154, -154, - -154, -154, -154, 448, 449, 450, 451, 452, 453, 454, - -154, -154, -154, -154, -154, -154, -154, -154, 455, 456, - 457, 458, 459, 460, 461, 462, -154, -154, -154, -154, - -154, -154, -154, -154, -154, 463, 464, 465, 466, 467, - 468, 469, 470, -154, -154, -154, -154, -154, -154, -154, - -154, -154, 471, 472, 473, 474, 475, 476, 477, 478, - 479, 480, 481, 482, -154, -154, -154, -154, -154, -154, - -154, -154, -154, -154, -154, -154, -154, 483, -154, -154, - 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, - -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, 494, 495, 496, 497, 498, -154, -154, -154, -154, + -154, -154, -154, 442, 443, 444, 446, 447, 448, 449, + -154, -154, -154, -154, -154, -154, -154, -154, 450, 451, + 452, 453, 454, 455, -154, -154, -154, -154, -154, -154, + -154, 456, 457, 458, 459, 460, 461, 462, -154, -154, + -154, -154, -154, -154, -154, -154, 463, 464, 465, 466, + 467, 468, 469, 470, -154, -154, -154, -154, -154, -154, + -154, -154, -154, 471, 472, 473, 474, 475, 476, 477, + 478, -154, -154, -154, -154, -154, -154, -154, -154, -154, + 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, + 489, 490, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, 491, -154, -154, 492, 493, + 494, 495, 496, 497, 498, 499, 500, 501, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, 502, + 503, 504, 505, 506, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, 499, 500, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, 507, + 508, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, -154, -154, -154, -154, -154, -154, -154, 501, 502, - 503, -154, -154, -154, -154, -154, -154, -154, -154, -154, - 504, 505, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, 509, 510, 511, -154, + -154, -154, -154, -154, -154, -154, -154, -154, 512, 513, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, 506, 507, 508, 509, 510, 511, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, 514, + 515, 516, 517, 518, 519, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, -154, 512, -154, -154, -154, -154, -154, -154, -154, + 520, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, 513, -154, -154, 514, 515, -154, -154, -154, -154, + -154, -154, -154, 521, -154, -154, 522, 523, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - 516, 517, 518, -154, -154, -154, -154, -154, -154, -154, - -154 + -154, -154, 524, 525, 526, -154, -154, -154, -154, -154, + -154, -154, -154 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1413,9 +1428,9 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 14, 202, 212, 450, 496, 469, 221, - 505, 528, 231, 3, 16, 204, 214, 223, 233, 452, - 471, 498, 507, 530, 4, 5, 6, 10, 13, 8, + 2, 0, 1, 14, 206, 216, 458, 504, 477, 225, + 513, 536, 235, 3, 16, 208, 218, 227, 237, 460, + 479, 506, 515, 538, 4, 5, 6, 10, 13, 8, 9, 7, 11, 12, 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, @@ -1434,67 +1449,68 @@ 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, 0, 0, 15, - 17, 18, 80, 83, 92, 177, 178, 19, 144, 145, - 146, 147, 148, 149, 150, 151, 152, 153, 31, 71, - 20, 84, 85, 42, 64, 79, 21, 22, 24, 25, - 23, 26, 27, 28, 29, 30, 115, 189, 116, 118, - 119, 120, 191, 196, 192, 173, 81, 70, 96, 113, - 114, 201, 198, 117, 32, 33, 34, 35, 36, 72, - 86, 87, 102, 58, 68, 59, 181, 182, 97, 52, - 53, 180, 54, 55, 106, 110, 124, 133, 158, 107, - 65, 37, 38, 39, 94, 125, 126, 127, 40, 41, - 43, 44, 46, 47, 45, 131, 48, 49, 50, 56, - 75, 111, 89, 132, 82, 154, 90, 91, 108, 109, - 199, 95, 51, 73, 76, 57, 60, 98, 99, 74, - 155, 100, 61, 62, 63, 190, 112, 168, 169, 170, - 171, 179, 101, 69, 103, 104, 105, 156, 66, 67, - 88, 77, 78, 93, 121, 122, 200, 123, 128, 129, - 130, 159, 160, 162, 164, 165, 163, 166, 174, 134, - 135, 138, 139, 136, 137, 140, 141, 143, 142, 193, - 195, 194, 157, 167, 183, 185, 184, 186, 187, 188, - 161, 172, 175, 176, 197, 0, 0, 0, 0, 0, - 0, 0, 203, 205, 206, 207, 209, 210, 211, 208, - 0, 0, 0, 0, 0, 0, 213, 215, 216, 217, - 218, 219, 220, 0, 0, 0, 0, 0, 0, 0, - 222, 224, 225, 228, 229, 226, 230, 227, 0, 0, - 0, 0, 0, 0, 0, 0, 232, 234, 235, 236, - 237, 241, 238, 239, 240, 0, 0, 0, 0, 0, - 0, 0, 0, 451, 453, 455, 454, 460, 456, 457, - 458, 459, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 470, 472, 473, 474, 475, 476, - 477, 478, 479, 480, 481, 482, 483, 0, 497, 499, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 506, 508, 509, 510, 512, 513, 511, 514, 515, 516, - 517, 0, 0, 0, 0, 0, 529, 531, 532, 533, - 534, 535, 243, 242, 249, 262, 260, 268, 269, 272, - 270, 271, 273, 274, 275, 276, 277, 296, 297, 298, - 299, 300, 323, 324, 325, 330, 331, 265, 332, 333, - 336, 334, 335, 338, 339, 340, 354, 311, 312, 314, - 315, 341, 357, 305, 307, 358, 364, 365, 366, 266, - 322, 380, 381, 306, 375, 289, 261, 301, 355, 361, - 342, 0, 0, 384, 267, 244, 288, 346, 245, 263, - 264, 302, 303, 382, 344, 348, 349, 246, 385, 326, - 353, 290, 310, 359, 360, 363, 374, 304, 378, 376, - 377, 316, 321, 350, 351, 317, 318, 343, 368, 291, - 292, 295, 278, 280, 281, 282, 283, 284, 386, 387, - 389, 327, 328, 329, 337, 390, 391, 392, 0, 0, - 0, 345, 319, 501, 401, 405, 403, 402, 406, 404, - 0, 0, 409, 410, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 347, 362, 379, 414, 415, 320, - 393, 0, 0, 0, 0, 0, 0, 369, 370, 371, - 372, 373, 502, 313, 308, 367, 287, 247, 248, 309, - 416, 418, 417, 419, 420, 421, 279, 286, 411, 413, - 412, 285, 0, 294, 352, 388, 293, 422, 423, 424, - 428, 427, 425, 426, 429, 430, 431, 432, 434, 433, - 443, 0, 447, 448, 0, 0, 449, 435, 441, 436, - 437, 438, 440, 442, 439, 461, 463, 462, 465, 466, - 467, 468, 464, 484, 485, 486, 487, 488, 489, 490, - 491, 492, 493, 494, 495, 500, 518, 519, 520, 523, - 521, 522, 524, 525, 526, 527, 536, 537, 538, 539, - 540, 356, 383, 400, 503, 504, 407, 408, 394, 395, - 0, 0, 0, 399, 541, 444, 445, 446, 398, 396, - 397 + 0, 0, 0, 15, 17, 18, 80, 83, 92, 177, + 178, 19, 144, 145, 146, 147, 148, 149, 150, 151, + 152, 153, 31, 71, 20, 84, 85, 42, 64, 79, + 21, 22, 24, 25, 23, 26, 27, 28, 29, 30, + 115, 189, 116, 118, 119, 120, 191, 196, 192, 203, + 204, 205, 173, 81, 70, 96, 113, 114, 201, 198, + 117, 32, 33, 34, 35, 36, 72, 86, 87, 102, + 58, 68, 59, 181, 182, 97, 52, 53, 180, 54, + 55, 106, 110, 124, 133, 158, 202, 107, 65, 37, + 38, 39, 94, 125, 126, 127, 40, 41, 43, 44, + 46, 47, 45, 131, 48, 49, 50, 56, 75, 111, + 89, 132, 82, 154, 90, 91, 108, 109, 199, 95, + 51, 73, 76, 57, 60, 98, 99, 74, 155, 100, + 61, 62, 63, 190, 112, 168, 169, 170, 171, 179, + 101, 69, 103, 104, 105, 156, 66, 67, 88, 77, + 78, 93, 121, 122, 200, 123, 128, 129, 130, 159, + 160, 162, 164, 165, 163, 166, 174, 134, 135, 138, + 139, 136, 137, 140, 141, 143, 142, 193, 195, 194, + 157, 167, 183, 185, 184, 186, 187, 188, 161, 172, + 175, 176, 197, 0, 0, 0, 0, 0, 0, 0, + 207, 209, 210, 211, 213, 214, 215, 212, 0, 0, + 0, 0, 0, 0, 217, 219, 220, 221, 222, 223, + 224, 0, 0, 0, 0, 0, 0, 0, 226, 228, + 229, 232, 233, 230, 234, 231, 0, 0, 0, 0, + 0, 0, 0, 0, 236, 238, 239, 240, 241, 245, + 242, 243, 244, 0, 0, 0, 0, 0, 0, 0, + 0, 459, 461, 463, 462, 468, 464, 465, 466, 467, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 478, 480, 481, 482, 483, 484, 485, 486, + 487, 488, 489, 490, 491, 0, 505, 507, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 514, 516, + 517, 518, 520, 521, 519, 522, 523, 524, 525, 0, + 0, 0, 0, 0, 537, 539, 540, 541, 542, 543, + 247, 246, 253, 266, 264, 272, 273, 276, 274, 275, + 277, 278, 279, 280, 281, 303, 304, 305, 306, 307, + 331, 332, 333, 338, 339, 269, 340, 341, 344, 342, + 343, 346, 347, 348, 362, 318, 319, 321, 322, 349, + 365, 312, 314, 366, 372, 373, 374, 270, 330, 388, + 389, 313, 383, 296, 265, 308, 363, 369, 350, 0, + 0, 392, 271, 248, 295, 354, 249, 267, 268, 309, + 310, 390, 352, 356, 357, 250, 393, 334, 361, 297, + 317, 367, 368, 371, 382, 311, 386, 384, 385, 323, + 329, 358, 359, 324, 325, 351, 376, 298, 299, 302, + 282, 284, 285, 286, 287, 288, 394, 395, 397, 335, + 336, 337, 345, 398, 399, 400, 0, 0, 0, 353, + 326, 509, 409, 413, 411, 410, 414, 412, 0, 0, + 417, 418, 254, 255, 256, 257, 258, 259, 260, 261, + 262, 263, 355, 370, 387, 422, 423, 327, 401, 0, + 0, 0, 0, 0, 0, 377, 378, 379, 380, 381, + 510, 320, 315, 375, 294, 251, 252, 316, 424, 426, + 425, 427, 428, 429, 283, 290, 419, 421, 420, 289, + 0, 301, 360, 396, 300, 328, 291, 292, 293, 430, + 431, 432, 436, 435, 433, 434, 437, 438, 439, 440, + 442, 441, 451, 0, 455, 456, 0, 0, 457, 443, + 449, 444, 445, 446, 448, 450, 447, 469, 471, 470, + 473, 474, 475, 476, 472, 492, 493, 494, 495, 496, + 497, 498, 499, 500, 501, 502, 503, 508, 526, 527, + 528, 531, 529, 530, 532, 533, 534, 535, 544, 545, + 546, 547, 548, 364, 391, 408, 511, 512, 415, 416, + 402, 403, 0, 0, 0, 407, 549, 452, 453, 454, + 406, 404, 405 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1528,41 +1544,41 @@ static const yytype_int16 yypgoto[] = -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, - -154, -154 + -154, -154, -154, -154, -154, -154 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 13, 14, 24, 219, 15, 25, 412, 16, - 26, 426, 17, 27, 440, 18, 28, 456, 220, 221, - 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, - 242, 243, 244, 245, 246, 247, 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, 413, 414, - 415, 416, 417, 418, 419, 427, 428, 429, 430, 431, - 432, 457, 458, 459, 460, 461, 462, 463, 464, 441, - 442, 443, 444, 445, 446, 447, 19, 29, 473, 474, - 475, 476, 477, 478, 479, 480, 481, 20, 30, 494, - 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, - 505, 506, 21, 31, 508, 509, 400, 401, 402, 403, - 22, 32, 520, 521, 522, 523, 524, 525, 526, 527, - 528, 529, 530, 23, 33, 536, 537, 538, 539, 540, - 541, 404 + -1, 1, 13, 14, 24, 223, 15, 25, 420, 16, + 26, 434, 17, 27, 448, 18, 28, 464, 224, 225, + 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, + 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, + 246, 247, 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, 421, 422, 423, 424, 425, 426, 427, 435, + 436, 437, 438, 439, 440, 465, 466, 467, 468, 469, + 470, 471, 472, 449, 450, 451, 452, 453, 454, 455, + 19, 29, 481, 482, 483, 484, 485, 486, 487, 488, + 489, 20, 30, 502, 503, 504, 505, 506, 507, 508, + 509, 510, 511, 512, 513, 514, 21, 31, 516, 517, + 408, 409, 410, 411, 22, 32, 528, 529, 530, 531, + 532, 533, 534, 535, 536, 537, 538, 23, 33, 544, + 545, 546, 547, 548, 549, 412 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1573,56 +1589,57 @@ static const yytype_uint16 yytable[] = 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 507, 542, 543, 544, 65, 66, 67, 545, 546, - 547, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 64, 515, 550, 551, 552, 65, 66, 67, 553, 554, + 555, 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, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 448, 531, 532, 533, 534, 535, 548, 549, - 550, 109, 110, 111, 551, 112, 113, 114, 552, 553, + 107, 108, 456, 539, 540, 541, 542, 543, 556, 557, + 558, 109, 110, 111, 559, 112, 113, 114, 560, 561, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 554, 555, 556, 139, 557, 140, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 558, - 559, 420, 560, 561, 562, 405, 563, 406, 407, 421, - 422, 564, 150, 151, 152, 153, 154, 155, 156, 157, + 135, 136, 137, 138, 562, 563, 564, 139, 565, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 149, 566, + 567, 428, 568, 569, 570, 413, 571, 414, 415, 429, + 430, 572, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 433, 188, 565, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 566, 567, 408, 568, - 569, 570, 2, 571, 572, 573, 574, 202, 203, 204, - 205, 206, 207, 3, 575, 576, 434, 435, 577, 208, - 578, 579, 580, 581, 423, 582, 424, 209, 210, 409, - 211, 212, 410, 213, 214, 583, 584, 215, 216, 217, - 218, 436, 585, 586, 587, 588, 4, 589, 590, 591, - 592, 593, 5, 482, 483, 484, 485, 486, 487, 488, - 489, 490, 491, 492, 493, 594, 595, 596, 597, 598, - 599, 449, 600, 450, 451, 452, 453, 454, 601, 602, - 603, 604, 605, 455, 510, 511, 512, 513, 514, 515, - 516, 517, 518, 519, 606, 607, 6, 608, 609, 610, - 611, 612, 437, 438, 465, 466, 467, 468, 469, 470, - 471, 472, 7, 613, 614, 615, 616, 617, 618, 619, - 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, - 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, - 640, 439, 641, 642, 643, 425, 644, 645, 646, 647, - 411, 648, 649, 8, 650, 651, 652, 653, 654, 655, - 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, - 666, 667, 668, 669, 670, 671, 672, 673, 674, 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, 9, 700, 701, 702, 703, 704, - 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, - 10, 715, 716, 717, 718, 719, 720, 721, 722, 723, - 724, 725, 726, 727, 728, 729, 730, 11, 731, 732, - 733, 734, 735, 736, 737, 12, 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, 770, 771, - 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, - 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, - 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, - 802, 803, 804, 805, 806, 807, 808, 809, 810 + 573, 188, 574, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 200, 201, 575, 576, 416, 441, + 577, 578, 2, 579, 580, 581, 582, 202, 203, 204, + 205, 206, 207, 3, 583, 584, 585, 586, 587, 208, + 588, 589, 590, 591, 431, 592, 432, 209, 210, 417, + 211, 212, 418, 213, 214, 442, 443, 215, 216, 217, + 218, 219, 220, 221, 222, 593, 4, 594, 595, 596, + 597, 598, 5, 599, 600, 601, 602, 603, 604, 605, + 444, 518, 519, 520, 521, 522, 523, 524, 525, 526, + 527, 457, 606, 458, 459, 460, 461, 462, 607, 608, + 609, 610, 611, 463, 490, 491, 492, 493, 494, 495, + 496, 497, 498, 499, 500, 501, 6, 612, 473, 474, + 475, 476, 477, 478, 479, 480, 613, 614, 615, 616, + 617, 618, 7, 619, 620, 621, 622, 623, 624, 625, + 626, 445, 446, 627, 628, 629, 630, 631, 632, 633, + 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, + 644, 645, 646, 647, 648, 433, 649, 650, 651, 652, + 419, 653, 654, 8, 655, 656, 657, 658, 659, 660, + 447, 661, 662, 663, 664, 665, 666, 667, 668, 669, + 670, 671, 672, 673, 674, 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, 702, 703, 9, 704, 705, 706, 707, 708, + 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, + 10, 719, 720, 721, 722, 723, 724, 725, 726, 727, + 728, 729, 730, 731, 732, 733, 734, 11, 735, 736, + 737, 738, 739, 740, 741, 12, 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, 779, 780, 781, 782, 783, 784, 785, + 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, + 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, + 816, 817, 818, 819, 820, 821, 822 }; static const yytype_uint16 yycheck[] = @@ -1646,25 +1663,25 @@ static const yytype_uint16 yycheck[] = 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, - 43, 203, 10, 205, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 217, 10, 10, 106, 10, + 10, 203, 10, 205, 206, 207, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 10, 10, 106, 43, 10, 10, 0, 10, 10, 10, 10, 229, 230, 231, - 232, 233, 234, 11, 10, 10, 79, 80, 10, 241, + 232, 233, 234, 11, 10, 10, 10, 10, 10, 241, 10, 10, 10, 10, 136, 10, 138, 249, 250, 137, - 252, 253, 140, 255, 256, 10, 10, 259, 260, 261, - 262, 104, 10, 10, 10, 10, 44, 10, 10, 10, - 10, 10, 50, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 10, 10, 10, 10, 10, - 10, 242, 10, 244, 245, 246, 247, 248, 10, 10, - 10, 10, 10, 254, 219, 220, 221, 222, 223, 224, - 225, 226, 227, 228, 10, 10, 94, 10, 10, 10, - 10, 10, 165, 166, 95, 96, 97, 98, 99, 100, - 101, 102, 110, 10, 10, 10, 10, 10, 10, 10, + 252, 253, 140, 255, 256, 79, 80, 259, 260, 261, + 262, 263, 264, 265, 266, 10, 44, 10, 10, 10, + 10, 10, 50, 10, 10, 10, 10, 10, 10, 10, + 104, 219, 220, 221, 222, 223, 224, 225, 226, 227, + 228, 242, 10, 244, 245, 246, 247, 248, 10, 10, + 10, 10, 10, 254, 152, 153, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 94, 10, 95, 96, + 97, 98, 99, 100, 101, 102, 10, 10, 10, 10, + 10, 10, 110, 10, 10, 10, 10, 10, 10, 10, + 10, 165, 166, 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, 204, 10, 10, 10, 257, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 257, 10, 10, 10, 10, 258, 10, 10, 151, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 204, 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, @@ -1679,17 +1696,18 @@ static const yytype_uint16 yycheck[] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10 + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 264, 0, 11, 44, 50, 94, 110, 151, 202, - 218, 235, 243, 265, 266, 269, 272, 275, 278, 489, - 500, 515, 523, 536, 267, 270, 273, 276, 279, 490, - 501, 516, 524, 537, 12, 13, 14, 15, 16, 17, + 0, 268, 0, 11, 44, 50, 94, 110, 151, 202, + 218, 235, 243, 269, 270, 273, 276, 279, 282, 497, + 508, 523, 531, 544, 271, 274, 277, 280, 283, 498, + 509, 524, 532, 545, 12, 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, 47, 48, 49, 53, 54, @@ -1707,8 +1725,8 @@ static const yytype_uint16 yystos[] = 194, 195, 196, 197, 198, 199, 200, 201, 203, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 229, 230, 231, 232, 233, 234, 241, 249, - 250, 252, 253, 255, 256, 259, 260, 261, 262, 268, - 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, + 250, 252, 253, 255, 256, 259, 260, 261, 262, 263, + 264, 265, 266, 272, 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, @@ -1726,21 +1744,21 @@ static const yytype_uint16 yystos[] = 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, - 519, 520, 521, 522, 544, 43, 45, 46, 106, 137, - 140, 258, 271, 461, 462, 463, 464, 465, 466, 467, - 43, 51, 52, 136, 138, 257, 274, 468, 469, 470, - 471, 472, 473, 43, 79, 80, 104, 165, 166, 204, - 277, 482, 483, 484, 485, 486, 487, 488, 43, 242, - 244, 245, 246, 247, 248, 254, 280, 474, 475, 476, - 477, 478, 479, 480, 481, 95, 96, 97, 98, 99, - 100, 101, 102, 491, 492, 493, 494, 495, 496, 497, - 498, 499, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 502, 503, 504, 505, 506, 507, - 508, 509, 510, 511, 512, 513, 514, 111, 517, 518, - 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, - 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, - 535, 236, 237, 238, 239, 240, 538, 539, 540, 541, - 542, 543, 10, 10, 10, 10, 10, 10, 10, 10, + 461, 462, 463, 464, 465, 466, 467, 468, 527, 528, + 529, 530, 552, 43, 45, 46, 106, 137, 140, 258, + 275, 469, 470, 471, 472, 473, 474, 475, 43, 51, + 52, 136, 138, 257, 278, 476, 477, 478, 479, 480, + 481, 43, 79, 80, 104, 165, 166, 204, 281, 490, + 491, 492, 493, 494, 495, 496, 43, 242, 244, 245, + 246, 247, 248, 254, 284, 482, 483, 484, 485, 486, + 487, 488, 489, 95, 96, 97, 98, 99, 100, 101, + 102, 499, 500, 501, 502, 503, 504, 505, 506, 507, + 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, + 162, 163, 510, 511, 512, 513, 514, 515, 516, 517, + 518, 519, 520, 521, 522, 111, 525, 526, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 533, 534, + 535, 536, 537, 538, 539, 540, 541, 542, 543, 236, + 237, 238, 239, 240, 546, 547, 548, 549, 550, 551, 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, @@ -1767,37 +1785,38 @@ 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 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint16 yyr1[] = { - 0, 263, 264, 264, 265, 265, 265, 265, 265, 265, - 265, 265, 265, 265, 266, 267, 267, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 269, 270, 270, 271, 271, 271, 271, 271, - 271, 271, 272, 273, 273, 274, 274, 274, 274, 274, - 274, 275, 276, 276, 277, 277, 277, 277, 277, 277, - 277, 278, 279, 279, 280, 280, 280, 280, 280, 280, - 280, 280, 281, 282, 283, 284, 285, 286, 287, 288, + 0, 267, 268, 268, 269, 269, 269, 269, 269, 269, + 269, 269, 269, 269, 270, 271, 271, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 273, 274, 274, 275, + 275, 275, 275, 275, 275, 275, 276, 277, 277, 278, + 278, 278, 278, 278, 278, 279, 280, 280, 281, 281, + 281, 281, 281, 281, 281, 282, 283, 283, 284, 284, + 284, 284, 284, 284, 284, 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, @@ -1818,16 +1837,16 @@ static const yytype_uint16 yyr1[] = 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, - 489, 490, 490, 491, 491, 491, 491, 491, 491, 491, - 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, - 501, 501, 502, 502, 502, 502, 502, 502, 502, 502, - 502, 502, 502, 502, 503, 504, 505, 506, 507, 508, - 509, 510, 511, 512, 513, 514, 515, 516, 516, 517, - 518, 519, 520, 521, 522, 523, 524, 524, 525, 525, - 525, 525, 525, 525, 525, 525, 525, 525, 526, 527, - 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, - 537, 538, 538, 538, 538, 538, 539, 540, 541, 542, - 543, 544 + 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, + 498, 499, 499, 499, 499, 499, 499, 499, 499, 500, + 501, 502, 503, 504, 505, 506, 507, 508, 509, 509, + 510, 510, 510, 510, 510, 510, 510, 510, 510, 510, + 510, 510, 511, 512, 513, 514, 515, 516, 517, 518, + 519, 520, 521, 522, 523, 524, 524, 525, 526, 527, + 528, 529, 530, 531, 532, 532, 533, 533, 533, 533, + 533, 533, 533, 533, 533, 533, 534, 535, 536, 537, + 538, 539, 540, 541, 542, 543, 544, 545, 545, 546, + 546, 546, 546, 546, 547, 548, 549, 550, 551, 552 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1853,41 +1872,41 @@ 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, 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, 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, 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, + 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, 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, + 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, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 3, 2, 2, 2, 1, 2, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, + 1, 1, 1, 1, 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, 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, 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, 2, 3, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 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, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, - 1, 2, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 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, - 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, 2, 2, 2, 2, - 2, 3 + 1, 1, 1, 1, 2, 2, 2, 2, 2, 3 }; @@ -2248,6 +2267,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, case N: \ yyformat = S; \ break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); @@ -2564,15 +2584,15 @@ yyreduce: switch (yyn) { case 14: -#line 180 "./util/configparser.y" /* yacc.c:1646 */ +#line 182 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("\nP(server:)\n")); } -#line 2572 "util/configparser.c" /* yacc.c:1646 */ +#line 2592 "util/configparser.c" /* yacc.c:1648 */ break; - case 202: -#line 269 "./util/configparser.y" /* yacc.c:1646 */ + case 206: +#line 273 "./util/configparser.y" /* yacc.c:1648 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2583,11 +2603,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2587 "util/configparser.c" /* yacc.c:1646 */ +#line 2607 "util/configparser.c" /* yacc.c:1648 */ break; - case 212: -#line 286 "./util/configparser.y" /* yacc.c:1646 */ + case 216: +#line 290 "./util/configparser.y" /* yacc.c:1648 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2598,11 +2618,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2602 "util/configparser.c" /* yacc.c:1646 */ +#line 2622 "util/configparser.c" /* yacc.c:1648 */ break; - case 221: -#line 303 "./util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 307 "./util/configparser.y" /* yacc.c:1648 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2615,11 +2635,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2619 "util/configparser.c" /* yacc.c:1646 */ +#line 2639 "util/configparser.c" /* yacc.c:1648 */ break; - case 231: -#line 322 "./util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 326 "./util/configparser.y" /* yacc.c:1648 */ { struct config_auth* s; OUTYY(("\nP(auth_zone:)\n")); @@ -2634,11 +2654,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2638 "util/configparser.c" /* yacc.c:1646 */ +#line 2658 "util/configparser.c" /* yacc.c:1648 */ break; - case 242: -#line 344 "./util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 348 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2646,11 +2666,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2650 "util/configparser.c" /* yacc.c:1646 */ +#line 2670 "util/configparser.c" /* yacc.c:1648 */ break; - case 243: -#line 353 "./util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 357 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2658,11 +2678,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2662 "util/configparser.c" /* yacc.c:1646 */ +#line 2682 "util/configparser.c" /* yacc.c:1648 */ break; - case 244: -#line 362 "./util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 366 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2672,11 +2692,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2676 "util/configparser.c" /* yacc.c:1646 */ +#line 2696 "util/configparser.c" /* yacc.c:1648 */ break; - case 245: -#line 373 "./util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 377 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2684,11 +2704,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2688 "util/configparser.c" /* yacc.c:1646 */ +#line 2708 "util/configparser.c" /* yacc.c:1648 */ break; - case 246: -#line 382 "./util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 386 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2696,11 +2716,11 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2700 "util/configparser.c" /* yacc.c:1646 */ +#line 2720 "util/configparser.c" /* yacc.c:1648 */ break; - case 247: -#line 391 "./util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 395 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2708,11 +2728,11 @@ yyreduce: else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2712 "util/configparser.c" /* yacc.c:1646 */ +#line 2732 "util/configparser.c" /* yacc.c:1648 */ break; - case 248: -#line 400 "./util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 404 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2722,11 +2742,11 @@ yyreduce: else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2726 "util/configparser.c" /* yacc.c:1646 */ +#line 2746 "util/configparser.c" /* yacc.c:1648 */ break; - case 249: -#line 411 "./util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 415 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2734,11 +2754,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2738 "util/configparser.c" /* yacc.c:1646 */ +#line 2758 "util/configparser.c" /* yacc.c:1648 */ break; - case 250: -#line 420 "./util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 424 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str))); @@ -2748,11 +2768,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2752 "util/configparser.c" /* yacc.c:1646 */ +#line 2772 "util/configparser.c" /* yacc.c:1648 */ break; - case 251: -#line 431 "./util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 435 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str))); @@ -2763,11 +2783,11 @@ yyreduce: OUTYY(("P(Compiled without edns subnet option, ignoring)\n")); #endif } -#line 2767 "util/configparser.c" /* yacc.c:1646 */ +#line 2787 "util/configparser.c" /* yacc.c:1648 */ break; - case 252: -#line 444 "./util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 448 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str))); @@ -2781,11 +2801,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2785 "util/configparser.c" /* yacc.c:1646 */ +#line 2805 "util/configparser.c" /* yacc.c:1648 */ break; - case 253: -#line 459 "./util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 463 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str))); @@ -2795,11 +2815,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2799 "util/configparser.c" /* yacc.c:1646 */ +#line 2819 "util/configparser.c" /* yacc.c:1648 */ break; - case 254: -#line 470 "./util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 474 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2815,11 +2835,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2819 "util/configparser.c" /* yacc.c:1646 */ +#line 2839 "util/configparser.c" /* yacc.c:1648 */ break; - case 255: -#line 487 "./util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 491 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2835,11 +2855,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2839 "util/configparser.c" /* yacc.c:1646 */ +#line 2859 "util/configparser.c" /* yacc.c:1648 */ break; - case 256: -#line 504 "./util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 508 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv4:%s)\n", (yyvsp[0].str))); @@ -2855,11 +2875,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2859 "util/configparser.c" /* yacc.c:1646 */ +#line 2879 "util/configparser.c" /* yacc.c:1648 */ break; - case 257: -#line 521 "./util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 525 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(min_client_subnet_ipv6:%s)\n", (yyvsp[0].str))); @@ -2875,11 +2895,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2879 "util/configparser.c" /* yacc.c:1646 */ +#line 2899 "util/configparser.c" /* yacc.c:1648 */ break; - case 258: -#line 538 "./util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 542 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv4:%s)\n", (yyvsp[0].str))); @@ -2893,11 +2913,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2897 "util/configparser.c" /* yacc.c:1646 */ +#line 2917 "util/configparser.c" /* yacc.c:1648 */ break; - case 259: -#line 553 "./util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 557 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef CLIENT_SUBNET OUTYY(("P(max_ecs_tree_size_ipv6:%s)\n", (yyvsp[0].str))); @@ -2911,11 +2931,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2915 "util/configparser.c" /* yacc.c:1646 */ +#line 2935 "util/configparser.c" /* yacc.c:1648 */ break; - case 260: -#line 568 "./util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 572 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2927,11 +2947,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2931 "util/configparser.c" /* yacc.c:1646 */ +#line 2951 "util/configparser.c" /* yacc.c:1648 */ break; - case 261: -#line 581 "./util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 585 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2945,11 +2965,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2949 "util/configparser.c" /* yacc.c:1646 */ +#line 2969 "util/configparser.c" /* yacc.c:1648 */ break; - case 262: -#line 596 "./util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 600 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2957,11 +2977,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2961 "util/configparser.c" /* yacc.c:1646 */ +#line 2981 "util/configparser.c" /* yacc.c:1648 */ break; - case 263: -#line 605 "./util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 609 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2969,11 +2989,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2973 "util/configparser.c" /* yacc.c:1646 */ +#line 2993 "util/configparser.c" /* yacc.c:1648 */ break; - case 264: -#line 614 "./util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 618 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2981,11 +3001,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2985 "util/configparser.c" /* yacc.c:1646 */ +#line 3005 "util/configparser.c" /* yacc.c:1648 */ break; - case 265: -#line 623 "./util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 627 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2993,11 +3013,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2997 "util/configparser.c" /* yacc.c:1646 */ +#line 3017 "util/configparser.c" /* yacc.c:1648 */ break; - case 266: -#line 632 "./util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 636 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3005,11 +3025,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3009 "util/configparser.c" /* yacc.c:1646 */ +#line 3029 "util/configparser.c" /* yacc.c:1648 */ break; - case 267: -#line 641 "./util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 645 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3017,11 +3037,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3021 "util/configparser.c" /* yacc.c:1646 */ +#line 3041 "util/configparser.c" /* yacc.c:1648 */ break; - case 268: -#line 650 "./util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 654 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3029,11 +3049,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3033 "util/configparser.c" /* yacc.c:1646 */ +#line 3053 "util/configparser.c" /* yacc.c:1648 */ break; - case 269: -#line 659 "./util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 663 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3041,11 +3061,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3045 "util/configparser.c" /* yacc.c:1646 */ +#line 3065 "util/configparser.c" /* yacc.c:1648 */ break; - case 270: -#line 668 "./util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 672 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3053,11 +3073,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3057 "util/configparser.c" /* yacc.c:1646 */ +#line 3077 "util/configparser.c" /* yacc.c:1648 */ break; - case 271: -#line 677 "./util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 681 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3065,11 +3085,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3069 "util/configparser.c" /* yacc.c:1646 */ +#line 3089 "util/configparser.c" /* yacc.c:1648 */ break; - case 272: -#line 686 "./util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 690 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3077,11 +3097,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3081 "util/configparser.c" /* yacc.c:1646 */ +#line 3101 "util/configparser.c" /* yacc.c:1648 */ break; - case 273: -#line 695 "./util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 699 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3089,11 +3109,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3093 "util/configparser.c" /* yacc.c:1646 */ +#line 3113 "util/configparser.c" /* yacc.c:1648 */ break; - case 274: -#line 704 "./util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 708 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3101,11 +3121,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3105 "util/configparser.c" /* yacc.c:1646 */ +#line 3125 "util/configparser.c" /* yacc.c:1648 */ break; - case 275: -#line 713 "./util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 717 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_tcp_idle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3117,11 +3137,11 @@ yyreduce: else cfg_parser->cfg->tcp_idle_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3121 "util/configparser.c" /* yacc.c:1646 */ +#line 3141 "util/configparser.c" /* yacc.c:1648 */ break; - case 276: -#line 726 "./util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 730 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_tcp_keepalive:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3129,11 +3149,11 @@ yyreduce: else cfg_parser->cfg->do_tcp_keepalive = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3133 "util/configparser.c" /* yacc.c:1646 */ +#line 3153 "util/configparser.c" /* yacc.c:1648 */ break; - case 277: -#line 735 "./util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 739 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_tcp_keepalive_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3145,11 +3165,11 @@ yyreduce: else cfg_parser->cfg->tcp_keepalive_timeout = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3149 "util/configparser.c" /* yacc.c:1646 */ +#line 3169 "util/configparser.c" /* yacc.c:1648 */ break; - case 278: -#line 748 "./util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 752 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3157,11 +3177,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3161 "util/configparser.c" /* yacc.c:1646 */ +#line 3181 "util/configparser.c" /* yacc.c:1648 */ break; - case 279: -#line 757 "./util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 761 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -3169,11 +3189,11 @@ yyreduce: else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3173 "util/configparser.c" /* yacc.c:1646 */ +#line 3193 "util/configparser.c" /* yacc.c:1648 */ break; - case 280: -#line 766 "./util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 770 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3181,31 +3201,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3185 "util/configparser.c" /* yacc.c:1646 */ +#line 3205 "util/configparser.c" /* yacc.c:1648 */ break; - case 281: -#line 775 "./util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 779 "./util/configparser.y" /* yacc.c:1648 */ { 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 3195 "util/configparser.c" /* yacc.c:1646 */ +#line 3215 "util/configparser.c" /* yacc.c:1648 */ break; - case 282: -#line 782 "./util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 786 "./util/configparser.y" /* yacc.c:1648 */ { 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 3205 "util/configparser.c" /* yacc.c:1646 */ +#line 3225 "util/configparser.c" /* yacc.c:1648 */ break; - case 283: -#line 789 "./util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 793 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3213,21 +3233,21 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3217 "util/configparser.c" /* yacc.c:1646 */ +#line 3237 "util/configparser.c" /* yacc.c:1648 */ break; - case 284: -#line 798 "./util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 802 "./util/configparser.y" /* yacc.c:1648 */ { 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 3227 "util/configparser.c" /* yacc.c:1646 */ +#line 3247 "util/configparser.c" /* yacc.c:1648 */ break; - case 285: -#line 805 "./util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 809 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_tls_win_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3235,22 +3255,53 @@ yyreduce: else cfg_parser->cfg->tls_win_cert = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3239 "util/configparser.c" /* yacc.c:1646 */ +#line 3259 "util/configparser.c" /* yacc.c:1648 */ break; - case 286: -#line 814 "./util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 818 "./util/configparser.y" /* yacc.c:1648 */ { 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 3250 "util/configparser.c" /* yacc.c:1646 */ +#line 3270 "util/configparser.c" /* yacc.c:1648 */ break; - case 287: -#line 822 "./util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 826 "./util/configparser.y" /* yacc.c:1648 */ + { + 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 3280 "util/configparser.c" /* yacc.c:1648 */ + break; + + case 292: +#line 833 "./util/configparser.y" /* yacc.c:1648 */ + { + 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 3290 "util/configparser.c" /* yacc.c:1648 */ + break; + + case 293: +#line 840 "./util/configparser.y" /* yacc.c:1648 */ + { + 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 3301 "util/configparser.c" /* yacc.c:1648 */ + break; + + case 294: +#line 848 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3258,11 +3309,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3262 "util/configparser.c" /* yacc.c:1646 */ +#line 3313 "util/configparser.c" /* yacc.c:1648 */ break; - case 288: -#line 831 "./util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 857 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3270,11 +3321,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3274 "util/configparser.c" /* yacc.c:1646 */ +#line 3325 "util/configparser.c" /* yacc.c:1648 */ break; - case 289: -#line 840 "./util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 866 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3287,11 +3338,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3291 "util/configparser.c" /* yacc.c:1646 */ +#line 3342 "util/configparser.c" /* yacc.c:1648 */ break; - case 290: -#line 854 "./util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 880 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3299,11 +3350,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3303 "util/configparser.c" /* yacc.c:1646 */ +#line 3354 "util/configparser.c" /* yacc.c:1648 */ break; - case 291: -#line 863 "./util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 889 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3311,11 +3362,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3315 "util/configparser.c" /* yacc.c:1646 */ +#line 3366 "util/configparser.c" /* yacc.c:1648 */ break; - case 292: -#line 872 "./util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 898 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3323,11 +3374,11 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3327 "util/configparser.c" /* yacc.c:1646 */ +#line 3378 "util/configparser.c" /* yacc.c:1648 */ break; - case 293: -#line 881 "./util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 907 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_log_tag_queryreply:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3335,11 +3386,11 @@ yyreduce: else cfg_parser->cfg->log_tag_queryreply = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3339 "util/configparser.c" /* yacc.c:1646 */ +#line 3390 "util/configparser.c" /* yacc.c:1648 */ break; - case 294: -#line 890 "./util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 916 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_log_servfail:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3347,11 +3398,11 @@ yyreduce: else cfg_parser->cfg->log_servfail = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3351 "util/configparser.c" /* yacc.c:1646 */ +#line 3402 "util/configparser.c" /* yacc.c:1648 */ break; - case 295: -#line 899 "./util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 925 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_log_local_actions:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3359,31 +3410,31 @@ yyreduce: else cfg_parser->cfg->log_local_actions = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3363 "util/configparser.c" /* yacc.c:1646 */ +#line 3414 "util/configparser.c" /* yacc.c:1648 */ break; - case 296: -#line 908 "./util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 934 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 3373 "util/configparser.c" /* yacc.c:1646 */ +#line 3424 "util/configparser.c" /* yacc.c:1648 */ break; - case 297: -#line 915 "./util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 941 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 3383 "util/configparser.c" /* yacc.c:1646 */ +#line 3434 "util/configparser.c" /* yacc.c:1648 */ break; - case 298: -#line 922 "./util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 948 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -3408,105 +3459,105 @@ yyreduce: } } } -#line 3412 "util/configparser.c" /* yacc.c:1646 */ +#line 3463 "util/configparser.c" /* yacc.c:1648 */ break; - case 299: -#line 948 "./util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 974 "./util/configparser.y" /* yacc.c:1648 */ { 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 3423 "util/configparser.c" /* yacc.c:1646 */ +#line 3474 "util/configparser.c" /* yacc.c:1648 */ break; - case 300: -#line 956 "./util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 982 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 3433 "util/configparser.c" /* yacc.c:1646 */ +#line 3484 "util/configparser.c" /* yacc.c:1648 */ break; - case 301: -#line 963 "./util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 989 "./util/configparser.y" /* yacc.c:1648 */ { 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 3443 "util/configparser.c" /* yacc.c:1646 */ +#line 3494 "util/configparser.c" /* yacc.c:1648 */ break; - case 302: -#line 970 "./util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 996 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dlv_anchor_file); cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str); } -#line 3453 "util/configparser.c" /* yacc.c:1646 */ +#line 3504 "util/configparser.c" /* yacc.c:1648 */ break; - case 303: -#line 977 "./util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1003 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str))) yyerror("out of memory"); } -#line 3463 "util/configparser.c" /* yacc.c:1646 */ +#line 3514 "util/configparser.c" /* yacc.c:1648 */ break; - case 304: -#line 984 "./util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1010 "./util/configparser.y" /* yacc.c:1648 */ { 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 3474 "util/configparser.c" /* yacc.c:1646 */ +#line 3525 "util/configparser.c" /* yacc.c:1648 */ break; - case 305: -#line 992 "./util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1018 "./util/configparser.y" /* yacc.c:1648 */ { 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 3485 "util/configparser.c" /* yacc.c:1646 */ +#line 3536 "util/configparser.c" /* yacc.c:1648 */ break; - case 306: -#line 1000 "./util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1026 "./util/configparser.y" /* yacc.c:1648 */ { 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 3496 "util/configparser.c" /* yacc.c:1646 */ +#line 3547 "util/configparser.c" /* yacc.c:1648 */ break; - case 307: -#line 1008 "./util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1034 "./util/configparser.y" /* yacc.c:1648 */ { 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 3506 "util/configparser.c" /* yacc.c:1646 */ +#line 3557 "util/configparser.c" /* yacc.c:1648 */ break; - case 308: -#line 1015 "./util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1041 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3516,11 +3567,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3520 "util/configparser.c" /* yacc.c:1646 */ +#line 3571 "util/configparser.c" /* yacc.c:1648 */ break; - case 309: -#line 1026 "./util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1052 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_root_key_sentinel:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3530,21 +3581,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3534 "util/configparser.c" /* yacc.c:1646 */ +#line 3585 "util/configparser.c" /* yacc.c:1648 */ break; - case 310: -#line 1037 "./util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1063 "./util/configparser.y" /* yacc.c:1648 */ { 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 3544 "util/configparser.c" /* yacc.c:1646 */ +#line 3595 "util/configparser.c" /* yacc.c:1648 */ break; - case 311: -#line 1044 "./util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1070 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3552,11 +3603,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3556 "util/configparser.c" /* yacc.c:1646 */ +#line 3607 "util/configparser.c" /* yacc.c:1648 */ break; - case 312: -#line 1053 "./util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1079 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3564,11 +3615,11 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3568 "util/configparser.c" /* yacc.c:1646 */ +#line 3619 "util/configparser.c" /* yacc.c:1648 */ break; - case 313: -#line 1062 "./util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1088 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3576,53 +3627,53 @@ yyreduce: else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3580 "util/configparser.c" /* yacc.c:1646 */ +#line 3631 "util/configparser.c" /* yacc.c:1648 */ break; - case 314: -#line 1071 "./util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1097 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 3590 "util/configparser.c" /* yacc.c:1646 */ +#line 3641 "util/configparser.c" /* yacc.c:1648 */ break; - case 315: -#line 1078 "./util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1104 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 3600 "util/configparser.c" /* yacc.c:1646 */ +#line 3651 "util/configparser.c" /* yacc.c:1648 */ break; - case 316: -#line 1085 "./util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1111 "./util/configparser.y" /* yacc.c:1648 */ { 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 3611 "util/configparser.c" /* yacc.c:1646 */ +#line 3662 "util/configparser.c" /* yacc.c:1648 */ break; - case 317: -#line 1093 "./util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1119 "./util/configparser.y" /* yacc.c:1648 */ { 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 3622 "util/configparser.c" /* yacc.c:1646 */ +#line 3673 "util/configparser.c" /* yacc.c:1648 */ break; - case 318: -#line 1101 "./util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1127 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3631,11 +3682,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3635 "util/configparser.c" /* yacc.c:1646 */ +#line 3686 "util/configparser.c" /* yacc.c:1648 */ break; - case 319: -#line 1111 "./util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1137 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3644,11 +3695,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3648 "util/configparser.c" /* yacc.c:1646 */ +#line 3699 "util/configparser.c" /* yacc.c:1648 */ break; - case 320: -#line 1121 "./util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1147 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3657,11 +3708,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3661 "util/configparser.c" /* yacc.c:1646 */ +#line 3712 "util/configparser.c" /* yacc.c:1648 */ break; - case 321: -#line 1131 "./util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1157 "./util/configparser.y" /* yacc.c:1648 */ + { + 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 3723 "util/configparser.c" /* yacc.c:1648 */ + break; + + case 329: +#line 1165 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3673,11 +3735,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3677 "util/configparser.c" /* yacc.c:1646 */ +#line 3739 "util/configparser.c" /* yacc.c:1648 */ break; - case 322: -#line 1144 "./util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1178 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3687,22 +3749,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3691 "util/configparser.c" /* yacc.c:1646 */ +#line 3753 "util/configparser.c" /* yacc.c:1648 */ break; - case 323: -#line 1155 "./util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1189 "./util/configparser.y" /* yacc.c:1648 */ { 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 3702 "util/configparser.c" /* yacc.c:1646 */ +#line 3764 "util/configparser.c" /* yacc.c:1648 */ break; - case 324: -#line 1163 "./util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1197 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3714,11 +3776,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3718 "util/configparser.c" /* yacc.c:1646 */ +#line 3780 "util/configparser.c" /* yacc.c:1648 */ break; - case 325: -#line 1176 "./util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1210 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3726,11 +3788,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3730 "util/configparser.c" /* yacc.c:1646 */ +#line 3792 "util/configparser.c" /* yacc.c:1648 */ break; - case 326: -#line 1185 "./util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1219 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3738,11 +3800,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3742 "util/configparser.c" /* yacc.c:1646 */ +#line 3804 "util/configparser.c" /* yacc.c:1648 */ break; - case 327: -#line 1194 "./util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1228 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3750,11 +3812,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3754 "util/configparser.c" /* yacc.c:1646 */ +#line 3816 "util/configparser.c" /* yacc.c:1648 */ break; - case 328: -#line 1203 "./util/configparser.y" /* yacc.c:1646 */ + case 336: +#line 1237 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3763,11 +3825,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3767 "util/configparser.c" /* yacc.c:1646 */ +#line 3829 "util/configparser.c" /* yacc.c:1648 */ break; - case 329: -#line 1213 "./util/configparser.y" /* yacc.c:1646 */ + case 337: +#line 1247 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3776,22 +3838,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3780 "util/configparser.c" /* yacc.c:1646 */ +#line 3842 "util/configparser.c" /* yacc.c:1648 */ break; - case 330: -#line 1223 "./util/configparser.y" /* yacc.c:1646 */ + case 338: +#line 1257 "./util/configparser.y" /* yacc.c:1648 */ { 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 3791 "util/configparser.c" /* yacc.c:1646 */ +#line 3853 "util/configparser.c" /* yacc.c:1648 */ break; - case 331: -#line 1231 "./util/configparser.y" /* yacc.c:1646 */ + case 339: +#line 1265 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3803,11 +3865,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3807 "util/configparser.c" /* yacc.c:1646 */ +#line 3869 "util/configparser.c" /* yacc.c:1648 */ break; - case 332: -#line 1244 "./util/configparser.y" /* yacc.c:1646 */ + case 340: +#line 1278 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3815,22 +3877,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3819 "util/configparser.c" /* yacc.c:1646 */ +#line 3881 "util/configparser.c" /* yacc.c:1648 */ break; - case 333: -#line 1253 "./util/configparser.y" /* yacc.c:1646 */ + case 341: +#line 1287 "./util/configparser.y" /* yacc.c:1648 */ { 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 3830 "util/configparser.c" /* yacc.c:1646 */ +#line 3892 "util/configparser.c" /* yacc.c:1648 */ break; - case 334: -#line 1261 "./util/configparser.y" /* yacc.c:1646 */ + case 342: +#line 1295 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3838,22 +3900,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3842 "util/configparser.c" /* yacc.c:1646 */ +#line 3904 "util/configparser.c" /* yacc.c:1648 */ break; - case 335: -#line 1270 "./util/configparser.y" /* yacc.c:1646 */ + case 343: +#line 1304 "./util/configparser.y" /* yacc.c:1648 */ { 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 3853 "util/configparser.c" /* yacc.c:1646 */ +#line 3915 "util/configparser.c" /* yacc.c:1648 */ break; - case 336: -#line 1278 "./util/configparser.y" /* yacc.c:1646 */ + case 344: +#line 1312 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3865,11 +3927,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3869 "util/configparser.c" /* yacc.c:1646 */ +#line 3931 "util/configparser.c" /* yacc.c:1648 */ break; - case 337: -#line 1291 "./util/configparser.y" /* yacc.c:1646 */ + case 345: +#line 1325 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3877,21 +3939,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3881 "util/configparser.c" /* yacc.c:1646 */ +#line 3943 "util/configparser.c" /* yacc.c:1648 */ break; - case 338: -#line 1300 "./util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1334 "./util/configparser.y" /* yacc.c:1648 */ { 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 3891 "util/configparser.c" /* yacc.c:1646 */ +#line 3953 "util/configparser.c" /* yacc.c:1648 */ break; - case 339: -#line 1307 "./util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1341 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3900,11 +3962,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3904 "util/configparser.c" /* yacc.c:1646 */ +#line 3966 "util/configparser.c" /* yacc.c:1648 */ break; - case 340: -#line 1317 "./util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1351 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3913,11 +3975,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3917 "util/configparser.c" /* yacc.c:1646 */ +#line 3979 "util/configparser.c" /* yacc.c:1648 */ break; - case 341: -#line 1327 "./util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1361 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3926,11 +3988,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3930 "util/configparser.c" /* yacc.c:1646 */ +#line 3992 "util/configparser.c" /* yacc.c:1648 */ break; - case 342: -#line 1337 "./util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1371 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3939,11 +4001,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3943 "util/configparser.c" /* yacc.c:1646 */ +#line 4005 "util/configparser.c" /* yacc.c:1648 */ break; - case 343: -#line 1347 "./util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1381 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3952,11 +4014,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3956 "util/configparser.c" /* yacc.c:1646 */ +#line 4018 "util/configparser.c" /* yacc.c:1648 */ break; - case 344: -#line 1357 "./util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1391 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3965,11 +4027,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3969 "util/configparser.c" /* yacc.c:1646 */ +#line 4031 "util/configparser.c" /* yacc.c:1648 */ break; - case 345: -#line 1367 "./util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1401 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3978,11 +4040,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3982 "util/configparser.c" /* yacc.c:1646 */ +#line 4044 "util/configparser.c" /* yacc.c:1648 */ break; - case 346: -#line 1377 "./util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1411 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -3991,41 +4053,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3995 "util/configparser.c" /* yacc.c:1646 */ +#line 4057 "util/configparser.c" /* yacc.c:1648 */ break; - case 347: -#line 1387 "./util/configparser.y" /* yacc.c:1646 */ + case 355: +#line 1421 "./util/configparser.y" /* yacc.c:1648 */ { 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 4005 "util/configparser.c" /* yacc.c:1646 */ +#line 4067 "util/configparser.c" /* yacc.c:1648 */ break; - case 348: -#line 1394 "./util/configparser.y" /* yacc.c:1646 */ + case 356: +#line 1428 "./util/configparser.y" /* yacc.c:1648 */ { 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 4015 "util/configparser.c" /* yacc.c:1646 */ +#line 4077 "util/configparser.c" /* yacc.c:1648 */ break; - case 349: -#line 1401 "./util/configparser.y" /* yacc.c:1646 */ + case 357: +#line 1435 "./util/configparser.y" /* yacc.c:1648 */ { 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 4025 "util/configparser.c" /* yacc.c:1646 */ +#line 4087 "util/configparser.c" /* yacc.c:1648 */ break; - case 350: -#line 1408 "./util/configparser.y" /* yacc.c:1646 */ + case 358: +#line 1442 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4033,11 +4095,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4037 "util/configparser.c" /* yacc.c:1646 */ +#line 4099 "util/configparser.c" /* yacc.c:1648 */ break; - case 351: -#line 1417 "./util/configparser.y" /* yacc.c:1646 */ + case 359: +#line 1451 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4045,11 +4107,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4049 "util/configparser.c" /* yacc.c:1646 */ +#line 4111 "util/configparser.c" /* yacc.c:1648 */ break; - case 352: -#line 1426 "./util/configparser.y" /* yacc.c:1646 */ + case 360: +#line 1460 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_deny_any:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4057,11 +4119,11 @@ yyreduce: else cfg_parser->cfg->deny_any = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4061 "util/configparser.c" /* yacc.c:1646 */ +#line 4123 "util/configparser.c" /* yacc.c:1648 */ break; - case 353: -#line 1435 "./util/configparser.y" /* yacc.c:1646 */ + case 361: +#line 1469 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4069,21 +4131,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4073 "util/configparser.c" /* yacc.c:1646 */ +#line 4135 "util/configparser.c" /* yacc.c:1648 */ break; - case 354: -#line 1444 "./util/configparser.y" /* yacc.c:1646 */ + case 362: +#line 1478 "./util/configparser.y" /* yacc.c:1648 */ { 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 4083 "util/configparser.c" /* yacc.c:1646 */ +#line 4145 "util/configparser.c" /* yacc.c:1648 */ break; - case 355: -#line 1451 "./util/configparser.y" /* yacc.c:1646 */ + case 363: +#line 1485 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -4092,11 +4154,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4096 "util/configparser.c" /* yacc.c:1646 */ +#line 4158 "util/configparser.c" /* yacc.c:1648 */ break; - case 356: -#line 1461 "./util/configparser.y" /* yacc.c:1646 */ + case 364: +#line 1495 "./util/configparser.y" /* yacc.c:1648 */ { 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 && @@ -4115,21 +4177,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 4119 "util/configparser.c" /* yacc.c:1646 */ +#line 4181 "util/configparser.c" /* yacc.c:1648 */ break; - case 357: -#line 1481 "./util/configparser.y" /* yacc.c:1646 */ + case 365: +#line 1515 "./util/configparser.y" /* yacc.c:1648 */ { 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 4129 "util/configparser.c" /* yacc.c:1646 */ +#line 4191 "util/configparser.c" /* yacc.c:1648 */ break; - case 358: -#line 1488 "./util/configparser.y" /* yacc.c:1646 */ + case 366: +#line 1522 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4146,11 +4208,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4150 "util/configparser.c" /* yacc.c:1646 */ +#line 4212 "util/configparser.c" /* yacc.c:1648 */ break; - case 359: -#line 1506 "./util/configparser.y" /* yacc.c:1646 */ + case 367: +#line 1540 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4162,11 +4224,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4166 "util/configparser.c" /* yacc.c:1646 */ +#line 4228 "util/configparser.c" /* yacc.c:1648 */ break; - case 360: -#line 1519 "./util/configparser.y" /* yacc.c:1646 */ + case 368: +#line 1553 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -4178,11 +4240,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4182 "util/configparser.c" /* yacc.c:1646 */ +#line 4244 "util/configparser.c" /* yacc.c:1648 */ break; - case 361: -#line 1532 "./util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1566 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4190,11 +4252,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4194 "util/configparser.c" /* yacc.c:1646 */ +#line 4256 "util/configparser.c" /* yacc.c:1648 */ break; - case 362: -#line 1541 "./util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1575 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4202,11 +4264,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4206 "util/configparser.c" /* yacc.c:1646 */ +#line 4268 "util/configparser.c" /* yacc.c:1648 */ break; - case 363: -#line 1550 "./util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1584 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4214,11 +4276,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4218 "util/configparser.c" /* yacc.c:1646 */ +#line 4280 "util/configparser.c" /* yacc.c:1648 */ break; - case 364: -#line 1559 "./util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1593 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4226,11 +4288,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4230 "util/configparser.c" /* yacc.c:1646 */ +#line 4292 "util/configparser.c" /* yacc.c:1648 */ break; - case 365: -#line 1568 "./util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1602 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4239,11 +4301,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4243 "util/configparser.c" /* yacc.c:1646 */ +#line 4305 "util/configparser.c" /* yacc.c:1648 */ break; - case 366: -#line 1578 "./util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1612 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4252,11 +4314,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4256 "util/configparser.c" /* yacc.c:1646 */ +#line 4318 "util/configparser.c" /* yacc.c:1648 */ break; - case 367: -#line 1588 "./util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1622 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_aggressive_nsec:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4266,11 +4328,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4270 "util/configparser.c" /* yacc.c:1646 */ +#line 4332 "util/configparser.c" /* yacc.c:1648 */ break; - case 368: -#line 1599 "./util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1633 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4278,11 +4340,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4282 "util/configparser.c" /* yacc.c:1646 */ +#line 4344 "util/configparser.c" /* yacc.c:1648 */ break; - case 369: -#line 1608 "./util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1642 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4290,11 +4352,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4294 "util/configparser.c" /* yacc.c:1646 */ +#line 4356 "util/configparser.c" /* yacc.c:1648 */ break; - case 370: -#line 1617 "./util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1651 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_serve_expired_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4302,11 +4364,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4306 "util/configparser.c" /* yacc.c:1646 */ +#line 4368 "util/configparser.c" /* yacc.c:1648 */ break; - case 371: -#line 1626 "./util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1660 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -4314,11 +4376,11 @@ yyreduce: else cfg_parser->cfg->serve_expired_ttl_reset = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4318 "util/configparser.c" /* yacc.c:1646 */ +#line 4380 "util/configparser.c" /* yacc.c:1648 */ break; - case 372: -#line 1635 "./util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1669 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4330,11 +4392,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4334 "util/configparser.c" /* yacc.c:1646 */ +#line 4396 "util/configparser.c" /* yacc.c:1648 */ break; - case 373: -#line 1648 "./util/configparser.y" /* yacc.c:1646 */ + case 381: +#line 1682 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4346,11 +4408,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4350 "util/configparser.c" /* yacc.c:1646 */ +#line 4412 "util/configparser.c" /* yacc.c:1648 */ break; - case 374: -#line 1661 "./util/configparser.y" /* yacc.c:1646 */ + case 382: +#line 1695 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4358,21 +4420,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4362 "util/configparser.c" /* yacc.c:1646 */ +#line 4424 "util/configparser.c" /* yacc.c:1648 */ break; - case 375: -#line 1670 "./util/configparser.y" /* yacc.c:1646 */ + case 383: +#line 1704 "./util/configparser.y" /* yacc.c:1648 */ { 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 4372 "util/configparser.c" /* yacc.c:1646 */ +#line 4434 "util/configparser.c" /* yacc.c:1648 */ break; - case 376: -#line 1677 "./util/configparser.y" /* yacc.c:1646 */ + case 384: +#line 1711 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4380,11 +4442,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4384 "util/configparser.c" /* yacc.c:1646 */ +#line 4446 "util/configparser.c" /* yacc.c:1648 */ break; - case 377: -#line 1686 "./util/configparser.y" /* yacc.c:1646 */ + case 385: +#line 1720 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4392,11 +4454,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4396 "util/configparser.c" /* yacc.c:1646 */ +#line 4458 "util/configparser.c" /* yacc.c:1648 */ break; - case 378: -#line 1695 "./util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 1729 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4404,11 +4466,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4408 "util/configparser.c" /* yacc.c:1646 */ +#line 4470 "util/configparser.c" /* yacc.c:1648 */ break; - case 379: -#line 1704 "./util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 1738 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4417,22 +4479,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4421 "util/configparser.c" /* yacc.c:1646 */ +#line 4483 "util/configparser.c" /* yacc.c:1648 */ break; - case 380: -#line 1713 "./util/configparser.y" /* yacc.c:1646 */ + case 388: +#line 1747 "./util/configparser.y" /* yacc.c:1648 */ { 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 4432 "util/configparser.c" /* yacc.c:1646 */ +#line 4494 "util/configparser.c" /* yacc.c:1648 */ break; - case 381: -#line 1721 "./util/configparser.y" /* yacc.c:1646 */ + case 389: +#line 1755 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4444,22 +4506,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4448 "util/configparser.c" /* yacc.c:1646 */ +#line 4510 "util/configparser.c" /* yacc.c:1648 */ break; - case 382: -#line 1734 "./util/configparser.y" /* yacc.c:1646 */ + case 390: +#line 1768 "./util/configparser.y" /* yacc.c:1648 */ { 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 4459 "util/configparser.c" /* yacc.c:1646 */ +#line 4521 "util/configparser.c" /* yacc.c:1648 */ break; - case 383: -#line 1742 "./util/configparser.y" /* yacc.c:1646 */ + case 391: +#line 1776 "./util/configparser.y" /* yacc.c:1648 */ { 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 && @@ -4470,12 +4532,14 @@ yyreduce: && strcmp((yyvsp[0].str), "always_refuse")!=0 && strcmp((yyvsp[0].str), "always_nxdomain")!=0 && strcmp((yyvsp[0].str), "noview")!=0 - && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0) { + && strcmp((yyvsp[0].str), "inform")!=0 && strcmp((yyvsp[0].str), "inform_deny")!=0 + && strcmp((yyvsp[0].str), "inform_redirect") != 0) { yyerror("local-zone type: expected static, deny, " "refuse, redirect, transparent, " "typetransparent, inform, inform_deny, " - "always_transparent, always_refuse, " - "always_nxdomain, noview or nodefault"); + "inform_redirect, always_transparent, " + "always_refuse, always_nxdomain, noview " + "or nodefault"); free((yyvsp[-1].str)); free((yyvsp[0].str)); } else if(strcmp((yyvsp[0].str), "nodefault")==0) { @@ -4489,21 +4553,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4493 "util/configparser.c" /* yacc.c:1646 */ +#line 4557 "util/configparser.c" /* yacc.c:1648 */ break; - case 384: -#line 1773 "./util/configparser.y" /* yacc.c:1646 */ + case 392: +#line 1809 "./util/configparser.y" /* yacc.c:1648 */ { 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 4503 "util/configparser.c" /* yacc.c:1646 */ +#line 4567 "util/configparser.c" /* yacc.c:1648 */ break; - case 385: -#line 1780 "./util/configparser.y" /* yacc.c:1646 */ + case 393: +#line 1816 "./util/configparser.y" /* yacc.c:1648 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -4517,11 +4581,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 4521 "util/configparser.c" /* yacc.c:1646 */ +#line 4585 "util/configparser.c" /* yacc.c:1648 */ break; - case 386: -#line 1795 "./util/configparser.y" /* yacc.c:1646 */ + case 394: +#line 1831 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4530,11 +4594,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4534 "util/configparser.c" /* yacc.c:1646 */ +#line 4598 "util/configparser.c" /* yacc.c:1648 */ break; - case 387: -#line 1805 "./util/configparser.y" /* yacc.c:1646 */ + case 395: +#line 1841 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4543,41 +4607,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4547 "util/configparser.c" /* yacc.c:1646 */ +#line 4611 "util/configparser.c" /* yacc.c:1648 */ break; - case 388: -#line 1815 "./util/configparser.y" /* yacc.c:1646 */ + case 396: +#line 1851 "./util/configparser.y" /* yacc.c:1648 */ { 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 4557 "util/configparser.c" /* yacc.c:1646 */ +#line 4621 "util/configparser.c" /* yacc.c:1648 */ break; - case 389: -#line 1822 "./util/configparser.y" /* yacc.c:1646 */ + case 397: +#line 1858 "./util/configparser.y" /* yacc.c:1648 */ { 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 4567 "util/configparser.c" /* yacc.c:1646 */ +#line 4631 "util/configparser.c" /* yacc.c:1648 */ break; - case 390: -#line 1829 "./util/configparser.y" /* yacc.c:1646 */ + case 398: +#line 1865 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 4577 "util/configparser.c" /* yacc.c:1646 */ +#line 4641 "util/configparser.c" /* yacc.c:1648 */ break; - case 391: -#line 1836 "./util/configparser.y" /* yacc.c:1646 */ + case 399: +#line 1872 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4585,22 +4649,22 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4589 "util/configparser.c" /* yacc.c:1646 */ +#line 4653 "util/configparser.c" /* yacc.c:1648 */ break; - case 392: -#line 1845 "./util/configparser.y" /* yacc.c:1646 */ + case 400: +#line 1881 "./util/configparser.y" /* yacc.c:1648 */ { 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 4600 "util/configparser.c" /* yacc.c:1646 */ +#line 4664 "util/configparser.c" /* yacc.c:1648 */ break; - case 393: -#line 1853 "./util/configparser.y" /* yacc.c:1646 */ + case 401: +#line 1889 "./util/configparser.y" /* yacc.c:1648 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -4613,11 +4677,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4617 "util/configparser.c" /* yacc.c:1646 */ +#line 4681 "util/configparser.c" /* yacc.c:1648 */ break; - case 394: -#line 1867 "./util/configparser.y" /* yacc.c:1646 */ + case 402: +#line 1903 "./util/configparser.y" /* yacc.c:1648 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4637,11 +4701,11 @@ yyreduce: } } } -#line 4641 "util/configparser.c" /* yacc.c:1646 */ +#line 4705 "util/configparser.c" /* yacc.c:1648 */ break; - case 395: -#line 1888 "./util/configparser.y" /* yacc.c:1646 */ + case 403: +#line 1924 "./util/configparser.y" /* yacc.c:1648 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4661,11 +4725,11 @@ yyreduce: } } } -#line 4665 "util/configparser.c" /* yacc.c:1646 */ +#line 4729 "util/configparser.c" /* yacc.c:1648 */ break; - case 396: -#line 1909 "./util/configparser.y" /* yacc.c:1646 */ + case 404: +#line 1945 "./util/configparser.y" /* yacc.c:1648 */ { 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, @@ -4676,11 +4740,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4680 "util/configparser.c" /* yacc.c:1646 */ +#line 4744 "util/configparser.c" /* yacc.c:1648 */ break; - case 397: -#line 1921 "./util/configparser.y" /* yacc.c:1646 */ + case 405: +#line 1957 "./util/configparser.y" /* yacc.c:1648 */ { 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, @@ -4691,11 +4755,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4695 "util/configparser.c" /* yacc.c:1646 */ +#line 4759 "util/configparser.c" /* yacc.c:1648 */ break; - case 398: -#line 1933 "./util/configparser.y" /* yacc.c:1646 */ + case 406: +#line 1969 "./util/configparser.y" /* yacc.c:1648 */ { 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, @@ -4706,11 +4770,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4710 "util/configparser.c" /* yacc.c:1646 */ +#line 4774 "util/configparser.c" /* yacc.c:1648 */ break; - case 399: -#line 1945 "./util/configparser.y" /* yacc.c:1646 */ + case 407: +#line 1981 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -4718,11 +4782,11 @@ yyreduce: yyerror("out of memory"); } } -#line 4722 "util/configparser.c" /* yacc.c:1646 */ +#line 4786 "util/configparser.c" /* yacc.c:1648 */ break; - case 400: -#line 1954 "./util/configparser.y" /* yacc.c:1646 */ + case 408: +#line 1990 "./util/configparser.y" /* yacc.c:1648 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -4742,11 +4806,11 @@ yyreduce: } } } -#line 4746 "util/configparser.c" /* yacc.c:1646 */ +#line 4810 "util/configparser.c" /* yacc.c:1648 */ break; - case 401: -#line 1975 "./util/configparser.y" /* yacc.c:1646 */ + case 409: +#line 2011 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4754,11 +4818,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4758 "util/configparser.c" /* yacc.c:1646 */ +#line 4822 "util/configparser.c" /* yacc.c:1648 */ break; - case 402: -#line 1985 "./util/configparser.y" /* yacc.c:1646 */ + case 410: +#line 2021 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4766,33 +4830,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4770 "util/configparser.c" /* yacc.c:1646 */ +#line 4834 "util/configparser.c" /* yacc.c:1648 */ break; - case 403: -#line 1994 "./util/configparser.y" /* yacc.c:1646 */ + case 411: +#line 2030 "./util/configparser.y" /* yacc.c:1648 */ { 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 4781 "util/configparser.c" /* yacc.c:1646 */ +#line 4845 "util/configparser.c" /* yacc.c:1648 */ break; - case 404: -#line 2002 "./util/configparser.y" /* yacc.c:1646 */ + case 412: +#line 2038 "./util/configparser.y" /* yacc.c:1648 */ { 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 4792 "util/configparser.c" /* yacc.c:1646 */ +#line 4856 "util/configparser.c" /* yacc.c:1648 */ break; - case 405: -#line 2010 "./util/configparser.y" /* yacc.c:1646 */ + case 413: +#line 2046 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4804,11 +4868,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4808 "util/configparser.c" /* yacc.c:1646 */ +#line 4872 "util/configparser.c" /* yacc.c:1648 */ break; - case 406: -#line 2023 "./util/configparser.y" /* yacc.c:1646 */ + case 414: +#line 2059 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4820,11 +4884,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 4824 "util/configparser.c" /* yacc.c:1646 */ +#line 4888 "util/configparser.c" /* yacc.c:1648 */ break; - case 407: -#line 2036 "./util/configparser.y" /* yacc.c:1646 */ + case 415: +#line 2072 "./util/configparser.y" /* yacc.c:1648 */ { 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) { @@ -4838,11 +4902,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 4842 "util/configparser.c" /* yacc.c:1646 */ +#line 4906 "util/configparser.c" /* yacc.c:1648 */ break; - case 408: -#line 2051 "./util/configparser.y" /* yacc.c:1646 */ + case 416: +#line 2087 "./util/configparser.y" /* yacc.c:1648 */ { 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) { @@ -4856,11 +4920,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 4860 "util/configparser.c" /* yacc.c:1646 */ +#line 4924 "util/configparser.c" /* yacc.c:1648 */ break; - case 409: -#line 2066 "./util/configparser.y" /* yacc.c:1646 */ + case 417: +#line 2102 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4868,11 +4932,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4872 "util/configparser.c" /* yacc.c:1646 */ +#line 4936 "util/configparser.c" /* yacc.c:1648 */ break; - case 410: -#line 2075 "./util/configparser.y" /* yacc.c:1646 */ + case 418: +#line 2111 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4880,20 +4944,20 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4884 "util/configparser.c" /* yacc.c:1646 */ +#line 4948 "util/configparser.c" /* yacc.c:1648 */ break; - case 411: -#line 2084 "./util/configparser.y" /* yacc.c:1646 */ + case 419: +#line 2120 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n")); free((yyvsp[0].str)); } -#line 4893 "util/configparser.c" /* yacc.c:1646 */ +#line 4957 "util/configparser.c" /* yacc.c:1648 */ break; - case 412: -#line 2090 "./util/configparser.y" /* yacc.c:1646 */ + case 420: +#line 2126 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_fast_server_num:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) <= 0) @@ -4901,11 +4965,11 @@ yyreduce: else cfg_parser->cfg->fast_server_num = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4905 "util/configparser.c" /* yacc.c:1646 */ +#line 4969 "util/configparser.c" /* yacc.c:1648 */ break; - case 413: -#line 2099 "./util/configparser.y" /* yacc.c:1646 */ + case 421: +#line 2135 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_fast_server_permil:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -4913,11 +4977,11 @@ yyreduce: else cfg_parser->cfg->fast_server_permil = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4917 "util/configparser.c" /* yacc.c:1646 */ +#line 4981 "util/configparser.c" /* yacc.c:1648 */ break; - case 414: -#line 2108 "./util/configparser.y" /* yacc.c:1646 */ + case 422: +#line 2144 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4926,11 +4990,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4930 "util/configparser.c" /* yacc.c:1646 */ +#line 4994 "util/configparser.c" /* yacc.c:1648 */ break; - case 415: -#line 2118 "./util/configparser.y" /* yacc.c:1646 */ + case 423: +#line 2154 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4939,11 +5003,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4943 "util/configparser.c" /* yacc.c:1646 */ +#line 5007 "util/configparser.c" /* yacc.c:1648 */ break; - case 416: -#line 2128 "./util/configparser.y" /* yacc.c:1646 */ + case 424: +#line 2164 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str))); @@ -4955,11 +5019,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4959 "util/configparser.c" /* yacc.c:1646 */ +#line 5023 "util/configparser.c" /* yacc.c:1648 */ break; - case 417: -#line 2141 "./util/configparser.y" /* yacc.c:1646 */ + case 425: +#line 2177 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str))); @@ -4971,11 +5035,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 4975 "util/configparser.c" /* yacc.c:1646 */ +#line 5039 "util/configparser.c" /* yacc.c:1648 */ break; - case 418: -#line 2154 "./util/configparser.y" /* yacc.c:1646 */ + case 426: +#line 2190 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str))); @@ -4986,11 +5050,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 4990 "util/configparser.c" /* yacc.c:1646 */ +#line 5054 "util/configparser.c" /* yacc.c:1648 */ break; - case 419: -#line 2166 "./util/configparser.y" /* yacc.c:1646 */ + case 427: +#line 2202 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str))); @@ -5003,11 +5067,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5007 "util/configparser.c" /* yacc.c:1646 */ +#line 5071 "util/configparser.c" /* yacc.c:1648 */ break; - case 420: -#line 2180 "./util/configparser.y" /* yacc.c:1646 */ + case 428: +#line 2216 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str))); @@ -5018,11 +5082,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5022 "util/configparser.c" /* yacc.c:1646 */ +#line 5086 "util/configparser.c" /* yacc.c:1648 */ break; - case 421: -#line 2192 "./util/configparser.y" /* yacc.c:1646 */ + case 429: +#line 2228 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_IPSECMOD OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str))); @@ -5035,11 +5099,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5039 "util/configparser.c" /* yacc.c:1646 */ +#line 5103 "util/configparser.c" /* yacc.c:1648 */ break; - case 422: -#line 2206 "./util/configparser.y" /* yacc.c:1646 */ + case 430: +#line 2242 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -5048,31 +5112,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 5052 "util/configparser.c" /* yacc.c:1646 */ +#line 5116 "util/configparser.c" /* yacc.c:1648 */ break; - case 423: -#line 2216 "./util/configparser.y" /* yacc.c:1646 */ + case 431: +#line 2252 "./util/configparser.y" /* yacc.c:1648 */ { 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 5062 "util/configparser.c" /* yacc.c:1646 */ +#line 5126 "util/configparser.c" /* yacc.c:1648 */ break; - case 424: -#line 2223 "./util/configparser.y" /* yacc.c:1646 */ + case 432: +#line 2259 "./util/configparser.y" /* yacc.c:1648 */ { 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 5072 "util/configparser.c" /* yacc.c:1646 */ +#line 5136 "util/configparser.c" /* yacc.c:1648 */ break; - case 425: -#line 2230 "./util/configparser.y" /* yacc.c:1646 */ + case 433: +#line 2266 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5080,11 +5144,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5084 "util/configparser.c" /* yacc.c:1646 */ +#line 5148 "util/configparser.c" /* yacc.c:1648 */ break; - case 426: -#line 2239 "./util/configparser.y" /* yacc.c:1646 */ + case 434: +#line 2275 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(stub-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5092,11 +5156,11 @@ yyreduce: else cfg_parser->cfg->stubs->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5096 "util/configparser.c" /* yacc.c:1646 */ +#line 5160 "util/configparser.c" /* yacc.c:1648 */ break; - case 427: -#line 2248 "./util/configparser.y" /* yacc.c:1646 */ + case 435: +#line 2284 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5105,11 +5169,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5109 "util/configparser.c" /* yacc.c:1646 */ +#line 5173 "util/configparser.c" /* yacc.c:1648 */ break; - case 428: -#line 2258 "./util/configparser.y" /* yacc.c:1646 */ + case 436: +#line 2294 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5118,11 +5182,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5122 "util/configparser.c" /* yacc.c:1646 */ +#line 5186 "util/configparser.c" /* yacc.c:1648 */ break; - case 429: -#line 2268 "./util/configparser.y" /* yacc.c:1646 */ + case 437: +#line 2304 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -5131,31 +5195,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 5135 "util/configparser.c" /* yacc.c:1646 */ +#line 5199 "util/configparser.c" /* yacc.c:1648 */ break; - case 430: -#line 2278 "./util/configparser.y" /* yacc.c:1646 */ + case 438: +#line 2314 "./util/configparser.y" /* yacc.c:1648 */ { 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 5145 "util/configparser.c" /* yacc.c:1646 */ +#line 5209 "util/configparser.c" /* yacc.c:1648 */ break; - case 431: -#line 2285 "./util/configparser.y" /* yacc.c:1646 */ + case 439: +#line 2321 "./util/configparser.y" /* yacc.c:1648 */ { 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 5155 "util/configparser.c" /* yacc.c:1646 */ +#line 5219 "util/configparser.c" /* yacc.c:1648 */ break; - case 432: -#line 2292 "./util/configparser.y" /* yacc.c:1646 */ + case 440: +#line 2328 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5163,11 +5227,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5167 "util/configparser.c" /* yacc.c:1646 */ +#line 5231 "util/configparser.c" /* yacc.c:1648 */ break; - case 433: -#line 2301 "./util/configparser.y" /* yacc.c:1646 */ + case 441: +#line 2337 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(forward-no-cache:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5175,11 +5239,11 @@ yyreduce: else cfg_parser->cfg->forwards->no_cache=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5179 "util/configparser.c" /* yacc.c:1646 */ +#line 5243 "util/configparser.c" /* yacc.c:1648 */ break; - case 434: -#line 2310 "./util/configparser.y" /* yacc.c:1646 */ + case 442: +#line 2346 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5188,11 +5252,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5192 "util/configparser.c" /* yacc.c:1646 */ +#line 5256 "util/configparser.c" /* yacc.c:1648 */ break; - case 435: -#line 2320 "./util/configparser.y" /* yacc.c:1646 */ + case 443: +#line 2356 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->auths->name) @@ -5201,52 +5265,52 @@ yyreduce: free(cfg_parser->cfg->auths->name); cfg_parser->cfg->auths->name = (yyvsp[0].str); } -#line 5205 "util/configparser.c" /* yacc.c:1646 */ +#line 5269 "util/configparser.c" /* yacc.c:1648 */ break; - case 436: -#line 2330 "./util/configparser.y" /* yacc.c:1646 */ + case 444: +#line 2366 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->auths->zonefile); cfg_parser->cfg->auths->zonefile = (yyvsp[0].str); } -#line 5215 "util/configparser.c" /* yacc.c:1646 */ +#line 5279 "util/configparser.c" /* yacc.c:1648 */ break; - case 437: -#line 2337 "./util/configparser.y" /* yacc.c:1646 */ + case 445: +#line 2373 "./util/configparser.y" /* yacc.c:1648 */ { 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 5225 "util/configparser.c" /* yacc.c:1646 */ +#line 5289 "util/configparser.c" /* yacc.c:1648 */ break; - case 438: -#line 2344 "./util/configparser.y" /* yacc.c:1646 */ + case 446: +#line 2380 "./util/configparser.y" /* yacc.c:1648 */ { 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 5235 "util/configparser.c" /* yacc.c:1646 */ +#line 5299 "util/configparser.c" /* yacc.c:1648 */ break; - case 439: -#line 2351 "./util/configparser.y" /* yacc.c:1646 */ + case 447: +#line 2387 "./util/configparser.y" /* yacc.c:1648 */ { 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 5246 "util/configparser.c" /* yacc.c:1646 */ +#line 5310 "util/configparser.c" /* yacc.c:1648 */ break; - case 440: -#line 2359 "./util/configparser.y" /* yacc.c:1646 */ + case 448: +#line 2395 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5255,11 +5319,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5259 "util/configparser.c" /* yacc.c:1646 */ +#line 5323 "util/configparser.c" /* yacc.c:1648 */ break; - case 441: -#line 2369 "./util/configparser.y" /* yacc.c:1646 */ + case 449: +#line 2405 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5268,11 +5332,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5272 "util/configparser.c" /* yacc.c:1646 */ +#line 5336 "util/configparser.c" /* yacc.c:1648 */ break; - case 442: -#line 2379 "./util/configparser.y" /* yacc.c:1646 */ + case 450: +#line 2415 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(fallback-enabled:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5281,11 +5345,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5285 "util/configparser.c" /* yacc.c:1646 */ +#line 5349 "util/configparser.c" /* yacc.c:1648 */ break; - case 443: -#line 2389 "./util/configparser.y" /* yacc.c:1646 */ + case 451: +#line 2425 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -5294,11 +5358,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 5298 "util/configparser.c" /* yacc.c:1646 */ +#line 5362 "util/configparser.c" /* yacc.c:1648 */ break; - case 444: -#line 2399 "./util/configparser.y" /* yacc.c:1646 */ + case 452: +#line 2435 "./util/configparser.y" /* yacc.c:1648 */ { 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 && @@ -5329,11 +5393,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 5333 "util/configparser.c" /* yacc.c:1646 */ +#line 5397 "util/configparser.c" /* yacc.c:1648 */ break; - case 445: -#line 2431 "./util/configparser.y" /* yacc.c:1646 */ + case 453: +#line 2467 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5342,33 +5406,33 @@ yyreduce: fatal_exit("out of memory adding per-view " "response-ip action"); } -#line 5346 "util/configparser.c" /* yacc.c:1646 */ +#line 5410 "util/configparser.c" /* yacc.c:1648 */ break; - case 446: -#line 2441 "./util/configparser.y" /* yacc.c:1646 */ + case 454: +#line 2477 "./util/configparser.y" /* yacc.c:1648 */ { 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 5357 "util/configparser.c" /* yacc.c:1646 */ +#line 5421 "util/configparser.c" /* yacc.c:1648 */ break; - case 447: -#line 2449 "./util/configparser.y" /* yacc.c:1646 */ + case 455: +#line 2485 "./util/configparser.y" /* yacc.c:1648 */ { 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 5368 "util/configparser.c" /* yacc.c:1646 */ +#line 5432 "util/configparser.c" /* yacc.c:1648 */ break; - case 448: -#line 2457 "./util/configparser.y" /* yacc.c:1646 */ + case 456: +#line 2493 "./util/configparser.y" /* yacc.c:1648 */ { char* ptr; OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -5382,11 +5446,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 5386 "util/configparser.c" /* yacc.c:1646 */ +#line 5450 "util/configparser.c" /* yacc.c:1648 */ break; - case 449: -#line 2472 "./util/configparser.y" /* yacc.c:1646 */ + case 457: +#line 2508 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5394,19 +5458,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5398 "util/configparser.c" /* yacc.c:1646 */ +#line 5462 "util/configparser.c" /* yacc.c:1648 */ break; - case 450: -#line 2481 "./util/configparser.y" /* yacc.c:1646 */ + case 458: +#line 2517 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 5406 "util/configparser.c" /* yacc.c:1646 */ +#line 5470 "util/configparser.c" /* yacc.c:1648 */ break; - case 461: -#line 2492 "./util/configparser.y" /* yacc.c:1646 */ + case 469: +#line 2528 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5415,11 +5479,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5419 "util/configparser.c" /* yacc.c:1646 */ +#line 5483 "util/configparser.c" /* yacc.c:1648 */ break; - case 462: -#line 2502 "./util/configparser.y" /* yacc.c:1646 */ + case 470: +#line 2538 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5427,79 +5491,79 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5431 "util/configparser.c" /* yacc.c:1646 */ +#line 5495 "util/configparser.c" /* yacc.c:1648 */ break; - case 463: -#line 2511 "./util/configparser.y" /* yacc.c:1646 */ + case 471: +#line 2547 "./util/configparser.y" /* yacc.c:1648 */ { 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 5441 "util/configparser.c" /* yacc.c:1646 */ +#line 5505 "util/configparser.c" /* yacc.c:1648 */ break; - case 464: -#line 2518 "./util/configparser.y" /* yacc.c:1646 */ + case 472: +#line 2554 "./util/configparser.y" /* yacc.c:1648 */ { 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 5451 "util/configparser.c" /* yacc.c:1646 */ +#line 5515 "util/configparser.c" /* yacc.c:1648 */ break; - case 465: -#line 2525 "./util/configparser.y" /* yacc.c:1646 */ + case 473: +#line 2561 "./util/configparser.y" /* yacc.c:1648 */ { 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 5461 "util/configparser.c" /* yacc.c:1646 */ +#line 5525 "util/configparser.c" /* yacc.c:1648 */ break; - case 466: -#line 2532 "./util/configparser.y" /* yacc.c:1646 */ + case 474: +#line 2568 "./util/configparser.y" /* yacc.c:1648 */ { 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 5471 "util/configparser.c" /* yacc.c:1646 */ +#line 5535 "util/configparser.c" /* yacc.c:1648 */ break; - case 467: -#line 2539 "./util/configparser.y" /* yacc.c:1646 */ + case 475: +#line 2575 "./util/configparser.y" /* yacc.c:1648 */ { 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 5481 "util/configparser.c" /* yacc.c:1646 */ +#line 5545 "util/configparser.c" /* yacc.c:1648 */ break; - case 468: -#line 2546 "./util/configparser.y" /* yacc.c:1646 */ + case 476: +#line 2582 "./util/configparser.y" /* yacc.c:1648 */ { 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 5491 "util/configparser.c" /* yacc.c:1646 */ +#line 5555 "util/configparser.c" /* yacc.c:1648 */ break; - case 469: -#line 2553 "./util/configparser.y" /* yacc.c:1646 */ + case 477: +#line 2589 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 5499 "util/configparser.c" /* yacc.c:1646 */ +#line 5563 "util/configparser.c" /* yacc.c:1648 */ break; - case 484: -#line 2570 "./util/configparser.y" /* yacc.c:1646 */ + case 492: +#line 2606 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5507,21 +5571,21 @@ yyreduce: else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5511 "util/configparser.c" /* yacc.c:1646 */ +#line 5575 "util/configparser.c" /* yacc.c:1648 */ break; - case 485: -#line 2579 "./util/configparser.y" /* yacc.c:1646 */ + case 493: +#line 2615 "./util/configparser.y" /* yacc.c:1648 */ { 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 5521 "util/configparser.c" /* yacc.c:1646 */ +#line 5585 "util/configparser.c" /* yacc.c:1648 */ break; - case 486: -#line 2586 "./util/configparser.y" /* yacc.c:1646 */ + case 494: +#line 2622 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5529,11 +5593,11 @@ yyreduce: else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5533 "util/configparser.c" /* yacc.c:1646 */ +#line 5597 "util/configparser.c" /* yacc.c:1648 */ break; - case 487: -#line 2595 "./util/configparser.y" /* yacc.c:1646 */ + case 495: +#line 2631 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5541,31 +5605,31 @@ yyreduce: else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5545 "util/configparser.c" /* yacc.c:1646 */ +#line 5609 "util/configparser.c" /* yacc.c:1648 */ break; - case 488: -#line 2604 "./util/configparser.y" /* yacc.c:1646 */ + case 496: +#line 2640 "./util/configparser.y" /* yacc.c:1648 */ { 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 5555 "util/configparser.c" /* yacc.c:1646 */ +#line 5619 "util/configparser.c" /* yacc.c:1648 */ break; - case 489: -#line 2611 "./util/configparser.y" /* yacc.c:1646 */ + case 497: +#line 2647 "./util/configparser.y" /* yacc.c:1648 */ { 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 5565 "util/configparser.c" /* yacc.c:1646 */ +#line 5629 "util/configparser.c" /* yacc.c:1648 */ break; - case 490: -#line 2618 "./util/configparser.y" /* yacc.c:1646 */ + case 498: +#line 2654 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -5574,11 +5638,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5578 "util/configparser.c" /* yacc.c:1646 */ +#line 5642 "util/configparser.c" /* yacc.c:1648 */ break; - case 491: -#line 2628 "./util/configparser.y" /* yacc.c:1646 */ + case 499: +#line 2664 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -5587,11 +5651,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5591 "util/configparser.c" /* yacc.c:1646 */ +#line 5655 "util/configparser.c" /* yacc.c:1648 */ break; - case 492: -#line 2638 "./util/configparser.y" /* yacc.c:1646 */ + case 500: +#line 2674 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -5600,11 +5664,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5604 "util/configparser.c" /* yacc.c:1646 */ +#line 5668 "util/configparser.c" /* yacc.c:1648 */ break; - case 493: -#line 2648 "./util/configparser.y" /* yacc.c:1646 */ + case 501: +#line 2684 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -5613,11 +5677,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5617 "util/configparser.c" /* yacc.c:1646 */ +#line 5681 "util/configparser.c" /* yacc.c:1648 */ break; - case 494: -#line 2658 "./util/configparser.y" /* yacc.c:1646 */ + case 502: +#line 2694 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -5626,11 +5690,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5630 "util/configparser.c" /* yacc.c:1646 */ +#line 5694 "util/configparser.c" /* yacc.c:1648 */ break; - case 495: -#line 2668 "./util/configparser.y" /* yacc.c:1646 */ + case 503: +#line 2704 "./util/configparser.y" /* yacc.c:1648 */ { 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) @@ -5639,29 +5703,29 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5643 "util/configparser.c" /* yacc.c:1646 */ +#line 5707 "util/configparser.c" /* yacc.c:1648 */ break; - case 496: -#line 2678 "./util/configparser.y" /* yacc.c:1646 */ + case 504: +#line 2714 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("\nP(python:)\n")); } -#line 5651 "util/configparser.c" /* yacc.c:1646 */ +#line 5715 "util/configparser.c" /* yacc.c:1648 */ break; - case 500: -#line 2687 "./util/configparser.y" /* yacc.c:1646 */ + case 508: +#line 2723 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = (yyvsp[0].str); } -#line 5661 "util/configparser.c" /* yacc.c:1646 */ +#line 5725 "util/configparser.c" /* yacc.c:1648 */ break; - case 501: -#line 2693 "./util/configparser.y" /* yacc.c:1646 */ + case 509: +#line 2729 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5670,21 +5734,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5674 "util/configparser.c" /* yacc.c:1646 */ +#line 5738 "util/configparser.c" /* yacc.c:1648 */ break; - case 502: -#line 2703 "./util/configparser.y" /* yacc.c:1646 */ + case 510: +#line 2739 "./util/configparser.y" /* yacc.c:1648 */ { 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 5684 "util/configparser.c" /* yacc.c:1646 */ +#line 5748 "util/configparser.c" /* yacc.c:1648 */ break; - case 503: -#line 2710 "./util/configparser.y" /* yacc.c:1646 */ + case 511: +#line 2746 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); validate_respip_action((yyvsp[0].str)); @@ -5692,30 +5756,30 @@ yyreduce: (yyvsp[-1].str), (yyvsp[0].str))) fatal_exit("out of memory adding response-ip"); } -#line 5696 "util/configparser.c" /* yacc.c:1646 */ +#line 5760 "util/configparser.c" /* yacc.c:1648 */ break; - case 504: -#line 2719 "./util/configparser.y" /* yacc.c:1646 */ + case 512: +#line 2755 "./util/configparser.y" /* yacc.c:1648 */ { 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 5707 "util/configparser.c" /* yacc.c:1646 */ +#line 5771 "util/configparser.c" /* yacc.c:1648 */ break; - case 505: -#line 2727 "./util/configparser.y" /* yacc.c:1646 */ + case 513: +#line 2763 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("\nP(dnscrypt:)\n")); } -#line 5715 "util/configparser.c" /* yacc.c:1646 */ +#line 5779 "util/configparser.c" /* yacc.c:1648 */ break; - case 518: -#line 2743 "./util/configparser.y" /* yacc.c:1646 */ + case 526: +#line 2779 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -5723,11 +5787,11 @@ yyreduce: else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 5727 "util/configparser.c" /* yacc.c:1646 */ +#line 5791 "util/configparser.c" /* yacc.c:1648 */ break; - case 519: -#line 2753 "./util/configparser.y" /* yacc.c:1646 */ + case 527: +#line 2789 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5735,21 +5799,21 @@ yyreduce: else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 5739 "util/configparser.c" /* yacc.c:1646 */ +#line 5803 "util/configparser.c" /* yacc.c:1648 */ break; - case 520: -#line 2762 "./util/configparser.y" /* yacc.c:1646 */ + case 528: +#line 2798 "./util/configparser.y" /* yacc.c:1648 */ { 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 5749 "util/configparser.c" /* yacc.c:1646 */ +#line 5813 "util/configparser.c" /* yacc.c:1648 */ break; - case 521: -#line 2769 "./util/configparser.y" /* yacc.c:1646 */ + case 529: +#line 2805 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str))) @@ -5757,21 +5821,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 5761 "util/configparser.c" /* yacc.c:1646 */ +#line 5825 "util/configparser.c" /* yacc.c:1648 */ break; - case 522: -#line 2778 "./util/configparser.y" /* yacc.c:1646 */ + case 530: +#line 2814 "./util/configparser.y" /* yacc.c:1648 */ { 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 5771 "util/configparser.c" /* yacc.c:1646 */ +#line 5835 "util/configparser.c" /* yacc.c:1648 */ break; - case 523: -#line 2785 "./util/configparser.y" /* yacc.c:1646 */ + case 531: +#line 2821 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str))); if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str))) @@ -5779,22 +5843,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 5783 "util/configparser.c" /* yacc.c:1646 */ +#line 5847 "util/configparser.c" /* yacc.c:1648 */ break; - case 524: -#line 2794 "./util/configparser.y" /* yacc.c:1646 */ + case 532: +#line 2830 "./util/configparser.y" /* yacc.c:1648 */ { 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 5794 "util/configparser.c" /* yacc.c:1646 */ +#line 5858 "util/configparser.c" /* yacc.c:1648 */ break; - case 525: -#line 2802 "./util/configparser.y" /* yacc.c:1646 */ + case 533: +#line 2838 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5806,22 +5870,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5810 "util/configparser.c" /* yacc.c:1646 */ +#line 5874 "util/configparser.c" /* yacc.c:1648 */ break; - case 526: -#line 2815 "./util/configparser.y" /* yacc.c:1646 */ + case 534: +#line 2851 "./util/configparser.y" /* yacc.c:1648 */ { 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 5821 "util/configparser.c" /* yacc.c:1646 */ +#line 5885 "util/configparser.c" /* yacc.c:1648 */ break; - case 527: -#line 2823 "./util/configparser.y" /* yacc.c:1646 */ + case 535: +#line 2859 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -5833,19 +5897,19 @@ yyreduce: } free((yyvsp[0].str)); } -#line 5837 "util/configparser.c" /* yacc.c:1646 */ - break; - - case 528: -#line 2836 "./util/configparser.y" /* yacc.c:1646 */ - { - OUTYY(("\nP(cachedb:)\n")); - } -#line 5845 "util/configparser.c" /* yacc.c:1646 */ +#line 5901 "util/configparser.c" /* yacc.c:1648 */ break; case 536: -#line 2846 "./util/configparser.y" /* yacc.c:1646 */ +#line 2872 "./util/configparser.y" /* yacc.c:1648 */ + { + OUTYY(("\nP(cachedb:)\n")); + } +#line 5909 "util/configparser.c" /* yacc.c:1648 */ + break; + + case 544: +#line 2882 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_CACHEDB OUTYY(("P(backend:%s)\n", (yyvsp[0].str))); @@ -5859,11 +5923,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5863 "util/configparser.c" /* yacc.c:1646 */ +#line 5927 "util/configparser.c" /* yacc.c:1648 */ break; - case 537: -#line 2861 "./util/configparser.y" /* yacc.c:1646 */ + case 545: +#line 2897 "./util/configparser.y" /* yacc.c:1648 */ { #ifdef USE_CACHEDB OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str))); @@ -5877,11 +5941,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5881 "util/configparser.c" /* yacc.c:1646 */ +#line 5945 "util/configparser.c" /* yacc.c:1648 */ break; - case 538: -#line 2876 "./util/configparser.y" /* yacc.c:1646 */ + case 546: +#line 2912 "./util/configparser.y" /* yacc.c:1648 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_server_host:%s)\n", (yyvsp[0].str))); @@ -5892,11 +5956,11 @@ yyreduce: free((yyvsp[0].str)); #endif } -#line 5896 "util/configparser.c" /* yacc.c:1646 */ +#line 5960 "util/configparser.c" /* yacc.c:1648 */ break; - case 539: -#line 2888 "./util/configparser.y" /* yacc.c:1646 */ + case 547: +#line 2924 "./util/configparser.y" /* yacc.c:1648 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) int port; @@ -5910,11 +5974,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5914 "util/configparser.c" /* yacc.c:1646 */ +#line 5978 "util/configparser.c" /* yacc.c:1648 */ break; - case 540: -#line 2903 "./util/configparser.y" /* yacc.c:1646 */ + case 548: +#line 2939 "./util/configparser.y" /* yacc.c:1648 */ { #if defined(USE_CACHEDB) && defined(USE_REDIS) OUTYY(("P(redis_timeout:%s)\n", (yyvsp[0].str))); @@ -5926,11 +5990,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 5930 "util/configparser.c" /* yacc.c:1646 */ +#line 5994 "util/configparser.c" /* yacc.c:1648 */ break; - case 541: -#line 2916 "./util/configparser.y" /* yacc.c:1646 */ + case 549: +#line 2952 "./util/configparser.y" /* yacc.c:1648 */ { OUTYY(("P(server_tcp_connection_limit:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if (atoi((yyvsp[0].str)) < 0) @@ -5940,11 +6004,11 @@ yyreduce: fatal_exit("out of memory adding tcp connection limit"); } } -#line 5944 "util/configparser.c" /* yacc.c:1646 */ +#line 6008 "util/configparser.c" /* yacc.c:1648 */ break; -#line 5948 "util/configparser.c" /* yacc.c:1646 */ +#line 6012 "util/configparser.c" /* yacc.c:1648 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -6172,7 +6236,7 @@ yyreturn: #endif return yyresult; } -#line 2926 "./util/configparser.y" /* yacc.c:1906 */ +#line 2962 "./util/configparser.y" /* yacc.c:1907 */ /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index b6585824a..db6e94714 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ +/* A Bison parser, made by GNU Bison 3.0.5. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -304,7 +304,11 @@ extern int yydebug; VAR_LOG_SERVFAIL = 514, VAR_DENY_ANY = 515, VAR_UNKNOWN_SERVER_TIME_LIMIT = 516, - VAR_LOG_TAG_QUERYREPLY = 517 + VAR_LOG_TAG_QUERYREPLY = 517, + VAR_STREAM_WAIT_SIZE = 518, + VAR_TLS_CIPHERS = 519, + VAR_TLS_CIPHERSUITES = 520, + VAR_TLS_SESSION_TICKET_KEYS = 521 }; #endif /* Tokens. */ @@ -568,17 +572,21 @@ extern int yydebug; #define VAR_DENY_ANY 515 #define VAR_UNKNOWN_SERVER_TIME_LIMIT 516 #define VAR_LOG_TAG_QUERYREPLY 517 +#define VAR_STREAM_WAIT_SIZE 518 +#define VAR_TLS_CIPHERS 519 +#define VAR_TLS_CIPHERSUITES 520 +#define VAR_TLS_SESSION_TICKET_KEYS 521 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 66 "./util/configparser.y" /* yacc.c:1909 */ +#line 66 "./util/configparser.y" /* yacc.c:1910 */ char* str; -#line 582 "util/configparser.h" /* yacc.c:1909 */ +#line 590 "util/configparser.h" /* yacc.c:1910 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index f01073d44..c7b916966 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -165,6 +165,8 @@ extern struct config_parser_state* cfg_parser; %token VAR_ALLOW_NOTIFY VAR_TLS_WIN_CERT VAR_TCP_CONNECTION_LIMIT %token VAR_FORWARD_NO_CACHE VAR_STUB_NO_CACHE VAR_LOG_SERVFAIL VAR_DENY_ANY %token VAR_UNKNOWN_SERVER_TIME_LIMIT VAR_LOG_TAG_QUERYREPLY +%token VAR_STREAM_WAIT_SIZE VAR_TLS_CIPHERS VAR_TLS_CIPHERSUITES +%token VAR_TLS_SESSION_TICKET_KEYS %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -263,7 +265,9 @@ content_server: server_num_threads | server_verbosity | server_port | server_tls_cert_bundle | server_tls_additional_port | server_low_rtt | server_fast_server_permil | server_fast_server_num | server_tls_win_cert | server_tcp_connection_limit | server_log_servfail | server_deny_any | - server_unknown_server_time_limit | server_log_tag_queryreply + server_unknown_server_time_limit | server_log_tag_queryreply | + server_stream_wait_size | server_tls_ciphers | + server_tls_ciphersuites | server_tls_session_ticket_keys ; stubstart: VAR_STUB_ZONE { @@ -818,6 +822,28 @@ server_tls_additional_port: VAR_TLS_ADDITIONAL_PORT STRING_ARG yyerror("out of memory"); } ; +server_tls_ciphers: VAR_TLS_CIPHERS STRING_ARG + { + OUTYY(("P(server_tls_ciphers:%s)\n", $2)); + free(cfg_parser->cfg->tls_ciphers); + cfg_parser->cfg->tls_ciphers = $2; + } + ; +server_tls_ciphersuites: VAR_TLS_CIPHERSUITES STRING_ARG + { + OUTYY(("P(server_tls_ciphersuites:%s)\n", $2)); + free(cfg_parser->cfg->tls_ciphersuites); + cfg_parser->cfg->tls_ciphersuites = $2; + } + ; +server_tls_session_ticket_keys: VAR_TLS_SESSION_TICKET_KEYS STRING_ARG + { + OUTYY(("P(server_tls_session_ticket_keys:%s)\n", $2)); + if(!cfg_strlist_append(&cfg_parser->cfg->tls_session_ticket_keys, + $2)) + yyerror("out of memory"); + } + ; server_use_systemd: VAR_USE_SYSTEMD STRING_ARG { OUTYY(("P(server_use_systemd:%s)\n", $2)); @@ -1127,6 +1153,14 @@ server_ip_freebind: VAR_IP_FREEBIND STRING_ARG free($2); } ; +server_stream_wait_size: VAR_STREAM_WAIT_SIZE STRING_ARG + { + OUTYY(("P(server_stream_wait_size:%s)\n", $2)); + if(!cfg_parse_memsize($2, &cfg_parser->cfg->stream_wait_size)) + yyerror("memory size expected"); + free($2); + } + ; server_edns_buffer_size: VAR_EDNS_BUFFER_SIZE STRING_ARG { OUTYY(("P(server_edns_buffer_size:%s)\n", $2)); @@ -1749,12 +1783,14 @@ server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG && strcmp($3, "always_refuse")!=0 && strcmp($3, "always_nxdomain")!=0 && strcmp($3, "noview")!=0 - && strcmp($3, "inform")!=0 && strcmp($3, "inform_deny")!=0) { + && strcmp($3, "inform")!=0 && strcmp($3, "inform_deny")!=0 + && strcmp($3, "inform_redirect") != 0) { yyerror("local-zone type: expected static, deny, " "refuse, redirect, transparent, " "typetransparent, inform, inform_deny, " - "always_transparent, always_refuse, " - "always_nxdomain, noview or nodefault"); + "inform_redirect, always_transparent, " + "always_refuse, always_nxdomain, noview " + "or nodefault"); free($2); free($3); } else if(strcmp($3, "nodefault")==0) { diff --git a/util/edns.c b/util/edns.c index 2c4e4a1fd..d19952df0 100644 --- a/util/edns.c +++ b/util/edns.c @@ -40,7 +40,7 @@ */ #include "config.h" - +#include "util/edns.h" #include "util/config_file.h" #include "util/netevent.h" #include "util/regional.h" diff --git a/util/mini_event.c b/util/mini_event.c index 14e9efe47..faadf1a23 100644 --- a/util/mini_event.c +++ b/util/mini_event.c @@ -41,6 +41,7 @@ */ #include "config.h" +#include "util/mini_event.h" #ifdef HAVE_TIME_H #include #endif @@ -48,7 +49,6 @@ #if defined(USE_MINI_EVENT) && !defined(USE_WINSOCK) #include -#include "util/mini_event.h" #include "util/fptr_wlist.h" /** compare events in tree, based on timevalue, ptr for uniqueness */ diff --git a/util/net_help.c b/util/net_help.c index 0393ff9a1..a6c3fd5cc 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -43,11 +43,14 @@ #include "util/data/dname.h" #include "util/module.h" #include "util/regional.h" +#include "util/config_file.h" #include "sldns/parseutil.h" #include "sldns/wire2str.h" #include #ifdef HAVE_OPENSSL_SSL_H #include +#include +#include #endif #ifdef HAVE_OPENSSL_ERR_H #include @@ -70,6 +73,12 @@ int RRSET_ROUNDROBIN = 0; /** log tag queries with name instead of 'info' for filtering */ int LOG_TAG_QUERYREPLY = 0; +static struct tls_session_ticket_key { + unsigned char *key_name; + unsigned char *aes_key; + unsigned char *hmac_key; +} *ticket_keys; + /* returns true is string addr is an ip6 specced address */ int str_is_ip6(const char* str) @@ -793,6 +802,16 @@ void* listen_sslctx_create(char* key, char* pem, char* verifypem) log_crypto_err("could not SSL_CTX_new"); return NULL; } + if(!key || key[0] == 0) { + log_err("error: no tls-service-key file specified"); + SSL_CTX_free(ctx); + return NULL; + } + if(!pem || pem[0] == 0) { + log_err("error: no tls-service-pem file specified"); + SSL_CTX_free(ctx); + return NULL; + } if(!listen_sslctx_setup(ctx)) { SSL_CTX_free(ctx); return NULL; @@ -1040,11 +1059,19 @@ void* outgoing_ssl_fd(void* sslctx, int fd) static lock_basic_type *ub_openssl_locks = NULL; /** callback that gets thread id for openssl */ +#ifdef HAVE_CRYPTO_THREADID_SET_CALLBACK +static void +ub_crypto_id_cb(CRYPTO_THREADID *id) +{ + CRYPTO_THREADID_set_numeric(id, (unsigned long)log_thread_get()); +} +#else static unsigned long ub_crypto_id_cb(void) { return (unsigned long)log_thread_get(); } +#endif static void ub_crypto_lock_cb(int mode, int type, const char *ATTR_UNUSED(file), @@ -1069,7 +1096,11 @@ int ub_openssl_lock_init(void) for(i=0; inext) { + s++; + } + keys = calloc(s, sizeof(struct tls_session_ticket_key)); + memset(keys, 0, s*sizeof(*keys)); + ticket_keys = keys; + + for(p = tls_session_ticket_keys; p; p = p->next) { + size_t n; + unsigned char *data = (unsigned char *)malloc(80); + FILE *f = fopen(p->str, "r"); + if(!f) { + log_err("could not read tls-session-ticket-key %s: %s", p->str, strerror(errno)); + free(data); + return 0; + } + n = fread(data, 1, 80, f); + fclose(f); + + if(n != 80) { + log_err("tls-session-ticket-key %s is %d bytes, must be 80 bytes", p->str, (int)n); + free(data); + return 0; + } + verbose(VERB_OPS, "read tls-session-ticket-key: %s", p->str); + + keys->key_name = data; + keys->aes_key = data + 16; + keys->hmac_key = data + 48; + keys++; + } + /* terminate array with NULL key name entry */ + keys->key_name = NULL; + if(SSL_CTX_set_tlsext_ticket_key_cb(sslctx, tls_session_ticket_key_cb) == 0) { + log_err("no support for TLS session ticket"); + return 0; + } + return 1; +#else + (void)sslctx; + (void)tls_session_ticket_keys; + return 0; +#endif + +} + +int tls_session_ticket_key_cb(void *ATTR_UNUSED(sslctx), unsigned char* key_name, unsigned char* iv, void *evp_sctx, void *hmac_ctx, int enc) +{ +#ifdef HAVE_SSL + const EVP_MD *digest; + const EVP_CIPHER *cipher; + int evp_cipher_length; + digest = EVP_sha256(); + cipher = EVP_aes_256_cbc(); + evp_cipher_length = EVP_CIPHER_iv_length(cipher); + if( enc == 1 ) { + /* encrypt */ + verbose(VERB_CLIENT, "start session encrypt"); + memcpy(key_name, ticket_keys->key_name, 16); + if (RAND_bytes(iv, evp_cipher_length) != 1) { + verbose(VERB_CLIENT, "RAND_bytes failed"); + return -1; + } + if (EVP_EncryptInit_ex(evp_sctx, cipher, NULL, ticket_keys->aes_key, iv) != 1) { + verbose(VERB_CLIENT, "EVP_EncryptInit_ex failed"); + return -1; + } + if (HMAC_Init_ex(hmac_ctx, ticket_keys->hmac_key, 32, digest, NULL) != 1) { + verbose(VERB_CLIENT, "HMAC_Init_ex failed"); + return -1; + } + return 1; + } else if (enc == 0) { + /* decrypt */ + struct tls_session_ticket_key *key; + verbose(VERB_CLIENT, "start session decrypt"); + for(key = ticket_keys; key->key_name != NULL; key++) { + if (!memcmp(key_name, key->key_name, 16)) { + verbose(VERB_CLIENT, "Found session_key"); + break; + } + } + if(key->key_name == NULL) { + verbose(VERB_CLIENT, "Not found session_key"); + return 0; + } + + if (HMAC_Init_ex(hmac_ctx, key->hmac_key, 32, digest, NULL) != 1) { + verbose(VERB_CLIENT, "HMAC_Init_ex failed"); + return -1; + } + if (EVP_DecryptInit_ex(evp_sctx, cipher, NULL, key->aes_key, iv) != 1) { + log_err("EVP_DecryptInit_ex failed"); + return -1; + } + + return (key == ticket_keys) ? 1 : 2; + } + return -1; +#else + (void)key_name; + (void)iv; + (void)evp_sctx; + (void)hmac_ctx; + (void)enc; + return 0; +#endif +} + +void +listen_sslctx_delete_ticket_keys(void) +{ + struct tls_session_ticket_key *key; + if(!ticket_keys) return; + for(key = ticket_keys; key->key_name != NULL; key++) { + memset(key->key_name, 0xdd, 80); /* wipe key data from memory*/ + free(key->key_name); + } + free(ticket_keys); + ticket_keys = NULL; +} diff --git a/util/net_help.h b/util/net_help.h index 0ca0f3f7d..0b197fbdd 100644 --- a/util/net_help.h +++ b/util/net_help.h @@ -44,6 +44,7 @@ #include "util/log.h" struct sock_list; struct regional; +struct config_strlist; /** DNS constants for uint16_t style flag manipulation. host byteorder. * 1 1 1 1 1 1 @@ -437,4 +438,30 @@ int ub_openssl_lock_init(void); */ void ub_openssl_lock_delete(void); +/** + * setup TLS session ticket + * @param sslctx: the SSL_CTX to use (from connect_sslctx_create()) + * @param tls_session_ticket_keys: TLS ticket secret filenames + * @return false on failure (alloc failure). + */ +int listen_sslctx_setup_ticket_keys(void* sslctx, + struct config_strlist* tls_session_ticket_keys); + +/** + * callback TLS session ticket encrypt and decrypt + * For use with SSL_CTX_set_tlsext_ticket_key_cb + * @param s: the SSL_CTX to use (from connect_sslctx_create()) + * @param key_name: secret name, 16 bytes + * @param iv: up to EVP_MAX_IV_LENGTH. + * @param evp_ctx: the evp cipher context, function sets this. + * @param hmac_ctx: the hmax context, function sets this. + * @param enc: 1 is encrypt, 0 is decrypt + * @return 0 on no ticket, 1 for okay, and 2 for okay but renew the ticket + * (the ticket is decrypt only). and <0 for failures. + */ +int tls_session_ticket_key_cb(void *s, unsigned char* key_name,unsigned char* iv, void *evp_ctx, void *hmac_ctx, int enc); + +/** Free memory used for TLS session ticket keys */ +void listen_sslctx_delete_ticket_keys(void); + #endif /* NET_HELP_H */ diff --git a/util/netevent.c b/util/netevent.c index 373538041..5d9422836 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -50,6 +50,7 @@ #include "sldns/str2wire.h" #include "dnstap/dnstap.h" #include "dnscrypt/dnscrypt.h" +#include "services/listen_dnsport.h" #ifdef HAVE_OPENSSL_SSL_H #include #endif @@ -150,7 +151,8 @@ struct internal_signal { /** create a tcp handler with a parent */ static struct comm_point* comm_point_create_tcp_handler( struct comm_base *base, struct comm_point* parent, size_t bufsize, - comm_point_callback_type* callback, void* callback_arg); + struct sldns_buffer* spoolbuf, comm_point_callback_type* callback, + void* callback_arg); /* -------- End of local definitions -------- */ @@ -176,7 +178,7 @@ comm_base_create(int sigs) } ub_comm_base_now(b); ub_get_event_sys(b->eb->base, &evnm, &evsys, &evmethod); - verbose(VERB_ALGO, "%s %s user %s method.", evnm, evsys, evmethod); + verbose(VERB_ALGO, "%s %s uses %s method.", evnm, evsys, evmethod); return b; } @@ -987,8 +989,12 @@ tcp_callback_writer(struct comm_point* c) c->tcp_is_reading = 1; c->tcp_byte_count = 0; /* switch from listening(write) to listening(read) */ - comm_point_stop_listening(c); - comm_point_start_listening(c, -1, -1); + 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, -1); + } } /** do the callback when reading is done */ @@ -1000,11 +1006,15 @@ tcp_callback_reader(struct comm_point* c) if(c->tcp_do_toggle_rw) c->tcp_is_reading = 0; c->tcp_byte_count = 0; - if(c->type == comm_tcp) - comm_point_stop_listening(c); - fptr_ok(fptr_whitelist_comm_point(c->callback)); - if( (*c->callback)(c, c->cb_arg, NETEVENT_NOERROR, &c->repinfo) ) { - comm_point_start_listening(c, -1, c->tcp_timeout_msec); + if(c->tcp_req_info) { + tcp_req_info_handle_readdone(c->tcp_req_info); + } else { + if(c->type == comm_tcp) + comm_point_stop_listening(c); + fptr_ok(fptr_whitelist_comm_point(c->callback)); + if( (*c->callback)(c, c->cb_arg, NETEVENT_NOERROR, &c->repinfo) ) { + comm_point_start_listening(c, -1, c->tcp_timeout_msec); + } } } @@ -1163,6 +1173,8 @@ ssl_handle_read(struct comm_point* c) c->tcp_byte_count))) <= 0) { int want = SSL_get_error(c->ssl, r); if(want == SSL_ERROR_ZERO_RETURN) { + if(c->tcp_req_info) + return tcp_req_info_handle_read_close(c->tcp_req_info); return 0; /* shutdown, closed */ } else if(want == SSL_ERROR_WANT_READ) { ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ); @@ -1205,6 +1217,8 @@ ssl_handle_read(struct comm_point* c) if(r <= 0) { int want = SSL_get_error(c->ssl, r); if(want == SSL_ERROR_ZERO_RETURN) { + if(c->tcp_req_info) + return tcp_req_info_handle_read_close(c->tcp_req_info); return 0; /* shutdown, closed */ } else if(want == SSL_ERROR_WANT_READ) { ub_winsock_tcp_wouldblock(c->ev->ev, UB_EV_READ); @@ -1365,9 +1379,11 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok) /* read length bytes */ r = recv(fd,(void*)sldns_buffer_at(c->buffer,c->tcp_byte_count), sizeof(uint16_t)-c->tcp_byte_count, 0); - if(r == 0) + if(r == 0) { + if(c->tcp_req_info) + return tcp_req_info_handle_read_close(c->tcp_req_info); return 0; - else if(r == -1) { + } else if(r == -1) { #ifndef USE_WINSOCK if(errno == EINTR || errno == EAGAIN) return 1; @@ -1416,6 +1432,8 @@ comm_point_tcp_handle_read(int fd, struct comm_point* c, int short_ok) r = recv(fd, (void*)sldns_buffer_current(c->buffer), sldns_buffer_remaining(c->buffer), 0); if(r == 0) { + if(c->tcp_req_info) + return tcp_req_info_handle_read_close(c->tcp_req_info); return 0; } else if(r == -1) { #ifndef USE_WINSOCK @@ -1669,6 +1687,29 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) return 1; } +/** read again to drain buffers when there could be more to read */ +static void +tcp_req_info_read_again(int fd, struct comm_point* c) +{ + while(c->tcp_req_info->read_again) { + int r; + c->tcp_req_info->read_again = 0; + if(c->tcp_is_reading) + r = comm_point_tcp_handle_read(fd, c, 0); + else r = comm_point_tcp_handle_write(fd, c); + if(!r) { + 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) { @@ -1698,6 +1739,7 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) #endif if(event&UB_EV_READ) { + int has_tcpq = (c->tcp_req_info != NULL); if(!comm_point_tcp_handle_read(fd, c, 0)) { reclaim_tcp_handler(c); if(!c->tcp_do_close) { @@ -1707,9 +1749,12 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) NETEVENT_CLOSED, NULL); } } + if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again) + tcp_req_info_read_again(fd, c); return; } if(event&UB_EV_WRITE) { + int has_tcpq = (c->tcp_req_info != NULL); if(!comm_point_tcp_handle_write(fd, c)) { reclaim_tcp_handler(c); if(!c->tcp_do_close) { @@ -1719,6 +1764,8 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg) NETEVENT_CLOSED, NULL); } } + if(has_tcpq && c->tcp_req_info && c->tcp_req_info->read_again) + tcp_req_info_read_again(fd, c); return; } if(event&UB_EV_TIMEOUT) { @@ -2523,7 +2570,8 @@ comm_point_create_udp_ancil(struct comm_base *base, int fd, static struct comm_point* comm_point_create_tcp_handler(struct comm_base *base, struct comm_point* parent, size_t bufsize, - comm_point_callback_type* callback, void* callback_arg) + struct sldns_buffer* spoolbuf, comm_point_callback_type* callback, + void* callback_arg) { struct comm_point* c = (struct comm_point*)calloc(1, sizeof(struct comm_point)); @@ -2579,6 +2627,20 @@ comm_point_create_tcp_handler(struct comm_base *base, c->repinfo.c = c; c->callback = callback; c->cb_arg = callback_arg; + if(spoolbuf) { + c->tcp_req_info = tcp_req_info_create(spoolbuf); + if(!c->tcp_req_info) { + log_err("could not create tcp commpoint"); + sldns_buffer_free(c->buffer); + free(c->timeout); + free(c->ev); + free(c); + return NULL; + } + c->tcp_req_info->cp = c; + c->tcp_do_close = 1; + c->tcp_do_toggle_rw = 0; + } /* add to parent free list */ c->tcp_free = parent->tcp_free; parent->tcp_free = c; @@ -2590,6 +2652,9 @@ comm_point_create_tcp_handler(struct comm_base *base, { log_err("could not basetset tcphdl event"); parent->tcp_free = c->tcp_free; + tcp_req_info_delete(c->tcp_req_info); + sldns_buffer_free(c->buffer); + free(c->timeout); free(c->ev); free(c); return NULL; @@ -2600,7 +2665,8 @@ comm_point_create_tcp_handler(struct comm_base *base, struct comm_point* comm_point_create_tcp(struct comm_base *base, int fd, int num, int idle_timeout, struct tcl_list* tcp_conn_limit, size_t bufsize, - comm_point_callback_type* callback, void* callback_arg) + struct sldns_buffer* spoolbuf, comm_point_callback_type* callback, + void* callback_arg) { struct comm_point* c = (struct comm_point*)calloc(1, sizeof(struct comm_point)); @@ -2667,7 +2733,7 @@ comm_point_create_tcp(struct comm_base *base, int fd, int num, /* now prealloc the tcp handlers */ for(i=0; itcp_handlers[i] = comm_point_create_tcp_handler(base, - c, bufsize, callback, callback_arg); + c, bufsize, spoolbuf, callback, callback_arg); if(!c->tcp_handlers[i]) { comm_point_delete(c); return NULL; @@ -2949,6 +3015,8 @@ comm_point_close(struct comm_point* c) } } tcl_close_connection(c->tcl_addr); + if(c->tcp_req_info) + tcp_req_info_clear(c->tcp_req_info); /* close fd after removing from event lists, or epoll.. is messed up */ if(c->fd != -1 && !c->do_not_close) { if(c->type == comm_tcp || c->type == comm_http) { @@ -2992,6 +3060,9 @@ comm_point_delete(struct comm_point* c) sldns_buffer_free(c->dnscrypt_buffer); } #endif + if(c->tcp_req_info) { + tcp_req_info_delete(c->tcp_req_info); + } } ub_event_free(c->ev->ev); free(c->ev); @@ -3032,8 +3103,12 @@ comm_point_send_reply(struct comm_reply *repinfo) dt_msg_send_client_response(repinfo->c->tcp_parent->dtenv, &repinfo->addr, repinfo->c->type, repinfo->c->buffer); #endif - comm_point_start_listening(repinfo->c, -1, - repinfo->c->tcp_timeout_msec); + if(repinfo->c->tcp_req_info) { + tcp_req_info_send_reply(repinfo->c->tcp_req_info); + } else { + comm_point_start_listening(repinfo->c, -1, + repinfo->c->tcp_timeout_msec); + } } } @@ -3046,6 +3121,8 @@ comm_point_drop_reply(struct comm_reply* repinfo) log_assert(repinfo->c->type != comm_tcp_accept); if(repinfo->c->type == comm_udp) return; + if(repinfo->c->tcp_req_info) + repinfo->c->tcp_req_info->is_drop = 1; reclaim_tcp_handler(repinfo->c); } diff --git a/util/netevent.h b/util/netevent.h index f6b6af688..d80c72b33 100644 --- a/util/netevent.h +++ b/util/netevent.h @@ -268,6 +268,9 @@ struct comm_point { /** the entry for the connection. */ struct tcl_addr* tcl_addr; + /** the structure to keep track of open requests on this channel */ + struct tcp_req_info* tcp_req_info; + #ifdef USE_MSG_FASTOPEN /** used to track if the sendto() call should be done when using TFO. */ int tcp_do_fastopen; @@ -455,6 +458,8 @@ struct comm_point* comm_point_create_udp_ancil(struct comm_base* base, * @param idle_timeout: TCP idle timeout in ms. * @param tcp_conn_limit: TCP connection limit info. * @param bufsize: size of buffer to create for handlers. + * @param spoolbuf: shared spool buffer for tcp_req_info structures. + * or NULL to not create those structures in the tcp handlers. * @param callback: callback function pointer for TCP handlers. * @param callback_arg: will be passed to your callback function. * @return: returns the TCP listener commpoint. You can find the @@ -464,7 +469,8 @@ struct comm_point* comm_point_create_udp_ancil(struct comm_base* base, */ struct comm_point* comm_point_create_tcp(struct comm_base* base, int fd, int num, int idle_timeout, struct tcl_list* tcp_conn_limit, - size_t bufsize, comm_point_callback_type* callback, void* callback_arg); + size_t bufsize, struct sldns_buffer* spoolbuf, + comm_point_callback_type* callback, void* callback_arg); /** * Create an outgoing TCP commpoint. No file descriptor is opened, left at -1.