diff --git a/Makefile.in b/Makefile.in index 997282e44..5205a9a6a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,6 +104,7 @@ iterator/iter_scrub.c iterator/iter_utils.c services/listen_dnsport.c \ services/localzone.c services/mesh.c services/modstack.c services/view.c \ services/outbound_list.c services/outside_network.c util/alloc.c \ util/config_file.c util/configlexer.c util/configparser.c \ +util/shm_side/shm_main.c \ util/fptr_wlist.c util/locks.c util/log.c util/mini_event.c util/module.c \ util/netevent.c util/net_help.c util/random.c util/rbtree.c util/regional.c \ util/rtt.c util/storage/dnstree.c util/storage/lookup3.c \ @@ -156,7 +157,7 @@ UNITTEST_OBJ_LINK=$(UNITTEST_OBJ) worker_cb.lo $(COMMON_OBJ) $(SLDNS_OBJ) \ $(COMPAT_OBJ) DAEMON_SRC=daemon/acl_list.c daemon/cachedump.c daemon/daemon.c \ daemon/remote.c daemon/stats.c daemon/unbound.c daemon/worker.c @WIN_DAEMON_SRC@ -DAEMON_OBJ=acl_list.lo cachedump.lo daemon.lo remote.lo stats.lo unbound.lo \ +DAEMON_OBJ=acl_list.lo cachedump.lo daemon.lo 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@ @@ -180,7 +181,7 @@ daemon/worker.c daemon/acl_list.c daemon/daemon.c daemon/stats.c \ testcode/replay.c testcode/fake_event.c TESTBOUND_OBJ=testbound.lo replay.lo fake_event.lo TESTBOUND_OBJ_LINK=$(TESTBOUND_OBJ) testpkts.lo worker.lo acl_list.lo \ -daemon.lo stats.lo $(COMMON_OBJ_WITHOUT_NETCALL) ub_event.lo $(SLDNS_OBJ) \ +daemon.lo stats.lo shm_main.lo $(COMMON_OBJ_WITHOUT_NETCALL) ub_event.lo $(SLDNS_OBJ) \ $(COMPAT_OBJ) LOCKVERIFY_SRC=testcode/lock_verify.c LOCKVERIFY_OBJ=lock_verify.lo @@ -751,6 +752,10 @@ alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h $(srcdi $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h +shm_main.lo shm_main.o: $(srcdir)/util/shm_side/shm_main.c config.h $(srcdir)/daemon/worker.h $(srcdir)/daemon/daemon.h \ + $(srcdir)/daemon/stats.h $(srcdir)/util/config_file.h $(srcdir)/validator/validator.h $(srcdir)/services/mesh.h \ + $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/log.h\ + $(srcdir)/util/shm_side/shm_main.h config_file.lo config_file.o: $(srcdir)/util/config_file.c config.h $(srcdir)/util/log.h \ $(srcdir)/util/configyyrename.h $(srcdir)/util/config_file.h util/configparser.h \ $(srcdir)/util/net_help.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ @@ -986,7 +991,7 @@ daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/util/random.h \ - $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h + $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h $(srcdir)/util/shm_side/shm_main.h remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h \ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \ @@ -1038,7 +1043,7 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(sr $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h \ $(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/libunbound/libworker.h + $(srcdir)/libunbound/libworker.h $(srcdir)/util/shm_side/shm_main.h testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \ $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h \ $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c \ @@ -1084,7 +1089,7 @@ daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/services/view.h $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/util/random.h \ - $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h + $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h $(srcdir)/util/shm_side/shm_main.h stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ diff --git a/config.h.in b/config.h.in index 3a4f47b5c..4cb48f827 100644 --- a/config.h.in +++ b/config.h.in @@ -385,6 +385,9 @@ /* Define to 1 if you have the `SHA512_Update' function. */ #undef HAVE_SHA512_UPDATE +/* Define to 1 if you have the `shmget' function. */ +#undef HAVE_SHMGET + /* Define to 1 if you have the `sigprocmask' function. */ #undef HAVE_SIGPROCMASK @@ -457,6 +460,9 @@ /* Define to 1 if systemd should be used */ #undef HAVE_SYSTEMD +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IPC_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H @@ -466,6 +472,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SHA2_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SHM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H diff --git a/configure b/configure index b3add6ec2..772655782 100755 --- a/configure +++ b/configure @@ -14423,7 +14423,7 @@ CC=$lt_save_CC # 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 +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/ipc.h sys/shm.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default @@ -19252,7 +19252,7 @@ if test "$ac_res" != no; then : fi -for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync +for ac_func in tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget 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" diff --git a/configure.ac b/configure.ac index f38122ec4..44f126295 100644 --- a/configure.ac +++ b/configure.ac @@ -305,7 +305,7 @@ AC_CHECK_TOOL(STRIP, strip) ACX_LIBTOOL_C_ONLY # 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],,, [AC_INCLUDES_DEFAULT]) +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/ipc.h sys/shm.h],,, [AC_INCLUDES_DEFAULT]) # check for types. # Using own tests for int64* because autoconf builtin only give 32bit. @@ -1149,7 +1149,7 @@ AC_INCLUDES_DEFAULT #endif ]) AC_SEARCH_LIBS([setusercontext], [util]) -AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync]) +AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam endpwent getrlimit setrlimit setsid chroot kill chown sleep usleep random srandom recvmsg sendmsg writev socketpair glob initgroups strftime localtime_r setusercontext _beginthreadex endservent endprotoent fsync shmget]) AC_CHECK_FUNCS([setresuid],,[AC_CHECK_FUNCS([setreuid])]) AC_CHECK_FUNCS([setresgid],,[AC_CHECK_FUNCS([setregid])]) diff --git a/daemon/daemon.c b/daemon/daemon.c index 4cae43800..11a887c40 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -73,6 +73,7 @@ #include "util/log.h" #include "util/config_file.h" #include "util/data/msgreply.h" +#include "util/shm_side/shm_main.h" #include "util/storage/lookup3.h" #include "util/storage/slabhash.h" #include "services/listen_dnsport.h" @@ -605,6 +606,9 @@ daemon_fork(struct daemon* daemon) #endif signal_handling_playback(daemon->workers[0]); + if (!shm_main_init(daemon)) + log_warn("SHM has failed"); + /* Start resolver service on main thread. */ #ifdef HAVE_SYSTEMD sd_notify(0, "READY=1"); @@ -619,6 +623,9 @@ daemon_fork(struct daemon* daemon) /* we exited! a signal happened! Stop other threads */ daemon_stop_others(daemon); + /* Shutdown SHM */ + shm_main_shutdown(daemon); + daemon->need_to_exit = daemon->workers[0]->need_to_exit; } diff --git a/daemon/daemon.h b/daemon/daemon.h index 9177c0fd6..dc39a9cbd 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -56,6 +56,7 @@ struct local_zones; struct views; struct ub_randstate; struct daemon_remote; +struct shm_main_info; #include "dnstap/dnstap_config.h" #ifdef USE_DNSTAP @@ -118,6 +119,7 @@ struct daemon { /** the dnstap environment master value, copied and changed by threads*/ struct dt_env* dtenv; #endif + struct shm_main_info* shm_info; }; /** diff --git a/daemon/worker.c b/daemon/worker.c index b23bbab95..a6d5f1a37 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -72,6 +72,7 @@ #include "libunbound/context.h" #include "libunbound/libworker.h" #include "sldns/sbuffer.h" +#include "util/shm_side/shm_main.h" #ifdef HAVE_SYS_TYPES_H # include @@ -1169,6 +1170,10 @@ void worker_stat_timer_cb(void* arg) server_stats_log(&worker->stats, worker, worker->thread_num); mesh_stats(worker->env.mesh, "mesh has"); worker_mem_report(worker, NULL); + /* SHM is enabled, process data to SHM */ + if (worker->daemon->cfg->shm_enable) { + shm_main_run(worker); + } if(!worker->daemon->cfg->stat_cumulative) { worker_stats_clear(worker); } diff --git a/doc/Changelog b/doc/Changelog index 881bbaf25..28b86ba20 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,9 @@ 23 February 2017: Wouter - Fix doc/CNAME-basedRedirectionDesignNotes.pdf zone static to redirect. + - Patch from Luiz Fernando Softov for Stats Shared Memory. + - unbound-control stats_shm command prints stats using shared memory, + which uses less cpu. 22 February 2017: Wouter - Fix #1224: Fix that defaults should not fall back to "Program Files diff --git a/doc/example.conf.in b/doc/example.conf.in index 1f787016a..552e2640a 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -19,6 +19,14 @@ server: # Set to "" or 0 to disable. Default is disabled. # statistics-interval: 0 + # enable shm for stats, default no. if you enable also enable + # statistics-interval, every time it also writes stats to the + # shared memory segment keyed with shm-key. + # shm-enable: no + + # shm for stats uses this key, and key+1 for the shared mem segment. + # shm-key: 11777 + # enable cumulative statistics, without clearing them after printing. # statistics-cumulative: no diff --git a/sldns/wire2str.c b/sldns/wire2str.c index 0ccf3492d..b2ca6192c 100644 --- a/sldns/wire2str.c +++ b/sldns/wire2str.c @@ -273,6 +273,12 @@ int sldns_wire2str_rcode_buf(int rcode, char* s, size_t slen) return sldns_wire2str_rcode_print(&s, &slen, rcode); } +int sldns_wire2str_opcode_buf(int opcode, char* s, size_t slen) +{ + /* use arguments as temporary variables */ + return sldns_wire2str_opcode_print(&s, &slen, opcode); +} + int sldns_wire2str_dname_buf(uint8_t* d, size_t dlen, char* s, size_t slen) { /* use arguments as temporary variables */ diff --git a/sldns/wire2str.h b/sldns/wire2str.h index c477f0661..b92fb744a 100644 --- a/sldns/wire2str.h +++ b/sldns/wire2str.h @@ -441,6 +441,17 @@ int sldns_wire2str_class_buf(uint16_t rrclass, char* str, size_t len); */ int sldns_wire2str_rcode_buf(int rcode, char* str, size_t len); +/** + * Convert host format opcode to a string. 'QUERY', 'NOTIFY', 'UPDATE'. + * With user buffer. + * @param rcode: rcode as integer in host order + * @param str: the string to write to. + * @param len: length of str. + * @return the number of characters for this element, excluding zerobyte. + * Is larger or equal than str_len if output was truncated. + */ +int sldns_wire2str_opcode_buf(int opcode, char* str, size_t len); + /** * Convert wire dname to a string, "example.com.". With user buffer. * @param dname: the dname in uncompressed wireformat. diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c index af4b45ee7..ca9de3268 100644 --- a/smallapp/unbound-control.c +++ b/smallapp/unbound-control.c @@ -58,7 +58,17 @@ #include "util/config_file.h" #include "util/locks.h" #include "util/net_help.h" +#include "util/shm_side/shm_main.h" +#include "daemon/stats.h" +#include "sldns/wire2str.h" +#include "sldns/pkthdr.h" +#ifdef HAVE_SYS_IPC_H +#include "sys/ipc.h" +#endif +#ifdef HAVE_SYS_SHM_H +#include "sys/shm.h" +#endif #ifdef HAVE_SYS_UN_H #include #endif @@ -81,6 +91,9 @@ usage(void) printf(" (this flushes data, stats, requestlist)\n"); printf(" stats print statistics\n"); printf(" stats_noreset peek at statistics\n"); +#ifdef HAVE_SHMGET + printf(" stats_shm print statistics using shm\n"); +#endif printf(" status display status of server\n"); printf(" verbosity change logging detail\n"); printf(" log_reopen close and open the logfile\n"); @@ -138,6 +151,246 @@ usage(void) exit(1); } +#ifdef HAVE_SHMGET +/** what to put on statistics lines between var and value, ": " or "=" */ +#define SQ "=" +/** if true, inhibits a lot of =0 lines from the stats output */ +static const int inhibit_zero = 1; +/** divide sum of timers to get average */ +static void +timeval_divide(struct timeval* avg, const struct timeval* sum, size_t d) +{ +#ifndef S_SPLINT_S + size_t leftover; + if(d == 0) { + avg->tv_sec = 0; + avg->tv_usec = 0; + return; + } + avg->tv_sec = sum->tv_sec / d; + avg->tv_usec = sum->tv_usec / d; + /* handle fraction from seconds divide */ + leftover = sum->tv_sec - avg->tv_sec*d; + avg->tv_usec += (leftover*1000000)/d; +#endif +} + +/** print unsigned long stats value */ +#define PR_UL_NM(str, var) printf("%s."str SQ"%lu\n", nm, (unsigned long)(var)); +#define PR_UL(str, var) printf(str SQ"%lu\n", (unsigned long)(var)); +#define PR_UL_SUB(str, nm, var) printf(str".%s"SQ"%lu\n", nm, (unsigned long)(var)); +#define PR_TIMEVAL(str, var) printf(str SQ ARG_LL "d.%6.6d\n", \ + (long long)var.tv_sec, (unsigned)var.tv_usec); +#define PR_LL(str, var) printf(str SQ ARG_LL"d\n", (long long)(var)); + +/** print stat block */ +static void pr_stats(const char* nm, struct stats_info* s) +{ + struct timeval avg; + PR_UL_NM("num.queries", s->svr.num_queries); + PR_UL_NM("num.queries_ip_ratelimited", + s->svr.num_queries_ip_ratelimited); + PR_UL_NM("num.cachehits", + s->svr.num_queries - s->svr.num_queries_missed_cache); + PR_UL_NM("num.cachemiss", s->svr.num_queries_missed_cache); + PR_UL_NM("num.prefetch", s->svr.num_queries_prefetch); + PR_UL_NM("num.zero_ttl", s->svr.zero_ttl_responses); + PR_UL_NM("num.recursivereplies", s->mesh_replies_sent); + printf("%s.requestlist.avg"SQ"%g\n", nm, + (s->svr.num_queries_missed_cache+s->svr.num_queries_prefetch)? + (double)s->svr.sum_query_list_size/ + (s->svr.num_queries_missed_cache+ + s->svr.num_queries_prefetch) : 0.0); + PR_UL_NM("requestlist.max", s->svr.max_query_list_size); + PR_UL_NM("requestlist.overwritten", s->mesh_jostled); + PR_UL_NM("requestlist.exceeded", s->mesh_dropped); + PR_UL_NM("requestlist.current.all", s->mesh_num_states); + PR_UL_NM("requestlist.current.user", s->mesh_num_reply_states); + timeval_divide(&avg, &s->mesh_replies_sum_wait, s->mesh_replies_sent); + printf("%s.", nm); + PR_TIMEVAL("recursion.time.avg", avg); + printf("%s.recursion.time.median"SQ"%g\n", nm, s->mesh_time_median); + PR_UL_NM("tcpusage", s->svr.tcp_accept_usage); +} + +/** print uptime */ +static void print_uptime(struct shm_stat_info* shm_stat) +{ + PR_TIMEVAL("time.now", shm_stat->time.now); + PR_TIMEVAL("time.up", shm_stat->time.up); + PR_TIMEVAL("time.elapsed", shm_stat->time.elapsed); +} + +/** print memory usage */ +static void print_mem(struct shm_stat_info* shm_stat) +{ + PR_LL("mem.cache.rrset", shm_stat->mem.rrset); + PR_LL("mem.cache.message", shm_stat->mem.msg); + PR_LL("mem.cache.iterator", shm_stat->mem.iter); + PR_LL("mem.cache.validator", shm_stat->mem.val); +} + +/** print histogram */ +static void print_hist(struct stats_info* s) +{ + struct timehist* hist; + size_t i; + hist = timehist_setup(); + if(!hist) + fatal_exit("out of memory"); + timehist_import(hist, s->svr.hist, NUM_BUCKETS_HIST); + for(i=0; inum; i++) { + printf("histogram.%6.6d.%6.6d.to.%6.6d.%6.6d=%lu\n", + (int)hist->buckets[i].lower.tv_sec, + (int)hist->buckets[i].lower.tv_usec, + (int)hist->buckets[i].upper.tv_sec, + (int)hist->buckets[i].upper.tv_usec, + (unsigned long)hist->buckets[i].count); + } + timehist_delete(hist); +} + +/** print extended */ +static void print_extended(struct stats_info* s) +{ + int i; + char nm[16]; + + /* TYPE */ + for(i=0; isvr.qtype[i] == 0) + continue; + sldns_wire2str_type_buf(i, nm, sizeof(nm)); + PR_UL_SUB("num.query.type", nm, s->svr.qtype[i]); + } + if(!inhibit_zero || s->svr.qtype_big) { + PR_UL("num.query.type.other", s->svr.qtype_big); + } + + /* CLASS */ + for(i=0; isvr.qclass[i] == 0) + continue; + sldns_wire2str_class_buf(i, nm, sizeof(nm)); + PR_UL_SUB("num.query.class", nm, s->svr.qclass[i]); + } + if(!inhibit_zero || s->svr.qclass_big) { + PR_UL("num.query.class.other", s->svr.qclass_big); + } + + /* OPCODE */ + for(i=0; isvr.qopcode[i] == 0) + continue; + sldns_wire2str_opcode_buf(i, nm, sizeof(nm)); + PR_UL_SUB("num.query.opcode", nm, s->svr.qopcode[i]); + } + + /* transport */ + PR_UL("num.query.tcp", s->svr.qtcp); + PR_UL("num.query.tcpout", s->svr.qtcp_outgoing); + PR_UL("num.query.ipv6", s->svr.qipv6); + + /* flags */ + PR_UL("num.query.flags.QR", s->svr.qbit_QR); + PR_UL("num.query.flags.AA", s->svr.qbit_AA); + PR_UL("num.query.flags.TC", s->svr.qbit_TC); + PR_UL("num.query.flags.RD", s->svr.qbit_RD); + PR_UL("num.query.flags.RA", s->svr.qbit_RA); + PR_UL("num.query.flags.Z", s->svr.qbit_Z); + PR_UL("num.query.flags.AD", s->svr.qbit_AD); + PR_UL("num.query.flags.CD", s->svr.qbit_CD); + PR_UL("num.query.edns.present", s->svr.qEDNS); + PR_UL("num.query.edns.DO", s->svr.qEDNS_DO); + + /* RCODE */ + for(i=0; i LDNS_RCODE_REFUSED && s->svr.ans_rcode[i] == 0) + continue; + sldns_wire2str_rcode_buf(i, nm, sizeof(nm)); + PR_UL_SUB("num.answer.rcode", nm, s->svr.ans_rcode[i]); + } + if(!inhibit_zero || s->svr.ans_rcode_nodata) { + PR_UL("num.answer.rcode.nodata", s->svr.ans_rcode_nodata); + } + /* validation */ + PR_UL("num.answer.secure", s->svr.ans_secure); + PR_UL("num.answer.bogus", s->svr.ans_bogus); + PR_UL("num.rrset.bogus", s->svr.rrset_bogus); + /* threat detection */ + PR_UL("unwanted.queries", s->svr.unwanted_queries); + PR_UL("unwanted.replies", s->svr.unwanted_replies); + /* cache counts */ + PR_UL("msg.cache.count", s->svr.msg_cache_count); + PR_UL("rrset.cache.count", s->svr.rrset_cache_count); + PR_UL("infra.cache.count", s->svr.infra_cache_count); + PR_UL("key.cache.count", s->svr.key_cache_count); +} + +/** print statistics out of memory structures */ +static void do_stats_shm(struct config_file* cfg, struct stats_info* stats, + struct shm_stat_info* shm_stat) +{ + int i; + char nm[16]; + for(i=0; inum_threads; i++) { + snprintf(nm, sizeof(nm), "thread%d", i); + pr_stats(nm, &stats[i+1]); + } + pr_stats("total", &stats[0]); + print_uptime(shm_stat); + if(cfg->stat_extended) { + print_mem(shm_stat); + print_hist(stats); + print_extended(stats); + } +} +#endif /* HAVE_SHMGET */ + +/** print statistics from shm memory segment */ +static void print_stats_shm(const char* cfgfile) +{ +#ifdef HAVE_SHMGET + struct config_file* cfg; + struct stats_info* stats; + struct shm_stat_info* shm_stat; + int id_ctl, id_arr; + /* read config */ + if(!(cfg = config_create())) + fatal_exit("out of memory"); + if(!config_read(cfg, cfgfile, NULL)) + fatal_exit("could not read config file"); + /* get shm segments */ + id_ctl = shmget(cfg->shm_key, sizeof(int), SHM_R|SHM_W); + if(id_ctl == -1) { + fatal_exit("shmget(%d): %s", cfg->shm_key, strerror(errno)); + } + id_arr = shmget(cfg->shm_key+1, sizeof(int), SHM_R|SHM_W); + if(id_arr == -1) { + fatal_exit("shmget(%d): %s", cfg->shm_key+1, strerror(errno)); + } + shm_stat = (struct shm_stat_info*)shmat(id_ctl, NULL, 0); + if(shm_stat == (void*)-1) { + fatal_exit("shmat(%d): %s", id_ctl, strerror(errno)); + } + stats = (struct stats_info*)shmat(id_arr, NULL, 0); + if(stats == (void*)-1) { + fatal_exit("shmat(%d): %s", id_arr, strerror(errno)); + } + + /* print the stats */ + do_stats_shm(cfg, stats, shm_stat); + + /* shutdown */ + shmdt(shm_stat); + shmdt(stats); + config_delete(cfg); +#else + (void)cfgfile; +#endif /* HAVE_SHMGET */ +} + /** exit with ssl error */ static void ssl_err(const char* s) { @@ -160,13 +413,13 @@ setup_ctx(struct config_file* cfg) if(!s_cert || !c_key || !c_cert) fatal_exit("out of memory"); } - ctx = SSL_CTX_new(SSLv23_client_method()); + ctx = SSL_CTX_new(SSLv23_client_method()); if(!ctx) ssl_err("could not allocate SSL_CTX pointer"); - if((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) + if((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) & SSL_OP_NO_SSLv2) != SSL_OP_NO_SSLv2) ssl_err("could not set SSL_OP_NO_SSLv2"); - if(cfg->remote_control_use_cert) { + if(cfg->remote_control_use_cert) { if((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3) & SSL_OP_NO_SSLv3) != SSL_OP_NO_SSLv3) ssl_err("could not set SSL_OP_NO_SSLv3"); @@ -441,44 +694,10 @@ int main(int argc, char* argv[]) log_init(NULL, 0, NULL); checklock_start(); #ifdef USE_WINSOCK - if((r = WSAStartup(MAKEWORD(2,2), &wsa_data)) != 0) - fatal_exit("WSAStartup failed: %s", wsa_strerror(r)); /* use registry config file in preference to compiletime location */ if(!(cfgfile=w_lookup_reg_str("Software\\Unbound", "ConfigFile"))) cfgfile = CONFIGFILE; #endif - -#ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS - ERR_load_crypto_strings(); -#endif - ERR_load_SSL_strings(); -#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO) - OpenSSL_add_all_algorithms(); -#else - OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS - | OPENSSL_INIT_ADD_ALL_DIGESTS - | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); -#endif -#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL) - (void)SSL_library_init(); -#else - (void)OPENSSL_init_ssl(0, NULL); -#endif - - if(!RAND_status()) { - /* try to seed it */ - unsigned char buf[256]; - unsigned int seed=(unsigned)time(NULL) ^ (unsigned)getpid(); - unsigned int v = seed; - size_t i; - for(i=0; i<256/sizeof(v); i++) { - memmove(buf+i*sizeof(v), &v, sizeof(v)); - v = v*seed + (unsigned int)i; - } - RAND_seed(buf, 256); - log_warn("no entropy, seeding openssl PRNG with time\n"); - } - /* parse the options */ while( (c=getopt(argc, argv, "c:s:qh")) != -1) { switch(c) { @@ -508,11 +727,51 @@ int main(int argc, char* argv[]) strerror(errno)); } } + if(argc >= 1 && strcmp(argv[0], "stats_shm")==0) { + print_stats_shm(cfgfile); + return 0; + } + +#ifdef USE_WINSOCK + if((r = WSAStartup(MAKEWORD(2,2), &wsa_data)) != 0) + fatal_exit("WSAStartup failed: %s", wsa_strerror(r)); +#endif + +#ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS + ERR_load_crypto_strings(); +#endif + ERR_load_SSL_strings(); +#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_CRYPTO) + OpenSSL_add_all_algorithms(); +#else + OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS + | OPENSSL_INIT_ADD_ALL_DIGESTS + | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); +#endif +#if OPENSSL_VERSION_NUMBER < 0x10100000 || !defined(HAVE_OPENSSL_INIT_SSL) + (void)SSL_library_init(); +#else + (void)OPENSSL_init_ssl(0, NULL); +#endif + + if(!RAND_status()) { + /* try to seed it */ + unsigned char buf[256]; + unsigned int seed=(unsigned)time(NULL) ^ (unsigned)getpid(); + unsigned int v = seed; + size_t i; + for(i=0; i<256/sizeof(v); i++) { + memmove(buf+i*sizeof(v), &v, sizeof(v)); + v = v*seed + (unsigned int)i; + } + RAND_seed(buf, 256); + log_warn("no entropy, seeding openssl PRNG with time\n"); + } ret = go(cfgfile, svr, quiet, argc, argv); #ifdef USE_WINSOCK - WSACleanup(); + WSACleanup(); #endif checklock_stop(); return ret; diff --git a/util/config_file.c b/util/config_file.c index 1eba4af86..e126668c0 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -257,6 +257,8 @@ config_create(void) cfg->ratelimit_factor = 10; cfg->qname_minimisation = 0; cfg->qname_minimisation_strict = 0; + cfg->shm_enable = 0; + cfg->shm_key = 11777; return cfg; error_exit: config_delete(cfg); @@ -380,6 +382,8 @@ int config_set_option(struct config_file* cfg, const char* opt, else S_STR("log-identity:", log_identity) else S_YNO("extended-statistics:", stat_extended) else S_YNO("statistics-cumulative:", stat_cumulative) + else S_YNO("shm-enable:", shm_enable) + else S_NUMBER_OR_ZERO("shm-key:", shm_key) else S_YNO("do-ip4:", do_ip4) else S_YNO("do-ip6:", do_ip6) else S_YNO("do-udp:", do_udp) @@ -697,6 +701,8 @@ config_get_option(struct config_file* cfg, const char* opt, else O_DEC(opt, "statistics-interval", stat_interval) else O_YNO(opt, "statistics-cumulative", stat_cumulative) else O_YNO(opt, "extended-statistics", stat_extended) + else O_YNO(opt, "shm-enable", shm_enable) + else O_DEC(opt, "shm-key", shm_key) else O_YNO(opt, "use-syslog", use_syslog) else O_STR(opt, "log-identity", log_identity) else O_YNO(opt, "log-time-ascii", log_time_ascii) diff --git a/util/config_file.h b/util/config_file.h index d52c2f481..8e21674d3 100644 --- a/util/config_file.h +++ b/util/config_file.h @@ -422,6 +422,10 @@ struct config_file { /** minimise QNAME in strict mode, minimise according to RFC. * Do not apply fallback */ int qname_minimisation_strict; + /* SHM data - true if shm is enabled */ + int shm_enable; + /* SHM data - key for the shm */ + int shm_key; }; /** from cfg username, after daemonise setup performed */ diff --git a/util/configlexer.c b/util/configlexer.c index 914b0de47..165814a2f 100644 --- a/util/configlexer.c +++ b/util/configlexer.c @@ -378,8 +378,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 203 -#define YY_END_OF_BUFFER 204 +#define YY_NUM_RULES 205 +#define YY_END_OF_BUFFER 206 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -387,228 +387,229 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1997] = +static yyconst flex_int16_t yy_accept[2011] = { 0, - 1, 1, 185, 185, 189, 189, 193, 193, 197, 197, - 1, 1, 204, 201, 1, 183, 183, 202, 2, 202, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 185, 186, 186, 187, 202, 189, 190, 190, 191, 202, - 196, 193, 194, 194, 195, 202, 197, 198, 198, 199, - 202, 200, 184, 2, 188, 202, 200, 201, 0, 1, - 2, 2, 2, 2, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 1, 1, 187, 187, 191, 191, 195, 195, 199, 199, + 1, 1, 206, 203, 1, 185, 185, 204, 2, 204, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 187, 188, 188, 189, 204, 191, 192, 192, 193, 204, + 198, 195, 196, 196, 197, 204, 199, 200, 200, 201, + 204, 202, 186, 2, 190, 204, 202, 203, 0, 1, + 2, 2, 2, 2, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 185, 0, - 189, 0, 196, 0, 193, 197, 0, 200, 0, 2, - 2, 200, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 187, + 0, 191, 0, 198, 0, 195, 199, 0, 202, 0, + 2, 2, 202, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 201, 201, 201, 200, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 200, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 202, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 202, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 77, 201, 201, 201, 201, 201, 201, 8, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 88, 200, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 77, 203, 203, 203, 203, + 203, 203, 8, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 88, 202, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 200, 201, 201, 201, 201, 201, 37, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 202, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 159, - 201, 14, 15, 201, 18, 17, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 145, 201, 201, 201, 201, 201, 201, 201, - 201, 3, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 37, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 161, 203, 14, 15, + 203, 18, 17, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 147, + 203, 203, 203, 203, 203, 203, 203, 203, 3, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 200, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 192, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 40, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 41, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 202, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 194, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 40, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 41, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 136, - 201, 201, 201, 20, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 96, 201, 192, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 112, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 95, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 20, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 96, 203, 194, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 112, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 95, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 75, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 25, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 38, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 39, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 75, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 25, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 38, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 39, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 28, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 174, 201, 201, 201, 201, - 201, 201, 201, 32, 201, 33, 201, 201, 201, 78, - 201, 79, 201, 201, 76, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 7, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 152, 201, 201, 201, - 201, 98, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 28, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 176, 203, 203, + 203, 203, 203, 203, 203, 203, 32, 203, 33, 203, + 203, 203, 78, 203, 79, 203, 203, 76, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 7, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 154, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 29, 201, 201, 201, - 201, 201, 201, 201, 128, 201, 127, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 16, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 42, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 81, 80, 201, 201, 201, - 201, 201, 201, 201, 201, 122, 201, 201, 201, 201, - 201, 201, 201, 201, 89, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 98, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 29, + 203, 203, 203, 203, 203, 203, 203, 128, 203, 127, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 16, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 42, 203, + 203, 203, 203, 203, 135, 203, 203, 203, 203, 81, + 80, 203, 203, 203, 203, 203, 203, 203, 203, 122, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 60, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 64, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 36, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 125, - 126, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 6, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 89, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 60, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 64, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 36, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 125, 126, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 6, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 201, 26, 201, 201, 201, - 201, 201, 201, 201, 201, 118, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 138, 201, 119, 201, 201, - 150, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 27, 201, 201, 201, 201, 84, 201, 85, 201, - 83, 201, 201, 201, 201, 201, 201, 201, 94, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 173, 201, 201, 120, 201, 201, 201, 201, 201, 123, - 201, 149, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 74, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 26, 203, 203, 203, 203, 203, 203, 203, 203, 118, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 140, + 203, 119, 203, 203, 152, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 27, 203, 203, 203, 203, + 84, 203, 85, 203, 83, 203, 203, 203, 203, 203, + 203, 203, 94, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 175, 203, 203, 120, 203, 203, + 203, 203, 203, 123, 203, 151, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 34, 201, 201, 22, 201, 201, 201, 201, 19, - 201, 103, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 49, 51, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 160, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 86, 201, 201, 201, 201, 201, 201, 201, 93, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 97, 201, 201, 201, 201, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 74, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 34, 203, 203, 22, 203, + 203, 203, 203, 19, 203, 103, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 49, 51, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 162, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 86, 203, 203, 203, 203, + 203, 203, 203, 93, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 144, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 111, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 107, 201, 113, 201, 201, 201, 201, 201, 92, 201, - 201, 70, 201, 136, 201, 201, 201, 201, 201, 151, - 201, 201, 201, 201, 201, 201, 201, 165, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 110, 201, 201, 201, 201, 201, 52, 53, 201, 201, - 201, 201, 201, 35, 59, 114, 201, 129, 201, 153, - 124, 201, 201, 45, 201, 116, 201, 201, 201, 201, + 203, 203, 203, 203, 203, 97, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 146, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 111, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 107, 203, 113, 203, 203, 203, + 203, 203, 92, 203, 203, 70, 203, 138, 203, 203, + 203, 203, 203, 153, 203, 203, 203, 203, 203, 203, + 203, 167, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 110, 203, 203, 203, 203, 203, + 52, 53, 203, 203, 203, 203, 203, 35, 59, 114, - 201, 9, 201, 201, 201, 73, 201, 201, 201, 201, - 178, 201, 135, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 99, 164, 201, 201, 201, 201, - 201, 201, 201, 201, 146, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 115, 201, 201, 44, 46, 201, - 201, 201, 201, 201, 201, 201, 72, 201, 201, 201, - 201, 176, 201, 201, 201, 201, 140, 23, 24, 201, + 203, 129, 203, 155, 124, 203, 203, 45, 203, 116, + 203, 203, 203, 203, 203, 9, 203, 203, 203, 73, + 203, 203, 203, 203, 180, 203, 137, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 99, 166, + 203, 203, 203, 203, 203, 203, 203, 203, 148, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 115, 203, + 203, 44, 46, 203, 203, 203, 203, 203, 203, 203, - 201, 201, 201, 201, 201, 201, 201, 69, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 142, 139, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 43, 201, 201, 201, 201, 201, 201, 201, 201, - 13, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 12, 201, 201, 21, 201, 201, - 201, 182, 201, 47, 201, 148, 141, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 106, - 105, 201, 201, 201, 201, 143, 137, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, + 72, 203, 203, 203, 203, 178, 203, 203, 203, 203, + 142, 23, 24, 203, 203, 203, 203, 203, 203, 203, + 203, 69, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 144, 141, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 43, 203, 203, 203, 203, + 203, 203, 203, 203, 13, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 12, 203, + 203, 21, 203, 203, 203, 184, 203, 47, 203, 150, + 143, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 106, 105, 203, 203, 203, 203, 145, - 201, 201, 201, 201, 201, 201, 201, 54, 201, 201, - 201, 177, 201, 201, 147, 201, 201, 201, 201, 201, - 201, 201, 201, 48, 201, 201, 82, 201, 100, 102, - 130, 201, 201, 201, 104, 201, 201, 154, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 161, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 131, 201, 201, 175, 201, 201, 30, 201, - 201, 201, 201, 4, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 157, 201, 201, 201, 201, - 201, 201, 201, 201, 163, 201, 201, 134, 201, 201, + 139, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 54, 203, 203, 203, 179, 203, 203, 149, 203, + 203, 203, 203, 203, 203, 203, 203, 48, 203, 203, + 82, 203, 100, 102, 130, 203, 203, 203, 104, 203, + 203, 156, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 163, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 131, 203, 203, 177, + 203, 203, 30, 203, 203, 203, 203, 4, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 159, - 201, 201, 201, 201, 201, 201, 57, 201, 31, 181, - 158, 201, 11, 201, 201, 201, 201, 201, 201, 132, - 61, 201, 201, 201, 109, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 162, 90, 201, 87, 201, - 201, 201, 63, 67, 62, 201, 55, 201, 10, 201, - 201, 201, 179, 201, 201, 108, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 68, - 66, 201, 56, 201, 121, 201, 201, 133, 201, 201, - 201, 201, 101, 50, 201, 201, 201, 201, 201, 201, - 201, 91, 65, 58, 201, 180, 201, 201, 201, 156, + 203, 203, 203, 203, 203, 203, 203, 203, 165, 203, + 203, 134, 203, 203, 203, 203, 203, 203, 203, 203, + 57, 203, 31, 183, 160, 203, 11, 203, 203, 203, + 203, 203, 203, 132, 61, 203, 203, 203, 109, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 164, + 90, 203, 87, 203, 203, 203, 63, 67, 62, 203, + 55, 203, 10, 203, 203, 203, 181, 203, 203, 108, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 68, 66, 203, 56, 203, 121, 203, + 203, 133, 203, 203, 203, 203, 101, 50, 203, 203, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 71, - 201, 155, 172, 201, 201, 201, 201, 201, 201, 5, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 117, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 168, 201, 201, 201, 201, 201, 201, 201, 201, 201, - 201, 201, 201, 201, 166, 201, 169, 170, 201, 201, - 201, 201, 201, 167, 171, 0 + 203, 203, 203, 203, 203, 91, 65, 58, 203, 182, + 203, 203, 203, 158, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 71, 203, 157, 174, 203, 203, 203, + 203, 203, 203, 5, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 117, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 170, 203, 203, 203, 203, 203, + 203, 203, 203, 203, 203, 203, 203, 203, 168, 203, + 171, 172, 203, 203, 203, 203, 203, 169, 173, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -651,898 +652,906 @@ static yyconst YY_CHAR yy_meta[40] = 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_uint16_t yy_base[2011] = +static yyconst flex_uint16_t yy_base[2025] = { 0, 0, 0, 37, 40, 44, 51, 63, 75, 56, 68, - 87, 108, 2518, 2290, 50, 3939, 3939, 3939, 129, 94, + 87, 108, 1988, 1845, 50, 3970, 3970, 3970, 129, 94, 70, 104, 130, 90, 109, 106, 127, 111, 84, 122, - 146, 148, 50, 170, 136, 158, 152, 180, 168, 191, - 2135, 3939, 3939, 3939, 70, 1956, 3939, 3939, 3939, 42, - 1771, 1568, 3939, 3939, 3939, 210, 1370, 3939, 3939, 3939, - 141, 1190, 3939, 214, 3939, 218, 140, 1132, 224, 167, - 0, 235, 0, 0, 92, 162, 164, 174, 193, 217, - 230, 219, 103, 178, 233, 225, 220, 221, 241, 243, - 244, 189, 249, 247, 256, 245, 252, 255, 254, 260, + 146, 148, 50, 170, 136, 158, 196, 171, 138, 177, + 1582, 3970, 3970, 3970, 70, 1472, 3970, 3970, 3970, 42, + 1346, 1295, 3970, 3970, 3970, 208, 1213, 3970, 3970, 3970, + 141, 1154, 3970, 214, 3970, 218, 140, 1064, 228, 167, + 0, 239, 0, 0, 92, 162, 164, 218, 180, 167, + 223, 224, 103, 168, 237, 226, 193, 183, 236, 241, + 244, 246, 247, 249, 258, 245, 257, 260, 256, 265, - 265, 268, 138, 272, 270, 271, 276, 280, 281, 287, - 273, 285, 282, 288, 289, 290, 295, 303, 300, 305, - 297, 307, 308, 314, 317, 318, 310, 319, 596, 329, - 458, 122, 403, 342, 373, 327, 347, 222, 351, 355, - 0, 332, 348, 356, 350, 352, 354, 357, 341, 358, - 368, 359, 370, 379, 377, 398, 380, 366, 378, 382, - 49, 384, 386, 311, 389, 393, 376, 390, 396, 409, - 400, 406, 416, 413, 426, 428, 424, 417, 430, 431, - 439, 440, 392, 437, 441, 442, 443, 444, 445, 446, - 451, 448, 452, 455, 454, 461, 469, 457, 465, 468, + 266, 271, 272, 274, 273, 275, 276, 283, 284, 288, + 289, 190, 290, 291, 277, 296, 298, 299, 305, 301, + 306, 303, 308, 311, 317, 318, 314, 320, 325, 890, + 337, 587, 122, 513, 342, 346, 225, 350, 192, 354, + 358, 0, 351, 339, 360, 322, 353, 356, 357, 359, + 362, 368, 365, 366, 378, 376, 397, 380, 364, 377, + 384, 49, 386, 387, 385, 388, 393, 391, 395, 402, + 413, 404, 394, 420, 421, 428, 430, 426, 416, 432, + 436, 443, 444, 440, 429, 445, 446, 448, 449, 450, + 452, 455, 453, 456, 457, 459, 469, 461, 472, 463, - 478, 470, 471, 481, 490, 491, 492, 474, 484, 487, - 493, 500, 498, 504, 502, 505, 507, 510, 488, 509, - 514, 519, 525, 526, 528, 515, 524, 530, 532, 534, - 540, 537, 546, 544, 542, 553, 538, 549, 550, 552, - 554, 556, 557, 560, 561, 562, 566, 568, 574, 570, - 576, 572, 577, 578, 582, 585, 591, 601, 602, 587, - 583, 603, 606, 609, 611, 613, 610, 617, 618, 619, - 626, 620, 623, 624, 631, 632, 633, 641, 638, 634, - 637, 635, 644, 646, 652, 667, 656, 654, 673, 659, - 674, 660, 664, 690, 676, 677, 687, 689, 688, 696, + 473, 470, 487, 474, 478, 484, 491, 494, 495, 488, + 492, 496, 498, 505, 502, 508, 501, 499, 398, 510, + 512, 519, 521, 524, 529, 527, 530, 520, 532, 535, + 539, 533, 545, 534, 546, 549, 551, 557, 544, 553, + 554, 555, 558, 560, 561, 562, 565, 569, 567, 572, + 578, 574, 576, 580, 581, 582, 586, 592, 591, 596, + 602, 601, 607, 606, 608, 610, 611, 612, 614, 619, + 620, 623, 630, 626, 628, 631, 634, 627, 635, 638, + 645, 644, 648, 650, 652, 657, 655, 659, 675, 653, + 663, 665, 662, 666, 680, 676, 684, 681, 682, 686, - 678, 692, 695, 705, 701, 706, 710, 712, 713, 714, - 719, 716, 720, 721, 722, 723, 726, 727, 734, 738, - 741, 749, 731, 745, 743, 753, 746, 661, 754, 715, - 755, 762, 760, 761, 763, 765, 767, 769, 770, 772, - 775, 780, 3939, 783, 776, 778, 785, 787, 788, 3939, - 790, 789, 791, 798, 792, 799, 795, 811, 817, 802, - 813, 814, 815, 816, 820, 819, 839, 822, 825, 827, - 828, 826, 831, 848, 832, 852, 841, 850, 846, 854, - 837, 863, 860, 864, 866, 870, 3939, 867, 877, 874, - 875, 878, 879, 885, 880, 894, 888, 895, 882, 896, + 688, 692, 703, 697, 699, 700, 710, 706, 708, 718, + 709, 712, 719, 720, 721, 726, 727, 724, 725, 732, + 736, 733, 740, 737, 748, 747, 749, 752, 753, 750, + 759, 757, 751, 765, 772, 769, 761, 771, 774, 763, + 777, 778, 780, 784, 786, 3970, 788, 790, 791, 792, + 793, 794, 3970, 796, 795, 798, 802, 800, 803, 810, + 822, 824, 807, 820, 804, 823, 827, 828, 829, 830, + 832, 852, 835, 837, 833, 845, 836, 841, 847, 838, + 864, 854, 862, 857, 866, 859, 870, 867, 873, 879, + 877, 3970, 880, 887, 886, 888, 889, 891, 896, 893, - 899, 890, 908, 904, 911, 913, 919, 916, 921, 923, - 905, 922, 924, 925, 933, 930, 931, 932, 940, 937, - 939, 938, 944, 947, 945, 949, 951, 955, 964, 957, - 958, 967, 960, 968, 970, 972, 974, 975, 976, 982, - 978, 980, 987, 989, 981, 992, 1000, 996, 1002, 1004, - 998, 1010, 1008, 1011, 1017, 1013, 1015, 1014, 1028, 1029, - 1016, 1030, 1020, 1025, 1026, 1034, 1036, 1037, 1041, 1039, - 1042, 1044, 1052, 1048, 1049, 1050, 1058, 1053, 1055, 1063, - 1065, 1069, 1066, 1070, 1071, 1072, 1076, 1074, 1080, 1085, - 1083, 1086, 1088, 1096, 1098, 1089, 1100, 1103, 3939, 1111, + 908, 897, 901, 900, 907, 910, 911, 919, 916, 921, + 923, 931, 925, 933, 939, 917, 935, 928, 937, 948, + 942, 944, 936, 950, 952, 951, 955, 953, 959, 954, + 961, 964, 962, 973, 970, 974, 978, 975, 981, 983, + 984, 985, 987, 988, 994, 992, 993, 1002, 1001, 991, + 1007, 1013, 1010, 1016, 1014, 1018, 1025, 1019, 1022, 1031, + 1027, 1030, 1029, 1042, 1038, 1028, 1043, 1040, 1044, 1047, + 1049, 1050, 1051, 1052, 1054, 1055, 1057, 1058, 1061, 1073, + 1060, 1062, 1082, 1074, 1080, 1084, 1072, 1066, 1086, 1087, + 1090, 1093, 1092, 1096, 1098, 1102, 1103, 1104, 1105, 1106, - 1104, 1113, 1107, 1090, 1120, 1114, 1105, 1091, 1125, 3939, - 1118, 3939, 3939, 1121, 3939, 3939, 1126, 1136, 1127, 1128, - 1145, 1148, 1141, 1139, 1143, 1151, 1159, 1156, 1161, 1164, - 1169, 1171, 1172, 1173, 1180, 1153, 1174, 1177, 1181, 1183, - 1184, 1186, 1188, 1187, 1192, 1189, 1196, 1203, 1211, 1207, - 1208, 1209, 1212, 1213, 1216, 1215, 1199, 1224, 1219, 1225, - 1232, 1226, 3939, 1229, 1230, 1234, 1235, 1240, 1236, 1242, - 1243, 3939, 1244, 1247, 1248, 1250, 1253, 1256, 1255, 1257, - 1259, 1260, 1258, 1262, 1268, 1272, 1281, 1263, 1271, 1289, - 1291, 1288, 1287, 1290, 1293, 1273, 1295, 1304, 1297, 1301, + 1107, 1113, 1108, 1119, 1115, 3970, 1126, 1122, 1123, 1125, + 1130, 1136, 1132, 1133, 1134, 1160, 3970, 1135, 3970, 3970, + 995, 3970, 3970, 1138, 1139, 1149, 1143, 1146, 1183, 1152, + 1155, 1156, 1158, 1163, 1164, 1166, 1174, 1175, 1186, 1177, + 1188, 1168, 1192, 1178, 1194, 1196, 1198, 1199, 1203, 1205, + 1207, 1208, 1211, 1210, 1217, 1226, 1224, 1222, 1223, 1229, + 1230, 1233, 1232, 1234, 1236, 1240, 1242, 1246, 1243, 3970, + 1245, 1247, 1252, 1244, 1259, 1251, 1257, 1261, 3970, 1263, + 1268, 1269, 1270, 1271, 1273, 1274, 1277, 1276, 1278, 1280, + 1283, 1279, 1287, 1286, 1289, 1304, 1291, 1294, 1306, 1310, - 1303, 1312, 1305, 1309, 1311, 1314, 1315, 1317, 1318, 1320, - 1322, 1323, 1345, 1326, 1324, 1331, 1332, 1334, 1340, 1342, - 1335, 1339, 1358, 1352, 1359, 1360, 1363, 1351, 1368, 1369, - 1376, 1379, 1383, 1373, 1381, 1380, 1387, 1392, 1390, 1333, - 1396, 1388, 1398, 1400, 3939, 1406, 1405, 1403, 1411, 1417, - 1413, 1414, 1416, 1419, 1415, 1420, 1421, 1427, 1423, 1430, - 1426, 1436, 1438, 1439, 3939, 1435, 1437, 1441, 1448, 1452, - 1458, 1442, 1449, 1464, 1460, 3939, 1461, 1467, 1468, 1471, - 1465, 1470, 1476, 1475, 1478, 1480, 1482, 1483, 1484, 1486, - 1487, 1493, 1497, 1485, 1500, 1502, 1504, 1506, 1507, 1508, + 1309, 1307, 1312, 1314, 1315, 1316, 1323, 1322, 1320, 1321, + 1333, 1327, 1330, 1331, 1340, 1335, 1337, 1342, 1343, 1344, + 1345, 1368, 1351, 1353, 1348, 1355, 1356, 1354, 1359, 1362, + 1372, 1366, 1375, 1378, 1382, 1374, 1381, 1385, 1391, 1400, + 1404, 1405, 1396, 1407, 1401, 1398, 1416, 1409, 1418, 1419, + 1420, 1422, 1423, 3970, 1430, 1429, 1428, 1435, 1441, 1437, + 1434, 1440, 1443, 1438, 1446, 1444, 1445, 1451, 1456, 1457, + 1458, 1459, 1465, 3970, 1461, 1464, 1466, 1469, 1473, 1479, + 1476, 1486, 1488, 1462, 3970, 1489, 1495, 1492, 1497, 1498, + 1491, 1499, 1501, 1503, 1502, 1504, 1508, 1510, 1507, 3970, - 1514, 1510, 1511, 3939, 1512, 1517, 1513, 1519, 1528, 1534, - 1526, 1532, 1536, 1533, 1539, 1538, 1544, 1542, 1545, 1543, - 1546, 3939, 1547, 186, 1549, 1555, 1548, 1556, 1564, 1567, - 1569, 1561, 1565, 1573, 1576, 1558, 1580, 1581, 1582, 1584, - 1585, 1586, 1588, 1589, 1592, 1590, 1598, 1597, 1600, 1602, - 1606, 1607, 1608, 1613, 1610, 3939, 1617, 1614, 1616, 1619, - 1622, 1625, 1624, 1626, 1628, 1630, 1633, 1635, 1634, 1642, - 3939, 1646, 1643, 1644, 1640, 1653, 1647, 1666, 1655, 1656, - 1662, 1663, 1667, 1668, 1676, 1672, 1678, 1679, 1681, 1682, - 1684, 1689, 1690, 1691, 1692, 1699, 1701, 1697, 1700, 1711, + 1516, 1509, 1518, 1527, 1528, 1517, 1529, 1530, 1531, 1533, + 1534, 1541, 1538, 1539, 3970, 1540, 1542, 1546, 1549, 1556, + 1559, 1552, 1555, 1563, 1564, 1565, 1566, 1572, 1569, 1571, + 1570, 1573, 3970, 1574, 151, 1576, 1577, 1575, 1586, 1596, + 1594, 1597, 1600, 1601, 1603, 1604, 1588, 1605, 1606, 1609, + 1585, 1610, 1611, 1616, 1613, 1617, 1620, 1623, 1626, 1631, + 1627, 1632, 1637, 1635, 1638, 1636, 3970, 1644, 1647, 1646, + 1639, 1649, 1650, 1651, 1652, 1653, 1659, 1660, 1665, 1662, + 1667, 3970, 1673, 1669, 1670, 1672, 1679, 1675, 1686, 1688, + 1689, 1691, 1693, 1695, 1690, 1701, 1697, 1700, 1702, 1709, - 1706, 1714, 1708, 3939, 1709, 1703, 1715, 1717, 1735, 1722, - 1721, 1716, 1723, 1732, 1728, 1738, 1743, 1739, 1745, 3939, - 1747, 1748, 1749, 1752, 1755, 1757, 1759, 1758, 1761, 1762, - 1765, 1766, 1767, 1776, 1769, 1778, 1773, 1781, 3939, 1788, - 1790, 1786, 1797, 1789, 1793, 1795, 1800, 1796, 1801, 1802, - 1808, 1804, 1807, 1805, 1810, 1813, 1809, 1811, 1815, 1826, - 1820, 1822, 1830, 3939, 1823, 1839, 1832, 1840, 1844, 1837, - 1852, 1849, 1843, 1850, 1855, 1856, 1857, 1858, 1859, 1860, - 1865, 1861, 1863, 1868, 1870, 1871, 1872, 1873, 1877, 1887, - 1888, 1889, 1890, 1893, 1894, 1895, 1901, 1902, 1866, 1903, + 1710, 1712, 1716, 1717, 1706, 1718, 1724, 1726, 1723, 1727, + 1737, 1729, 1394, 1732, 3970, 1734, 1733, 1740, 1735, 1750, + 1742, 1741, 1739, 1752, 1754, 1759, 1761, 1762, 1765, 1768, + 1770, 3970, 1771, 1773, 1772, 1776, 1779, 1781, 1782, 1784, + 1789, 1790, 1792, 1785, 1795, 1801, 1794, 1798, 1796, 1806, + 3970, 1813, 1814, 1811, 1820, 1817, 1818, 1821, 1823, 1807, + 1824, 1825, 1833, 1829, 1830, 1834, 1835, 1838, 1831, 1836, + 1840, 1842, 1855, 1841, 1852, 3970, 1856, 1867, 1859, 1863, + 1870, 1860, 1878, 1865, 1876, 1877, 1879, 1880, 1881, 1882, + 1883, 1884, 1889, 1885, 1890, 1892, 1893, 1894, 1891, 1911, - 3939, 1908, 1909, 1910, 1911, 1912, 1914, 1916, 1923, 1925, - 1921, 1926, 1927, 1930, 1931, 1932, 1933, 1942, 1934, 1936, - 1940, 1943, 1938, 1944, 1948, 1960, 1947, 1954, 1968, 1964, - 1970, 1958, 1972, 1973, 1976, 3939, 1977, 1980, 1983, 1985, - 1975, 1984, 1992, 3939, 1990, 3939, 1991, 1998, 2005, 3939, - 2002, 3939, 2007, 1994, 3939, 2009, 2013, 2003, 2011, 2015, - 2016, 2017, 2020, 2022, 2023, 2024, 2027, 2028, 2030, 2031, - 2033, 3939, 2041, 2035, 2037, 2044, 2042, 2046, 2048, 2052, - 2054, 2055, 2058, 2064, 2056, 2065, 3939, 2067, 2070, 2071, - 2072, 3939, 1669, 2079, 2073, 2062, 2083, 2092, 2088, 2075, + 1912, 1913, 1897, 1914, 1917, 1895, 1899, 1921, 1927, 1929, + 1930, 1933, 3970, 1936, 1937, 1938, 1925, 1939, 1928, 1940, + 1950, 1953, 1946, 1951, 1954, 1955, 1956, 1957, 1958, 1965, + 1961, 1962, 1967, 1968, 1963, 1969, 1978, 1971, 1985, 1979, + 1984, 1989, 1992, 1995, 1997, 1998, 1999, 3970, 2000, 2003, + 2004, 2010, 2007, 2012, 2021, 2023, 3970, 2013, 3970, 2019, + 2026, 2033, 3970, 2030, 3970, 2035, 2036, 3970, 2037, 2038, + 2041, 2017, 2043, 2044, 2045, 2047, 2050, 2048, 2058, 2051, + 2053, 2061, 2055, 2062, 3970, 2070, 2063, 2066, 2071, 2077, + 2075, 2076, 2078, 2079, 2083, 2084, 2091, 2088, 2097, 3970, - 2091, 2077, 2094, 2100, 2098, 2103, 2104, 2105, 2111, 2107, - 2113, 2109, 2110, 2117, 2114, 2118, 2120, 2122, 2124, 2127, - 2128, 2131, 2129, 2130, 2133, 2134, 3939, 2144, 2137, 2146, - 2145, 2152, 2153, 2148, 3939, 2154, 3939, 2156, 2167, 2171, - 2158, 2163, 2172, 2173, 2175, 2177, 2176, 2183, 2180, 2184, - 2187, 2190, 2191, 2193, 2195, 3939, 2192, 2196, 2197, 2199, - 2201, 2206, 2212, 2216, 2202, 3939, 2223, 2203, 2219, 2231, - 2229, 2222, 2237, 2230, 2236, 3939, 3939, 2233, 2238, 2234, - 2240, 2241, 2249, 2248, 2250, 3939, 2254, 2251, 2255, 2256, - 2257, 2265, 2263, 2266, 3939, 2267, 2274, 2269, 2277, 2275, + 2090, 2094, 2098, 2100, 3970, 2101, 2102, 2107, 2109, 2110, + 2120, 2118, 2105, 2121, 2111, 2124, 2135, 2131, 2122, 2133, + 2134, 2142, 2138, 2144, 2141, 2145, 2147, 2148, 2149, 2151, + 2155, 2156, 2157, 2159, 2163, 2160, 2161, 2162, 2165, 3970, + 2174, 2168, 2177, 2178, 2183, 2185, 2179, 3970, 2184, 3970, + 2166, 2201, 2203, 2189, 2205, 2196, 2198, 2187, 2208, 2209, + 2216, 2214, 2215, 2219, 2221, 2222, 2224, 2225, 3970, 2223, + 2226, 2227, 2229, 2233, 2238, 2246, 2241, 2231, 3970, 2256, + 2234, 2254, 2260, 2257, 3970, 2258, 2267, 2264, 2265, 3970, + 3970, 2266, 2271, 2269, 2270, 2272, 2280, 2273, 2276, 3970, - 2276, 2278, 2285, 2279, 2281, 2286, 2294, 2295, 2301, 3939, - 2302, 2296, 2304, 2306, 2308, 2310, 2309, 2311, 2312, 2314, - 2315, 2316, 2325, 2327, 2320, 2328, 2329, 2333, 2330, 2338, - 2334, 2340, 2342, 2348, 2351, 3939, 2357, 2344, 2358, 2345, - 2360, 2363, 2361, 2365, 2366, 2367, 2373, 2369, 3939, 2376, - 2374, 2372, 2381, 2382, 2390, 2383, 2385, 2394, 2397, 3939, - 3939, 2392, 2399, 2400, 2402, 2404, 2405, 2410, 2406, 2412, - 3939, 2414, 2421, 2417, 2418, 2427, 2429, 2434, 2430, 2436, - 2420, 2423, 2426, 2441, 2439, 2443, 2446, 2448, 2449, 2450, - 2451, 2452, 2453, 2460, 2456, 2471, 2454, 2464, 2461, 2479, + 2284, 2281, 2286, 2287, 2293, 2295, 2296, 2297, 3970, 2299, + 2303, 2304, 2306, 2307, 2309, 2308, 2315, 2311, 2312, 2316, + 2325, 2326, 2332, 3970, 2328, 2334, 2336, 2337, 2339, 2338, + 2340, 2341, 2345, 2342, 2346, 2348, 2354, 2360, 2357, 2358, + 2359, 2362, 2365, 2368, 2369, 2371, 2372, 2380, 2381, 3970, + 2387, 2373, 2388, 2374, 2393, 2394, 2401, 2397, 2386, 2398, + 2405, 2402, 3970, 2408, 2412, 2404, 2414, 2389, 2419, 2417, + 2421, 2423, 2428, 3970, 3970, 2429, 2431, 2432, 2433, 2435, + 2434, 2441, 2436, 2439, 3970, 2445, 2451, 2448, 2449, 2457, + 2458, 2464, 2454, 2461, 2465, 2467, 2466, 2469, 2471, 2473, - 2477, 2485, 2487, 2466, 2483, 2491, 3939, 2488, 2489, 2490, - 2473, 2499, 2496, 2506, 2497, 3939, 2504, 2510, 2513, 2515, - 2503, 2516, 2519, 2520, 2508, 3939, 2525, 3939, 2528, 2521, - 3939, 2527, 2535, 2529, 2532, 2536, 2537, 2538, 2540, 2548, - 2544, 3939, 2550, 2546, 2552, 2557, 3939, 2560, 3939, 2547, - 3939, 2553, 2555, 2570, 2567, 2571, 2573, 2577, 3939, 2574, - 2578, 2579, 2582, 2583, 2585, 2587, 2588, 2586, 2590, 2589, - 3939, 2593, 2594, 3939, 2596, 2607, 2592, 2606, 2615, 3939, - 2616, 3939, 2603, 2619, 2602, 2621, 2627, 2630, 2631, 2620, - 2623, 2637, 2634, 2633, 2640, 3939, 2641, 2642, 2645, 2649, + 2474, 2476, 2477, 2479, 2480, 2481, 2483, 2498, 2490, 2503, + 2488, 2493, 2495, 2505, 2511, 2513, 2519, 2504, 2516, 2522, + 3970, 2520, 2521, 2523, 2518, 2529, 2526, 2536, 2527, 3970, + 2534, 2540, 2545, 2547, 2533, 2549, 2551, 2552, 2550, 3970, + 2557, 3970, 2560, 2542, 3970, 2561, 2565, 2566, 2567, 2569, + 2570, 2568, 2574, 2580, 2571, 3970, 2581, 2577, 2583, 2588, + 3970, 2591, 3970, 2578, 3970, 2584, 2596, 2603, 2600, 2601, + 2604, 2608, 3970, 2605, 2609, 2613, 2611, 2615, 2616, 2618, + 2619, 2621, 2622, 2626, 3970, 2623, 2624, 3970, 2633, 2625, + 2634, 2635, 2639, 3970, 2641, 3970, 2642, 2649, 2651, 2653, - 2647, 2651, 2657, 2653, 2659, 2654, 2655, 2663, 2669, 2670, - 2672, 3939, 2673, 2675, 3939, 2674, 2676, 2677, 2681, 3939, - 2682, 3939, 2683, 2685, 2686, 2690, 2692, 2693, 2704, 2694, - 2701, 2707, 2706, 2715, 2708, 2698, 3939, 3939, 2721, 2717, - 2723, 2724, 2727, 2728, 2734, 2730, 2732, 3939, 2733, 2736, - 2737, 2738, 2740, 2743, 2747, 2749, 2750, 2742, 2751, 2744, - 2752, 3939, 2755, 2759, 2762, 2764, 2766, 2765, 2767, 3939, - 2769, 2772, 2776, 2778, 2780, 2784, 2791, 2795, 2781, 2797, - 2798, 2800, 2802, 2804, 2806, 2807, 2814, 2811, 2816, 2818, - 2808, 3939, 2819, 2821, 2822, 2831, 2825, 2773, 2832, 2833, + 2655, 2654, 2660, 2661, 2662, 2668, 2664, 2667, 2666, 3970, + 2670, 2671, 2673, 2675, 2678, 2681, 2688, 2686, 2690, 2684, + 2694, 2695, 2699, 2700, 2702, 3970, 2705, 2707, 3970, 2704, + 2708, 2711, 2715, 3970, 2713, 3970, 2716, 2718, 2720, 2721, + 2724, 2725, 2727, 2732, 2735, 2736, 2737, 2743, 2740, 2744, + 3970, 3970, 2747, 2749, 2753, 2754, 2756, 2757, 2765, 2761, + 2763, 3970, 2759, 2767, 2769, 2770, 2771, 2773, 2774, 2778, + 2779, 2780, 2781, 2782, 2787, 3970, 2788, 2789, 2793, 2794, + 2797, 2798, 2799, 3970, 2801, 2802, 2796, 2811, 2803, 2814, + 2822, 2824, 2804, 2826, 2827, 2829, 2831, 2833, 2835, 2836, - 2837, 2823, 2838, 2828, 2840, 3939, 2844, 2845, 2846, 2848, - 2851, 2854, 2856, 2857, 2858, 2860, 3939, 2862, 2865, 2863, - 2866, 2871, 2867, 2875, 2876, 2877, 2878, 2881, 2889, 2890, - 3939, 2882, 3939, 2896, 2897, 2904, 2900, 2893, 3939, 2903, - 2907, 3939, 2908, 3939, 2911, 2912, 2906, 2910, 2924, 3939, - 2928, 2919, 2929, 2925, 2921, 2931, 2938, 3939, 2932, 2940, - 2942, 2944, 2934, 2945, 2946, 2947, 2948, 2952, 2958, 2955, - 3939, 2956, 2959, 2967, 2963, 2973, 3939, 3939, 2966, 2969, - 2974, 2976, 2978, 3939, 3939, 3939, 2982, 3939, 2983, 3939, - 3939, 2984, 2986, 3939, 2988, 3939, 2995, 2991, 2993, 2994, + 2843, 2840, 2845, 2847, 2837, 3970, 2848, 2850, 2851, 2860, + 2854, 2857, 2861, 2865, 2868, 2852, 2862, 2869, 2874, 3970, + 2875, 2876, 2878, 2879, 2885, 2882, 2887, 2880, 2889, 2891, + 3970, 2892, 2897, 2894, 2896, 2903, 2905, 2907, 2898, 2908, + 2911, 2914, 2921, 2918, 3970, 2915, 3970, 2923, 2925, 2934, + 2930, 2927, 3970, 2933, 2936, 3970, 2938, 3970, 2937, 2941, + 2942, 2943, 2952, 3970, 2954, 2944, 2956, 2959, 2960, 2961, + 2963, 3970, 2965, 2967, 2973, 2976, 2966, 2968, 2975, 2978, + 2977, 2979, 2990, 2987, 3970, 2983, 2991, 3000, 2994, 3001, + 3970, 3970, 2992, 3004, 3007, 2998, 3008, 3970, 3970, 3970, - 2998, 3939, 2996, 2999, 3005, 3939, 2997, 3012, 3000, 3008, - 3939, 3014, 3939, 3017, 3019, 3010, 3020, 3027, 3029, 3031, - 3032, 3033, 3034, 3036, 3037, 3038, 3040, 3039, 3042, 3043, - 3046, 3047, 3053, 3054, 3055, 3056, 3061, 3058, 3060, 3063, - 3074, 3065, 3081, 3083, 3939, 3939, 3071, 3075, 3073, 3077, - 3085, 3086, 3087, 3088, 3939, 3099, 3092, 3090, 3096, 3100, - 3102, 3104, 3107, 3109, 3111, 3117, 3113, 3114, 3116, 3119, - 3118, 3121, 3125, 3132, 3939, 3127, 3126, 3939, 3939, 3133, - 3137, 3143, 3139, 3144, 3147, 3148, 3939, 3149, 3151, 3157, - 3150, 3939, 3159, 3160, 3166, 3168, 3939, 3939, 3939, 3169, + 3012, 3970, 3013, 3970, 3970, 3014, 3016, 3970, 3018, 3970, + 3025, 3021, 3023, 3026, 3027, 3970, 3028, 3029, 3034, 3970, + 3035, 3042, 3036, 3030, 3970, 3050, 3970, 3038, 3051, 3046, + 3052, 3056, 3059, 3062, 3063, 3064, 3065, 3067, 3068, 3069, + 3071, 3070, 3073, 3074, 3077, 3078, 3084, 3085, 3086, 3087, + 3092, 3089, 3091, 3094, 3105, 3096, 3112, 3114, 3970, 3970, + 3102, 3106, 3104, 3108, 3116, 3117, 3118, 3119, 3970, 3130, + 3123, 3121, 3127, 3131, 3133, 3135, 3138, 3140, 3142, 3148, + 3144, 3145, 3147, 3150, 3149, 3152, 3156, 3163, 3970, 3158, + 3157, 3970, 3970, 3164, 3168, 3174, 3170, 3175, 3178, 3179, - 3161, 3171, 3172, 3173, 3175, 3174, 3177, 3939, 3176, 3182, - 3189, 3186, 3196, 3198, 3192, 3200, 3207, 3203, 3210, 3212, - 3939, 3939, 3204, 3218, 3215, 3216, 3214, 3220, 3222, 3224, - 3225, 3939, 3228, 3227, 3188, 3226, 3233, 3234, 3240, 3236, - 3939, 3238, 3244, 3246, 3248, 3249, 3250, 3251, 3253, 3254, - 3256, 3262, 3255, 3267, 3939, 3269, 3258, 3939, 3270, 3275, - 3276, 3939, 3279, 3939, 3282, 3939, 3939, 3277, 3283, 3286, - 3287, 3293, 3295, 3299, 3288, 3296, 3305, 3302, 3303, 3939, - 3939, 3309, 3311, 3312, 3319, 3939, 3939, 3315, 3313, 3316, - 3317, 3322, 3323, 3325, 3326, 3328, 3327, 3332, 3338, 3340, + 3970, 3180, 3182, 3188, 3181, 3970, 3190, 3191, 3197, 3199, + 3970, 3970, 3970, 3200, 3192, 3202, 3203, 3204, 3206, 3205, + 3208, 3970, 3207, 3213, 3220, 3217, 3227, 3229, 3223, 3231, + 3238, 3234, 3241, 3243, 3970, 3970, 3235, 3249, 3246, 3247, + 3245, 3251, 3253, 3255, 3256, 3970, 3259, 3258, 3219, 3257, + 3264, 3265, 3271, 3267, 3970, 3269, 3275, 3277, 3279, 3280, + 3281, 3282, 3284, 3285, 3287, 3293, 3286, 3298, 3970, 3300, + 3289, 3970, 3301, 3306, 3307, 3970, 3310, 3970, 3313, 3970, + 3970, 3308, 3314, 3317, 3318, 3324, 3326, 3330, 3319, 3327, + 3336, 3333, 3334, 3970, 3970, 3340, 3342, 3343, 3350, 3970, - 3343, 3344, 3347, 3329, 3348, 3350, 3351, 3939, 3353, 3358, - 3354, 3939, 3363, 3360, 3939, 3356, 3369, 3373, 3366, 3364, - 3381, 3378, 3383, 3939, 3384, 3382, 3939, 3385, 3939, 3939, - 3939, 3390, 3386, 3388, 3939, 3396, 3398, 3939, 3404, 3400, - 3405, 3411, 3407, 3408, 3412, 3419, 3415, 3417, 3939, 3418, - 3420, 3422, 3423, 3427, 3424, 3426, 3429, 3438, 3434, 3432, - 3444, 3441, 3939, 3450, 3452, 3939, 3454, 3456, 3939, 3463, - 3445, 3447, 3455, 3939, 3466, 3457, 3459, 3469, 3473, 3464, - 3475, 3476, 3478, 3479, 3484, 3939, 3480, 3486, 3488, 3489, - 3490, 3498, 3495, 3500, 3939, 3502, 3497, 3939, 3504, 3505, + 3970, 3346, 3344, 3347, 3348, 3353, 3354, 3356, 3357, 3359, + 3358, 3363, 3369, 3371, 3374, 3375, 3378, 3360, 3379, 3381, + 3382, 3970, 3384, 3389, 3385, 3970, 3394, 3391, 3970, 3387, + 3400, 3404, 3397, 3395, 3412, 3409, 3414, 3970, 3415, 3413, + 3970, 3416, 3970, 3970, 3970, 3421, 3417, 3419, 3970, 3427, + 3429, 3970, 3435, 3431, 3436, 3442, 3438, 3439, 3443, 3450, + 3446, 3448, 3970, 3449, 3451, 3453, 3454, 3458, 3455, 3457, + 3460, 3469, 3465, 3463, 3475, 3472, 3970, 3481, 3483, 3970, + 3485, 3487, 3970, 3494, 3476, 3478, 3486, 3970, 3497, 3488, + 3490, 3500, 3504, 3495, 3506, 3507, 3509, 3510, 3515, 3970, - 3507, 3514, 3518, 3523, 3525, 3515, 3939, 3527, 3939, 3939, - 3939, 3528, 3939, 3531, 3532, 3533, 3534, 3536, 3537, 3939, - 3939, 3539, 3541, 3544, 3939, 3538, 3545, 3550, 3548, 3551, - 3552, 3556, 3557, 3561, 3562, 3939, 3939, 3563, 3939, 3569, - 3577, 3580, 3939, 3939, 3939, 3579, 3939, 3581, 3939, 3587, - 3571, 3588, 3939, 3591, 3592, 3939, 3593, 3564, 3594, 3597, - 3599, 3600, 3601, 3603, 3604, 3608, 3609, 3610, 3616, 3939, - 3939, 3620, 3939, 3622, 3939, 3623, 3628, 3939, 3554, 3630, - 3624, 3634, 3939, 3939, 3508, 3617, 3635, 3636, 3637, 3640, - 3638, 3939, 3939, 3939, 3642, 3939, 3643, 3644, 3646, 3939, + 3511, 3517, 3519, 3520, 3521, 3529, 3526, 3531, 3970, 3533, + 3528, 3970, 3535, 3536, 3538, 3545, 3549, 3554, 3556, 3546, + 3970, 3558, 3970, 3970, 3970, 3559, 3970, 3562, 3563, 3564, + 3565, 3567, 3568, 3970, 3970, 3570, 3572, 3575, 3970, 3569, + 3576, 3581, 3579, 3582, 3583, 3587, 3588, 3592, 3593, 3970, + 3970, 3594, 3970, 3600, 3608, 3611, 3970, 3970, 3970, 3610, + 3970, 3612, 3970, 3618, 3602, 3619, 3970, 3622, 3623, 3970, + 3624, 3595, 3625, 3628, 3630, 3631, 3632, 3634, 3635, 3639, + 3640, 3641, 3647, 3970, 3970, 3651, 3970, 3653, 3970, 3654, + 3659, 3970, 3585, 3661, 3655, 3665, 3970, 3970, 3539, 3648, - 3648, 3650, 3651, 3653, 3652, 3655, 3657, 3661, 3666, 3667, - 3674, 3678, 3679, 3682, 3669, 3675, 3688, 3685, 3692, 3939, - 3686, 3939, 3939, 3689, 3698, 3700, 3696, 3702, 3697, 3939, - 3703, 3704, 3705, 3706, 3707, 3709, 3720, 3711, 3712, 3722, - 3724, 3728, 3721, 3736, 3735, 3732, 3737, 3738, 3746, 3742, - 3745, 3939, 3743, 3744, 3747, 3749, 3750, 3754, 3752, 3764, - 3767, 3755, 3769, 3753, 3774, 3770, 3775, 3778, 3779, 3780, - 3939, 3781, 3783, 3785, 3787, 3789, 3791, 3792, 3793, 3796, - 3798, 3801, 3803, 3807, 3939, 3808, 3939, 3939, 3812, 3809, - 3815, 3819, 3821, 3939, 3939, 3939, 3847, 3854, 3861, 3868, + 3666, 3667, 3668, 3671, 3669, 3970, 3970, 3970, 3673, 3970, + 3674, 3675, 3677, 3970, 3679, 3681, 3682, 3684, 3683, 3686, + 3688, 3692, 3697, 3698, 3705, 3709, 3710, 3713, 3700, 3706, + 3719, 3716, 3723, 3970, 3717, 3970, 3970, 3720, 3729, 3731, + 3727, 3733, 3728, 3970, 3734, 3735, 3736, 3737, 3738, 3740, + 3751, 3742, 3743, 3753, 3755, 3759, 3752, 3767, 3766, 3763, + 3768, 3769, 3777, 3773, 3776, 3970, 3774, 3775, 3778, 3780, + 3781, 3785, 3783, 3795, 3798, 3786, 3800, 3784, 3805, 3801, + 3806, 3809, 3810, 3811, 3970, 3812, 3814, 3816, 3818, 3820, + 3822, 3823, 3824, 3827, 3829, 3832, 3834, 3838, 3970, 3839, - 3875, 94, 3882, 3889, 3896, 3903, 3910, 3917, 3924, 3931 + 3970, 3970, 3843, 3840, 3846, 3850, 3852, 3970, 3970, 3970, + 3878, 3885, 3892, 3899, 3906, 94, 3913, 3920, 3927, 3934, + 3941, 3948, 3955, 3962 } ; -static yyconst flex_int16_t yy_def[2011] = +static yyconst flex_int16_t yy_def[2025] = { 0, - 1996, 1, 1997, 1997, 1998, 1998, 1999, 1999, 2000, 2000, - 2001, 2001, 1996, 2002, 1996, 1996, 1996, 1996, 2003, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2004, 1996, 1996, 1996, 2004, 2005, 1996, 1996, 1996, 2005, - 2006, 1996, 1996, 1996, 1996, 2006, 2007, 1996, 1996, 1996, - 2007, 2008, 1996, 2009, 1996, 2008, 2008, 2002, 2002, 1996, - 2010, 2003, 2010, 2003, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2010, 1, 2011, 2011, 2012, 2012, 2013, 2013, 2014, 2014, + 2015, 2015, 2010, 2016, 2010, 2010, 2010, 2010, 2017, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2018, 2010, 2010, 2010, 2018, 2019, 2010, 2010, 2010, 2019, + 2020, 2010, 2010, 2010, 2010, 2020, 2021, 2010, 2010, 2010, + 2021, 2022, 2010, 2023, 2010, 2022, 2022, 2016, 2016, 2010, + 2024, 2017, 2024, 2017, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2004, 2004, - 2005, 2005, 2006, 2006, 1996, 2007, 2007, 2008, 2008, 2009, - 2009, 2008, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2018, + 2018, 2019, 2019, 2020, 2020, 2010, 2021, 2021, 2022, 2022, + 2023, 2023, 2022, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2008, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2008, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2022, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2022, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2008, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2010, 2022, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2008, 2002, 2002, 2002, 2002, 2002, 1996, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2022, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 1996, 1996, 2002, 1996, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2010, 2010, + 2016, 2010, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2008, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2022, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, - 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2008, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2010, 2016, 2022, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 1996, 2002, 1996, 2002, 2002, 2002, 1996, - 2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2010, 2016, + 2016, 2016, 2010, 2016, 2010, 2016, 2016, 2010, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 1996, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2010, + 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 1996, 2002, 2002, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 1996, 2002, 1996, 2002, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2016, 2010, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2010, 2016, 2010, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2010, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2010, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 1996, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2010, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2010, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 1996, 2002, - 2002, 1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, - 2002, 2002, 2002, 1996, 1996, 1996, 2002, 1996, 2002, 1996, - 1996, 2002, 2002, 1996, 2002, 1996, 2002, 2002, 2002, 2002, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2010, 2016, 2016, 2016, + 2016, 2016, 2010, 2016, 2016, 2010, 2016, 2010, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2010, 2010, 2016, 2016, 2016, 2016, 2016, 2010, 2010, 2010, - 2002, 1996, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 1996, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 1996, 1996, 1996, 2002, + 2016, 2010, 2016, 2010, 2010, 2016, 2016, 2010, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2010, 2016, 2010, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2010, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002, - 2002, 1996, 2002, 1996, 2002, 1996, 1996, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 1996, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, + 2010, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2010, 2010, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2010, 2016, 2016, 2016, 2010, 2016, 2010, 2016, 2010, + 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2010, 2016, 2016, 2016, 2016, 2010, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, - 2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 1996, 1996, - 1996, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002, 1996, 2002, - 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002, + 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2010, 2016, 2016, 2016, 2010, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, + 2010, 2016, 2010, 2010, 2010, 2016, 2016, 2016, 2010, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2010, + 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2010, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, - 2002, 2002, 2002, 2002, 2002, 2002, 1996, 2002, 1996, 1996, - 1996, 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 1996, 2002, 2002, 2002, 1996, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 1996, 1996, 2002, 1996, 2002, - 2002, 2002, 1996, 1996, 1996, 2002, 1996, 2002, 1996, 2002, - 2002, 2002, 1996, 2002, 2002, 1996, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 1996, 2002, 1996, 2002, 1996, 2002, 2002, 1996, 2002, 2002, - 2002, 2002, 1996, 1996, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 1996, 1996, 2002, 1996, 2002, 2002, 2002, 1996, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2010, 2016, 2010, 2010, 2010, 2016, 2010, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2010, 2016, 2016, 2016, 2010, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, + 2010, 2016, 2010, 2016, 2016, 2016, 2010, 2010, 2010, 2016, + 2010, 2016, 2010, 2016, 2016, 2016, 2010, 2016, 2016, 2010, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2010, 2016, 2010, 2016, 2010, 2016, + 2016, 2010, 2016, 2016, 2016, 2016, 2010, 2010, 2016, 2016, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 1996, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 1996, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 1996, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, 2002, - 2002, 2002, 2002, 2002, 1996, 2002, 1996, 1996, 2002, 2002, - 2002, 2002, 2002, 1996, 1996, 0, 1996, 1996, 1996, 1996, + 2016, 2016, 2016, 2016, 2016, 2010, 2010, 2010, 2016, 2010, + 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2010, 2010, 2016, 2016, 2016, + 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2010, 2016, 2016, 2016, 2016, 2016, + 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2016, 2010, 2016, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996 + 2010, 2010, 2016, 2016, 2016, 2016, 2016, 2010, 2010, 0, + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, + 2010, 2010, 2010, 2010 } ; -static yyconst flex_uint16_t yy_nxt[3979] = +static yyconst flex_uint16_t yy_nxt[4010] = { 0, 14, 15, 16, 17, 18, 19, 18, 14, 14, 14, 14, 18, 20, 21, 14, 22, 23, 24, 25, 14, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 14, 14, 14, 14, 42, - 43, 44, 42, 43, 44, 131, 47, 48, 131, 45, + 43, 44, 42, 43, 44, 132, 47, 48, 132, 45, 49, 70, 45, 47, 48, 71, 50, 49, 58, 59, 60, 69, 69, 50, 52, 53, 54, 55, 61, 18, - 58, 59, 60, 129, 129, 56, 52, 53, 54, 55, - 61, 18, 69, 106, 234, 75, 76, 56, 15, 16, + 58, 59, 60, 130, 130, 56, 52, 53, 54, 55, + 61, 18, 69, 106, 236, 75, 76, 56, 15, 16, 17, 63, 64, 65, 68, 68, 69, 68, 68, 66, - 68, 97, 69, 77, 69, 68, 86, 143, 67, 15, + 68, 97, 69, 77, 69, 68, 86, 144, 67, 15, 16, 17, 63, 64, 65, 69, 69, 78, 69, 90, - 66, 69, 88, 69, 79, 131, 87, 91, 131, 67, - 73, 80, 73, 73, 69, 73, 89, 154, 96, 69, - 73, 74, 69, 92, 136, 136, 93, 81, 69, 98, - 69, 82, 139, 94, 83, 95, 84, 85, 69, 99, - 69, 103, 112, 180, 69, 104, 142, 100, 70, 117, - 69, 113, 71, 101, 69, 114, 69, 102, 144, 118, - 69, 105, 69, 119, 120, 115, 69, 107, 116, 146, - 69, 108, 69, 121, 124, 122, 145, 109, 139, 125, + 66, 69, 88, 69, 79, 132, 87, 91, 132, 67, + 73, 80, 73, 73, 69, 73, 89, 155, 96, 69, + 73, 74, 69, 92, 137, 137, 93, 81, 69, 98, + 69, 82, 140, 94, 83, 95, 84, 85, 69, 99, + 69, 103, 112, 140, 125, 104, 143, 100, 70, 126, + 69, 113, 71, 101, 69, 114, 69, 102, 145, 69, + 69, 105, 69, 69, 122, 115, 123, 107, 116, 69, + 127, 108, 69, 150, 128, 69, 146, 109, 129, 156, - 110, 69, 147, 69, 126, 69, 164, 111, 127, 155, - 123, 133, 128, 133, 133, 73, 133, 73, 73, 138, - 73, 138, 138, 148, 138, 68, 141, 68, 68, 69, - 68, 69, 69, 69, 139, 68, 73, 69, 73, 73, - 156, 73, 69, 149, 160, 69, 73, 74, 150, 152, - 153, 158, 159, 69, 151, 69, 69, 69, 157, 69, - 163, 69, 166, 170, 69, 167, 69, 69, 69, 172, - 174, 161, 69, 162, 175, 165, 171, 69, 168, 169, - 69, 178, 69, 69, 69, 69, 177, 179, 69, 173, - 176, 181, 69, 69, 69, 182, 185, 69, 190, 69, + 110, 124, 69, 191, 140, 69, 161, 111, 69, 134, + 149, 134, 134, 117, 134, 73, 118, 73, 73, 139, + 73, 139, 139, 119, 139, 160, 142, 120, 121, 68, + 69, 68, 68, 147, 68, 69, 69, 138, 69, 68, + 73, 151, 73, 73, 157, 73, 148, 152, 69, 69, + 73, 74, 159, 69, 153, 154, 69, 69, 69, 69, + 164, 69, 158, 165, 167, 171, 162, 168, 69, 69, + 69, 163, 69, 166, 173, 175, 172, 69, 69, 176, + 169, 170, 179, 69, 69, 69, 69, 69, 69, 69, + 180, 178, 177, 182, 174, 69, 69, 181, 183, 186, - 69, 69, 69, 183, 187, 189, 184, 69, 188, 69, - 196, 186, 69, 192, 191, 69, 193, 69, 198, 69, - 69, 194, 69, 69, 197, 195, 69, 200, 203, 69, - 69, 69, 129, 129, 205, 201, 208, 237, 199, 137, - 207, 202, 206, 133, 139, 133, 133, 209, 133, 204, - 136, 136, 138, 69, 138, 138, 73, 138, 73, 73, - 69, 73, 69, 211, 69, 210, 69, 141, 69, 69, - 69, 69, 213, 216, 135, 218, 220, 212, 69, 217, - 69, 219, 69, 221, 215, 214, 222, 223, 69, 69, - 69, 69, 69, 230, 69, 232, 69, 231, 69, 233, + 69, 69, 69, 69, 194, 188, 185, 184, 69, 189, + 69, 69, 198, 69, 187, 69, 193, 69, 69, 200, + 69, 190, 192, 69, 197, 199, 69, 195, 196, 69, + 69, 205, 69, 202, 69, 207, 203, 69, 208, 201, + 130, 130, 210, 134, 204, 134, 134, 136, 134, 214, + 209, 69, 206, 137, 137, 139, 212, 139, 139, 73, + 139, 73, 73, 140, 73, 69, 211, 213, 69, 69, + 142, 69, 69, 215, 69, 220, 69, 69, 69, 223, + 69, 221, 222, 219, 217, 224, 225, 216, 69, 69, + 69, 218, 69, 232, 234, 233, 69, 69, 69, 69, - 235, 69, 69, 236, 69, 69, 241, 242, 69, 224, - 69, 261, 69, 243, 225, 134, 238, 239, 69, 226, - 240, 69, 244, 250, 227, 69, 251, 245, 69, 69, - 228, 229, 248, 252, 249, 254, 69, 257, 69, 246, - 69, 247, 69, 69, 253, 255, 259, 260, 258, 69, - 256, 69, 69, 69, 69, 69, 69, 69, 69, 263, - 69, 265, 262, 69, 69, 267, 69, 69, 269, 69, - 132, 268, 272, 69, 264, 270, 276, 69, 266, 278, - 69, 69, 69, 69, 271, 280, 69, 279, 273, 277, - 69, 274, 275, 69, 283, 282, 139, 284, 286, 69, + 69, 235, 237, 69, 238, 69, 69, 69, 226, 69, + 69, 239, 244, 227, 69, 240, 69, 241, 228, 245, + 242, 243, 251, 229, 301, 69, 246, 252, 69, 230, + 231, 247, 69, 69, 253, 254, 250, 256, 69, 259, + 69, 69, 69, 248, 69, 249, 255, 257, 69, 258, + 261, 262, 69, 260, 264, 69, 69, 69, 69, 263, + 69, 69, 69, 265, 69, 69, 267, 69, 69, 69, + 269, 69, 271, 69, 274, 69, 276, 270, 266, 279, + 272, 69, 69, 268, 69, 69, 69, 281, 273, 282, + 69, 277, 278, 275, 283, 280, 69, 286, 287, 69, - 69, 281, 69, 69, 69, 69, 287, 293, 290, 289, - 69, 295, 69, 292, 69, 294, 69, 69, 291, 69, - 285, 69, 69, 288, 301, 300, 69, 69, 302, 296, - 299, 69, 303, 298, 304, 297, 69, 69, 69, 305, - 69, 306, 69, 307, 69, 309, 69, 312, 310, 69, - 69, 308, 69, 314, 69, 311, 69, 315, 69, 316, - 317, 69, 69, 313, 69, 69, 69, 322, 69, 69, - 318, 323, 69, 69, 69, 327, 325, 321, 69, 319, - 69, 330, 69, 320, 69, 331, 69, 324, 69, 69, - 69, 326, 329, 333, 69, 69, 328, 69, 337, 69, + 69, 289, 285, 69, 140, 284, 69, 69, 69, 290, + 69, 69, 296, 69, 69, 298, 293, 69, 295, 297, + 69, 288, 69, 292, 69, 135, 291, 294, 299, 300, + 302, 69, 69, 69, 304, 305, 69, 306, 307, 69, + 308, 69, 69, 309, 69, 69, 69, 69, 310, 303, + 312, 69, 315, 317, 314, 313, 69, 69, 69, 311, + 316, 69, 318, 69, 320, 69, 69, 69, 319, 69, + 69, 325, 69, 69, 69, 326, 321, 69, 328, 69, + 324, 69, 330, 322, 69, 333, 69, 323, 69, 334, + 69, 327, 69, 69, 69, 329, 332, 331, 69, 133, - 332, 334, 335, 69, 336, 341, 342, 339, 130, 340, - 347, 338, 343, 69, 69, 69, 345, 344, 69, 346, - 350, 69, 69, 69, 348, 69, 352, 349, 351, 69, - 69, 69, 69, 357, 354, 69, 69, 353, 69, 360, - 359, 361, 355, 69, 69, 69, 69, 69, 367, 69, - 69, 356, 358, 69, 366, 368, 69, 362, 69, 369, - 363, 374, 372, 364, 69, 365, 69, 370, 69, 371, - 373, 139, 69, 69, 428, 385, 69, 375, 376, 69, - 386, 377, 378, 384, 387, 69, 69, 390, 69, 69, - 69, 379, 388, 380, 381, 382, 391, 392, 383, 69, + 335, 336, 340, 69, 69, 344, 345, 346, 69, 337, + 338, 342, 339, 69, 69, 341, 343, 347, 69, 69, + 69, 353, 69, 69, 69, 355, 69, 351, 354, 352, + 348, 69, 69, 349, 350, 69, 357, 360, 69, 69, + 69, 356, 69, 69, 358, 362, 69, 69, 363, 365, + 69, 366, 372, 367, 364, 359, 69, 69, 361, 371, + 69, 373, 69, 368, 69, 69, 369, 69, 370, 69, + 379, 69, 391, 374, 140, 69, 392, 69, 69, 377, + 389, 375, 376, 378, 390, 381, 380, 69, 69, 382, + 383, 397, 69, 69, 69, 393, 69, 394, 69, 384, - 69, 69, 69, 398, 69, 389, 396, 69, 69, 394, - 399, 393, 402, 69, 395, 397, 400, 69, 69, 405, - 406, 401, 69, 404, 69, 69, 69, 69, 69, 403, - 411, 69, 69, 69, 69, 69, 412, 413, 69, 69, - 430, 408, 409, 69, 407, 410, 69, 416, 418, 415, - 69, 419, 414, 69, 420, 69, 422, 69, 69, 425, - 417, 69, 421, 424, 423, 69, 69, 69, 431, 432, - 426, 429, 69, 69, 69, 69, 433, 69, 427, 69, - 435, 69, 69, 439, 69, 438, 436, 69, 69, 440, - 69, 437, 69, 442, 434, 69, 443, 69, 445, 69, + 69, 385, 386, 387, 69, 401, 388, 395, 396, 69, + 403, 69, 69, 400, 399, 69, 398, 407, 69, 402, + 69, 69, 69, 405, 69, 409, 406, 410, 411, 404, + 69, 69, 69, 69, 408, 416, 69, 69, 69, 69, + 413, 412, 417, 418, 69, 69, 415, 414, 69, 69, + 424, 420, 69, 421, 419, 427, 425, 423, 426, 69, + 69, 69, 69, 69, 69, 69, 422, 429, 430, 69, + 431, 69, 433, 69, 434, 69, 435, 69, 436, 437, + 428, 69, 432, 69, 69, 438, 69, 442, 440, 69, + 69, 444, 69, 443, 439, 441, 69, 445, 69, 447, - 69, 69, 69, 69, 69, 453, 446, 69, 441, 444, - 69, 69, 448, 454, 69, 456, 455, 452, 457, 447, - 449, 451, 450, 69, 458, 69, 69, 69, 69, 69, - 462, 69, 69, 464, 69, 476, 460, 69, 69, 69, - 69, 478, 463, 69, 69, 477, 461, 459, 465, 69, - 466, 69, 467, 69, 473, 475, 474, 468, 69, 469, - 69, 480, 69, 479, 69, 482, 69, 470, 483, 481, - 471, 487, 69, 485, 484, 69, 69, 472, 69, 139, - 488, 489, 69, 493, 494, 486, 69, 69, 492, 69, - 69, 69, 69, 491, 69, 490, 499, 69, 495, 498, + 69, 448, 69, 69, 69, 69, 69, 69, 69, 458, + 69, 450, 69, 451, 69, 69, 69, 446, 453, 69, + 460, 459, 69, 449, 457, 452, 454, 456, 455, 462, + 461, 463, 69, 465, 69, 69, 69, 466, 467, 69, + 69, 69, 69, 469, 69, 69, 471, 69, 69, 69, + 69, 485, 483, 69, 464, 470, 468, 69, 472, 69, + 487, 482, 484, 473, 69, 474, 69, 480, 481, 69, + 475, 69, 476, 486, 69, 488, 69, 489, 69, 69, + 477, 490, 69, 478, 492, 69, 491, 495, 496, 69, + 479, 69, 140, 494, 501, 499, 500, 493, 69, 69, - 69, 501, 69, 497, 500, 496, 69, 69, 69, 504, - 503, 69, 502, 505, 506, 509, 69, 69, 507, 510, - 69, 508, 512, 69, 513, 69, 514, 515, 69, 511, - 517, 69, 516, 69, 69, 69, 69, 69, 518, 519, - 522, 521, 69, 69, 69, 69, 523, 526, 524, 69, - 69, 69, 69, 529, 527, 520, 69, 69, 530, 69, - 533, 69, 531, 69, 525, 528, 535, 69, 536, 69, - 69, 538, 69, 540, 532, 534, 69, 543, 539, 69, - 69, 537, 69, 541, 69, 544, 69, 69, 69, 550, - 69, 547, 69, 69, 69, 552, 551, 546, 545, 69, + 69, 69, 131, 69, 497, 69, 498, 506, 69, 69, + 502, 505, 69, 69, 504, 508, 510, 507, 503, 69, + 69, 509, 69, 69, 512, 513, 516, 511, 69, 69, + 517, 69, 519, 69, 520, 69, 522, 69, 521, 514, + 69, 518, 515, 69, 523, 69, 524, 69, 69, 69, + 525, 69, 526, 528, 69, 529, 69, 533, 530, 527, + 69, 531, 69, 69, 69, 69, 69, 69, 532, 534, + 536, 69, 540, 69, 69, 537, 69, 535, 542, 538, + 545, 543, 69, 539, 541, 69, 69, 69, 544, 547, + 69, 546, 550, 69, 548, 69, 69, 69, 551, 69, - 549, 69, 553, 548, 69, 542, 554, 557, 69, 559, - 69, 555, 69, 558, 69, 561, 69, 562, 556, 560, - 69, 563, 69, 69, 566, 69, 69, 69, 69, 69, - 568, 570, 69, 564, 567, 571, 565, 69, 69, 572, - 69, 69, 69, 573, 575, 569, 69, 574, 69, 69, - 576, 69, 580, 69, 69, 577, 69, 578, 581, 586, - 69, 69, 69, 589, 69, 69, 579, 69, 582, 583, - 69, 585, 592, 584, 590, 69, 591, 69, 69, 587, - 588, 69, 69, 69, 69, 596, 69, 597, 69, 599, - 598, 593, 69, 600, 595, 69, 594, 69, 69, 602, + 69, 557, 554, 69, 69, 69, 69, 69, 559, 553, + 558, 552, 556, 69, 69, 555, 549, 560, 561, 69, + 564, 562, 69, 566, 637, 69, 69, 565, 69, 567, + 69, 69, 569, 563, 69, 568, 570, 69, 573, 69, + 69, 69, 69, 69, 571, 575, 577, 572, 574, 578, + 69, 580, 69, 579, 69, 69, 69, 582, 584, 69, + 576, 69, 69, 69, 69, 581, 69, 69, 589, 69, + 69, 583, 69, 69, 69, 590, 69, 585, 69, 586, + 595, 587, 591, 588, 69, 69, 69, 592, 594, 593, + 599, 596, 69, 597, 69, 598, 69, 603, 69, 69, - 139, 69, 69, 69, 601, 606, 603, 605, 69, 604, - 69, 607, 69, 610, 608, 69, 69, 69, 613, 69, - 617, 611, 609, 69, 612, 69, 69, 618, 621, 615, - 69, 616, 69, 69, 619, 620, 614, 69, 69, 69, - 69, 632, 622, 631, 69, 627, 623, 629, 69, 624, - 628, 69, 633, 69, 630, 69, 625, 69, 641, 626, - 69, 634, 635, 69, 636, 69, 644, 637, 69, 642, - 645, 69, 638, 69, 647, 646, 69, 654, 639, 640, - 643, 69, 649, 69, 69, 69, 69, 651, 650, 69, - 652, 648, 69, 69, 653, 69, 69, 659, 69, 69, + 602, 601, 69, 600, 69, 69, 605, 606, 69, 608, + 69, 604, 607, 609, 69, 69, 69, 69, 140, 69, + 69, 611, 616, 615, 612, 69, 614, 69, 610, 617, + 613, 69, 619, 622, 69, 69, 621, 69, 69, 624, + 620, 618, 69, 627, 69, 69, 69, 69, 69, 625, + 69, 69, 628, 642, 623, 69, 641, 639, 69, 638, + 626, 69, 636, 629, 69, 640, 140, 69, 69, 650, + 69, 630, 69, 653, 654, 69, 69, 631, 69, 656, + 69, 632, 662, 655, 633, 651, 69, 69, 658, 69, + 69, 634, 660, 652, 635, 69, 643, 644, 69, 645, - 69, 69, 139, 658, 69, 655, 664, 665, 69, 656, - 666, 69, 657, 660, 661, 69, 663, 662, 667, 69, - 69, 69, 668, 69, 69, 69, 669, 69, 69, 670, - 675, 69, 671, 673, 674, 676, 69, 69, 69, 679, - 677, 69, 69, 672, 69, 678, 69, 69, 69, 683, - 681, 682, 69, 685, 69, 69, 69, 680, 688, 69, - 69, 684, 69, 686, 691, 69, 689, 69, 69, 69, - 69, 69, 69, 697, 69, 69, 696, 690, 687, 700, - 69, 692, 693, 69, 69, 69, 701, 694, 695, 698, - 703, 699, 704, 69, 702, 705, 707, 706, 708, 69, + 69, 657, 646, 659, 69, 661, 69, 647, 69, 664, + 69, 69, 668, 648, 649, 69, 663, 69, 667, 69, + 69, 674, 69, 69, 675, 138, 665, 666, 673, 69, + 669, 670, 672, 676, 69, 69, 69, 671, 69, 677, + 678, 69, 69, 679, 69, 69, 69, 685, 69, 680, + 682, 683, 69, 688, 69, 69, 69, 69, 69, 69, + 681, 686, 687, 69, 69, 684, 690, 692, 691, 69, + 693, 69, 694, 69, 689, 69, 697, 699, 695, 700, + 69, 69, 69, 69, 698, 69, 69, 702, 69, 69, + 69, 69, 69, 696, 708, 69, 136, 707, 69, 69, - 69, 69, 69, 69, 709, 69, 714, 69, 715, 69, - 713, 716, 717, 69, 711, 69, 69, 69, 710, 720, - 722, 69, 712, 69, 69, 724, 139, 69, 719, 69, - 69, 718, 69, 726, 69, 69, 69, 721, 69, 737, - 738, 723, 725, 69, 69, 69, 69, 69, 729, 727, - 741, 69, 69, 768, 69, 730, 728, 69, 739, 743, - 731, 744, 732, 69, 69, 745, 733, 742, 734, 740, - 69, 69, 69, 735, 746, 69, 748, 750, 736, 747, - 69, 69, 137, 755, 752, 69, 749, 754, 69, 751, - 756, 69, 69, 69, 753, 69, 757, 762, 763, 69, + 711, 69, 701, 69, 703, 704, 69, 714, 705, 706, + 709, 712, 713, 718, 710, 715, 69, 719, 69, 69, + 717, 69, 69, 716, 69, 720, 69, 69, 69, 726, + 727, 724, 69, 69, 69, 69, 722, 728, 721, 69, + 731, 733, 69, 69, 723, 69, 730, 69, 725, 69, + 729, 735, 140, 737, 69, 69, 69, 69, 135, 732, + 69, 734, 736, 69, 748, 69, 69, 69, 69, 749, + 740, 69, 752, 738, 69, 750, 754, 741, 69, 739, + 69, 753, 757, 742, 69, 743, 69, 69, 755, 744, + 69, 745, 751, 69, 69, 759, 746, 69, 756, 761, - 69, 758, 69, 759, 69, 766, 764, 767, 69, 771, - 69, 765, 69, 773, 760, 69, 772, 69, 69, 770, - 774, 761, 769, 69, 777, 69, 69, 69, 69, 69, - 778, 69, 69, 69, 775, 69, 776, 780, 69, 69, - 781, 783, 69, 782, 785, 779, 791, 69, 69, 69, - 69, 69, 784, 69, 69, 786, 787, 789, 788, 790, - 69, 69, 799, 798, 69, 795, 792, 793, 794, 796, - 69, 800, 69, 69, 803, 797, 69, 69, 804, 69, - 69, 805, 69, 69, 806, 801, 807, 69, 69, 802, - 69, 808, 69, 812, 69, 69, 69, 69, 69, 69, + 762, 747, 758, 69, 941, 760, 69, 766, 69, 765, + 69, 764, 69, 69, 763, 767, 69, 69, 768, 69, + 773, 69, 776, 769, 774, 770, 778, 775, 69, 777, + 69, 69, 69, 782, 69, 69, 771, 784, 779, 783, + 69, 69, 69, 772, 785, 780, 69, 69, 788, 69, + 69, 781, 69, 69, 789, 69, 69, 69, 69, 786, + 787, 791, 796, 69, 792, 790, 793, 794, 69, 69, + 69, 69, 802, 69, 69, 795, 69, 69, 69, 800, + 801, 69, 798, 797, 133, 69, 806, 812, 69, 799, + 807, 69, 803, 805, 804, 811, 808, 809, 69, 810, - 815, 816, 809, 810, 817, 69, 821, 811, 820, 69, - 814, 819, 69, 813, 69, 818, 69, 823, 69, 69, - 69, 828, 69, 69, 69, 69, 69, 829, 830, 69, - 822, 69, 832, 827, 824, 835, 833, 825, 69, 826, - 69, 836, 831, 834, 69, 69, 69, 839, 69, 838, - 69, 69, 843, 837, 69, 69, 69, 69, 69, 69, - 69, 69, 842, 852, 840, 841, 845, 69, 69, 135, - 69, 853, 844, 69, 846, 849, 69, 69, 848, 69, - 851, 69, 850, 847, 854, 69, 855, 856, 69, 860, - 858, 857, 69, 69, 69, 864, 69, 69, 69, 861, + 69, 69, 814, 69, 69, 816, 815, 69, 817, 69, + 69, 69, 818, 69, 69, 69, 69, 813, 823, 69, + 69, 69, 69, 820, 819, 826, 821, 827, 69, 69, + 69, 828, 825, 822, 829, 824, 831, 830, 832, 69, + 69, 69, 69, 69, 835, 69, 69, 834, 840, 833, + 69, 69, 69, 69, 69, 841, 842, 844, 69, 839, + 836, 69, 837, 847, 69, 838, 848, 69, 69, 845, + 843, 69, 850, 846, 851, 69, 69, 69, 69, 849, + 855, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 854, 853, 857, 864, 131, 852, 876, 69, 69, 856, - 69, 69, 69, 859, 69, 869, 867, 870, 862, 69, - 69, 865, 69, 863, 69, 873, 866, 871, 69, 69, - 69, 868, 69, 872, 876, 69, 69, 875, 69, 69, - 878, 69, 874, 880, 69, 881, 69, 69, 69, 877, - 69, 879, 69, 882, 885, 69, 69, 69, 886, 884, - 883, 890, 69, 894, 69, 69, 69, 887, 69, 69, - 889, 888, 891, 893, 896, 69, 892, 69, 69, 895, - 898, 899, 897, 900, 69, 69, 905, 901, 69, 69, - 69, 69, 903, 908, 69, 909, 902, 904, 69, 907, - 69, 69, 906, 69, 69, 910, 69, 914, 912, 913, + 69, 858, 861, 865, 862, 860, 69, 863, 69, 69, + 859, 866, 69, 69, 867, 69, 69, 69, 69, 872, + 870, 69, 69, 69, 873, 69, 868, 869, 69, 69, + 881, 871, 69, 874, 879, 69, 877, 882, 69, 69, + 875, 878, 883, 69, 69, 880, 885, 69, 69, 69, + 69, 69, 884, 887, 888, 890, 69, 886, 69, 69, + 892, 69, 69, 69, 69, 69, 889, 891, 893, 897, + 895, 69, 69, 894, 69, 898, 896, 69, 902, 69, + 906, 69, 69, 899, 69, 69, 900, 69, 905, 901, + 908, 69, 903, 912, 904, 907, 910, 913, 69, 911, - 911, 69, 69, 69, 69, 1113, 919, 916, 920, 69, - 915, 69, 69, 69, 921, 69, 922, 917, 69, 928, - 69, 69, 918, 69, 929, 931, 69, 69, 69, 69, - 932, 930, 923, 69, 69, 69, 939, 924, 934, 925, - 69, 926, 935, 927, 69, 933, 936, 69, 937, 940, - 69, 69, 938, 941, 944, 69, 946, 69, 942, 69, - 69, 69, 947, 950, 69, 948, 945, 69, 952, 69, - 69, 69, 955, 69, 69, 943, 953, 69, 69, 69, - 949, 69, 957, 134, 959, 69, 958, 951, 69, 960, - 69, 954, 963, 69, 956, 965, 962, 966, 69, 961, + 69, 69, 69, 69, 909, 69, 917, 69, 920, 69, + 921, 919, 69, 69, 69, 915, 916, 922, 69, 914, + 918, 69, 69, 923, 69, 926, 924, 925, 69, 69, + 69, 931, 929, 932, 928, 69, 69, 927, 69, 69, + 933, 69, 940, 934, 69, 69, 69, 69, 930, 69, + 943, 69, 69, 69, 69, 942, 946, 947, 935, 951, + 944, 948, 69, 936, 69, 937, 69, 938, 949, 939, + 945, 69, 950, 69, 69, 953, 957, 69, 952, 956, + 69, 959, 69, 69, 69, 69, 960, 963, 69, 954, + 961, 69, 965, 69, 69, 958, 69, 69, 955, 966, - 69, 69, 69, 967, 968, 69, 964, 69, 69, 69, - 969, 972, 69, 69, 69, 976, 69, 69, 971, 69, - 69, 69, 69, 69, 970, 69, 982, 69, 973, 980, - 977, 987, 69, 974, 69, 69, 978, 975, 69, 979, - 981, 983, 69, 986, 69, 985, 991, 989, 984, 69, - 992, 69, 69, 993, 990, 69, 69, 988, 995, 997, - 994, 69, 69, 996, 69, 998, 999, 69, 69, 69, - 69, 69, 69, 69, 1003, 69, 1006, 69, 69, 1025, - 69, 1000, 69, 69, 69, 69, 1002, 1009, 1004, 69, - 1014, 1005, 1008, 1001, 1010, 1007, 1015, 1011, 1012, 69, + 968, 69, 69, 962, 69, 971, 69, 69, 69, 970, + 69, 964, 972, 69, 973, 976, 975, 967, 69, 69, + 978, 979, 969, 69, 974, 69, 69, 981, 980, 69, + 69, 977, 69, 69, 985, 69, 69, 69, 982, 986, + 989, 69, 69, 69, 984, 69, 69, 69, 69, 983, + 69, 995, 69, 69, 69, 990, 987, 69, 993, 999, + 988, 991, 992, 996, 69, 994, 1000, 69, 69, 1002, + 998, 69, 69, 997, 1004, 69, 1001, 69, 1005, 69, + 1006, 1011, 69, 1007, 1008, 1010, 1009, 1003, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 1016, 1012, - 69, 69, 69, 1013, 1016, 69, 69, 69, 1023, 1024, - 1018, 1020, 1022, 69, 69, 69, 1026, 1019, 1017, 1027, - 69, 69, 69, 69, 69, 1028, 69, 1021, 69, 1031, - 1034, 1029, 1036, 69, 1035, 69, 1037, 69, 69, 69, - 1032, 1030, 69, 69, 69, 69, 69, 1033, 69, 1045, - 69, 1044, 69, 1038, 69, 69, 69, 1039, 1040, 69, - 69, 1041, 1054, 1043, 1050, 1046, 69, 1047, 132, 1042, - 69, 1048, 69, 1053, 1049, 1052, 69, 1051, 1055, 1056, - 69, 1057, 69, 1059, 69, 69, 1058, 69, 69, 69, - 1062, 1066, 69, 1060, 1063, 69, 69, 69, 1061, 1071, + 1019, 69, 69, 69, 69, 69, 69, 69, 1013, 69, + 1015, 69, 1017, 1033, 1022, 1018, 1021, 1014, 1023, 1020, + 1024, 1025, 1026, 69, 69, 69, 69, 1030, 1027, 69, + 1029, 1028, 1034, 69, 1036, 1031, 1037, 69, 1035, 69, + 69, 69, 69, 1038, 1032, 69, 1039, 1040, 69, 69, + 69, 69, 69, 1041, 1045, 1043, 1044, 1047, 69, 1042, + 1049, 1048, 69, 69, 1050, 69, 69, 69, 69, 69, + 69, 1046, 1058, 69, 69, 69, 1057, 69, 1051, 69, + 69, 69, 1052, 69, 1066, 1053, 1054, 2010, 1056, 1063, + 69, 69, 1059, 1060, 1055, 1069, 69, 69, 1061, 1062, - 1067, 1068, 69, 69, 69, 1069, 69, 1064, 1073, 1065, - 69, 1074, 1075, 1076, 69, 69, 1070, 69, 1077, 69, - 1072, 69, 1078, 69, 1079, 69, 1080, 69, 69, 69, - 1081, 1086, 69, 1084, 69, 69, 69, 1089, 1087, 69, - 69, 1083, 69, 69, 1085, 69, 1092, 69, 1082, 69, - 1094, 1091, 1095, 69, 69, 1088, 69, 1098, 69, 1099, - 69, 1090, 1093, 1097, 69, 1096, 69, 69, 69, 1104, - 69, 1106, 1108, 1102, 69, 1105, 69, 69, 1100, 69, - 1101, 1110, 69, 69, 69, 69, 1103, 69, 1107, 69, - 1112, 69, 1114, 1109, 1116, 69, 1122, 1115, 1117, 1120, + 1067, 69, 1064, 1068, 69, 1065, 1070, 69, 1071, 69, + 69, 69, 69, 1075, 1079, 69, 69, 1076, 1073, 69, + 1072, 1080, 69, 1074, 69, 69, 1081, 2010, 1084, 69, + 1077, 69, 1078, 69, 1085, 69, 1087, 1082, 69, 1088, + 1089, 1090, 69, 1086, 1083, 69, 1091, 69, 69, 69, + 69, 1094, 1093, 69, 1096, 69, 69, 69, 1100, 69, + 69, 1098, 69, 69, 1092, 69, 1101, 69, 1095, 1097, + 69, 1103, 1099, 69, 69, 69, 1105, 1106, 69, 1108, + 1102, 1109, 69, 69, 1112, 1104, 1107, 69, 69, 69, + 69, 69, 1111, 1110, 1113, 69, 69, 1118, 1120, 1116, - 69, 1118, 1111, 69, 69, 1121, 69, 1126, 1123, 1125, - 69, 1127, 69, 1119, 1124, 69, 69, 69, 1131, 69, - 1133, 69, 69, 69, 1132, 69, 69, 1135, 1136, 69, - 69, 1137, 69, 1128, 69, 1129, 69, 1130, 1144, 69, - 69, 69, 69, 69, 1134, 69, 69, 130, 1138, 69, - 1141, 1142, 1139, 1143, 1140, 1149, 69, 69, 69, 1147, - 69, 1145, 1146, 1151, 69, 69, 69, 1148, 69, 1150, - 69, 1153, 1152, 1162, 1154, 69, 1156, 1155, 1160, 69, - 1163, 1157, 1161, 69, 69, 69, 1158, 69, 69, 69, - 1170, 1171, 69, 1159, 1165, 69, 69, 1169, 1167, 69, + 69, 1119, 69, 69, 1122, 1124, 69, 1114, 1115, 69, + 69, 1117, 69, 69, 69, 1128, 1123, 69, 1126, 69, + 1121, 69, 69, 69, 2010, 1131, 1136, 1134, 1132, 1125, + 69, 1129, 69, 69, 69, 1135, 69, 1127, 1137, 1139, + 1133, 1130, 1140, 69, 1141, 69, 69, 69, 1138, 1145, + 69, 1147, 1142, 69, 69, 1146, 69, 69, 1150, 69, + 69, 69, 1149, 69, 1143, 1151, 1144, 69, 69, 69, + 1158, 69, 69, 69, 69, 69, 1148, 69, 69, 1152, + 69, 1156, 1155, 1153, 1157, 1163, 69, 1154, 1161, 69, + 69, 69, 1159, 1160, 1165, 69, 69, 69, 1162, 69, - 1164, 1168, 69, 69, 69, 69, 1166, 69, 69, 69, - 1180, 69, 1173, 69, 69, 69, 1172, 1175, 69, 1177, - 1174, 1176, 1182, 1183, 69, 1184, 1179, 1181, 69, 1178, - 1189, 69, 1188, 1190, 69, 69, 1191, 1186, 1192, 1185, - 1187, 69, 69, 69, 1195, 69, 69, 1193, 69, 69, - 69, 1197, 69, 69, 1194, 1196, 1204, 1198, 1200, 1201, - 69, 69, 69, 69, 1199, 1207, 69, 69, 69, 69, - 1202, 1209, 1203, 1210, 1211, 69, 1205, 69, 69, 69, - 1206, 69, 1212, 1208, 1213, 1216, 69, 69, 69, 69, - 69, 69, 1222, 69, 1215, 1217, 1218, 69, 69, 1219, + 1164, 69, 1167, 1173, 1176, 1166, 1168, 1170, 69, 1169, + 69, 1171, 1174, 69, 1175, 69, 1172, 69, 1180, 1179, + 69, 69, 1177, 1184, 1178, 1185, 69, 69, 69, 1181, + 1183, 69, 1182, 69, 69, 69, 69, 69, 69, 69, + 1194, 69, 2010, 69, 1187, 69, 69, 1186, 1189, 1191, + 69, 1188, 1190, 69, 1196, 1197, 1193, 1195, 69, 1198, + 1192, 1202, 1200, 1203, 1204, 1201, 69, 1206, 69, 69, + 69, 1205, 69, 1199, 1209, 1207, 69, 69, 69, 69, + 1211, 69, 69, 69, 69, 69, 1212, 1218, 69, 1210, + 1208, 1214, 69, 69, 1215, 1221, 69, 1213, 69, 69, - 1220, 1214, 69, 1223, 1225, 1226, 69, 69, 69, 1221, - 1227, 1224, 1228, 69, 69, 1231, 69, 1230, 69, 1229, - 69, 69, 69, 69, 69, 1233, 69, 69, 69, 1237, - 1232, 1234, 69, 1235, 1243, 1238, 1242, 69, 1236, 69, - 69, 69, 69, 1241, 1247, 69, 69, 1240, 1239, 1249, - 69, 1251, 69, 1244, 69, 1253, 69, 69, 1252, 1245, - 69, 1246, 1248, 69, 1255, 1257, 1254, 1250, 1261, 69, - 69, 1259, 69, 69, 1256, 69, 1260, 69, 69, 69, - 1268, 69, 1258, 1270, 69, 69, 69, 1271, 69, 1262, - 1263, 1264, 1274, 69, 69, 69, 1265, 69, 1266, 1267, + 1216, 1219, 1223, 1217, 1224, 69, 1220, 69, 69, 69, + 1225, 69, 1226, 1222, 1230, 69, 69, 1227, 69, 69, + 69, 69, 1236, 69, 69, 1232, 1229, 69, 69, 2010, + 1231, 1233, 1228, 1234, 1239, 1237, 1240, 69, 69, 1235, + 69, 1241, 1238, 1242, 69, 1243, 69, 1245, 69, 69, + 69, 69, 69, 69, 69, 1244, 1247, 69, 69, 1248, + 69, 1246, 1251, 1252, 1249, 1256, 69, 1257, 1250, 69, + 69, 69, 69, 1261, 69, 1255, 1253, 69, 1254, 1263, + 69, 69, 1265, 69, 69, 69, 69, 1267, 1266, 1259, + 1258, 1260, 69, 69, 1269, 1271, 1268, 1262, 69, 69, - 1272, 1269, 69, 1276, 69, 1273, 69, 1279, 1280, 69, - 1282, 69, 69, 1281, 69, 1277, 69, 69, 69, 1278, - 1275, 1284, 69, 1287, 69, 1285, 69, 1283, 1291, 69, - 69, 1290, 69, 69, 1294, 69, 1295, 1293, 69, 69, - 1289, 69, 69, 1286, 1288, 1296, 69, 1297, 69, 1292, - 1301, 69, 1299, 69, 1300, 69, 1302, 1298, 69, 1305, - 69, 69, 69, 69, 69, 69, 69, 1309, 69, 1303, - 1310, 1312, 69, 69, 1311, 1306, 69, 1308, 69, 1313, - 1307, 1304, 1315, 69, 1314, 69, 1319, 1316, 1320, 69, - 1317, 69, 1321, 1318, 1323, 69, 1322, 69, 1326, 69, + 69, 69, 1264, 1270, 1273, 69, 69, 1274, 1275, 69, + 69, 1272, 1282, 69, 69, 1284, 69, 69, 1280, 1285, + 69, 1276, 1277, 1278, 69, 1288, 69, 1289, 1279, 69, + 1281, 69, 1290, 69, 1283, 69, 1293, 1287, 1286, 1294, + 69, 69, 1296, 69, 69, 69, 69, 69, 69, 1291, + 1295, 69, 1298, 69, 1301, 1292, 1299, 69, 1305, 1297, + 69, 69, 1304, 69, 1308, 1309, 69, 1303, 1307, 69, + 69, 1311, 1300, 69, 1302, 1310, 69, 69, 69, 69, + 1306, 69, 1312, 69, 1316, 69, 69, 1319, 69, 69, + 1315, 69, 69, 69, 2010, 69, 1323, 1313, 1314, 1324, - 69, 69, 69, 69, 1324, 1328, 1331, 1325, 69, 69, - 1330, 69, 1327, 1333, 1329, 69, 69, 1996, 69, 1335, - 69, 1334, 69, 1336, 1337, 69, 1338, 69, 69, 1343, - 1332, 69, 69, 69, 1340, 1339, 1341, 69, 1342, 69, - 69, 69, 1344, 1345, 69, 1346, 1348, 69, 69, 69, - 69, 1347, 69, 1350, 1353, 1355, 69, 1354, 69, 69, - 69, 1349, 69, 1357, 69, 69, 1351, 69, 1352, 69, - 1356, 1362, 69, 1360, 1358, 1363, 1359, 1366, 1361, 69, - 1364, 1365, 69, 69, 1368, 69, 69, 1369, 1370, 69, - 69, 69, 1373, 1371, 69, 69, 1367, 69, 69, 69, + 69, 1317, 69, 1320, 1325, 69, 1322, 69, 1321, 1326, + 69, 1318, 1333, 1327, 1329, 69, 69, 69, 1328, 1331, + 1335, 1330, 1334, 69, 1336, 69, 1337, 1332, 69, 1340, + 69, 69, 69, 69, 69, 69, 1345, 1342, 69, 69, + 1339, 69, 1338, 1347, 1341, 69, 69, 1343, 69, 1349, + 2010, 1348, 69, 1350, 69, 1344, 1351, 69, 1352, 69, + 1346, 69, 69, 69, 69, 1353, 1360, 1354, 1355, 69, + 1356, 1357, 69, 69, 1358, 1359, 1362, 69, 69, 69, + 69, 69, 69, 69, 1367, 1361, 69, 1369, 1364, 69, + 69, 1368, 69, 69, 1371, 69, 69, 1370, 1363, 1365, - 69, 69, 69, 1374, 69, 69, 69, 1381, 69, 1376, - 1372, 1377, 1378, 1385, 69, 69, 1375, 1380, 69, 69, - 1382, 1386, 1387, 1388, 1379, 1383, 1384, 69, 69, 1391, - 1392, 69, 69, 69, 1389, 69, 1996, 1390, 1394, 69, - 1393, 1395, 69, 69, 1400, 69, 69, 1396, 1397, 69, - 1398, 1401, 69, 69, 69, 1399, 1406, 69, 1402, 69, - 1403, 69, 1407, 69, 1410, 69, 69, 69, 1405, 69, - 1411, 69, 1404, 1412, 1408, 69, 1414, 1416, 1413, 1415, - 1417, 69, 69, 1409, 69, 69, 69, 69, 69, 69, - 1420, 1418, 1421, 69, 69, 69, 1419, 69, 69, 1422, + 69, 1366, 1376, 69, 1374, 1372, 1377, 1373, 69, 1375, + 1380, 1378, 69, 69, 1382, 69, 69, 69, 1383, 1384, + 69, 69, 1379, 69, 1385, 69, 1387, 69, 69, 1381, + 69, 69, 1388, 69, 69, 69, 69, 69, 69, 1400, + 1390, 1386, 1391, 1392, 1395, 69, 69, 69, 1389, 1394, + 1399, 69, 1402, 69, 69, 1397, 1398, 1396, 1403, 1393, + 1406, 69, 1404, 69, 1401, 69, 69, 69, 1405, 1409, + 1408, 1410, 69, 69, 69, 1414, 69, 1411, 69, 69, + 69, 1415, 69, 69, 1420, 69, 1417, 69, 1421, 1407, + 69, 1412, 1416, 69, 1413, 1424, 69, 1419, 69, 2010, - 1426, 1427, 69, 1431, 69, 69, 69, 1424, 1423, 1425, - 69, 1430, 1428, 69, 1432, 1433, 69, 1435, 69, 69, - 69, 1996, 1438, 1429, 1436, 1434, 1439, 69, 1440, 69, - 1441, 1437, 1442, 69, 1444, 69, 69, 1445, 1443, 69, - 69, 1448, 69, 1450, 69, 69, 69, 1449, 69, 69, - 69, 1446, 69, 1452, 69, 69, 69, 1455, 1447, 69, - 1458, 69, 69, 69, 69, 1454, 1459, 69, 1461, 1460, - 1451, 69, 1453, 1456, 69, 1457, 69, 69, 69, 69, - 1471, 69, 1462, 1463, 69, 69, 1464, 1472, 69, 1469, - 69, 1498, 69, 69, 1465, 1467, 69, 1476, 1466, 1468, + 69, 1418, 69, 1425, 1426, 1422, 69, 69, 1427, 1430, + 1431, 69, 69, 1423, 69, 1428, 69, 69, 1429, 69, + 69, 1432, 1434, 69, 1435, 69, 1433, 69, 69, 1436, + 69, 1440, 69, 69, 1441, 1445, 69, 69, 1447, 69, + 1437, 1438, 1444, 1439, 69, 1442, 1446, 69, 69, 69, + 1452, 1449, 69, 1450, 1453, 69, 69, 1443, 1456, 69, + 1454, 69, 1451, 1448, 1458, 69, 69, 1459, 69, 69, + 1457, 69, 1462, 69, 1464, 69, 1455, 69, 1463, 69, + 1460, 69, 69, 69, 1466, 69, 69, 1461, 1469, 1472, + 69, 69, 69, 69, 69, 1473, 1465, 1468, 1475, 69, - 1470, 1473, 1477, 69, 1474, 1475, 1478, 69, 1479, 69, - 69, 1481, 69, 1484, 69, 1485, 69, 1486, 69, 69, - 69, 1482, 1480, 69, 1483, 1488, 69, 1490, 69, 1491, - 69, 69, 1494, 69, 69, 69, 1493, 69, 1487, 1492, - 69, 1489, 1496, 69, 69, 69, 1500, 1499, 1502, 69, - 69, 1506, 69, 1495, 1503, 1497, 69, 69, 69, 1505, - 69, 1501, 1511, 69, 1510, 1504, 69, 1513, 69, 69, - 69, 1515, 69, 1509, 69, 69, 1507, 69, 69, 69, - 1508, 1516, 1518, 69, 1522, 1512, 1517, 69, 69, 69, - 69, 1520, 1523, 69, 69, 1514, 1528, 1996, 1525, 1526, + 69, 69, 1471, 1470, 1467, 69, 69, 1474, 69, 69, + 69, 69, 1485, 69, 69, 69, 69, 1486, 1477, 1478, + 1476, 1487, 1483, 69, 1479, 1481, 69, 1490, 1489, 1480, + 1482, 1493, 1484, 1491, 69, 1492, 69, 1488, 69, 69, + 1495, 69, 1498, 69, 1499, 69, 1500, 69, 69, 69, + 1496, 1494, 69, 1497, 1502, 69, 1504, 69, 1505, 69, + 69, 1508, 69, 69, 69, 1507, 69, 1501, 1506, 69, + 1503, 1510, 69, 69, 69, 1512, 1513, 69, 1514, 1516, + 69, 69, 1509, 1517, 1511, 1520, 69, 69, 69, 1518, + 69, 69, 69, 1515, 69, 1524, 1525, 69, 1527, 69, - 1519, 69, 69, 1524, 1521, 69, 1529, 1527, 69, 69, - 1532, 1533, 69, 1534, 1530, 69, 69, 1531, 69, 69, - 69, 1535, 69, 69, 69, 1536, 1541, 1537, 1539, 1542, - 1538, 69, 1540, 69, 1544, 1545, 69, 69, 1543, 1546, - 69, 69, 1548, 69, 69, 1547, 69, 1550, 1553, 1549, - 69, 1552, 69, 1555, 69, 1554, 69, 69, 69, 69, - 69, 1556, 1551, 1560, 69, 1563, 1557, 69, 69, 1562, - 69, 69, 1559, 1564, 1567, 69, 1566, 1558, 69, 69, - 1561, 69, 1571, 1568, 1565, 69, 69, 1569, 69, 1572, - 69, 1574, 1570, 1575, 69, 69, 69, 1578, 69, 1579, + 1519, 69, 1529, 69, 69, 1523, 69, 1521, 69, 69, + 69, 1522, 1530, 1526, 1532, 69, 1531, 69, 1528, 69, + 69, 1534, 1536, 69, 1537, 1538, 69, 69, 1542, 1539, + 69, 1533, 1540, 69, 1543, 69, 1535, 69, 1546, 69, + 1541, 1547, 69, 1548, 1545, 69, 69, 1544, 69, 69, + 69, 1549, 1555, 69, 69, 69, 69, 1553, 1556, 1550, + 1552, 1551, 1554, 1559, 69, 1560, 69, 1558, 69, 1562, + 1561, 69, 69, 69, 1557, 69, 1566, 69, 69, 69, + 69, 1567, 1568, 1563, 1569, 69, 1564, 69, 69, 69, + 69, 69, 1565, 1570, 1574, 69, 1576, 1577, 1571, 69, - 69, 1577, 1580, 69, 1581, 69, 69, 69, 69, 69, - 69, 69, 69, 1576, 1573, 1584, 1587, 69, 1588, 1589, - 69, 1582, 69, 1586, 69, 1592, 69, 1585, 1583, 69, - 1590, 69, 69, 1594, 1593, 1591, 1595, 1596, 1597, 69, - 1598, 69, 1599, 69, 69, 69, 69, 1602, 69, 69, - 69, 69, 69, 1608, 69, 69, 1600, 1606, 69, 69, - 1603, 1604, 1605, 1601, 1609, 69, 69, 69, 69, 1615, - 69, 1607, 69, 69, 1996, 69, 1621, 69, 1612, 1611, - 1619, 1614, 1616, 69, 1610, 69, 69, 69, 1617, 69, - 1613, 1620, 1622, 69, 1618, 69, 1623, 69, 69, 69, + 1572, 1573, 69, 69, 69, 1578, 69, 1581, 1580, 1575, + 69, 1579, 69, 69, 1582, 1583, 69, 1585, 1584, 69, + 69, 1588, 1586, 1589, 69, 69, 69, 1592, 69, 1593, + 69, 1591, 1594, 69, 1595, 69, 1587, 69, 69, 69, + 69, 69, 69, 1590, 1598, 1601, 69, 69, 69, 1603, + 69, 1596, 2010, 1600, 69, 1607, 1602, 1605, 69, 1599, + 1597, 1606, 69, 69, 69, 1608, 1604, 1611, 69, 1610, + 1612, 69, 1609, 1613, 69, 69, 69, 69, 1616, 69, + 69, 69, 69, 69, 1622, 69, 69, 1614, 1620, 69, + 69, 1617, 1618, 1619, 1615, 1623, 69, 69, 69, 69, - 69, 1631, 69, 1624, 69, 1625, 1628, 1626, 69, 1627, - 1632, 69, 69, 1633, 69, 1635, 69, 1630, 1629, 69, - 1634, 69, 1641, 69, 1642, 69, 69, 1636, 69, 69, - 69, 69, 1637, 69, 1638, 1639, 1646, 69, 69, 69, - 1640, 1644, 1649, 1643, 69, 69, 1650, 1645, 1651, 69, - 1647, 69, 1654, 1648, 1655, 69, 69, 1652, 1658, 69, - 69, 69, 69, 69, 1659, 1653, 1656, 1661, 1662, 69, - 1664, 69, 69, 69, 1657, 1663, 1660, 1666, 69, 1667, - 69, 69, 1668, 69, 69, 69, 69, 69, 69, 69, - 1672, 1665, 1673, 1671, 69, 1669, 1670, 1675, 69, 1677, + 1629, 69, 1621, 69, 69, 2010, 69, 1635, 69, 1626, + 1625, 1633, 1628, 1630, 69, 1624, 69, 69, 69, 1631, + 69, 1627, 1634, 1636, 69, 1632, 69, 1637, 69, 69, + 69, 69, 1645, 69, 1638, 69, 1639, 1642, 1640, 69, + 1641, 1646, 69, 69, 1647, 69, 1649, 69, 1644, 1643, + 69, 1648, 69, 1655, 69, 1656, 69, 69, 1650, 69, + 69, 69, 69, 1651, 69, 1652, 1653, 1660, 69, 69, + 69, 1654, 1658, 1663, 1657, 69, 69, 1664, 1659, 1665, + 69, 1661, 69, 1668, 1662, 1669, 69, 69, 1666, 1672, + 69, 69, 69, 69, 69, 1673, 1667, 1670, 1675, 1676, - 69, 69, 1996, 1676, 69, 1674, 1678, 1680, 69, 1681, - 69, 1682, 69, 1679, 1684, 69, 69, 1683, 1699, 69, - 1685, 1686, 69, 1687, 69, 1689, 69, 69, 69, 1688, - 69, 1690, 69, 1691, 69, 1692, 69, 69, 69, 69, - 69, 1695, 1694, 1697, 1698, 69, 69, 1693, 69, 1696, - 69, 1700, 69, 1703, 1701, 1702, 69, 1704, 69, 1708, - 69, 69, 69, 69, 1712, 69, 69, 69, 69, 1705, - 69, 1710, 1714, 1715, 69, 1716, 1706, 1707, 1711, 69, - 1709, 69, 69, 1719, 1717, 1713, 1720, 69, 69, 69, - 1718, 69, 1723, 1724, 69, 69, 1726, 1727, 69, 69, + 69, 1678, 69, 69, 69, 1671, 1677, 1674, 1680, 69, + 1681, 69, 69, 1682, 69, 69, 69, 69, 69, 69, + 69, 1686, 1679, 1687, 1685, 69, 1683, 1684, 1689, 69, + 1691, 69, 69, 2010, 1690, 69, 1688, 1692, 1694, 69, + 1695, 69, 1696, 69, 1693, 1698, 69, 69, 1697, 1713, + 69, 1699, 1700, 69, 1701, 69, 1703, 69, 69, 69, + 1702, 69, 1704, 69, 1705, 69, 1706, 69, 69, 69, + 69, 69, 1709, 1708, 1711, 1712, 69, 69, 1707, 69, + 1710, 69, 1714, 69, 1717, 1715, 1716, 69, 1718, 69, + 1722, 69, 69, 69, 69, 1726, 69, 69, 69, 69, - 69, 1721, 1728, 1722, 1729, 69, 1730, 69, 69, 1725, - 1731, 69, 1734, 1735, 69, 69, 1737, 69, 1732, 1736, - 1738, 69, 1733, 69, 69, 69, 1741, 69, 69, 69, - 1740, 69, 1742, 1745, 69, 69, 1749, 69, 69, 69, - 69, 69, 1743, 1744, 69, 1753, 1739, 1746, 1751, 1748, - 69, 1754, 69, 1755, 1747, 69, 69, 1750, 1752, 69, - 69, 1757, 69, 69, 1763, 69, 69, 1759, 69, 1760, - 69, 1756, 69, 1764, 1766, 69, 69, 1767, 69, 1758, - 1769, 69, 1761, 1762, 1765, 69, 1768, 1771, 1773, 1770, - 69, 1772, 1774, 69, 69, 69, 69, 69, 69, 1781, + 1719, 69, 1724, 1728, 1729, 69, 1730, 1720, 1721, 1725, + 69, 1723, 69, 69, 1733, 1731, 1727, 1734, 69, 69, + 69, 1732, 69, 1737, 1738, 69, 69, 1740, 1741, 69, + 69, 69, 1735, 1742, 1736, 1743, 69, 1744, 69, 69, + 1739, 1745, 69, 1748, 1749, 69, 69, 1751, 69, 1746, + 1750, 1752, 69, 1747, 69, 69, 69, 1755, 69, 69, + 69, 1754, 69, 1756, 1759, 69, 69, 1763, 69, 69, + 69, 69, 69, 1757, 1758, 69, 1767, 1753, 1760, 1765, + 1762, 69, 1768, 69, 1769, 1761, 69, 69, 1764, 1766, + 69, 69, 1771, 69, 69, 1777, 69, 69, 1773, 69, - 69, 1996, 69, 1775, 1776, 1777, 1778, 1780, 69, 1782, - 69, 1784, 69, 1783, 1785, 1786, 69, 69, 1789, 69, - 69, 1787, 1779, 69, 69, 1791, 1793, 69, 1795, 69, - 69, 69, 69, 1798, 69, 69, 69, 1788, 69, 69, - 1790, 69, 1792, 1800, 69, 1801, 69, 1797, 1799, 1796, - 69, 1805, 1794, 69, 1802, 1807, 69, 69, 1804, 69, - 1803, 1809, 69, 1810, 69, 1811, 69, 69, 69, 69, - 1806, 69, 1808, 1812, 1813, 69, 69, 1814, 69, 1817, - 1820, 69, 1815, 1818, 1821, 69, 1816, 69, 69, 1825, - 69, 69, 69, 1819, 1826, 1822, 69, 1827, 69, 1823, + 1774, 69, 1770, 69, 1778, 1780, 69, 69, 1781, 69, + 1772, 1783, 69, 1775, 1776, 1779, 69, 1782, 1785, 1787, + 1784, 69, 1786, 1788, 69, 69, 69, 69, 69, 69, + 1795, 69, 2010, 69, 1789, 1790, 1791, 1792, 1794, 69, + 1796, 69, 1798, 69, 1797, 1799, 1800, 69, 69, 1803, + 69, 69, 1801, 1793, 69, 69, 1805, 1807, 69, 1809, + 69, 69, 69, 69, 1812, 69, 69, 69, 1802, 69, + 69, 1804, 69, 1806, 1814, 69, 1815, 69, 1811, 1813, + 1810, 69, 1819, 1808, 69, 1816, 1821, 69, 69, 1818, + 69, 1817, 1823, 69, 1824, 69, 1825, 69, 69, 69, - 69, 69, 69, 1830, 1828, 1833, 1831, 69, 1824, 69, - 69, 1836, 69, 1837, 69, 1839, 69, 69, 1829, 69, - 69, 1832, 1840, 1901, 1834, 1835, 69, 69, 1838, 1843, - 69, 1842, 1846, 1841, 1844, 69, 1845, 69, 1847, 69, - 69, 1848, 1849, 69, 69, 69, 69, 1853, 69, 69, - 69, 69, 1856, 69, 1854, 1852, 69, 69, 1850, 1855, - 69, 1857, 69, 69, 69, 1851, 69, 1860, 69, 69, - 1858, 1862, 1861, 69, 69, 69, 69, 1859, 1897, 1868, - 1870, 69, 1863, 69, 1864, 1881, 1865, 1866, 1871, 69, - 1873, 69, 69, 69, 1867, 1869, 1872, 1874, 1875, 69, + 69, 1820, 69, 1822, 1826, 1827, 69, 69, 1828, 69, + 1831, 1834, 69, 1829, 1832, 1835, 69, 1830, 69, 69, + 1839, 69, 69, 69, 1833, 1840, 1836, 69, 1841, 69, + 1837, 69, 69, 69, 1844, 1842, 1847, 1845, 69, 1838, + 69, 69, 1850, 69, 1851, 69, 1853, 69, 69, 1843, + 69, 69, 1846, 1854, 1915, 1848, 1849, 69, 69, 1852, + 1857, 69, 1856, 1860, 1855, 1858, 69, 1859, 69, 1861, + 69, 69, 1862, 1863, 69, 69, 69, 69, 1867, 69, + 69, 69, 69, 1870, 69, 1868, 1866, 69, 69, 1864, + 1869, 69, 1871, 69, 69, 69, 1865, 69, 1874, 69, - 69, 1876, 1878, 69, 69, 69, 69, 1882, 1883, 69, - 1884, 69, 69, 69, 1877, 69, 69, 1885, 1996, 1879, - 69, 69, 69, 1880, 1902, 1889, 1890, 1892, 69, 69, - 1887, 1893, 69, 1894, 69, 69, 69, 1888, 1886, 1896, - 69, 1891, 69, 1898, 1895, 1900, 69, 69, 69, 69, - 69, 1899, 69, 1904, 69, 69, 69, 1908, 69, 1909, - 69, 1903, 69, 69, 69, 69, 1907, 69, 1905, 69, - 1906, 1912, 1911, 69, 1996, 1913, 1910, 1920, 69, 69, - 1916, 69, 1914, 1915, 1918, 1922, 69, 69, 1921, 1923, - 69, 69, 1917, 1919, 69, 1928, 1924, 69, 69, 1925, + 69, 1872, 1876, 1875, 69, 69, 69, 69, 1873, 1911, + 1882, 1884, 69, 1877, 69, 1878, 1895, 1879, 1880, 1885, + 69, 1887, 69, 69, 69, 1881, 1883, 1886, 1888, 1889, + 69, 69, 1890, 1892, 69, 69, 69, 69, 1896, 1897, + 69, 1898, 69, 69, 69, 1891, 69, 69, 1899, 2010, + 1893, 69, 69, 69, 1894, 1916, 1903, 1904, 1906, 69, + 69, 1901, 1907, 69, 1908, 69, 69, 69, 1902, 1900, + 1910, 69, 1905, 69, 1912, 1909, 1914, 69, 69, 69, + 69, 69, 1913, 69, 1918, 69, 69, 69, 1922, 69, + 1923, 69, 1917, 69, 69, 69, 69, 1921, 69, 1919, - 69, 69, 1927, 1930, 69, 1933, 1926, 1934, 69, 69, - 69, 1929, 69, 1931, 69, 69, 69, 69, 69, 69, - 1932, 69, 1935, 69, 69, 1946, 1943, 1936, 1937, 1938, - 1940, 1941, 69, 69, 69, 1939, 69, 1944, 1942, 1947, - 69, 1948, 1945, 1951, 69, 1949, 1952, 69, 69, 69, - 69, 1953, 1950, 1956, 69, 69, 69, 69, 69, 69, - 1959, 69, 69, 1963, 69, 69, 69, 69, 1954, 1955, - 1958, 1964, 1968, 1957, 1962, 1960, 69, 1966, 1961, 69, - 1967, 69, 69, 1965, 1970, 1971, 69, 69, 1969, 1972, - 69, 69, 69, 69, 1973, 69, 1975, 69, 1977, 69, + 69, 1920, 1926, 1925, 69, 2010, 1927, 1924, 1934, 69, + 69, 1930, 69, 1928, 1929, 1932, 1936, 69, 69, 1935, + 1937, 69, 69, 1931, 1933, 69, 1942, 1938, 69, 69, + 1939, 69, 69, 1941, 1944, 69, 1947, 1940, 1948, 69, + 69, 69, 1943, 69, 1945, 69, 69, 69, 69, 69, + 69, 1946, 69, 1949, 69, 69, 1960, 1957, 1950, 1951, + 1952, 1954, 1955, 69, 69, 69, 1953, 69, 1958, 1956, + 1961, 69, 1962, 1959, 1965, 69, 1963, 1966, 69, 69, + 69, 69, 1967, 1964, 1970, 69, 69, 69, 69, 69, + 69, 1973, 69, 69, 1977, 69, 69, 69, 69, 1968, - 1978, 69, 1981, 69, 69, 69, 1984, 1985, 69, 1974, - 69, 1976, 1987, 69, 1988, 69, 1979, 1986, 1980, 69, - 69, 69, 1982, 1983, 69, 1990, 1989, 69, 1996, 1991, - 1994, 69, 1995, 69, 1996, 1996, 1996, 1996, 1996, 1996, - 1992, 1996, 1996, 1996, 1996, 1996, 1993, 41, 41, 41, - 41, 41, 41, 41, 46, 46, 46, 46, 46, 46, - 46, 51, 51, 51, 51, 51, 51, 51, 57, 57, - 57, 57, 57, 57, 57, 62, 62, 62, 62, 62, - 62, 62, 72, 72, 1996, 72, 72, 72, 72, 129, - 129, 1996, 1996, 1996, 129, 129, 131, 131, 1996, 1996, + 1969, 1972, 1978, 1982, 1971, 1976, 1974, 69, 1980, 1975, + 69, 1981, 69, 69, 1979, 1984, 1985, 69, 69, 1983, + 1986, 69, 69, 69, 69, 1987, 69, 1989, 69, 1991, + 69, 1992, 69, 1995, 69, 69, 69, 1998, 1999, 69, + 1988, 69, 1990, 2001, 69, 2002, 69, 1993, 2000, 1994, + 69, 69, 69, 1996, 1997, 69, 2004, 2003, 69, 2010, + 2005, 2008, 69, 2009, 69, 2010, 2010, 2010, 2010, 2010, + 2010, 2006, 2010, 2010, 2010, 2010, 2010, 2007, 41, 41, + 41, 41, 41, 41, 41, 46, 46, 46, 46, 46, + 46, 46, 51, 51, 51, 51, 51, 51, 51, 57, - 131, 1996, 131, 133, 1996, 1996, 1996, 1996, 1996, 133, - 136, 136, 1996, 1996, 1996, 136, 136, 138, 1996, 1996, - 1996, 1996, 1996, 138, 140, 140, 1996, 140, 140, 140, - 140, 73, 73, 1996, 73, 73, 73, 73, 13, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996 + 57, 57, 57, 57, 57, 57, 62, 62, 62, 62, + 62, 62, 62, 72, 72, 2010, 72, 72, 72, 72, + 130, 130, 2010, 2010, 2010, 130, 130, 132, 132, 2010, + 2010, 132, 2010, 132, 134, 2010, 2010, 2010, 2010, 2010, + 134, 137, 137, 2010, 2010, 2010, 137, 137, 139, 2010, + 2010, 2010, 2010, 2010, 139, 141, 141, 2010, 141, 141, + 141, 141, 73, 73, 2010, 73, 73, 73, 73, 13, + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, + + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010 } ; -static yyconst flex_int16_t yy_chk[3979] = +static yyconst flex_int16_t yy_chk[4010] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1550,437 +1559,441 @@ static yyconst flex_int16_t yy_chk[3979] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 4, 4, 4, 50, 5, 5, 50, 3, 5, 15, 4, 6, 6, 15, 5, 6, 9, 9, - 9, 161, 33, 6, 7, 7, 7, 7, 9, 7, + 9, 162, 33, 6, 7, 7, 7, 7, 9, 7, 10, 10, 10, 45, 45, 7, 8, 8, 8, 8, - 10, 8, 21, 33, 161, 21, 21, 8, 11, 11, - 11, 11, 11, 11, 2002, 20, 29, 20, 20, 11, + 10, 8, 21, 33, 162, 21, 21, 8, 11, 11, + 11, 11, 11, 11, 2016, 20, 29, 20, 20, 11, 20, 29, 24, 21, 75, 20, 24, 75, 11, 12, 12, 12, 12, 12, 12, 83, 22, 22, 26, 26, - 12, 25, 25, 28, 22, 132, 24, 26, 132, 12, + 12, 25, 25, 28, 22, 133, 24, 26, 133, 12, 19, 22, 19, 19, 30, 19, 25, 83, 28, 27, 19, 19, 23, 27, 61, 61, 27, 23, 35, 30, - 103, 23, 67, 27, 23, 27, 23, 23, 31, 31, - 32, 32, 35, 103, 37, 32, 67, 31, 70, 37, - 36, 36, 70, 31, 76, 36, 77, 31, 76, 37, - 39, 32, 34, 37, 37, 36, 78, 34, 36, 78, - 84, 34, 38, 38, 39, 38, 77, 34, 724, 39, + 39, 23, 67, 27, 23, 27, 23, 23, 31, 31, + 32, 32, 35, 735, 39, 32, 67, 31, 70, 39, + 36, 36, 70, 31, 76, 36, 77, 31, 76, 80, + 84, 32, 34, 38, 38, 36, 38, 34, 36, 40, + 40, 34, 79, 80, 40, 88, 77, 34, 40, 84, - 34, 92, 78, 40, 40, 79, 92, 34, 40, 84, - 38, 56, 40, 56, 56, 64, 56, 64, 64, 66, - 64, 66, 66, 79, 66, 69, 64, 69, 69, 80, - 69, 82, 87, 88, 138, 69, 72, 86, 72, 72, - 85, 72, 81, 80, 88, 85, 72, 72, 81, 82, - 82, 86, 87, 89, 81, 90, 91, 96, 85, 94, - 91, 93, 94, 95, 97, 94, 99, 98, 95, 97, - 98, 89, 100, 90, 98, 93, 96, 101, 94, 94, - 102, 101, 105, 106, 104, 111, 100, 102, 107, 97, - 99, 104, 108, 109, 113, 105, 108, 112, 112, 110, + 34, 38, 112, 112, 139, 87, 88, 34, 37, 56, + 79, 56, 56, 37, 56, 64, 37, 64, 64, 66, + 64, 66, 66, 37, 66, 87, 64, 37, 37, 69, + 78, 69, 69, 78, 69, 81, 82, 137, 86, 69, + 72, 81, 72, 72, 85, 72, 78, 81, 89, 85, + 72, 72, 86, 90, 82, 82, 91, 96, 92, 93, + 91, 94, 85, 92, 94, 95, 89, 94, 99, 97, + 95, 90, 98, 93, 97, 98, 96, 100, 101, 98, + 94, 94, 101, 102, 103, 105, 104, 106, 107, 115, + 102, 100, 99, 104, 97, 108, 109, 103, 105, 108, - 114, 115, 116, 106, 110, 111, 107, 117, 110, 121, - 118, 109, 119, 114, 113, 118, 115, 120, 120, 122, - 123, 116, 127, 164, 119, 117, 124, 121, 124, 125, - 126, 128, 130, 130, 125, 122, 128, 164, 120, 136, - 127, 123, 126, 134, 142, 134, 134, 142, 134, 124, - 137, 137, 139, 149, 139, 139, 140, 139, 140, 140, - 143, 140, 145, 144, 146, 143, 147, 140, 144, 148, - 150, 152, 146, 149, 135, 151, 152, 145, 158, 150, - 151, 151, 153, 153, 148, 147, 154, 155, 167, 155, - 159, 154, 157, 157, 160, 159, 162, 158, 163, 160, + 110, 111, 113, 114, 115, 110, 107, 106, 116, 110, + 117, 118, 119, 120, 109, 122, 114, 119, 121, 121, + 123, 111, 113, 124, 118, 120, 127, 116, 117, 125, + 126, 125, 128, 122, 146, 126, 123, 129, 127, 121, + 131, 131, 129, 135, 124, 135, 135, 136, 135, 146, + 128, 144, 125, 138, 138, 140, 144, 140, 140, 141, + 140, 141, 141, 143, 141, 147, 143, 145, 148, 149, + 141, 150, 145, 147, 151, 152, 159, 153, 154, 154, + 152, 152, 153, 151, 149, 155, 156, 148, 156, 160, + 155, 150, 158, 158, 160, 159, 161, 165, 163, 164, - 162, 165, 168, 163, 183, 166, 167, 168, 169, 155, - 156, 183, 171, 169, 156, 133, 165, 166, 172, 156, - 166, 170, 170, 173, 156, 174, 174, 170, 173, 178, - 156, 156, 171, 175, 172, 176, 177, 179, 175, 170, - 176, 170, 179, 180, 175, 177, 181, 182, 180, 184, - 178, 181, 182, 185, 186, 187, 188, 189, 190, 185, - 192, 187, 184, 191, 193, 189, 195, 194, 191, 198, - 131, 190, 194, 196, 186, 192, 197, 199, 188, 199, - 200, 197, 202, 203, 193, 201, 208, 200, 195, 198, - 201, 196, 196, 204, 204, 203, 209, 205, 206, 210, + 166, 161, 163, 168, 164, 167, 173, 169, 156, 157, + 219, 165, 169, 157, 170, 166, 172, 167, 157, 170, + 167, 168, 173, 157, 219, 171, 171, 174, 179, 157, + 157, 171, 174, 175, 175, 176, 172, 177, 178, 180, + 176, 185, 177, 171, 180, 171, 176, 178, 181, 179, + 182, 183, 184, 181, 185, 182, 183, 186, 187, 184, + 188, 189, 190, 186, 191, 193, 188, 192, 194, 195, + 190, 196, 192, 198, 195, 200, 197, 191, 187, 199, + 193, 197, 202, 189, 199, 201, 204, 201, 194, 202, + 205, 198, 198, 196, 203, 200, 206, 206, 207, 203, - 219, 202, 205, 206, 207, 211, 207, 212, 209, 208, - 213, 214, 212, 211, 215, 213, 214, 216, 210, 217, - 205, 220, 218, 207, 220, 219, 221, 226, 221, 215, - 218, 222, 222, 217, 223, 216, 227, 223, 224, 224, - 225, 225, 228, 226, 229, 228, 230, 231, 229, 232, - 237, 227, 231, 233, 235, 230, 234, 234, 233, 235, - 236, 238, 239, 232, 240, 236, 241, 241, 242, 243, - 237, 242, 244, 245, 246, 246, 244, 240, 247, 238, - 248, 249, 250, 239, 252, 250, 249, 243, 251, 253, - 254, 245, 248, 252, 255, 261, 247, 256, 253, 260, + 210, 208, 205, 207, 211, 204, 208, 209, 212, 209, + 213, 218, 214, 217, 215, 216, 211, 214, 213, 215, + 216, 207, 220, 210, 221, 134, 209, 212, 217, 218, + 220, 222, 228, 223, 222, 223, 224, 224, 225, 226, + 226, 225, 227, 227, 229, 232, 234, 230, 228, 221, + 230, 231, 233, 235, 232, 231, 239, 233, 235, 229, + 234, 236, 236, 237, 238, 240, 241, 242, 237, 238, + 243, 243, 244, 245, 246, 244, 239, 247, 246, 249, + 242, 248, 248, 240, 250, 251, 252, 241, 253, 252, + 251, 245, 254, 255, 256, 247, 250, 249, 257, 132, - 251, 252, 252, 257, 252, 257, 257, 255, 129, 256, - 261, 254, 258, 258, 259, 262, 260, 259, 263, 260, - 264, 264, 267, 265, 262, 266, 266, 263, 265, 268, - 269, 270, 272, 271, 268, 273, 274, 267, 271, 274, - 273, 274, 269, 275, 276, 277, 280, 282, 278, 281, - 279, 270, 272, 278, 277, 279, 283, 275, 284, 280, - 276, 284, 282, 276, 285, 276, 288, 280, 287, 281, - 283, 290, 292, 328, 328, 288, 293, 284, 285, 286, - 289, 286, 286, 287, 289, 289, 291, 292, 295, 296, - 301, 286, 290, 286, 286, 286, 293, 294, 286, 297, + 253, 254, 255, 259, 258, 259, 259, 260, 260, 254, + 254, 257, 254, 262, 261, 256, 258, 261, 264, 263, + 265, 266, 266, 267, 268, 268, 269, 264, 267, 265, + 262, 270, 271, 262, 263, 272, 270, 273, 274, 278, + 275, 269, 273, 276, 271, 275, 277, 279, 276, 277, + 280, 277, 281, 278, 276, 272, 282, 281, 274, 280, + 283, 282, 284, 279, 285, 290, 279, 287, 279, 286, + 287, 288, 292, 283, 293, 291, 292, 292, 294, 285, + 290, 283, 284, 286, 291, 288, 287, 289, 296, 289, + 289, 297, 295, 298, 299, 293, 297, 294, 300, 289, - 299, 298, 294, 300, 302, 291, 298, 303, 300, 296, - 301, 295, 304, 305, 297, 299, 302, 304, 306, 307, - 307, 303, 307, 306, 308, 309, 310, 330, 312, 305, - 312, 311, 313, 314, 315, 316, 313, 314, 317, 318, - 330, 309, 310, 323, 308, 311, 319, 317, 318, 316, - 320, 319, 315, 321, 320, 325, 322, 324, 327, 325, - 317, 322, 321, 324, 323, 326, 329, 331, 331, 332, - 326, 329, 333, 334, 332, 335, 333, 336, 327, 337, - 335, 338, 339, 339, 340, 338, 336, 341, 345, 340, - 346, 337, 342, 342, 334, 344, 344, 347, 346, 348, + 301, 289, 289, 289, 302, 301, 289, 295, 296, 304, + 303, 305, 306, 300, 299, 303, 298, 307, 308, 302, + 309, 311, 307, 305, 312, 309, 306, 310, 310, 304, + 310, 313, 314, 315, 308, 315, 318, 319, 316, 317, + 312, 311, 316, 317, 320, 322, 314, 313, 321, 324, + 322, 319, 323, 320, 318, 325, 323, 321, 324, 326, + 325, 327, 330, 333, 328, 329, 320, 327, 328, 332, + 329, 331, 331, 337, 332, 340, 333, 334, 334, 335, + 326, 336, 330, 338, 335, 336, 339, 340, 338, 341, + 342, 342, 343, 341, 337, 339, 344, 343, 345, 345, - 349, 352, 351, 353, 355, 354, 347, 357, 341, 345, - 354, 356, 349, 355, 360, 357, 356, 353, 358, 348, - 351, 352, 351, 358, 359, 361, 362, 363, 364, 359, - 362, 366, 365, 364, 368, 371, 360, 369, 372, 370, - 371, 372, 363, 373, 375, 371, 361, 359, 365, 381, - 366, 367, 367, 377, 368, 370, 369, 367, 379, 367, - 374, 374, 378, 373, 376, 376, 380, 367, 377, 375, - 367, 381, 383, 379, 378, 382, 384, 367, 385, 388, - 382, 383, 386, 388, 389, 380, 390, 391, 386, 389, - 392, 393, 395, 385, 399, 384, 394, 394, 390, 393, + 347, 347, 348, 349, 350, 351, 352, 355, 354, 357, + 356, 349, 358, 350, 357, 359, 365, 344, 352, 363, + 359, 358, 360, 348, 356, 351, 354, 355, 354, 361, + 360, 362, 364, 363, 361, 366, 362, 364, 365, 367, + 368, 369, 370, 367, 371, 375, 369, 373, 377, 374, + 380, 377, 376, 378, 362, 368, 366, 376, 370, 379, + 379, 375, 376, 371, 372, 372, 382, 373, 374, 384, + 372, 386, 372, 378, 383, 380, 381, 381, 385, 388, + 372, 382, 387, 372, 384, 389, 383, 387, 388, 391, + 372, 390, 393, 386, 394, 391, 393, 385, 395, 394, - 397, 396, 402, 392, 395, 391, 396, 398, 400, 399, - 398, 401, 397, 400, 401, 403, 404, 411, 402, 403, - 403, 402, 405, 405, 406, 406, 407, 408, 408, 404, - 410, 407, 409, 409, 412, 410, 413, 414, 411, 412, - 415, 414, 416, 417, 418, 415, 416, 419, 417, 420, - 422, 421, 419, 422, 420, 413, 423, 425, 422, 424, - 424, 426, 422, 427, 418, 421, 426, 428, 427, 430, - 431, 429, 433, 431, 423, 425, 429, 433, 430, 432, - 434, 428, 435, 432, 436, 434, 437, 438, 439, 440, - 441, 437, 442, 445, 440, 442, 441, 436, 435, 443, + 396, 397, 130, 398, 389, 400, 390, 399, 399, 402, + 395, 398, 404, 403, 397, 401, 403, 400, 396, 405, + 401, 402, 406, 407, 405, 406, 408, 404, 409, 416, + 408, 408, 410, 410, 411, 411, 413, 413, 412, 407, + 418, 409, 407, 412, 414, 414, 415, 417, 423, 419, + 416, 415, 417, 419, 421, 420, 422, 424, 421, 418, + 420, 422, 424, 426, 425, 428, 430, 427, 423, 425, + 427, 429, 429, 431, 433, 427, 432, 426, 431, 427, + 434, 432, 435, 428, 430, 434, 436, 438, 433, 436, + 437, 435, 438, 439, 437, 440, 441, 442, 439, 443, - 439, 444, 443, 438, 446, 432, 444, 447, 448, 449, - 451, 445, 447, 448, 449, 451, 450, 452, 446, 450, - 453, 452, 452, 454, 455, 456, 458, 457, 461, 455, - 457, 458, 463, 453, 456, 459, 454, 464, 465, 459, - 459, 460, 462, 460, 462, 457, 466, 461, 467, 468, - 463, 470, 467, 469, 471, 464, 472, 465, 468, 473, - 474, 475, 476, 476, 473, 478, 466, 479, 469, 470, - 477, 472, 479, 471, 477, 480, 478, 481, 483, 474, - 475, 482, 484, 485, 486, 483, 488, 484, 487, 486, - 485, 480, 489, 487, 482, 491, 481, 490, 492, 489, + 444, 445, 442, 450, 446, 447, 445, 521, 447, 441, + 446, 440, 444, 449, 448, 443, 437, 448, 449, 451, + 452, 450, 453, 454, 521, 452, 455, 453, 454, 455, + 456, 458, 457, 451, 459, 456, 457, 457, 460, 461, + 466, 463, 462, 460, 458, 462, 463, 459, 461, 464, + 465, 465, 468, 464, 464, 467, 469, 467, 469, 470, + 462, 471, 472, 473, 474, 466, 475, 476, 474, 477, + 478, 468, 481, 479, 482, 475, 68, 470, 488, 471, + 480, 472, 476, 473, 487, 480, 484, 477, 479, 478, + 484, 481, 485, 482, 483, 483, 486, 488, 489, 490, - 493, 496, 504, 508, 488, 493, 490, 492, 494, 491, - 495, 494, 497, 497, 495, 498, 501, 507, 500, 503, - 504, 497, 496, 500, 498, 502, 506, 505, 508, 502, - 511, 503, 505, 514, 506, 507, 501, 509, 517, 519, - 520, 520, 509, 519, 68, 511, 509, 517, 518, 509, - 514, 524, 521, 523, 518, 525, 509, 521, 523, 509, - 522, 522, 522, 526, 522, 536, 526, 522, 528, 524, - 527, 527, 522, 529, 529, 528, 530, 536, 522, 522, - 525, 531, 531, 532, 533, 534, 537, 533, 532, 538, - 534, 530, 535, 539, 535, 540, 541, 541, 542, 544, + 487, 486, 491, 485, 493, 492, 490, 491, 494, 493, + 495, 489, 492, 494, 496, 497, 498, 499, 500, 501, + 503, 496, 501, 500, 497, 502, 499, 505, 495, 502, + 498, 504, 504, 507, 508, 509, 505, 510, 507, 509, + 504, 503, 511, 512, 513, 514, 515, 518, 512, 510, + 524, 525, 513, 528, 508, 527, 527, 525, 528, 524, + 511, 526, 518, 514, 530, 526, 62, 531, 532, 530, + 533, 515, 516, 533, 534, 534, 535, 516, 536, 536, + 542, 516, 542, 535, 516, 531, 537, 538, 538, 540, + 544, 516, 540, 532, 516, 529, 529, 529, 539, 529, - 543, 546, 62, 540, 545, 537, 546, 547, 547, 538, - 548, 557, 539, 542, 543, 548, 545, 544, 549, 550, - 551, 552, 550, 549, 553, 554, 551, 556, 555, 552, - 557, 559, 553, 555, 556, 558, 558, 560, 562, 561, - 559, 564, 565, 554, 561, 560, 566, 567, 569, 566, - 564, 565, 568, 568, 570, 571, 573, 562, 571, 574, - 575, 567, 576, 569, 574, 577, 571, 579, 578, 580, - 583, 581, 582, 580, 584, 588, 579, 573, 570, 583, - 585, 575, 576, 589, 586, 596, 584, 577, 578, 581, - 586, 582, 587, 587, 585, 588, 590, 589, 591, 593, + 541, 537, 529, 539, 543, 541, 545, 529, 546, 544, + 547, 548, 548, 529, 529, 549, 543, 550, 547, 551, + 552, 554, 554, 553, 555, 57, 545, 546, 553, 555, + 549, 550, 552, 556, 558, 559, 557, 551, 556, 557, + 558, 560, 561, 559, 563, 562, 564, 565, 565, 560, + 562, 563, 566, 568, 567, 569, 574, 571, 568, 572, + 561, 566, 567, 576, 573, 564, 571, 573, 572, 577, + 574, 575, 575, 578, 569, 580, 578, 580, 576, 581, + 581, 582, 583, 584, 578, 585, 586, 583, 588, 587, + 589, 592, 590, 577, 589, 591, 52, 588, 594, 593, - 592, 590, 594, 591, 592, 595, 596, 597, 597, 599, - 595, 598, 599, 600, 594, 601, 598, 603, 593, 602, - 604, 604, 594, 605, 602, 606, 606, 607, 601, 608, - 609, 600, 610, 608, 611, 612, 615, 603, 614, 614, - 615, 605, 607, 616, 617, 640, 618, 621, 611, 609, - 618, 622, 619, 640, 620, 612, 610, 613, 616, 620, - 613, 621, 613, 628, 624, 622, 613, 619, 613, 617, - 623, 625, 626, 613, 623, 627, 625, 626, 613, 624, - 629, 630, 57, 631, 628, 634, 625, 630, 631, 627, - 632, 632, 636, 635, 629, 633, 633, 634, 635, 637, + 592, 595, 582, 597, 584, 585, 598, 595, 586, 587, + 590, 593, 594, 599, 591, 596, 596, 600, 599, 602, + 598, 601, 600, 597, 603, 601, 604, 605, 606, 606, + 607, 604, 609, 610, 608, 607, 603, 608, 602, 612, + 611, 613, 613, 614, 603, 611, 610, 616, 605, 617, + 609, 615, 615, 617, 618, 619, 620, 621, 51, 612, + 625, 614, 616, 623, 623, 624, 628, 626, 627, 624, + 620, 629, 627, 618, 630, 625, 629, 621, 632, 619, + 622, 628, 632, 622, 631, 622, 636, 633, 630, 622, + 634, 622, 626, 637, 635, 634, 622, 638, 631, 635, - 642, 633, 639, 633, 638, 638, 636, 639, 641, 643, - 643, 637, 644, 646, 633, 648, 644, 647, 646, 642, - 647, 633, 641, 649, 650, 651, 652, 655, 653, 650, - 651, 654, 656, 657, 648, 659, 649, 653, 661, 658, - 654, 656, 660, 655, 658, 652, 664, 666, 662, 667, - 663, 664, 657, 668, 672, 659, 660, 662, 661, 663, - 669, 673, 673, 672, 670, 669, 666, 667, 668, 670, - 671, 674, 675, 677, 678, 671, 674, 681, 678, 678, - 679, 679, 682, 680, 679, 675, 680, 684, 683, 677, - 685, 681, 686, 685, 687, 688, 689, 694, 690, 691, + 636, 622, 633, 639, 813, 634, 813, 640, 643, 639, + 646, 638, 640, 645, 637, 641, 641, 642, 642, 644, + 643, 648, 646, 642, 644, 642, 648, 645, 647, 647, + 649, 650, 651, 652, 652, 653, 642, 655, 649, 653, + 657, 656, 655, 642, 656, 650, 661, 658, 659, 660, + 664, 651, 662, 659, 660, 663, 666, 667, 665, 657, + 658, 662, 667, 668, 663, 661, 664, 665, 669, 670, + 671, 672, 673, 675, 684, 666, 676, 673, 677, 671, + 672, 678, 669, 668, 46, 679, 678, 684, 681, 670, + 679, 680, 675, 677, 676, 683, 680, 681, 682, 682, - 688, 689, 682, 683, 690, 692, 694, 684, 693, 693, - 687, 692, 695, 686, 696, 691, 697, 696, 698, 699, - 700, 701, 702, 703, 705, 707, 701, 702, 703, 706, - 695, 708, 706, 700, 697, 709, 707, 698, 711, 699, - 709, 710, 705, 708, 712, 714, 710, 713, 713, 712, - 716, 715, 717, 711, 718, 720, 717, 719, 721, 723, - 727, 725, 716, 728, 714, 715, 719, 726, 728, 52, - 736, 729, 718, 732, 720, 725, 729, 733, 723, 730, - 727, 731, 726, 721, 730, 734, 731, 732, 735, 736, - 734, 733, 737, 738, 739, 740, 740, 741, 742, 737, + 683, 686, 687, 691, 688, 688, 687, 687, 688, 689, + 690, 692, 689, 693, 695, 694, 696, 686, 694, 699, + 697, 702, 698, 691, 690, 697, 692, 698, 701, 706, + 703, 699, 696, 693, 701, 695, 703, 702, 704, 704, + 705, 707, 708, 709, 707, 710, 711, 706, 712, 705, + 713, 714, 716, 712, 717, 713, 714, 717, 718, 711, + 708, 719, 709, 720, 722, 710, 721, 723, 720, 718, + 716, 721, 723, 719, 724, 724, 725, 726, 727, 722, + 728, 729, 731, 730, 728, 732, 734, 738, 736, 737, + 727, 726, 730, 739, 41, 725, 751, 751, 739, 729, - 743, 744, 746, 735, 745, 745, 743, 746, 738, 748, - 747, 741, 749, 739, 750, 749, 742, 747, 751, 752, - 753, 744, 755, 748, 752, 754, 758, 751, 759, 757, - 754, 760, 750, 757, 761, 758, 763, 762, 764, 753, - 765, 755, 766, 759, 762, 767, 769, 768, 763, 761, - 760, 767, 775, 772, 770, 773, 774, 764, 772, 777, - 766, 765, 768, 770, 774, 776, 769, 779, 780, 773, - 776, 777, 775, 778, 781, 782, 782, 778, 778, 783, - 784, 993, 780, 785, 786, 786, 779, 781, 785, 784, - 787, 788, 783, 789, 790, 787, 791, 791, 789, 790, + 747, 731, 736, 740, 737, 734, 741, 738, 740, 742, + 732, 741, 743, 744, 742, 745, 746, 748, 749, 747, + 745, 750, 752, 753, 748, 755, 743, 744, 754, 756, + 756, 746, 757, 749, 754, 758, 752, 757, 759, 761, + 750, 753, 758, 760, 762, 755, 760, 764, 766, 763, + 765, 771, 759, 762, 763, 765, 768, 761, 770, 769, + 768, 772, 773, 774, 775, 776, 764, 766, 769, 773, + 771, 777, 778, 770, 780, 774, 772, 779, 778, 781, + 783, 784, 785, 775, 786, 783, 776, 788, 781, 777, + 785, 787, 779, 789, 780, 784, 787, 789, 789, 788, - 788, 792, 793, 794, 795, 993, 796, 793, 797, 798, - 792, 796, 799, 797, 798, 806, 799, 794, 801, 801, - 803, 805, 795, 800, 802, 805, 802, 807, 812, 808, - 806, 803, 800, 811, 810, 813, 812, 800, 808, 800, - 815, 800, 809, 800, 814, 807, 809, 809, 810, 813, - 816, 818, 811, 814, 817, 817, 819, 819, 815, 821, - 822, 823, 821, 824, 824, 822, 818, 825, 826, 826, - 828, 827, 829, 829, 830, 816, 827, 831, 832, 833, - 823, 835, 831, 51, 833, 837, 832, 825, 834, 834, - 836, 828, 837, 838, 830, 840, 836, 841, 842, 835, + 790, 791, 795, 792, 786, 793, 793, 794, 796, 797, + 797, 795, 798, 796, 799, 791, 792, 798, 805, 790, + 794, 800, 801, 799, 802, 802, 800, 801, 803, 804, + 806, 807, 805, 808, 804, 809, 807, 803, 808, 810, + 809, 812, 812, 810, 814, 817, 816, 819, 806, 811, + 816, 823, 818, 822, 821, 814, 819, 820, 811, 823, + 817, 820, 820, 811, 824, 811, 825, 811, 821, 811, + 818, 826, 822, 827, 828, 825, 829, 829, 824, 828, + 830, 831, 831, 833, 835, 834, 833, 836, 836, 826, + 834, 837, 838, 838, 839, 830, 840, 844, 827, 839, - 840, 844, 841, 842, 843, 845, 838, 846, 848, 843, - 844, 847, 847, 849, 850, 851, 852, 854, 846, 853, - 851, 857, 855, 858, 845, 856, 856, 859, 848, 854, - 852, 861, 861, 849, 862, 865, 852, 850, 860, 853, - 855, 857, 863, 860, 867, 859, 866, 863, 858, 870, - 866, 866, 868, 867, 865, 873, 869, 862, 869, 871, - 868, 872, 874, 870, 871, 872, 873, 875, 876, 877, - 878, 879, 880, 882, 877, 883, 880, 881, 899, 899, - 884, 874, 885, 886, 887, 888, 876, 883, 878, 889, - 888, 879, 882, 875, 884, 881, 889, 885, 886, 890, + 841, 841, 842, 835, 843, 844, 847, 845, 849, 843, + 848, 837, 845, 846, 846, 849, 848, 840, 850, 860, + 852, 853, 842, 854, 847, 852, 853, 855, 854, 856, + 857, 850, 855, 858, 859, 859, 861, 862, 856, 860, + 863, 864, 865, 869, 858, 863, 866, 867, 870, 857, + 868, 868, 871, 874, 872, 864, 861, 14, 866, 872, + 862, 864, 865, 869, 875, 867, 873, 873, 877, 875, + 871, 879, 882, 870, 878, 880, 874, 884, 878, 878, + 879, 884, 881, 880, 881, 883, 882, 877, 885, 886, + 883, 887, 888, 889, 890, 891, 892, 894, 889, 885, - 891, 892, 893, 887, 890, 894, 895, 896, 897, 898, - 892, 894, 896, 897, 898, 900, 900, 893, 891, 902, - 902, 903, 904, 905, 906, 903, 907, 895, 908, 906, - 909, 904, 910, 911, 909, 909, 910, 910, 912, 913, - 907, 905, 914, 915, 916, 917, 919, 908, 920, 918, - 923, 917, 921, 911, 918, 922, 924, 912, 913, 927, - 925, 914, 927, 916, 923, 919, 928, 920, 46, 915, - 932, 921, 926, 926, 922, 925, 930, 924, 928, 929, - 929, 930, 931, 932, 933, 934, 931, 941, 935, 937, - 935, 938, 938, 933, 935, 939, 942, 940, 934, 943, + 892, 893, 895, 899, 896, 897, 898, 906, 886, 903, + 888, 907, 890, 906, 895, 891, 894, 887, 896, 893, + 897, 898, 899, 900, 901, 902, 904, 903, 900, 905, + 902, 901, 907, 908, 909, 904, 910, 917, 908, 909, + 919, 910, 911, 911, 905, 912, 912, 914, 914, 915, + 916, 918, 920, 915, 919, 917, 918, 921, 923, 916, + 922, 921, 921, 924, 922, 922, 925, 926, 927, 928, + 929, 920, 930, 931, 932, 935, 929, 930, 923, 933, + 934, 936, 924, 938, 938, 925, 926, 13, 928, 935, + 937, 940, 931, 932, 927, 941, 941, 939, 933, 934, - 939, 940, 945, 947, 943, 941, 954, 935, 947, 937, - 948, 948, 949, 951, 951, 958, 942, 949, 953, 953, - 945, 956, 954, 959, 956, 957, 957, 960, 961, 962, - 958, 963, 963, 961, 964, 965, 966, 966, 964, 967, - 968, 960, 969, 970, 962, 971, 969, 974, 959, 975, - 971, 968, 973, 973, 977, 965, 976, 976, 978, 977, - 979, 967, 970, 975, 980, 974, 981, 982, 985, 982, - 983, 984, 986, 980, 996, 983, 984, 986, 978, 988, - 979, 989, 989, 990, 991, 995, 981, 1000, 985, 1002, - 991, 994, 994, 988, 996, 997, 1000, 995, 997, 998, + 939, 942, 936, 940, 943, 937, 942, 944, 943, 945, + 946, 947, 949, 947, 950, 950, 951, 947, 945, 953, + 944, 951, 952, 946, 954, 958, 952, 0, 955, 972, + 947, 960, 949, 955, 956, 956, 960, 953, 961, 961, + 962, 964, 964, 958, 954, 962, 966, 966, 967, 969, + 970, 970, 969, 971, 972, 973, 974, 975, 976, 976, + 978, 974, 977, 980, 967, 981, 977, 983, 971, 973, + 979, 979, 975, 982, 984, 987, 981, 982, 988, 984, + 978, 986, 986, 989, 989, 980, 983, 991, 992, 990, + 993, 994, 988, 987, 990, 995, 996, 995, 997, 993, - 999, 997, 990, 1001, 998, 999, 1003, 1004, 1001, 1003, - 1005, 1005, 1004, 997, 1002, 1006, 1007, 1008, 1009, 1010, - 1011, 1012, 1013, 1009, 1010, 1011, 1015, 1013, 1014, 1014, - 1016, 1015, 1017, 1006, 1018, 1007, 1019, 1008, 1022, 1020, - 1021, 1023, 1024, 1022, 1012, 1025, 1026, 41, 1016, 1029, - 1019, 1020, 1017, 1021, 1018, 1028, 1028, 1031, 1030, 1025, - 1034, 1023, 1024, 1030, 1032, 1033, 1036, 1026, 1038, 1029, - 1041, 1032, 1031, 1041, 1033, 1042, 1034, 1033, 1039, 1039, - 1042, 1036, 1040, 1040, 1043, 1044, 1036, 1045, 1047, 1046, - 1048, 1049, 1049, 1038, 1044, 1048, 1050, 1047, 1046, 1051, + 998, 996, 1001, 997, 999, 1002, 1002, 991, 992, 999, + 1003, 994, 1004, 1006, 1007, 1007, 1001, 1013, 1004, 1008, + 998, 1009, 1010, 1015, 0, 1010, 1013, 1011, 1010, 1003, + 1012, 1008, 1011, 1014, 1019, 1012, 1016, 1006, 1014, 1016, + 1010, 1009, 1017, 1018, 1018, 1020, 1021, 1017, 1015, 1022, + 1023, 1024, 1019, 1025, 1022, 1023, 1024, 1026, 1027, 1027, + 1028, 1029, 1026, 1030, 1020, 1028, 1021, 1031, 1032, 1033, + 1035, 1034, 1036, 1037, 1038, 1035, 1025, 1039, 1051, 1029, + 1042, 1033, 1032, 1030, 1034, 1041, 1041, 1031, 1038, 1043, + 1044, 1047, 1036, 1037, 1043, 1045, 1049, 1046, 1039, 1058, - 1043, 1046, 1052, 1053, 1057, 1054, 1045, 1055, 1058, 1059, - 1059, 1060, 1051, 1061, 1065, 1068, 1050, 1053, 1062, 1055, - 1052, 1054, 1061, 1062, 1063, 1063, 1058, 1060, 1064, 1057, - 1067, 1069, 1065, 1068, 1072, 1067, 1069, 1064, 1070, 1063, - 1064, 1071, 1074, 1070, 1073, 1078, 1080, 1071, 1075, 1073, - 1079, 1075, 1081, 1082, 1072, 1074, 1083, 1075, 1079, 1080, - 1084, 1083, 1085, 1088, 1078, 1087, 1087, 1089, 1090, 1091, - 1081, 1089, 1082, 1090, 1091, 1093, 1084, 1092, 1094, 1096, - 1085, 1098, 1092, 1088, 1093, 1097, 1097, 1100, 1101, 1099, - 1102, 1104, 1103, 1105, 1096, 1098, 1099, 1103, 1106, 1100, + 1042, 1054, 1045, 1051, 1054, 1044, 1046, 1047, 1056, 1046, + 1057, 1049, 1052, 1052, 1053, 1053, 1049, 1055, 1058, 1057, + 1059, 1060, 1055, 1061, 1056, 1062, 1062, 1063, 1061, 1059, + 1060, 1064, 1059, 1065, 1066, 1070, 1067, 1068, 1071, 1072, + 1072, 1073, 0, 1078, 1064, 1074, 1081, 1063, 1066, 1068, + 1075, 1065, 1067, 1077, 1074, 1075, 1071, 1073, 1076, 1076, + 1070, 1078, 1077, 1080, 1081, 1077, 1082, 1083, 1080, 1084, + 1086, 1082, 1083, 1076, 1087, 1084, 1088, 1089, 1092, 1087, + 1089, 1094, 1095, 1093, 1096, 1098, 1089, 1097, 1099, 1088, + 1086, 1093, 1097, 1102, 1094, 1101, 1101, 1092, 1103, 1104, - 1101, 1094, 14, 1104, 1106, 1107, 1107, 1108, 1112, 1102, - 1108, 1105, 1109, 1109, 1111, 1113, 1113, 1112, 1114, 1111, - 1115, 1117, 1116, 1118, 1119, 1115, 1120, 1121, 1122, 1119, - 1114, 1116, 1125, 1117, 1124, 1120, 1123, 1123, 1118, 1124, - 1126, 1127, 1129, 1122, 1128, 1128, 1131, 1121, 1120, 1130, - 1130, 1132, 1132, 1125, 1133, 1134, 1138, 1140, 1133, 1126, - 1134, 1127, 1129, 1135, 1137, 1139, 1135, 1131, 1143, 1137, - 1139, 1141, 1141, 1143, 1138, 1142, 1142, 1144, 1145, 1146, - 1147, 1148, 1140, 1150, 1152, 1147, 1151, 1150, 1150, 1144, - 1144, 1144, 1153, 1153, 1154, 1156, 1144, 1157, 1145, 1146, + 1095, 1098, 1103, 1096, 1104, 1105, 1099, 1106, 1107, 1108, + 1105, 1110, 1106, 1102, 1111, 1111, 1112, 1107, 1113, 1114, + 1116, 1115, 1117, 1118, 1119, 1113, 1110, 1117, 1120, 0, + 1112, 1114, 1108, 1115, 1120, 1118, 1121, 1121, 1122, 1116, + 1125, 1122, 1119, 1123, 1123, 1125, 1126, 1127, 1127, 1128, + 1130, 1129, 1131, 1132, 1134, 1126, 1129, 1133, 1135, 1130, + 1136, 1128, 1133, 1134, 1131, 1137, 1137, 1138, 1132, 1139, + 1140, 1141, 1138, 1142, 1142, 1136, 1134, 1143, 1135, 1144, + 1144, 1145, 1146, 1146, 1147, 1152, 1154, 1148, 1147, 1140, + 1139, 1141, 1148, 1149, 1151, 1153, 1149, 1143, 1159, 1151, - 1151, 1148, 1155, 1155, 1162, 1152, 1158, 1158, 1159, 1159, - 1163, 1163, 1164, 1162, 1165, 1156, 1166, 1167, 1169, 1157, - 1154, 1165, 1168, 1168, 1170, 1166, 1172, 1164, 1173, 1174, - 1175, 1172, 1181, 1173, 1176, 1182, 1177, 1175, 1183, 1176, - 1170, 1177, 1179, 1167, 1169, 1178, 1178, 1179, 1180, 1174, - 1183, 1185, 1181, 1184, 1182, 1186, 1184, 1180, 1187, 1187, - 1188, 1189, 1190, 1191, 1192, 1193, 1197, 1191, 1195, 1185, - 1192, 1194, 1194, 1199, 1193, 1188, 1198, 1190, 1204, 1195, - 1189, 1186, 1196, 1196, 1195, 1211, 1200, 1197, 1201, 1201, - 1198, 1200, 1202, 1199, 1203, 1205, 1202, 1202, 1206, 1203, + 1153, 1168, 1145, 1152, 1155, 1155, 1156, 1156, 1157, 1158, + 1160, 1154, 1161, 1157, 1162, 1164, 1166, 1161, 1159, 1164, + 1164, 1158, 1158, 1158, 1165, 1167, 1167, 1168, 1158, 1170, + 1160, 1169, 1169, 1171, 1162, 1172, 1172, 1166, 1165, 1173, + 1173, 1176, 1177, 1177, 1178, 1179, 1181, 1180, 1183, 1170, + 1176, 1184, 1179, 1182, 1182, 1171, 1180, 1186, 1187, 1178, + 1188, 1189, 1186, 1187, 1190, 1191, 1193, 1184, 1189, 1190, + 1191, 1193, 1181, 1194, 1183, 1192, 1192, 1195, 1197, 1196, + 1188, 1198, 1194, 1199, 1198, 1200, 1201, 1201, 1202, 1203, + 1197, 1204, 1205, 1206, 0, 1207, 1205, 1195, 1196, 1206, - 1208, 1209, 1210, 1206, 1204, 1209, 1212, 1205, 1213, 1215, - 1211, 1212, 1208, 1214, 1210, 1221, 1217, 13, 1214, 1217, - 1225, 1215, 1218, 1218, 1219, 1219, 1220, 1220, 1222, 1225, - 1213, 1223, 1224, 1230, 1222, 1221, 1223, 1227, 1224, 1232, - 1229, 1234, 1227, 1229, 1235, 1230, 1233, 1233, 1236, 1237, - 1238, 1232, 1239, 1235, 1238, 1240, 1241, 1239, 1244, 1250, - 1240, 1234, 1243, 1243, 1245, 1252, 1236, 1253, 1237, 1246, - 1241, 1248, 1248, 1245, 1243, 1250, 1244, 1254, 1246, 1255, - 1252, 1253, 1254, 1256, 1256, 1257, 1260, 1257, 1258, 1258, - 1261, 1262, 1262, 1260, 1263, 1264, 1255, 1265, 1268, 1266, + 1211, 1199, 1209, 1202, 1207, 1212, 1204, 1213, 1203, 1208, + 1208, 1200, 1214, 1209, 1210, 1210, 1218, 1214, 1209, 1212, + 1216, 1211, 1215, 1215, 1216, 1216, 1217, 1213, 1219, 1220, + 1225, 1217, 1222, 1223, 1220, 1224, 1226, 1223, 1227, 1229, + 1219, 1226, 1218, 1228, 1222, 1235, 1231, 1224, 1228, 1231, + 0, 1229, 1232, 1232, 1244, 1225, 1233, 1233, 1234, 1234, + 1227, 1236, 1239, 1237, 1238, 1235, 1244, 1236, 1237, 1241, + 1238, 1239, 1243, 1246, 1241, 1243, 1247, 1247, 1248, 1249, + 1252, 1250, 1251, 1255, 1252, 1246, 1253, 1254, 1249, 1258, + 1264, 1253, 1254, 1257, 1257, 1259, 1266, 1255, 1248, 1250, - 1267, 1270, 1269, 1263, 1277, 1272, 1273, 1270, 1275, 1265, - 1261, 1266, 1267, 1275, 1285, 1283, 1264, 1269, 1278, 1276, - 1270, 1276, 1277, 1278, 1268, 1272, 1273, 1279, 1281, 1283, - 1284, 1284, 1290, 1286, 1279, 1291, 0, 1281, 1286, 1287, - 1285, 1287, 1288, 1289, 1292, 1294, 1293, 1288, 1289, 1292, - 1290, 1293, 1295, 1297, 1298, 1291, 1299, 1299, 1294, 1301, - 1295, 1300, 1300, 1302, 1303, 1304, 1306, 1307, 1298, 1303, - 1304, 1305, 1297, 1305, 1301, 1308, 1307, 1308, 1306, 1307, - 1309, 1309, 1310, 1302, 1311, 1313, 1316, 1314, 1317, 1318, - 1313, 1310, 1314, 1319, 1321, 1323, 1311, 1324, 1325, 1316, + 1260, 1251, 1262, 1262, 1259, 1257, 1264, 1258, 1267, 1260, + 1268, 1266, 1269, 1270, 1270, 1268, 1271, 1274, 1271, 1272, + 1272, 1275, 1267, 1277, 1274, 1276, 1276, 1278, 1279, 1269, + 1280, 1281, 1277, 1282, 1283, 1286, 1287, 1290, 1284, 1290, + 1279, 1275, 1280, 1281, 1284, 1289, 1291, 1292, 1278, 1283, + 1289, 1293, 1292, 1295, 1297, 1286, 1287, 1284, 1293, 1282, + 1298, 1298, 1295, 1299, 1291, 1300, 1302, 1301, 1297, 1301, + 1300, 1302, 1303, 1304, 1305, 1306, 1307, 1303, 1309, 1308, + 1306, 1307, 1311, 1312, 1313, 1313, 1309, 1314, 1314, 1299, + 1315, 1304, 1308, 1316, 1305, 1317, 1320, 1312, 1318, 0, - 1321, 1323, 1326, 1327, 1327, 1328, 1330, 1318, 1317, 1319, - 1336, 1326, 1324, 1331, 1328, 1329, 1329, 1331, 1333, 1332, - 1335, 0, 1334, 1325, 1332, 1330, 1334, 1334, 1335, 1340, - 1336, 1333, 1339, 1339, 1341, 1341, 1342, 1342, 1340, 1343, - 1344, 1345, 1346, 1347, 1347, 1349, 1345, 1346, 1350, 1351, - 1352, 1343, 1353, 1350, 1358, 1354, 1360, 1353, 1344, 1355, - 1356, 1356, 1357, 1359, 1361, 1352, 1357, 1363, 1359, 1358, - 1349, 1364, 1351, 1354, 1365, 1355, 1366, 1368, 1367, 1369, - 1371, 1371, 1360, 1361, 1372, 1398, 1363, 1372, 1373, 1368, - 1374, 1398, 1375, 1379, 1364, 1366, 1376, 1376, 1365, 1367, + 1317, 1311, 1319, 1318, 1319, 1315, 1321, 1322, 1320, 1322, + 1323, 1323, 1324, 1316, 1325, 1321, 1330, 1327, 1321, 1328, + 1331, 1324, 1327, 1332, 1328, 1335, 1325, 1333, 1337, 1330, + 1338, 1335, 1339, 1340, 1337, 1341, 1341, 1342, 1343, 1343, + 1331, 1332, 1340, 1333, 1344, 1338, 1342, 1345, 1346, 1347, + 1348, 1345, 1349, 1346, 1348, 1348, 1350, 1339, 1353, 1353, + 1349, 1354, 1347, 1344, 1355, 1355, 1356, 1356, 1357, 1358, + 1354, 1363, 1359, 1360, 1361, 1361, 1350, 1359, 1360, 1364, + 1357, 1365, 1366, 1367, 1364, 1368, 1369, 1358, 1367, 1370, + 1370, 1371, 1372, 1373, 1374, 1371, 1363, 1366, 1373, 1375, - 1369, 1373, 1377, 1377, 1374, 1375, 1378, 1378, 1379, 1380, - 1381, 1381, 1382, 1383, 1383, 1384, 1384, 1385, 1385, 1386, - 1391, 1382, 1380, 1388, 1382, 1387, 1387, 1389, 1389, 1390, - 1390, 1393, 1394, 1394, 1395, 1402, 1393, 1397, 1386, 1391, - 1404, 1388, 1396, 1396, 1399, 1400, 1400, 1399, 1401, 1401, - 1403, 1405, 1405, 1395, 1402, 1397, 1407, 1408, 1409, 1404, - 1410, 1400, 1411, 1411, 1410, 1403, 1412, 1413, 1413, 1414, - 1415, 1415, 1416, 1409, 1418, 1420, 1407, 1419, 1421, 1423, - 1408, 1416, 1419, 1422, 1423, 1412, 1418, 1424, 1425, 1426, - 1427, 1421, 1424, 1428, 1432, 1414, 1429, 0, 1426, 1427, + 1377, 1378, 1369, 1368, 1365, 1379, 1380, 1372, 1387, 1381, + 1382, 1383, 1385, 1385, 1386, 1389, 1393, 1386, 1375, 1377, + 1374, 1387, 1382, 1388, 1378, 1380, 1390, 1390, 1389, 1379, + 1381, 1393, 1383, 1391, 1391, 1392, 1392, 1388, 1394, 1395, + 1395, 1396, 1397, 1397, 1398, 1398, 1399, 1399, 1400, 1405, + 1396, 1394, 1402, 1396, 1401, 1401, 1403, 1403, 1404, 1404, + 1407, 1408, 1408, 1409, 1416, 1407, 1411, 1400, 1405, 1412, + 1402, 1410, 1410, 1413, 1417, 1412, 1413, 1414, 1414, 1415, + 1415, 1418, 1409, 1416, 1411, 1419, 1419, 1421, 1422, 1417, + 1423, 1424, 1428, 1414, 1426, 1424, 1425, 1425, 1427, 1427, - 1420, 1429, 1430, 1425, 1422, 1438, 1430, 1428, 1434, 1435, - 1435, 1436, 1437, 1437, 1432, 1440, 1436, 1434, 1447, 1441, - 1443, 1437, 1448, 1445, 1446, 1438, 1445, 1438, 1441, 1446, - 1440, 1452, 1443, 1455, 1448, 1449, 1449, 1454, 1447, 1451, - 1451, 1453, 1453, 1456, 1459, 1452, 1463, 1455, 1459, 1454, - 1457, 1457, 1460, 1461, 1461, 1460, 1462, 1464, 1465, 1466, - 1467, 1462, 1456, 1466, 1468, 1469, 1463, 1470, 1472, 1468, - 1469, 1473, 1465, 1470, 1474, 1475, 1473, 1464, 1479, 1474, - 1467, 1480, 1480, 1475, 1472, 1476, 1481, 1476, 1482, 1481, - 1483, 1483, 1479, 1487, 1487, 1489, 1492, 1493, 1493, 1495, + 1418, 1429, 1429, 1430, 1432, 1423, 1434, 1421, 1435, 1433, + 1439, 1422, 1430, 1426, 1433, 1436, 1432, 1437, 1428, 1438, + 1440, 1435, 1437, 1441, 1438, 1439, 1442, 1446, 1443, 1440, + 1444, 1434, 1441, 1443, 1444, 1448, 1436, 1449, 1449, 1452, + 1442, 1450, 1451, 1451, 1448, 1454, 1450, 1446, 1455, 1459, + 1457, 1451, 1459, 1460, 1461, 1462, 1466, 1455, 1460, 1452, + 1454, 1452, 1457, 1463, 1463, 1465, 1465, 1462, 1467, 1467, + 1466, 1468, 1469, 1470, 1461, 1471, 1471, 1473, 1477, 1474, + 1478, 1473, 1474, 1468, 1475, 1475, 1469, 1479, 1476, 1481, + 1480, 1482, 1470, 1476, 1480, 1486, 1482, 1483, 1477, 1484, - 1495, 1492, 1497, 1498, 1498, 1499, 1500, 1497, 1503, 1507, - 1501, 1504, 1509, 1489, 1482, 1501, 1505, 1505, 1507, 1508, - 1510, 1499, 1516, 1504, 1508, 1512, 1512, 1503, 1500, 1514, - 1509, 1515, 1517, 1515, 1514, 1510, 1516, 1517, 1518, 1518, - 1519, 1519, 1520, 1520, 1521, 1522, 1523, 1523, 1524, 1525, - 1526, 1528, 1527, 1529, 1529, 1530, 1521, 1527, 1531, 1532, - 1524, 1525, 1526, 1522, 1530, 1533, 1534, 1535, 1536, 1536, - 1538, 1528, 1539, 1537, 0, 1540, 1542, 1542, 1533, 1532, - 1540, 1535, 1537, 1547, 1531, 1549, 1541, 1548, 1538, 1550, - 1534, 1541, 1543, 1543, 1539, 1544, 1544, 1551, 1552, 1553, + 1478, 1479, 1483, 1487, 1493, 1484, 1489, 1488, 1487, 1481, + 1496, 1486, 1488, 1490, 1489, 1490, 1494, 1494, 1493, 1495, + 1497, 1497, 1495, 1501, 1501, 1503, 1506, 1507, 1507, 1509, + 1509, 1506, 1511, 1512, 1512, 1513, 1496, 1511, 1514, 1515, + 1517, 1518, 1524, 1503, 1515, 1519, 1519, 1521, 1523, 1522, + 1528, 1513, 0, 1518, 1522, 1528, 1521, 1524, 1530, 1517, + 1514, 1526, 1526, 1529, 1531, 1529, 1523, 1532, 1532, 1531, + 1533, 1533, 1530, 1534, 1534, 1535, 1536, 1537, 1537, 1538, + 1539, 1540, 1542, 1541, 1543, 1543, 1544, 1535, 1541, 1545, + 1546, 1538, 1539, 1540, 1536, 1544, 1547, 1548, 1549, 1550, - 1554, 1554, 1558, 1547, 1557, 1548, 1551, 1549, 1559, 1550, - 1556, 1556, 1560, 1557, 1561, 1559, 1562, 1553, 1552, 1563, - 1558, 1564, 1565, 1565, 1566, 1567, 1568, 1560, 1569, 1566, - 1571, 1570, 1561, 1572, 1562, 1563, 1570, 1573, 1577, 1576, - 1564, 1568, 1573, 1567, 1574, 1580, 1574, 1569, 1576, 1581, - 1571, 1583, 1581, 1572, 1582, 1582, 1584, 1577, 1585, 1585, - 1586, 1588, 1591, 1589, 1586, 1580, 1583, 1589, 1590, 1590, - 1593, 1593, 1594, 1601, 1584, 1591, 1588, 1595, 1595, 1596, - 1596, 1600, 1600, 1602, 1603, 1604, 1606, 1605, 1609, 1607, - 1604, 1594, 1605, 1603, 1610, 1601, 1602, 1607, 1612, 1610, + 1550, 1552, 1542, 1553, 1551, 0, 1554, 1556, 1556, 1547, + 1546, 1554, 1549, 1551, 1561, 1545, 1563, 1555, 1562, 1552, + 1564, 1548, 1555, 1557, 1557, 1553, 1558, 1558, 1565, 1566, + 1567, 1568, 1568, 1572, 1561, 1571, 1562, 1565, 1563, 1573, + 1564, 1570, 1570, 1574, 1571, 1575, 1573, 1576, 1567, 1566, + 1577, 1572, 1578, 1579, 1579, 1580, 1581, 1582, 1574, 1583, + 1580, 1585, 1584, 1575, 1586, 1576, 1577, 1584, 1587, 1591, + 1590, 1578, 1582, 1587, 1581, 1588, 1594, 1588, 1583, 1590, + 1595, 1585, 1597, 1595, 1586, 1596, 1596, 1598, 1591, 1599, + 1599, 1600, 1602, 1605, 1603, 1600, 1594, 1597, 1603, 1604, - 1635, 1611, 0, 1609, 1615, 1606, 1611, 1613, 1613, 1614, - 1614, 1615, 1616, 1612, 1617, 1618, 1623, 1616, 1635, 1617, - 1618, 1619, 1619, 1620, 1620, 1624, 1627, 1625, 1626, 1623, - 1624, 1625, 1628, 1626, 1629, 1627, 1630, 1631, 1636, 1634, - 1633, 1630, 1629, 1633, 1634, 1637, 1638, 1628, 1640, 1631, - 1642, 1636, 1639, 1639, 1637, 1638, 1643, 1640, 1644, 1645, - 1645, 1646, 1647, 1648, 1649, 1649, 1650, 1653, 1651, 1642, - 1657, 1647, 1651, 1652, 1652, 1653, 1643, 1644, 1648, 1654, - 1646, 1656, 1659, 1657, 1654, 1650, 1659, 1660, 1661, 1668, - 1656, 1663, 1663, 1665, 1665, 1669, 1669, 1670, 1670, 1671, + 1604, 1607, 1607, 1608, 1615, 1598, 1605, 1602, 1609, 1609, + 1610, 1610, 1614, 1614, 1616, 1617, 1618, 1620, 1619, 1623, + 1621, 1618, 1608, 1619, 1617, 1624, 1615, 1616, 1621, 1626, + 1624, 1649, 1625, 0, 1623, 1629, 1620, 1625, 1627, 1627, + 1628, 1628, 1629, 1630, 1626, 1631, 1632, 1637, 1630, 1649, + 1631, 1632, 1633, 1633, 1634, 1634, 1638, 1641, 1639, 1640, + 1637, 1638, 1639, 1642, 1640, 1643, 1641, 1644, 1645, 1650, + 1648, 1647, 1644, 1643, 1647, 1648, 1651, 1652, 1642, 1654, + 1645, 1656, 1650, 1653, 1653, 1651, 1652, 1657, 1654, 1658, + 1659, 1659, 1660, 1661, 1662, 1663, 1663, 1664, 1667, 1665, - 1675, 1660, 1671, 1661, 1672, 1672, 1673, 1673, 1676, 1668, - 1674, 1674, 1677, 1678, 1678, 1679, 1682, 1677, 1675, 1679, - 1682, 1682, 1676, 1683, 1684, 1689, 1685, 1688, 1690, 1691, - 1684, 1685, 1688, 1690, 1692, 1693, 1694, 1694, 1695, 1697, - 1696, 1704, 1689, 1689, 1698, 1698, 1683, 1691, 1696, 1693, - 1699, 1699, 1700, 1700, 1692, 1701, 1702, 1695, 1697, 1703, - 1705, 1702, 1706, 1707, 1709, 1709, 1711, 1704, 1716, 1705, - 1710, 1701, 1714, 1710, 1713, 1713, 1720, 1714, 1719, 1703, - 1717, 1717, 1706, 1707, 1711, 1718, 1716, 1719, 1721, 1718, - 1722, 1720, 1721, 1721, 1726, 1723, 1725, 1728, 1733, 1733, + 1656, 1671, 1661, 1665, 1666, 1666, 1667, 1657, 1658, 1662, + 1668, 1660, 1670, 1673, 1671, 1668, 1664, 1673, 1674, 1675, + 1682, 1670, 1677, 1677, 1679, 1679, 1683, 1683, 1684, 1684, + 1685, 1689, 1674, 1685, 1675, 1686, 1686, 1687, 1687, 1690, + 1682, 1688, 1688, 1691, 1692, 1692, 1693, 1696, 1691, 1689, + 1693, 1696, 1696, 1690, 1697, 1698, 1703, 1699, 1702, 1704, + 1705, 1698, 1699, 1702, 1704, 1706, 1707, 1708, 1708, 1709, + 1711, 1710, 1718, 1703, 1703, 1712, 1712, 1697, 1705, 1710, + 1707, 1713, 1713, 1714, 1714, 1706, 1715, 1716, 1709, 1711, + 1717, 1719, 1716, 1720, 1721, 1723, 1723, 1725, 1718, 1730, - 1734, 0, 1732, 1722, 1723, 1725, 1726, 1732, 1736, 1734, - 1737, 1737, 1740, 1736, 1737, 1739, 1739, 1741, 1742, 1743, - 1744, 1740, 1728, 1742, 1745, 1744, 1746, 1747, 1748, 1748, - 1750, 1746, 1751, 1752, 1752, 1753, 1755, 1741, 1756, 1754, - 1743, 1757, 1745, 1754, 1760, 1755, 1759, 1751, 1753, 1750, - 1758, 1759, 1747, 1762, 1756, 1761, 1761, 1771, 1758, 1772, - 1757, 1764, 1764, 1765, 1765, 1767, 1767, 1773, 1768, 1776, - 1760, 1777, 1762, 1768, 1770, 1770, 1780, 1771, 1775, 1775, - 1778, 1778, 1772, 1776, 1779, 1779, 1773, 1781, 1782, 1783, - 1783, 1784, 1787, 1777, 1784, 1780, 1785, 1785, 1788, 1781, + 1719, 1724, 1715, 1728, 1724, 1727, 1727, 1734, 1728, 1733, + 1717, 1731, 1731, 1720, 1721, 1725, 1732, 1730, 1733, 1735, + 1732, 1736, 1734, 1735, 1735, 1740, 1737, 1739, 1742, 1747, + 1747, 1748, 0, 1746, 1736, 1737, 1739, 1740, 1746, 1750, + 1748, 1751, 1751, 1754, 1750, 1751, 1753, 1753, 1755, 1756, + 1757, 1758, 1754, 1742, 1756, 1759, 1758, 1760, 1761, 1762, + 1762, 1764, 1760, 1765, 1766, 1766, 1767, 1769, 1755, 1770, + 1768, 1757, 1771, 1759, 1768, 1774, 1769, 1773, 1765, 1767, + 1764, 1772, 1773, 1761, 1776, 1770, 1775, 1775, 1785, 1772, + 1786, 1771, 1778, 1778, 1779, 1779, 1781, 1781, 1787, 1782, - 1789, 1790, 1791, 1789, 1787, 1792, 1790, 1793, 1782, 1797, - 1792, 1794, 1794, 1796, 1796, 1799, 1799, 1800, 1788, 1801, - 1885, 1791, 1800, 1885, 1793, 1793, 1802, 1806, 1797, 1803, - 1803, 1802, 1806, 1801, 1804, 1804, 1805, 1805, 1808, 1808, - 1812, 1812, 1814, 1814, 1815, 1816, 1817, 1818, 1818, 1819, - 1826, 1822, 1823, 1823, 1819, 1817, 1824, 1827, 1815, 1822, - 1829, 1824, 1828, 1830, 1831, 1816, 1879, 1828, 1832, 1833, - 1826, 1830, 1829, 1834, 1835, 1838, 1858, 1827, 1879, 1835, - 1840, 1840, 1831, 1851, 1832, 1858, 1833, 1833, 1841, 1841, - 1846, 1846, 1842, 1848, 1834, 1838, 1842, 1848, 1850, 1850, + 1790, 1774, 1791, 1776, 1782, 1784, 1784, 1794, 1785, 1789, + 1789, 1792, 1792, 1786, 1790, 1793, 1793, 1787, 1795, 1796, + 1797, 1797, 1798, 1801, 1791, 1798, 1794, 1799, 1799, 1802, + 1795, 1803, 1804, 1805, 1803, 1801, 1806, 1804, 1807, 1796, + 1811, 1806, 1808, 1808, 1810, 1810, 1813, 1813, 1814, 1802, + 1815, 1899, 1805, 1814, 1899, 1807, 1807, 1816, 1820, 1811, + 1817, 1817, 1816, 1820, 1815, 1818, 1818, 1819, 1819, 1822, + 1822, 1826, 1826, 1828, 1828, 1829, 1830, 1831, 1832, 1832, + 1833, 1840, 1836, 1837, 1837, 1833, 1831, 1838, 1841, 1829, + 1836, 1843, 1838, 1842, 1844, 1845, 1830, 1893, 1842, 1846, - 1852, 1851, 1854, 1854, 1855, 1857, 1859, 1859, 1860, 1860, - 1861, 1861, 1862, 1863, 1852, 1864, 1865, 1862, 0, 1855, - 1866, 1867, 1868, 1857, 1886, 1866, 1867, 1869, 1869, 1886, - 1864, 1872, 1872, 1874, 1874, 1876, 1881, 1865, 1863, 1877, - 1877, 1868, 1880, 1880, 1876, 1882, 1882, 1887, 1888, 1889, - 1891, 1881, 1890, 1888, 1895, 1897, 1898, 1895, 1899, 1897, - 1901, 1887, 1902, 1903, 1905, 1904, 1891, 1906, 1889, 1907, - 1890, 1901, 1899, 1908, 0, 1902, 1898, 1909, 1909, 1910, - 1905, 1915, 1903, 1904, 1907, 1911, 1911, 1916, 1910, 1912, - 1912, 1913, 1906, 1908, 1914, 1917, 1913, 1918, 1921, 1914, + 1847, 1840, 1844, 1843, 1848, 1849, 1852, 1872, 1841, 1893, + 1849, 1854, 1854, 1845, 1865, 1846, 1872, 1847, 1847, 1855, + 1855, 1860, 1860, 1856, 1862, 1848, 1852, 1856, 1862, 1864, + 1864, 1866, 1865, 1868, 1868, 1869, 1871, 1873, 1873, 1874, + 1874, 1875, 1875, 1876, 1877, 1866, 1878, 1879, 1876, 0, + 1869, 1880, 1881, 1882, 1871, 1900, 1880, 1881, 1883, 1883, + 1900, 1878, 1886, 1886, 1888, 1888, 1890, 1895, 1879, 1877, + 1891, 1891, 1882, 1894, 1894, 1890, 1896, 1896, 1901, 1902, + 1903, 1905, 1895, 1904, 1902, 1909, 1911, 1912, 1909, 1913, + 1911, 1915, 1901, 1916, 1917, 1919, 1918, 1905, 1920, 1903, - 1917, 1924, 1916, 1919, 1919, 1925, 1915, 1926, 1927, 1929, - 1925, 1918, 1926, 1921, 1928, 1931, 1932, 1933, 1934, 1935, - 1924, 1936, 1927, 1938, 1939, 1939, 1936, 1928, 1929, 1931, - 1933, 1934, 1937, 1943, 1940, 1932, 1941, 1937, 1935, 1940, - 1942, 1941, 1938, 1944, 1946, 1942, 1945, 1945, 1944, 1947, - 1948, 1946, 1943, 1949, 1950, 1953, 1954, 1951, 1949, 1955, - 1953, 1956, 1957, 1957, 1959, 1964, 1958, 1962, 1947, 1948, - 1951, 1958, 1962, 1950, 1956, 1954, 1960, 1960, 1955, 1961, - 1961, 1963, 1966, 1959, 1964, 1965, 1965, 1967, 1963, 1966, - 1968, 1969, 1970, 1972, 1967, 1973, 1969, 1974, 1972, 1975, + 1921, 1904, 1915, 1913, 1922, 0, 1916, 1912, 1923, 1923, + 1924, 1919, 1929, 1917, 1918, 1921, 1925, 1925, 1930, 1924, + 1926, 1926, 1927, 1920, 1922, 1928, 1931, 1927, 1932, 1935, + 1928, 1931, 1938, 1930, 1933, 1933, 1939, 1929, 1940, 1941, + 1943, 1939, 1932, 1940, 1935, 1942, 1945, 1946, 1947, 1948, + 1949, 1938, 1950, 1941, 1952, 1953, 1953, 1950, 1942, 1943, + 1945, 1947, 1948, 1951, 1957, 1954, 1946, 1955, 1951, 1949, + 1954, 1956, 1955, 1952, 1958, 1960, 1956, 1959, 1959, 1958, + 1961, 1962, 1960, 1957, 1963, 1964, 1967, 1968, 1965, 1963, + 1969, 1967, 1970, 1971, 1971, 1973, 1978, 1972, 1976, 1961, - 1973, 1976, 1976, 1977, 1978, 1979, 1979, 1980, 1980, 1968, - 1981, 1970, 1982, 1982, 1983, 1983, 1974, 1981, 1975, 1984, - 1986, 1990, 1977, 1978, 1989, 1986, 1984, 1991, 0, 1989, - 1992, 1992, 1993, 1993, 0, 0, 0, 0, 0, 0, - 1990, 0, 0, 0, 0, 0, 1991, 1997, 1997, 1997, - 1997, 1997, 1997, 1997, 1998, 1998, 1998, 1998, 1998, 1998, - 1998, 1999, 1999, 1999, 1999, 1999, 1999, 1999, 2000, 2000, - 2000, 2000, 2000, 2000, 2000, 2001, 2001, 2001, 2001, 2001, - 2001, 2001, 2003, 2003, 0, 2003, 2003, 2003, 2003, 2004, - 2004, 0, 0, 0, 2004, 2004, 2005, 2005, 0, 0, + 1962, 1965, 1972, 1976, 1964, 1970, 1968, 1974, 1974, 1969, + 1975, 1975, 1977, 1980, 1973, 1978, 1979, 1979, 1981, 1977, + 1980, 1982, 1983, 1984, 1986, 1981, 1987, 1983, 1988, 1986, + 1989, 1987, 1990, 1990, 1991, 1992, 1993, 1993, 1994, 1994, + 1982, 1995, 1984, 1996, 1996, 1997, 1997, 1988, 1995, 1989, + 1998, 2000, 2004, 1991, 1992, 2003, 2000, 1998, 2005, 0, + 2003, 2006, 2006, 2007, 2007, 0, 0, 0, 0, 0, + 0, 2004, 0, 0, 0, 0, 0, 2005, 2011, 2011, + 2011, 2011, 2011, 2011, 2011, 2012, 2012, 2012, 2012, 2012, + 2012, 2012, 2013, 2013, 2013, 2013, 2013, 2013, 2013, 2014, - 2005, 0, 2005, 2006, 0, 0, 0, 0, 0, 2006, - 2007, 2007, 0, 0, 0, 2007, 2007, 2008, 0, 0, - 0, 0, 0, 2008, 2009, 2009, 0, 2009, 2009, 2009, - 2009, 2010, 2010, 0, 2010, 2010, 2010, 2010, 1996, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996, - 1996, 1996, 1996, 1996, 1996, 1996, 1996, 1996 + 2014, 2014, 2014, 2014, 2014, 2014, 2015, 2015, 2015, 2015, + 2015, 2015, 2015, 2017, 2017, 0, 2017, 2017, 2017, 2017, + 2018, 2018, 0, 0, 0, 2018, 2018, 2019, 2019, 0, + 0, 2019, 0, 2019, 2020, 0, 0, 0, 0, 0, + 2020, 2021, 2021, 0, 0, 0, 2021, 2021, 2022, 0, + 0, 0, 0, 0, 2022, 2023, 2023, 0, 2023, 2023, + 2023, 2023, 2024, 2024, 0, 2024, 2024, 2024, 2024, 2010, + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, + + 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010, 2010 } ; static yy_state_type yy_last_accepting_state; @@ -2191,7 +2204,7 @@ static void config_end_include(void) #define YY_NO_INPUT 1 #endif -#line 2193 "" +#line 2206 "" #define INITIAL 0 #define quotedstring 1 @@ -2414,7 +2427,7 @@ YY_DECL { #line 207 "./util/configlexer.lex" -#line 2416 "" +#line 2429 "" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2447,13 +2460,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 >= 1997 ) + if ( yy_current_state >= 2011 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 3939 ); + while ( yy_base[yy_current_state] != 3970 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -3154,284 +3167,294 @@ YY_RULE_SETUP case 135: YY_RULE_SETUP #line 346 "./util/configlexer.lex" -{ YDVAR(0, VAR_REMOTE_CONTROL) } +{ YDVAR(1, VAR_SHM_ENABLE) } YY_BREAK case 136: YY_RULE_SETUP #line 347 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_ENABLE) } +{ YDVAR(1, VAR_SHM_KEY) } YY_BREAK case 137: YY_RULE_SETUP #line 348 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_INTERFACE) } +{ YDVAR(0, VAR_REMOTE_CONTROL) } YY_BREAK case 138: YY_RULE_SETUP #line 349 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_PORT) } +{ YDVAR(1, VAR_CONTROL_ENABLE) } YY_BREAK case 139: YY_RULE_SETUP #line 350 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_USE_CERT) } +{ YDVAR(1, VAR_CONTROL_INTERFACE) } YY_BREAK case 140: YY_RULE_SETUP #line 351 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_KEY_FILE) } +{ YDVAR(1, VAR_CONTROL_PORT) } YY_BREAK case 141: YY_RULE_SETUP #line 352 "./util/configlexer.lex" -{ YDVAR(1, VAR_SERVER_CERT_FILE) } +{ YDVAR(1, VAR_CONTROL_USE_CERT) } YY_BREAK case 142: YY_RULE_SETUP #line 353 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_KEY_FILE) } +{ YDVAR(1, VAR_SERVER_KEY_FILE) } YY_BREAK case 143: YY_RULE_SETUP #line 354 "./util/configlexer.lex" -{ YDVAR(1, VAR_CONTROL_CERT_FILE) } +{ YDVAR(1, VAR_SERVER_CERT_FILE) } YY_BREAK case 144: YY_RULE_SETUP #line 355 "./util/configlexer.lex" -{ YDVAR(1, VAR_PYTHON_SCRIPT) } +{ YDVAR(1, VAR_CONTROL_KEY_FILE) } YY_BREAK case 145: YY_RULE_SETUP #line 356 "./util/configlexer.lex" -{ YDVAR(0, VAR_PYTHON) } +{ YDVAR(1, VAR_CONTROL_CERT_FILE) } YY_BREAK case 146: YY_RULE_SETUP #line 357 "./util/configlexer.lex" -{ YDVAR(1, VAR_DOMAIN_INSECURE) } +{ YDVAR(1, VAR_PYTHON_SCRIPT) } YY_BREAK case 147: YY_RULE_SETUP #line 358 "./util/configlexer.lex" -{ YDVAR(1, VAR_MINIMAL_RESPONSES) } +{ YDVAR(0, VAR_PYTHON) } YY_BREAK case 148: YY_RULE_SETUP #line 359 "./util/configlexer.lex" -{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } +{ YDVAR(1, VAR_DOMAIN_INSECURE) } YY_BREAK case 149: YY_RULE_SETUP #line 360 "./util/configlexer.lex" -{ YDVAR(1, VAR_MAX_UDP_SIZE) } +{ YDVAR(1, VAR_MINIMAL_RESPONSES) } YY_BREAK case 150: YY_RULE_SETUP #line 361 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_PREFIX) } +{ YDVAR(1, VAR_RRSET_ROUNDROBIN) } YY_BREAK case 151: YY_RULE_SETUP #line 362 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNS64_SYNTHALL) } +{ YDVAR(1, VAR_MAX_UDP_SIZE) } YY_BREAK case 152: YY_RULE_SETUP #line 363 "./util/configlexer.lex" -{ YDVAR(1, VAR_DEFINE_TAG) } +{ YDVAR(1, VAR_DNS64_PREFIX) } YY_BREAK case 153: YY_RULE_SETUP #line 364 "./util/configlexer.lex" -{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } +{ YDVAR(1, VAR_DNS64_SYNTHALL) } YY_BREAK case 154: YY_RULE_SETUP #line 365 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } +{ YDVAR(1, VAR_DEFINE_TAG) } YY_BREAK case 155: YY_RULE_SETUP #line 366 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } +{ YDVAR(2, VAR_LOCAL_ZONE_TAG) } YY_BREAK case 156: YY_RULE_SETUP #line 367 "./util/configlexer.lex" -{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } +{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) } YY_BREAK case 157: YY_RULE_SETUP #line 368 "./util/configlexer.lex" -{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) } YY_BREAK case 158: YY_RULE_SETUP #line 369 "./util/configlexer.lex" -{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } +{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) } YY_BREAK case 159: YY_RULE_SETUP #line 370 "./util/configlexer.lex" -{ YDVAR(0, VAR_DNSTAP) } +{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) } YY_BREAK case 160: YY_RULE_SETUP #line 371 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_ENABLE) } +{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) } YY_BREAK case 161: YY_RULE_SETUP #line 372 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } +{ YDVAR(0, VAR_DNSTAP) } YY_BREAK case 162: YY_RULE_SETUP #line 373 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_ENABLE) } YY_BREAK case 163: YY_RULE_SETUP #line 374 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) } YY_BREAK case 164: YY_RULE_SETUP #line 375 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_IDENTITY) } +{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) } YY_BREAK case 165: YY_RULE_SETUP #line 376 "./util/configlexer.lex" -{ YDVAR(1, VAR_DNSTAP_VERSION) } +{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) } YY_BREAK case 166: YY_RULE_SETUP #line 377 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } +{ YDVAR(1, VAR_DNSTAP_IDENTITY) } YY_BREAK case 167: YY_RULE_SETUP -#line 379 "./util/configlexer.lex" -{ - YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } +#line 378 "./util/configlexer.lex" +{ YDVAR(1, VAR_DNSTAP_VERSION) } YY_BREAK case 168: YY_RULE_SETUP -#line 381 "./util/configlexer.lex" +#line 379 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) } YY_BREAK case 169: YY_RULE_SETUP -#line 383 "./util/configlexer.lex" +#line 381 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) } YY_BREAK case 170: YY_RULE_SETUP -#line 385 "./util/configlexer.lex" +#line 383 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) } YY_BREAK case 171: YY_RULE_SETUP -#line 387 "./util/configlexer.lex" +#line 385 "./util/configlexer.lex" { - YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } + YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) } YY_BREAK case 172: YY_RULE_SETUP -#line 389 "./util/configlexer.lex" -{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } +#line 387 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) } YY_BREAK case 173: YY_RULE_SETUP -#line 390 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT) } +#line 389 "./util/configlexer.lex" +{ + YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) } YY_BREAK case 174: YY_RULE_SETUP #line 391 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT) } +{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) } YY_BREAK case 175: YY_RULE_SETUP #line 392 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_IP_RATELIMIT) } YY_BREAK case 176: YY_RULE_SETUP #line 393 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SLABS) } +{ YDVAR(1, VAR_RATELIMIT) } YY_BREAK case 177: YY_RULE_SETUP #line 394 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) } YY_BREAK case 178: YY_RULE_SETUP #line 395 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_SIZE) } +{ YDVAR(1, VAR_RATELIMIT_SLABS) } YY_BREAK case 179: YY_RULE_SETUP #line 396 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } +{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) } YY_BREAK case 180: YY_RULE_SETUP #line 397 "./util/configlexer.lex" -{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } +{ YDVAR(1, VAR_RATELIMIT_SIZE) } YY_BREAK case 181: YY_RULE_SETUP #line 398 "./util/configlexer.lex" -{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) } YY_BREAK case 182: YY_RULE_SETUP #line 399 "./util/configlexer.lex" -{ YDVAR(1, VAR_RATELIMIT_FACTOR) } +{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) } YY_BREAK case 183: -/* rule 183 can match eol */ YY_RULE_SETUP #line 400 "./util/configlexer.lex" +{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) } + YY_BREAK +case 184: +YY_RULE_SETUP +#line 401 "./util/configlexer.lex" +{ YDVAR(1, VAR_RATELIMIT_FACTOR) } + YY_BREAK +case 185: +/* rule 185 can match eol */ +YY_RULE_SETUP +#line 402 "./util/configlexer.lex" { LEXOUT(("NL\n")); cfg_parser->line++; } YY_BREAK /* Quoted strings. Strip leading and ending quotes */ -case 184: +case 186: YY_RULE_SETUP -#line 403 "./util/configlexer.lex" +#line 405 "./util/configlexer.lex" { BEGIN(quotedstring); LEXOUT(("QS ")); } YY_BREAK case YY_STATE_EOF(quotedstring): -#line 404 "./util/configlexer.lex" +#line 406 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 185: +case 187: YY_RULE_SETUP -#line 409 "./util/configlexer.lex" +#line 411 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 186: -/* rule 186 can match eol */ +case 188: +/* rule 188 can match eol */ YY_RULE_SETUP -#line 410 "./util/configlexer.lex" +#line 412 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end \""); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 187: +case 189: YY_RULE_SETUP -#line 412 "./util/configlexer.lex" +#line 414 "./util/configlexer.lex" { LEXOUT(("QE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3444,34 +3467,34 @@ YY_RULE_SETUP } YY_BREAK /* Single Quoted strings. Strip leading and ending quotes */ -case 188: +case 190: YY_RULE_SETUP -#line 424 "./util/configlexer.lex" +#line 426 "./util/configlexer.lex" { BEGIN(singlequotedstr); LEXOUT(("SQS ")); } YY_BREAK case YY_STATE_EOF(singlequotedstr): -#line 425 "./util/configlexer.lex" +#line 427 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); if(--num_args == 0) { BEGIN(INITIAL); } else { BEGIN(val); } } YY_BREAK -case 189: +case 191: YY_RULE_SETUP -#line 430 "./util/configlexer.lex" +#line 432 "./util/configlexer.lex" { LEXOUT(("STR(%s) ", yytext)); yymore(); } YY_BREAK -case 190: -/* rule 190 can match eol */ +case 192: +/* rule 192 can match eol */ YY_RULE_SETUP -#line 431 "./util/configlexer.lex" +#line 433 "./util/configlexer.lex" { yyerror("newline inside quoted string, no end '"); cfg_parser->line++; BEGIN(INITIAL); } YY_BREAK -case 191: +case 193: YY_RULE_SETUP -#line 433 "./util/configlexer.lex" +#line 435 "./util/configlexer.lex" { LEXOUT(("SQE ")); if(--num_args == 0) { BEGIN(INITIAL); } @@ -3484,38 +3507,38 @@ YY_RULE_SETUP } YY_BREAK /* include: directive */ -case 192: +case 194: YY_RULE_SETUP -#line 445 "./util/configlexer.lex" +#line 447 "./util/configlexer.lex" { LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); } YY_BREAK case YY_STATE_EOF(include): -#line 447 "./util/configlexer.lex" +#line 449 "./util/configlexer.lex" { yyerror("EOF inside include directive"); BEGIN(inc_prev); } YY_BREAK -case 193: -YY_RULE_SETUP -#line 451 "./util/configlexer.lex" -{ LEXOUT(("ISP ")); /* ignore */ } - YY_BREAK -case 194: -/* rule 194 can match eol */ -YY_RULE_SETUP -#line 452 "./util/configlexer.lex" -{ LEXOUT(("NL\n")); cfg_parser->line++;} - YY_BREAK case 195: YY_RULE_SETUP #line 453 "./util/configlexer.lex" -{ LEXOUT(("IQS ")); BEGIN(include_quoted); } +{ LEXOUT(("ISP ")); /* ignore */ } YY_BREAK case 196: +/* rule 196 can match eol */ YY_RULE_SETUP #line 454 "./util/configlexer.lex" +{ LEXOUT(("NL\n")); cfg_parser->line++;} + YY_BREAK +case 197: +YY_RULE_SETUP +#line 455 "./util/configlexer.lex" +{ LEXOUT(("IQS ")); BEGIN(include_quoted); } + YY_BREAK +case 198: +YY_RULE_SETUP +#line 456 "./util/configlexer.lex" { LEXOUT(("Iunquotedstr(%s) ", yytext)); config_start_include_glob(yytext); @@ -3523,27 +3546,27 @@ YY_RULE_SETUP } YY_BREAK case YY_STATE_EOF(include_quoted): -#line 459 "./util/configlexer.lex" +#line 461 "./util/configlexer.lex" { yyerror("EOF inside quoted string"); BEGIN(inc_prev); } YY_BREAK -case 197: +case 199: YY_RULE_SETUP -#line 463 "./util/configlexer.lex" +#line 465 "./util/configlexer.lex" { LEXOUT(("ISTR(%s) ", yytext)); yymore(); } YY_BREAK -case 198: -/* rule 198 can match eol */ +case 200: +/* rule 200 can match eol */ YY_RULE_SETUP -#line 464 "./util/configlexer.lex" +#line 466 "./util/configlexer.lex" { yyerror("newline before \" in include name"); cfg_parser->line++; BEGIN(inc_prev); } YY_BREAK -case 199: +case 201: YY_RULE_SETUP -#line 466 "./util/configlexer.lex" +#line 468 "./util/configlexer.lex" { LEXOUT(("IQE ")); yytext[yyleng - 1] = '\0'; @@ -3553,7 +3576,7 @@ YY_RULE_SETUP YY_BREAK case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(val): -#line 472 "./util/configlexer.lex" +#line 474 "./util/configlexer.lex" { LEXOUT(("LEXEOF ")); yy_set_bol(1); /* Set beginning of line, so "^" rules match. */ @@ -3565,33 +3588,33 @@ case YY_STATE_EOF(val): } } YY_BREAK -case 200: +case 202: YY_RULE_SETUP -#line 483 "./util/configlexer.lex" +#line 485 "./util/configlexer.lex" { LEXOUT(("unquotedstr(%s) ", yytext)); if(--num_args == 0) { BEGIN(INITIAL); } yylval.str = strdup(yytext); return STRING_ARG; } YY_BREAK -case 201: +case 203: YY_RULE_SETUP -#line 487 "./util/configlexer.lex" +#line 489 "./util/configlexer.lex" { ub_c_error_msg("unknown keyword '%s'", yytext); } YY_BREAK -case 202: +case 204: YY_RULE_SETUP -#line 491 "./util/configlexer.lex" +#line 493 "./util/configlexer.lex" { ub_c_error_msg("stray '%s'", yytext); } YY_BREAK -case 203: +case 205: YY_RULE_SETUP -#line 495 "./util/configlexer.lex" +#line 497 "./util/configlexer.lex" ECHO; YY_BREAK -#line 3593 "" +#line 3616 "" case YY_END_OF_BUFFER: { @@ -3882,7 +3905,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 >= 1997 ) + if ( yy_current_state >= 2011 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3910,11 +3933,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 >= 1997 ) + if ( yy_current_state >= 2011 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 1996); + yy_is_jam = (yy_current_state == 2010); return yy_is_jam ? 0 : yy_current_state; } @@ -4553,7 +4576,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 495 "./util/configlexer.lex" +#line 497 "./util/configlexer.lex" diff --git a/util/configlexer.lex b/util/configlexer.lex index 0e6037cd1..8bac3d818 100644 --- a/util/configlexer.lex +++ b/util/configlexer.lex @@ -343,6 +343,8 @@ insecure-lan-zones{COLON} { YDVAR(1, VAR_INSECURE_LAN_ZONES) } statistics-interval{COLON} { YDVAR(1, VAR_STATISTICS_INTERVAL) } statistics-cumulative{COLON} { YDVAR(1, VAR_STATISTICS_CUMULATIVE) } extended-statistics{COLON} { YDVAR(1, VAR_EXTENDED_STATISTICS) } +shm-enable{COLON} { YDVAR(1, VAR_SHM_ENABLE) } +shm-key{COLON} { YDVAR(1, VAR_SHM_KEY) } remote-control{COLON} { YDVAR(0, VAR_REMOTE_CONTROL) } control-enable{COLON} { YDVAR(1, VAR_CONTROL_ENABLE) } control-interface{COLON} { YDVAR(1, VAR_CONTROL_INTERFACE) } diff --git a/util/configparser.c b/util/configparser.c index c1eef6101..6768bcecd 100644 --- a/util/configparser.c +++ b/util/configparser.c @@ -310,7 +310,9 @@ extern int yydebug; VAR_SERVE_EXPIRED = 441, VAR_FAKE_DSA = 442, VAR_LOG_IDENTITY = 443, - VAR_USE_SYSTEMD = 444 + VAR_USE_SYSTEMD = 444, + VAR_SHM_ENABLE = 445, + VAR_SHM_KEY = 446 }; #endif /* Tokens. */ @@ -501,6 +503,8 @@ extern int yydebug; #define VAR_FAKE_DSA 442 #define VAR_LOG_IDENTITY 443 #define VAR_USE_SYSTEMD 444 +#define VAR_SHM_ENABLE 445 +#define VAR_SHM_KEY 446 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -511,7 +515,7 @@ union YYSTYPE char* str; -#line 515 "util/configparser.c" /* yacc.c:355 */ +#line 519 "util/configparser.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -528,7 +532,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 532 "util/configparser.c" /* yacc.c:358 */ +#line 536 "util/configparser.c" /* yacc.c:358 */ #ifdef short # undef short @@ -770,21 +774,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 375 +#define YYLAST 379 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 190 +#define YYNTOKENS 192 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 200 +#define YYNNTS 202 /* YYNRULES -- Number of rules. */ -#define YYNRULES 383 +#define YYNRULES 387 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 574 +#define YYNSTATES 580 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 444 +#define YYMAXUTOK 446 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -837,7 +841,7 @@ static const yytype_uint8 yytranslate[] = 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, 188, 189 + 185, 186, 187, 188, 189, 190, 191 }; #if YYDEBUG @@ -859,30 +863,30 @@ static const yytype_uint16 yyrline[] = 200, 201, 201, 202, 202, 203, 203, 203, 204, 204, 205, 205, 206, 207, 207, 208, 209, 209, 210, 210, 211, 211, 211, 212, 212, 213, 213, 214, 214, 215, - 215, 216, 216, 216, 218, 230, 231, 232, 232, 232, - 232, 232, 233, 235, 247, 248, 249, 249, 249, 249, - 250, 252, 266, 267, 268, 268, 268, 268, 270, 279, - 288, 299, 308, 317, 326, 339, 354, 363, 372, 381, - 390, 399, 408, 417, 426, 435, 444, 453, 462, 471, - 480, 489, 496, 503, 512, 521, 530, 544, 553, 562, - 571, 578, 585, 611, 619, 626, 633, 640, 647, 655, - 663, 671, 678, 685, 694, 703, 710, 717, 725, 733, - 743, 753, 763, 776, 787, 795, 808, 817, 826, 835, - 845, 855, 863, 876, 885, 893, 902, 910, 923, 932, - 939, 949, 959, 969, 979, 989, 999, 1009, 1019, 1026, - 1033, 1040, 1049, 1058, 1067, 1074, 1084, 1101, 1108, 1126, - 1139, 1152, 1161, 1170, 1179, 1188, 1198, 1208, 1217, 1226, - 1239, 1248, 1255, 1264, 1273, 1282, 1291, 1299, 1312, 1320, - 1348, 1355, 1370, 1380, 1390, 1397, 1404, 1413, 1427, 1446, - 1465, 1477, 1489, 1501, 1512, 1522, 1531, 1539, 1547, 1560, - 1573, 1586, 1599, 1608, 1617, 1627, 1637, 1647, 1654, 1661, - 1670, 1680, 1690, 1700, 1707, 1714, 1723, 1733, 1743, 1772, - 1781, 1790, 1795, 1796, 1797, 1797, 1797, 1798, 1798, 1798, - 1799, 1799, 1801, 1811, 1820, 1827, 1837, 1844, 1851, 1858, - 1865, 1870, 1871, 1872, 1872, 1873, 1873, 1874, 1874, 1875, - 1876, 1877, 1878, 1879, 1880, 1882, 1890, 1897, 1905, 1913, - 1920, 1927, 1936, 1945, 1954, 1963, 1972, 1981, 1986, 1987, - 1988, 1990, 1996, 2006 + 215, 216, 216, 216, 217, 217, 219, 231, 232, 233, + 233, 233, 233, 233, 234, 236, 248, 249, 250, 250, + 250, 250, 251, 253, 267, 268, 269, 269, 269, 269, + 271, 280, 289, 300, 309, 318, 327, 338, 347, 360, + 375, 384, 393, 402, 411, 420, 429, 438, 447, 456, + 465, 474, 483, 492, 501, 510, 517, 524, 533, 542, + 551, 565, 574, 583, 592, 599, 606, 632, 640, 647, + 654, 661, 668, 676, 684, 692, 699, 706, 715, 724, + 731, 738, 746, 754, 764, 774, 784, 797, 808, 816, + 829, 838, 847, 856, 866, 876, 884, 897, 906, 914, + 923, 931, 944, 953, 960, 970, 980, 990, 1000, 1010, + 1020, 1030, 1040, 1047, 1054, 1061, 1070, 1079, 1088, 1095, + 1105, 1122, 1129, 1147, 1160, 1173, 1182, 1191, 1200, 1209, + 1219, 1229, 1238, 1247, 1260, 1269, 1276, 1285, 1294, 1303, + 1312, 1320, 1333, 1341, 1369, 1376, 1391, 1401, 1411, 1418, + 1425, 1434, 1448, 1467, 1486, 1498, 1510, 1522, 1533, 1543, + 1552, 1560, 1568, 1581, 1594, 1607, 1620, 1629, 1638, 1648, + 1658, 1668, 1675, 1682, 1691, 1701, 1711, 1721, 1728, 1735, + 1744, 1754, 1764, 1793, 1802, 1811, 1816, 1817, 1818, 1818, + 1818, 1819, 1819, 1819, 1820, 1820, 1822, 1832, 1841, 1848, + 1858, 1865, 1872, 1879, 1886, 1891, 1892, 1893, 1893, 1894, + 1894, 1895, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1903, + 1911, 1918, 1926, 1934, 1941, 1948, 1957, 1966, 1975, 1984, + 1993, 2002, 2007, 2008, 2009, 2011, 2017, 2027 }; #endif @@ -958,23 +962,24 @@ static const char *const yytname[] = "VAR_ACCESS_CONTROL_TAG_ACTION", "VAR_ACCESS_CONTROL_TAG_DATA", "VAR_VIEW", "VAR_ACCESS_CONTROL_VIEW", "VAR_VIEW_FIRST", "VAR_SERVE_EXPIRED", "VAR_FAKE_DSA", "VAR_LOG_IDENTITY", - "VAR_USE_SYSTEMD", "$accept", "toplevelvars", "toplevelvar", - "serverstart", "contents_server", "content_server", "stubstart", - "contents_stub", "content_stub", "forwardstart", "contents_forward", - "content_forward", "viewstart", "contents_view", "content_view", - "server_num_threads", "server_verbosity", "server_statistics_interval", + "VAR_USE_SYSTEMD", "VAR_SHM_ENABLE", "VAR_SHM_KEY", "$accept", + "toplevelvars", "toplevelvar", "serverstart", "contents_server", + "content_server", "stubstart", "contents_stub", "content_stub", + "forwardstart", "contents_forward", "content_forward", "viewstart", + "contents_view", "content_view", "server_num_threads", + "server_verbosity", "server_statistics_interval", "server_statistics_cumulative", "server_extended_statistics", - "server_port", "server_interface", "server_outgoing_interface", - "server_outgoing_range", "server_outgoing_port_permit", - "server_outgoing_port_avoid", "server_outgoing_num_tcp", - "server_incoming_num_tcp", "server_interface_automatic", "server_do_ip4", - "server_do_ip6", "server_do_udp", "server_do_tcp", "server_prefer_ip6", - "server_tcp_mss", "server_outgoing_tcp_mss", "server_tcp_upstream", - "server_ssl_upstream", "server_ssl_service_key", - "server_ssl_service_pem", "server_ssl_port", "server_use_systemd", - "server_do_daemonize", "server_use_syslog", "server_log_time_ascii", - "server_log_queries", "server_log_replies", "server_chroot", - "server_username", "server_directory", "server_logfile", + "server_shm_enable", "server_shm_key", "server_port", "server_interface", + "server_outgoing_interface", "server_outgoing_range", + "server_outgoing_port_permit", "server_outgoing_port_avoid", + "server_outgoing_num_tcp", "server_incoming_num_tcp", + "server_interface_automatic", "server_do_ip4", "server_do_ip6", + "server_do_udp", "server_do_tcp", "server_prefer_ip6", "server_tcp_mss", + "server_outgoing_tcp_mss", "server_tcp_upstream", "server_ssl_upstream", + "server_ssl_service_key", "server_ssl_service_pem", "server_ssl_port", + "server_use_systemd", "server_do_daemonize", "server_use_syslog", + "server_log_time_ascii", "server_log_queries", "server_log_replies", + "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", @@ -1064,7 +1069,8 @@ static const yytype_uint16 yytoknum[] = 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, - 435, 436, 437, 438, 439, 440, 441, 442, 443, 444 + 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, + 445, 446 }; # endif @@ -1098,7 +1104,7 @@ static const yytype_int16 yypact[] = 171, 172, 215, 216, 217, 218, 219, 220, 221, 222, 223, 227, 231, 232, 256, 257, 258, 259, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, - 281, 307, 309, 314, 315, -132, -132, -132, -132, -132, + 281, 307, 309, 316, 317, 318, 319, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, @@ -1112,34 +1118,34 @@ static const yytype_int16 yypact[] = -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, 316, 317, 318, 319, - 320, 321, -132, -132, -132, -132, -132, -132, -132, 322, - 323, 324, 325, 326, -132, -132, -132, -132, -132, -132, - 327, 328, 329, 330, -132, -132, -132, -132, -132, 331, - 332, 333, 334, 335, 336, 337, 338, -132, -132, -132, - -132, -132, -132, -132, -132, -132, 339, 340, 341, 342, - 343, 344, 345, 346, 347, 348, 349, 350, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, 351, -132, -132, -132, -132, -132, -132, -132, -132, + 320, 321, 322, 323, 324, 325, -132, -132, -132, -132, + -132, -132, -132, 326, 327, 328, 329, 330, -132, -132, + -132, -132, -132, -132, 331, 332, 333, 334, -132, -132, + -132, -132, -132, 335, 336, 337, 338, 339, 340, 341, + 342, -132, -132, -132, -132, -132, -132, -132, -132, -132, + 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, + 353, 354, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, 355, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - 352, 353, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, 356, 357, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, 354, 355, -132, -132, -132, -132, -132, - -132, -132, -132, -132, 356, 357, 358, 359, 360, 361, + -132, -132, -132, -132, -132, -132, -132, 358, 359, -132, + -132, -132, -132, -132, -132, -132, -132, -132, 360, 361, + 362, 363, 364, 365, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, 362, -132, -132, -132, + -132, -132, 366, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, 363, 364, 365, -132, - -132, -132, -132, -132 + -132, -132, 367, 368, 369, -132, -132, -132, -132, -132 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1147,8 +1153,8 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 2, 0, 1, 11, 154, 163, 331, 377, 350, 171, - 3, 13, 156, 165, 173, 333, 352, 379, 4, 5, + 2, 0, 1, 11, 156, 165, 335, 381, 354, 173, + 3, 13, 158, 167, 175, 337, 356, 383, 4, 5, 6, 10, 8, 9, 7, 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, @@ -1163,48 +1169,48 @@ 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, 12, 14, 15, 74, 77, - 86, 16, 25, 65, 17, 78, 79, 36, 58, 73, - 18, 19, 21, 22, 20, 23, 24, 109, 110, 111, - 112, 113, 153, 75, 64, 90, 107, 108, 26, 27, - 28, 29, 30, 66, 80, 81, 96, 52, 62, 53, - 91, 46, 47, 48, 49, 100, 104, 117, 125, 140, - 101, 59, 31, 32, 33, 88, 118, 119, 120, 34, - 35, 37, 38, 40, 41, 39, 123, 42, 43, 44, - 50, 69, 105, 83, 124, 76, 136, 84, 85, 102, - 103, 89, 45, 67, 70, 51, 54, 92, 93, 68, - 137, 94, 55, 56, 57, 106, 150, 151, 95, 63, - 97, 98, 99, 138, 60, 61, 82, 71, 72, 87, - 114, 115, 116, 121, 122, 141, 142, 144, 146, 147, - 145, 148, 126, 127, 130, 131, 128, 129, 132, 133, - 135, 134, 139, 149, 143, 152, 0, 0, 0, 0, - 0, 0, 155, 157, 158, 159, 161, 162, 160, 0, - 0, 0, 0, 0, 164, 166, 167, 168, 169, 170, - 0, 0, 0, 0, 172, 174, 175, 176, 177, 0, - 0, 0, 0, 0, 0, 0, 0, 332, 334, 336, - 335, 341, 337, 338, 339, 340, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 351, 353, - 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, - 364, 0, 378, 380, 179, 178, 183, 186, 184, 192, - 193, 196, 194, 195, 197, 198, 210, 211, 212, 213, - 214, 234, 235, 236, 241, 242, 189, 243, 244, 247, - 245, 246, 249, 250, 251, 264, 223, 224, 225, 226, - 252, 267, 219, 221, 268, 274, 275, 276, 190, 233, - 286, 287, 220, 281, 206, 185, 215, 265, 271, 253, - 0, 0, 290, 191, 180, 205, 257, 181, 187, 188, - 216, 217, 288, 255, 259, 260, 182, 291, 237, 263, - 207, 222, 269, 270, 273, 280, 218, 284, 282, 283, - 227, 232, 261, 262, 228, 229, 254, 277, 208, 209, - 199, 200, 201, 202, 203, 292, 293, 294, 238, 239, - 240, 248, 295, 296, 256, 230, 382, 304, 308, 306, - 305, 309, 307, 0, 0, 312, 313, 258, 272, 285, - 314, 315, 231, 297, 0, 0, 0, 0, 0, 0, - 278, 279, 383, 204, 316, 317, 318, 321, 320, 319, - 322, 323, 324, 325, 326, 327, 0, 329, 330, 342, - 344, 343, 346, 347, 348, 349, 345, 365, 366, 367, - 368, 369, 370, 371, 372, 373, 374, 375, 376, 381, - 266, 289, 310, 311, 298, 299, 0, 0, 0, 303, - 328, 302, 300, 301 + 0, 0, 0, 0, 0, 0, 0, 12, 14, 15, + 74, 77, 86, 154, 155, 16, 25, 65, 17, 78, + 79, 36, 58, 73, 18, 19, 21, 22, 20, 23, + 24, 109, 110, 111, 112, 113, 153, 75, 64, 90, + 107, 108, 26, 27, 28, 29, 30, 66, 80, 81, + 96, 52, 62, 53, 91, 46, 47, 48, 49, 100, + 104, 117, 125, 140, 101, 59, 31, 32, 33, 88, + 118, 119, 120, 34, 35, 37, 38, 40, 41, 39, + 123, 42, 43, 44, 50, 69, 105, 83, 124, 76, + 136, 84, 85, 102, 103, 89, 45, 67, 70, 51, + 54, 92, 93, 68, 137, 94, 55, 56, 57, 106, + 150, 151, 95, 63, 97, 98, 99, 138, 60, 61, + 82, 71, 72, 87, 114, 115, 116, 121, 122, 141, + 142, 144, 146, 147, 145, 148, 126, 127, 130, 131, + 128, 129, 132, 133, 135, 134, 139, 149, 143, 152, + 0, 0, 0, 0, 0, 0, 157, 159, 160, 161, + 163, 164, 162, 0, 0, 0, 0, 0, 166, 168, + 169, 170, 171, 172, 0, 0, 0, 0, 174, 176, + 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, + 0, 336, 338, 340, 339, 345, 341, 342, 343, 344, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 355, 357, 358, 359, 360, 361, 362, 363, + 364, 365, 366, 367, 368, 0, 382, 384, 181, 180, + 187, 190, 188, 196, 197, 200, 198, 199, 201, 202, + 214, 215, 216, 217, 218, 238, 239, 240, 245, 246, + 193, 247, 248, 251, 249, 250, 253, 254, 255, 268, + 227, 228, 229, 230, 256, 271, 223, 225, 272, 278, + 279, 280, 194, 237, 290, 291, 224, 285, 210, 189, + 219, 269, 275, 257, 0, 0, 294, 195, 182, 209, + 261, 183, 191, 192, 220, 221, 292, 259, 263, 264, + 184, 295, 241, 267, 211, 226, 273, 274, 277, 284, + 222, 288, 286, 287, 231, 236, 265, 266, 232, 233, + 258, 281, 212, 213, 203, 204, 205, 206, 207, 296, + 297, 298, 242, 243, 244, 252, 299, 300, 260, 234, + 386, 308, 312, 310, 309, 313, 311, 0, 0, 316, + 317, 262, 276, 289, 318, 319, 235, 301, 0, 0, + 0, 0, 0, 0, 282, 283, 387, 208, 185, 186, + 320, 321, 322, 325, 324, 323, 326, 327, 328, 329, + 330, 331, 0, 333, 334, 346, 348, 347, 350, 351, + 352, 353, 349, 369, 370, 371, 372, 373, 374, 375, + 376, 377, 378, 379, 380, 385, 270, 293, 314, 315, + 302, 303, 0, 0, 0, 307, 332, 306, 304, 305 }; /* YYPGOTO[NTERM-NUM]. */ @@ -1229,32 +1235,34 @@ static const yytype_int16 yypgoto[] = -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, -132, -132, -132, -132 + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 10, 11, 18, 165, 12, 19, 312, 13, - 20, 324, 14, 21, 334, 166, 167, 168, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, - 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 215, 216, 217, 218, 219, 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, 313, 314, 315, 316, 317, 318, 325, - 326, 327, 328, 329, 335, 336, 337, 338, 15, 22, - 347, 348, 349, 350, 351, 352, 353, 354, 355, 16, - 23, 368, 369, 370, 371, 372, 373, 374, 375, 376, - 377, 378, 379, 380, 17, 24, 382, 383, 304, 305 + -1, 1, 10, 11, 18, 167, 12, 19, 316, 13, + 20, 328, 14, 21, 338, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 217, 218, 219, 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, 317, 318, 319, 320, 321, + 322, 329, 330, 331, 332, 333, 339, 340, 341, 342, + 15, 22, 351, 352, 353, 354, 355, 356, 357, 358, + 359, 16, 23, 372, 373, 374, 375, 376, 377, 378, + 379, 380, 381, 382, 383, 384, 17, 24, 386, 387, + 308, 309 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1262,44 +1270,44 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { - 2, 306, 381, 307, 308, 319, 384, 385, 386, 387, - 0, 3, 388, 320, 321, 356, 357, 358, 359, 360, - 361, 362, 363, 364, 365, 366, 367, 389, 390, 330, - 339, 340, 341, 342, 343, 344, 345, 346, 391, 392, - 393, 4, 394, 395, 396, 397, 398, 5, 399, 400, - 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, - 411, 412, 413, 414, 309, 331, 332, 415, 416, 417, - 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, - 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, - 438, 6, 439, 440, 310, 441, 311, 322, 442, 323, - 443, 444, 445, 446, 447, 448, 449, 7, 450, 451, - 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, - 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, - 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, - 482, 483, 484, 485, 0, 8, 25, 26, 27, 28, + 2, 310, 385, 311, 312, 323, 388, 389, 390, 391, + 0, 3, 392, 324, 325, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 393, 394, 334, + 343, 344, 345, 346, 347, 348, 349, 350, 395, 396, + 397, 4, 398, 399, 400, 401, 402, 5, 403, 404, + 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, + 415, 416, 417, 418, 313, 335, 336, 419, 420, 421, + 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, + 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, + 442, 6, 443, 444, 314, 445, 315, 326, 446, 327, + 447, 448, 449, 450, 451, 452, 453, 7, 454, 455, + 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, + 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, + 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, + 486, 487, 488, 489, 0, 8, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 333, 486, 487, 488, 53, 54, - 55, 489, 490, 9, 56, 57, 58, 59, 60, 61, + 49, 50, 51, 52, 337, 490, 491, 492, 53, 54, + 55, 493, 494, 9, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, 96, 491, 492, 493, 494, 495, - 496, 497, 498, 499, 97, 98, 99, 500, 100, 101, - 102, 501, 502, 103, 104, 105, 106, 107, 108, 109, + 92, 93, 94, 95, 96, 495, 496, 497, 498, 499, + 500, 501, 502, 503, 97, 98, 99, 504, 100, 101, + 102, 505, 506, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 503, 504, 505, 506, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 507, - 508, 509, 510, 511, 512, 513, 514, 515, 516, 517, - 518, 519, 135, 136, 137, 138, 139, 140, 141, 142, + 120, 121, 122, 123, 124, 125, 507, 508, 509, 510, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 511, + 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, + 522, 523, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158, 159, 520, 160, 521, - 161, 162, 163, 164, 522, 523, 524, 525, 526, 527, - 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, - 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, - 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, - 558, 559, 560, 561, 562, 563, 564, 565, 566, 567, - 568, 569, 570, 571, 572, 573 + 153, 154, 155, 156, 157, 158, 159, 524, 160, 525, + 161, 162, 163, 164, 165, 166, 526, 527, 528, 529, + 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, + 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, + 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, + 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, + 570, 571, 572, 573, 574, 575, 576, 577, 578, 579 }; static const yytype_int16 yycheck[] = @@ -1336,21 +1344,21 @@ static const yytype_int16 yycheck[] = 10, 10, 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, 10, 184, 10, - 186, 187, 188, 189, 10, 10, 10, 10, 10, 10, + 186, 187, 188, 189, 190, 191, 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, 10, 10, 10, 10 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint16 yystos[] = { - 0, 191, 0, 11, 41, 47, 91, 107, 145, 183, - 192, 193, 196, 199, 202, 358, 369, 384, 194, 197, - 200, 203, 359, 370, 385, 12, 13, 14, 15, 16, + 0, 193, 0, 11, 41, 47, 91, 107, 145, 183, + 194, 195, 198, 201, 204, 362, 373, 388, 196, 199, + 202, 205, 363, 374, 389, 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, 44, 45, 46, 50, 51, 52, 53, @@ -1364,7 +1372,7 @@ static const yytype_uint16 yystos[] = 140, 141, 142, 143, 144, 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, - 184, 186, 187, 188, 189, 195, 205, 206, 207, 208, + 184, 186, 187, 188, 189, 190, 191, 197, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, @@ -1378,15 +1386,15 @@ static const yytype_uint16 yystos[] = 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, 388, 389, 40, 42, 43, 103, - 133, 135, 198, 343, 344, 345, 346, 347, 348, 40, - 48, 49, 132, 134, 201, 349, 350, 351, 352, 353, - 40, 76, 77, 185, 204, 354, 355, 356, 357, 92, - 93, 94, 95, 96, 97, 98, 99, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 371, 372, - 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, - 383, 108, 386, 387, 10, 10, 10, 10, 10, 10, + 339, 340, 341, 342, 343, 344, 345, 346, 392, 393, + 40, 42, 43, 103, 133, 135, 200, 347, 348, 349, + 350, 351, 352, 40, 48, 49, 132, 134, 203, 353, + 354, 355, 356, 357, 40, 76, 77, 185, 206, 358, + 359, 360, 361, 92, 93, 94, 95, 96, 97, 98, + 99, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 375, 376, 377, 378, 379, 380, 381, 382, + 383, 384, 385, 386, 387, 108, 390, 391, 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, @@ -1405,30 +1413,30 @@ 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, 190, 191, 191, 192, 192, 192, 192, 192, 192, - 192, 193, 194, 194, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 195, 195, 195, 195, 196, 197, 197, 198, 198, 198, - 198, 198, 198, 199, 200, 200, 201, 201, 201, 201, - 201, 202, 203, 203, 204, 204, 204, 204, 205, 206, + 0, 192, 193, 193, 194, 194, 194, 194, 194, 194, + 194, 195, 196, 196, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 197, 197, 197, 197, 197, 198, 199, 199, 200, + 200, 200, 200, 200, 200, 201, 202, 202, 203, 203, + 203, 203, 203, 204, 205, 205, 206, 206, 206, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, @@ -1444,12 +1452,12 @@ static const yytype_uint16 yyr1[] = 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, 359, 360, 360, 360, 360, 360, 360, - 360, 360, 361, 362, 363, 364, 365, 366, 367, 368, - 369, 370, 370, 371, 371, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 371, 372, 373, 374, 375, 376, - 377, 378, 379, 380, 381, 382, 383, 384, 385, 385, - 386, 387, 388, 389 + 357, 358, 359, 360, 361, 362, 363, 363, 364, 364, + 364, 364, 364, 364, 364, 364, 365, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 374, 375, 375, 375, + 375, 375, 375, 375, 375, 375, 375, 375, 375, 376, + 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, + 387, 388, 389, 389, 390, 391, 392, 393 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1470,9 +1478,9 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, + 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, - 1, 1, 2, 0, 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, @@ -1481,19 +1489,19 @@ static const yytype_uint8 yyr2[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, - 4, 4, 4, 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, 3, 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, 1, 2, 0, - 1, 2, 2, 2 + 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 3, 3, 4, 4, 4, 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, 3, 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, 1, 2, 0, 1, 2, 2, 2 }; @@ -2174,11 +2182,11 @@ yyreduce: { OUTYY(("\nP(server:)\n")); } -#line 2178 "util/configparser.c" /* yacc.c:1646 */ +#line 2186 "util/configparser.c" /* yacc.c:1646 */ break; - case 154: -#line 219 "./util/configparser.y" /* yacc.c:1646 */ + case 156: +#line 220 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(stub_zone:)\n")); @@ -2189,11 +2197,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2193 "util/configparser.c" /* yacc.c:1646 */ +#line 2201 "util/configparser.c" /* yacc.c:1646 */ break; - case 163: -#line 236 "./util/configparser.y" /* yacc.c:1646 */ + case 165: +#line 237 "./util/configparser.y" /* yacc.c:1646 */ { struct config_stub* s; OUTYY(("\nP(forward_zone:)\n")); @@ -2204,11 +2212,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2208 "util/configparser.c" /* yacc.c:1646 */ +#line 2216 "util/configparser.c" /* yacc.c:1646 */ break; - case 171: -#line 253 "./util/configparser.y" /* yacc.c:1646 */ + case 173: +#line 254 "./util/configparser.y" /* yacc.c:1646 */ { struct config_view* s; OUTYY(("\nP(view:)\n")); @@ -2221,11 +2229,11 @@ yyreduce: } else yyerror("out of memory"); } -#line 2225 "util/configparser.c" /* yacc.c:1646 */ +#line 2233 "util/configparser.c" /* yacc.c:1646 */ break; - case 178: -#line 271 "./util/configparser.y" /* yacc.c:1646 */ + case 180: +#line 272 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2233,11 +2241,11 @@ yyreduce: else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2237 "util/configparser.c" /* yacc.c:1646 */ +#line 2245 "util/configparser.c" /* yacc.c:1646 */ break; - case 179: -#line 280 "./util/configparser.y" /* yacc.c:1646 */ + case 181: +#line 281 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2245,11 +2253,11 @@ yyreduce: else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2249 "util/configparser.c" /* yacc.c:1646 */ +#line 2257 "util/configparser.c" /* yacc.c:1646 */ break; - case 180: -#line 289 "./util/configparser.y" /* yacc.c:1646 */ + case 182: +#line 290 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) @@ -2259,11 +2267,11 @@ yyreduce: else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2263 "util/configparser.c" /* yacc.c:1646 */ +#line 2271 "util/configparser.c" /* yacc.c:1646 */ break; - case 181: -#line 300 "./util/configparser.y" /* yacc.c:1646 */ + case 183: +#line 301 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2271,11 +2279,11 @@ yyreduce: else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2275 "util/configparser.c" /* yacc.c:1646 */ +#line 2283 "util/configparser.c" /* yacc.c:1646 */ break; - case 182: -#line 309 "./util/configparser.y" /* yacc.c:1646 */ + case 184: +#line 310 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2283,11 +2291,37 @@ yyreduce: else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2287 "util/configparser.c" /* yacc.c:1646 */ +#line 2295 "util/configparser.c" /* yacc.c:1646 */ break; - case 183: -#line 318 "./util/configparser.y" /* yacc.c:1646 */ + case 185: +#line 319 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0); + free((yyvsp[0].str)); + } +#line 2307 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 186: +#line 328 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); + if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0) + cfg_parser->cfg->shm_key = 0; + else if(atoi((yyvsp[0].str)) == 0) + yyerror("number expected"); + else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str)); + free((yyvsp[0].str)); + } +#line 2321 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 187: +#line 339 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2295,11 +2329,11 @@ yyreduce: else cfg_parser->cfg->port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2299 "util/configparser.c" /* yacc.c:1646 */ +#line 2333 "util/configparser.c" /* yacc.c:1646 */ break; - case 184: -#line 327 "./util/configparser.y" /* yacc.c:1646 */ + case 188: +#line 348 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_ifs == 0) @@ -2311,11 +2345,11 @@ yyreduce: else cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str); } -#line 2315 "util/configparser.c" /* yacc.c:1646 */ +#line 2349 "util/configparser.c" /* yacc.c:1646 */ break; - case 185: -#line 340 "./util/configparser.y" /* yacc.c:1646 */ + case 189: +#line 361 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->num_out_ifs == 0) @@ -2329,11 +2363,11 @@ yyreduce: cfg_parser->cfg->out_ifs[ cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str); } -#line 2333 "util/configparser.c" /* yacc.c:1646 */ +#line 2367 "util/configparser.c" /* yacc.c:1646 */ break; - case 186: -#line 355 "./util/configparser.y" /* yacc.c:1646 */ + case 190: +#line 376 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2341,11 +2375,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2345 "util/configparser.c" /* yacc.c:1646 */ +#line 2379 "util/configparser.c" /* yacc.c:1646 */ break; - case 187: -#line 364 "./util/configparser.y" /* yacc.c:1646 */ + case 191: +#line 385 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 1, @@ -2353,11 +2387,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2357 "util/configparser.c" /* yacc.c:1646 */ +#line 2391 "util/configparser.c" /* yacc.c:1646 */ break; - case 188: -#line 373 "./util/configparser.y" /* yacc.c:1646 */ + case 192: +#line 394 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str))); if(!cfg_mark_ports((yyvsp[0].str), 0, @@ -2365,11 +2399,11 @@ yyreduce: yyerror("port number or range (\"low-high\") expected"); free((yyvsp[0].str)); } -#line 2369 "util/configparser.c" /* yacc.c:1646 */ +#line 2403 "util/configparser.c" /* yacc.c:1646 */ break; - case 189: -#line 382 "./util/configparser.y" /* yacc.c:1646 */ + case 193: +#line 403 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2377,11 +2411,11 @@ yyreduce: else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2381 "util/configparser.c" /* yacc.c:1646 */ +#line 2415 "util/configparser.c" /* yacc.c:1646 */ break; - case 190: -#line 391 "./util/configparser.y" /* yacc.c:1646 */ + case 194: +#line 412 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2389,11 +2423,11 @@ yyreduce: else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2393 "util/configparser.c" /* yacc.c:1646 */ +#line 2427 "util/configparser.c" /* yacc.c:1646 */ break; - case 191: -#line 400 "./util/configparser.y" /* yacc.c:1646 */ + case 195: +#line 421 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2401,11 +2435,11 @@ yyreduce: else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2405 "util/configparser.c" /* yacc.c:1646 */ +#line 2439 "util/configparser.c" /* yacc.c:1646 */ break; - case 192: -#line 409 "./util/configparser.y" /* yacc.c:1646 */ + case 196: +#line 430 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2413,11 +2447,11 @@ yyreduce: else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2417 "util/configparser.c" /* yacc.c:1646 */ +#line 2451 "util/configparser.c" /* yacc.c:1646 */ break; - case 193: -#line 418 "./util/configparser.y" /* yacc.c:1646 */ + case 197: +#line 439 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2425,11 +2459,11 @@ yyreduce: else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2429 "util/configparser.c" /* yacc.c:1646 */ +#line 2463 "util/configparser.c" /* yacc.c:1646 */ break; - case 194: -#line 427 "./util/configparser.y" /* yacc.c:1646 */ + case 198: +#line 448 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2437,11 +2471,11 @@ yyreduce: else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2441 "util/configparser.c" /* yacc.c:1646 */ +#line 2475 "util/configparser.c" /* yacc.c:1646 */ break; - case 195: -#line 436 "./util/configparser.y" /* yacc.c:1646 */ + case 199: +#line 457 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2449,11 +2483,11 @@ yyreduce: else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2453 "util/configparser.c" /* yacc.c:1646 */ +#line 2487 "util/configparser.c" /* yacc.c:1646 */ break; - case 196: -#line 445 "./util/configparser.y" /* yacc.c:1646 */ + case 200: +#line 466 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2461,11 +2495,11 @@ yyreduce: else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2465 "util/configparser.c" /* yacc.c:1646 */ +#line 2499 "util/configparser.c" /* yacc.c:1646 */ break; - case 197: -#line 454 "./util/configparser.y" /* yacc.c:1646 */ + case 201: +#line 475 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2473,11 +2507,11 @@ yyreduce: else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2477 "util/configparser.c" /* yacc.c:1646 */ +#line 2511 "util/configparser.c" /* yacc.c:1646 */ break; - case 198: -#line 463 "./util/configparser.y" /* yacc.c:1646 */ + case 202: +#line 484 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2485,11 +2519,11 @@ yyreduce: else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2489 "util/configparser.c" /* yacc.c:1646 */ +#line 2523 "util/configparser.c" /* yacc.c:1646 */ break; - case 199: -#line 472 "./util/configparser.y" /* yacc.c:1646 */ + case 203: +#line 493 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2497,11 +2531,11 @@ yyreduce: else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2501 "util/configparser.c" /* yacc.c:1646 */ +#line 2535 "util/configparser.c" /* yacc.c:1646 */ break; - case 200: -#line 481 "./util/configparser.y" /* yacc.c:1646 */ + case 204: +#line 502 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2509,31 +2543,31 @@ yyreduce: else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2513 "util/configparser.c" /* yacc.c:1646 */ +#line 2547 "util/configparser.c" /* yacc.c:1646 */ break; - case 201: -#line 490 "./util/configparser.y" /* yacc.c:1646 */ + case 205: +#line 511 "./util/configparser.y" /* yacc.c:1646 */ { 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 2523 "util/configparser.c" /* yacc.c:1646 */ +#line 2557 "util/configparser.c" /* yacc.c:1646 */ break; - case 202: -#line 497 "./util/configparser.y" /* yacc.c:1646 */ + case 206: +#line 518 "./util/configparser.y" /* yacc.c:1646 */ { 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 2533 "util/configparser.c" /* yacc.c:1646 */ +#line 2567 "util/configparser.c" /* yacc.c:1646 */ break; - case 203: -#line 504 "./util/configparser.y" /* yacc.c:1646 */ + case 207: +#line 525 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2541,11 +2575,11 @@ yyreduce: else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2545 "util/configparser.c" /* yacc.c:1646 */ +#line 2579 "util/configparser.c" /* yacc.c:1646 */ break; - case 204: -#line 513 "./util/configparser.y" /* yacc.c:1646 */ + case 208: +#line 534 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2553,11 +2587,11 @@ yyreduce: else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2557 "util/configparser.c" /* yacc.c:1646 */ +#line 2591 "util/configparser.c" /* yacc.c:1646 */ break; - case 205: -#line 522 "./util/configparser.y" /* yacc.c:1646 */ + case 209: +#line 543 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2565,11 +2599,11 @@ yyreduce: else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2569 "util/configparser.c" /* yacc.c:1646 */ +#line 2603 "util/configparser.c" /* yacc.c:1646 */ break; - case 206: -#line 531 "./util/configparser.y" /* yacc.c:1646 */ + case 210: +#line 552 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2582,11 +2616,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 2586 "util/configparser.c" /* yacc.c:1646 */ +#line 2620 "util/configparser.c" /* yacc.c:1646 */ break; - case 207: -#line 545 "./util/configparser.y" /* yacc.c:1646 */ + case 211: +#line 566 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2594,11 +2628,11 @@ yyreduce: else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2598 "util/configparser.c" /* yacc.c:1646 */ +#line 2632 "util/configparser.c" /* yacc.c:1646 */ break; - case 208: -#line 554 "./util/configparser.y" /* yacc.c:1646 */ + case 212: +#line 575 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2606,11 +2640,11 @@ yyreduce: else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2610 "util/configparser.c" /* yacc.c:1646 */ +#line 2644 "util/configparser.c" /* yacc.c:1646 */ break; - case 209: -#line 563 "./util/configparser.y" /* yacc.c:1646 */ + case 213: +#line 584 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2618,31 +2652,31 @@ yyreduce: else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2622 "util/configparser.c" /* yacc.c:1646 */ +#line 2656 "util/configparser.c" /* yacc.c:1646 */ break; - case 210: -#line 572 "./util/configparser.y" /* yacc.c:1646 */ + case 214: +#line 593 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->chrootdir); cfg_parser->cfg->chrootdir = (yyvsp[0].str); } -#line 2632 "util/configparser.c" /* yacc.c:1646 */ +#line 2666 "util/configparser.c" /* yacc.c:1646 */ break; - case 211: -#line 579 "./util/configparser.y" /* yacc.c:1646 */ + case 215: +#line 600 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_username:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->username); cfg_parser->cfg->username = (yyvsp[0].str); } -#line 2642 "util/configparser.c" /* yacc.c:1646 */ +#line 2676 "util/configparser.c" /* yacc.c:1646 */ break; - case 212: -#line 586 "./util/configparser.y" /* yacc.c:1646 */ + case 216: +#line 607 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->directory); @@ -2667,115 +2701,115 @@ yyreduce: } } } -#line 2671 "util/configparser.c" /* yacc.c:1646 */ +#line 2705 "util/configparser.c" /* yacc.c:1646 */ break; - case 213: -#line 612 "./util/configparser.y" /* yacc.c:1646 */ + case 217: +#line 633 "./util/configparser.y" /* yacc.c:1646 */ { 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 2682 "util/configparser.c" /* yacc.c:1646 */ +#line 2716 "util/configparser.c" /* yacc.c:1646 */ break; - case 214: -#line 620 "./util/configparser.y" /* yacc.c:1646 */ + case 218: +#line 641 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->pidfile); cfg_parser->cfg->pidfile = (yyvsp[0].str); } -#line 2692 "util/configparser.c" /* yacc.c:1646 */ +#line 2726 "util/configparser.c" /* yacc.c:1646 */ break; - case 215: -#line 627 "./util/configparser.y" /* yacc.c:1646 */ + case 219: +#line 648 "./util/configparser.y" /* yacc.c:1646 */ { 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 2702 "util/configparser.c" /* yacc.c:1646 */ +#line 2736 "util/configparser.c" /* yacc.c:1646 */ break; - case 216: -#line 634 "./util/configparser.y" /* yacc.c:1646 */ + case 220: +#line 655 "./util/configparser.y" /* yacc.c:1646 */ { 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 2712 "util/configparser.c" /* yacc.c:1646 */ +#line 2746 "util/configparser.c" /* yacc.c:1646 */ break; - case 217: -#line 641 "./util/configparser.y" /* yacc.c:1646 */ + case 221: +#line 662 "./util/configparser.y" /* yacc.c:1646 */ { 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 2722 "util/configparser.c" /* yacc.c:1646 */ +#line 2756 "util/configparser.c" /* yacc.c:1646 */ break; - case 218: -#line 648 "./util/configparser.y" /* yacc.c:1646 */ + case 222: +#line 669 "./util/configparser.y" /* yacc.c:1646 */ { 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 2733 "util/configparser.c" /* yacc.c:1646 */ +#line 2767 "util/configparser.c" /* yacc.c:1646 */ break; - case 219: -#line 656 "./util/configparser.y" /* yacc.c:1646 */ + case 223: +#line 677 "./util/configparser.y" /* yacc.c:1646 */ { 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 2744 "util/configparser.c" /* yacc.c:1646 */ +#line 2778 "util/configparser.c" /* yacc.c:1646 */ break; - case 220: -#line 664 "./util/configparser.y" /* yacc.c:1646 */ + case 224: +#line 685 "./util/configparser.y" /* yacc.c:1646 */ { 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 2755 "util/configparser.c" /* yacc.c:1646 */ +#line 2789 "util/configparser.c" /* yacc.c:1646 */ break; - case 221: -#line 672 "./util/configparser.y" /* yacc.c:1646 */ + case 225: +#line 693 "./util/configparser.y" /* yacc.c:1646 */ { 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 2765 "util/configparser.c" /* yacc.c:1646 */ +#line 2799 "util/configparser.c" /* yacc.c:1646 */ break; - case 222: -#line 679 "./util/configparser.y" /* yacc.c:1646 */ + case 226: +#line 700 "./util/configparser.y" /* yacc.c:1646 */ { 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 2775 "util/configparser.c" /* yacc.c:1646 */ +#line 2809 "util/configparser.c" /* yacc.c:1646 */ break; - case 223: -#line 686 "./util/configparser.y" /* yacc.c:1646 */ + case 227: +#line 707 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2783,11 +2817,11 @@ yyreduce: else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2787 "util/configparser.c" /* yacc.c:1646 */ +#line 2821 "util/configparser.c" /* yacc.c:1646 */ break; - case 224: -#line 695 "./util/configparser.y" /* yacc.c:1646 */ + case 228: +#line 716 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2795,53 +2829,53 @@ yyreduce: else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2799 "util/configparser.c" /* yacc.c:1646 */ +#line 2833 "util/configparser.c" /* yacc.c:1646 */ break; - case 225: -#line 704 "./util/configparser.y" /* yacc.c:1646 */ + case 229: +#line 725 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->identity); cfg_parser->cfg->identity = (yyvsp[0].str); } -#line 2809 "util/configparser.c" /* yacc.c:1646 */ +#line 2843 "util/configparser.c" /* yacc.c:1646 */ break; - case 226: -#line 711 "./util/configparser.y" /* yacc.c:1646 */ + case 230: +#line 732 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_version:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->version); cfg_parser->cfg->version = (yyvsp[0].str); } -#line 2819 "util/configparser.c" /* yacc.c:1646 */ +#line 2853 "util/configparser.c" /* yacc.c:1646 */ break; - case 227: -#line 718 "./util/configparser.y" /* yacc.c:1646 */ + case 231: +#line 739 "./util/configparser.y" /* yacc.c:1646 */ { 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 2830 "util/configparser.c" /* yacc.c:1646 */ +#line 2864 "util/configparser.c" /* yacc.c:1646 */ break; - case 228: -#line 726 "./util/configparser.y" /* yacc.c:1646 */ + case 232: +#line 747 "./util/configparser.y" /* yacc.c:1646 */ { 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 2841 "util/configparser.c" /* yacc.c:1646 */ +#line 2875 "util/configparser.c" /* yacc.c:1646 */ break; - case 229: -#line 734 "./util/configparser.y" /* yacc.c:1646 */ + case 233: +#line 755 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2850,11 +2884,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2854 "util/configparser.c" /* yacc.c:1646 */ +#line 2888 "util/configparser.c" /* yacc.c:1646 */ break; - case 230: -#line 744 "./util/configparser.y" /* yacc.c:1646 */ + case 234: +#line 765 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2863,11 +2897,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2867 "util/configparser.c" /* yacc.c:1646 */ +#line 2901 "util/configparser.c" /* yacc.c:1646 */ break; - case 231: -#line 754 "./util/configparser.y" /* yacc.c:1646 */ + case 235: +#line 775 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2876,11 +2910,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2880 "util/configparser.c" /* yacc.c:1646 */ +#line 2914 "util/configparser.c" /* yacc.c:1646 */ break; - case 232: -#line 764 "./util/configparser.y" /* yacc.c:1646 */ + case 236: +#line 785 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2892,11 +2926,11 @@ yyreduce: else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2896 "util/configparser.c" /* yacc.c:1646 */ +#line 2930 "util/configparser.c" /* yacc.c:1646 */ break; - case 233: -#line 777 "./util/configparser.y" /* yacc.c:1646 */ + case 237: +#line 798 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2906,22 +2940,22 @@ yyreduce: else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2910 "util/configparser.c" /* yacc.c:1646 */ +#line 2944 "util/configparser.c" /* yacc.c:1646 */ break; - case 234: -#line 788 "./util/configparser.y" /* yacc.c:1646 */ + case 238: +#line 809 "./util/configparser.y" /* yacc.c:1646 */ { 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 2921 "util/configparser.c" /* yacc.c:1646 */ +#line 2955 "util/configparser.c" /* yacc.c:1646 */ break; - case 235: -#line 796 "./util/configparser.y" /* yacc.c:1646 */ + case 239: +#line 817 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2933,11 +2967,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 2937 "util/configparser.c" /* yacc.c:1646 */ +#line 2971 "util/configparser.c" /* yacc.c:1646 */ break; - case 236: -#line 809 "./util/configparser.y" /* yacc.c:1646 */ + case 240: +#line 830 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -2945,11 +2979,11 @@ yyreduce: else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2949 "util/configparser.c" /* yacc.c:1646 */ +#line 2983 "util/configparser.c" /* yacc.c:1646 */ break; - case 237: -#line 818 "./util/configparser.y" /* yacc.c:1646 */ + case 241: +#line 839 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2957,11 +2991,11 @@ yyreduce: else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2961 "util/configparser.c" /* yacc.c:1646 */ +#line 2995 "util/configparser.c" /* yacc.c:1646 */ break; - case 238: -#line 827 "./util/configparser.y" /* yacc.c:1646 */ + case 242: +#line 848 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -2969,11 +3003,11 @@ yyreduce: else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 2973 "util/configparser.c" /* yacc.c:1646 */ +#line 3007 "util/configparser.c" /* yacc.c:1646 */ break; - case 239: -#line 836 "./util/configparser.y" /* yacc.c:1646 */ + case 243: +#line 857 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2982,11 +3016,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2986 "util/configparser.c" /* yacc.c:1646 */ +#line 3020 "util/configparser.c" /* yacc.c:1646 */ break; - case 240: -#line 846 "./util/configparser.y" /* yacc.c:1646 */ + case 244: +#line 867 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -2995,22 +3029,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 2999 "util/configparser.c" /* yacc.c:1646 */ +#line 3033 "util/configparser.c" /* yacc.c:1646 */ break; - case 241: -#line 856 "./util/configparser.y" /* yacc.c:1646 */ + case 245: +#line 877 "./util/configparser.y" /* yacc.c:1646 */ { 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 3010 "util/configparser.c" /* yacc.c:1646 */ +#line 3044 "util/configparser.c" /* yacc.c:1646 */ break; - case 242: -#line 864 "./util/configparser.y" /* yacc.c:1646 */ + case 246: +#line 885 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3022,11 +3056,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3026 "util/configparser.c" /* yacc.c:1646 */ +#line 3060 "util/configparser.c" /* yacc.c:1646 */ break; - case 243: -#line 877 "./util/configparser.y" /* yacc.c:1646 */ + case 247: +#line 898 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3034,22 +3068,22 @@ yyreduce: else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3038 "util/configparser.c" /* yacc.c:1646 */ +#line 3072 "util/configparser.c" /* yacc.c:1646 */ break; - case 244: -#line 886 "./util/configparser.y" /* yacc.c:1646 */ + case 248: +#line 907 "./util/configparser.y" /* yacc.c:1646 */ { 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 3049 "util/configparser.c" /* yacc.c:1646 */ +#line 3083 "util/configparser.c" /* yacc.c:1646 */ break; - case 245: -#line 894 "./util/configparser.y" /* yacc.c:1646 */ + case 249: +#line 915 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3057,22 +3091,22 @@ yyreduce: else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3061 "util/configparser.c" /* yacc.c:1646 */ +#line 3095 "util/configparser.c" /* yacc.c:1646 */ break; - case 246: -#line 903 "./util/configparser.y" /* yacc.c:1646 */ + case 250: +#line 924 "./util/configparser.y" /* yacc.c:1646 */ { 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 3072 "util/configparser.c" /* yacc.c:1646 */ +#line 3106 "util/configparser.c" /* yacc.c:1646 */ break; - case 247: -#line 911 "./util/configparser.y" /* yacc.c:1646 */ + case 251: +#line 932 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3084,11 +3118,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3088 "util/configparser.c" /* yacc.c:1646 */ +#line 3122 "util/configparser.c" /* yacc.c:1646 */ break; - case 248: -#line 924 "./util/configparser.y" /* yacc.c:1646 */ + case 252: +#line 945 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3096,21 +3130,21 @@ yyreduce: else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3100 "util/configparser.c" /* yacc.c:1646 */ +#line 3134 "util/configparser.c" /* yacc.c:1646 */ break; - case 249: -#line 933 "./util/configparser.y" /* yacc.c:1646 */ + case 253: +#line 954 "./util/configparser.y" /* yacc.c:1646 */ { 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 3110 "util/configparser.c" /* yacc.c:1646 */ +#line 3144 "util/configparser.c" /* yacc.c:1646 */ break; - case 250: -#line 940 "./util/configparser.y" /* yacc.c:1646 */ + case 254: +#line 961 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3119,11 +3153,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3123 "util/configparser.c" /* yacc.c:1646 */ +#line 3157 "util/configparser.c" /* yacc.c:1646 */ break; - case 251: -#line 950 "./util/configparser.y" /* yacc.c:1646 */ + case 255: +#line 971 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3132,11 +3166,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3136 "util/configparser.c" /* yacc.c:1646 */ +#line 3170 "util/configparser.c" /* yacc.c:1646 */ break; - case 252: -#line 960 "./util/configparser.y" /* yacc.c:1646 */ + case 256: +#line 981 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3145,11 +3179,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3149 "util/configparser.c" /* yacc.c:1646 */ +#line 3183 "util/configparser.c" /* yacc.c:1646 */ break; - case 253: -#line 970 "./util/configparser.y" /* yacc.c:1646 */ + case 257: +#line 991 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3158,11 +3192,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3162 "util/configparser.c" /* yacc.c:1646 */ +#line 3196 "util/configparser.c" /* yacc.c:1646 */ break; - case 254: -#line 980 "./util/configparser.y" /* yacc.c:1646 */ + case 258: +#line 1001 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3171,11 +3205,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3175 "util/configparser.c" /* yacc.c:1646 */ +#line 3209 "util/configparser.c" /* yacc.c:1646 */ break; - case 255: -#line 990 "./util/configparser.y" /* yacc.c:1646 */ + case 259: +#line 1011 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3184,11 +3218,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3188 "util/configparser.c" /* yacc.c:1646 */ +#line 3222 "util/configparser.c" /* yacc.c:1646 */ break; - case 256: -#line 1000 "./util/configparser.y" /* yacc.c:1646 */ + case 260: +#line 1021 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3197,11 +3231,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3201 "util/configparser.c" /* yacc.c:1646 */ +#line 3235 "util/configparser.c" /* yacc.c:1646 */ break; - case 257: -#line 1010 "./util/configparser.y" /* yacc.c:1646 */ + case 261: +#line 1031 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -3210,41 +3244,41 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3214 "util/configparser.c" /* yacc.c:1646 */ +#line 3248 "util/configparser.c" /* yacc.c:1646 */ break; - case 258: -#line 1020 "./util/configparser.y" /* yacc.c:1646 */ + case 262: +#line 1041 "./util/configparser.y" /* yacc.c:1646 */ { 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 3224 "util/configparser.c" /* yacc.c:1646 */ +#line 3258 "util/configparser.c" /* yacc.c:1646 */ break; - case 259: -#line 1027 "./util/configparser.y" /* yacc.c:1646 */ + case 263: +#line 1048 "./util/configparser.y" /* yacc.c:1646 */ { 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 3234 "util/configparser.c" /* yacc.c:1646 */ +#line 3268 "util/configparser.c" /* yacc.c:1646 */ break; - case 260: -#line 1034 "./util/configparser.y" /* yacc.c:1646 */ + case 264: +#line 1055 "./util/configparser.y" /* yacc.c:1646 */ { 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 3244 "util/configparser.c" /* yacc.c:1646 */ +#line 3278 "util/configparser.c" /* yacc.c:1646 */ break; - case 261: -#line 1041 "./util/configparser.y" /* yacc.c:1646 */ + case 265: +#line 1062 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3252,11 +3286,11 @@ yyreduce: else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3256 "util/configparser.c" /* yacc.c:1646 */ +#line 3290 "util/configparser.c" /* yacc.c:1646 */ break; - case 262: -#line 1050 "./util/configparser.y" /* yacc.c:1646 */ + case 266: +#line 1071 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3264,11 +3298,11 @@ yyreduce: else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3268 "util/configparser.c" /* yacc.c:1646 */ +#line 3302 "util/configparser.c" /* yacc.c:1646 */ break; - case 263: -#line 1059 "./util/configparser.y" /* yacc.c:1646 */ + case 267: +#line 1080 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3276,21 +3310,21 @@ yyreduce: else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3280 "util/configparser.c" /* yacc.c:1646 */ +#line 3314 "util/configparser.c" /* yacc.c:1646 */ break; - case 264: -#line 1068 "./util/configparser.y" /* yacc.c:1646 */ + case 268: +#line 1089 "./util/configparser.y" /* yacc.c:1646 */ { 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 3290 "util/configparser.c" /* yacc.c:1646 */ +#line 3324 "util/configparser.c" /* yacc.c:1646 */ break; - case 265: -#line 1075 "./util/configparser.y" /* yacc.c:1646 */ + case 269: +#line 1096 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -3299,11 +3333,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3303 "util/configparser.c" /* yacc.c:1646 */ +#line 3337 "util/configparser.c" /* yacc.c:1646 */ break; - case 266: -#line 1085 "./util/configparser.y" /* yacc.c:1646 */ + case 270: +#line 1106 "./util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -3319,21 +3353,21 @@ yyreduce: fatal_exit("out of memory adding acl"); } } -#line 3323 "util/configparser.c" /* yacc.c:1646 */ +#line 3357 "util/configparser.c" /* yacc.c:1646 */ break; - case 267: -#line 1102 "./util/configparser.y" /* yacc.c:1646 */ + case 271: +#line 1123 "./util/configparser.y" /* yacc.c:1646 */ { 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 3333 "util/configparser.c" /* yacc.c:1646 */ +#line 3367 "util/configparser.c" /* yacc.c:1646 */ break; - case 268: -#line 1109 "./util/configparser.y" /* yacc.c:1646 */ + case 272: +#line 1130 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3350,11 +3384,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3354 "util/configparser.c" /* yacc.c:1646 */ +#line 3388 "util/configparser.c" /* yacc.c:1646 */ break; - case 269: -#line 1127 "./util/configparser.y" /* yacc.c:1646 */ + case 273: +#line 1148 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3366,11 +3400,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3370 "util/configparser.c" /* yacc.c:1646 */ +#line 3404 "util/configparser.c" /* yacc.c:1646 */ break; - case 270: -#line 1140 "./util/configparser.y" /* yacc.c:1646 */ + case 274: +#line 1161 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str))); if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) { @@ -3382,11 +3416,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3386 "util/configparser.c" /* yacc.c:1646 */ +#line 3420 "util/configparser.c" /* yacc.c:1646 */ break; - case 271: -#line 1153 "./util/configparser.y" /* yacc.c:1646 */ + case 275: +#line 1174 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3394,11 +3428,11 @@ yyreduce: else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3398 "util/configparser.c" /* yacc.c:1646 */ +#line 3432 "util/configparser.c" /* yacc.c:1646 */ break; - case 272: -#line 1162 "./util/configparser.y" /* yacc.c:1646 */ + case 276: +#line 1183 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3406,11 +3440,11 @@ yyreduce: else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3410 "util/configparser.c" /* yacc.c:1646 */ +#line 3444 "util/configparser.c" /* yacc.c:1646 */ break; - case 273: -#line 1171 "./util/configparser.y" /* yacc.c:1646 */ + case 277: +#line 1192 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3418,11 +3452,11 @@ yyreduce: else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3422 "util/configparser.c" /* yacc.c:1646 */ +#line 3456 "util/configparser.c" /* yacc.c:1646 */ break; - case 274: -#line 1180 "./util/configparser.y" /* yacc.c:1646 */ + case 278: +#line 1201 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3430,11 +3464,11 @@ yyreduce: else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3434 "util/configparser.c" /* yacc.c:1646 */ +#line 3468 "util/configparser.c" /* yacc.c:1646 */ break; - case 275: -#line 1189 "./util/configparser.y" /* yacc.c:1646 */ + case 279: +#line 1210 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3443,11 +3477,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3447 "util/configparser.c" /* yacc.c:1646 */ +#line 3481 "util/configparser.c" /* yacc.c:1646 */ break; - case 276: -#line 1199 "./util/configparser.y" /* yacc.c:1646 */ + case 280: +#line 1220 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3456,11 +3490,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3460 "util/configparser.c" /* yacc.c:1646 */ +#line 3494 "util/configparser.c" /* yacc.c:1646 */ break; - case 277: -#line 1209 "./util/configparser.y" /* yacc.c:1646 */ + case 281: +#line 1230 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3468,11 +3502,11 @@ yyreduce: else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3472 "util/configparser.c" /* yacc.c:1646 */ +#line 3506 "util/configparser.c" /* yacc.c:1646 */ break; - case 278: -#line 1218 "./util/configparser.y" /* yacc.c:1646 */ + case 282: +#line 1239 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3480,11 +3514,11 @@ yyreduce: else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3484 "util/configparser.c" /* yacc.c:1646 */ +#line 3518 "util/configparser.c" /* yacc.c:1646 */ break; - case 279: -#line 1227 "./util/configparser.y" /* yacc.c:1646 */ + case 283: +#line 1248 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3496,11 +3530,11 @@ yyreduce: #endif free((yyvsp[0].str)); } -#line 3500 "util/configparser.c" /* yacc.c:1646 */ +#line 3534 "util/configparser.c" /* yacc.c:1646 */ break; - case 280: -#line 1240 "./util/configparser.y" /* yacc.c:1646 */ + case 284: +#line 1261 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3508,21 +3542,21 @@ yyreduce: else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3512 "util/configparser.c" /* yacc.c:1646 */ +#line 3546 "util/configparser.c" /* yacc.c:1646 */ break; - case 281: -#line 1249 "./util/configparser.y" /* yacc.c:1646 */ + case 285: +#line 1270 "./util/configparser.y" /* yacc.c:1646 */ { 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 3522 "util/configparser.c" /* yacc.c:1646 */ +#line 3556 "util/configparser.c" /* yacc.c:1646 */ break; - case 282: -#line 1256 "./util/configparser.y" /* yacc.c:1646 */ + case 286: +#line 1277 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3530,11 +3564,11 @@ yyreduce: else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3534 "util/configparser.c" /* yacc.c:1646 */ +#line 3568 "util/configparser.c" /* yacc.c:1646 */ break; - case 283: -#line 1265 "./util/configparser.y" /* yacc.c:1646 */ + case 287: +#line 1286 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3542,11 +3576,11 @@ yyreduce: else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3546 "util/configparser.c" /* yacc.c:1646 */ +#line 3580 "util/configparser.c" /* yacc.c:1646 */ break; - case 284: -#line 1274 "./util/configparser.y" /* yacc.c:1646 */ + case 288: +#line 1295 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3554,11 +3588,11 @@ yyreduce: else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3558 "util/configparser.c" /* yacc.c:1646 */ +#line 3592 "util/configparser.c" /* yacc.c:1646 */ break; - case 285: -#line 1283 "./util/configparser.y" /* yacc.c:1646 */ + case 289: +#line 1304 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3567,22 +3601,22 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3571 "util/configparser.c" /* yacc.c:1646 */ +#line 3605 "util/configparser.c" /* yacc.c:1646 */ break; - case 286: -#line 1292 "./util/configparser.y" /* yacc.c:1646 */ + case 290: +#line 1313 "./util/configparser.y" /* yacc.c:1646 */ { 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 3582 "util/configparser.c" /* yacc.c:1646 */ +#line 3616 "util/configparser.c" /* yacc.c:1646 */ break; - case 287: -#line 1300 "./util/configparser.y" /* yacc.c:1646 */ + case 291: +#line 1321 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3594,22 +3628,22 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3598 "util/configparser.c" /* yacc.c:1646 */ +#line 3632 "util/configparser.c" /* yacc.c:1646 */ break; - case 288: -#line 1313 "./util/configparser.y" /* yacc.c:1646 */ + case 292: +#line 1334 "./util/configparser.y" /* yacc.c:1646 */ { 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 3609 "util/configparser.c" /* yacc.c:1646 */ +#line 3643 "util/configparser.c" /* yacc.c:1646 */ break; - case 289: -#line 1321 "./util/configparser.y" /* yacc.c:1646 */ + case 293: +#line 1342 "./util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -3636,21 +3670,21 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 3640 "util/configparser.c" /* yacc.c:1646 */ +#line 3674 "util/configparser.c" /* yacc.c:1646 */ break; - case 290: -#line 1349 "./util/configparser.y" /* yacc.c:1646 */ + case 294: +#line 1370 "./util/configparser.y" /* yacc.c:1646 */ { 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 3650 "util/configparser.c" /* yacc.c:1646 */ +#line 3684 "util/configparser.c" /* yacc.c:1646 */ break; - case 291: -#line 1356 "./util/configparser.y" /* yacc.c:1646 */ + case 295: +#line 1377 "./util/configparser.y" /* yacc.c:1646 */ { char* ptr; OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str))); @@ -3664,11 +3698,11 @@ yyreduce: yyerror("local-data-ptr could not be reversed"); } } -#line 3668 "util/configparser.c" /* yacc.c:1646 */ +#line 3702 "util/configparser.c" /* yacc.c:1646 */ break; - case 292: -#line 1371 "./util/configparser.y" /* yacc.c:1646 */ + case 296: +#line 1392 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3677,11 +3711,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3681 "util/configparser.c" /* yacc.c:1646 */ +#line 3715 "util/configparser.c" /* yacc.c:1646 */ break; - case 293: -#line 1381 "./util/configparser.y" /* yacc.c:1646 */ + case 297: +#line 1402 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3690,31 +3724,31 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3694 "util/configparser.c" /* yacc.c:1646 */ +#line 3728 "util/configparser.c" /* yacc.c:1646 */ break; - case 294: -#line 1391 "./util/configparser.y" /* yacc.c:1646 */ + case 298: +#line 1412 "./util/configparser.y" /* yacc.c:1646 */ { 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 3704 "util/configparser.c" /* yacc.c:1646 */ +#line 3738 "util/configparser.c" /* yacc.c:1646 */ break; - case 295: -#line 1398 "./util/configparser.y" /* yacc.c:1646 */ + case 299: +#line 1419 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->dns64_prefix); cfg_parser->cfg->dns64_prefix = (yyvsp[0].str); } -#line 3714 "util/configparser.c" /* yacc.c:1646 */ +#line 3748 "util/configparser.c" /* yacc.c:1646 */ break; - case 296: -#line 1405 "./util/configparser.y" /* yacc.c:1646 */ + case 300: +#line 1426 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3722,11 +3756,11 @@ yyreduce: else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3726 "util/configparser.c" /* yacc.c:1646 */ +#line 3760 "util/configparser.c" /* yacc.c:1646 */ break; - case 297: -#line 1414 "./util/configparser.y" /* yacc.c:1646 */ + case 301: +#line 1435 "./util/configparser.y" /* yacc.c:1646 */ { char* p, *s = (yyvsp[0].str); OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str))); @@ -3739,11 +3773,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3743 "util/configparser.c" /* yacc.c:1646 */ +#line 3777 "util/configparser.c" /* yacc.c:1646 */ break; - case 298: -#line 1428 "./util/configparser.y" /* yacc.c:1646 */ + case 302: +#line 1449 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -3761,11 +3795,11 @@ yyreduce: } } } -#line 3765 "util/configparser.c" /* yacc.c:1646 */ +#line 3799 "util/configparser.c" /* yacc.c:1646 */ break; - case 299: -#line 1447 "./util/configparser.y" /* yacc.c:1646 */ + case 303: +#line 1468 "./util/configparser.y" /* yacc.c:1646 */ { size_t len = 0; uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str), @@ -3783,11 +3817,11 @@ yyreduce: } } } -#line 3787 "util/configparser.c" /* yacc.c:1646 */ +#line 3821 "util/configparser.c" /* yacc.c:1646 */ break; - case 300: -#line 1466 "./util/configparser.y" /* yacc.c:1646 */ + case 304: +#line 1487 "./util/configparser.y" /* yacc.c:1646 */ { 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, @@ -3798,11 +3832,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3802 "util/configparser.c" /* yacc.c:1646 */ +#line 3836 "util/configparser.c" /* yacc.c:1646 */ break; - case 301: -#line 1478 "./util/configparser.y" /* yacc.c:1646 */ + case 305: +#line 1499 "./util/configparser.y" /* yacc.c:1646 */ { 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, @@ -3813,11 +3847,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3817 "util/configparser.c" /* yacc.c:1646 */ +#line 3851 "util/configparser.c" /* yacc.c:1646 */ break; - case 302: -#line 1490 "./util/configparser.y" /* yacc.c:1646 */ + case 306: +#line 1511 "./util/configparser.y" /* yacc.c:1646 */ { 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, @@ -3828,11 +3862,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3832 "util/configparser.c" /* yacc.c:1646 */ +#line 3866 "util/configparser.c" /* yacc.c:1646 */ break; - case 303: -#line 1502 "./util/configparser.y" /* yacc.c:1646 */ + case 307: +#line 1523 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str))); if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view, @@ -3842,11 +3876,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 3846 "util/configparser.c" /* yacc.c:1646 */ +#line 3880 "util/configparser.c" /* yacc.c:1646 */ break; - case 304: -#line 1513 "./util/configparser.y" /* yacc.c:1646 */ + case 308: +#line 1534 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3854,11 +3888,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3858 "util/configparser.c" /* yacc.c:1646 */ +#line 3892 "util/configparser.c" /* yacc.c:1646 */ break; - case 305: -#line 1523 "./util/configparser.y" /* yacc.c:1646 */ + case 309: +#line 1544 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3866,33 +3900,33 @@ yyreduce: else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3870 "util/configparser.c" /* yacc.c:1646 */ +#line 3904 "util/configparser.c" /* yacc.c:1646 */ break; - case 306: -#line 1532 "./util/configparser.y" /* yacc.c:1646 */ + case 310: +#line 1553 "./util/configparser.y" /* yacc.c:1646 */ { 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 3881 "util/configparser.c" /* yacc.c:1646 */ +#line 3915 "util/configparser.c" /* yacc.c:1646 */ break; - case 307: -#line 1540 "./util/configparser.y" /* yacc.c:1646 */ + case 311: +#line 1561 "./util/configparser.y" /* yacc.c:1646 */ { 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 3892 "util/configparser.c" /* yacc.c:1646 */ +#line 3926 "util/configparser.c" /* yacc.c:1646 */ break; - case 308: -#line 1548 "./util/configparser.y" /* yacc.c:1646 */ + case 312: +#line 1569 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3904,11 +3938,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3908 "util/configparser.c" /* yacc.c:1646 */ +#line 3942 "util/configparser.c" /* yacc.c:1646 */ break; - case 309: -#line 1561 "./util/configparser.y" /* yacc.c:1646 */ + case 313: +#line 1582 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -3920,11 +3954,11 @@ yyreduce: } free((yyvsp[0].str)); } -#line 3924 "util/configparser.c" /* yacc.c:1646 */ +#line 3958 "util/configparser.c" /* yacc.c:1646 */ break; - case 310: -#line 1574 "./util/configparser.y" /* yacc.c:1646 */ + case 314: +#line 1595 "./util/configparser.y" /* yacc.c:1646 */ { 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) { @@ -3936,11 +3970,11 @@ yyreduce: "ratelimit-for-domain"); } } -#line 3940 "util/configparser.c" /* yacc.c:1646 */ +#line 3974 "util/configparser.c" /* yacc.c:1646 */ break; - case 311: -#line 1587 "./util/configparser.y" /* yacc.c:1646 */ + case 315: +#line 1608 "./util/configparser.y" /* yacc.c:1646 */ { 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) { @@ -3952,11 +3986,11 @@ yyreduce: "ratelimit-below-domain"); } } -#line 3956 "util/configparser.c" /* yacc.c:1646 */ +#line 3990 "util/configparser.c" /* yacc.c:1646 */ break; - case 312: -#line 1600 "./util/configparser.y" /* yacc.c:1646 */ + case 316: +#line 1621 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3964,11 +3998,11 @@ yyreduce: else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3968 "util/configparser.c" /* yacc.c:1646 */ +#line 4002 "util/configparser.c" /* yacc.c:1646 */ break; - case 313: -#line 1609 "./util/configparser.y" /* yacc.c:1646 */ + case 317: +#line 1630 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) @@ -3976,11 +4010,11 @@ yyreduce: else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 3980 "util/configparser.c" /* yacc.c:1646 */ +#line 4014 "util/configparser.c" /* yacc.c:1646 */ break; - case 314: -#line 1618 "./util/configparser.y" /* yacc.c:1646 */ + case 318: +#line 1639 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -3989,11 +4023,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 3993 "util/configparser.c" /* yacc.c:1646 */ +#line 4027 "util/configparser.c" /* yacc.c:1646 */ break; - case 315: -#line 1628 "./util/configparser.y" /* yacc.c:1646 */ + case 319: +#line 1649 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4002,11 +4036,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4006 "util/configparser.c" /* yacc.c:1646 */ +#line 4040 "util/configparser.c" /* yacc.c:1646 */ break; - case 316: -#line 1638 "./util/configparser.y" /* yacc.c:1646 */ + case 320: +#line 1659 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->stubs->name) @@ -4015,31 +4049,31 @@ yyreduce: free(cfg_parser->cfg->stubs->name); cfg_parser->cfg->stubs->name = (yyvsp[0].str); } -#line 4019 "util/configparser.c" /* yacc.c:1646 */ +#line 4053 "util/configparser.c" /* yacc.c:1646 */ break; - case 317: -#line 1648 "./util/configparser.y" /* yacc.c:1646 */ + case 321: +#line 1669 "./util/configparser.y" /* yacc.c:1646 */ { 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 4029 "util/configparser.c" /* yacc.c:1646 */ +#line 4063 "util/configparser.c" /* yacc.c:1646 */ break; - case 318: -#line 1655 "./util/configparser.y" /* yacc.c:1646 */ + case 322: +#line 1676 "./util/configparser.y" /* yacc.c:1646 */ { 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 4039 "util/configparser.c" /* yacc.c:1646 */ +#line 4073 "util/configparser.c" /* yacc.c:1646 */ break; - case 319: -#line 1662 "./util/configparser.y" /* yacc.c:1646 */ + case 323: +#line 1683 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4047,11 +4081,11 @@ yyreduce: else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4051 "util/configparser.c" /* yacc.c:1646 */ +#line 4085 "util/configparser.c" /* yacc.c:1646 */ break; - case 320: -#line 1671 "./util/configparser.y" /* yacc.c:1646 */ + case 324: +#line 1692 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4060,11 +4094,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4064 "util/configparser.c" /* yacc.c:1646 */ +#line 4098 "util/configparser.c" /* yacc.c:1646 */ break; - case 321: -#line 1681 "./util/configparser.y" /* yacc.c:1646 */ + case 325: +#line 1702 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4073,11 +4107,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4077 "util/configparser.c" /* yacc.c:1646 */ +#line 4111 "util/configparser.c" /* yacc.c:1646 */ break; - case 322: -#line 1691 "./util/configparser.y" /* yacc.c:1646 */ + case 326: +#line 1712 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->forwards->name) @@ -4086,31 +4120,31 @@ yyreduce: free(cfg_parser->cfg->forwards->name); cfg_parser->cfg->forwards->name = (yyvsp[0].str); } -#line 4090 "util/configparser.c" /* yacc.c:1646 */ +#line 4124 "util/configparser.c" /* yacc.c:1646 */ break; - case 323: -#line 1701 "./util/configparser.y" /* yacc.c:1646 */ + case 327: +#line 1722 "./util/configparser.y" /* yacc.c:1646 */ { 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 4100 "util/configparser.c" /* yacc.c:1646 */ +#line 4134 "util/configparser.c" /* yacc.c:1646 */ break; - case 324: -#line 1708 "./util/configparser.y" /* yacc.c:1646 */ + case 328: +#line 1729 "./util/configparser.y" /* yacc.c:1646 */ { 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 4110 "util/configparser.c" /* yacc.c:1646 */ +#line 4144 "util/configparser.c" /* yacc.c:1646 */ break; - case 325: -#line 1715 "./util/configparser.y" /* yacc.c:1646 */ + case 329: +#line 1736 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4118,11 +4152,11 @@ yyreduce: else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4122 "util/configparser.c" /* yacc.c:1646 */ +#line 4156 "util/configparser.c" /* yacc.c:1646 */ break; - case 326: -#line 1724 "./util/configparser.y" /* yacc.c:1646 */ + case 330: +#line 1745 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4131,11 +4165,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4135 "util/configparser.c" /* yacc.c:1646 */ +#line 4169 "util/configparser.c" /* yacc.c:1646 */ break; - case 327: -#line 1734 "./util/configparser.y" /* yacc.c:1646 */ + case 331: +#line 1755 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(name:%s)\n", (yyvsp[0].str))); if(cfg_parser->cfg->views->name) @@ -4144,11 +4178,11 @@ yyreduce: free(cfg_parser->cfg->views->name); cfg_parser->cfg->views->name = (yyvsp[0].str); } -#line 4148 "util/configparser.c" /* yacc.c:1646 */ +#line 4182 "util/configparser.c" /* yacc.c:1646 */ break; - case 328: -#line 1744 "./util/configparser.y" /* yacc.c:1646 */ + case 332: +#line 1765 "./util/configparser.y" /* yacc.c:1646 */ { 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 && @@ -4176,11 +4210,11 @@ yyreduce: fatal_exit("out of memory adding local-zone"); } } -#line 4180 "util/configparser.c" /* yacc.c:1646 */ +#line 4214 "util/configparser.c" /* yacc.c:1646 */ break; - case 329: -#line 1773 "./util/configparser.y" /* yacc.c:1646 */ + case 333: +#line 1794 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) { @@ -4188,11 +4222,11 @@ yyreduce: free((yyvsp[0].str)); } } -#line 4192 "util/configparser.c" /* yacc.c:1646 */ +#line 4226 "util/configparser.c" /* yacc.c:1646 */ break; - case 330: -#line 1782 "./util/configparser.y" /* yacc.c:1646 */ + case 334: +#line 1803 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(view-first:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4200,19 +4234,19 @@ yyreduce: else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4204 "util/configparser.c" /* yacc.c:1646 */ +#line 4238 "util/configparser.c" /* yacc.c:1646 */ break; - case 331: -#line 1791 "./util/configparser.y" /* yacc.c:1646 */ + case 335: +#line 1812 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(remote-control:)\n")); } -#line 4212 "util/configparser.c" /* yacc.c:1646 */ +#line 4246 "util/configparser.c" /* yacc.c:1646 */ break; - case 342: -#line 1802 "./util/configparser.y" /* yacc.c:1646 */ + case 346: +#line 1823 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4221,11 +4255,11 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4225 "util/configparser.c" /* yacc.c:1646 */ +#line 4259 "util/configparser.c" /* yacc.c:1646 */ break; - case 343: -#line 1812 "./util/configparser.y" /* yacc.c:1646 */ + case 347: +#line 1833 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_port:%s)\n", (yyvsp[0].str))); if(atoi((yyvsp[0].str)) == 0) @@ -4233,21 +4267,21 @@ yyreduce: else cfg_parser->cfg->control_port = atoi((yyvsp[0].str)); free((yyvsp[0].str)); } -#line 4237 "util/configparser.c" /* yacc.c:1646 */ +#line 4271 "util/configparser.c" /* yacc.c:1646 */ break; - case 344: -#line 1821 "./util/configparser.y" /* yacc.c:1646 */ + case 348: +#line 1842 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str))); if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str))) yyerror("out of memory"); } -#line 4247 "util/configparser.c" /* yacc.c:1646 */ +#line 4281 "util/configparser.c" /* yacc.c:1646 */ break; - case 345: -#line 1828 "./util/configparser.y" /* yacc.c:1646 */ + case 349: +#line 1849 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4256,122 +4290,122 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4260 "util/configparser.c" /* yacc.c:1646 */ +#line 4294 "util/configparser.c" /* yacc.c:1646 */ break; - case 346: -#line 1838 "./util/configparser.y" /* yacc.c:1646 */ + case 350: +#line 1859 "./util/configparser.y" /* yacc.c:1646 */ { 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 4270 "util/configparser.c" /* yacc.c:1646 */ +#line 4304 "util/configparser.c" /* yacc.c:1646 */ break; - case 347: -#line 1845 "./util/configparser.y" /* yacc.c:1646 */ + case 351: +#line 1866 "./util/configparser.y" /* yacc.c:1646 */ { 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 4280 "util/configparser.c" /* yacc.c:1646 */ +#line 4314 "util/configparser.c" /* yacc.c:1646 */ break; - case 348: -#line 1852 "./util/configparser.y" /* yacc.c:1646 */ + case 352: +#line 1873 "./util/configparser.y" /* yacc.c:1646 */ { 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 4290 "util/configparser.c" /* yacc.c:1646 */ +#line 4324 "util/configparser.c" /* yacc.c:1646 */ break; - case 349: -#line 1859 "./util/configparser.y" /* yacc.c:1646 */ + case 353: +#line 1880 "./util/configparser.y" /* yacc.c:1646 */ { 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 4300 "util/configparser.c" /* yacc.c:1646 */ +#line 4334 "util/configparser.c" /* yacc.c:1646 */ break; - case 350: -#line 1866 "./util/configparser.y" /* yacc.c:1646 */ + case 354: +#line 1887 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("\nP(dnstap:)\n")); } -#line 4308 "util/configparser.c" /* yacc.c:1646 */ +#line 4342 "util/configparser.c" /* yacc.c:1646 */ break; - case 365: -#line 1883 "./util/configparser.y" /* yacc.c:1646 */ + case 369: +#line 1904 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4319 "util/configparser.c" /* yacc.c:1646 */ +#line 4353 "util/configparser.c" /* yacc.c:1646 */ break; - case 366: -#line 1891 "./util/configparser.y" /* yacc.c:1646 */ + case 370: +#line 1912 "./util/configparser.y" /* yacc.c:1646 */ { 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 4329 "util/configparser.c" /* yacc.c:1646 */ +#line 4363 "util/configparser.c" /* yacc.c:1646 */ break; - case 367: -#line 1898 "./util/configparser.y" /* yacc.c:1646 */ + case 371: +#line 1919 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4340 "util/configparser.c" /* yacc.c:1646 */ +#line 4374 "util/configparser.c" /* yacc.c:1646 */ break; - case 368: -#line 1906 "./util/configparser.y" /* yacc.c:1646 */ + case 372: +#line 1927 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str))); if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) yyerror("expected yes or no."); else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4351 "util/configparser.c" /* yacc.c:1646 */ +#line 4385 "util/configparser.c" /* yacc.c:1646 */ break; - case 369: -#line 1914 "./util/configparser.y" /* yacc.c:1646 */ + case 373: +#line 1935 "./util/configparser.y" /* yacc.c:1646 */ { 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 4361 "util/configparser.c" /* yacc.c:1646 */ +#line 4395 "util/configparser.c" /* yacc.c:1646 */ break; - case 370: -#line 1921 "./util/configparser.y" /* yacc.c:1646 */ + case 374: +#line 1942 "./util/configparser.y" /* yacc.c:1646 */ { 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 4371 "util/configparser.c" /* yacc.c:1646 */ +#line 4405 "util/configparser.c" /* yacc.c:1646 */ break; - case 371: -#line 1928 "./util/configparser.y" /* yacc.c:1646 */ + case 375: +#line 1949 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4379,11 +4413,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4383 "util/configparser.c" /* yacc.c:1646 */ +#line 4417 "util/configparser.c" /* yacc.c:1646 */ break; - case 372: -#line 1937 "./util/configparser.y" /* yacc.c:1646 */ + case 376: +#line 1958 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4391,11 +4425,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_resolver_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4395 "util/configparser.c" /* yacc.c:1646 */ +#line 4429 "util/configparser.c" /* yacc.c:1646 */ break; - case 373: -#line 1946 "./util/configparser.y" /* yacc.c:1646 */ + case 377: +#line 1967 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4403,11 +4437,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4407 "util/configparser.c" /* yacc.c:1646 */ +#line 4441 "util/configparser.c" /* yacc.c:1646 */ break; - case 374: -#line 1955 "./util/configparser.y" /* yacc.c:1646 */ + case 378: +#line 1976 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4415,11 +4449,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_client_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4419 "util/configparser.c" /* yacc.c:1646 */ +#line 4453 "util/configparser.c" /* yacc.c:1646 */ break; - case 375: -#line 1964 "./util/configparser.y" /* yacc.c:1646 */ + case 379: +#line 1985 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4427,11 +4461,11 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_query_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4431 "util/configparser.c" /* yacc.c:1646 */ +#line 4465 "util/configparser.c" /* yacc.c:1646 */ break; - case 376: -#line 1973 "./util/configparser.y" /* yacc.c:1646 */ + case 380: +#line 1994 "./util/configparser.y" /* yacc.c:1646 */ { 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) @@ -4439,29 +4473,29 @@ yyreduce: else cfg_parser->cfg->dnstap_log_forwarder_response_messages = (strcmp((yyvsp[0].str), "yes")==0); } -#line 4443 "util/configparser.c" /* yacc.c:1646 */ - break; - - case 377: -#line 1982 "./util/configparser.y" /* yacc.c:1646 */ - { - OUTYY(("\nP(python:)\n")); - } -#line 4451 "util/configparser.c" /* yacc.c:1646 */ +#line 4477 "util/configparser.c" /* yacc.c:1646 */ break; case 381: -#line 1991 "./util/configparser.y" /* yacc.c:1646 */ +#line 2003 "./util/configparser.y" /* yacc.c:1646 */ + { + OUTYY(("\nP(python:)\n")); + } +#line 4485 "util/configparser.c" /* yacc.c:1646 */ + break; + + case 385: +#line 2012 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(python-script:%s)\n", (yyvsp[0].str))); free(cfg_parser->cfg->python_script); cfg_parser->cfg->python_script = (yyvsp[0].str); } -#line 4461 "util/configparser.c" /* yacc.c:1646 */ +#line 4495 "util/configparser.c" /* yacc.c:1646 */ break; - case 382: -#line 1997 "./util/configparser.y" /* yacc.c:1646 */ + case 386: +#line 2018 "./util/configparser.y" /* yacc.c:1646 */ { OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str))); if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0) @@ -4470,21 +4504,21 @@ yyreduce: (strcmp((yyvsp[0].str), "yes")==0); free((yyvsp[0].str)); } -#line 4474 "util/configparser.c" /* yacc.c:1646 */ +#line 4508 "util/configparser.c" /* yacc.c:1646 */ break; - case 383: -#line 2007 "./util/configparser.y" /* yacc.c:1646 */ + case 387: +#line 2028 "./util/configparser.y" /* yacc.c:1646 */ { 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 4484 "util/configparser.c" /* yacc.c:1646 */ +#line 4518 "util/configparser.c" /* yacc.c:1646 */ break; -#line 4488 "util/configparser.c" /* yacc.c:1646 */ +#line 4522 "util/configparser.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4712,7 +4746,7 @@ yyreturn: #endif return yyresult; } -#line 2013 "./util/configparser.y" /* yacc.c:1906 */ +#line 2034 "./util/configparser.y" /* yacc.c:1906 */ /* parse helper routines could be here */ diff --git a/util/configparser.h b/util/configparser.h index 1bee06bd7..80360c651 100644 --- a/util/configparser.h +++ b/util/configparser.h @@ -231,7 +231,9 @@ extern int yydebug; VAR_SERVE_EXPIRED = 441, VAR_FAKE_DSA = 442, VAR_LOG_IDENTITY = 443, - VAR_USE_SYSTEMD = 444 + VAR_USE_SYSTEMD = 444, + VAR_SHM_ENABLE = 445, + VAR_SHM_KEY = 446 }; #endif /* Tokens. */ @@ -422,6 +424,8 @@ extern int yydebug; #define VAR_FAKE_DSA 442 #define VAR_LOG_IDENTITY 443 #define VAR_USE_SYSTEMD 444 +#define VAR_SHM_ENABLE 445 +#define VAR_SHM_KEY 446 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -432,7 +436,7 @@ union YYSTYPE char* str; -#line 436 "util/configparser.h" /* yacc.c:1909 */ +#line 440 "util/configparser.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/util/configparser.y b/util/configparser.y index e6e3fb474..1fb12e7f8 100644 --- a/util/configparser.y +++ b/util/configparser.y @@ -135,7 +135,7 @@ extern struct config_parser_state* cfg_parser; %token VAR_ACCESS_CONTROL_TAG_DATA VAR_VIEW VAR_ACCESS_CONTROL_VIEW %token VAR_VIEW_FIRST VAR_SERVE_EXPIRED VAR_FAKE_DSA %token VAR_LOG_IDENTITY -%token VAR_USE_SYSTEMD +%token VAR_USE_SYSTEMD VAR_SHM_ENABLE VAR_SHM_KEY %% toplevelvars: /* empty */ | toplevelvars toplevelvar ; @@ -213,7 +213,8 @@ content_server: server_num_threads | server_verbosity | server_port | server_local_zone_override | server_access_control_tag_action | server_access_control_tag_data | server_access_control_view | server_qname_minimisation_strict | server_serve_expired | - server_fake_dsa | server_log_identity | server_use_systemd + server_fake_dsa | server_log_identity | server_use_systemd | + server_shm_enable | server_shm_key ; stubstart: VAR_STUB_ZONE { @@ -314,6 +315,26 @@ server_extended_statistics: VAR_EXTENDED_STATISTICS STRING_ARG free($2); } ; +server_shm_enable: VAR_SHM_ENABLE STRING_ARG + { + OUTYY(("P(server_shm_enable:%s)\n", $2)); + if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) + yyerror("expected yes or no."); + else cfg_parser->cfg->shm_enable = (strcmp($2, "yes")==0); + free($2); + } + ; +server_shm_key: VAR_SHM_KEY STRING_ARG + { + OUTYY(("P(server_shm_key:%s)\n", $2)); + if(strcmp($2, "") == 0 || strcmp($2, "0") == 0) + cfg_parser->cfg->shm_key = 0; + else if(atoi($2) == 0) + yyerror("number expected"); + else cfg_parser->cfg->shm_key = atoi($2); + free($2); + } + ; server_port: VAR_PORT STRING_ARG { OUTYY(("P(server_port:%s)\n", $2)); diff --git a/util/shm_side/shm_main.c b/util/shm_side/shm_main.c new file mode 100644 index 000000000..758abf6a6 --- /dev/null +++ b/util/shm_side/shm_main.c @@ -0,0 +1,273 @@ +/* + * util/shm_side/shm_main.c - SHM for statistics transport + * + * Copyright (c) 2017, NLnet Labs. All rights reserved. + * + * This software is open source. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of the NLNET LABS nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * \file + * + * This file contains functions for the SHM implementation. + */ + +#include "config.h" +#include "shm_main.h" +#include +#include +#ifdef HAVE_SYS_IPC_H +#include "sys/ipc.h" +#endif +#ifdef HAVE_SYS_SHM_H +#include "sys/shm.h" +#endif +#include "errno.h" +#include "config.h" +#include "daemon/daemon.h" +#include "daemon/worker.h" +#include "daemon/stats.h" +#include "services/mesh.h" +#include "services/cache/rrset.h" +#include "services/cache/infra.h" +#include "validator/validator.h" +#include "util/config_file.h" +#include "util/fptr_wlist.h" +#include "util/log.h" + +#ifdef HAVE_SHMGET +/** subtract timers and the values do not overflow or become negative */ +static void +timeval_subtract(struct timeval* d, const struct timeval* end, + const struct timeval* start) +{ +#ifndef S_SPLINT_S + time_t end_usec = end->tv_usec; + d->tv_sec = end->tv_sec - start->tv_sec; + if(end_usec < start->tv_usec) { + end_usec += 1000000; + d->tv_sec--; + } + d->tv_usec = end_usec - start->tv_usec; +#endif +} +#endif /* HAVE_SHMGET */ + +int shm_main_init(struct daemon* daemon) +{ +#ifdef HAVE_SHMGET + struct shm_stat_info *shm_stat; + int shm_size; + + /* sanitize */ + if(!daemon) + return 0; + if(daemon->cfg->stat_interval == 0) + log_warn("shm-enable is yes but statistics-interval is 0"); + + /* Statistics to maintain the number of thread + total */ + shm_size = (sizeof(struct stats_info) * (daemon->num + 1)); + + /* Allocation of needed memory */ + daemon->shm_info = (struct shm_main_info*)calloc(1, shm_size); + + /* Sanitize */ + if(!daemon->shm_info) { + log_err("shm fail: malloc failure"); + return 0; + } + + daemon->shm_info->key = daemon->cfg->shm_key; + + /* Check for previous create SHM */ + daemon->shm_info->id_ctl = shmget(daemon->shm_info->key, sizeof(int), SHM_R); + daemon->shm_info->id_arr = shmget(daemon->shm_info->key + 1, sizeof(int), SHM_R); + + /* Destroy previous SHM */ + if (daemon->shm_info->id_ctl >= 0) + shmctl(daemon->shm_info->id_ctl, IPC_RMID, NULL); + + /* Destroy previous SHM */ + if (daemon->shm_info->id_arr >= 0) + shmctl(daemon->shm_info->id_ctl, IPC_RMID, NULL); + + /* SHM: Create the segment */ + daemon->shm_info->id_ctl = shmget(daemon->shm_info->key, sizeof(struct shm_stat_info), IPC_CREAT | 0666); + + if (daemon->shm_info->id_ctl < 0) + { + log_err("SHM failed(id_ctl) cannot shmget(key %d) %s", + daemon->shm_info->key, strerror(errno)); + + /* Just release memory unused */ + free(daemon->shm_info); + + return 0; + } + + daemon->shm_info->id_arr = shmget(daemon->shm_info->key + 1, shm_size, IPC_CREAT | 0666); + + if (daemon->shm_info->id_arr < 0) + { + log_err("SHM failed(id_arr) cannot shmget(key %d + 1) %s", + daemon->shm_info->key, strerror(errno)); + + /* Just release memory unused */ + free(daemon->shm_info); + + return 0; + } + + /* SHM: attach the segment */ + daemon->shm_info->ptr_ctl = (struct shm_stat_info*) + shmat(daemon->shm_info->id_ctl, NULL, 0); + if(daemon->shm_info->ptr_ctl == (void *) -1) { + log_err("SHM failed(ctl) cannot shmat(%d) %s", + daemon->shm_info->id_ctl, strerror(errno)); + + /* Just release memory unused */ + free(daemon->shm_info); + + return 0; + } + + daemon->shm_info->ptr_arr = (struct stats_info*) + shmat(daemon->shm_info->id_arr, NULL, 0); + + if (daemon->shm_info->ptr_arr == (void *) -1) + { + log_err("SHM failed(arr) cannot shmat(%d) %s", + daemon->shm_info->id_arr, strerror(errno)); + + /* Just release memory unused */ + free(daemon->shm_info); + + return 0; + } + + /* Zero fill SHM to stand clean while is not filled by other events */ + memset(daemon->shm_info->ptr_ctl, 0, sizeof(struct shm_stat_info)); + memset(daemon->shm_info->ptr_arr, 0, shm_size); + + shm_stat = daemon->shm_info->ptr_ctl; + shm_stat->num_threads = daemon->num; + +#else + (void)daemon; +#endif /* HAVE_SHMGET */ + return 1; +} + +void shm_main_shutdown(struct daemon* daemon) +{ +#ifdef HAVE_SHMGET + /* web are OK, just disabled */ + if(!daemon->cfg->shm_enable) + return; + + verbose(VERB_DETAIL, "SHM shutdown - KEY [%d] - ID CTL [%d] ARR [%d] - PTR CTL [%p] ARR [%p]", + daemon->shm_info->key, daemon->shm_info->id_ctl, daemon->shm_info->id_arr, daemon->shm_info->ptr_ctl, daemon->shm_info->ptr_arr); + + /* Destroy previous SHM */ + if (daemon->shm_info->id_ctl >= 0) + shmctl(daemon->shm_info->id_ctl, IPC_RMID, NULL); + + if (daemon->shm_info->id_arr >= 0) + shmctl(daemon->shm_info->id_arr, IPC_RMID, NULL); + + if (daemon->shm_info->ptr_ctl) + shmdt(daemon->shm_info->ptr_ctl); + + if (daemon->shm_info->ptr_arr) + shmdt(daemon->shm_info->ptr_arr); + +#else + (void)daemon; +#endif /* HAVE_SHMGET */ +} + +void shm_main_run(struct worker *worker) +{ +#ifdef HAVE_SHMGET + struct shm_stat_info *shm_stat; + struct stats_info *stat_total; + struct stats_info *stat_info; + int modstack; + int offset; + + verbose(VERB_DETAIL, "SHM run - worker [%d] - daemon [%p] - timenow(%u) - timeboot(%u)", + worker->thread_num, worker->daemon, (unsigned)worker->env.now_tv->tv_sec, (unsigned)worker->daemon->time_boot.tv_sec); + + offset = worker->thread_num + 1; + stat_total = worker->daemon->shm_info->ptr_arr; + stat_info = worker->daemon->shm_info->ptr_arr + offset; + + /* Copy data to the current position */ + server_stats_compile(worker, stat_info, 0); + + /* First thread, zero fill total, and copy general info */ + if (worker->thread_num == 0) { + + /* Copy data to the current position */ + memset(stat_total, 0, sizeof(struct stats_info)); + + /* Point to data into SHM */ + shm_stat = worker->daemon->shm_info->ptr_ctl; + shm_stat->time.now = *worker->env.now_tv; + + timeval_subtract(&shm_stat->time.up, &shm_stat->time.now, &worker->daemon->time_boot); + timeval_subtract(&shm_stat->time.elapsed, &shm_stat->time.now, &worker->daemon->time_last_stat); + + shm_stat->mem.msg = slabhash_get_mem(worker->env.msg_cache); + shm_stat->mem.rrset = slabhash_get_mem(&worker->env.rrset_cache->table); + shm_stat->mem.val = 0; + shm_stat->mem.iter = 0; + + modstack = modstack_find(&worker->env.mesh->mods, "validator"); + if(modstack != -1) { + fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem)); + shm_stat->mem.val = (*worker->env.mesh->mods.mod[modstack]->get_mem)(&worker->env, modstack); + } + modstack = modstack_find(&worker->env.mesh->mods, "iterator"); + if(modstack != -1) { + fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem)); + shm_stat->mem.iter = (*worker->env.mesh->mods.mod[modstack]->get_mem)(&worker->env, modstack); + } + } + + server_stats_add(stat_total, stat_info); + + /* print the thread statistics */ + stat_total->mesh_time_median /= (double)worker->daemon->num; + +#else + (void)worker; +#endif /* HAVE_SHMGET */ +} diff --git a/util/shm_side/shm_main.h b/util/shm_side/shm_main.h new file mode 100644 index 000000000..c45519306 --- /dev/null +++ b/util/shm_side/shm_main.h @@ -0,0 +1,85 @@ +/* + * util/shm_side/shm_main.h - control the shared memory for unbound. + * + * Copyright (c) 2007, NLnet Labs. All rights reserved. + * + * This software is open source. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of the NLNET LABS nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * \file + * + * This file contains functions for the SHM side. + */ + +#ifndef UTIL_SHM_SIDE_MAIN_H +#define UTIL_SHM_SIDE_MAIN_H +struct daemon; +struct worker; + +/** Some global statistics that are not in struct stats_info, + * this struct is shared on a shm segment */ +struct shm_stat_info { + + int num_threads; + + struct { + struct timeval now; + struct timeval up; + struct timeval elapsed; + } time; + + struct { + size_t msg; + size_t rrset; + size_t val; + size_t iter; + } mem; +}; + +/** + * The SHM info. + */ +struct shm_main_info { + /** stats_info array, shared memory segment. + * [0] is totals, [1..thread_num] are per-thread stats */ + struct stats_info* ptr_arr; + /** the global stats block, shared memory segment */ + struct shm_stat_info* ptr_ctl; + int key; + int id_ctl; + int id_arr; +}; + +int shm_main_init(struct daemon* daemon); +void shm_main_shutdown(struct daemon* daemon); +void shm_main_run(struct worker *worker); + +#endif /* UTIL_SHM_SIDE_MAIN_H */