- ratelimit feature, ratelimit: 100, or some sensible qps, can be

  used to turn it on.  It ratelimits recursion effort per zone.
  For particular names you can configure exceptions in unbound.conf.

git-svn-id: file:///svn/unbound/trunk@3391 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 8ca74367a865ff5f49a334bae8c8c9318809da55..94b126d311678417dfb5f9e039dbb6b7ce1e5bc4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -599,12 +599,13 @@ dns.lo dns.o: $(srcdir)/services/cache/dns.c config.h $(srcdir)/iterator/iter_de
  $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/data/dname.h \
  $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
  $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
-infra.lo infra.o: $(srcdir)/services/cache/infra.c config.h $(srcdir)/sldns/rrdef.h \
+infra.lo infra.o: $(srcdir)/services/cache/infra.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h \
  $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/rtt.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lookup3.h \
- $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/iterator/iterator.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/storage/slabhash.h \
+ $(srcdir)/util/storage/lookup3.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/config_file.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h \
+ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h
 rrset.lo rrset.o: $(srcdir)/services/cache/rrset.c config.h $(srcdir)/services/cache/rrset.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/slabhash.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/config_file.h \
@@ -614,8 +615,9 @@ dname.lo dname.o: $(srcdir)/util/data/dname.c config.h $(srcdir)/util/data/dname
  $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/storage/lookup3.h $(srcdir)/sldns/sbuffer.h
 msgencode.lo msgencode.o: $(srcdir)/util/data/msgencode.c config.h $(srcdir)/util/data/msgencode.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/dname.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
+ $(srcdir)/sldns/sbuffer.h
 msgparse.lo msgparse.o: $(srcdir)/util/data/msgparse.c config.h $(srcdir)/util/data/msgparse.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/packed_rrset.h \
@@ -679,15 +681,16 @@ iter_utils.lo iter_utils.o: $(srcdir)/iterator/iter_utils.c config.h $(srcdir)/i
  $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/module.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \
- $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_donotq.h \
- $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_priv.h $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/storage/slabhash.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h \
- $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \
- $(srcdir)/util/netevent.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \
- $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_kentry.h \
- $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/iterator/iter_hints.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_fwd.h \
+ $(srcdir)/iterator/iter_donotq.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_priv.h \
+ $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h \
+ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/data/dname.h $(srcdir)/util/random.h \
+ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \
+ $(srcdir)/services/modstack.h $(srcdir)/validator/val_anchor.h $(srcdir)/validator/val_kcache.h \
+ $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_sigcrypt.h \
+ $(srcdir)/sldns/sbuffer.h
 listen_dnsport.lo listen_dnsport.o: $(srcdir)/services/listen_dnsport.c config.h \
  $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/services/outside_network.h \
  $(srcdir)/util/rbtree.h  $(srcdir)/util/log.h $(srcdir)/util/config_file.h \
@@ -700,29 +703,30 @@ localzone.lo localzone.o: $(srcdir)/services/localzone.c config.h $(srcdir)/serv
  $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h
 mesh.lo mesh.o: $(srcdir)/services/mesh.c config.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/netevent.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
- $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h $(srcdir)/services/outbound_list.h \
- $(srcdir)/services/cache/dns.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \
- $(srcdir)/util/data/msgencode.h $(srcdir)/util/timehist.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \
- $(srcdir)/util/alloc.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/modstack.h \
+ $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/dns.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/regional.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/timehist.h $(srcdir)/util/fptr_wlist.h \
+ $(srcdir)/util/tube.h $(srcdir)/util/alloc.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
 modstack.lo modstack.o: $(srcdir)/services/modstack.c config.h $(srcdir)/services/modstack.h \
  $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/tube.h \
- $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/dns64/dns64.h $(srcdir)/iterator/iterator.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h \
+ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/dns64/dns64.h \
+ $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/validator/validator.h \
+ $(srcdir)/validator/val_utils.h
 outbound_list.lo outbound_list.o: $(srcdir)/services/outbound_list.c config.h \
  $(srcdir)/services/outbound_list.h $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/netevent.h 
 outside_network.lo outside_network.o: $(srcdir)/services/outside_network.c config.h \
  $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h $(srcdir)/util/netevent.h \
   $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/rtt.h \
- $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h \
- $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \
- $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/dnstap/dnstap.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \
+ $(srcdir)/util/module.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h \
  
 alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/util/regional.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
@@ -735,8 +739,9 @@ config_file.lo config_file.o: $(srcdir)/util/config_file.c config.h $(srcdir)/ut
  $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/regional.h $(srcdir)/util/fptr_wlist.h \
  $(srcdir)/util/netevent.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \
- $(srcdir)/services/modstack.h $(srcdir)/util/data/dname.h $(srcdir)/util/rtt.h $(srcdir)/sldns/wire2str.h \
- $(srcdir)/sldns/parseutil.h $(srcdir)/util/iana_ports.inc
+ $(srcdir)/services/modstack.h $(srcdir)/util/data/dname.h $(srcdir)/util/rtt.h $(srcdir)/services/cache/infra.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h \
+ $(srcdir)/util/iana_ports.inc
 configlexer.lo configlexer.o: util/configlexer.c config.h $(srcdir)/util/configyyrename.h \
  $(srcdir)/util/config_file.h util/configparser.h
 configparser.lo configparser.o: util/configparser.c config.h $(srcdir)/util/configyyrename.h \
@@ -747,15 +752,14 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/
  $(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 $(srcdir)/util/mini_event.h \
  $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h  \
- $(srcdir)/services/localzone.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/dns64/dns64.h \
+ $(srcdir)/services/localzone.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/dns64/dns64.h \
  $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \
  $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_anchor.h \
  $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h \
- $(srcdir)/validator/val_neg.h $(srcdir)/validator/autotrust.h $(srcdir)/util/storage/dnstree.h \
- $(srcdir)/libunbound/libworker.h $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h \
- $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/util/config_file.h
+ $(srcdir)/validator/val_neg.h $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h \
+ $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound.h \
+ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h
 locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h
 log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h
 mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \
@@ -823,13 +827,14 @@ val_anchor.lo val_anchor.o: $(srcdir)/validator/val_anchor.c config.h $(srcdir)/
 validator.lo validator.o: $(srcdir)/validator/validator.c config.h $(srcdir)/validator/validator.h \
  $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_anchor.h \
- $(srcdir)/util/rbtree.h $(srcdir)/validator/val_kcache.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_nsec3.h \
- $(srcdir)/validator/val_neg.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/autotrust.h \
- $(srcdir)/services/cache/dns.h $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/tube.h \
- $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/sldns/wire2str.h
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h \
+ $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_kcache.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/validator/val_kentry.h $(srcdir)/validator/val_nsec.h \
+ $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_neg.h $(srcdir)/validator/val_sigcrypt.h \
+ $(srcdir)/validator/autotrust.h $(srcdir)/services/cache/dns.h $(srcdir)/util/data/dname.h \
+ $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h \
+ $(srcdir)/util/netevent.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \
+ $(srcdir)/sldns/wire2str.h
 val_kcache.lo val_kcache.o: $(srcdir)/validator/val_kcache.c config.h $(srcdir)/validator/val_kcache.h \
  $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/validator/val_kentry.h $(srcdir)/util/config_file.h $(srcdir)/util/data/dname.h \
@@ -882,11 +887,11 @@ val_utils.lo val_utils.o: $(srcdir)/validator/val_utils.c config.h $(srcdir)/val
  $(srcdir)/util/net_help.h $(srcdir)/util/regional.h
 dns64.lo dns64.o: $(srcdir)/dns64/dns64.c config.h $(srcdir)/dns64/dns64.h $(srcdir)/util/module.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/tube.h \
- $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/net_help.h \
- $(srcdir)/util/regional.h
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h \
+ $(srcdir)/util/netevent.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/services/modstack.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h
 checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
  $(srcdir)/testcode/checklocks.h
 dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c  config.h $(srcdir)/sldns/sbuffer.h \
@@ -904,10 +909,10 @@ unitlruhash.lo unitlruhash.o: $(srcdir)/testcode/unitlruhash.c config.h $(srcdir
  $(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h
 unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
- $(srcdir)/util/log.h \
- $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/config_file.h $(srcdir)/util/rtt.h $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/util/random.h
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/util/random.h
 unitmsgparse.lo unitmsgparse.o: $(srcdir)/testcode/unitmsgparse.c config.h $(srcdir)/util/log.h \
  $(srcdir)/testcode/unitmain.h $(srcdir)/util/data/msgparse.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
@@ -948,11 +953,11 @@ cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h \
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
  $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
   $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/util/regional.h \
- $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h \
- $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/util/rbtree.h \
- $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/wire2str.h \
+ $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \
+ $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \
+ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/sldns/wire2str.h \
  $(srcdir)/sldns/str2wire.h
 daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \
  $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
@@ -971,18 +976,18 @@ remote.lo remote.o: $(srcdir)/daemon/remote.c config.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 $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
+ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
  $(srcdir)/services/modstack.h $(srcdir)/daemon/cachedump.h $(srcdir)/util/config_file.h \
  $(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/localzone.h $(srcdir)/util/fptr_wlist.h \
- $(srcdir)/util/tube.h $(srcdir)/util/data/dname.h $(srcdir)/validator/validator.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \
+ $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/data/dname.h $(srcdir)/validator/validator.h \
  $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_kcache.h $(srcdir)/validator/val_kentry.h \
  $(srcdir)/validator/val_anchor.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \
- $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \
- $(srcdir)/iterator/iter_delegpt.h $(srcdir)/services/outside_network.h $(srcdir)/sldns/str2wire.h \
- $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h
+ $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/iterator/iter_delegpt.h \
+ $(srcdir)/services/outside_network.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h \
+ $(srcdir)/sldns/wire2str.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 \
@@ -990,25 +995,26 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s
  $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
   $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h \
  $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/validator/validator.h \
- $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
+ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \
+ $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
 unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \
  $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h  \
  $(srcdir)/daemon/remote.h \
  $(srcdir)/util/config_file.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/util/fptr_wlist.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)/util/net_help.h $(srcdir)/util/mini_event.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.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/net_help.h $(srcdir)/util/mini_event.h \
  $(srcdir)/util/rbtree.h
 worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
  $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
+ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
  $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
  $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \
@@ -1026,8 +1032,8 @@ testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/test
  $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
   $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
- $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.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/net_help.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
 testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcode/testpkts.h \
@@ -1037,8 +1043,8 @@ worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(sr
  $(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
  $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
  $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
+ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h  $(srcdir)/daemon/daemon.h \
  $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
  $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \
@@ -1070,10 +1076,11 @@ stats.lo stats.o: $(srcdir)/daemon/stats.c config.h $(srcdir)/daemon/stats.h $(s
  $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
  $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
   $(srcdir)/daemon/daemon.h $(srcdir)/services/modstack.h \
- $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h $(srcdir)/services/listen_dnsport.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h $(srcdir)/validator/validator.h \
- $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
+ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/outside_network.h \
+ $(srcdir)/services/listen_dnsport.h $(srcdir)/util/config_file.h $(srcdir)/util/tube.h $(srcdir)/util/net_help.h \
+ $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/cache/rrset.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
+ $(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
 replay.lo replay.o: $(srcdir)/testcode/replay.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/config_file.h $(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/testcode/testpkts.h \
  $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h
@@ -1083,9 +1090,10 @@ fake_event.lo fake_event.o: $(srcdir)/testcode/fake_event.c config.h $(srcdir)/t
  $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \
  $(srcdir)/util/data/dname.h $(srcdir)/util/config_file.h $(srcdir)/services/listen_dnsport.h \
  $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h  \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/testcode/replay.h $(srcdir)/testcode/testpkts.h \
- $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h \
- $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
+ $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \
+ $(srcdir)/testcode/replay.h $(srcdir)/testcode/testpkts.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \
+ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
 lock_verify.lo lock_verify.o: $(srcdir)/testcode/lock_verify.c config.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \
  $(srcdir)/util/locks.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
@@ -1122,7 +1130,7 @@ context.lo context.o: $(srcdir)/libunbound/context.c config.h $(srcdir)/libunbou
  $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
  $(srcdir)/sldns/rrdef.h $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/services/localzone.h \
  $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/rtt.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h $(srcdir)/sldns/sbuffer.h
 libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbound/unbound.h \
  $(srcdir)/libunbound/unbound-event.h config.h $(srcdir)/libunbound/context.h $(srcdir)/util/locks.h \
  $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
@@ -1130,8 +1138,8 @@ libunbound.lo libunbound.o: $(srcdir)/libunbound/libunbound.c $(srcdir)/libunbou
  $(srcdir)/util/config_file.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/regional.h \
  $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/services/localzone.h \
- $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/storage/slabhash.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \
+ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/sldns/sbuffer.h
 libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h \
  $(srcdir)/libunbound/libworker.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \
@@ -1159,13 +1167,12 @@ streamtcp.lo streamtcp.o: $(srcdir)/testcode/streamtcp.c config.h $(srcdir)/util
  
 perf.lo perf.o: $(srcdir)/testcode/perf.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
  $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
 delayer.lo delayer.o: $(srcdir)/testcode/delayer.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
  $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
 unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h \
- $(srcdir)/util/log.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h
+ $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h
 unbound-anchor.lo unbound-anchor.o: $(srcdir)/smallapp/unbound-anchor.c config.h $(srcdir)/libunbound/unbound.h \
  $(srcdir)/sldns/rrdef.h \
  
@@ -1173,8 +1180,8 @@ petal.lo petal.o: $(srcdir)/testcode/petal.c config.h \
  
 pythonmod_utils.lo pythonmod_utils.o: $(srcdir)/pythonmod/pythonmod_utils.c config.h $(srcdir)/util/module.h \
  $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h $(srcdir)/services/cache/dns.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h $(srcdir)/services/cache/dns.h \
  $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/regional.h \
  $(srcdir)/iterator/iter_delegpt.h $(srcdir)/sldns/sbuffer.h
 win_svc.lo win_svc.o: $(srcdir)/winrc/win_svc.c config.h $(srcdir)/winrc/win_svc.h $(srcdir)/winrc/w_inst.h \
@@ -1197,7 +1204,8 @@ keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h \
  
 sbuffer.lo sbuffer.o: $(srcdir)/sldns/sbuffer.c config.h $(srcdir)/sldns/sbuffer.h
 wire2str.lo wire2str.o: $(srcdir)/sldns/wire2str.c config.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/keyraw.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/sldns/keyraw.h \
  
 parse.lo parse.o: $(srcdir)/sldns/parse.c config.h $(srcdir)/sldns/parse.h $(srcdir)/sldns/parseutil.h \
  $(srcdir)/sldns/sbuffer.h
@@ -1217,7 +1225,6 @@ memmove.lo memmove.o: $(srcdir)/compat/memmove.c config.h
 snprintf.lo snprintf.o: $(srcdir)/compat/snprintf.c config.h
 strlcat.lo strlcat.o: $(srcdir)/compat/strlcat.c config.h
 strlcpy.lo strlcpy.o: $(srcdir)/compat/strlcpy.c config.h
-reallocarray.lo reallocarray.o: $(srcdir)/compat/reallocarray.c config.h
 strptime.lo strptime.o: $(srcdir)/compat/strptime.c config.h
 getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h \
  
@@ -1229,3 +1236,4 @@ arc4random.lo arc4random.o: $(srcdir)/compat/arc4random.c config.h $(srcdir)/com
 arc4random_uniform.lo arc4random_uniform.o: $(srcdir)/compat/arc4random_uniform.c config.h
 arc4_lock.lo arc4_lock.o: $(srcdir)/compat/arc4_lock.c config.h $(srcdir)/util/locks.h
 sha512.lo sha512.o: $(srcdir)/compat/sha512.c config.h
+reallocarray.lo reallocarray.o: $(srcdir)/compat/reallocarray.c config.h

diff --git a/doc/Changelog b/doc/Changelog
index 8664b2172264e87c7579172de564b045edb967ac..fabf2cd8c9555700c09504961be8b73db1fbca70 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+10 April 2015: Wouter
+       - ratelimit feature, ratelimit: 100, or some sensible qps, can be
+         used to turn it on.  It ratelimits recursion effort per zone.
+         For particular names you can configure exceptions in unbound.conf.
+
 8 April 2015: Wouter
        - Fix crash in dnstap: Do not try to log TCP responses after timeout.
 

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 69b3cf39ec6a5463b5f664cc45bcde20a20fe868..425ecaad71e1218396022c65a78e8949786e6cd0 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -551,6 +551,23 @@ server:
        # Enable dns64 in module-config.  Used to synthesize IPv6 from IPv4.
        # dns64-prefix: 64:ff9b::0/96
 
+       # ratelimit for uncached, new queries, this limits recursion effort.
+       # ratelimiting is experimental, and may help against randomqueryflood.
+       # if 0(default) it is disabled, otherwise state qps allowed per zone.
+       # ratelimit: 0
+
+       # ratelimits are tracked in a cache, size in bytes of cache (or k,m).
+       # ratelimit-size: 4m
+       # ratelimit cache slabs, reduces lock contention if equal to cpucount.
+       # ratelimit-slabs: 4
+
+       # override the ratelimit for a specific domain name.
+       # give this setting multiple times to have multiple overrides.
+       # ratelimit-for-domain: example.com 100
+       # override the ratelimits for all domains below a domain name
+       # can give this multiple times, the name closest to the zone is used.
+       # ratelimit-below-domain: example 100
+
 # Python config section. To enable:
 # o use --with-pythonmodule to configure before compiling.
 # o list python in the module-config string (above) to enable.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 91b8b24ae6adaa85b57494e9eaf5eef315f99549..d3346c9402cb35704823939afcb907e2d348de59 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -978,6 +978,42 @@ it as detailed in the stub zone section below.
 Configure local data shorthand for a PTR record with the reversed IPv4 or
 IPv6 address and the host name.  For example "192.0.2.4 www.example.com".
 TTL can be inserted like this: "2001:DB8::4 7200 www.example.com"
+.TP 5
+.B ratelimit: \fI<number or 0>
+Enable ratelimiting of queries sent to nameserver for performing recursion.
+If 0, the default, it is disabled.  This option is experimental at this time.
+The ratelimit is in queries per second that are allowed.  More queries are
+turned away with an error (servfail).  This stops recursive floods, eg. random
+query names, but not spoofed reflection floods.  Cached responses are not
+ratelimited by this setting.  The zone of the query is determined by examining
+the nameservers for it, the zone name is used to keep track of the rate.
+For example, 100 may be a suitable value to stop the server from being
+overloaded with random names, and keeps unbound from sending traffic to the
+nameservers for those zones.
+.TP 5
+.B ratelimit\-size: \fI<memory size>
+Give the size of the data structure in which the current ongoing rates are
+kep track in.  Default 4m.  In bytes or use m(mega), k(kilo), g(giga).
+The ratelimit structure is small, so this data structure likely does
+not need to be large.
+.TP 5
+.B ratelimit\-slabs: \fI<number>
+Give power of 2 number of slabs, this is used to reduce lock contention
+in the ratelimit tracking data structure.  Close to the number of cpus is
+a fairly good setting.
+.TP 5
+.B ratelimit\-for\-domain: \fI<domain> <number qps>
+Override the global ratelimit for an exact match domain name with the listed
+number.  You can give this for any number of names.  For example, for
+a top\-level\-domain you may want to have a higher limit than other names.
+.TP 5
+.B ratelimit\-below\-domain: \fI<domain> <number qps>
+Override the global ratelimit for a domain name that ends in this name.
+You can give this multiple times, it then describes different settings
+in different parts of the namespace.  The closest matching suffix is used
+to determine the qps limit.  The rate for the exact matching domain name
+is not changed, use ratelimit\-for\-domain to set that, you might want
+to use different settings for a top\-level\-domain and subdomains.
 .SS "Remote Control Options"
 In the
 .B remote\-control:

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 02de86e12ebc4296680640e7df3ba03673db24bd..11312e16fb4c5c7409a91834fff63c05650acfc3 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1125,6 +1125,18 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                         * results of priming. */
                        return 0;
                }
+               if(infra_ratelimit_exceeded(qstate->env->infra_cache,
+                       iq->dp->name, iq->dp->namelen, *qstate->env->now)) {
+                       /* and increment the rate, so that the rate for time
+                        * now will also exceed the rate, keeping cache fresh */
+                       (void)infra_ratelimit_inc(qstate->env->infra_cache,
+                               iq->dp->name, iq->dp->namelen,
+                               *qstate->env->now);
+                       log_nametypeclass(VERB_ALGO, "ratelimit exceeded with "
+                               "delegation point", iq->dp->name,
+                               LDNS_RR_TYPE_NS, LDNS_RR_CLASS_IN);
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
 
                /* see if this dp not useless.
                 * It is useless if:
@@ -1914,6 +1926,15 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                return 0;
        }
 
+       /* if not forwarding, check ratelimits per delegationpoint name */
+       if(!(iq->chase_flags & BIT_RD)) {
+               if(!infra_ratelimit_inc(qstate->env->infra_cache, iq->dp->name,
+                       iq->dp->namelen, *qstate->env->now)) {
+                       verbose(VERB_ALGO, "query exceeded ratelimits");
+                       return error_response(qstate, id, LDNS_RCODE_SERVFAIL);
+               }
+       }
+
        /* We have a valid target. */
        if(verbosity >= VERB_QUERY) {
                log_query_info(VERB_QUERY, "sending query:", &iq->qchase);
@@ -1933,6 +1954,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
        if(!outq) {
                log_addr(VERB_DETAIL, "error sending query to auth server", 
                        &target->addr, target->addrlen);
+               infra_ratelimit_dec(qstate->env->infra_cache, iq->dp->name,
+                       iq->dp->namelen, *qstate->env->now);
                return next_state(iq, QUERYTARGETS_STATE);
        }
        outbound_list_insert(&iq->outlist, outq);
@@ -2083,6 +2106,14 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
                 * delegation point, and back to the QUERYTARGETS_STATE. */
                verbose(VERB_DETAIL, "query response was REFERRAL");
 
+               if(!(iq->chase_flags & BIT_RD)) {
+                       /* we have a referral, no ratelimit, we can send
+                        * our queries to the given name */
+                       infra_ratelimit_dec(qstate->env->infra_cache,
+                               iq->dp->name, iq->dp->namelen,
+                               *qstate->env->now);
+               }
+
                /* if hardened, only store referral if we asked for it */
                if(!qstate->env->cfg->harden_referral_path ||
                    (  qstate->qinfo.qtype == LDNS_RR_TYPE_NS 

diff --git a/services/cache/infra.c b/services/cache/infra.c
index 61bab3fe588932c55f199c8443d69c2e40f190a6..2c8f2fa284ec36788475405d0564c1a34a4658fb 100644 (file)
--- a/services/cache/infra.c
+++ b/services/cache/infra.c
@@ -40,6 +40,7 @@
  */
 #include "config.h"
 #include "sldns/rrdef.h"
+#include "sldns/str2wire.h"
 #include "services/cache/infra.h"
 #include "util/storage/slabhash.h"
 #include "util/storage/lookup3.h"
@@ -57,6 +58,9 @@
  * can do this number of packets (until those all timeout too) */
 #define TIMEOUT_COUNT_MAX 3
 
+/** ratelimit value for delegation point */
+int infra_dp_ratelimit = 0;
+
 size_t 
 infra_sizefunc(void* k, void* ATTR_UNUSED(d))
 {
@@ -99,6 +103,108 @@ infra_deldatafunc(void* d, void* ATTR_UNUSED(arg))
        free(data);
 }
 
+size_t 
+rate_sizefunc(void* k, void* ATTR_UNUSED(d))
+{
+       struct rate_key* key = (struct rate_key*)k;
+       return sizeof(*key) + sizeof(struct rate_data) + key->namelen
+               + lock_get_mem(&key->entry.lock);
+}
+
+int 
+rate_compfunc(void* key1, void* key2)
+{
+       struct rate_key* k1 = (struct rate_key*)key1;
+       struct rate_key* k2 = (struct rate_key*)key2;
+       if(k1->namelen != k2->namelen) {
+               if(k1->namelen < k2->namelen)
+                       return -1;
+               return 1;
+       }
+       return query_dname_compare(k1->name, k2->name);
+}
+
+void 
+rate_delkeyfunc(void* k, void* ATTR_UNUSED(arg))
+{
+       struct rate_key* key = (struct rate_key*)k;
+       if(!key)
+               return;
+       lock_rw_destroy(&key->entry.lock);
+       free(key->name);
+       free(key);
+}
+
+void 
+rate_deldatafunc(void* d, void* ATTR_UNUSED(arg))
+{
+       struct rate_data* data = (struct rate_data*)d;
+       free(data);
+}
+
+/** find or create element in domainlimit tree */
+static struct domain_limit_data* domain_limit_findcreate(
+       struct infra_cache* infra, char* name)
+{
+       uint8_t* nm;
+       int labs;
+       size_t nmlen;
+       struct domain_limit_data* d;
+
+       /* parse name */
+       nm = sldns_str2wire_dname(name, &nmlen);
+       if(!nm) {
+               log_err("could not parse %s", name);
+               return NULL;
+       }
+       labs = dname_count_labels(nm);
+
+       /* can we find it? */
+       d = (struct domain_limit_data*)name_tree_find(&infra->domain_limits,
+               nm, nmlen, labs, LDNS_RR_CLASS_IN);
+       if(d)
+               return d;
+       
+       /* create it */
+       d = (struct domain_limit_data*)calloc(1, sizeof(*d));
+       if(!d)
+               return NULL;
+       d->node.node.key = &d->node;
+       d->node.name = nm;
+       d->node.len = nmlen;
+       d->node.labs = labs;
+       d->node.dclass = LDNS_RR_CLASS_IN;
+       d->lim = -1;
+       d->below = -1;
+       if(!name_tree_insert(&infra->domain_limits, &d->node, nm, nmlen,
+               labs, LDNS_RR_CLASS_IN)) {
+               log_err("duplicate element in domainlimit tree");
+               return NULL;
+       }
+       return d;
+}
+
+/** insert rate limit configuration into lookup tree */
+static int infra_ratelimit_cfg_insert(struct infra_cache* infra,
+       struct config_file* cfg)
+{
+       struct config_str2list* p;
+       struct domain_limit_data* d;
+       for(p = cfg->ratelimit_for_domain; p; p = p->next) {
+               d = domain_limit_findcreate(infra, p->str);
+               if(!d)
+                       return 0;
+               d->lim = atoi(p->str2);
+       }
+       for(p = cfg->ratelimit_below_domain; p; p = p->next) {
+               d = domain_limit_findcreate(infra, p->str);
+               if(!d)
+                       return 0;
+               d->below = atoi(p->str2);
+       }
+       return 1;
+}
+
 struct infra_cache* 
 infra_create(struct config_file* cfg)
 {
@@ -114,15 +220,44 @@ infra_create(struct config_file* cfg)
                return NULL;
        }
        infra->host_ttl = cfg->host_ttl;
+       name_tree_init(&infra->domain_limits);
+       infra_dp_ratelimit = cfg->ratelimit;
+       if(cfg->ratelimit != 0) {
+               infra->domain_rates = slabhash_create(cfg->ratelimit_slabs,
+                       INFRA_HOST_STARTSIZE, cfg->ratelimit_size,
+                       &rate_sizefunc, &rate_compfunc, &rate_delkeyfunc,
+                       &rate_deldatafunc, NULL);
+               if(!infra->domain_rates) {
+                       infra_delete(infra);
+                       return NULL;
+               }
+               /* insert config data into ratelimits */
+               if(!infra_ratelimit_cfg_insert(infra, cfg)) {
+                       infra_delete(infra);
+                       return NULL;
+               }
+               name_tree_init_parents(&infra->domain_limits);
+       }
        return infra;
 }
 
+/** delete domain_limit entries */
+static void domain_limit_free(rbnode_t* n, void* ATTR_UNUSED(arg))
+{
+       if(n) {
+               free(((struct domain_limit_data*)n)->node.name);
+               free(n);
+       }
+}
+
 void 
 infra_delete(struct infra_cache* infra)
 {
        if(!infra)
                return;
        slabhash_delete(infra->hosts);
+       slabhash_delete(infra->domain_rates);
+       traverse_postorder(&infra->domain_limits, domain_limit_free, NULL);
        free(infra);
 }
 
@@ -562,8 +697,180 @@ infra_get_lame_rtt(struct infra_cache* infra,
        return 1;
 }
 
+/** find the ratelimit in qps for a domain */
+static int infra_find_ratelimit(struct infra_cache* infra, uint8_t* name,
+       size_t namelen)
+{
+       int labs = dname_count_labels(name);
+       struct domain_limit_data* d = (struct domain_limit_data*)
+               name_tree_lookup(&infra->domain_limits, name, namelen, labs,
+               LDNS_RR_CLASS_IN);
+       if(!d) return infra_dp_ratelimit;
+
+       if(d->node.labs == labs && d->lim != -1)
+               return d->lim; /* exact match */
+
+       /* find 'below match' */
+       if(d->node.labs == labs)
+               d = (struct domain_limit_data*)d->node.parent;
+       while(d) {
+               if(d->below != -1)
+                       return d->below;
+               d = (struct domain_limit_data*)d->node.parent;
+       }
+       return infra_dp_ratelimit;
+}
+
+/** find data item in array, for write access, caller unlocks */
+static struct lruhash_entry* infra_find_ratedata(struct infra_cache* infra,
+       uint8_t* name, size_t namelen, int wr)
+{
+       struct rate_key key;
+       hashvalue_t h = dname_query_hash(name, 0xab);
+       memset(&key, 0, sizeof(key));
+       key.name = name;
+       key.namelen = namelen;
+       key.entry.hash = h;
+       return slabhash_lookup(infra->domain_rates, h, &key, wr);
+}
+
+/** create rate data item for name, number 1 in now */
+static void infra_create_ratedata(struct infra_cache* infra,
+       uint8_t* name, size_t namelen, time_t timenow)
+{
+       hashvalue_t h = dname_query_hash(name, 0xab);
+       struct rate_key* k = (struct rate_key*)calloc(1, sizeof(*k));
+       struct rate_data* d = (struct rate_data*)calloc(1, sizeof(*d));
+       if(!k || !d) {
+               free(k);
+               free(d);
+               return; /* alloc failure */
+       }
+       k->namelen = namelen;
+       k->name = memdup(name, namelen);
+       if(!k->name) {
+               free(k);
+               free(d);
+               return; /* alloc failure */
+       }
+       lock_rw_init(&k->entry.lock);
+       k->entry.hash = h;
+       k->entry.key = k;
+       k->entry.data = d;
+       d->qps[0] = 1;
+       d->timestamp[0] = timenow;
+       slabhash_insert(infra->domain_rates, h, &k->entry, d, NULL);
+}
+
+/** find the second and return its rate counter, if none, remove oldest */
+static int* infra_rate_find_second(void* data, time_t t)
+{
+       struct rate_data* d = (struct rate_data*)data;
+       int i, oldest;
+       for(i=0; i<RATE_WINDOW; i++) {
+               if(d->timestamp[i] == t)
+                       return &(d->qps[i]);
+       }
+       /* remove oldest timestamp, and insert it at t with 0 qps */
+       oldest = 0;
+       for(i=0; i<RATE_WINDOW; i++) {
+               if(d->timestamp[i] < d->timestamp[oldest])
+                       oldest = i;
+       }
+       d->timestamp[oldest] = t;
+       d->qps[oldest] = 0;
+       return &(d->qps[oldest]);
+}
+
+/** find the maximum rate stored, not too old. 0 if no information. */
+static int infra_rate_max(void* data, time_t now)
+{
+       struct rate_data* d = (struct rate_data*)data;
+       int i, max = 0;
+       for(i=0; i<RATE_WINDOW; i++) {
+               if(now-d->timestamp[i] <= RATE_WINDOW) {
+                       if(d->qps[i] > max)
+                               max = d->qps[i];
+               }
+       }
+       return max;
+}
+
+int infra_ratelimit_inc(struct infra_cache* infra, uint8_t* name,
+       size_t namelen, time_t timenow)
+{
+       int lim, max;
+       struct lruhash_entry* entry;
+
+       if(!infra_dp_ratelimit)
+               return 1; /* not enabled */
+
+       /* find ratelimit */
+       lim = infra_find_ratelimit(infra, name, namelen);
+       
+       /* find or insert ratedata */
+       entry = infra_find_ratedata(infra, name, namelen, 1);
+       if(entry) {
+               int premax = infra_rate_max(entry->data, timenow);
+               int* cur = infra_rate_find_second(entry->data, timenow);
+               (*cur)++;
+               max = infra_rate_max(entry->data, timenow);
+               lock_rw_unlock(&entry->lock);
+
+               if(premax < lim && max >= lim) {
+                       char buf[257];
+                       dname_str(name, buf);
+                       verbose(VERB_OPS, "ratelimit exceeded %s %d", buf, lim);
+               }
+               return (max < lim);
+       }
+
+       /* create */
+       infra_create_ratedata(infra, name, namelen, timenow);
+       return (1 < lim);
+}
+
+void infra_ratelimit_dec(struct infra_cache* infra, uint8_t* name,
+       size_t namelen, time_t timenow)
+{
+       struct lruhash_entry* entry;
+       int* cur;
+       if(!infra_dp_ratelimit)
+               return; /* not enabled */
+       entry = infra_find_ratedata(infra, name, namelen, 1);
+       if(!entry) return; /* not cached */
+       cur = infra_rate_find_second(entry->data, timenow);
+       if((*cur) > 0)
+               (*cur)--;
+       lock_rw_unlock(&entry->lock);
+}
+
+int infra_ratelimit_exceeded(struct infra_cache* infra, uint8_t* name,
+       size_t namelen, time_t timenow)
+{
+       struct lruhash_entry* entry;
+       int lim, max;
+       if(!infra_dp_ratelimit)
+               return 0; /* not enabled */
+
+       /* find ratelimit */
+       lim = infra_find_ratelimit(infra, name, namelen);
+
+       /* find current rate */
+       entry = infra_find_ratedata(infra, name, namelen, 0);
+       if(!entry)
+               return 0; /* not cached */
+       max = infra_rate_max(entry->data, timenow);
+       lock_rw_unlock(&entry->lock);
+
+       return (max >= lim);
+}
+
 size_t 
 infra_get_mem(struct infra_cache* infra)
 {
-       return sizeof(*infra) + slabhash_get_mem(infra->hosts);
+       size_t s = sizeof(*infra) + slabhash_get_mem(infra->hosts);
+       if(infra->domain_rates) s += slabhash_get_mem(infra->domain_rates);
+       /* ignore domain_limits because walk through tree is big */
+       return s;
 }

diff --git a/services/cache/infra.h b/services/cache/infra.h
index fc54f7f0df0025b7af73fa7c37bf2f8513fee311..5ebbbd9f7b5f48a9a1e5bbb62a66afd9a948df37 100644 (file)
--- a/services/cache/infra.h
+++ b/services/cache/infra.h
@@ -42,6 +42,7 @@
 #ifndef SERVICES_CACHE_INFRA_H
 #define SERVICES_CACHE_INFRA_H
 #include "util/storage/lruhash.h"
+#include "util/storage/dnstree.h"
 #include "util/rtt.h"
 struct slabhash;
 struct config_file;
@@ -108,6 +109,55 @@ struct infra_cache {
        struct slabhash* hosts;
        /** TTL value for host information, in seconds */
        int host_ttl;
+       /** hash table with query rates per name: rate_key, rate_data */
+       struct slabhash* domain_rates;
+       /** ratelimit settings for domains, struct domain_limit_data */
+       rbtree_t domain_limits;
+};
+
+/** ratelimit, unless overridden by domain_limits, 0 is off */
+extern int infra_dp_ratelimit;
+
+/**
+ * ratelimit settings for domains
+ */
+struct domain_limit_data {
+       /** key for rbtree, must be first in struct, name of domain */
+       struct name_tree_node node;
+       /** ratelimit for exact match with this name, -1 if not set */
+       int lim;
+       /** ratelimit for names below this name, -1 if not set */
+       int below;
+};
+
+/**
+ * key for ratelimit lookups, a domain name
+ */
+struct rate_key {
+       /** lruhash key entry */
+       struct lruhash_entry entry;
+       /** domain name in uncompressed wireformat */
+       uint8_t* name;
+       /** length of name */
+       size_t namelen;
+};
+
+/** number of seconds to track qps rate */
+#define RATE_WINDOW 2
+
+/**
+ * Data for ratelimits per domain name
+ * It is incremented when a non-cache-lookup happens for that domain name.
+ * The name is the delegation point we have for the name.
+ * If a new delegation point is found (a referral reply), the previous
+ * delegation point is decremented, and the new one is charged with the query.
+ */
+struct rate_data {
+       /** queries counted, for that second. 0 if not in use. */
+       int qps[RATE_WINDOW];
+       /** what the timestamp is of the qps array members, counter is
+        * valid for that timestamp.  Usually now and now-1. */
+       time_t timestamp[RATE_WINDOW];
 };
 
 /** infra host cache default hash lookup size */
@@ -286,6 +336,44 @@ long long infra_get_host_rto(struct infra_cache* infra,
        size_t namelen, struct rtt_info* rtt, int* delay, time_t timenow,
        int* tA, int* tAAAA, int* tother);
 
+/**
+ * Increment the query rate counter for a delegation point.
+ * @param infra: infra cache.
+ * @param name: zone name
+ * @param namelen: zone name length
+ * @param timenow: what time it is now.
+ * @return 1 if it could be incremented. 0 if the increment overshot the
+ * ratelimit or if in the previous second the ratelimit was exceeded.
+ * Failures like alloc failures are not returned (probably as 1).
+ */
+int infra_ratelimit_inc(struct infra_cache* infra, uint8_t* name,
+       size_t namelen, time_t timenow);
+
+/**
+ * Decrement the query rate counter for a delegation point.
+ * Because the reply received for the delegation point was pleasant,
+ * we do not charge this delegation point with it (i.e. it was a referral).
+ * Should call it with same second as when inc() was called.
+ * @param infra: infra cache.
+ * @param name: zone name
+ * @param namelen: zone name length
+ * @param timenow: what time it is now.
+ */
+void infra_ratelimit_dec(struct infra_cache* infra, uint8_t* name,
+       size_t namelen, time_t timenow);
+
+/**
+ * See if the query rate counter for a delegation point is exceeded.
+ * So, no queries are going to be allowed.
+ * @param infra: infra cache.
+ * @param name: zone name
+ * @param namelen: zone name length
+ * @param timenow: what time it is now.
+ * @return true if exceeded.
+ */
+int infra_ratelimit_exceeded(struct infra_cache* infra, uint8_t* name,
+       size_t namelen, time_t timenow);
+
 /**
  * Get memory used by the infra cache.
  * @param infra: infrastructure cache.
@@ -306,4 +394,16 @@ void infra_delkeyfunc(void* k, void* arg);
 /** delete data and destroy the lameness hashtable */
 void infra_deldatafunc(void* d, void* arg);
 
+/** calculate size for the hashtable */
+size_t rate_sizefunc(void* k, void* d);
+
+/** compare two names, returns -1, 0, or +1 */
+int rate_compfunc(void* key1, void* key2);
+
+/** delete key, and destroy the lock */
+void rate_delkeyfunc(void* k, void* arg);
+
+/** delete data */
+void rate_deldatafunc(void* d, void* arg);
+
 #endif /* SERVICES_CACHE_INFRA_H */

diff --git a/util/config_file.c b/util/config_file.c
index 9c6b43cab2d86e23b3038943a051268421dc36c1..b402f0ef6fabef7bca3823ef5922455cf318a279 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -56,6 +56,7 @@
 #include "util/fptr_wlist.h"
 #include "util/data/dname.h"
 #include "util/rtt.h"
+#include "services/cache/infra.h"
 #include "sldns/wire2str.h"
 #include "sldns/parseutil.h"
 #ifdef HAVE_GLOB_H
@@ -228,6 +229,11 @@ config_create(void)
        if(!(cfg->dnstap_socket_path = strdup(DNSTAP_SOCKET_PATH)))
                goto error_exit;
 #endif
+       cfg->ratelimit = 0;
+       cfg->ratelimit_slabs = 4;
+       cfg->ratelimit_size = 4*1024*1024;
+       cfg->ratelimit_for_domain = NULL;
+       cfg->ratelimit_below_domain = NULL;
        return cfg;
 error_exit:
        config_delete(cfg); 
@@ -448,6 +454,12 @@ int config_set_option(struct config_file* cfg, const char* opt,
        else S_STR("control-cert-file:", control_cert_file)
        else S_STR("module-config:", module_conf)
        else S_STR("python-script:", python_script)
+       else if(strcmp(opt, "ratelimit:") == 0) {
+           IS_NUMBER_OR_ZERO; cfg->ratelimit = atoi(val);
+           infra_dp_ratelimit=cfg->ratelimit;
+       }
+       else S_MEMSIZE("ratelimit-size:", ratelimit_size)
+       else S_POW2("ratelimit-slabs:", ratelimit_slabs)
        /* val_sig_skew_min and max are copied into val_env during init,
         * so this does not update val_env with set_option */
        else if(strcmp(opt, "val-sig-skew-min:") == 0)
@@ -470,7 +482,8 @@ int config_set_option(struct config_file* cfg, const char* opt,
                 * interface, outgoing-interface, access-control, 
                 * stub-zone, name, stub-addr, stub-host, stub-prime
                 * forward-first, stub-first,
-                * forward-zone, name, forward-addr, forward-host */
+                * forward-zone, name, forward-addr, forward-host,
+                * ratelimit-for-domain, ratelimit-below-domain */
                return 0;
        }
        return 1;
@@ -710,6 +723,11 @@ config_get_option(struct config_file* cfg, const char* opt,
        else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones)
        else O_DEC(opt, "max-udp-size", max_udp_size)
        else O_STR(opt, "python-script", python_script)
+       else O_DEC(opt, "ratelimit", ratelimit)
+       else O_MEM(opt, "ratelimit-size", ratelimit_size)
+       else O_DEC(opt, "ratelimit-slabs", ratelimit_slabs)
+       else O_LS2(opt, "ratelimit-for-domain", ratelimit_for_domain)
+       else O_LS2(opt, "ratelimit-below-domain", ratelimit_below_domain)
        else O_DEC(opt, "val-sig-skew-min", val_sig_skew_min)
        else O_DEC(opt, "val-sig-skew-max", val_sig_skew_max)
        /* not here:
@@ -919,6 +937,8 @@ config_delete(struct config_file* cfg)
        free(cfg->dnstap_socket_path);
        free(cfg->dnstap_identity);
        free(cfg->dnstap_version);
+       config_deldblstrlist(cfg->ratelimit_for_domain);
+       config_deldblstrlist(cfg->ratelimit_below_domain);
        free(cfg);
 }
 

diff --git a/util/config_file.h b/util/config_file.h
index a3479b28fba3b7e119a570e4f3cafb812e4f810a..9e9dabcabed432abb10bb5affade14e0d53af0f3 100644 (file)
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -345,6 +345,17 @@ struct config_file {
        int dnstap_log_forwarder_query_messages;
        /** true to log dnstap FORWARDER_RESPONSE message events */
        int dnstap_log_forwarder_response_messages;
+
+       /** ratelimit 0 is off, otherwise qps (unless overridden) */
+       int ratelimit;
+       /** number of slabs for ratelimit cache */
+       size_t ratelimit_slabs;
+       /** memory size in bytes for ratelimit cache */
+       size_t ratelimit_size;
+       /* ratelimits for domain (exact match) */
+       struct config_str2list* ratelimit_for_domain;
+       /* ratelimits below domain */
+       struct config_str2list* ratelimit_below_domain;
 };
 
 /** from cfg username, after daemonise setup performed */

diff --git a/util/configlexer.c b/util/configlexer.c
index fcade1ac326ef6df573aa4cbd78c9c30acf7d231..57e85feac9398e10fc3ec60a6328f2792dcd09d1 100644 (file)
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -363,8 +363,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 166
-#define YY_END_OF_BUFFER 167
+#define YY_NUM_RULES 171
+#define YY_END_OF_BUFFER 172
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -372,190 +372,195 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[1655] =
+static yyconst flex_int16_t yy_accept[1699] =
     {   0,
-        1,    1,  148,  148,  152,  152,  156,  156,  160,  160,
-        1,    1,  167,  164,    1,  146,  146,  165,    2,  165,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  148,
-      149,  149,  150,  165,  152,  153,  153,  154,  165,  159,
-      156,  157,  157,  158,  165,  160,  161,  161,  162,  165,
-      163,  147,    2,  151,  165,  163,  164,    0,    1,    2,
-        2,    2,    2,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  148,    0,  152,    0,  159,    0,  156,  160,
-        0,  163,    0,    2,    2,  163,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  163,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  163,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,   68,  164,  164,
-      164,  164,  164,    6,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  163,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  163,  164,  164,  164,  164,   30,
-      164,  164,  164,  164,  164,  164,  164,  164,  133,  164,
-       12,   13,  164,   15,   14,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  126,  164,  164,  164,  164,  164,    3,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      163,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  155,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-       33,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-       34,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,   83,
-      155,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,   82,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,   66,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,   20,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,   31,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-       32,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,   22,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,   26,  164,   27,  164,
-      164,  164,   69,  164,   70,  164,   67,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,    5,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,   85,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-       23,  164,  164,  164,  164,  164,  110,  109,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,   35,  164,  164,
-      164,  164,  164,  164,  164,  164,   72,   71,  164,  164,
-      164,  164,  164,  164,  164,  106,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,   52,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,   56,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  108,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,    4,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  103,  164,  164,  164,  164,  164,  164,  164,  119,
-      164,  104,  164,  131,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,   21,  164,  164,  164,  164,   74,
-      164,   75,   73,  164,  164,  164,  164,  164,  164,  164,
-       81,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  105,  164,  164,  164,  164,  130,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,   65,
-      164,  164,  164,  164,  164,  164,  164,  164,   28,  164,
-      164,   17,  164,  164,  164,   16,  164,   90,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,   42,   43,  164,  164,  164,  164,  164,  164,  164,
-      134,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,   76,  164,  164,  164,  164,  164,
-      164,   80,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,   84,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      125,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,   94,  164,   98,
-      164,  164,  164,  164,   79,  164,  164,  117,  164,  164,
-      164,  164,  132,  164,  164,  164,  164,  164,  164,  164,
-      139,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,   97,  164,  164,  164,  164,  164,   44,   45,
-      164,   29,   51,   99,  164,  111,  107,  164,  164,   38,
-      164,  101,  164,  164,  164,  164,  164,    7,  164,   64,
-      116,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,   86,  138,  164,
-      164,  164,  164,  164,  164,  164,  164,  127,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  100,  164,   37,   39,  164,  164,  164,  164,
-      164,   63,  164,  164,  164,  164,  121,   18,   19,  164,
-      164,  164,  164,  164,  164,  164,   61,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  123,  120,  164,  164,
-      164,  164,  164,  164,  164,  164,   36,  164,  164,  164,
-      164,  164,  164,  164,   11,  164,  164,  164,  164,  164,
-      164,  164,  164,   10,  164,  164,   40,  164,  129,  122,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,   93,   92,  164,  124,  118,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,   46,  164,  128,  164,  164,  164,
-      164,   41,  164,  164,  164,   87,   89,  112,  164,  164,
-      164,   91,  164,  164,  164,  164,  164,  164,  164,  164,
-      135,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,   24,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  137,  164,  164,  115,  164,  164,  164,  164,  164,
-
-      164,  164,   49,  164,   25,  164,    9,  164,  164,  113,
-       53,  164,  164,  164,   96,  164,  164,  164,  164,  164,
-      164,  136,   77,  164,  164,  164,  164,   55,   59,   54,
-      164,   47,  164,    8,  164,  164,   95,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,   60,   58,  164,   48,
-      164,  114,  164,  164,   88,  164,  164,  164,  164,  164,
-      164,   78,   57,   50,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-       62,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  102,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  142,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  140,  164,  143,  144,  164,  164,  164,  164,
-      164,  141,  145,    0
+        1,    1,  153,  153,  157,  157,  161,  161,  165,  165,
+        1,    1,  172,  169,    1,  151,  151,  170,    2,  170,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  153,
+      154,  154,  155,  170,  157,  158,  158,  159,  170,  164,
+      161,  162,  162,  163,  170,  165,  166,  166,  167,  170,
+      168,  152,    2,  156,  170,  168,  169,    0,    1,    2,
+        2,    2,    2,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  153,    0,  157,    0,  164,    0,  161,
+      165,    0,  168,    0,    2,    2,  168,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  168,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  168,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+       68,  169,  169,  169,  169,  169,    6,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      168,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  168,
+      169,  169,  169,  169,   30,  169,  169,  169,  169,  169,
+      169,  169,  169,  133,  169,   12,   13,  169,   15,   14,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  126,  169,
+
+      169,  169,  169,  169,  169,    3,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  168,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  160,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,   33,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,   34,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,   83,  160,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,   82,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,   66,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,   20,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,   31,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,   32,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,   22,  169,  169,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  146,
+      169,  169,  169,  169,  169,  169,   26,  169,   27,  169,
+      169,  169,   69,  169,   70,  169,   67,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,    5,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,   85,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+
+       23,  169,  169,  169,  169,  169,  110,  109,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+       35,  169,  169,  169,  169,  169,  169,  169,  169,   72,
+       71,  169,  169,  169,  169,  169,  169,  169,  106,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,   52,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,   56,  169,  169,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      108,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+        4,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  103,  169,
+      169,  169,  169,  169,  169,  169,  119,  169,  104,  169,
+      131,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,   21,  169,  169,  169,  169,   74,  169,   75,   73,
+      169,  169,  169,  169,  169,  169,  169,   81,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  105,
+      169,  169,  169,  169,  130,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,   65,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,   28,
+      169,  169,   17,  169,  169,  169,   16,  169,   90,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,   42,   43,  169,  169,  169,  169,  169,  169,
+      169,  134,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,   76,  169,  169,  169,  169,
+      169,  169,   80,  169,  169,  169,  169,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,   84,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  125,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,   94,  169,   98,  169,  169,  169,  169,   79,
+      169,  169,  117,  169,  169,  169,  169,  132,  169,  169,
+      169,  169,  169,  169,  169,  139,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,   97,  169,  169,
+      169,  169,  169,   44,   45,  169,   29,   51,   99,  169,
+      111,  107,  169,  169,   38,  169,  101,  169,  169,  169,
+
+      169,  169,    7,  169,   64,  169,  169,  148,  169,  116,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,   86,  138,  169,  169,
+      169,  169,  169,  169,  169,  169,  127,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  100,  169,   37,   39,  169,  169,  169,  169,  169,
+       63,  169,  169,  147,  169,  169,  169,  169,  121,   18,
+       19,  169,  169,  169,  169,  169,  169,  169,   61,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  123,  120,
+
+      169,  169,  169,  169,  169,  169,  169,  169,   36,  169,
+      169,  169,  169,  169,  169,  169,   11,  169,  169,  169,
+      169,  169,  169,  169,  169,   10,  169,  169,  169,  169,
+       40,  169,  129,  122,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,   93,   92,  169,  124,  118,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,   46,  169,
+      128,  169,  169,  169,  169,  169,  169,   41,  169,  169,
+      169,   87,   89,  112,  169,  169,  169,   91,  169,  169,
+      169,  169,  169,  169,  169,  169,  135,  169,  169,  169,
+
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,   24,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  137,
+      169,  169,  115,  169,  169,  169,  169,  169,  169,  169,
+       49,  169,   25,  169,    9,  169,  169,  169,  169,  113,
+       53,  169,  169,  169,   96,  169,  169,  169,  169,  169,
+      169,  136,   77,  169,  169,  169,  169,   55,   59,   54,
+      169,   47,  169,    8,  169,  149,  169,  169,   95,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,   60,   58,
+      169,   48,  169,  169,  114,  169,  169,   88,  169,  169,
+
+      169,  169,  169,  169,   78,   57,   50,  150,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,   62,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  102,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  142,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  140,  169,  143,  144,
+      169,  169,  169,  169,  169,  141,  145,    0
+
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -598,750 +603,772 @@ static yyconst flex_int32_t yy_meta[40] =
         1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[1669] =
+static yyconst flex_int16_t yy_base[1713] =
     {   0,
         0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 2501, 2145,   50, 3281, 3281, 3281,  129,   94,
+       87,  108, 3005, 2883,   50, 3371, 3371, 3371,  129,   94,
        70,  104,  130,   90,   92,  115,  127,   95,   84,  111,
-      137,  148,   50,  150,  155,  157,  163,  171,  178, 2001,
-     3281, 3281, 3281,   70, 1900, 3281, 3281, 3281,   42, 1856,
-     1448, 3281, 3281, 3281,  195, 1202, 3281, 3281, 3281,  141,
-     1174, 3281,  202, 3281,  206,  122, 1044,  212,  120,    0,
-      223,    0,    0,  103,  147,  154,  158,  192,  199,  207,
-      208,  205,  209,  221,  218,  220,  224,  225,  229,  230,
-      231,  238,  251,  236,  247,  250,  237,  248,  256,  259,
-
-      167,  263,  254,  249,  264,  265,  271,  273,  274,  125,
-      275,  277,  284,  278,  281,  285,  288,  286,  289,  292,
-      296,  298, 1016,  308,  746,  315,  650,  326,  474,  368,
-      319,  301,  330,  334,    0,  327,  331,  337,  314,  305,
-      333,  335,  343,  340,  346,  349,  370,  350,  339,  352,
-       49,  356,  354,  353,  361,  363,  362,  366,  372,  365,
-      377,  386,  382,  394,  401,  388,  387,  403,  399,  407,
-      410,  406,  182,  395,  411,  342,  412,  409,  414,  416,
-      418,  419,  427,  423,  426,  425,  435,  429,  433,  441,
-      436,  444,  447,  446,  450,  451,  457,  455,  453,  456,
-
-      462,  461,  464,  471,  476,  477,  479,  465,  475,  482,
-      483,  484,  494,  488,  491,  495,  501,  497,  498,  499,
-      505,  503,  506,  507,  508,  509,  515,  519,  513,  512,
-      514,  527,  528,  530,  531,  536,  537,  538,  539,  543,
-      545,  546,  549,  547,  553,  561,  557,  559,  560,  566,
-      567,  569,  575,  571,  568,  572,  579,  581,  582,  584,
-      602,  591,  587,  590,  574,  597,  599,  608,  600,  607,
-      609,  615,  613,  623,  630,  626,  627,  631,  634,  635,
-      636,  639,  638,  641,  643,  644,  646,  647,  657,  659,
-      660,  670,  666,  667,  648,  673,  664,  674,  681,  679,
-
-      680,  682,  683,  684,  686,  688,  692, 3281,  695,  690,
-      697,  698,  701, 3281,  699,  702,  703,  710,  704,  721,
-      706,  708,  714,  723,  718,  720,  726,  728,  748,  731,
-      729,  739,  737,  732,  757,  736,  759,  738,  743,  750,
-      762,  741,  766,  767,  768,  769,  773,  775,  778,  779,
-      772,  783,  780,  786,  788,  789,  793,  794,  800,  801,
-      803,  806,  812,  809,  816,  822,  811,  818,  820,  826,
-      825,  828,  819,  835,  831,  827,  834,  843,  838,  840,
-      850,  848,  849,  847,  853,  855,  859,  860,  862,  866,
-      863,  867,  872,  877,  865,  871,  879,  878,  886,  893,
-
-      894,  887,  895,  902,  903,  880,  904,  890,  900,  907,
-      909,  910,  911,  912,  915,  916,  922,  919,  923,  921,
-      928,  930,  932,  934,  936,  937,  940,  943,  941,  942,
-      951,  952,  954,  956,  955,  958,  962,  957,  964, 3281,
-      972,  971,  968,  974,  976,  977,  979, 1005, 3281,  981,
-     3281, 3281,  982, 3281, 3281,  985,  983,  986,  993, 1028,
-      997,  991,  987,  998, 1007, 1008, 1018, 1011, 1020, 1000,
-     1031, 1022, 1013, 1023, 1037, 1038, 1034, 1025, 1048, 1051,
-     1057, 1059, 1055, 1056, 1060, 1061, 1063, 1065, 1064, 1067,
-     1072, 1078, 1074, 3281, 1076, 1075, 1082, 1077, 1084, 3281,
-
-     1085, 1086, 1088, 1090, 1094, 1097, 1096, 1098, 1100, 1101,
-     1099, 1107, 1113, 1103, 1111, 1127, 1129, 1126, 1112, 1128,
-     1132, 1114, 1133, 1141, 1139, 1138, 1144, 1148, 1145, 1147,
-     1150, 1151, 1154, 1152, 1153, 1155, 1178, 1159, 1160, 1161,
-     1164, 1162, 1168, 1170, 1172, 1173, 1180, 1191, 1190, 1192,
-     1193, 1197, 1205, 1208, 1198, 1201, 1211, 1212, 1217, 1215,
-     1219, 1221, 1222, 1229, 1226, 3281, 1236, 1237, 1223, 1232,
-     1233, 1239, 1243, 1244, 1246, 1247, 1248, 1249, 1251, 1255,
-     3281, 1254, 1256, 1257, 1261, 1262, 1264, 1270, 1275, 1282,
-     3281, 1285, 1286, 1278, 1283, 1271, 1289, 1288, 1294, 1295,
-
-     1296, 1297, 1301, 1304, 1305, 1293, 1312, 1306, 1308, 1310,
-     1316, 1317, 1318, 1319, 1325, 1104, 1320, 1326, 1336, 1333,
-     1335, 1338, 1339, 1340, 1345, 1342, 1346, 1343, 1344, 3281,
-      239, 1347, 1349, 1350, 1356, 1359, 1358, 1365, 1366, 1367,
-     1368, 1371, 1373, 1374, 1376, 1377, 1378, 1381, 1385, 1382,
-     1389, 1391, 1394, 1392, 1398, 1399, 1400, 1403, 1402, 1409,
-     1406, 1411, 1412, 1416, 1417, 1414, 1418, 1420, 1422, 1425,
-     1424, 1432, 3281, 1435, 1431, 1434, 1436, 1443, 1451, 1447,
-     1452, 1449, 1454, 1460, 1457, 1459, 1465, 1467, 1469, 1471,
-     1461, 1472, 1479, 1482, 1480, 1483, 1484, 1481, 3281, 1491,
-
-     1473, 1486, 1489, 1494, 1497, 1496, 1499, 1501, 1507, 1508,
-     1512, 3281, 1515, 1509, 1516, 1520, 1521, 1525, 1522, 1529,
-     1530, 1531, 1532, 1533, 1542, 1534, 1539, 1537, 3281, 1551,
-     1553, 1549, 1560, 1547, 1557, 1558, 1562, 1559, 1563, 1570,
-     1564, 1567, 1571, 1572, 1568, 1566, 1574, 1575, 1577, 1578,
-     3281, 1595, 1593, 1596, 1597, 1598, 1606, 1581, 1603, 1605,
-     1582, 1607, 1610, 1609, 1611, 1613, 1616, 1618, 1619, 1620,
-     1621, 1622, 1623, 1632, 1638, 1626, 1640, 1630, 1642, 1629,
-     1646, 1652, 1658, 1654, 3281, 1657, 1659, 1660, 1661, 1662,
-     1668, 1670, 1664, 1666, 1671, 1672, 1673, 1687, 1674, 1676,
-
-     1680, 1684, 1678, 1686, 1689, 1700, 1705, 1690, 1696, 1702,
-     1688, 1713, 1714, 1716, 1698, 1722, 3281, 1706, 3281, 1721,
-     1727, 1730, 3281, 1732, 3281, 1734, 3281, 1735, 1736, 1729,
-     1715, 1739, 1741, 1742, 1748, 1723, 1749, 1745, 1751, 1752,
-     1754, 1755, 3281, 1758, 1761, 1763, 1759, 1765, 1766, 1768,
-     1769, 1777, 1771, 1783, 1780, 1782, 1784, 3281, 1787, 1788,
-     1792, 1793, 1796, 1800, 1798, 1797, 1805, 1801, 1809, 1820,
-     1807, 1816, 1817, 1818, 1819, 1827, 1821, 1823, 1830, 1832,
-     1825, 1831, 1833, 1835, 1840, 1841, 1847, 1839, 1845, 1846,
-     3281, 1850, 1848, 1857, 1860, 1858, 3281, 3281, 1862, 1868,
-
-     1870, 1866, 1876, 1873, 1877, 1878, 1884, 1881, 1883, 1888,
-     1890, 1891, 1893, 1894, 1895, 1897, 1898, 3281, 1904, 1902,
-     1911, 1909, 1907, 1919, 1910, 1921, 3281, 3281, 1917, 1922,
-     1926, 1928, 1934, 1932, 1931, 3281, 1933, 1936, 1937, 1938,
-     1941, 1945, 1939, 1950, 1952, 1955, 1956, 1958, 1964, 1960,
-     1957, 1961, 1974, 1963, 1977, 3281, 1971, 1979, 1981, 1982,
-     1983, 1984, 1985, 1986, 1988, 1989, 1990, 1995, 2003, 1999,
-     2002, 2004, 2007, 2008, 2012, 2014, 2015, 2022, 2023, 3281,
-     2030, 2016, 2032, 2018, 2036, 2037, 2044, 2033, 2029, 2031,
-     2040, 2041, 2042, 2054, 2048, 2056, 2050, 3281, 2058, 2062,
-
-     2064, 2059, 2068, 2065, 2071, 2069, 2073, 3281, 2075, 2081,
-     2078, 2083, 2085, 2082, 2088, 2086, 2092, 2093, 2094, 2096,
-     2099, 2101, 2103, 2105, 2110, 2111, 2118, 2116, 2122, 2128,
-     2120, 2124, 2132, 2126, 2129, 2130, 2134, 2140, 2139, 2148,
-     2137, 3281, 2141, 2151, 2153, 2154, 2157, 2158, 2147, 3281,
-     2163, 3281, 2155, 3281, 2165, 2170, 2166, 2171, 2172, 2173,
-     2174, 2176, 2184, 2175, 3281, 2182, 2185, 2187, 2188, 3281,
-     2199, 3281, 3281, 2191, 2193, 2200, 2201, 2204, 2208, 2212,
-     3281, 2202, 2213, 2214, 2216, 2217, 2219, 2220, 2222, 2221,
-     2223, 2224, 3281, 2230, 2226, 2227, 2237, 3281, 2239, 2241,
-
-     2229, 2242, 2248, 2249, 2251, 2252, 2257, 2263, 2259, 3281,
-     2260, 2261, 2266, 2262, 2269, 2271, 2267, 2268, 3281, 2282,
-     2283, 3281, 2272, 2284, 2286, 3281, 2289, 3281, 2290, 2291,
-     2292, 2294, 2298, 2299, 2301, 2293, 2305, 2310, 2307, 2314,
-     2311, 3281, 3281, 2316, 2322, 2323, 2318, 2326, 2327, 2329,
-     3281, 2331, 2333, 2334, 2335, 2336, 2337, 2342, 2340, 2343,
-     2345, 2346, 2348, 2349, 3281, 2352, 2353, 2354, 2359, 2364,
-     2361, 3281, 2363, 2366, 2365, 2367, 2370, 2371, 2385, 2387,
-     2379, 2389, 2391, 2394, 2395, 2397, 2399, 2400, 3281, 2401,
-     2403, 2404, 2408, 2409, 2405, 2410, 2415, 2418, 2420, 2422,
-
-     3281, 2425, 2412, 2428, 2426, 2430, 2432, 2433, 2434, 2436,
-     2440, 2441, 2443, 2444, 2446, 2454, 2451, 3281, 2448, 3281,
-     2450, 2461, 2469, 2465, 3281, 2463, 2467, 3281, 2470, 2471,
-     2472, 2481, 3281, 2483, 2475, 2484, 2486, 2477, 2487, 2493,
-     3281, 2495, 2497, 2502, 2503, 2490, 2504, 2505, 2496, 2507,
-     2519, 2511, 3281, 2513, 2515, 2526, 2522, 2523, 3281, 3281,
-     2527, 3281, 3281, 3281, 2532, 3281, 3281, 2533, 2535, 3281,
-     2537, 3281, 2544, 2540, 2542, 2524, 2543, 3281, 2550, 3281,
-     3281, 2547, 2551, 2545, 2555, 2557, 2562, 2564, 2554, 2565,
-     2567, 2568, 2569, 2570, 2571, 2573, 2576, 2574, 2577, 2582,
-
-     2578, 2584, 2586, 2587, 2588, 2590, 2606, 3281, 3281, 2594,
-     2599, 2596, 2601, 2603, 2607, 2608, 2609, 3281, 2616, 2611,
-     2622, 2613, 2619, 2623, 2624, 2625, 2631, 2638, 2632, 2634,
-     2635, 2636, 3281, 2639, 3281, 3281, 2642, 2643, 2648, 2645,
-     2651, 3281, 2653, 2655, 2664, 2666, 3281, 3281, 3281, 2667,
-     2657, 2661, 2671, 2672, 2659, 2673, 3281, 2675, 2680, 2682,
-     2683, 2689, 2692, 2699, 2696, 2701, 3281, 3281, 2702, 2703,
-     2704, 2684, 2705, 2706, 2708, 2710, 3281, 2712, 2711, 2717,
-     2716, 2718, 2723, 2719, 3281, 2721, 2726, 2731, 2733, 2734,
-     2736, 2737, 2739, 3281, 2738, 2741, 3281, 2749, 3281, 3281,
-
-     2742, 2751, 2753, 2758, 2760, 2764, 2755, 2761, 2770, 2767,
-     2768, 3281, 3281, 2771, 3281, 3281, 2769, 2774, 2776, 2778,
-     2781, 2783, 2780, 2784, 2785, 2788, 2790, 2793, 2796, 2797,
-     2800, 2802, 2803, 2805, 3281, 2807, 3281, 2806, 2813, 2814,
-     2819, 3281, 2820, 2815, 2808, 3281, 3281, 3281, 2816, 2830,
-     2832, 3281, 2834, 2835, 2822, 2837, 2836, 2845, 2838, 2847,
-     3281, 2848, 2849, 2851, 2852, 2853, 2855, 2857, 2858, 2860,
-     2859, 2869, 2861, 2873, 2870, 3281, 2878, 2874, 2879, 2882,
-     2884, 2886, 2887, 2888, 2890, 2891, 2892, 2893, 2900, 2896,
-     2907, 3281, 2910, 2898, 3281, 2911, 2904, 2915, 2922, 2924,
-
-     2926, 2927, 3281, 2929, 3281, 2930, 3281, 2934, 2935, 3281,
-     3281, 2936, 2938, 2941, 3281, 2942, 2939, 2943, 2945, 2948,
-     2949, 3281, 3281, 2950, 2952, 2956, 2960, 3281, 3281, 3281,
-     2966, 3281, 2967, 3281, 2973, 2953, 3281, 2958, 2975, 2961,
-     2977, 2978, 2979, 2980, 2981, 2983, 3281, 3281, 2988, 3281,
-     2990, 3281, 2991, 2993, 3281, 3001, 2995, 2997, 2998, 3004,
-     3005, 3281, 3281, 3281, 3006, 3007, 3011, 3012, 3008, 3013,
-     3014, 3015, 3019, 3016, 3023, 3032, 3020, 3033, 3040, 3036,
-     3281, 3034, 3038, 3046, 3047, 3044, 3043, 3051, 3052, 3053,
-     3054, 3055, 3059, 3060, 3064, 3061, 3062, 3071, 3074, 3077,
-
-     3073, 3086, 3084, 3087, 3085, 3088, 3095, 3089, 3093, 3281,
-     3091, 3097, 3098, 3099, 3100, 3105, 3102, 3113, 3118, 3115,
-     3122, 3109, 3124, 3125, 3126, 3111, 3131, 3127, 3281, 3134,
-     3135, 3137, 3138, 3141, 3143, 3144, 3147, 3150, 3145, 3154,
-     3159, 3160, 3281, 3161, 3281, 3281, 3164, 3151, 3155, 3172,
-     3176, 3281, 3281, 3281, 3189, 3196, 3203, 3210, 3217,   94,
-     3224, 3231, 3238, 3245, 3252, 3259, 3266, 3273
+      137,  148,   50,  150,  161,  158,  154,  167,  182, 2745,
+     3371, 3371, 3371,   70, 2207, 3371, 3371, 3371,   42, 2179,
+     2055, 3371, 3371, 3371,  199, 1990, 3371, 3371, 3371,  141,
+     1867, 3371,  203, 3371,  207,  122, 1593,  213,  120,    0,
+      224,    0,    0,  103,  147,  140,  171,  208,  170,  209,
+      210,  189,  200,  222,  206,  214,  225,  227,  229,  180,
+      230,  236,  237,  231,  241,  248,  238,  240,  249,  252,
+
+      247,  257,  258,  261,  263,  265,  268,  269,  270,  272,
+      276,  274,  278,  280,  282,  286,  279,  284,  288,  299,
+      298,  292,  295, 1273,  314, 1186,  317, 1122,  323, 1009,
+      887,  327,  164,  332,  336,    0,  329,  333,  339,  316,
+      302,  320,  337,  345,  342,  348,  351,  372,  352,  341,
+      350,   49,  354,  356,  359,  362,  363,  364,  365,  367,
+      369,  374,  384,  394,  385,  388,  396,  397,  403,  399,
+      406,  407,  408,  410,  400,  411,  344,  413,  409,  412,
+      419,  423,  422,  424,  430,  426,  429,  433,  437,  434,
+      435,  448,  441,  450,  452,  451,  438,  456,  460,  461,
+
+      458,  462,  467,  465,  469,  476,  481,  482,  484,  470,
+      474,  488,  492,  493,  499,  487,  497,  495,  508,  504,
+      505,  506,  507,  509,  511,  512,  513,  514,  522,  515,
+      521,  519,  525,  528,  530,  532,  535,  541,  542,  546,
+      547,  548,  551,  553,  554,  552,  556,  559,  565,  561,
+      564,  570,  571,  572,  574,  582,  584,  576,  578,  580,
+      586,  587,  594,  609,  592,  596,  599,  603,  601,  610,
+      618,  614,  602,  604,  631,  615,  627,  637,  629,  633,
+      642,  636,  643,  644,  647,  646,  649,  650,  651,  654,
+      655,  652,  658,  666,  672,  671,  669,  678,  680,  670,
+
+      681,  689,  674,  687,  686,  688,  690,  694,  693,  700,
+     3371,  702,  697,  704,  706,  705, 3371,  707,  708,  709,
+      710,  711,  713,  725,  722,  724,  726,  729,  730,  731,
+      732,  734,  754,  737,  735,  744,  738,  743,  758,  742,
+      764,  756,  761,  766,  750,  752,  772,  775,  768,  776,
+      778,  788,  785,  786,  779,  790,  793,  794,  795,  796,
+      799,  800,  808,  801,  810,  813,  820,  818,  822,  828,
+      824,  825,  827,  834,  832,  833,  826,  840,  837,  839,
+      844,  848,  841,  843,  855,  851,  858,  862,  863,  854,
+      864,  865,  870,  876,  872,  874,  880,  879,  873,  875,
+
+      885,  892,  893,  901,  886,  902,  894,  904,  910,  906,
+      911,  912,  913,  915,  916,  917,  919,  918,  921,  920,
+      924,  934,  925,  940,  928,  468,  942,  943,  926,  948,
+      946,  949,  950,  951,  955,  952,  958,  962,  963,  964,
+      972,  974,  966,  967, 3371,  984,  981,  980,  973,  982,
+      983,  986, 1012, 3371,  988, 3371, 3371,  989, 3371, 3371,
+      993,  994,  995, 1009, 1035, 1005,  996,  997, 1013, 1008,
+     1018, 1019, 1015, 1026, 1029, 1023, 1033, 1038, 1040, 1041,
+     1043, 1045, 1046, 1050, 1057, 1066, 1067, 1048, 1063, 1065,
+     1068, 1070, 1072, 1071, 1075, 1079, 1085, 1081, 3371, 1082,
+
+     1083, 1084, 1089, 1092, 1093, 3371, 1094, 1097, 1095, 1099,
+     1101, 1105, 1103, 1106, 1108, 1109, 1111, 1113, 1118, 1114,
+     1117, 1135, 1137, 1129, 1121, 1136, 1138, 1139, 1141, 1149,
+     1147, 1145, 1146, 1156, 1152, 1154, 1158, 1155, 1161, 1162,
+     1164, 1166, 1189, 1167, 1168, 1174, 1169, 1173, 1176, 1177,
+     1175, 1182, 1196, 1202, 1195, 1185, 1203, 1187, 1213, 1214,
+     1204, 1218, 1212, 1219, 1224, 1227, 1221, 1228, 1230, 1234,
+     1235, 3371, 1241, 1243, 1237, 1238, 1245, 1244, 1248, 1252,
+     1247, 1253, 1254, 1255, 1259, 1262, 3371, 1260, 1265, 1267,
+     1270, 1271, 1272, 1278, 1280, 1289, 3371, 1291, 1292, 1285,
+
+     1294, 1295, 1297, 1298, 1299, 1300, 1302, 1303, 1306, 1312,
+     1316, 1304, 1308, 1321, 1311, 1319, 1323, 1327, 1325, 1328,
+     1331, 1332, 1334, 1336, 1342, 1344, 1341, 1347, 1350, 1351,
+     1352, 1357, 1354, 1358, 1355, 1359, 3371,  125, 1361, 1362,
+     1360, 1368, 1371, 1373, 1376, 1379, 1381, 1370, 1382, 1383,
+     1387, 1389, 1391, 1394, 1392, 1395, 1397, 1403, 1399, 1404,
+     1405, 1408, 1411, 1414, 1415, 1418, 1421, 1419, 1424, 1426,
+     1422, 1430, 1427, 1431, 1432, 1434, 1436, 1435, 1438, 3371,
+     1448, 1444, 1445, 1449, 1454, 1461, 1457, 1462, 1464, 1465,
+     1471, 1467, 1470, 1473, 1479, 1472, 1482, 1483, 1484, 1490,
+
+     1491, 1488, 1492, 1489, 1495, 3371, 1500, 1494, 1499, 1513,
+     1501, 1510, 1511, 1514, 1516, 1518, 1521, 1522, 1524, 3371,
+     1527, 1526, 1525, 1533, 1535, 1539, 1536, 1546, 1540, 1542,
+     1548, 1549, 1550, 1552, 1553, 1557, 3371, 1563, 1566, 1562,
+     1573, 1565, 1569, 1571, 1576, 1572, 1577, 1583, 1579, 1581,
+     1580, 1584, 1586, 1587, 1589, 1590, 1591, 1597, 3371, 1609,
+     1594, 1605, 1615, 1596, 1616, 1618, 1619, 1620, 1621, 1623,
+     1624, 1625, 1626, 1627, 1632, 1633, 1628, 1634, 1636, 1635,
+     1640, 1637, 1648, 1638, 1655, 1657, 1659, 1658, 1661, 1667,
+     1668, 1669, 3371, 1674, 1660, 1671, 1675, 1677, 1685, 1682,
+
+     1683, 1686, 1687, 1688, 1691, 1695, 1692, 1693, 1698, 1699,
+     1694, 1700, 1701, 1703, 1709, 1706, 1715, 1720, 1724, 3371,
+     1719, 1723, 1727, 1731, 1725, 1738, 3371, 1734, 3371, 1736,
+     1746, 1742, 3371, 1749, 3371, 1751, 3371, 1753, 1754, 1744,
+     1740, 1757, 1758, 1760, 1762, 1764, 1766, 1768, 1769, 1770,
+     1772, 1773, 3371, 1776, 1779, 1781, 1777, 1783, 1785, 1786,
+     1787, 1800, 1789, 1801, 1798, 1807, 1802, 3371, 1799, 1810,
+     1804, 1813, 1814, 1824, 1821, 1818, 1825, 1815, 1828, 1834,
+     1835, 1837, 1822, 1838, 1839, 1847, 1843, 1845, 1849, 1846,
+     1852, 1853, 1854, 1857, 1856, 1859, 1865, 1861, 1862, 1863,
+
+     3371, 1864, 1875, 1876, 1877, 1878, 3371, 3371, 1880, 1885,
+     1887, 1891, 1893, 1895, 1896, 1897, 1903, 1900, 1901, 1904,
+     1909, 1910, 1911, 1912, 1915, 1913, 1918, 1919, 1926, 1922,
+     3371, 1925, 1928, 1937, 1933, 1931, 1947, 1941, 1949, 3371,
+     3371, 1945, 1943, 1944, 1948, 1955, 1957, 1959, 3371, 1960,
+     1961, 1963, 1964, 1966, 1970, 1972, 1974, 1976, 1978, 1981,
+     1982, 1988, 1984, 1985, 1991, 1987, 1998, 2000, 3371, 2002,
+     2005, 2006, 2007, 2008, 2009, 2010, 2014, 2013, 2016, 2015,
+     2024, 2031, 2020, 2027, 2028, 2033, 2029, 2038, 2040, 2043,
+     2050, 2051, 3371, 2057, 2042, 2058, 2034, 2056, 2061, 2068,
+
+     2064, 2065, 2066, 2067, 2070, 2069, 2072, 2073, 2074, 2080,
+     3371, 2079, 2082, 2089, 2091, 2092, 2093, 2094, 2096, 2097,
+     3371, 2102, 2108, 2105, 2109, 2111, 2112, 2106, 2114, 2118,
+     2120, 2121, 2123, 2126, 2127, 2128, 2129, 2131, 2133, 2137,
+     2145, 2136, 2142, 2154, 2151, 2160, 2163, 2139, 2152, 2166,
+     2162, 2167, 2168, 2169, 2175, 2173, 2177, 2176, 3371, 2178,
+     2183, 2185, 2186, 2191, 2187, 2189, 3371, 2197, 3371, 2199,
+     3371, 2200, 2204, 2190, 2205, 2201, 2206, 2209, 2215, 2221,
+     2208, 3371, 2217, 2223, 2224, 2226, 3371, 2228, 3371, 3371,
+     2230, 2232, 2236, 2234, 2237, 2240, 2244, 3371, 2247, 2239,
+
+     2248, 2252, 2250, 2253, 2255, 2256, 2257, 2258, 2260, 3371,
+     2264, 2273, 2263, 2270, 3371, 2262, 2283, 2266, 2284, 2285,
+     2286, 2288, 2277, 2274, 2301, 2297, 3371, 2290, 2298, 2300,
+     2303, 2310, 2306, 2313, 2304, 2308, 2319, 2314, 2322, 3371,
+     2324, 2325, 3371, 2326, 2307, 2328, 3371, 2331, 3371, 2332,
+     2333, 2335, 2336, 2341, 2342, 2347, 2343, 2349, 2350, 2352,
+     2357, 2358, 3371, 3371, 2354, 2368, 2369, 2359, 2361, 2372,
+     2374, 3371, 2364, 2375, 2376, 2378, 2381, 2382, 2385, 2384,
+     2387, 2388, 2390, 2392, 2394, 3371, 2396, 2397, 2398, 2402,
+     2404, 2405, 3371, 2407, 2408, 2409, 2410, 2412, 2414, 2428,
+
+     2430, 2420, 2432, 2435, 2437, 2438, 2440, 2442, 2443, 3371,
+     2444, 2446, 2447, 2451, 2452, 2448, 2453, 2458, 2461, 2463,
+     2465, 3371, 2455, 2467, 2469, 2472, 2476, 2473, 2479, 2477,
+     2481, 2483, 2484, 2485, 2487, 2489, 2490, 2492, 2495, 2496,
+     2502, 2503, 3371, 2500, 3371, 2506, 2511, 2518, 2516, 3371,
+     2514, 2519, 3371, 2521, 2522, 2523, 2533, 3371, 2535, 2526,
+     2536, 2530, 2538, 2528, 2544, 3371, 2546, 2548, 2554, 2555,
+     2539, 2549, 2557, 2556, 2562, 2569, 2565, 3371, 2558, 2568,
+     2575, 2572, 2577, 3371, 3371, 2581, 3371, 3371, 3371, 2584,
+     3371, 3371, 2585, 2587, 3371, 2589, 3371, 2596, 2592, 2578,
+
+     2595, 2597, 3371, 2599, 3371, 2605, 2601, 3371, 2604, 3371,
+     2606, 2607, 2608, 2610, 2613, 2619, 2621, 2614, 2623, 2624,
+     2625, 2627, 2628, 2629, 2631, 2634, 2632, 2635, 2638, 2640,
+     2642, 2644, 2645, 2647, 2654, 2660, 3371, 3371, 2646, 2657,
+     2648, 2661, 2663, 2665, 2668, 2673, 3371, 2677, 2669, 2680,
+     2667, 2671, 2679, 2683, 2684, 2691, 2693, 2692, 2694, 2695,
+     2696, 3371, 2698, 3371, 3371, 2700, 2701, 2706, 2707, 2708,
+     3371, 2711, 2712, 3371, 2719, 2702, 2724, 2728, 3371, 3371,
+     3371, 2729, 2713, 2731, 2732, 2733, 2734, 2736, 3371, 2739,
+     2741, 2742, 2743, 2749, 2751, 2757, 2756, 2760, 3371, 3371,
+
+     2766, 2763, 2764, 2762, 2765, 2768, 2770, 2772, 3371, 2774,
+     2773, 2779, 2778, 2781, 2782, 2785, 3371, 2786, 2788, 2793,
+     2796, 2789, 2800, 2801, 2797, 3371, 2804, 2803, 2806, 2810,
+     3371, 2815, 3371, 3371, 2807, 2817, 2819, 2824, 2826, 2829,
+     2820, 2830, 2836, 2833, 2835, 3371, 3371, 2834, 3371, 3371,
+     2837, 2841, 2842, 2843, 2845, 2848, 2849, 2850, 2851, 2852,
+     2856, 2861, 2862, 2864, 2865, 2866, 2869, 2872, 3371, 2871,
+     3371, 2876, 2879, 2881, 2873, 2880, 2886, 3371, 2887, 2888,
+     2541, 3371, 3371, 3371, 2897, 2898, 2901, 3371, 2903, 2904,
+     2890, 2907, 2905, 2914, 2906, 2916, 3371, 2917, 2918, 2920,
+
+     2921, 2926, 2922, 2924, 2929, 2927, 2928, 2940, 2930, 2942,
+     2945, 3371, 2947, 2944, 2951, 2934, 2953, 2956, 2958, 2959,
+     2960, 2961, 2963, 2965, 2966, 2967, 2973, 2970, 2980, 3371,
+     2983, 2974, 3371, 2984, 2976, 2991, 2995, 2998, 3000, 3001,
+     3371, 3003, 3371, 3004, 3371, 3008, 3009, 3011, 3012, 3371,
+     3371, 3013, 3015, 3019, 3371, 3020, 3016, 2969, 3022, 3023,
+     3026, 3371, 3371, 3027, 3029, 3033, 3037, 3371, 3371, 3371,
+     3036, 3371, 3038, 3371, 3043, 3371, 3046, 3048, 3371, 3049,
+     3051, 3030, 3053, 3052, 3054, 3056, 3058, 3065, 3371, 3371,
+     3070, 3371, 3072, 3075, 3371, 3066, 3079, 3371, 3081, 3082,
+
+     3083, 3084, 3086, 3085, 3371, 3371, 3371, 3371, 3087, 3089,
+     3092, 3093, 3090, 3094, 3095, 3098, 3100, 3097, 3102, 3111,
+     3114, 3115, 3122, 3118, 3371, 3119, 3121, 3128, 3129, 3127,
+     3125, 3126, 3133, 3131, 3135, 3136, 3137, 3146, 3152, 3142,
+     3143, 3153, 3154, 3155, 3162, 3168, 3165, 3166, 3167, 3169,
+     3175, 3171, 3172, 3371, 3174, 3176, 3177, 3178, 3182, 3184,
+     3180, 3192, 3197, 3200, 3187, 3201, 3203, 3204, 3206, 3207,
+     3209, 3208, 3371, 3210, 3212, 3216, 3218, 3221, 3219, 3223,
+     3224, 3229, 3232, 3231, 3234, 3236, 3371, 3240, 3371, 3371,
+     3241, 3244, 3247, 3249, 3251, 3371, 3371, 3371, 3279, 3286,
+
+     3293, 3300, 3307,   94, 3314, 3321, 3328, 3335, 3342, 3349,
+     3356, 3363
     } ;
 
-static yyconst flex_int16_t yy_def[1669] =
+static yyconst flex_int16_t yy_def[1713] =
     {   0,
-     1654,    1, 1655, 1655, 1656, 1656, 1657, 1657, 1658, 1658,
-     1659, 1659, 1654, 1660, 1654, 1654, 1654, 1654, 1661, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1662,
-     1654, 1654, 1654, 1662, 1663, 1654, 1654, 1654, 1663, 1664,
-     1654, 1654, 1654, 1654, 1664, 1665, 1654, 1654, 1654, 1665,
-     1666, 1654, 1667, 1654, 1666, 1666, 1660, 1660, 1654, 1668,
-     1661, 1668, 1661, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1662, 1662, 1663, 1663, 1664, 1664, 1654, 1665,
-     1665, 1666, 1666, 1667, 1667, 1666, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1666, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1666, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660,
-     1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1666, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1666, 1660, 1660, 1660, 1660, 1654,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660,
-     1654, 1654, 1660, 1654, 1654, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660, 1654,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1666, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654,
-     1666, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1654, 1660,
-     1660, 1660, 1654, 1660, 1654, 1660, 1654, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1654, 1654, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1654, 1654, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654,
-     1660, 1654, 1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1654,
-     1660, 1654, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1654, 1660, 1660, 1660, 1660, 1654, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660,
-     1660, 1654, 1660, 1660, 1660, 1654, 1660, 1654, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1654,
-     1660, 1660, 1660, 1660, 1654, 1660, 1660, 1654, 1660, 1660,
-     1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660, 1654, 1654,
-     1660, 1654, 1654, 1654, 1660, 1654, 1654, 1660, 1660, 1654,
-     1660, 1654, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1654,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1654, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1654, 1660, 1654, 1654, 1660, 1660, 1660, 1660,
-     1660, 1654, 1660, 1660, 1660, 1660, 1654, 1654, 1654, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1654, 1654, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1654, 1660, 1660, 1654, 1660, 1654, 1654,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1654, 1660, 1654, 1654, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1654, 1660, 1654, 1660, 1660, 1660,
-     1660, 1654, 1660, 1660, 1660, 1654, 1654, 1654, 1660, 1660,
-     1660, 1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1654, 1660, 1654, 1660, 1654, 1660, 1660, 1654,
-     1654, 1660, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1654, 1660, 1660, 1660, 1660, 1654, 1654, 1654,
-     1660, 1654, 1660, 1654, 1660, 1660, 1654, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1654, 1654, 1660, 1654,
-     1660, 1654, 1660, 1660, 1654, 1660, 1660, 1660, 1660, 1660,
-     1660, 1654, 1654, 1654, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1654, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1654, 1660,
-     1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1660,
-     1660, 1660, 1654, 1660, 1654, 1654, 1660, 1660, 1660, 1660,
-     1660, 1654, 1654,    0, 1654, 1654, 1654, 1654, 1654, 1654,
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654
+     1698,    1, 1699, 1699, 1700, 1700, 1701, 1701, 1702, 1702,
+     1703, 1703, 1698, 1704, 1698, 1698, 1698, 1698, 1705, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1706,
+     1698, 1698, 1698, 1706, 1707, 1698, 1698, 1698, 1707, 1708,
+     1698, 1698, 1698, 1698, 1708, 1709, 1698, 1698, 1698, 1709,
+     1710, 1698, 1711, 1698, 1710, 1710, 1704, 1704, 1698, 1712,
+     1705, 1712, 1705, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1706, 1706, 1707, 1707, 1708, 1708, 1698,
+     1709, 1709, 1710, 1710, 1711, 1711, 1710, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1710, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1710, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1698, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1710, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1710,
+     1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1698, 1704, 1698, 1698, 1704, 1698, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1710, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1710, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1704,
+     1704, 1704, 1698, 1704, 1698, 1704, 1698, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1698, 1704, 1704, 1704, 1704, 1704, 1698, 1698, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1704,
+     1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1698, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1698, 1704, 1704, 1704, 1698, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1698, 1698, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704,
+     1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1698, 1704, 1698, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1698, 1704, 1704, 1704, 1704, 1698, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704,
+     1704, 1704, 1704, 1698, 1698, 1704, 1698, 1698, 1698, 1704,
+     1698, 1698, 1704, 1704, 1698, 1704, 1698, 1704, 1704, 1704,
+
+     1704, 1704, 1698, 1704, 1698, 1704, 1704, 1698, 1704, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1698, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1698, 1704, 1698, 1698, 1704, 1704, 1704, 1704, 1704,
+     1698, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1698, 1698,
+     1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1698,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704,
+     1698, 1704, 1698, 1698, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1698, 1698, 1704, 1698, 1698,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704,
+     1698, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704,
+     1704, 1698, 1698, 1698, 1704, 1704, 1704, 1698, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698,
+     1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1698, 1704, 1698, 1704, 1698, 1704, 1704, 1704, 1704, 1698,
+     1698, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704,
+     1704, 1698, 1698, 1704, 1704, 1704, 1704, 1698, 1698, 1698,
+     1704, 1698, 1704, 1698, 1704, 1698, 1704, 1704, 1698, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1698, 1698,
+     1704, 1698, 1704, 1704, 1698, 1704, 1704, 1698, 1704, 1704,
+
+     1704, 1704, 1704, 1704, 1698, 1698, 1698, 1698, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1698, 1704, 1704, 1704, 1704, 1704, 1704, 1704,
+     1704, 1704, 1704, 1704, 1704, 1704, 1698, 1704, 1698, 1698,
+     1704, 1704, 1704, 1704, 1704, 1698, 1698,    0, 1698, 1698,
+
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
+     1698, 1698
     } ;
 
-static yyconst flex_int16_t yy_nxt[3321] =
+static yyconst flex_int16_t yy_nxt[3411] =
     {   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,   14,
        35,   36,   37,   38,   39,   14,   14,   14,   14,   41,
-       42,   43,   41,   42,   43,  125,   46,   47,  125,   44,
+       42,   43,   41,   42,   43,  126,   46,   47,  126,   44,
        48,   69,   44,   46,   47,   70,   49,   48,   57,   58,
        59,   68,   68,   49,   51,   52,   53,   54,   60,   18,
-       57,   58,   59,  123,  123,   55,   51,   52,   53,   54,
-       60,   18,   68,  104,  215,   74,   75,   55,   15,   16,
+       57,   58,   59,  124,  124,   55,   51,   52,   53,   54,
+       60,   18,   68,  104,  217,   74,   75,   55,   15,   16,
        17,   62,   63,   64,   67,   67,   68,   67,   67,   65,
 
        67,   95,   68,   76,   68,   67,   85,   68,   66,   15,
-       16,   17,   62,   63,   64,   68,   68,   77,  137,   87,
+       16,   17,   62,   63,   64,   68,   68,   77,  138,   87,
        65,   69,   94,   68,   78,   70,   86,   68,   88,   66,
-       72,   79,   72,   72,  133,   72,   89,   68,   96,   68,
-       72,   73,   68,   90,  130,  130,   91,   80,  136,   68,
-       97,   81,  179,   92,   82,   93,   83,   84,   98,   68,
-       68,  101,   68,  138,   99,  102,   68,   68,  100,   68,
-       68,  105,  109,  140,  112,   68,  116,  106,  117,   68,
-      107,  103,  110,   68,  113,  111,  139,  108,  114,  115,
-       68,  121,  169,  118,   68,  122,  127,  119,  127,  127,
-
-      240,  127,  120,   72,   68,   72,   72,  132,   72,  132,
-      132,   68,  132,   67,  135,   67,   67,   68,   67,   68,
-       68,   68,  141,   67,   72,  142,   72,   72,  147,   72,
-       68,  143,   68,   68,   72,   73,   68,   68,  144,  145,
-      146,   68,   68,   68,  149,  153,  148,  154,   68,   68,
-       68,  133,  150,  156,  151,  152,  157,  155,  159,   68,
-       68,   68,   68,   68,  161,  163,   68,  160,   68,  164,
-      158,   68,  167,  165,  166,   68,   68,   68,  168,  171,
-      173,  172,  170,   68,  162,   68,   68,   68,  175,   68,
-       68,  182,  176,   68,  184,  174,   68,   68,   68,  178,
-
-       68,   68,  183,  189,   68,  177,  180,  181,   68,  191,
-       68,  123,  123,  133,  185,  186,  187,   68,  125,  188,
-      192,  125,  130,  130,  190,  198,   68,  127,  193,  127,
-      127,  132,  127,  132,  132,   72,  132,   72,   72,  133,
-       72,  197,  194,   68,  196,   68,  135,   68,  195,   68,
-      201,   68,   68,  204,   68,   68,  202,  203,   68,  205,
-      199,   68,   68,  212,   68,   68,   68,  200,   68,  214,
-      213,  217,  216,   68,   68,   68,  243,   68,   68,  218,
-      131,  206,   68,  223,   68,  224,  207,  220,  219,   68,
-      221,  208,  222,  228,   68,  229,  209,  226,   68,   68,
-
-       68,  230,  210,  211,  225,  227,   68,   68,  232,  233,
-      235,   68,  231,   68,  237,   68,  236,  238,   68,   68,
-      234,   68,   68,   68,   68,  239,   68,  241,   68,  242,
-       68,   68,  244,  247,  251,   68,  245,   68,   68,   68,
-      253,   68,  255,  259,  254,   68,  246,   68,   68,  249,
-      250,  261,  248,   68,  258,  252,   68,  257,  133,   68,
-      256,  262,   68,   68,  267,   68,  260,   68,   68,   68,
-      264,  266,  268,   68,   68,  129,   68,   68,  263,  273,
-      269,  265,  271,   68,  274,  275,  270,   68,   68,   68,
-      276,   68,  277,  278,   68,   68,   68,  280,  272,  281,
-
-       68,  283,  279,   68,  285,  282,   68,   68,  287,   68,
-       68,   68,  286,   68,  284,   68,  292,   68,   68,   68,
-       68,   68,  297,  294,   68,   68,   68,   68,  289,  288,
-      291,   68,  290,  296,  298,  302,  293,  299,  295,   68,
-       68,  300,   68,   68,  301,  306,  307,  308,   68,   68,
-       68,   68,  309,  304,  305,   68,  314,   68,   68,   68,
-      303,   68,  316,  315,  313,   68,  312,  310,  319,   68,
-      311,   68,   68,   68,  317,  322,  321,  323,   68,   68,
-       68,   68,  329,   68,   68,  318,   68,   68,  330,  320,
-      328,   68,  324,   68,   68,  325,   68,  335,  326,   68,
-
-      327,  331,  133,   68,  332,  348,  333,  334,  346,   68,
-      337,   68,   68,  336,   68,  351,  338,  339,  345,   68,
-       68,   68,  355,  347,  349,   68,  340,   68,  341,  342,
-      343,  350,  352,  344,  353,   68,  354,  358,   68,   68,
-      361,  362,   68,   68,  360,  356,   68,   68,   68,  357,
-       68,   68,  367,   68,  359,   68,   68,  368,   68,   68,
-       68,  380,  128,  364,  365,  366,  363,  371,  373,   68,
-      370,   68,   68,  369,  374,  375,   68,  377,   68,   68,
-      372,  376,   68,  379,  378,   68,   68,  383,  384,  382,
-      381,   68,   68,   68,   68,   68,   68,  389,   68,  388,
-
-       68,  386,   68,  390,   68,  392,  387,   68,  393,   68,
-       68,   68,  385,   68,   68,   68,   68,  395,   68,  396,
-       68,  391,   68,  394,  402,  397,   68,  401,  403,  400,
-       68,  398,   68,   68,  399,   68,  404,  409,   68,  407,
-       68,   68,  405,   68,   68,  408,  419,  406,   68,   68,
-       68,   68,  421,   68,  410,   68,  420,  418,  126,  411,
-       68,  412,   68,  417,  422,  426,  413,  427,  414,   68,
-      423,   68,  425,  424,   68,  430,  415,  428,   68,   68,
-       68,   68,  436,  431,   68,  133,  416,   68,  432,  435,
-       68,   68,   68,  429,  440,   68,  434,  439,   68,  433,
-
-       68,   68,  437,  443,  441,   68,   68,  448,  445,  438,
-      442,  449,   68,   68,  451,   68,  444,  452,   68,  453,
-      454,   68,  446,   68,   68,  447,  450,  455,   68,  456,
-       68,   68,   68,  460,   68,  458,  459,   68,   68,   68,
-       68,  461,  464,   68,  457,  462,   68,   68,  465,  467,
-       68,  463,   68,  466,  468,   68,  470,  473,  469,   68,
-       68,   68,   68,  476,  475,   68,  472,   68,  471,  474,
-      478,   68,   68,  483,   68,   68,  480,   68,   68,   68,
-      479,  484,  485,   68,   68,  477,  482,  486,  481,   68,
-       68,   68,   68,  491,  487,  488,  490,  489,   68,   68,
-
-      493,  495,   68,  492,  494,   68,   68,   68,  496,  499,
-      497,  502,   68,  500,   68,   68,   68,  501,  503,   68,
-      504,   68,   68,   68,   68,  498,  508,   68,   68,  513,
-      505,   68,  509,   68,   68,   68,  515,  516,  506,  510,
-       68,  507,   68,  512,   68,  511,   68,  518,   68,   68,
-      514,  517,   68,   68,   68,   68,  522,  523,  525,  526,
-      519,  521,  524,   68,   68,  520,   68,  133,   68,   68,
-       68,  528,  531,  532,   68,  529,   68,  535,  533,  537,
-       68,  527,  530,   68,   68,  536,   68,  538,   68,   68,
-      534,   68,  539,   68,   68,   68,  541,   68,   68,   68,
-
-      554,  552,  553,   68,  540,   68,  551,  542,  549,   68,
-       68,  550,   68,  565,  562,  571,  543,   68,  566,   68,
-       68,  563,  544,   68,  564,   68,  545,  567,  124,  546,
-       68,  568,   68,  570,   68,   68,  547,   68,  569,  548,
-       68,  555,  556,   68,  557,  574,   68,  558,  572,   68,
-       68,  577,  559,  573,  575,  579,   68,  576,  560,  561,
-       68,  578,  581,   68,  582,  580,  583,   68,   68,   68,
-      584,   68,   68,   68,  585,   68,   68,   68,  591,   68,
-      586,  587,  589,  590,   68,  593,   68,   68,   68,   68,
-       68,  595,  592,  588,   68,  597,   68,   68,   68,  599,
-
-       68,  596,   68,  602,  598,  594,   68,  600,   68,   68,
-       68,   68,   68,   68,  608,   68,   68,  607,  601,   68,
-      611,  603,  604,   68,   68,   68,   68,  724,  605,  606,
-      609,  613,  610,  612,  616,  614,  617,  615,   68,   68,
-       68,   68,  618,  619,   68,   68,  623,  622,  624,  621,
-       68,   68,  620,   68,  625,  628,   68,   68,  630,   68,
-       68,  631,  133,   68,   68,   68,   68,   68,  626,  627,
-      633,   68,   68,   68,   68,  643,   68,  629,  632,  647,
-       68,  636,   68,  634,   68,   68,  133,  644,  650,  635,
-       68,  646,   68,  637,  648,  638,  649,  652,  645,  639,
-
-      651,  640,   68,   68,   68,   68,  641,  653,  654,   68,
-       68,  642,  659,   68,  131,  658,  655,   68,  665,  657,
-       68,  660,  664,   68,   68,  656,  661,   68,  662,   68,
-      668,   68,  669,   68,   68,   68,  667,  666,   68,  670,
-      673,   68,  674,  675,   68,   68,  663,  671,   68,   68,
-      679,   68,  676,  672,  677,   68,   68,  678,   68,   68,
-       68,   68,  688,   68,  684,  682,   68,   68,   68,   68,
-      680,  681,  687,   68,   68,  686,   68,  683,  692,  693,
-      685,  694,   68,   68,  691,  689,  690,   68,  696,  697,
-       68,  695,  698,  702,   68,   68,  699,   68,   68,  700,
-
-       68,   68,  701,  704,  705,   68,   68,   68,   68,   68,
-      703,  707,  708,   68,  709,  712,   68,   68,   68,  711,
-       68,  706,   68,  714,   68,  710,  713,  715,   68,   68,
-       68,   68,   68,  726,  720,  721,  716,   68,   68,  717,
-      723,  719,  718,  727,  725,   68,  729,   68,   68,  722,
-       68,   68,   68,  733,   68,   68,   68,   68,   68,   68,
-      728,   68,   68,  741,  732,  731,  742,  735,   68,  730,
-       68,   68,  734,  738,  736,  743,  739,   68,   68,   68,
-       68,  737,  740,   68,  746,   68,   68,  751,   68,   68,
-       68,  744,  745,   68,   68,  747,  753,   68,  755,  756,
-
-      749,   68,  748,   68,   68,  750,   68,  752,  757,  759,
-       68,   68,   68,  754,   68,   68,  762,  758,   68,  761,
-      764,   68,  760,   68,   68,  766,   68,  767,   68,   68,
-       68,  763,   68,  765,   68,  770,   68,   68,  768,  769,
-      775,  771,  779,   68,   68,  772,   68,   68,   68,  129,
-      774,  773,  776,  778,  781,   68,  777,  780,  784,   68,
-      783,   68,  785,   68,   68,  787,   68,  790,  782,   68,
-      791,   68,   68,   68,  788,  789,  792,   68,  786,   68,
-      794,   68,  793,   68,   68,   68,  799,  797,  796,  800,
-      795,   68,   68,   68,   68,   68,   68,  801,   68,  802,
-
-      809,   68,  798,   68,  807,  803,   68,  808,   68,   68,
-      804,   68,  805,   68,  806,  811,  810,  813,  817,   68,
-       68,   68,  814,  819,   68,  812,  821,   68,   68,  815,
-      820,  823,   68,   68,   68,  818,  825,   68,  816,  826,
-      827,   68,   68,   68,   68,   68,   68,  822,  829,   68,
-      831,   68,  830,  824,   68,  832,  835,  834,  836,   68,
-      837,   68,  828,   68,  833,   68,  838,  839,  840,   68,
-       68,   68,   68,  843,   68,   68,   68,  846,   68,   68,
-       68,  842,   68,   68,   68,  850,   68,   68,  841,   68,
-       68,  844,  854,   68,   68,  856,  847,  864,  845,  848,
-
-      851,  849,  857,  852,  853,   68,  858,   68,   68,   68,
-       68,  861,  855,  863,  859,   68,  860,   68,   68,   68,
-      867,   68,   68,   68,  862,   68,  865,  869,   68,  872,
-       68,   68,   68,   68,   68,   68,  866,  868,   68,  870,
-      879,   68,   68,  871,   68,  875,  873,  876,  877,  874,
-       68,  880,   68,  878,   68,  881,  882,  884,   68,  888,
-      885,  883,  886,  887,   68,  889,   68,  890,  891,   68,
-       68,   68,   68,   68,   68,  896,   68,  893,   68,  897,
-       68,  898,   68,   68,   68,   68,   68,  894,   68,  892,
-       68,  903,   68,  895,  904,  899,   68,  900,   68,   68,
-
-       68,   68,   68,  902,  909,  905,  914,  906,   68,  901,
-       68,  907,   68,  912,   68,  908,  911,   68,   68,  910,
-      917,  915,  913,  916,  918,   68,   68,   68,   68,  922,
-      921,  919,  920,   68,   68,   68,  923,  926,  924,   68,
-      925,   68,   68,  927,   68,  928,   68,   68,   68,  930,
-      929,   68,  932,   68,   68,  937,  931,   68,  934,  936,
-       68,   68,  938,   68,   68,  933,   68,   68,  941,  935,
-       68,   68,  943,   68,  940,   68,  946,   68,   68,  939,
-       68,   68,  950,   68,  952,  942,  951,  945,  944,   68,
-      954,  947,   68,  956,   68,   68,   68,  948,  949,   68,
-
-       68,  959,  957,  953,   68,   68,  955,  965,   68,   68,
-       68,  962,   68,   68,  963,  966,  960,   68,  967,   68,
-      972,   68,  968,  958,  970,  961,  964,  971,   68,   68,
-       68,   68,   68,   68,  977,   68,  976,   68,  969,   68,
-      979,  980,   68,   68,   68,   68,  973,   68,  974,  981,
-      975,   68,   68,   68,  988,  982,  978,   68,   68,   68,
-       68,  985,   68,  983,  986,  984,  987,  992,  128,   68,
-       68,  989,   68,  998,   68,  993,  994,  990,   68,  991,
-       68,  995,   68,  999,  996,   68,  997, 1000,   68,   68,
-       68, 1007, 1008,   68, 1001,   68,   68, 1002, 1004, 1006,
-
-       68, 1005,   68,   68, 1003,   68,   68,   68, 1015,   68,
-       68, 1018,  126, 1010,   68, 1009,   68, 1012, 1020,   68,
-     1011,   68,   68,   68, 1014, 1016, 1023, 1021, 1017,   68,
-     1013,   68, 1019,   68,   68, 1024, 1025, 1027,   68, 1022,
-       68, 1031, 1026,   68,   68,   68,   68, 1028,   68,   68,
-       68,   68, 1035,   68, 1036, 1037, 1029,   68, 1038, 1030,
-     1032, 1033,   68, 1042,   68, 1034, 1039,   68,   68,   68,
-       68, 1046,   68,   68, 1040,   68,   68, 1041, 1051, 1049,
-     1044, 1043, 1045,   68, 1047, 1050,   68, 1048, 1052,   68,
-     1054,   68, 1053,   68,   68,   68,   68,   68,   68, 1056,
-
-       68,   68,   68, 1060, 1057, 1055, 1065,   68, 1058, 1061,
-     1066,   68, 1059,  124,   68,   68,   68, 1064, 1070,   68,
-       68, 1063, 1062, 1072,   68, 1073,   68,   68,   68, 1075,
-       68, 1074, 1067, 1068,   68,   68, 1069, 1077, 1076, 1079,
-     1071,   68,   68,   68,   68,   68, 1078, 1081,   68,   68,
-     1082, 1083,   68,   68,   68, 1080,   68, 1084, 1085, 1086,
-       68, 1088,   68, 1089, 1087, 1093,   68, 1091,   68, 1095,
-       68,   68, 1090, 1098,   68, 1092,   68,   68, 1100, 1097,
-       68,   68, 1096,   68, 1103,   68, 1094,   68, 1107, 1101,
-       68, 1099, 1106,   68,   68,   68, 1110,   68,   68, 1111,
-
-       68, 1105, 1109, 1102,   68,   68,   68, 1104,   68, 1112,
-     1108,   68, 1119,   68, 1117,   68, 1122,   68, 1113, 1114,
-     1118, 1116,   68,   68, 1115, 1125, 1120, 1126,   68, 1127,
-       68, 1121,   68, 1128,   68, 1129,   68, 1124,   68, 1132,
-       68,   68,   68, 1123,   68, 1134,   68, 1137, 1131,   68,
-     1133,   68,   68,   68, 1135, 1139, 1141,   68, 1130,   68,
-       68, 1140, 1142,   68, 1143,   68,   68,   68, 1147,   68,
-       68, 1136, 1144, 1138, 1145,   68, 1146,   68,   68, 1149,
-     1148, 1151,   68,   68,   68,   68,   68,   68,   68, 1150,
-     1156, 1158, 1153, 1157,   68, 1160,   68,   68, 1152,   68,
-
-       68, 1159, 1154,   68, 1155,   68, 1161, 1168, 1163, 1164,
-     1165,   68,   68,   68,   68, 1162,   68, 1170, 1166, 1167,
-       68, 1173, 1171, 1172,   68,   68,   68, 1175,   68,   68,
-     1169,   68,   68,   68,   68,   68,   68, 1176,   68,   68,
-     1185,   68,   68, 1178, 1179, 1174, 1180, 1184, 1181,   68,
-     1177,   68, 1189,   68,   68, 1182, 1183, 1186, 1187, 1191,
-       68,   68, 1192,   68,   68, 1188, 1193, 1190, 1194,   68,
-     1197,   68,   68,   68,   68,   68, 1198, 1201,   68,   68,
-       68,   68, 1195,   68,   68, 1205, 1202, 1200, 1206, 1196,
-     1203, 1199, 1207, 1204,   68,   68,   68, 1210,   68, 1208,
-
-     1209,   68,   68,   68,   68,   68,   68, 1213, 1214, 1218,
-       68,   68, 1220,   68, 1212, 1217, 1211,   68, 1215,   68,
-     1219, 1222,   68,   68, 1221, 1225,   68, 1223,   68, 1216,
-       68, 1226, 1224, 1228,   68,   68, 1229, 1227,   68,   68,
-     1233,   68, 1230,   68, 1232,   68,   68,   68,   68,   68,
-     1235, 1241,   68, 1238,   68,   68, 1231,   68,   68, 1242,
-       68,   68, 1237, 1244,   68,   68,   68, 1239, 1234, 1236,
-     1240,   68, 1243,   68, 1253,   68,   68,   68,   68,   68,
-     1246, 1254,   68,   68, 1258, 1249, 1245, 1247, 1251, 1248,
-     1255,   68, 1250, 1256, 1252, 1257, 1259,   68, 1260,   68,
-
-     1262,   68, 1263,   68, 1261, 1264,   68,   68, 1266,   68,
-     1267,   68,   68,   68, 1270,   68,   68,   68, 1269, 1272,
-       68,   68,   68, 1274,   68, 1275, 1265,   68, 1276, 1278,
-       68, 1268,   68, 1280,   68, 1271, 1281,   68,   68, 1273,
-       68, 1283,   68, 1277,   68,   68,   68, 1284,   68, 1286,
-     1282, 1279,   68,   68, 1285,   68,   68, 1290,   68, 1288,
-       68, 1295,   68,   68, 1292, 1293,   68, 1296, 1291, 1289,
-     1287, 1298, 1294,   68, 1299,   68, 1300,   68, 1301,   68,
-     1297,   68,   68,   68,   68, 1305, 1302,   68, 1306,   68,
-     1303, 1304, 1308,   68, 1309,   68,   68, 1311,   68,   68,
-
-     1654, 1310,   68, 1313, 1307,   68, 1315,   68,   68,   68,
-     1312, 1316, 1317, 1318,   68,   68,   68,   68, 1314,   68,
-     1319, 1322, 1320,   68, 1324,   68, 1325,   68, 1323, 1326,
-     1321,   68, 1328, 1329,   68,   68,   68, 1331,   68,   68,
-     1332, 1327, 1330, 1333,   68,   68, 1335,   68, 1336,   68,
-     1334, 1337,   68, 1338,   68,   68,   68,   68, 1340,   68,
-     1341, 1342,   68,   68, 1343, 1344,   68,   68, 1347,   68,
-     1339, 1345, 1346, 1348,   68, 1349,   68,   68, 1350,   68,
-       68,   68,   68,   68, 1357,   68,   68, 1355,   68,   68,
-       68, 1352, 1353, 1354,   68, 1351,   68, 1358,   68,   68,
-
-       68, 1367,   68, 1356, 1365, 1366,   68, 1361,   68, 1360,
-     1363,   68, 1359,   68, 1362,   68, 1364, 1368,   68,   68,
-       68,   68, 1376,   68, 1373,   68, 1369, 1377,   68, 1370,
-     1371,   68, 1378, 1372,   68,   68,   68,   68, 1375, 1374,
-     1380, 1379, 1385,   68,   68, 1386,   68,   68,   68, 1381,
-       68,   68, 1383, 1382,   68,   68, 1384,   68, 1393, 1394,
-       68, 1388, 1387,   68, 1397,   68, 1389,   68, 1390,   68,
-     1391,   68, 1395,   68, 1392, 1399,   68, 1400,   68,   68,
-     1401, 1396, 1403,   68,   68,   68, 1398,   68, 1404, 1405,
-     1406, 1402,   68, 1407,   68,   68,   68, 1409, 1654, 1410,
-
-     1412,   68, 1408, 1413,   68, 1420, 1414, 1415,   68, 1417,
-     1411,   68, 1416,   68,   68,   68,   68,   68,   68, 1418,
-       68, 1419,   68,   68,   68, 1423, 1422, 1425,   68,   68,
-       68,   68, 1421,   68, 1424,   68, 1430, 1428,   68, 1429,
-     1431, 1426, 1427,   68, 1435,   68,   68, 1437,   68,   68,
-       68,   68, 1432,   68,   68, 1436, 1439, 1438, 1433, 1440,
-     1442,   68, 1434,   68, 1444,   68, 1441,   68, 1445, 1446,
-       68, 1447,   68,   68, 1443, 1448,   68, 1451, 1452,   68,
-       68,   68,   68,   68, 1453, 1449,   68, 1450,   68, 1454,
-       68, 1457,   68,   68, 1461,   68,   68,   68, 1455, 1456,
-
-       68, 1465,   68, 1466, 1463,   68, 1458, 1460,   68,   68,
-     1459, 1462,   68, 1468,   68,   68, 1464,   68,   68,   68,
-       68, 1467, 1474, 1471, 1476,   68,   68,   68,   68, 1469,
-     1477,   68,   68, 1482,   68, 1472, 1475, 1473, 1470, 1480,
-     1478, 1479,   68, 1483,   68, 1481,   68,   68,   68,   68,
-       68, 1485, 1490, 1484, 1488, 1487, 1486,   68, 1492,   68,
-       68,   68, 1495,   68,   68,   68, 1489,   68, 1496,   68,
-       68,   68,   68,   68, 1497, 1491, 1494, 1501, 1500, 1493,
-     1503,   68,   68, 1498, 1505,   68,   68, 1506, 1499, 1507,
-       68,   68, 1504, 1510,   68, 1511,   68, 1502,   68,   68,
-
-       68, 1515,   68,   68,   68,   68, 1508, 1519,   68, 1517,
-       68, 1513,   68, 1509, 1654, 1516,   68, 1512, 1522,   68,
-     1514, 1523,   68,   68, 1518, 1520, 1521,   68, 1525, 1524,
-     1526, 1654, 1527, 1528,   68, 1529,   68, 1530,   68,   68,
-     1532,   68,   68, 1533, 1531, 1534,   68,   68,   68, 1537,
-       68,   68, 1535,   68,   68,   68, 1536,   68, 1538, 1539,
-       68,   68,   68, 1547,   68,   68, 1545, 1548,   68, 1540,
-       68, 1541,   68,   68, 1542, 1543, 1549, 1550,   68,   68,
-     1553, 1544, 1546, 1551, 1552,   68, 1555,   68, 1554,   68,
-       68,   68,   68,   68, 1562,   68, 1559, 1560, 1556, 1563,
-
-       68, 1564,   68,   68, 1557,   68, 1566,   68, 1567,   68,
-       68, 1558, 1561,   68, 1569, 1565,   68,   68,   68,   68,
-       68, 1568, 1573,   68,   68,   68,   68,   68,   68, 1570,
-     1581,   68,   68, 1572, 1571,   68, 1575, 1582, 1577, 1574,
-     1583, 1578, 1580, 1576,   68,   68,   68, 1587,   68, 1584,
-       68, 1579,   68, 1591, 1592,   68,   68, 1585,   68,   68,
-     1586, 1589, 1588,   68,   68,   68,   68,   68, 1594, 1590,
-     1593,   68,   68,   68,   68, 1604,   68, 1601, 1596, 1598,
-     1599, 1602, 1595,   68, 1597,   68,   68, 1654, 1605,   68,
-     1600, 1606, 1603, 1609, 1607, 1610,   68,   68,   68,   68,
-
-       68,   68, 1614,   68, 1608,   68, 1611,   68, 1617,   68,
-       68,   68,   68, 1621,   68, 1654, 1612,   68, 1616, 1613,
-     1615,   68, 1622,   68, 1620,   68, 1624,   68, 1618, 1619,
-       68, 1625, 1626, 1623,   68, 1629,   68,   68,   68,   68,
-     1628, 1627, 1632,   68, 1630, 1631,   68,   68, 1633,   68,
-       68, 1635, 1636,   68, 1639,   68,   68,   68, 1634,   68,
-     1642, 1643,   68,   68, 1644, 1645,   68,   68, 1637, 1638,
-     1646,   68,   68,   68, 1640, 1641,   68, 1654, 1648, 1647,
-     1654, 1649, 1650, 1652,   68, 1654, 1651, 1653,   68,   40,
+       72,   79,   72,   72,  134,   72,   89,  134,   96,   68,
+       72,   73,   68,   90,  131,  131,   91,   80,  137,   68,
+       97,   81,   68,   92,   82,   93,   83,   84,   98,   68,
+       68,  101,   68,  139,   99,  102,   68,  117,  100,  118,
+       68,  105,  140,   68,  109,  113,  134,  106,  110,   68,
+      107,  103,   68,   68,  119,  114,  141,  108,  111,  115,
+      116,  112,   68,  120,   68,  122,  143,  155,  121,  123,
+
+      128,   68,  128,  128,   72,  128,   72,   72,  133,   72,
+      133,  133,   68,  133,   67,  136,   67,   67,   68,   67,
+       68,   68,   68,  146,   67,   72,   68,   72,   72,  148,
+       72,  147,  150,  144,   68,   72,   73,   68,  142,   68,
+      145,   68,   68,   68,  160,  154,  151,  149,   68,   68,
+       68,  157,   68,   68,  158,  152,  156,  153,  162,   68,
+       68,   68,  161,  164,   68,  168,  167,  165,  159,   68,
+       68,  169,  170,   68,  166,   68,  171,   68,  163,  174,
+       68,   68,   68,  172,   68,  176,   68,  184,   68,  177,
+       68,   68,   68,  173,   68,  175,   68,  180,   68,  186,
+
+       68,  178,  179,  181,   68,  182,  185,   68,  183,  188,
+       68,   68,  189,  191,   68,  193,  194,  124,  124,  187,
+      126,  190,  200,  126,  128,  195,  128,  128,   68,  128,
+      131,  131,   68,  133,  192,  133,  133,   72,  133,   72,
+       72,  134,   72,  199,  196,   68,  198,  201,  136,   68,
+      197,   68,  203,   68,   68,  206,   68,   68,  204,  205,
+       68,  207,   68,   68,   68,  214,   68,  216,   68,  202,
+      218,   68,  215,  219,   68,   68,   68,   68,  245,   68,
+      226,   68,  225,  208,   68,  220,   68,  222,  209,  221,
+      223,  230,  232,  210,  224,  234,   68,   68,  211,  227,
+
+       68,  228,  229,  233,  212,  213,   68,  231,   68,   68,
+      237,   68,   68,  239,  240,   68,  238,  235,   68,   68,
+       68,   68,   68,   68,   68,   68,  247,  241,  242,  244,
+      236,   68,  243,  246,   68,   68,   68,  254,   68,  248,
+      250,   68,   68,  256,  258,   68,   68,   68,  262,   68,
+       68,  249,  257,   68,  252,  253,  251,  264,  255,  260,
+       68,  261,   68,  134,   68,  259,  265,  270,   68,  268,
+       68,  263,   68,   68,   68,  267,  269,   68,  271,   68,
+       68,   68,   68,  266,  276,  272,   68,  274,   68,  277,
+      278,  523,  273,   68,   68,  279,   68,  280,  281,   68,
+
+       68,  282,  275,  283,   68,   68,  286,   68,  284,   68,
+      288,   68,  289,  287,  285,  290,   68,   68,   68,   68,
+       68,   68,  295,   68,   68,   68,   68,   68,  297,  300,
+      301,   68,  294,   68,   68,  292,  291,   68,  299,  293,
+       68,  296,   68,  298,   68,  302,  305,   68,  303,  309,
+      310,  304,  311,   68,   68,  307,  308,  312,   68,   68,
+       68,  306,  317,   68,   68,   68,   68,  319,   68,  316,
+      318,   68,  323,   68,  315,  313,   68,   68,  314,  320,
+      321,  325,   68,   68,   68,  326,   68,  327,   68,  333,
+       68,  322,   68,  324,   68,  332,   68,  328,   68,   68,
+
+      329,  334,  339,  330,   68,  331,   68,  337,   68,  335,
+      336,  134,  338,   68,   68,   68,   68,  350,  340,  349,
+      341,   68,   68,  342,  343,  355,   68,   68,  353,  357,
+       68,  358,  351,  344,  352,  345,  346,  347,  359,   68,
+      348,   68,  354,   68,  362,   68,  356,  360,   68,   68,
+      364,  365,  366,  361,   68,   68,   68,  363,   68,   68,
+      371,   68,   68,   68,   68,  372,   68,   68,  367,  378,
+       68,  368,  369,  370,  379,  375,  377,  374,   68,  381,
+      373,   68,   68,   68,   68,  383,   68,  380,  376,  382,
+       68,  384,   68,   68,  387,  386,  388,  385,   68,   68,
+
+       68,   68,   68,  393,  392,   68,   68,  389,  390,   68,
+      391,  394,   68,  396,   68,  397,   68,   68,   68,   68,
+       68,   68,   68,   68,  399,   68,  395,  400,  406,  401,
+      398,  405,  408,  407,   68,  404,   68,   68,   68,  402,
+      403,   68,   68,   68,   68,  412,   68,   68,  414,   68,
+       68,  424,  409,  426,   68,   68,   68,  413,  410,  411,
+      415,  425,   68,  423,   68,  416,   68,  417,   68,  422,
+       68,  428,  418,   68,  419,  427,   68,  430,   68,  429,
+       68,  434,  420,  431,   68,  432,  435,   68,   68,  436,
+      134,   68,  421,  433,  440,  441,  437,   68,   68,  438,
+
+       68,  445,   68,  439,  444,   68,   68,   68,   68,  442,
+      448,   68,   68,   68,  450,  453,  443,  446,  447,  454,
+       68,  456,   68,  449,  457,   68,  455,  458,  451,  459,
+       68,  452,   68,  460,   68,  461,   68,   68,   68,   68,
+       68,  465,  463,  464,   68,   68,   68,  469,  466,   68,
+      467,   68,   68,   68,  470,   68,   68,  462,  468,  472,
+       68,  475,  478,   68,  473,  471,   68,   68,  474,  477,
+       68,  476,  479,  480,   68,   68,   68,   68,  481,  484,
+      483,  485,   68,  488,   68,   68,   68,   68,   68,  490,
+      489,   68,   68,  486,  487,  491,  492,   68,   68,  132,
+
+      482,  494,  495,  493,   68,   68,   68,  496,  498,  501,
+      497,  500,  499,   68,   68,  502,   68,  505,   68,  503,
+      507,  506,   68,   68,   68,   68,  509,   68,   68,   68,
+       68,   68,   68,   68,  504,  514,   68,   68,   68,  515,
+       68,  519,  508,  510,  522,  511,   68,  512,  516,  513,
+      517,  518,   68,  521,   68,   68,  520,  526,   68,  524,
+       68,   68,   68,   68,   68,  528,  529,   68,  531,  530,
+       68,  525,  532,  527,   68,   68,  134,  534,   68,   68,
+      541,  537,  533,  535,   68,   68,   68,  538,  542,  536,
+      539,  543,   68,   68,   68,   68,   68,  544,   68,  540,
+
+       68,   68,  547,  546,  545,   68,   68,   68,   68,   68,
+      130,  559,  558,  548,  557,  555,  560,   68,  556,  572,
+       68,   68,  568,  549,   68,   68,  569,   68,  571,  550,
+       68,   68,  574,  551,  570,   68,  552,  573,   68,  576,
+      578,   68,  575,  553,  577,   68,  554,   68,  561,  562,
+       68,  563,   68,   68,  564,   68,  583,   68,   68,  565,
+       68,  582,   68,  590,  579,  566,  567,  586,  587,   68,
+      580,  581,  584,  588,  589,   68,  585,   68,   68,   68,
+       68,  591,   68,   68,   68,  592,  597,   68,  593,  595,
+      596,   68,  599,   68,   68,   68,   68,   68,  602,  598,
+
+      594,   68,  604,  601,   68,   68,   68,   68,  606,   68,
+      603,   68,  600,   68,  609,   68,  607,   68,   68,  605,
+       68,   68,  615,   68,  614,   68,   68,  608,  610,   68,
+       68,  611,  618,   68,  129,  612,  620,  613,  616,  619,
+      617,   68,  623,  622,  624,  625,  621,   68,   68,   68,
+       68,   68,  626,   68,  630,  628,  631,   68,   68,   68,
+      627,   68,  632,  635,   68,  637,   68,   68,   68,  638,
+      134,  634,  629,   68,   68,  633,   68,  640,   68,   68,
+       68,   68,  639,  650,  636,   68,   68,   68,   68,   68,
+      654,  657,  643,  641,   68,  651,  653,   68,  127,   68,
+
+      642,   68,  655,  656,  644,  665,  645,   68,   68,  658,
+      646,  652,  647,  659,   68,   68,   68,  648,  663,  661,
+      666,  662,  649,  660,   68,   68,   68,  667,  671,  664,
+       68,   68,  668,   68,  669,  672,   68,  675,  673,   68,
+       68,  677,   68,  674,  676,  680,   68,   68,  682,   68,
+       68,  681,  670,   68,  678,   68,   68,   68,  683,   68,
+       68,  679,  686,  685,   68,   68,   68,   68,  684,  695,
+      691,   68,   68,  689,   68,  687,  688,   68,  690,   68,
+      694,  693,   68,   68,   68,  125,  692,  699,  700,  701,
+       68,  696,   68,  703,  698,  697,  704,   68,  705,  702,
+
+      709,   68,  706,   68,   68,  707,   68,   68,  708,   68,
+       68,   68,   68,  713,   68,   68,   68,  715,   68,  716,
+       68,  717,  711,   68,   68,  721,  710,  720,   68,  712,
+      719,   68,  714,   68,  718,   68,  723,   68,  722,   68,
+       68,  724,  728,   68,   68,  729,   68,  731,   68,  734,
+      725,  735,  727,   68,   68,  726,   68,  732,  737,   68,
+      733,  730,   68,   68,   68,  741,   68,   68,  736,   68,
+       68,   68,   68,   68,   68,  749,  740,  739,  750,  743,
+       68,  738,   68,   68,  742,   68,  744,  746,   68,  747,
+      751,   68,  748,   68,   68,   68,  745,  755,  754,   68,
+
+      759,   68,  752,   68,   68,  753,   68,   68,  763,   68,
+      757,   68,  761,  756,  764,   68,   68,   68,  758,  767,
+       68,  760,  765,   68,  762,  766,   68,   68,  770,  769,
+       68,   68,  772,   68,   68,  768,   68,  774,   68,   68,
+      775,  778,   68,   68,   68,  771,   68,   68,   68,  773,
+       68,  776,  783,  777,  779,  787,   68,   68,  780,  786,
+       68,   68,  782,  784,  781,  789,   68,  785,  792,   68,
+      788,  791,  793,   68,   68,  795,   68,   68,  798,   68,
+      799,  790,   68,   68,   68,   68,  797,  800,  794,  796,
+      801,   68,  802,  803,   68,   68,   68,  807,  808,  804,
+
+       68,   68,   68,   68,   68,  809,   68,   68,  810,  805,
+      811,   68,   68,   68,  806,  812,  816,  813,  815,  814,
+      819,  817,   68,   68,  820,   68,   68,  821,   68,  818,
+       68,  823,  827,   68,   68,  829,   68,   68,   68,   68,
+      824,  822,  830,  831,  833,   68,  825,   68,   68,  828,
+      835,   68,   68,  836,   68,  826,  832,  837,   68,  839,
+       68,   68,   68,  842,   68,   68,  841,  834,  840,   68,
+      846,  844,  838,  847,   68,   68,  845,   68,   68,  848,
+      849,   68,  843,   68,   68,   68,  850,  853,   68,   68,
+      856,   68,   68,   68,  852,   68,   68,  860,   68,   68,
+
+      851,   68,   68,   68,  854,   68,   68,  864,   68,   68,
+      859,  857,  855,  858,  866,  869,  867,   68,  861,  863,
+      868,   68,  872,  873,  862,  870,  865,   68,   68,  871,
+       68,   68,   68,   68,  874,   68,   68,   68,   68,   68,
+       68,  879,  875,  882,   68,   68,   68,   68,   68,   68,
+       68,  876,   68,  878,  885,  880,  890,  889,  881,  877,
+       68,  886,  883,  887,  884,  891,  888,   68,  892,   68,
+       68,   68,   68,   68,  898,  899,  893,  895,  897,   68,
+       68,   68,  900,   68,  894,  901,   68,   68,  903,   68,
+      902,  896,  906,  908,   68,   68,  907,   68,   68,   68,
+
+       68,  904,  914,   68,   68,   68,   68,   68,  905,  913,
+       68,   68,   68,   68,  909,   68,  922,  910,   68,  912,
+      919,   68,  924,  915,  916,  911,  923,   68,  921,  917,
+      918,   68,   68,  920,  931,   68,   68,   68,  927,   68,
+      925,  926,  928,   68,  932,  935,   68,  933,   68,  939,
+       68,  930,   68,  937,   68,  929,   68,  934,   68,  938,
+      940,   68,  941,   68,  936,   68,   68,  943,  942,   68,
+       68,  944,   68,  949,   68,  947,   68,  945,   68,  951,
+       68,   68,   68,  946,   68,   68,  954,  948,   68,   68,
+      956,   68,  953,   68,  959,   68,  950,   68,   68,   68,
+
+      963,   68,  952,  955,  964,  958,  957,  965,  967,  960,
+       68,   68,   68,   68,   68,  961,   68,  962,  969,   68,
+      970,  966,   68,  972,  968,   68,   68,   68,  973,  975,
+       68,  978,  976,   68,   68,  971,   68,   68,  979,  980,
+       68,  984,  981,  983,  977,  974,   68,   68,  985,   68,
+       68,   68,  982,  987,  990,   68,  989,   68,   68,   68,
+      993,   68,  992,  994,   68,   68,   68,  986,   68,   68,
+      988,   68, 1001,   68,   68,   68,   68,   68,  991,  134,
+      999, 1005,  995,  998, 1000,  996,  997,   68,   68,   68,
+       68, 1011,   68, 1002, 1003, 1007, 1004,   68, 1008,   68,
+
+     1012, 1009, 1006,   68, 1013,   68, 1010,   68,   68,   68,
+     1020, 1021,   68,   68, 1015,   68,   68, 1017, 1019, 1014,
+     1018,   68,   68,   68,   68,   68, 1016,   68, 1028, 1023,
+       68,   68, 1035, 1022,   68, 1030, 1025,   68,   68, 1024,
+       68, 1029, 1027,   68, 1037,   68, 1031, 1032, 1026,   68,
+     1033, 1038, 1034,   68, 1040,   68,   68,   68, 1036,   68,
+       68,   68, 1048, 1039, 1042, 1044, 1041,   68, 1045,   68,
+     1043,   68,   68,   68, 1046,   68,   68, 1052,   68, 1047,
+     1053, 1054,   68, 1055,   68, 1049,   68, 1059,   68, 1050,
+       68, 1056, 1051,   68,   68, 1063,   68,   68, 1067,   68,
+
+       68, 1058,  132,   68, 1060, 1061, 1062, 1057, 1064, 1066,
+       68, 1069,   68, 1068,   68, 1065, 1071,   68,   68,   68,
+       68,   68,   68, 1070, 1073,   68,   68,   68,   68, 1074,
+     1072, 1077,   68, 1075, 1078, 1082,   68, 1076, 1083,   68,
+       68,   68, 1081,   68, 1087,   68,   68, 1079, 1080, 1089,
+       68, 1090,   68, 1084,   68,   68,  130, 1092, 1085, 1091,
+     1086, 1088,   68,   68, 1094, 1096, 1093, 1098,   68,   68,
+       68, 1097, 1095,   68, 1099, 1100,   68,   68,   68,   68,
+       68,   68,   68, 1110,   68,   68,   68, 1112, 1101, 1102,
+     1103,   68,   68, 1115,   68, 1104, 1108, 1105, 1106, 1107,
+
+     1114,   68, 1109,   68,   68,   68,   68, 1120,   68,   68,
+     1117, 1111, 1113, 1118,   68, 1124, 1116,   68,   68, 1123,
+       68,   68, 1127,   68,   68, 1122,   68, 1129, 1126, 1128,
+       68, 1119,   68,   68, 1121,   68, 1134, 1125,   68,   68,
+       68,   68, 1131,   68, 1140,   68, 1130, 1138,   68,   68,
+     1132,   68, 1139, 1135,   68, 1137, 1143,   68, 1136, 1133,
+     1141, 1146, 1147,   68,   68, 1142,   68, 1148, 1145, 1144,
+     1150, 1149,   68, 1153,   68,   68, 1152, 1151,   68,   68,
+       68,   68, 1158, 1155, 1160,   68, 1154,   68,   68,   68,
+       68,  129, 1156, 1162, 1163,   68, 1164,   68,   68,   68,
+
+     1161,   68,   68,   68, 1165, 1167, 1157, 1159, 1166,   68,
+     1168,   68,   68,   68, 1169, 1172,   68,   68,   68,  127,
+       68,   68, 1173, 1170, 1171, 1177, 1174,   68, 1179,   68,
+     1181, 1175, 1178,   68, 1180,   68,   68, 1176,   68, 1186,
+       68, 1182,   68, 1189,   68, 1184,   68, 1185,   68,   68,
+     1191,   68,   68, 1183, 1192, 1193,   68, 1187, 1188,   68,
+       68, 1196,   68, 1190,   68,   68, 1194,   68,   68,   68,
+       68, 1195,   68, 1197,   68,   68,   68, 1199,   68, 1200,
+     1201, 1205,   68, 1198, 1202,   68,   68, 1206, 1209,   68,
+     1203, 1208, 1204, 1207, 1210,   68,   68,   68,   68, 1213,
+
+       68, 1212,   68, 1214, 1211, 1215, 1217, 1216, 1218,   68,
+       68, 1222,   68,   68, 1219,   68,   68, 1224,   68,   68,
+       68, 1220,   68, 1225, 1221,   68,   68, 1226, 1227, 1228,
+     1223,   68, 1229, 1230,   68, 1231,   68,   68,   68, 1236,
+       68, 1233, 1234,   68,   68,   68, 1232,   68,   68, 1238,
+     1239, 1235, 1243,   68,   68,   68, 1237, 1242, 1245,   68,
+     1240,   68,   68, 1244,   68, 1247,   68, 1248, 1250,   68,
+       68,   68, 1241,   68, 1246, 1252,   68, 1249, 1251, 1253,
+       68,   68, 1254, 1255,   68, 1258,   68,   68,   68, 1257,
+       68, 1256, 1260,   68,   68, 1266,   68,   68, 1263,   68,
+
+       68, 1259,   68, 1267,   68, 1262,   68, 1269,   68,   68,
+       68, 1261, 1264, 1265,   68, 1268,   68,   68, 1278,   68,
+       68,   68,   68, 1279,   68, 1271,   68, 1283, 1276, 1274,
+     1270, 1272,   68, 1273, 1280, 1275, 1281, 1282, 1277, 1284,
+       68, 1285,   68, 1287,   68, 1286, 1288,   68, 1289,   68,
+       68, 1291,   68, 1292,   68,   68,   68, 1295,   68,   68,
+       68, 1294, 1297,   68,   68,   68, 1299,   68, 1300, 1290,
+       68, 1301, 1303,   68, 1293,   68, 1305,   68, 1296,   68,
+     1308,   68, 1298, 1307,   68,   68, 1302, 1310,   68,   68,
+     1306,   68, 1312,   68, 1304,   68,   68,   68, 1313,   68,
+
+     1315,   68,   68, 1309,   68, 1314, 1319,   68,   68, 1324,
+     1317, 1311,   68, 1321,   68,   68, 1322, 1320,   68, 1325,
+     1318, 1316, 1323,   68, 1328, 1329,   68, 1327,   68, 1330,
+       68,   68, 1326,   68,   68,   68, 1334, 1331,   68, 1335,
+       68, 1332,   68, 1333, 1337,   68, 1338,   68,   68, 1340,
+       68,   68, 1339,   68, 1341, 1336,   68, 1344,   68, 1343,
+       68,   68, 1345, 1346, 1342, 1347,   68,   68,   68,   68,
+       68, 1349, 1348, 1351,   68, 1350, 1354,   68, 1519, 1353,
+       68,   68, 1358, 1355,   68, 1357, 1356,   68, 1352,   68,
+       68, 1360, 1359,   68, 1361, 1362,   68,   68, 1364,   68,
+
+     1365,   68, 1363, 1366,   68, 1367, 1368,   68,   68,   68,
+     1371,   68, 1372,   68, 1370, 1374,   68,   68,   68,   68,
+       68, 1376,   68, 1375, 1379,   68,   68, 1378, 1373, 1369,
+     1380,   68, 1381,   68, 1377,   68,   68,   68, 1382,   68,
+       68,   68, 1389,   68,   68, 1387,   68,   68, 1384, 1385,
+       68, 1386,   68, 1383,   68, 1390,   68,   68,   68,   68,
+       68, 1388, 1397, 1393, 1398, 1399,   68, 1392, 1395,   68,
+     1391, 1400,   68,   68, 1396,   68, 1394,   68, 1401,   68,
+       68,   68, 1403,   68, 1405,   68, 1408, 1402, 1409,   68,
+     1410,   68,   68, 1404, 1412,   68,   68, 1406, 1407, 1411,
+
+     1418, 1413, 1417,   68,   68,   68,   68,   68,   68, 1414,
+       68, 1415,   68,   68,   68, 1416, 1425, 1426,   68,   68,
+       68, 1420, 1419,   68,   68,   68, 1421, 1429, 1422, 1423,
+     1431,   68, 1424, 1432, 1427, 1433,   68, 1430, 1428, 1434,
+       68,   68, 1435,   68,   68,   68,   68, 1436,   68, 1438,
+     1439,   68, 1437,   68,   68,   68, 1441,  125, 1443, 1444,
+     1446,   68, 1447,   68, 1448, 1440, 1442, 1449,   68,   68,
+     1445, 1450,   68, 1451,   68,   68,   68,   68,   68, 1452,
+       68, 1453,   68, 1454,   68,   68,   68, 1457, 1456, 1459,
+       68,   68, 1455,   68,   68, 1464, 1458,   68,   68, 1462,
+
+       68,   68, 1463, 1460, 1461,   68, 1465, 1469,   68,   68,
+     1470, 1471,   68,   68, 1473,   68,   68, 1466,   68,   68,
+     1467, 1472,   68, 1477, 1468, 1474, 1478,   68, 1475,   68,
+     1480,   68,   68, 1476, 1481, 1482,   68, 1483,   68, 1479,
+     1484,   68,   68, 1487, 1488,   68,   68,   68,   68,   68,
+     1485, 1489, 1490,   68,   68,   68, 1486,   68, 1493, 1497,
+       68,   68,   68,   68,   68, 1501, 1491, 1492,   68, 1502,
+     1499, 1496, 1494,   68,   68, 1495,   68,   68,   68, 1504,
+     1498,   68, 1500,   68,   68,   68, 1510, 1507,   68, 1503,
+     1512,   68,   68,   68, 1514,   68, 1505, 1513,   68,   68,
+
+       68, 1508,   68, 1506, 1509, 1515, 1511, 1516, 1517,   68,
+       68, 1521, 1518,   68, 1520,   68,   68,   68,   68,   68,
+     1523, 1528, 1522, 1525, 1526, 1524,   68, 1530,   68,   68,
+       68, 1533,   68,   68,   68, 1527,   68, 1534,   68,   68,
+       68,   68,   68, 1529, 1539, 1532,   68, 1535, 1531, 1538,
+     1536, 1541,   68, 1543,   68, 1537,   68,   68, 1545,   68,
+     1548, 1542, 1544,   68, 1547,   68, 1540, 1550,   68, 1551,
+       68,   68,   68,   68, 1555,   68, 1546,   68,   68,   68,
+     1559,   68,   68, 1557, 1553,   68,   68, 1549,   68, 1556,
+     1552, 1562,   68, 1554, 1563,   68,   68, 1583, 1558, 1560,
+
+     1561, 1565, 1566,   68, 1698, 1564, 1568,   68, 1567, 1569,
+       68, 1570,   68,   68, 1572,   68,   68, 1573, 1571, 1574,
+       68,   68, 1576,   68,   68,   68, 1579,   68,   68, 1577,
+     1575,   68,   68, 1578,   68,   68, 1580, 1581,   68,   68,
+     1589,   68,   68, 1587, 1590,   68, 1582, 1592,   68,   68,
+       68, 1584, 1585, 1591, 1593,   68, 1586, 1595,   68, 1588,
+       68,   68, 1598,   68,   68,   68,   68, 1599,   68, 1594,
+       68, 1602, 1698, 1603, 1698, 1596, 1605,   68,   68, 1597,
+     1600, 1606,   68, 1607,   68, 1601, 1608,   68, 1611, 1604,
+     1609,   68, 1610,   68,   68,   68,   68,   68,   68,   68,
+
+     1613,   68,   68, 1617,   68,   68,   68,   68, 1612,   68,
+       68, 1625,   68, 1616,   68, 1614, 1615, 1619, 1626, 1627,
+     1621, 1618, 1622,   68, 1620, 1624,   68,   68, 1628, 1631,
+       68,   68, 1623,   68,   68, 1635, 1636,   68,   68,   68,
+       68,   68, 1630,   68, 1632,   68, 1633,   68,   68,   68,
+     1638, 1629, 1634, 1637,   68,   68, 1648, 1639,   68, 1640,
+     1642, 1643, 1641, 1645,   68,   68,   68,   68, 1644, 1646,
+     1649, 1650, 1651, 1647,   68, 1653, 1654,   68,   68,   68,
+       68,   68, 1658,   68,   68, 1655,   68,   68,   68,   68,
+       68, 1661,   68, 1652,   68, 1665,   68, 1660, 1656,   68,
+
+     1657, 1666, 1659, 1664,   68, 1668, 1671, 1662, 1663,   68,
+     1669, 1667,   68,   68, 1673,   68,   68, 1670,   68,   68,
+       68,   68,   68, 1674,   68, 1675, 1677, 1679,   68, 1680,
+       68,   68, 1672,   68, 1683,   68,   68, 1686, 1676, 1678,
+     1687,   68, 1689,   68,   68, 1690,   68, 1681,   68, 1682,
+     1684, 1688,   68,   68, 1685, 1691,   68, 1692, 1693,   68,
+     1696,   68, 1697,   68, 1698, 1698, 1698, 1698, 1698, 1698,
+     1698, 1698, 1698, 1698, 1698, 1694, 1698, 1698, 1695,   40,
        40,   40,   40,   40,   40,   40,   45,   45,   45,   45,
-
        45,   45,   45,   50,   50,   50,   50,   50,   50,   50,
+
        56,   56,   56,   56,   56,   56,   56,   61,   61,   61,
-       61,   61,   61,   61,   71,   71, 1654,   71,   71,   71,
-       71,  123,  123, 1654, 1654, 1654,  123,  123,  125,  125,
-     1654, 1654,  125, 1654,  125,  127, 1654, 1654, 1654, 1654,
-     1654,  127,  130,  130, 1654, 1654, 1654,  130,  130,  132,
-     1654, 1654, 1654, 1654, 1654,  132,  134,  134, 1654,  134,
-      134,  134,  134,   72,   72, 1654,   72,   72,   72,   72,
-       13, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654,
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654,
-
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654,
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654
+       61,   61,   61,   61,   71,   71, 1698,   71,   71,   71,
+       71,  124,  124, 1698, 1698, 1698,  124,  124,  126,  126,
+     1698, 1698,  126, 1698,  126,  128, 1698, 1698, 1698, 1698,
+     1698,  128,  131,  131, 1698, 1698, 1698,  131,  131,  133,
+     1698, 1698, 1698, 1698, 1698,  133,  135,  135, 1698,  135,
+      135,  135,  135,   72,   72, 1698,   72,   72,   72,   72,
+       13, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
+
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698
     } ;
 
-static yyconst flex_int16_t yy_chk[3321] =
+static yyconst flex_int16_t yy_chk[3411] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1349,365 +1376,375 @@ static yyconst flex_int16_t yy_chk[3321] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    3,
         3,    3,    4,    4,    4,   49,    5,    5,   49,    3,
         5,   15,    4,    6,    6,   15,    5,    6,    9,    9,
-        9,  151,   33,    6,    7,    7,    7,    7,    9,    7,
+        9,  152,   33,    6,    7,    7,    7,    7,    9,    7,
        10,   10,   10,   44,   44,    7,    8,    8,    8,    8,
-       10,    8,   21,   33,  151,   21,   21,    8,   11,   11,
-       11,   11,   11,   11, 1660,   20,   29,   20,   20,   11,
+       10,    8,   21,   33,  152,   21,   21,    8,   11,   11,
+       11,   11,   11,   11, 1704,   20,   29,   20,   20,   11,
 
        20,   29,   24,   21,   25,   20,   24,   28,   11,   12,
        12,   12,   12,   12,   12,   74,   22,   22,   74,   25,
        12,   69,   28,   30,   22,   69,   24,   26,   26,   12,
-       19,   22,   19,   19,   66,   19,   26,  110,   30,   27,
+       19,   22,   19,   19,   66,   19,   26,  638,   30,   27,
        19,   19,   23,   27,   60,   60,   27,   23,   66,   31,
-       31,   23,  110,   27,   23,   27,   23,   23,   31,   75,
-       32,   32,   34,   75,   31,   32,   76,   35,   31,   36,
-       77,   34,   35,   77,   36,   37,   37,   34,   37,  101,
-       34,   32,   35,   38,   36,   35,   76,   34,   36,   36,
-       39,   39,  101,   37,  173,   39,   55,   38,   55,   55,
-
-      173,   55,   38,   63,   78,   63,   63,   65,   63,   65,
-       65,   79,   65,   68,   63,   68,   68,   82,   68,   80,
-       81,   83,   78,   68,   71,   79,   71,   71,   84,   71,
-       85,   80,   86,   84,   71,   71,   87,   88,   81,   82,
-       83,   89,   90,   91,   85,   89,   84,   90,   94,   97,
-       92,  631,   86,   92,   87,   88,   92,   91,   93,   95,
-       98,  104,   96,   93,   95,   96,  103,   94,   99,   96,
-       92,  100,   99,   97,   98,  102,  105,  106,  100,  103,
-      105,  104,  102,  107,   95,  108,  109,  111,  107,  112,
-      114,  113,  107,  115,  115,  106,  113,  116,  118,  109,
-
-      117,  119,  114,  119,  120,  108,  111,  112,  121,  120,
-      122,  124,  124,  132,  115,  116,  117,  140,  126,  118,
-      121,  126,  131,  131,  119,  140,  139,  128,  122,  128,
-      128,  133,  128,  133,  133,  134,  133,  134,  134,  136,
-      134,  139,  136,  137,  138,  141,  134,  142,  137,  138,
-      143,  149,  144,  145,  176,  143,  143,  144,  145,  146,
-      141,  146,  148,  148,  150,  154,  153,  142,  152,  150,
-      149,  153,  152,  155,  157,  156,  176,  160,  158,  154,
-      130,  146,  147,  158,  159,  159,  147,  156,  155,  161,
-      156,  147,  157,  162,  163,  163,  147,  160,  162,  167,
-
-      166,  164,  147,  147,  159,  161,  164,  174,  165,  166,
-      168,  169,  164,  165,  170,  168,  169,  171,  172,  170,
-      167,  178,  171,  175,  177,  172,  179,  174,  180,  175,
-      181,  182,  177,  180,  183,  184,  178,  186,  185,  183,
-      185,  188,  187,  191,  186,  189,  179,  187,  191,  182,
-      182,  192,  181,  190,  190,  184,  192,  189,  194,  193,
-      188,  193,  195,  196,  197,  199,  191,  198,  200,  197,
-      194,  196,  198,  202,  201,  129,  203,  208,  193,  203,
-      199,  195,  201,  204,  204,  205,  200,  209,  205,  206,
-      206,  207,  207,  208,  210,  211,  212,  210,  202,  211,
-
-      214,  213,  209,  215,  215,  212,  213,  216,  217,  218,
-      219,  220,  216,  217,  214,  222,  222,  221,  223,  224,
-      225,  226,  227,  224,  230,  229,  231,  227,  219,  218,
-      221,  228,  220,  226,  228,  231,  223,  229,  225,  232,
-      233,  230,  234,  235,  230,  235,  235,  236,  236,  237,
-      238,  239,  237,  233,  234,  240,  241,  241,  242,  244,
-      232,  243,  243,  242,  240,  245,  239,  238,  246,  247,
-      238,  248,  249,  246,  244,  249,  248,  249,  250,  251,
-      255,  252,  253,  254,  256,  245,  265,  253,  254,  247,
-      252,  257,  250,  258,  259,  251,  260,  259,  251,  263,
-
-      251,  255,  264,  262,  256,  265,  257,  258,  263,  266,
-      260,  267,  269,  259,  261,  268,  261,  261,  262,  270,
-      268,  271,  272,  264,  266,  273,  261,  272,  261,  261,
-      261,  267,  269,  261,  270,  274,  271,  275,  276,  277,
-      278,  278,  275,  278,  277,  273,  279,  280,  281,  274,
-      283,  282,  283,  284,  276,  285,  286,  284,  287,  288,
-      295,  295,  127,  280,  281,  282,  279,  287,  288,  289,
-      286,  290,  291,  285,  289,  290,  297,  292,  293,  294,
-      287,  291,  292,  294,  293,  296,  298,  298,  299,  297,
-      296,  300,  301,  299,  302,  303,  304,  304,  305,  303,
-
-      306,  301,  310,  305,  307,  307,  302,  309,  309,  311,
-      312,  315,  300,  313,  316,  317,  319,  311,  321,  312,
-      322,  306,  318,  310,  319,  313,  323,  318,  320,  317,
-      325,  315,  326,  320,  316,  324,  321,  326,  327,  324,
-      328,  331,  322,  330,  334,  325,  332,  323,  336,  333,
-      338,  332,  333,  342,  327,  339,  332,  331,  125,  328,
-      329,  329,  340,  330,  334,  338,  329,  339,  329,  335,
-      335,  337,  337,  336,  341,  342,  329,  340,  343,  344,
-      345,  346,  348,  343,  351,  347,  329,  348,  344,  347,
-      349,  350,  353,  341,  352,  352,  346,  351,  354,  345,
-
-      355,  356,  349,  355,  353,  357,  358,  359,  357,  350,
-      354,  359,  359,  360,  361,  361,  356,  362,  362,  363,
-      364,  364,  358,  367,  363,  358,  360,  365,  365,  366,
-      368,  373,  369,  370,  366,  368,  369,  371,  370,  376,
-      372,  371,  374,  375,  367,  372,  377,  374,  375,  377,
-      379,  373,  380,  376,  377,  378,  378,  381,  377,  384,
-      382,  383,  381,  384,  383,  385,  380,  386,  379,  382,
-      385,  387,  388,  390,  389,  391,  387,  395,  390,  392,
-      386,  391,  392,  396,  393,  384,  389,  393,  388,  394,
-      398,  397,  406,  398,  394,  395,  397,  396,  399,  402,
-
-      400,  401,  408,  399,  400,  400,  401,  403,  402,  404,
-      403,  406,  409,  404,  404,  405,  407,  405,  407,  410,
-      408,  411,  412,  413,  414,  403,  412,  415,  416,  417,
-      409,  418,  413,  420,  417,  419,  419,  420,  410,  414,
-      421,  411,  422,  416,  423,  415,  424,  422,  425,  426,
-      418,  421,  427,  429,  430,  428,  426,  427,  429,  430,
-      423,  425,  428,  431,  432,  424,  433,  435,  434,  438,
-      436,  432,  435,  436,  437,  433,  439,  439,  437,  441,
-      443,  431,  434,  442,  441,  439,  444,  442,  445,  446,
-      438,  447,  443,  450,  453,  457,  445,  456,  458,  463,
-
-      459,  457,  458,  462,  444,  459,  456,  446,  450,  461,
-      464,  453,  470,  464,  461,  470,  447,  448,  465,  465,
-      466,  462,  448,  468,  463,  473,  448,  466,  123,  448,
-      467,  467,  469,  469,  472,  474,  448,  478,  468,  448,
-      460,  460,  460,  471,  460,  473,  477,  460,  471,  475,
-      476,  476,  460,  472,  474,  478,   67,  475,  460,  460,
-      479,  477,  480,  480,  481,  479,  482,  483,  484,  481,
-      483,  482,  485,  486,  484,  487,  489,  488,  490,  490,
-      485,  486,  488,  489,  491,  492,  493,  496,  495,  498,
-      492,  495,  491,  487,  497,  497,  499,  501,  502,  499,
-
-      503,  496,  504,  502,  498,  493,  505,  499,  507,  506,
-      508,  511,  509,  510,  508,  514,  616,  507,  501,  512,
-      511,  503,  504,  515,  519,  513,  522,  616,  505,  506,
-      509,  513,  510,  512,  516,  514,  517,  515,  518,  516,
-      520,  517,  518,  519,  521,  523,  523,  522,  524,  521,
-      526,  525,  520,  524,  525,  528,  527,  529,  530,  530,
-      528,  531,  531,  532,  534,  535,  533,  536,  526,  527,
-      533,  538,  539,  540,  542,  538,  541,  529,  532,  542,
-      543,  536,  544,  534,  545,  546,   61,  539,  545,  535,
-      537,  541,  547,  537,  543,  537,  544,  547,  540,  537,
-
-      546,  537,  549,  548,  550,  551,  537,  547,  548,  552,
-      555,  537,  553,  556,   56,  552,  549,  553,  556,  551,
-      554,  554,  555,  557,  558,  550,  554,  560,  554,  559,
-      559,  561,  560,  562,  563,  569,  558,  557,  565,  561,
-      564,  564,  565,  567,  570,  571,  554,  562,  567,  568,
-      571,  572,  568,  563,  569,  573,  574,  570,  575,  576,
-      577,  578,  580,  579,  576,  574,  582,  580,  583,  584,
-      572,  573,  579,  585,  586,  578,  587,  575,  585,  586,
-      577,  587,  588,  596,  584,  582,  583,  589,  589,  590,
-      594,  588,  592,  594,  590,  595,  592,  592,  593,  593,
-
-      598,  597,  593,  596,  597,  606,  599,  600,  601,  602,
-      595,  599,  600,  603,  601,  604,  604,  605,  608,  603,
-      609,  598,  610,  606,  607,  602,  605,  607,  611,  612,
-      613,  614,  617,  618,  612,  613,  608,  615,  618,  609,
-      615,  611,  610,  619,  617,  620,  621,  621,  619,  614,
-      622,  623,  624,  625,  626,  628,  629,  625,  627,  632,
-      620,  633,  634,  635,  624,  623,  636,  627,  635,  622,
-      637,  636,  626,  632,  628,  637,  633,  638,  639,  640,
-      641,  629,  634,  642,  640,  643,  644,  645,  645,  646,
-      647,  638,  639,  648,  650,  641,  647,  649,  649,  650,
-
-      643,  651,  642,  652,  654,  644,  653,  646,  651,  653,
-      655,  656,  657,  648,  659,  658,  656,  652,  661,  655,
-      658,  660,  654,  662,  663,  660,  666,  661,  664,  665,
-      667,  657,  668,  659,  669,  664,  671,  670,  662,  663,
-      669,  665,  674,  675,  672,  666,  676,  674,  677,   51,
-      668,  667,  670,  672,  676,  678,  671,  675,  679,  680,
-      678,  682,  679,  679,  681,  681,  683,  684,  677,  685,
-      685,  686,  684,  691,  682,  683,  686,  687,  680,  688,
-      688,  689,  687,  690,  692,  701,  693,  691,  690,  694,
-      689,  693,  695,  698,  694,  696,  697,  695,  702,  696,
-
-      701,  703,  692,  700,  698,  697,  704,  700,  706,  705,
-      697,  707,  697,  708,  697,  703,  702,  705,  709,  709,
-      710,  714,  706,  711,  711,  704,  714,  713,  715,  707,
-      713,  716,  716,  717,  719,  710,  718,  718,  708,  719,
-      720,  720,  721,  722,  723,  724,  726,  715,  722,  728,
-      724,  727,  723,  717,  725,  725,  728,  727,  730,  734,
-      731,  732,  721,  730,  726,  731,  732,  733,  734,  735,
-      736,  738,  733,  737,  737,  739,  741,  740,  746,  742,
-      745,  736,  740,  743,  744,  744,  747,  748,  735,  749,
-      750,  738,  748,  758,  761,  750,  741,  758,  739,  742,
-
-      745,  743,  752,  746,  747,  753,  752,  752,  754,  755,
-      756,  755,  749,  757,  753,  759,  754,  760,  757,  762,
-      761,  764,  763,  765,  756,  766,  759,  763,  767,  766,
-      768,  769,  770,  771,  772,  773,  760,  762,  776,  764,
-      773,  780,  778,  765,  774,  769,  767,  770,  771,  768,
-      775,  774,  777,  772,  779,  775,  776,  778,  781,  782,
-      779,  777,  780,  781,  782,  783,  784,  784,  786,  786,
-      783,  787,  788,  789,  790,  791,  793,  788,  794,  791,
-      791,  792,  792,  795,  796,  797,  799,  789,  800,  787,
-      803,  797,  801,  790,  798,  793,  802,  794,  804,  798,
-
-      811,  805,  808,  796,  803,  799,  808,  800,  809,  795,
-      815,  801,  806,  806,  810,  802,  805,  807,  818,  804,
-      811,  809,  807,  810,  812,  812,  813,  831,  814,  816,
-      815,  813,  814,  820,  816,  836,  818,  822,  820,  821,
-      821,  830,  822,  824,  824,  826,  826,  828,  829,  829,
-      828,  832,  831,  833,  834,  836,  830,  838,  833,  835,
-      835,  837,  837,  839,  840,  832,  841,  842,  840,  834,
-      844,  847,  842,  845,  839,  846,  846,  848,  849,  838,
-      850,  851,  850,  853,  852,  841,  851,  845,  844,  852,
-      854,  847,  855,  856,  856,  854,  857,  848,  849,  859,
-
-      860,  860,  857,  853,  861,  862,  855,  864,  863,  866,
-      865,  863,  864,  868,  863,  865,  861,  867,  866,  871,
-      871,  869,  867,  859,  869,  862,  863,  870,  872,  873,
-      874,  875,  870,  877,  876,  878,  875,  881,  868,  876,
-      878,  879,  879,  882,  880,  883,  872,  884,  873,  880,
-      874,  888,  885,  886,  887,  881,  877,  889,  890,  887,
-      893,  884,  892,  882,  885,  883,  886,  892,   50,  894,
-      896,  888,  895,  899,  899,  893,  894,  889,  902,  890,
-      900,  895,  901,  900,  895,  904,  896,  901,  903,  905,
-      906,  907,  908,  908,  902,  909,  907,  903,  905,  906,
-
-      910,  905,  911,  912,  904,  913,  914,  915,  915,  916,
-      917,  919,   45,  910,  920,  909,  919,  912,  921,  923,
-      911,  922,  925,  921,  914,  916,  924,  922,  917,  929,
-      913,  924,  920,  926,  930,  925,  926,  929,  931,  923,
-      932,  933,  926,  935,  934,  937,  933,  930,  938,  939,
-      940,  943,  938,  941,  939,  940,  931,  942,  941,  932,
-      934,  935,  944,  945,  945,  937,  942,  946,  947,  951,
-      948,  949,  950,  952,  943,  954,  949,  944,  954,  952,
-      947,  946,  948,  957,  950,  953,  953,  951,  955,  955,
-      958,  958,  957,  959,  960,  961,  962,  963,  964,  960,
-
-      965,  966,  967,  964,  961,  959,  968,  968,  962,  965,
-      969,  970,  963,   40,  971,  969,  972,  967,  973,  973,
-      974,  966,  965,  975,  975,  976,  976,  977,  982,  978,
-      984,  977,  970,  971,  978,  979,  972,  981,  979,  983,
-      974,  989,  981,  990,  983,  988,  982,  985,  985,  986,
-      986,  987,  991,  992,  993,  984,  987,  988,  988,  988,
-      995,  989,  997,  990,  988,  994,  994,  992,  996,  996,
-      999, 1002,  991, 1000, 1000,  993, 1001, 1004, 1002,  999,
-     1003, 1006,  997, 1005, 1005, 1007,  995, 1009, 1010, 1003,
-     1011, 1001, 1009, 1010, 1014, 1012, 1013, 1013, 1016, 1014,
-
-     1015, 1007, 1012, 1004, 1017, 1018, 1019, 1006, 1020, 1015,
-     1011, 1021, 1022, 1022, 1020, 1023, 1024, 1024, 1016, 1017,
-     1021, 1019, 1025, 1026, 1018, 1027, 1023, 1028, 1028, 1029,
-     1027, 1023, 1031, 1029, 1029, 1030, 1032, 1026, 1034, 1033,
-     1030, 1035, 1036, 1025, 1033, 1035, 1037, 1038, 1032, 1041,
-     1034, 1039, 1038, 1043, 1036, 1040, 1043,   14, 1031, 1049,
-     1040, 1041, 1044, 1044, 1045, 1045, 1046, 1053, 1049, 1047,
-     1048, 1037, 1046, 1039, 1047, 1051, 1048, 1055, 1057, 1053,
-     1051, 1056, 1056, 1058, 1059, 1060, 1061, 1064, 1062, 1055,
-     1061, 1063, 1058, 1062, 1066, 1066, 1063, 1067, 1057, 1068,
-
-     1069, 1064, 1059, 1074, 1060, 1075, 1066, 1076, 1068, 1069,
-     1071, 1071, 1076, 1077, 1082, 1067, 1078, 1078, 1074, 1075,
-     1079, 1082, 1079, 1080, 1080, 1083, 1084, 1084, 1085, 1086,
-     1077, 1087, 1088, 1090, 1089, 1091, 1092, 1085, 1095, 1096,
-     1095, 1101, 1094, 1087, 1088, 1083, 1089, 1094, 1090, 1097,
-     1086, 1099, 1100, 1100, 1102, 1091, 1092, 1096, 1097, 1102,
-     1103, 1104, 1103, 1105, 1106, 1099, 1104, 1101, 1105, 1107,
-     1108, 1109, 1111, 1112, 1114, 1108, 1109, 1113, 1113, 1117,
-     1118, 1115, 1106, 1116, 1123, 1116, 1114, 1112, 1117, 1107,
-     1115, 1111, 1118, 1115, 1120, 1121, 1124, 1123, 1125, 1120,
-
-     1121, 1127, 1129, 1130, 1131, 1136, 1132, 1127, 1129, 1133,
-     1133, 1134, 1135, 1135, 1125, 1132, 1124, 1137, 1130, 1139,
-     1134, 1137, 1138, 1141, 1136, 1140, 1140, 1138, 1144, 1131,
-     1147, 1141, 1139, 1145, 1145, 1146, 1146, 1144, 1148, 1149,
-     1150, 1150, 1147, 1152, 1149, 1153, 1154, 1155, 1156, 1157,
-     1153, 1159, 1159, 1156, 1158, 1160, 1148, 1161, 1162, 1160,
-     1163, 1164, 1155, 1162, 1166, 1167, 1168, 1157, 1152, 1154,
-     1158, 1169, 1161, 1171, 1173, 1173, 1170, 1175, 1174, 1176,
-     1164, 1174, 1177, 1178, 1178, 1168, 1163, 1166, 1170, 1167,
-     1175, 1181, 1169, 1176, 1171, 1177, 1179, 1179, 1180, 1180,
-
-     1182, 1182, 1183, 1183, 1181, 1184, 1184, 1185, 1186, 1186,
-     1187, 1187, 1188, 1190, 1191, 1191, 1192, 1195, 1190, 1193,
-     1193, 1194, 1196, 1195, 1203, 1196, 1185, 1197, 1197, 1198,
-     1198, 1188, 1199, 1200, 1200, 1192, 1202, 1202, 1205, 1194,
-     1204, 1204, 1206, 1197, 1207, 1208, 1209, 1205, 1210, 1207,
-     1203, 1199, 1211, 1212, 1206, 1213, 1214, 1211, 1215, 1209,
-     1219, 1216, 1221, 1217, 1213, 1214, 1216, 1217, 1212, 1210,
-     1208, 1221, 1215, 1222, 1222, 1226, 1223, 1224, 1224, 1227,
-     1219, 1223, 1229, 1230, 1231, 1229, 1224, 1235, 1230, 1238,
-     1226, 1227, 1232, 1232, 1234, 1234, 1236, 1236, 1237, 1239,
-
-       13, 1235, 1246, 1238, 1231, 1240, 1240, 1242, 1249, 1243,
-     1237, 1242, 1243, 1244, 1244, 1245, 1247, 1248, 1239, 1250,
-     1245, 1248, 1246, 1252, 1250, 1254, 1251, 1255, 1249, 1252,
-     1247, 1251, 1255, 1256, 1257, 1258, 1276, 1258, 1256, 1261,
-     1261, 1254, 1257, 1265, 1265, 1268, 1269, 1269, 1271, 1271,
-     1268, 1273, 1274, 1274, 1275, 1277, 1273, 1284, 1276, 1282,
-     1277, 1279, 1279, 1283, 1282, 1283, 1289, 1285, 1286, 1286,
-     1275, 1284, 1285, 1287, 1287, 1288, 1288, 1290, 1289, 1291,
-     1292, 1293, 1294, 1295, 1296, 1296, 1298, 1294, 1297, 1299,
-     1301, 1291, 1292, 1293, 1300, 1290, 1302, 1297, 1303, 1304,
-
-     1305, 1306, 1306, 1295, 1304, 1305, 1310, 1300, 1312, 1299,
-     1302, 1311, 1298, 1313, 1301, 1314, 1303, 1307, 1307, 1315,
-     1316, 1317, 1317, 1320, 1314, 1322, 1310, 1319, 1319, 1311,
-     1312, 1323, 1320, 1313, 1321, 1324, 1325, 1326, 1316, 1315,
-     1322, 1321, 1327, 1327, 1329, 1328, 1330, 1331, 1332, 1323,
-     1328, 1334, 1325, 1324, 1337, 1338, 1326, 1340, 1338, 1339,
-     1339, 1330, 1329, 1341, 1343, 1343, 1331, 1344, 1332, 1351,
-     1334, 1355, 1340, 1352, 1337, 1345, 1345, 1346, 1346, 1350,
-     1350, 1341, 1352, 1353, 1354, 1356, 1344, 1358, 1353, 1354,
-     1355, 1351, 1359, 1356, 1360, 1361, 1372, 1359,    0, 1360,
-
-     1362, 1362, 1358, 1363, 1363, 1372, 1364, 1365, 1365, 1369,
-     1361, 1364, 1366, 1366, 1369, 1370, 1371, 1373, 1374, 1370,
-     1375, 1371, 1376, 1379, 1378, 1375, 1374, 1378, 1381, 1380,
-     1382, 1384, 1373, 1386, 1376, 1383, 1383, 1381, 1387, 1382,
-     1384, 1379, 1380, 1388, 1389, 1389, 1390, 1391, 1391, 1392,
-     1395, 1393, 1386, 1396, 1401, 1390, 1393, 1392, 1387, 1395,
-     1398, 1398, 1388, 1402, 1402, 1403, 1396, 1407, 1403, 1404,
-     1404, 1405, 1405, 1408, 1401, 1406, 1406, 1409, 1410, 1410,
-     1411, 1417, 1409, 1414, 1411, 1407, 1418, 1408, 1419, 1414,
-     1420, 1418, 1423, 1421, 1422, 1422, 1424, 1425, 1417, 1417,
-
-     1426, 1426, 1427, 1427, 1424, 1428, 1419, 1421, 1429, 1430,
-     1420, 1423, 1431, 1429, 1432, 1433, 1425, 1434, 1438, 1436,
-     1445, 1428, 1436, 1432, 1439, 1439, 1440, 1444, 1449, 1430,
-     1440, 1441, 1443, 1449, 1455, 1433, 1438, 1434, 1431, 1444,
-     1441, 1443, 1450, 1450, 1451, 1445, 1453, 1454, 1457, 1456,
-     1459, 1453, 1458, 1451, 1456, 1455, 1454, 1458, 1460, 1460,
-     1462, 1463, 1464, 1464, 1465, 1466, 1457, 1467, 1465, 1468,
-     1469, 1471, 1470, 1473, 1466, 1459, 1463, 1470, 1469, 1462,
-     1472, 1472, 1475, 1467, 1474, 1474, 1478, 1475, 1468, 1477,
-     1477, 1479, 1473, 1480, 1480, 1481, 1481, 1471, 1482, 1483,
-
-     1484, 1485, 1485, 1486, 1487, 1488, 1478, 1489, 1490, 1487,
-     1494, 1483, 1489, 1479,    0, 1486, 1497, 1482, 1491, 1491,
-     1484, 1493, 1493, 1496, 1488, 1490, 1490, 1498, 1496, 1494,
-     1497,    0, 1498, 1499, 1499, 1500, 1500, 1501, 1501, 1502,
-     1504, 1504, 1506, 1506, 1502, 1508, 1508, 1509, 1512, 1513,
-     1513, 1517, 1509, 1514, 1516, 1518, 1512, 1519, 1514, 1516,
-     1520, 1521, 1524, 1525, 1525, 1536, 1521, 1526, 1526, 1517,
-     1538, 1518, 1527, 1540, 1519, 1519, 1527, 1531, 1531, 1533,
-     1536, 1520, 1524, 1533, 1535, 1535, 1539, 1539, 1538, 1541,
-     1542, 1543, 1544, 1545, 1546, 1546, 1543, 1544, 1540, 1549,
-
-     1549, 1551, 1551, 1553, 1541, 1554, 1554, 1557, 1556, 1558,
-     1559, 1542, 1545, 1556, 1558, 1553, 1560, 1561, 1565, 1566,
-     1569, 1557, 1565, 1567, 1568, 1570, 1571, 1572, 1574, 1559,
-     1573, 1573, 1577, 1561, 1560, 1575, 1567, 1574, 1569, 1566,
-     1575, 1570, 1572, 1568, 1576, 1578, 1582, 1579, 1580, 1576,
-     1583, 1571, 1579, 1584, 1585, 1587, 1586, 1577, 1584, 1585,
-     1578, 1582, 1580, 1588, 1589, 1590, 1591, 1592, 1587, 1583,
-     1586, 1593, 1594, 1596, 1597, 1597, 1595, 1594, 1589, 1591,
-     1592, 1595, 1588, 1598, 1590, 1601, 1599,    0, 1598, 1600,
-     1593, 1599, 1596, 1602, 1600, 1603, 1603, 1605, 1602, 1604,
-
-     1606, 1608, 1607, 1611, 1601, 1609, 1604, 1607, 1611, 1612,
-     1613, 1614, 1615, 1615, 1617,    0, 1605, 1616, 1609, 1606,
-     1608, 1622, 1616, 1626, 1614, 1618, 1618, 1620, 1612, 1613,
-     1619, 1619, 1620, 1617, 1621, 1623, 1623, 1624, 1625, 1628,
-     1622, 1621, 1626, 1627, 1624, 1625, 1630, 1631, 1627, 1632,
-     1633, 1630, 1631, 1634, 1634, 1635, 1636, 1639, 1628, 1637,
-     1637, 1638, 1638, 1648, 1639, 1640, 1640, 1649, 1632, 1633,
-     1641, 1641, 1642, 1644, 1635, 1636, 1647,    0, 1644, 1642,
-        0, 1647, 1648, 1650, 1650,    0, 1649, 1651, 1651, 1655,
-     1655, 1655, 1655, 1655, 1655, 1655, 1656, 1656, 1656, 1656,
-
-     1656, 1656, 1656, 1657, 1657, 1657, 1657, 1657, 1657, 1657,
-     1658, 1658, 1658, 1658, 1658, 1658, 1658, 1659, 1659, 1659,
-     1659, 1659, 1659, 1659, 1661, 1661,    0, 1661, 1661, 1661,
-     1661, 1662, 1662,    0,    0,    0, 1662, 1662, 1663, 1663,
-        0,    0, 1663,    0, 1663, 1664,    0,    0,    0,    0,
-        0, 1664, 1665, 1665,    0,    0,    0, 1665, 1665, 1666,
-        0,    0,    0,    0,    0, 1666, 1667, 1667,    0, 1667,
-     1667, 1667, 1667, 1668, 1668,    0, 1668, 1668, 1668, 1668,
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654,
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654,
-
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654,
-     1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654
+       31,   23,   76,   27,   23,   27,   23,   23,   31,   75,
+       32,   32,   34,   75,   31,   32,   37,   37,   31,   37,
+       36,   34,   76,   35,   35,   36,  133,   34,   35,   38,
+       34,   32,   79,   77,   37,   36,   77,   34,   35,   36,
+       36,   35,   90,   38,   39,   39,   79,   90,   38,   39,
+
+       55,   82,   55,   55,   63,   55,   63,   63,   65,   63,
+       65,   65,   83,   65,   68,   63,   68,   68,   85,   68,
+       78,   80,   81,   82,   68,   71,   86,   71,   71,   84,
+       71,   83,   85,   80,   84,   71,   71,   87,   78,   88,
+       81,   89,   91,   94,   93,   89,   86,   84,   92,   93,
+       97,   92,   98,   95,   92,   87,   91,   88,   95,  101,
+       96,   99,   94,   96,  100,   99,   98,   96,   92,  102,
+      103,  100,  101,  104,   97,  105,  102,  106,   95,  105,
+      107,  108,  109,  103,  110,  107,  112,  114,  111,  107,
+      113,  117,  114,  104,  115,  106,  118,  110,  116,  116,
+
+      119,  108,  109,  111,  122,  112,  115,  123,  113,  117,
+      121,  120,  118,  120,  141,  121,  122,  125,  125,  116,
+      127,  119,  141,  127,  129,  123,  129,  129,  140,  129,
+      132,  132,  142,  134,  120,  134,  134,  135,  134,  135,
+      135,  137,  135,  140,  137,  138,  139,  142,  135,  143,
+      138,  139,  144,  150,  145,  146,  177,  144,  144,  145,
+      146,  147,  151,  147,  149,  149,  153,  151,  154,  143,
+      153,  155,  150,  154,  156,  157,  158,  159,  177,  160,
+      160,  161,  159,  147,  148,  155,  162,  157,  148,  156,
+      157,  163,  165,  148,  158,  166,  163,  165,  148,  160,
+
+      166,  161,  162,  165,  148,  148,  164,  164,  167,  168,
+      169,  170,  175,  171,  172,  169,  170,  167,  171,  172,
+      173,  179,  174,  176,  180,  178,  179,  173,  174,  176,
+      168,  181,  175,  178,  183,  182,  184,  185,  186,  180,
+      182,  187,  185,  187,  189,  188,  190,  191,  193,  189,
+      197,  181,  188,  193,  184,  184,  183,  194,  186,  191,
+      192,  192,  194,  196,  195,  190,  195,  199,  198,  197,
+      201,  193,  199,  200,  202,  196,  198,  204,  200,  203,
+      426,  205,  210,  195,  205,  201,  211,  203,  206,  206,
+      207,  426,  202,  207,  208,  208,  209,  209,  210,  216,
+
+      212,  211,  204,  212,  213,  214,  215,  218,  213,  217,
+      217,  215,  218,  216,  214,  219,  220,  221,  222,  223,
+      219,  224,  224,  225,  226,  227,  228,  230,  226,  229,
+      230,  232,  223,  231,  229,  221,  220,  233,  228,  222,
+      234,  225,  235,  227,  236,  231,  233,  237,  232,  237,
+      237,  232,  238,  238,  239,  235,  236,  239,  240,  241,
+      242,  234,  243,  243,  246,  244,  245,  245,  247,  242,
+      244,  248,  249,  250,  241,  240,  251,  249,  240,  246,
+      247,  251,  252,  253,  254,  252,  255,  252,  258,  256,
+      259,  248,  260,  250,  256,  255,  257,  253,  261,  262,
+
+      254,  257,  262,  254,  265,  254,  263,  260,  266,  258,
+      259,  267,  261,  269,  273,  268,  274,  266,  262,  265,
+      263,  264,  270,  264,  264,  271,  272,  276,  269,  273,
+      271,  274,  267,  264,  268,  264,  264,  264,  275,  277,
+      264,  279,  270,  275,  278,  280,  272,  276,  282,  278,
+      280,  281,  281,  277,  281,  283,  284,  279,  286,  285,
+      286,  287,  288,  289,  292,  287,  290,  291,  282,  292,
+      293,  283,  284,  285,  293,  290,  291,  289,  294,  295,
+      288,  297,  300,  296,  295,  297,  303,  294,  290,  296,
+      298,  298,  299,  301,  301,  300,  302,  299,  305,  304,
+
+      306,  302,  307,  307,  306,  309,  308,  303,  304,  313,
+      305,  308,  310,  310,  312,  312,  314,  316,  315,  318,
+      319,  320,  321,  322,  314,  323,  309,  315,  322,  316,
+      313,  321,  324,  323,  325,  320,  326,  324,  327,  318,
+      319,  328,  329,  330,  331,  328,  332,  335,  330,  334,
+      337,  336,  325,  337,  340,  338,  336,  329,  326,  327,
+      331,  336,  345,  335,  346,  332,  333,  333,  342,  334,
+      339,  339,  333,  343,  333,  338,  341,  341,  344,  340,
+      349,  345,  333,  342,  347,  343,  346,  348,  350,  347,
+      351,  355,  333,  344,  351,  352,  348,  353,  354,  349,
+
+      352,  356,  356,  350,  355,  357,  358,  359,  360,  353,
+      359,  361,  362,  364,  361,  363,  354,  357,  358,  363,
+      363,  365,  365,  360,  366,  366,  364,  367,  362,  368,
+      368,  362,  367,  369,  369,  370,  371,  372,  377,  373,
+      370,  374,  372,  373,  375,  376,  374,  378,  375,  379,
+      376,  380,  378,  383,  379,  384,  381,  371,  377,  381,
+      382,  382,  385,  386,  381,  380,  390,  385,  381,  384,
+      387,  383,  386,  387,  388,  389,  391,  392,  388,  390,
+      389,  391,  393,  394,  395,  399,  396,  400,  394,  396,
+      395,  398,  397,  392,  393,  397,  398,  401,  405,  131,
+
+      388,  400,  401,  399,  402,  403,  407,  402,  404,  406,
+      403,  405,  404,  404,  406,  407,  408,  409,  410,  408,
+      410,  409,  409,  411,  412,  413,  412,  414,  415,  416,
+      418,  417,  420,  419,  408,  417,  421,  423,  429,  418,
+      425,  422,  411,  413,  425,  414,  422,  415,  419,  416,
+      420,  421,  424,  424,  427,  428,  423,  429,  431,  427,
+      430,  432,  433,  434,  436,  431,  432,  435,  434,  433,
+      437,  428,  435,  430,  438,  439,  440,  437,  443,  444,
+      444,  440,  436,  438,  441,  449,  442,  441,  444,  439,
+      442,  446,  448,  447,  450,  451,  446,  447,  452,  443,
+
+      455,  458,  450,  449,  448,  461,  462,  463,  467,  468,
+      130,  463,  462,  451,  461,  455,  464,  466,  458,  470,
+      470,  464,  466,  452,  453,  469,  467,  473,  469,  453,
+      471,  472,  472,  453,  468,  476,  453,  471,  474,  474,
+      476,  475,  473,  453,  475,  477,  453,  465,  465,  465,
+      478,  465,  479,  480,  465,  481,  481,  482,  483,  465,
+      488,  480,  484,  488,  477,  465,  465,  484,  485,  485,
+      478,  479,  482,  486,  487,  489,  483,  490,  486,  487,
+      491,  489,  492,  494,  493,  490,  495,  495,  491,  493,
+      494,  496,  497,  498,  500,  501,  502,  497,  501,  496,
+
+      492,  503,  503,  500,  504,  505,  507,  509,  505,  508,
+      502,  510,  498,  511,  508,  513,  505,  512,  514,  504,
+      515,  516,  514,  517,  513,  518,  520,  507,  509,  521,
+      519,  510,  517,  525,  128,  511,  519,  512,  515,  518,
+      516,  524,  522,  521,  523,  524,  520,  522,  526,  523,
+      527,  528,  525,  529,  529,  527,  530,  532,  533,  531,
+      526,  530,  531,  534,  535,  536,  536,  538,  534,  537,
+      537,  533,  528,  539,  540,  532,  541,  539,  542,  544,
+      545,  547,  538,  544,  535,  548,  546,  551,  549,  550,
+      548,  551,  542,  540,  552,  545,  547,  556,  126,  558,
+
+      541,  543,  549,  550,  543,  558,  543,  555,  553,  552,
+      543,  546,  543,  553,  554,  557,  561,  543,  556,  554,
+      559,  555,  543,  553,  563,  559,  560,  560,  561,  557,
+      562,  564,  560,  567,  560,  562,  565,  565,  563,  566,
+      568,  567,  569,  564,  566,  570,  570,  571,  573,  575,
+      576,  571,  560,  573,  568,  574,  578,  577,  574,  581,
+      579,  569,  577,  576,  580,  582,  583,  584,  575,  586,
+      582,  585,  588,  580,  586,  578,  579,  589,  581,  590,
+      585,  584,  591,  592,  593,  124,  583,  591,  592,  593,
+      594,  588,  595,  595,  590,  589,  596,  600,  598,  594,
+
+      600,  596,  598,  598,  599,  599,  601,  602,  599,  603,
+      604,  605,  606,  604,  607,  608,  612,  606,  609,  607,
+      613,  608,  602,  615,  610,  612,  601,  611,  611,  603,
+      610,  616,  605,  614,  609,  617,  614,  619,  613,  618,
+      620,  615,  619,  621,  622,  620,  623,  622,  624,  625,
+      616,  626,  618,  627,  625,  617,  626,  623,  628,  628,
+      624,  621,  629,  630,  631,  632,  633,  635,  627,  632,
+      634,  636,  641,  639,  640,  642,  631,  630,  643,  634,
+      642,  629,  648,  643,  633,  644,  635,  639,  645,  640,
+      644,  646,  641,  647,  649,  650,  636,  648,  647,  651,
+
+      652,  652,  645,  653,  655,  646,  654,  656,  656,  657,
+      650,  659,  654,  649,  657,  658,  660,  661,  651,  660,
+      662,  653,  658,  663,  655,  659,  664,  665,  663,  662,
+      666,  668,  665,  667,  671,  661,  669,  667,  670,  673,
+      668,  671,  672,  674,  675,  664,  676,  678,  677,  666,
+      679,  669,  676,  670,  672,  681,  682,  683,  673,  679,
+      681,  684,  675,  677,  674,  683,  685,  678,  686,  687,
+      682,  685,  686,  686,  688,  688,  689,  690,  691,  692,
+      692,  684,  693,  691,  696,  694,  690,  693,  687,  689,
+      694,  695,  695,  696,  697,  698,  699,  700,  701,  697,
+
+      702,  704,  700,  701,  703,  702,  708,  705,  703,  698,
+      704,  709,  707,  711,  699,  704,  707,  704,  705,  704,
+      710,  708,  712,  713,  710,  710,  714,  711,  715,  709,
+      716,  713,  717,  717,  718,  719,  719,  723,  722,  721,
+      714,  712,  721,  722,  724,  724,  715,  725,  727,  718,
+      726,  726,  729,  727,  730,  716,  723,  728,  728,  730,
+      731,  732,  733,  733,  734,  735,  732,  725,  731,  736,
+      738,  735,  729,  739,  740,  738,  736,  742,  739,  740,
+      741,  743,  734,  744,  746,  741,  742,  745,  745,  747,
+      748,  749,  751,  750,  744,  748,  752,  752,  753,  754,
+
+      743,  755,  756,  757,  746,   67,  761,  756,  764,  758,
+      751,  749,  747,  750,  758,  761,  760,  762,  753,  755,
+      760,  760,  764,  765,  754,  762,  757,  763,  765,  763,
+      766,  767,  768,  769,  766,  770,  771,  772,  773,  774,
+      777,  771,  767,  774,  775,  776,  778,  780,  779,  782,
+      784,  768,  781,  770,  777,  772,  782,  781,  773,  769,
+      783,  778,  775,  779,  776,  783,  780,  785,  784,  786,
+      788,  787,  795,  789,  790,  791,  785,  787,  789,  790,
+      791,  792,  792,  796,  786,  794,  794,  797,  796,  798,
+      795,  788,  799,  800,  800,  801,  799,  799,  802,  803,
+
+      804,  797,  806,  805,  807,  808,  811,  806,  798,  805,
+      809,  810,  812,  813,  801,  814,  814,  802,  816,  804,
+      811,  815,  816,  807,  808,  803,  815,  817,  813,  809,
+      810,  821,  818,  812,  822,  822,  819,  825,  819,  823,
+      817,  818,  819,  824,  823,  826,  828,  824,  830,  832,
+      826,  821,  841,  830,  832,  819,  840,  825,  831,  831,
+      834,  834,  836,  836,  828,  838,  839,  839,  838,  842,
+      843,  840,  844,  845,  845,  843,  846,  841,  847,  847,
+      848,  849,  850,  842,  851,  852,  850,  844,  854,  857,
+      852,  855,  849,  856,  856,  858,  846,  859,  860,  861,
+
+      860,  863,  848,  851,  861,  855,  854,  862,  864,  857,
+      865,  869,  862,  864,  867,  858,  871,  859,  866,  866,
+      867,  863,  870,  870,  865,  872,  873,  878,  871,  873,
+      876,  874,  873,  875,  883,  869,  874,  877,  875,  876,
+      879,  880,  877,  879,  873,  872,  880,  881,  881,  882,
+      884,  885,  878,  883,  886,  887,  885,  888,  890,  886,
+      889,  889,  888,  890,  891,  892,  893,  882,  895,  894,
+      884,  896,  897,  898,  899,  900,  902,  897,  887,   61,
+      895,  902,  891,  894,  896,  892,  893,  903,  904,  905,
+      906,  909,  909,  898,  899,  904,  900,  910,  905,  911,
+
+      910,  905,  903,  912,  911,  913,  906,  914,  915,  916,
+      917,  918,  918,  919,  913,  917,  920,  915,  916,  912,
+      915,  921,  922,  923,  924,  926,  914,  925,  925,  920,
+      927,  928,  932,  919,  930,  927,  922,  932,  929,  921,
+      933,  926,  924,  936,  934,  935,  928,  929,  923,  934,
+      929,  935,  930,  938,  937,  943,  944,  942,  933,  937,
+      945,  939,  946,  936,  939,  942,  938,  946,  943,  947,
+      939,  948,  950,  951,  944,  952,  953,  951,  954,  945,
+      952,  953,  955,  954,  956,  947,  957,  958,  958,  948,
+      959,  955,  950,  960,  961,  962,  963,  964,  966,  966,
+
+      962,  957,   56,  965,  959,  960,  961,  956,  963,  965,
+      967,  968,  968,  967,  970,  964,  971,  971,  972,  973,
+      974,  975,  976,  970,  973,  978,  977,  980,  979,  974,
+      972,  977,  983,  975,  978,  981,  981,  976,  982,  984,
+      985,  987,  980,  982,  986,  986,  997,  978,  979,  988,
+      988,  989,  989,  983,  995,  990,   51,  991,  984,  990,
+      985,  987,  991,  992,  994,  996,  992,  998,  998,  994,
+      996,  997,  995,  999,  999, 1000, 1001, 1002, 1003, 1004,
+     1000, 1006, 1005, 1007, 1007, 1008, 1009, 1009, 1001, 1001,
+     1001, 1012, 1010, 1013, 1013, 1001, 1005, 1002, 1003, 1004,
+
+     1012, 1014, 1006, 1015, 1016, 1017, 1018, 1018, 1019, 1020,
+     1015, 1008, 1010, 1016, 1022, 1023, 1014, 1024, 1028, 1022,
+     1023, 1025, 1026, 1026, 1027, 1020, 1029, 1028, 1025, 1027,
+     1030, 1017, 1031, 1032, 1019, 1033, 1033, 1024, 1034, 1035,
+     1036, 1037, 1030, 1038, 1039, 1039, 1029, 1037, 1042, 1040,
+     1031, 1048, 1038, 1034, 1043, 1036, 1041, 1041, 1035, 1032,
+     1040, 1044, 1045, 1045, 1049, 1040, 1044, 1046, 1043, 1042,
+     1047, 1046, 1046, 1050, 1051, 1047, 1049, 1048, 1050, 1052,
+     1053, 1054, 1055, 1052, 1057, 1056, 1051, 1055, 1058, 1057,
+     1060,   50, 1053, 1060, 1061, 1061, 1062, 1062, 1063, 1065,
+
+     1058, 1066, 1074, 1064, 1063, 1065, 1054, 1056, 1064, 1068,
+     1066, 1070, 1072, 1076, 1068, 1073, 1073, 1075, 1077,   45,
+     1081, 1078, 1074, 1070, 1072, 1078, 1075, 1079, 1080, 1083,
+     1083, 1076, 1079, 1080, 1081, 1084, 1085, 1077, 1086, 1088,
+     1088, 1083, 1091, 1093, 1092, 1085, 1094, 1086, 1093, 1095,
+     1095, 1100, 1096, 1084, 1096, 1097, 1097, 1091, 1092, 1099,
+     1101, 1101, 1103, 1094, 1102, 1104, 1099, 1105, 1106, 1107,
+     1108, 1100, 1109, 1102, 1116, 1113, 1111, 1104, 1118, 1105,
+     1106, 1111, 1114, 1103, 1107, 1112, 1124, 1112, 1116, 1123,
+     1108, 1114, 1109, 1113, 1117, 1117, 1119, 1120, 1121, 1120,
+
+     1122, 1119, 1128, 1121, 1118, 1122, 1124, 1123, 1125, 1126,
+     1129, 1130, 1130, 1125, 1126, 1131, 1135, 1132, 1133, 1145,
+     1136, 1128, 1132, 1133, 1129, 1134, 1138, 1134, 1135, 1136,
+     1131, 1137, 1136, 1137, 1139, 1138, 1141, 1142, 1144, 1145,
+     1146, 1141, 1142, 1148, 1150, 1151, 1139, 1152, 1153, 1148,
+     1150, 1144, 1154, 1154, 1155, 1157, 1146, 1153, 1156, 1156,
+     1151, 1158, 1159, 1155, 1160, 1158, 1165, 1159, 1161, 1161,
+     1162, 1168, 1152, 1169, 1157, 1165, 1173, 1160, 1162, 1166,
+     1166, 1167, 1167, 1168, 1170, 1171, 1171, 1174, 1175, 1170,
+     1176, 1169, 1174, 1177, 1178, 1180, 1180, 1179, 1177, 1181,
+
+     1182, 1173, 1183, 1181, 1184, 1176, 1185, 1183, 1187, 1188,
+     1189, 1175, 1178, 1179, 1190, 1182, 1191, 1192, 1194, 1194,
+     1195, 1196, 1197, 1195, 1198, 1185, 1199, 1199, 1191, 1189,
+     1184, 1187, 1202, 1188, 1196, 1190, 1197, 1198, 1192, 1200,
+     1200, 1201, 1201, 1203, 1203, 1202, 1204, 1204, 1205, 1205,
+     1206, 1207, 1207, 1208, 1208, 1209, 1211, 1212, 1212, 1213,
+     1216, 1211, 1214, 1214, 1215, 1217, 1216, 1223, 1217, 1206,
+     1218, 1218, 1219, 1219, 1209, 1220, 1221, 1221, 1213, 1224,
+     1225, 1225, 1215, 1224, 1226, 1228, 1218, 1227, 1227, 1230,
+     1223, 1229, 1229, 1231, 1220, 1232, 1233, 1234, 1230, 1235,
+
+     1232, 1236, 1237, 1226, 1238, 1231, 1236, 1239, 1240, 1241,
+     1234, 1228, 1244, 1238, 1241, 1242, 1239, 1237, 1246, 1242,
+     1235, 1233, 1240, 1247, 1247, 1248, 1251, 1246, 1249, 1249,
+     1248, 1252, 1244, 1254, 1255, 1256, 1254, 1249, 1260, 1255,
+     1264, 1251, 1262, 1252, 1257, 1257, 1259, 1259, 1261, 1261,
+     1263, 1271, 1260, 1481, 1262, 1256, 1265, 1265, 1267, 1264,
+     1268, 1272, 1267, 1268, 1263, 1269, 1269, 1270, 1274, 1273,
+     1279, 1271, 1270, 1273, 1275, 1272, 1276, 1277, 1481, 1275,
+     1280, 1276, 1281, 1277, 1282, 1280, 1279, 1281, 1274, 1283,
+     1300, 1283, 1282, 1286, 1286, 1290, 1290, 1293, 1294, 1294,
+
+     1296, 1296, 1293, 1298, 1299, 1299, 1300, 1301, 1298, 1302,
+     1304, 1304, 1306, 1307, 1302, 1309, 1309, 1306, 1311, 1312,
+     1313, 1312, 1314, 1311, 1315, 1315, 1318, 1314, 1307, 1301,
+     1316, 1316, 1317, 1317, 1313, 1319, 1320, 1321, 1318, 1322,
+     1323, 1324, 1325, 1325, 1327, 1323, 1326, 1328, 1320, 1321,
+     1329, 1322, 1330, 1319, 1331, 1326, 1332, 1333, 1339, 1334,
+     1341, 1324, 1333, 1329, 1334, 1335, 1335, 1328, 1331, 1340,
+     1327, 1336, 1336, 1342, 1332, 1343, 1330, 1344, 1339, 1351,
+     1345, 1349, 1341, 1352, 1343, 1346, 1346, 1340, 1348, 1348,
+     1349, 1353, 1350, 1342, 1351, 1354, 1355, 1344, 1345, 1350,
+
+     1357, 1352, 1356, 1356, 1358, 1357, 1359, 1360, 1361, 1353,
+     1363, 1354, 1366, 1367, 1376, 1355, 1367, 1368, 1368, 1369,
+     1370, 1359, 1358, 1372, 1373, 1383, 1360, 1372, 1361, 1363,
+     1375, 1375, 1366, 1376, 1369, 1377, 1377, 1373, 1370, 1378,
+     1378, 1382, 1382, 1384, 1385, 1386, 1387, 1383, 1388, 1385,
+     1386, 1390, 1384, 1391, 1392, 1393, 1388,   40, 1391, 1392,
+     1394, 1394, 1395, 1395, 1396, 1387, 1390, 1397, 1397, 1396,
+     1393, 1398, 1398, 1401, 1404, 1402, 1403, 1405, 1401, 1402,
+     1406, 1403, 1407, 1404, 1408, 1411, 1410, 1407, 1406, 1410,
+     1413, 1412, 1405, 1414, 1415, 1415, 1408, 1416, 1418, 1413,
+
+     1419, 1422, 1414, 1411, 1412, 1420, 1416, 1421, 1421, 1425,
+     1422, 1423, 1423, 1424, 1425, 1428, 1427, 1418, 1429, 1435,
+     1419, 1424, 1430, 1430, 1420, 1427, 1432, 1432, 1428, 1436,
+     1436, 1437, 1441, 1429, 1437, 1438, 1438, 1439, 1439, 1435,
+     1440, 1440, 1442, 1443, 1444, 1444, 1448, 1445, 1443, 1451,
+     1441, 1445, 1448, 1452, 1453, 1454, 1442, 1455, 1452, 1456,
+     1456, 1457, 1458, 1459, 1460, 1460, 1451, 1451, 1461, 1461,
+     1458, 1455, 1453, 1462, 1463, 1454, 1464, 1465, 1466, 1463,
+     1457, 1467, 1459, 1470, 1468, 1475, 1470, 1466, 1472, 1462,
+     1473, 1473, 1476, 1474, 1475,   14, 1464, 1474, 1477, 1479,
+
+     1480, 1467, 1491, 1465, 1468, 1476, 1472, 1477, 1479, 1485,
+     1486, 1486, 1480, 1487, 1485, 1489, 1490, 1493, 1495, 1492,
+     1489, 1494, 1487, 1491, 1492, 1490, 1494, 1496, 1496, 1498,
+     1499, 1500, 1500, 1501, 1503, 1493, 1504, 1501, 1502, 1506,
+     1507, 1505, 1509, 1495, 1506, 1499, 1516, 1502, 1498, 1505,
+     1503, 1508, 1508, 1510, 1510, 1504, 1514, 1511, 1513, 1513,
+     1516, 1509, 1511, 1515, 1515, 1517, 1507, 1518, 1518, 1519,
+     1519, 1520, 1521, 1522, 1523, 1523, 1514, 1524, 1525, 1526,
+     1527, 1558, 1528, 1525, 1521, 1527, 1532, 1517, 1535, 1524,
+     1520, 1529, 1529, 1522, 1531, 1531, 1534, 1558, 1526, 1528,
+
+     1528, 1534, 1535, 1536,   13, 1532, 1537, 1537, 1536, 1538,
+     1538, 1539, 1539, 1540, 1542, 1542, 1544, 1544, 1540, 1546,
+     1546, 1547, 1548, 1548, 1549, 1552, 1553, 1553, 1557, 1549,
+     1547, 1554, 1556, 1552, 1559, 1560, 1554, 1556, 1561, 1564,
+     1565, 1565, 1582, 1561, 1566, 1566, 1557, 1571, 1571, 1567,
+     1573, 1559, 1559, 1567, 1573, 1575, 1560, 1577, 1577, 1564,
+     1578, 1580, 1581, 1581, 1584, 1583, 1585, 1582, 1586, 1575,
+     1587, 1585,    0, 1586,    0, 1578, 1588, 1588, 1596, 1580,
+     1583, 1591, 1591, 1593, 1593, 1584, 1594, 1594, 1599, 1587,
+     1596, 1597, 1597, 1599, 1600, 1601, 1602, 1604, 1603, 1609,
+
+     1601, 1610, 1613, 1609, 1611, 1612, 1614, 1615, 1600, 1618,
+     1616, 1617, 1617, 1604, 1619, 1602, 1603, 1611, 1618, 1619,
+     1613, 1610, 1614, 1620, 1612, 1616, 1621, 1622, 1620, 1623,
+     1624, 1626, 1615, 1627, 1623, 1628, 1629, 1631, 1632, 1630,
+     1628, 1629, 1622, 1634, 1624, 1633, 1626, 1635, 1636, 1637,
+     1631, 1621, 1627, 1630, 1640, 1641, 1641, 1632, 1638, 1633,
+     1635, 1636, 1634, 1638, 1639, 1642, 1643, 1644, 1637, 1639,
+     1642, 1643, 1644, 1640, 1645, 1646, 1647, 1647, 1648, 1649,
+     1646, 1650, 1651, 1652, 1653, 1648, 1655, 1651, 1656, 1657,
+     1658, 1655, 1661, 1645, 1659, 1659, 1660, 1653, 1649, 1665,
+
+     1650, 1660, 1652, 1658, 1662, 1662, 1665, 1656, 1657, 1663,
+     1663, 1661, 1664, 1666, 1667, 1667, 1668, 1664, 1669, 1670,
+     1672, 1671, 1674, 1668, 1675, 1669, 1671, 1674, 1676, 1675,
+     1677, 1679, 1666, 1678, 1678, 1680, 1681, 1681, 1670, 1672,
+     1682, 1682, 1684, 1684, 1683, 1685, 1685, 1676, 1686, 1677,
+     1679, 1683, 1688, 1691, 1680, 1686, 1692, 1688, 1691, 1693,
+     1694, 1694, 1695, 1695,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0, 1692,    0,    0, 1693, 1699,
+     1699, 1699, 1699, 1699, 1699, 1699, 1700, 1700, 1700, 1700,
+     1700, 1700, 1700, 1701, 1701, 1701, 1701, 1701, 1701, 1701,
+
+     1702, 1702, 1702, 1702, 1702, 1702, 1702, 1703, 1703, 1703,
+     1703, 1703, 1703, 1703, 1705, 1705,    0, 1705, 1705, 1705,
+     1705, 1706, 1706,    0,    0,    0, 1706, 1706, 1707, 1707,
+        0,    0, 1707,    0, 1707, 1708,    0,    0,    0,    0,
+        0, 1708, 1709, 1709,    0,    0,    0, 1709, 1709, 1710,
+        0,    0,    0,    0,    0, 1710, 1711, 1711,    0, 1711,
+     1711, 1711, 1711, 1712, 1712,    0, 1712, 1712, 1712, 1712,
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698,
+
+     1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -1908,7 +1945,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 1910 "<stdout>"
+#line 1947 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -2095,7 +2132,7 @@ YY_DECL
     
 #line 197 "./util/configlexer.lex"
 
-#line 2097 "<stdout>"
+#line 2134 "<stdout>"
 
        if ( !(yy_init) )
                {
@@ -2154,13 +2191,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 >= 1655 )
+                               if ( yy_current_state >= 1699 )
                                        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] != 3281 );
+               while ( yy_base[yy_current_state] != 3371 );
 
 yy_find_action:
                yy_act = yy_accept[yy_current_state];
@@ -2920,40 +2957,65 @@ YY_RULE_SETUP
                YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
        YY_BREAK
 case 146:
-/* rule 146 can match eol */
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
+{ YDVAR(1, VAR_RATELIMIT) }
        YY_BREAK
-/* Quoted strings. Strip leading and ending quotes */
 case 147:
 YY_RULE_SETUP
+#line 354 "./util/configlexer.lex"
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+       YY_BREAK
+case 148:
+YY_RULE_SETUP
+#line 355 "./util/configlexer.lex"
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+       YY_BREAK
+case 149:
+YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+       YY_BREAK
+case 150:
+YY_RULE_SETUP
+#line 357 "./util/configlexer.lex"
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+       YY_BREAK
+case 151:
+/* rule 151 can match eol */
+YY_RULE_SETUP
+#line 358 "./util/configlexer.lex"
+{ LEXOUT(("NL\n")); cfg_parser->line++; }
+       YY_BREAK
+/* Quoted strings. Strip leading and ending quotes */
+case 152:
+YY_RULE_SETUP
+#line 361 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
        YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 357 "./util/configlexer.lex"
+#line 362 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 148:
+case 153:
 YY_RULE_SETUP
-#line 362 "./util/configlexer.lex"
+#line 367 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 149:
-/* rule 149 can match eol */
+case 154:
+/* rule 154 can match eol */
 YY_RULE_SETUP
-#line 363 "./util/configlexer.lex"
+#line 368 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
                          cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 150:
+case 155:
 YY_RULE_SETUP
-#line 365 "./util/configlexer.lex"
+#line 370 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -2966,34 +3028,34 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 151:
+case 156:
 YY_RULE_SETUP
-#line 377 "./util/configlexer.lex"
+#line 382 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
        YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 378 "./util/configlexer.lex"
+#line 383 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
        if(--num_args == 0) { BEGIN(INITIAL); }
        else                { BEGIN(val); }
 }
        YY_BREAK
-case 152:
+case 157:
 YY_RULE_SETUP
-#line 383 "./util/configlexer.lex"
+#line 388 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 153:
-/* rule 153 can match eol */
+case 158:
+/* rule 158 can match eol */
 YY_RULE_SETUP
-#line 384 "./util/configlexer.lex"
+#line 389 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
                             cfg_parser->line++; BEGIN(INITIAL); }
        YY_BREAK
-case 154:
+case 159:
 YY_RULE_SETUP
-#line 386 "./util/configlexer.lex"
+#line 391 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
        if(--num_args == 0) { BEGIN(INITIAL); }
@@ -3006,38 +3068,38 @@ YY_RULE_SETUP
 }
        YY_BREAK
 /* include: directive */
-case 155:
+case 160:
 YY_RULE_SETUP
-#line 398 "./util/configlexer.lex"
+#line 403 "./util/configlexer.lex"
 { 
        LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
        YY_BREAK
 case YY_STATE_EOF(include):
-#line 400 "./util/configlexer.lex"
+#line 405 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 156:
+case 161:
 YY_RULE_SETUP
-#line 404 "./util/configlexer.lex"
+#line 409 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
        YY_BREAK
-case 157:
-/* rule 157 can match eol */
+case 162:
+/* rule 162 can match eol */
 YY_RULE_SETUP
-#line 405 "./util/configlexer.lex"
+#line 410 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
        YY_BREAK
-case 158:
+case 163:
 YY_RULE_SETUP
-#line 406 "./util/configlexer.lex"
+#line 411 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
        YY_BREAK
-case 159:
+case 164:
 YY_RULE_SETUP
-#line 407 "./util/configlexer.lex"
+#line 412 "./util/configlexer.lex"
 {
        LEXOUT(("Iunquotedstr(%s) ", yytext));
        config_start_include_glob(yytext);
@@ -3045,27 +3107,27 @@ YY_RULE_SETUP
 }
        YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 412 "./util/configlexer.lex"
+#line 417 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
        YY_BREAK
-case 160:
+case 165:
 YY_RULE_SETUP
-#line 416 "./util/configlexer.lex"
+#line 421 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
        YY_BREAK
-case 161:
-/* rule 161 can match eol */
+case 166:
+/* rule 166 can match eol */
 YY_RULE_SETUP
-#line 417 "./util/configlexer.lex"
+#line 422 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
                                  cfg_parser->line++; BEGIN(inc_prev); }
        YY_BREAK
-case 162:
+case 167:
 YY_RULE_SETUP
-#line 419 "./util/configlexer.lex"
+#line 424 "./util/configlexer.lex"
 {
        LEXOUT(("IQE "));
        yytext[yyleng - 1] = '\0';
@@ -3075,7 +3137,7 @@ YY_RULE_SETUP
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 425 "./util/configlexer.lex"
+#line 430 "./util/configlexer.lex"
 {
        LEXOUT(("LEXEOF "));
        yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -3087,33 +3149,33 @@ case YY_STATE_EOF(val):
        }
 }
        YY_BREAK
-case 163:
+case 168:
 YY_RULE_SETUP
-#line 436 "./util/configlexer.lex"
+#line 441 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
                        if(--num_args == 0) { BEGIN(INITIAL); }
                        yylval.str = strdup(yytext); return STRING_ARG; }
        YY_BREAK
-case 164:
+case 169:
 YY_RULE_SETUP
-#line 440 "./util/configlexer.lex"
+#line 445 "./util/configlexer.lex"
 {
        ub_c_error_msg("unknown keyword '%s'", yytext);
        }
        YY_BREAK
-case 165:
+case 170:
 YY_RULE_SETUP
-#line 444 "./util/configlexer.lex"
+#line 449 "./util/configlexer.lex"
 {
        ub_c_error_msg("stray '%s'", yytext);
        }
        YY_BREAK
-case 166:
+case 171:
 YY_RULE_SETUP
-#line 448 "./util/configlexer.lex"
+#line 453 "./util/configlexer.lex"
 ECHO;
        YY_BREAK
-#line 3115 "<stdout>"
+#line 3177 "<stdout>"
 
        case YY_END_OF_BUFFER:
                {
@@ -3403,7 +3465,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 >= 1655 )
+                       if ( yy_current_state >= 1699 )
                                yy_c = yy_meta[(unsigned int) yy_c];
                        }
                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -3431,11 +3493,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 >= 1655 )
+               if ( yy_current_state >= 1699 )
                        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 == 1654);
+       yy_is_jam = (yy_current_state == 1698);
 
                return yy_is_jam ? 0 : yy_current_state;
 }
@@ -4068,7 +4130,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 448 "./util/configlexer.lex"
+#line 453 "./util/configlexer.lex"
 
 
 

diff --git a/util/configlexer.lex b/util/configlexer.lex
index 5b1389dfb0c7bca7c9a05f67b0a0346a0a33a1c9..9e5896c46fe3df4e52ddd68a4671c9e1ac516486 100644 (file)
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -350,6 +350,11 @@ dnstap-log-forwarder-query-messages{COLON} {
                YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 dnstap-log-forwarder-response-messages{COLON}  {
                YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+ratelimit{COLON}               { YDVAR(1, VAR_RATELIMIT) }
+ratelimit-slabs{COLON}         { YDVAR(1, VAR_RATELIMIT_SLABS) }
+ratelimit-size{COLON}          { YDVAR(1, VAR_RATELIMIT_SIZE) }
+ratelimit-for-domain{COLON}    { YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+ratelimit-below-domain{COLON}  { YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 <INITIAL,val>{NEWLINE}         { LEXOUT(("NL\n")); cfg_parser->line++; }
 
        /* Quoted strings. Strip leading and ending quotes */

diff --git a/util/configparser.c b/util/configparser.c
index 745a9ba79890fc66e5873164f673aa9491cda9cd..f4dd596d158cad2aa73e5f4d185a81cf0d641fff 100644 (file)
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -276,7 +276,12 @@ extern int yydebug;
      VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 404,
      VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 405,
      VAR_HARDEN_ALGO_DOWNGRADE = 406,
-     VAR_IP_TRANSPARENT = 407
+     VAR_IP_TRANSPARENT = 407,
+     VAR_RATELIMIT = 408,
+     VAR_RATELIMIT_SLABS = 409,
+     VAR_RATELIMIT_SIZE = 410,
+     VAR_RATELIMIT_FOR_DOMAIN = 411,
+     VAR_RATELIMIT_BELOW_DOMAIN = 412
    };
 #endif
 /* Tokens.  */
@@ -430,6 +435,11 @@ extern int yydebug;
 #define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 405
 #define VAR_HARDEN_ALGO_DOWNGRADE 406
 #define VAR_IP_TRANSPARENT 407
+#define VAR_RATELIMIT 408
+#define VAR_RATELIMIT_SLABS 409
+#define VAR_RATELIMIT_SIZE 410
+#define VAR_RATELIMIT_FOR_DOMAIN 411
+#define VAR_RATELIMIT_BELOW_DOMAIN 412
 
 
 
@@ -443,7 +453,7 @@ typedef union YYSTYPE
 
 
 /* Line 387 of yacc.c  */
-#line 447 "util/configparser.c"
+#line 457 "util/configparser.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -471,7 +481,7 @@ int yyparse ();
 /* Copy the second part of user declarations.  */
 
 /* Line 390 of yacc.c  */
-#line 475 "util/configparser.c"
+#line 485 "util/configparser.c"
 
 #ifdef short
 # undef short
@@ -691,20 +701,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   283
+#define YYLAST   295
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  153
+#define YYNTOKENS  158
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  158
+#define YYNNTS  163
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  301
+#define YYNRULES  311
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  441
+#define YYNSTATES  458
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   407
+#define YYMAXUTOK   412
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -752,7 +762,8 @@ static const yytype_uint8 yytranslate[] =
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
      125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155,   156,   157
 };
 
 #if YYDEBUG
@@ -772,58 +783,60 @@ static const yytype_uint16 yyprhs[] =
      185,   187,   189,   191,   193,   195,   197,   199,   201,   203,
      205,   207,   209,   211,   213,   215,   217,   219,   221,   223,
      225,   227,   229,   231,   233,   235,   237,   239,   241,   243,
-     245,   247,   250,   251,   253,   255,   257,   259,   261,   263,
-     266,   267,   269,   271,   273,   275,   278,   281,   284,   287,
-     290,   293,   296,   299,   302,   305,   308,   311,   314,   317,
-     320,   323,   326,   329,   332,   335,   338,   341,   344,   347,
-     350,   353,   356,   359,   362,   365,   368,   371,   374,   377,
-     380,   383,   386,   389,   392,   395,   398,   401,   404,   407,
-     410,   413,   416,   419,   422,   425,   428,   431,   434,   437,
-     440,   443,   446,   449,   452,   455,   458,   461,   464,   467,
-     470,   473,   476,   479,   482,   485,   488,   491,   494,   497,
-     500,   503,   506,   509,   512,   515,   519,   522,   525,   528,
-     531,   534,   537,   540,   543,   546,   549,   552,   555,   558,
-     561,   564,   567,   570,   573,   577,   580,   583,   586,   589,
-     592,   595,   598,   601,   604,   607,   610,   613,   616,   619,
-     622,   625,   627,   630,   631,   633,   635,   637,   639,   641,
-     643,   645,   647,   650,   653,   656,   659,   662,   665,   668,
-     671,   673,   676,   677,   679,   681,   683,   685,   687,   689,
-     691,   693,   695,   697,   699,   701,   704,   707,   710,   713,
-     716,   719,   722,   725,   728,   731,   734,   737,   739,   742,
-     743,   745
+     245,   247,   249,   251,   253,   255,   257,   260,   261,   263,
+     265,   267,   269,   271,   273,   276,   277,   279,   281,   283,
+     285,   288,   291,   294,   297,   300,   303,   306,   309,   312,
+     315,   318,   321,   324,   327,   330,   333,   336,   339,   342,
+     345,   348,   351,   354,   357,   360,   363,   366,   369,   372,
+     375,   378,   381,   384,   387,   390,   393,   396,   399,   402,
+     405,   408,   411,   414,   417,   420,   423,   426,   429,   432,
+     435,   438,   441,   444,   447,   450,   453,   456,   459,   462,
+     465,   468,   471,   474,   477,   480,   483,   486,   489,   492,
+     495,   498,   501,   504,   507,   510,   513,   516,   519,   522,
+     525,   529,   532,   535,   538,   541,   544,   547,   550,   553,
+     556,   559,   562,   565,   568,   571,   574,   577,   580,   583,
+     587,   590,   593,   596,   599,   602,   605,   608,   611,   614,
+     617,   621,   625,   628,   631,   634,   637,   640,   643,   646,
+     649,   652,   654,   657,   658,   660,   662,   664,   666,   668,
+     670,   672,   674,   677,   680,   683,   686,   689,   692,   695,
+     698,   700,   703,   704,   706,   708,   710,   712,   714,   716,
+     718,   720,   722,   724,   726,   728,   731,   734,   737,   740,
+     743,   746,   749,   752,   755,   758,   761,   764,   766,   769,
+     770,   772
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     154,     0,    -1,    -1,   154,   155,    -1,   156,   157,    -1,
-     159,   160,    -1,   162,   163,    -1,   307,   308,    -1,   281,
-     282,    -1,   292,   293,    -1,    11,    -1,   157,   158,    -1,
-      -1,   165,    -1,   166,    -1,   170,    -1,   173,    -1,   179,
-      -1,   180,    -1,   181,    -1,   182,    -1,   171,    -1,   192,
-      -1,   193,    -1,   194,    -1,   195,    -1,   196,    -1,   215,
-      -1,   216,    -1,   217,    -1,   221,    -1,   222,    -1,   176,
-      -1,   223,    -1,   224,    -1,   227,    -1,   225,    -1,   226,
-      -1,   229,    -1,   230,    -1,   231,    -1,   243,    -1,   205,
-      -1,   206,    -1,   207,    -1,   208,    -1,   232,    -1,   246,
-      -1,   201,    -1,   203,    -1,   247,    -1,   252,    -1,   253,
-      -1,   254,    -1,   177,    -1,   214,    -1,   261,    -1,   262,
-      -1,   202,    -1,   257,    -1,   189,    -1,   172,    -1,   197,
-      -1,   244,    -1,   250,    -1,   233,    -1,   245,    -1,   264,
-      -1,   265,    -1,   178,    -1,   167,    -1,   188,    -1,   237,
-      -1,   168,    -1,   174,    -1,   175,    -1,   198,    -1,   199,
-      -1,   263,    -1,   235,    -1,   238,    -1,   239,    -1,   169,
-      -1,   266,    -1,   218,    -1,   242,    -1,   190,    -1,   204,
-      -1,   248,    -1,   249,    -1,   251,    -1,   256,    -1,   200,
-      -1,   258,    -1,   259,    -1,   260,    -1,   209,    -1,   213,
-      -1,   240,    -1,   241,    -1,   210,    -1,   234,    -1,   255,
-      -1,   191,    -1,   183,    -1,   184,    -1,   185,    -1,   186,
-      -1,   187,    -1,   267,    -1,   268,    -1,   269,    -1,   211,
-      -1,   219,    -1,   220,    -1,   270,    -1,   271,    -1,   228,
-      -1,   236,    -1,   212,    -1,    38,    -1,   160,   161,    -1,
-      -1,   272,    -1,   273,    -1,   274,    -1,   276,    -1,   275,
-      -1,    44,    -1,   163,   164,    -1,    -1,   277,    -1,   278,
-      -1,   279,    -1,   280,    -1,    13,    10,    -1,    12,    10,
+     159,     0,    -1,    -1,   159,   160,    -1,   161,   162,    -1,
+     164,   165,    -1,   167,   168,    -1,   317,   318,    -1,   291,
+     292,    -1,   302,   303,    -1,    11,    -1,   162,   163,    -1,
+      -1,   170,    -1,   171,    -1,   175,    -1,   178,    -1,   184,
+      -1,   185,    -1,   186,    -1,   187,    -1,   176,    -1,   197,
+      -1,   198,    -1,   199,    -1,   200,    -1,   201,    -1,   220,
+      -1,   221,    -1,   222,    -1,   226,    -1,   227,    -1,   181,
+      -1,   228,    -1,   229,    -1,   232,    -1,   230,    -1,   231,
+      -1,   234,    -1,   235,    -1,   236,    -1,   248,    -1,   210,
+      -1,   211,    -1,   212,    -1,   213,    -1,   237,    -1,   251,
+      -1,   206,    -1,   208,    -1,   252,    -1,   257,    -1,   258,
+      -1,   259,    -1,   182,    -1,   219,    -1,   266,    -1,   267,
+      -1,   207,    -1,   262,    -1,   194,    -1,   177,    -1,   202,
+      -1,   249,    -1,   255,    -1,   238,    -1,   250,    -1,   269,
+      -1,   270,    -1,   183,    -1,   172,    -1,   193,    -1,   242,
+      -1,   173,    -1,   179,    -1,   180,    -1,   203,    -1,   204,
+      -1,   268,    -1,   240,    -1,   243,    -1,   244,    -1,   174,
+      -1,   271,    -1,   223,    -1,   247,    -1,   195,    -1,   209,
+      -1,   253,    -1,   254,    -1,   256,    -1,   261,    -1,   205,
+      -1,   263,    -1,   264,    -1,   265,    -1,   214,    -1,   218,
+      -1,   245,    -1,   246,    -1,   215,    -1,   239,    -1,   260,
+      -1,   196,    -1,   188,    -1,   189,    -1,   190,    -1,   191,
+      -1,   192,    -1,   272,    -1,   273,    -1,   274,    -1,   216,
+      -1,   224,    -1,   225,    -1,   275,    -1,   276,    -1,   233,
+      -1,   241,    -1,   217,    -1,   277,    -1,   279,    -1,   278,
+      -1,   280,    -1,   281,    -1,    38,    -1,   165,   166,    -1,
+      -1,   282,    -1,   283,    -1,   284,    -1,   286,    -1,   285,
+      -1,    44,    -1,   168,   169,    -1,    -1,   287,    -1,   288,
+      -1,   289,    -1,   290,    -1,    13,    10,    -1,    12,    10,
       -1,    76,    10,    -1,    79,    10,    -1,    97,    10,    -1,
       14,    10,    -1,    16,    10,    -1,    67,    10,    -1,    15,
       10,    -1,    80,    10,    -1,    81,    10,    -1,    31,    10,
@@ -855,58 +868,61 @@ static const yytype_int16 yyrhs[] =
       -1,   111,    10,    -1,    62,    10,    -1,    63,    10,    -1,
       84,    10,    -1,    73,    10,    10,    -1,    74,    10,    -1,
       98,    10,    -1,   130,    10,    -1,   131,    10,    -1,   132,
-      10,    -1,   136,    10,    -1,   137,    10,    -1,    37,    10,
-      -1,    39,    10,    -1,    40,    10,    -1,   129,    10,    -1,
-     100,    10,    -1,    37,    10,    -1,    45,    10,    -1,    46,
-      10,    -1,   128,    10,    -1,    88,    -1,   282,   283,    -1,
-      -1,   284,    -1,   286,    -1,   285,    -1,   288,    -1,   289,
-      -1,   290,    -1,   291,    -1,   287,    -1,    89,    10,    -1,
-      91,    10,    -1,    90,    10,    -1,    96,    10,    -1,    92,
-      10,    -1,    93,    10,    -1,    94,    10,    -1,    95,    10,
-      -1,   138,    -1,   293,   294,    -1,    -1,   295,    -1,   296,
-      -1,   297,    -1,   298,    -1,   299,    -1,   300,    -1,   301,
-      -1,   302,    -1,   303,    -1,   304,    -1,   305,    -1,   306,
-      -1,   139,    10,    -1,   140,    10,    -1,   141,    10,    -1,
-     142,    10,    -1,   143,    10,    -1,   144,    10,    -1,   145,
-      10,    -1,   146,    10,    -1,   147,    10,    -1,   148,    10,
-      -1,   149,    10,    -1,   150,    10,    -1,   104,    -1,   308,
-     309,    -1,    -1,   310,    -1,   105,    10,    -1
+      10,    -1,   136,    10,    -1,   137,    10,    -1,   153,    10,
+      -1,   155,    10,    -1,   154,    10,    -1,   156,    10,    10,
+      -1,   157,    10,    10,    -1,    37,    10,    -1,    39,    10,
+      -1,    40,    10,    -1,   129,    10,    -1,   100,    10,    -1,
+      37,    10,    -1,    45,    10,    -1,    46,    10,    -1,   128,
+      10,    -1,    88,    -1,   292,   293,    -1,    -1,   294,    -1,
+     296,    -1,   295,    -1,   298,    -1,   299,    -1,   300,    -1,
+     301,    -1,   297,    -1,    89,    10,    -1,    91,    10,    -1,
+      90,    10,    -1,    96,    10,    -1,    92,    10,    -1,    93,
+      10,    -1,    94,    10,    -1,    95,    10,    -1,   138,    -1,
+     303,   304,    -1,    -1,   305,    -1,   306,    -1,   307,    -1,
+     308,    -1,   309,    -1,   310,    -1,   311,    -1,   312,    -1,
+     313,    -1,   314,    -1,   315,    -1,   316,    -1,   139,    10,
+      -1,   140,    10,    -1,   141,    10,    -1,   142,    10,    -1,
+     143,    10,    -1,   144,    10,    -1,   145,    10,    -1,   146,
+      10,    -1,   147,    10,    -1,   148,    10,    -1,   149,    10,
+      -1,   150,    10,    -1,   104,    -1,   318,   319,    -1,    -1,
+     320,    -1,   105,    10,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   124,   124,   124,   125,   125,   126,   126,   127,   127,
-     131,   136,   137,   138,   138,   138,   139,   139,   140,   140,
-     140,   141,   141,   141,   142,   142,   142,   143,   143,   144,
-     144,   145,   145,   146,   146,   147,   147,   148,   148,   149,
-     149,   150,   150,   151,   151,   151,   152,   152,   152,   153,
-     153,   153,   154,   154,   155,   155,   156,   156,   157,   157,
-     158,   158,   158,   159,   159,   160,   160,   161,   161,   161,
-     162,   162,   163,   163,   164,   164,   165,   165,   165,   166,
-     166,   167,   167,   168,   168,   169,   169,   170,   170,   171,
-     171,   171,   172,   172,   173,   173,   173,   174,   174,   174,
-     175,   175,   175,   176,   176,   176,   177,   177,   177,   178,
-     178,   178,   179,   179,   179,   180,   180,   181,   181,   182,
-     184,   196,   197,   198,   198,   198,   198,   198,   200,   212,
-     213,   214,   214,   214,   214,   216,   225,   234,   245,   254,
-     263,   272,   285,   300,   309,   318,   327,   336,   345,   354,
-     363,   372,   381,   390,   399,   408,   415,   422,   431,   440,
-     454,   463,   472,   479,   486,   493,   501,   508,   515,   522,
-     529,   537,   545,   553,   560,   567,   576,   585,   592,   599,
-     607,   615,   625,   635,   648,   659,   667,   680,   689,   698,
-     707,   717,   725,   738,   747,   755,   764,   772,   785,   794,
-     801,   811,   821,   831,   841,   851,   861,   871,   881,   888,
-     895,   904,   913,   922,   929,   939,   956,   963,   981,   994,
-    1007,  1016,  1025,  1034,  1044,  1054,  1063,  1072,  1079,  1088,
-    1097,  1106,  1114,  1127,  1135,  1158,  1165,  1180,  1190,  1200,
-    1207,  1214,  1223,  1233,  1240,  1247,  1256,  1266,  1276,  1283,
-    1290,  1299,  1304,  1305,  1306,  1306,  1306,  1307,  1307,  1307,
-    1308,  1308,  1310,  1320,  1329,  1336,  1346,  1353,  1360,  1367,
-    1374,  1379,  1380,  1381,  1381,  1382,  1382,  1383,  1383,  1384,
-    1385,  1386,  1387,  1388,  1389,  1391,  1399,  1406,  1414,  1422,
-    1429,  1436,  1445,  1454,  1463,  1472,  1481,  1490,  1495,  1496,
-    1497,  1499
+       0,   126,   126,   126,   127,   127,   128,   128,   129,   129,
+     133,   138,   139,   140,   140,   140,   141,   141,   142,   142,
+     142,   143,   143,   143,   144,   144,   144,   145,   145,   146,
+     146,   147,   147,   148,   148,   149,   149,   150,   150,   151,
+     151,   152,   152,   153,   153,   153,   154,   154,   154,   155,
+     155,   155,   156,   156,   157,   157,   158,   158,   159,   159,
+     160,   160,   160,   161,   161,   162,   162,   163,   163,   163,
+     164,   164,   165,   165,   166,   166,   167,   167,   167,   168,
+     168,   169,   169,   170,   170,   171,   171,   172,   172,   173,
+     173,   173,   174,   174,   175,   175,   175,   176,   176,   176,
+     177,   177,   177,   178,   178,   178,   179,   179,   179,   180,
+     180,   180,   181,   181,   181,   182,   182,   183,   183,   184,
+     184,   184,   185,   185,   186,   188,   200,   201,   202,   202,
+     202,   202,   202,   204,   216,   217,   218,   218,   218,   218,
+     220,   229,   238,   249,   258,   267,   276,   289,   304,   313,
+     322,   331,   340,   349,   358,   367,   376,   385,   394,   403,
+     412,   419,   426,   435,   444,   458,   467,   476,   483,   490,
+     497,   505,   512,   519,   526,   533,   541,   549,   557,   564,
+     571,   580,   589,   596,   603,   611,   619,   629,   639,   652,
+     663,   671,   684,   693,   702,   711,   721,   729,   742,   751,
+     759,   768,   776,   789,   798,   805,   815,   825,   835,   845,
+     855,   865,   875,   885,   892,   899,   908,   917,   926,   933,
+     943,   960,   967,   985,   998,  1011,  1020,  1029,  1038,  1048,
+    1058,  1067,  1076,  1083,  1092,  1101,  1110,  1118,  1131,  1139,
+    1162,  1169,  1184,  1194,  1204,  1211,  1218,  1227,  1236,  1244,
+    1257,  1270,  1283,  1293,  1300,  1307,  1316,  1326,  1336,  1343,
+    1350,  1359,  1364,  1365,  1366,  1366,  1366,  1367,  1367,  1367,
+    1368,  1368,  1370,  1380,  1389,  1396,  1406,  1413,  1420,  1427,
+    1434,  1439,  1440,  1441,  1441,  1442,  1442,  1443,  1443,  1444,
+    1445,  1446,  1447,  1448,  1449,  1451,  1459,  1466,  1474,  1482,
+    1489,  1496,  1505,  1514,  1523,  1532,  1541,  1550,  1555,  1556,
+    1557,  1559
 };
 #endif
 
@@ -968,17 +984,19 @@ static const char *const yytname[] =
   "VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES",
   "VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES",
   "VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES",
-  "VAR_HARDEN_ALGO_DOWNGRADE", "VAR_IP_TRANSPARENT", "$accept",
-  "toplevelvars", "toplevelvar", "serverstart", "contents_server",
-  "content_server", "stubstart", "contents_stub", "content_stub",
-  "forwardstart", "contents_forward", "content_forward",
-  "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_tcp_upstream",
+  "VAR_HARDEN_ALGO_DOWNGRADE", "VAR_IP_TRANSPARENT", "VAR_RATELIMIT",
+  "VAR_RATELIMIT_SLABS", "VAR_RATELIMIT_SIZE", "VAR_RATELIMIT_FOR_DOMAIN",
+  "VAR_RATELIMIT_BELOW_DOMAIN", "$accept", "toplevelvars", "toplevelvar",
+  "serverstart", "contents_server", "content_server", "stubstart",
+  "contents_stub", "content_stub", "forwardstart", "contents_forward",
+  "content_forward", "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_tcp_upstream",
   "server_ssl_upstream", "server_ssl_service_key",
   "server_ssl_service_pem", "server_ssl_port", "server_do_daemonize",
   "server_use_syslog", "server_log_time_ascii", "server_log_queries",
@@ -1016,7 +1034,9 @@ static const char *const yytname[] =
   "server_key_cache_slabs", "server_neg_cache_size", "server_local_zone",
   "server_local_data", "server_local_data_ptr", "server_minimal_responses",
   "server_rrset_roundrobin", "server_max_udp_size", "server_dns64_prefix",
-  "server_dns64_synthall", "stub_name", "stub_host", "stub_addr",
+  "server_dns64_synthall", "server_ratelimit", "server_ratelimit_size",
+  "server_ratelimit_slabs", "server_ratelimit_for_domain",
+  "server_ratelimit_below_domain", "stub_name", "stub_host", "stub_addr",
   "stub_first", "stub_prime", "forward_name", "forward_host",
   "forward_addr", "forward_first", "rcstart", "contents_rc", "content_rc",
   "rc_control_enable", "rc_control_port", "rc_control_interface",
@@ -1055,27 +1075,27 @@ static const yytype_uint16 yytoknum[] =
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407
+     405,   406,   407,   408,   409,   410,   411,   412
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   153,   154,   154,   155,   155,   155,   155,   155,   155,
-     156,   157,   157,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     158,   158,   158,   158,   158,   158,   158,   158,   158,   158,
-     159,   160,   160,   161,   161,   161,   161,   161,   162,   163,
-     163,   164,   164,   164,   164,   165,   166,   167,   168,   169,
+       0,   158,   159,   159,   160,   160,   160,   160,   160,   160,
+     161,   162,   162,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
+     163,   163,   163,   163,   163,   164,   165,   165,   166,   166,
+     166,   166,   166,   167,   168,   168,   169,   169,   169,   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,
@@ -1087,12 +1107,13 @@ static const yytype_uint16 yyr1[] =
      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,   282,   283,   283,   283,   283,   283,   283,
-     283,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,   293,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   295,   296,   297,   298,   299,
-     300,   301,   302,   303,   304,   305,   306,   307,   308,   308,
-     309,   310
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,   291,   292,   292,   293,   293,   293,   293,   293,   293,
+     293,   293,   294,   295,   296,   297,   298,   299,   300,   301,
+     302,   303,   303,   304,   304,   304,   304,   304,   304,   304,
+     304,   304,   304,   304,   304,   305,   306,   307,   308,   309,
+     310,   311,   312,   313,   314,   315,   316,   317,   318,   318,
+     319,   320
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1110,8 +1131,8 @@ 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,     2,     0,     1,     1,     1,     1,     1,     1,     2,
-       0,     1,     1,     1,     1,     2,     2,     2,     2,     2,
+       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,
@@ -1119,10 +1140,11 @@ 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,     3,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     3,     2,     2,     2,     2,     2,
+       3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       3,     3,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     1,     2,     0,     1,     1,     1,     1,     1,     1,
        1,     1,     2,     2,     2,     2,     2,     2,     2,     2,
        1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
@@ -1136,8 +1158,8 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    10,   120,   128,   251,   297,   270,     3,
-      12,   122,   130,   253,   272,   299,     4,     5,     6,     8,
+       2,     0,     1,    10,   125,   133,   261,   307,   280,     3,
+      12,   127,   135,   263,   282,   309,     4,     5,     6,     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,     0,     0,     0,
@@ -1148,60 +1170,62 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    11,
-      13,    14,    70,    73,    82,    15,    21,    61,    16,    74,
-      75,    32,    54,    69,    17,    18,    19,    20,   104,   105,
-     106,   107,   108,    71,    60,    86,   103,    22,    23,    24,
-      25,    26,    62,    76,    77,    92,    48,    58,    49,    87,
-      42,    43,    44,    45,    96,   100,   112,   119,    97,    55,
-      27,    28,    29,    84,   113,   114,    30,    31,    33,    34,
-      36,    37,    35,   117,    38,    39,    40,    46,    65,   101,
-      79,   118,    72,    80,    81,    98,    99,    85,    41,    63,
-      66,    47,    50,    88,    89,    64,    90,    51,    52,    53,
-     102,    91,    59,    93,    94,    95,    56,    57,    78,    67,
-      68,    83,   109,   110,   111,   115,   116,     0,     0,     0,
-       0,     0,   121,   123,   124,   125,   127,   126,     0,     0,
-       0,     0,   129,   131,   132,   133,   134,     0,     0,     0,
-       0,     0,     0,     0,     0,   252,   254,   256,   255,   261,
-     257,   258,   259,   260,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   271,   273,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,     0,
-     298,   300,   136,   135,   140,   143,   141,   149,   150,   151,
-     152,   162,   163,   164,   165,   166,   185,   186,   187,   191,
-     192,   146,   193,   194,   197,   195,   196,   199,   200,   201,
-     213,   175,   176,   177,   178,   202,   216,   171,   173,   217,
-     222,   223,   224,   147,   184,   231,   232,   172,   227,   159,
-     142,   167,   214,   220,   203,     0,     0,   235,   148,   137,
-     158,   207,   138,   144,   145,   168,   169,   233,   205,   208,
-     209,   139,   236,   188,   212,   160,   174,   218,   219,   221,
-     226,   170,   230,   228,   229,   179,   183,   210,   211,   180,
-     181,   204,   225,   161,   153,   154,   155,   156,   157,   237,
-     238,   239,   189,   190,   198,   240,   241,   206,   182,   242,
-     243,   244,   246,   245,   247,   248,   249,   250,   262,   264,
-     263,   266,   267,   268,   269,   265,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   301,   215,
-     234
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    11,    13,    14,    70,    73,    82,
+      15,    21,    61,    16,    74,    75,    32,    54,    69,    17,
+      18,    19,    20,   104,   105,   106,   107,   108,    71,    60,
+      86,   103,    22,    23,    24,    25,    26,    62,    76,    77,
+      92,    48,    58,    49,    87,    42,    43,    44,    45,    96,
+     100,   112,   119,    97,    55,    27,    28,    29,    84,   113,
+     114,    30,    31,    33,    34,    36,    37,    35,   117,    38,
+      39,    40,    46,    65,   101,    79,   118,    72,    80,    81,
+      98,    99,    85,    41,    63,    66,    47,    50,    88,    89,
+      64,    90,    51,    52,    53,   102,    91,    59,    93,    94,
+      95,    56,    57,    78,    67,    68,    83,   109,   110,   111,
+     115,   116,   120,   122,   121,   123,   124,     0,     0,     0,
+       0,     0,   126,   128,   129,   130,   132,   131,     0,     0,
+       0,     0,   134,   136,   137,   138,   139,     0,     0,     0,
+       0,     0,     0,     0,     0,   262,   264,   266,   265,   271,
+     267,   268,   269,   270,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   281,   283,   284,   285,
+     286,   287,   288,   289,   290,   291,   292,   293,   294,     0,
+     308,   310,   141,   140,   145,   148,   146,   154,   155,   156,
+     157,   167,   168,   169,   170,   171,   190,   191,   192,   196,
+     197,   151,   198,   199,   202,   200,   201,   204,   205,   206,
+     218,   180,   181,   182,   183,   207,   221,   176,   178,   222,
+     227,   228,   229,   152,   189,   236,   237,   177,   232,   164,
+     147,   172,   219,   225,   208,     0,     0,   240,   153,   142,
+     163,   212,   143,   149,   150,   173,   174,   238,   210,   213,
+     214,   144,   241,   193,   217,   165,   179,   223,   224,   226,
+     231,   175,   235,   233,   234,   184,   188,   215,   216,   185,
+     186,   209,   230,   166,   158,   159,   160,   161,   162,   242,
+     243,   244,   194,   195,   203,   245,   246,   211,   187,   247,
+     249,   248,     0,     0,   252,   253,   254,   256,   255,   257,
+     258,   259,   260,   272,   274,   273,   276,   277,   278,   279,
+     275,   295,   296,   297,   298,   299,   300,   301,   302,   303,
+     304,   305,   306,   311,   220,   239,   250,   251
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     9,    10,    16,   129,    11,    17,   242,    12,
-      18,   252,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,   153,   154,   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,   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,   243,
-     244,   245,   246,   247,   253,   254,   255,   256,    13,    19,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,    14,
-      20,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,    15,    21,   300,   301
+      -1,     1,     9,    10,    16,   134,    11,    17,   252,    12,
+      18,   262,   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,   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,   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,   253,   254,   255,   256,   257,   263,
+     264,   265,   266,    13,    19,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,    14,    20,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   308,    15,
+      21,   310,   311
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -1210,19 +1234,19 @@ static const yytype_int16 yydefgoto[] =
 static const yytype_int16 yypact[] =
 {
      -81,   116,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -81,   -81,   -81,   -12,    41,    47,    39,
-       3,   -80,    16,    17,    18,    22,    23,    24,    66,    67,
-      69,    72,    73,    78,   107,   126,   127,   128,   145,   146,
-     147,   148,   149,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   161,   162,   163,   164,   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,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   204,   205,   206,   207,   208,   209,   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,   -81,
-     -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81,   -81,   -81,   -81,   -12,    89,    47,   -13,
+      22,   -80,    16,    17,    18,    23,    24,    78,   107,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   136,   137,
+     138,   139,   140,   141,   142,   143,   145,   146,   147,   148,
+     149,   163,   164,   166,   167,   168,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   209,   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,   245,   246,   247,
+     248,   249,   250,   251,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
@@ -1232,28 +1256,29 @@ static const yytype_int16 yypact[] =
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -81,   -81,   -81,   -81,   241,   242,   243,
-     245,   246,   -81,   -81,   -81,   -81,   -81,   -81,   247,   248,
-     249,   250,   -81,   -81,   -81,   -81,   -81,   251,   252,   253,
-     254,   255,   256,   257,   258,   -81,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -81,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   271,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81,   -81,   -81,   -81,   -81,   252,   253,   254,
+     255,   256,   -81,   -81,   -81,   -81,   -81,   -81,   257,   258,
+     259,   260,   -81,   -81,   -81,   -81,   -81,   261,   262,   263,
+     264,   265,   266,   267,   268,   -81,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81,   -81,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   281,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -81,   -81,   272,   273,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81,   -81,   -81,   282,   283,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
+     -81,   -81,   284,   285,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
-     -81
+     -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81
 };
 
 /* YYPGOTO[NTERM-NUM].  */
@@ -1274,7 +1299,8 @@ static const yytype_int8 yypgoto[] =
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
      -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
-     -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81
+     -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,
+     -81,   -81,   -81
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1285,33 +1311,34 @@ static const yytype_uint16 yytable[] =
 {
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
       32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,   299,   302,   303,   304,    47,
-      48,    49,   305,   306,   307,    50,    51,    52,    53,    54,
+      42,    43,    44,    45,    46,   309,   312,   313,   314,    47,
+      48,    49,     0,   315,   316,    50,    51,    52,    53,    54,
       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,   308,   309,   237,   310,
-     238,   239,   311,   312,   248,    91,    92,    93,   313,    94,
-      95,    96,   249,   250,    97,    98,    99,   100,   101,   102,
+      85,    86,    87,    88,    89,    90,   267,   268,   269,   270,
+     271,   272,   273,   274,   258,    91,    92,    93,   317,    94,
+      95,    96,   259,   260,    97,    98,    99,   100,   101,   102,
      103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,     2,   314,   119,   120,
-     121,   122,   123,   124,   125,   126,     0,     3,   257,   258,
-     259,   260,   261,   262,   263,   264,   315,   316,   317,   127,
-     128,   240,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,     4,   318,   319,   320,   321,   322,
-       5,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-     241,   332,   333,   334,   335,   251,   336,   337,   338,   339,
-     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
-     350,   351,   352,   353,   354,   355,   356,   357,   358,   359,
-     360,   361,   362,   363,     6,   364,   365,   366,   367,   368,
-     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-       7,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-     388,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,     8,   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
+     113,   114,   115,   116,   117,   118,     2,   318,   119,   120,
+     121,   122,   123,   124,   125,   126,   247,     3,   248,   249,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   127,
+     128,   129,   130,   131,   132,   133,   328,   329,   330,   331,
+     332,   333,   334,   335,     4,   336,   337,   338,   339,   340,
+       5,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,   294,   295,   341,   342,   261,   343,   344,   345,   346,
+     347,   348,   349,   350,   351,   352,   353,   354,   355,   250,
+     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
+     366,   367,   368,   369,     6,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   251,   383,
+       7,   384,   385,   386,   387,   388,   389,   390,   391,   392,
+     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   406,   407,   408,   409,   410,   411,   412,
+     413,   414,   415,   416,     8,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457
 };
 
 #define yypact_value_is_default(Yystate) \
@@ -1325,41 +1352,42 @@ static const yytype_int16 yycheck[] =
       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,   105,    10,    10,    10,    41,
-      42,    43,    10,    10,    10,    47,    48,    49,    50,    51,
+      42,    43,    -1,    10,    10,    47,    48,    49,    50,    51,
       52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    10,    10,    37,    10,
-      39,    40,    10,    10,    37,    97,    98,    99,    10,   101,
+      82,    83,    84,    85,    86,    87,    89,    90,    91,    92,
+      93,    94,    95,    96,    37,    97,    98,    99,    10,   101,
      102,   103,    45,    46,   106,   107,   108,   109,   110,   111,
      112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
      122,   123,   124,   125,   126,   127,     0,    10,   130,   131,
-     132,   133,   134,   135,   136,   137,    -1,    11,    89,    90,
-      91,    92,    93,    94,    95,    96,    10,    10,    10,   151,
-     152,   100,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,    38,    10,    10,    10,    10,    10,
-      44,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-     129,    10,    10,    10,    10,   128,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+     132,   133,   134,   135,   136,   137,    37,    11,    39,    40,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,   151,
+     152,   153,   154,   155,   156,   157,    10,    10,    10,    10,
+      10,    10,    10,    10,    38,    10,    10,    10,    10,    10,
+      44,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,    10,    10,   128,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,   100,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    88,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,   129,    10,
      104,    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,   138,    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,   154,     0,    11,    38,    44,    88,   104,   138,   155,
-     156,   159,   162,   281,   292,   307,   157,   160,   163,   282,
-     293,   308,    12,    13,    14,    15,    16,    17,    18,    19,
+       0,   159,     0,    11,    38,    44,    88,   104,   138,   160,
+     161,   164,   167,   291,   302,   317,   162,   165,   168,   292,
+     303,   318,    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,    41,    42,    43,
       47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
@@ -1369,8 +1397,8 @@ static const yytype_uint16 yystos[] =
       87,    97,    98,    99,   101,   102,   103,   106,   107,   108,
      109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
      119,   120,   121,   122,   123,   124,   125,   126,   127,   130,
-     131,   132,   133,   134,   135,   136,   137,   151,   152,   158,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     131,   132,   133,   134,   135,   136,   137,   151,   152,   153,
+     154,   155,   156,   157,   163,   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,
@@ -1380,14 +1408,15 @@ static const yytype_uint16 yystos[] =
      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,    37,    39,    40,
-     100,   129,   161,   272,   273,   274,   275,   276,    37,    45,
-      46,   128,   164,   277,   278,   279,   280,    89,    90,    91,
-      92,    93,    94,    95,    96,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   105,
-     309,   310,    10,    10,    10,    10,    10,    10,    10,    10,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,    37,    39,    40,
+     100,   129,   166,   282,   283,   284,   285,   286,    37,    45,
+      46,   128,   169,   287,   288,   289,   290,    89,    90,    91,
+      92,    93,    94,    95,    96,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   105,
+     319,   320,    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,
@@ -1401,7 +1430,7 @@ 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
 };
 
 #define yyerrok                (yyerrstatus = 0)
@@ -2203,15 +2232,15 @@ yyreduce:
     {
         case 10:
 /* Line 1792 of yacc.c  */
-#line 132 "./util/configparser.y"
+#line 134 "./util/configparser.y"
     { 
                OUTYY(("\nP(server:)\n")); 
        }
     break;
 
-  case 120:
+  case 125:
 /* Line 1792 of yacc.c  */
-#line 185 "./util/configparser.y"
+#line 189 "./util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(stub_zone:)\n")); 
@@ -2224,9 +2253,9 @@ yyreduce:
        }
     break;
 
-  case 128:
+  case 133:
 /* Line 1792 of yacc.c  */
-#line 201 "./util/configparser.y"
+#line 205 "./util/configparser.y"
     {
                struct config_stub* s;
                OUTYY(("\nP(forward_zone:)\n")); 
@@ -2239,9 +2268,9 @@ yyreduce:
        }
     break;
 
-  case 135:
+  case 140:
 /* Line 1792 of yacc.c  */
-#line 217 "./util/configparser.y"
+#line 221 "./util/configparser.y"
     { 
                OUTYY(("P(server_num_threads:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2251,9 +2280,9 @@ yyreduce:
        }
     break;
 
-  case 136:
+  case 141:
 /* Line 1792 of yacc.c  */
-#line 226 "./util/configparser.y"
+#line 230 "./util/configparser.y"
     { 
                OUTYY(("P(server_verbosity:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2263,9 +2292,9 @@ yyreduce:
        }
     break;
 
-  case 137:
+  case 142:
 /* Line 1792 of yacc.c  */
-#line 235 "./util/configparser.y"
+#line 239 "./util/configparser.y"
     { 
                OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[(2) - (2)].str))); 
                if(strcmp((yyvsp[(2) - (2)].str), "") == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0)
@@ -2277,9 +2306,9 @@ yyreduce:
        }
     break;
 
-  case 138:
+  case 143:
 /* Line 1792 of yacc.c  */
-#line 246 "./util/configparser.y"
+#line 250 "./util/configparser.y"
     {
                OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2289,9 +2318,9 @@ yyreduce:
        }
     break;
 
-  case 139:
+  case 144:
 /* Line 1792 of yacc.c  */
-#line 255 "./util/configparser.y"
+#line 259 "./util/configparser.y"
     {
                OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2301,9 +2330,9 @@ yyreduce:
        }
     break;
 
-  case 140:
+  case 145:
 /* Line 1792 of yacc.c  */
-#line 264 "./util/configparser.y"
+#line 268 "./util/configparser.y"
     {
                OUTYY(("P(server_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2313,9 +2342,9 @@ yyreduce:
        }
     break;
 
-  case 141:
+  case 146:
 /* Line 1792 of yacc.c  */
-#line 273 "./util/configparser.y"
+#line 277 "./util/configparser.y"
     {
                OUTYY(("P(server_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_ifs == 0)
@@ -2329,9 +2358,9 @@ yyreduce:
        }
     break;
 
-  case 142:
+  case 147:
 /* Line 1792 of yacc.c  */
-#line 286 "./util/configparser.y"
+#line 290 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->num_out_ifs == 0)
@@ -2347,9 +2376,9 @@ yyreduce:
        }
     break;
 
-  case 143:
+  case 148:
 /* Line 1792 of yacc.c  */
-#line 301 "./util/configparser.y"
+#line 305 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2359,9 +2388,9 @@ yyreduce:
        }
     break;
 
-  case 144:
+  case 149:
 /* Line 1792 of yacc.c  */
-#line 310 "./util/configparser.y"
+#line 314 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 1, 
@@ -2371,9 +2400,9 @@ yyreduce:
        }
     break;
 
-  case 145:
+  case 150:
 /* Line 1792 of yacc.c  */
-#line 319 "./util/configparser.y"
+#line 323 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_mark_ports((yyvsp[(2) - (2)].str), 0, 
@@ -2383,9 +2412,9 @@ yyreduce:
        }
     break;
 
-  case 146:
+  case 151:
 /* Line 1792 of yacc.c  */
-#line 328 "./util/configparser.y"
+#line 332 "./util/configparser.y"
     {
                OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2395,9 +2424,9 @@ yyreduce:
        }
     break;
 
-  case 147:
+  case 152:
 /* Line 1792 of yacc.c  */
-#line 337 "./util/configparser.y"
+#line 341 "./util/configparser.y"
     {
                OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2407,9 +2436,9 @@ yyreduce:
        }
     break;
 
-  case 148:
+  case 153:
 /* Line 1792 of yacc.c  */
-#line 346 "./util/configparser.y"
+#line 350 "./util/configparser.y"
     {
                OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2419,9 +2448,9 @@ yyreduce:
        }
     break;
 
-  case 149:
+  case 154:
 /* Line 1792 of yacc.c  */
-#line 355 "./util/configparser.y"
+#line 359 "./util/configparser.y"
     {
                OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2431,9 +2460,9 @@ yyreduce:
        }
     break;
 
-  case 150:
+  case 155:
 /* Line 1792 of yacc.c  */
-#line 364 "./util/configparser.y"
+#line 368 "./util/configparser.y"
     {
                OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2443,9 +2472,9 @@ yyreduce:
        }
     break;
 
-  case 151:
+  case 156:
 /* Line 1792 of yacc.c  */
-#line 373 "./util/configparser.y"
+#line 377 "./util/configparser.y"
     {
                OUTYY(("P(server_do_udp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2455,9 +2484,9 @@ yyreduce:
        }
     break;
 
-  case 152:
+  case 157:
 /* Line 1792 of yacc.c  */
-#line 382 "./util/configparser.y"
+#line 386 "./util/configparser.y"
     {
                OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2467,9 +2496,9 @@ yyreduce:
        }
     break;
 
-  case 153:
+  case 158:
 /* Line 1792 of yacc.c  */
-#line 391 "./util/configparser.y"
+#line 395 "./util/configparser.y"
     {
                OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2479,9 +2508,9 @@ yyreduce:
        }
     break;
 
-  case 154:
+  case 159:
 /* Line 1792 of yacc.c  */
-#line 400 "./util/configparser.y"
+#line 404 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2491,9 +2520,9 @@ yyreduce:
        }
     break;
 
-  case 155:
+  case 160:
 /* Line 1792 of yacc.c  */
-#line 409 "./util/configparser.y"
+#line 413 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->ssl_service_key);
@@ -2501,9 +2530,9 @@ yyreduce:
        }
     break;
 
-  case 156:
+  case 161:
 /* Line 1792 of yacc.c  */
-#line 416 "./util/configparser.y"
+#line 420 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->ssl_service_pem);
@@ -2511,9 +2540,9 @@ yyreduce:
        }
     break;
 
-  case 157:
+  case 162:
 /* Line 1792 of yacc.c  */
-#line 423 "./util/configparser.y"
+#line 427 "./util/configparser.y"
     {
                OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2523,9 +2552,9 @@ yyreduce:
        }
     break;
 
-  case 158:
+  case 163:
 /* Line 1792 of yacc.c  */
-#line 432 "./util/configparser.y"
+#line 436 "./util/configparser.y"
     {
                OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2535,9 +2564,9 @@ yyreduce:
        }
     break;
 
-  case 159:
+  case 164:
 /* Line 1792 of yacc.c  */
-#line 441 "./util/configparser.y"
+#line 445 "./util/configparser.y"
     {
                OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2552,9 +2581,9 @@ yyreduce:
        }
     break;
 
-  case 160:
+  case 165:
 /* Line 1792 of yacc.c  */
-#line 455 "./util/configparser.y"
+#line 459 "./util/configparser.y"
     {
                OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2564,9 +2593,9 @@ yyreduce:
        }
     break;
 
-  case 161:
+  case 166:
 /* Line 1792 of yacc.c  */
-#line 464 "./util/configparser.y"
+#line 468 "./util/configparser.y"
     {
                OUTYY(("P(server_log_queries:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2576,9 +2605,9 @@ yyreduce:
        }
     break;
 
-  case 162:
+  case 167:
 /* Line 1792 of yacc.c  */
-#line 473 "./util/configparser.y"
+#line 477 "./util/configparser.y"
     {
                OUTYY(("P(server_chroot:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->chrootdir);
@@ -2586,9 +2615,9 @@ yyreduce:
        }
     break;
 
-  case 163:
+  case 168:
 /* Line 1792 of yacc.c  */
-#line 480 "./util/configparser.y"
+#line 484 "./util/configparser.y"
     {
                OUTYY(("P(server_username:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->username);
@@ -2596,9 +2625,9 @@ yyreduce:
        }
     break;
 
-  case 164:
+  case 169:
 /* Line 1792 of yacc.c  */
-#line 487 "./util/configparser.y"
+#line 491 "./util/configparser.y"
     {
                OUTYY(("P(server_directory:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->directory);
@@ -2606,9 +2635,9 @@ yyreduce:
        }
     break;
 
-  case 165:
+  case 170:
 /* Line 1792 of yacc.c  */
-#line 494 "./util/configparser.y"
+#line 498 "./util/configparser.y"
     {
                OUTYY(("P(server_logfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->logfile);
@@ -2617,9 +2646,9 @@ yyreduce:
        }
     break;
 
-  case 166:
+  case 171:
 /* Line 1792 of yacc.c  */
-#line 502 "./util/configparser.y"
+#line 506 "./util/configparser.y"
     {
                OUTYY(("P(server_pidfile:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->pidfile);
@@ -2627,9 +2656,9 @@ yyreduce:
        }
     break;
 
-  case 167:
+  case 172:
 /* Line 1792 of yacc.c  */
-#line 509 "./util/configparser.y"
+#line 513 "./util/configparser.y"
     {
                OUTYY(("P(server_root_hints:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[(2) - (2)].str)))
@@ -2637,9 +2666,9 @@ yyreduce:
        }
     break;
 
-  case 168:
+  case 173:
 /* Line 1792 of yacc.c  */
-#line 516 "./util/configparser.y"
+#line 520 "./util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dlv_anchor_file);
@@ -2647,9 +2676,9 @@ yyreduce:
        }
     break;
 
-  case 169:
+  case 174:
 /* Line 1792 of yacc.c  */
-#line 523 "./util/configparser.y"
+#line 527 "./util/configparser.y"
     {
                OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2657,9 +2686,9 @@ yyreduce:
        }
     break;
 
-  case 170:
+  case 175:
 /* Line 1792 of yacc.c  */
-#line 530 "./util/configparser.y"
+#line 534 "./util/configparser.y"
     {
                OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2668,9 +2697,9 @@ yyreduce:
        }
     break;
 
-  case 171:
+  case 176:
 /* Line 1792 of yacc.c  */
-#line 538 "./util/configparser.y"
+#line 542 "./util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2679,9 +2708,9 @@ yyreduce:
        }
     break;
 
-  case 172:
+  case 177:
 /* Line 1792 of yacc.c  */
-#line 546 "./util/configparser.y"
+#line 550 "./util/configparser.y"
     {
                OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->
@@ -2690,9 +2719,9 @@ yyreduce:
        }
     break;
 
-  case 173:
+  case 178:
 /* Line 1792 of yacc.c  */
-#line 554 "./util/configparser.y"
+#line 558 "./util/configparser.y"
     {
                OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[(2) - (2)].str)))
@@ -2700,9 +2729,9 @@ yyreduce:
        }
     break;
 
-  case 174:
+  case 179:
 /* Line 1792 of yacc.c  */
-#line 561 "./util/configparser.y"
+#line 565 "./util/configparser.y"
     {
                OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[(2) - (2)].str)))
@@ -2710,9 +2739,9 @@ yyreduce:
        }
     break;
 
-  case 175:
+  case 180:
 /* Line 1792 of yacc.c  */
-#line 568 "./util/configparser.y"
+#line 572 "./util/configparser.y"
     {
                OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2722,9 +2751,9 @@ yyreduce:
        }
     break;
 
-  case 176:
+  case 181:
 /* Line 1792 of yacc.c  */
-#line 577 "./util/configparser.y"
+#line 581 "./util/configparser.y"
     {
                OUTYY(("P(server_hide_version:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2734,9 +2763,9 @@ yyreduce:
        }
     break;
 
-  case 177:
+  case 182:
 /* Line 1792 of yacc.c  */
-#line 586 "./util/configparser.y"
+#line 590 "./util/configparser.y"
     {
                OUTYY(("P(server_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->identity);
@@ -2744,9 +2773,9 @@ yyreduce:
        }
     break;
 
-  case 178:
+  case 183:
 /* Line 1792 of yacc.c  */
-#line 593 "./util/configparser.y"
+#line 597 "./util/configparser.y"
     {
                OUTYY(("P(server_version:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->version);
@@ -2754,9 +2783,9 @@ yyreduce:
        }
     break;
 
-  case 179:
+  case 184:
 /* Line 1792 of yacc.c  */
-#line 600 "./util/configparser.y"
+#line 604 "./util/configparser.y"
     {
                OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_rcvbuf))
@@ -2765,9 +2794,9 @@ yyreduce:
        }
     break;
 
-  case 180:
+  case 185:
 /* Line 1792 of yacc.c  */
-#line 608 "./util/configparser.y"
+#line 612 "./util/configparser.y"
     {
                OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->so_sndbuf))
@@ -2776,9 +2805,9 @@ yyreduce:
        }
     break;
 
-  case 181:
+  case 186:
 /* Line 1792 of yacc.c  */
-#line 616 "./util/configparser.y"
+#line 620 "./util/configparser.y"
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[(2) - (2)].str)));
         if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2789,9 +2818,9 @@ yyreduce:
     }
     break;
 
-  case 182:
+  case 187:
 /* Line 1792 of yacc.c  */
-#line 626 "./util/configparser.y"
+#line 630 "./util/configparser.y"
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[(2) - (2)].str)));
         if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2802,9 +2831,9 @@ yyreduce:
     }
     break;
 
-  case 183:
+  case 188:
 /* Line 1792 of yacc.c  */
-#line 636 "./util/configparser.y"
+#line 640 "./util/configparser.y"
     {
                OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2818,9 +2847,9 @@ yyreduce:
        }
     break;
 
-  case 184:
+  case 189:
 /* Line 1792 of yacc.c  */
-#line 649 "./util/configparser.y"
+#line 653 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2832,9 +2861,9 @@ yyreduce:
        }
     break;
 
-  case 185:
+  case 190:
 /* Line 1792 of yacc.c  */
-#line 660 "./util/configparser.y"
+#line 664 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->msg_cache_size))
@@ -2843,9 +2872,9 @@ yyreduce:
        }
     break;
 
-  case 186:
+  case 191:
 /* Line 1792 of yacc.c  */
-#line 668 "./util/configparser.y"
+#line 672 "./util/configparser.y"
     {
                OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2859,9 +2888,9 @@ yyreduce:
        }
     break;
 
-  case 187:
+  case 192:
 /* Line 1792 of yacc.c  */
-#line 681 "./util/configparser.y"
+#line 685 "./util/configparser.y"
     {
                OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2871,9 +2900,9 @@ yyreduce:
        }
     break;
 
-  case 188:
+  case 193:
 /* Line 1792 of yacc.c  */
-#line 690 "./util/configparser.y"
+#line 694 "./util/configparser.y"
     {
                OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2883,9 +2912,9 @@ yyreduce:
        }
     break;
 
-  case 189:
+  case 194:
 /* Line 1792 of yacc.c  */
-#line 699 "./util/configparser.y"
+#line 703 "./util/configparser.y"
     {
                OUTYY(("P(server_delay_close:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2895,9 +2924,9 @@ yyreduce:
        }
     break;
 
-  case 190:
+  case 195:
 /* Line 1792 of yacc.c  */
-#line 708 "./util/configparser.y"
+#line 712 "./util/configparser.y"
     {
                OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -2908,9 +2937,9 @@ yyreduce:
        }
     break;
 
-  case 191:
+  case 196:
 /* Line 1792 of yacc.c  */
-#line 718 "./util/configparser.y"
+#line 722 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->rrset_cache_size))
@@ -2919,9 +2948,9 @@ yyreduce:
        }
     break;
 
-  case 192:
+  case 197:
 /* Line 1792 of yacc.c  */
-#line 726 "./util/configparser.y"
+#line 730 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2935,9 +2964,9 @@ yyreduce:
        }
     break;
 
-  case 193:
+  case 198:
 /* Line 1792 of yacc.c  */
-#line 739 "./util/configparser.y"
+#line 743 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -2947,9 +2976,9 @@ yyreduce:
        }
     break;
 
-  case 194:
+  case 199:
 /* Line 1792 of yacc.c  */
-#line 748 "./util/configparser.y"
+#line 752 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
@@ -2958,9 +2987,9 @@ yyreduce:
        }
     break;
 
-  case 195:
+  case 200:
 /* Line 1792 of yacc.c  */
-#line 756 "./util/configparser.y"
+#line 760 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2970,9 +2999,9 @@ yyreduce:
        }
     break;
 
-  case 196:
+  case 201:
 /* Line 1792 of yacc.c  */
-#line 765 "./util/configparser.y"
+#line 769 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[(2) - (2)].str)));
                verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
@@ -2981,9 +3010,9 @@ yyreduce:
        }
     break;
 
-  case 197:
+  case 202:
 /* Line 1792 of yacc.c  */
-#line 773 "./util/configparser.y"
+#line 777 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -2997,9 +3026,9 @@ yyreduce:
        }
     break;
 
-  case 198:
+  case 203:
 /* Line 1792 of yacc.c  */
-#line 786 "./util/configparser.y"
+#line 790 "./util/configparser.y"
     {
                OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3009,9 +3038,9 @@ yyreduce:
        }
     break;
 
-  case 199:
+  case 204:
 /* Line 1792 of yacc.c  */
-#line 795 "./util/configparser.y"
+#line 799 "./util/configparser.y"
     {
                OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->target_fetch_policy);
@@ -3019,9 +3048,9 @@ yyreduce:
        }
     break;
 
-  case 200:
+  case 205:
 /* Line 1792 of yacc.c  */
-#line 802 "./util/configparser.y"
+#line 806 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3032,9 +3061,9 @@ yyreduce:
        }
     break;
 
-  case 201:
+  case 206:
 /* Line 1792 of yacc.c  */
-#line 812 "./util/configparser.y"
+#line 816 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3045,9 +3074,9 @@ yyreduce:
        }
     break;
 
-  case 202:
+  case 207:
 /* Line 1792 of yacc.c  */
-#line 822 "./util/configparser.y"
+#line 826 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3058,9 +3087,9 @@ yyreduce:
        }
     break;
 
-  case 203:
+  case 208:
 /* Line 1792 of yacc.c  */
-#line 832 "./util/configparser.y"
+#line 836 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3071,9 +3100,9 @@ yyreduce:
        }
     break;
 
-  case 204:
+  case 209:
 /* Line 1792 of yacc.c  */
-#line 842 "./util/configparser.y"
+#line 846 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3084,9 +3113,9 @@ yyreduce:
        }
     break;
 
-  case 205:
+  case 210:
 /* Line 1792 of yacc.c  */
-#line 852 "./util/configparser.y"
+#line 856 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3097,9 +3126,9 @@ yyreduce:
        }
     break;
 
-  case 206:
+  case 211:
 /* Line 1792 of yacc.c  */
-#line 862 "./util/configparser.y"
+#line 866 "./util/configparser.y"
     {
                OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3110,9 +3139,9 @@ yyreduce:
        }
     break;
 
-  case 207:
+  case 212:
 /* Line 1792 of yacc.c  */
-#line 872 "./util/configparser.y"
+#line 876 "./util/configparser.y"
     {
                OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3123,9 +3152,9 @@ yyreduce:
        }
     break;
 
-  case 208:
+  case 213:
 /* Line 1792 of yacc.c  */
-#line 882 "./util/configparser.y"
+#line 886 "./util/configparser.y"
     {
                OUTYY(("P(server_private_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[(2) - (2)].str)))
@@ -3133,9 +3162,9 @@ yyreduce:
        }
     break;
 
-  case 209:
+  case 214:
 /* Line 1792 of yacc.c  */
-#line 889 "./util/configparser.y"
+#line 893 "./util/configparser.y"
     {
                OUTYY(("P(server_private_domain:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[(2) - (2)].str)))
@@ -3143,9 +3172,9 @@ yyreduce:
        }
     break;
 
-  case 210:
+  case 215:
 /* Line 1792 of yacc.c  */
-#line 896 "./util/configparser.y"
+#line 900 "./util/configparser.y"
     {
                OUTYY(("P(server_prefetch:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3155,9 +3184,9 @@ yyreduce:
        }
     break;
 
-  case 211:
+  case 216:
 /* Line 1792 of yacc.c  */
-#line 905 "./util/configparser.y"
+#line 909 "./util/configparser.y"
     {
                OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3167,9 +3196,9 @@ yyreduce:
        }
     break;
 
-  case 212:
+  case 217:
 /* Line 1792 of yacc.c  */
-#line 914 "./util/configparser.y"
+#line 918 "./util/configparser.y"
     {
                OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3179,9 +3208,9 @@ yyreduce:
        }
     break;
 
-  case 213:
+  case 218:
 /* Line 1792 of yacc.c  */
-#line 923 "./util/configparser.y"
+#line 927 "./util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[(2) - (2)].str)))
@@ -3189,9 +3218,9 @@ yyreduce:
        }
     break;
 
-  case 214:
+  case 219:
 /* Line 1792 of yacc.c  */
-#line 930 "./util/configparser.y"
+#line 934 "./util/configparser.y"
     {
                OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3202,9 +3231,9 @@ yyreduce:
        }
     break;
 
-  case 215:
+  case 220:
 /* Line 1792 of yacc.c  */
-#line 940 "./util/configparser.y"
+#line 944 "./util/configparser.y"
     {
                OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "deny")!=0 && strcmp((yyvsp[(3) - (3)].str), "refuse")!=0 &&
@@ -3222,9 +3251,9 @@ yyreduce:
        }
     break;
 
-  case 216:
+  case 221:
 /* Line 1792 of yacc.c  */
-#line 957 "./util/configparser.y"
+#line 961 "./util/configparser.y"
     {
                OUTYY(("P(server_module_conf:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->module_conf);
@@ -3232,9 +3261,9 @@ yyreduce:
        }
     break;
 
-  case 217:
+  case 222:
 /* Line 1792 of yacc.c  */
-#line 964 "./util/configparser.y"
+#line 968 "./util/configparser.y"
     {
                OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3253,9 +3282,9 @@ yyreduce:
        }
     break;
 
-  case 218:
+  case 223:
 /* Line 1792 of yacc.c  */
-#line 982 "./util/configparser.y"
+#line 986 "./util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3269,9 +3298,9 @@ yyreduce:
        }
     break;
 
-  case 219:
+  case 224:
 /* Line 1792 of yacc.c  */
-#line 995 "./util/configparser.y"
+#line 999 "./util/configparser.y"
     {
                OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strlen((yyvsp[(2) - (2)].str)) == 0 || strcmp((yyvsp[(2) - (2)].str), "0") == 0) {
@@ -3285,9 +3314,9 @@ yyreduce:
        }
     break;
 
-  case 220:
+  case 225:
 /* Line 1792 of yacc.c  */
-#line 1008 "./util/configparser.y"
+#line 1012 "./util/configparser.y"
     {
                OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3297,9 +3326,9 @@ yyreduce:
        }
     break;
 
-  case 221:
+  case 226:
 /* Line 1792 of yacc.c  */
-#line 1017 "./util/configparser.y"
+#line 1021 "./util/configparser.y"
     {
                OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3309,9 +3338,9 @@ yyreduce:
        }
     break;
 
-  case 222:
+  case 227:
 /* Line 1792 of yacc.c  */
-#line 1026 "./util/configparser.y"
+#line 1030 "./util/configparser.y"
     {
                OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3321,9 +3350,9 @@ yyreduce:
        }
     break;
 
-  case 223:
+  case 228:
 /* Line 1792 of yacc.c  */
-#line 1035 "./util/configparser.y"
+#line 1039 "./util/configparser.y"
     {
                OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3334,9 +3363,9 @@ yyreduce:
        }
     break;
 
-  case 224:
+  case 229:
 /* Line 1792 of yacc.c  */
-#line 1045 "./util/configparser.y"
+#line 1049 "./util/configparser.y"
     {
                OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3347,9 +3376,9 @@ yyreduce:
        }
     break;
 
-  case 225:
+  case 230:
 /* Line 1792 of yacc.c  */
-#line 1055 "./util/configparser.y"
+#line 1059 "./util/configparser.y"
     {
                OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3359,9 +3388,9 @@ yyreduce:
        }
     break;
 
-  case 226:
+  case 231:
 /* Line 1792 of yacc.c  */
-#line 1064 "./util/configparser.y"
+#line 1068 "./util/configparser.y"
     {
                OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3371,9 +3400,9 @@ yyreduce:
        }
     break;
 
-  case 227:
+  case 232:
 /* Line 1792 of yacc.c  */
-#line 1073 "./util/configparser.y"
+#line 1077 "./util/configparser.y"
     {
                OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->val_nsec3_key_iterations);
@@ -3381,9 +3410,9 @@ yyreduce:
        }
     break;
 
-  case 228:
+  case 233:
 /* Line 1792 of yacc.c  */
-#line 1080 "./util/configparser.y"
+#line 1084 "./util/configparser.y"
     {
                OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3393,9 +3422,9 @@ yyreduce:
        }
     break;
 
-  case 229:
+  case 234:
 /* Line 1792 of yacc.c  */
-#line 1089 "./util/configparser.y"
+#line 1093 "./util/configparser.y"
     {
                OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3405,9 +3434,9 @@ yyreduce:
        }
     break;
 
-  case 230:
+  case 235:
 /* Line 1792 of yacc.c  */
-#line 1098 "./util/configparser.y"
+#line 1102 "./util/configparser.y"
     {
                OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
@@ -3417,9 +3446,9 @@ yyreduce:
        }
     break;
 
-  case 231:
+  case 236:
 /* Line 1792 of yacc.c  */
-#line 1107 "./util/configparser.y"
+#line 1111 "./util/configparser.y"
     {
                OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->key_cache_size))
@@ -3428,9 +3457,9 @@ yyreduce:
        }
     break;
 
-  case 232:
+  case 237:
 /* Line 1792 of yacc.c  */
-#line 1115 "./util/configparser.y"
+#line 1119 "./util/configparser.y"
     {
                OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3444,9 +3473,9 @@ yyreduce:
        }
     break;
 
-  case 233:
+  case 238:
 /* Line 1792 of yacc.c  */
-#line 1128 "./util/configparser.y"
+#line 1132 "./util/configparser.y"
     {
                OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->neg_cache_size))
@@ -3455,9 +3484,9 @@ yyreduce:
        }
     break;
 
-  case 234:
+  case 239:
 /* Line 1792 of yacc.c  */
-#line 1136 "./util/configparser.y"
+#line 1140 "./util/configparser.y"
     {
                OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
                if(strcmp((yyvsp[(3) - (3)].str), "static")!=0 && strcmp((yyvsp[(3) - (3)].str), "deny")!=0 &&
@@ -3481,9 +3510,9 @@ yyreduce:
        }
     break;
 
-  case 235:
+  case 240:
 /* Line 1792 of yacc.c  */
-#line 1159 "./util/configparser.y"
+#line 1163 "./util/configparser.y"
     {
                OUTYY(("P(server_local_data:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[(2) - (2)].str)))
@@ -3491,9 +3520,9 @@ yyreduce:
        }
     break;
 
-  case 236:
+  case 241:
 /* Line 1792 of yacc.c  */
-#line 1166 "./util/configparser.y"
+#line 1170 "./util/configparser.y"
     {
                char* ptr;
                OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[(2) - (2)].str)));
@@ -3509,9 +3538,9 @@ yyreduce:
        }
     break;
 
-  case 237:
+  case 242:
 /* Line 1792 of yacc.c  */
-#line 1181 "./util/configparser.y"
+#line 1185 "./util/configparser.y"
     {
                OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3522,9 +3551,9 @@ yyreduce:
        }
     break;
 
-  case 238:
+  case 243:
 /* Line 1792 of yacc.c  */
-#line 1191 "./util/configparser.y"
+#line 1195 "./util/configparser.y"
     {
                OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3535,9 +3564,9 @@ yyreduce:
        }
     break;
 
-  case 239:
+  case 244:
 /* Line 1792 of yacc.c  */
-#line 1201 "./util/configparser.y"
+#line 1205 "./util/configparser.y"
     {
                OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[(2) - (2)].str)));
                cfg_parser->cfg->max_udp_size = atoi((yyvsp[(2) - (2)].str));
@@ -3545,9 +3574,9 @@ yyreduce:
        }
     break;
 
-  case 240:
+  case 245:
 /* Line 1792 of yacc.c  */
-#line 1208 "./util/configparser.y"
+#line 1212 "./util/configparser.y"
     {
                OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dns64_prefix);
@@ -3555,9 +3584,9 @@ yyreduce:
        }
     break;
 
-  case 241:
+  case 246:
 /* Line 1792 of yacc.c  */
-#line 1215 "./util/configparser.y"
+#line 1219 "./util/configparser.y"
     {
                OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3567,9 +3596,80 @@ yyreduce:
        }
     break;
 
-  case 242:
+  case 247:
 /* Line 1792 of yacc.c  */
-#line 1224 "./util/configparser.y"
+#line 1228 "./util/configparser.y"
+    { 
+               OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[(2) - (2)].str))); 
+               if(atoi((yyvsp[(2) - (2)].str)) == 0 && strcmp((yyvsp[(2) - (2)].str), "0") != 0)
+                       yyerror("number expected");
+               else cfg_parser->cfg->ratelimit = atoi((yyvsp[(2) - (2)].str));
+               free((yyvsp[(2) - (2)].str));
+       }
+    break;
+
+  case 248:
+/* Line 1792 of yacc.c  */
+#line 1237 "./util/configparser.y"
+    {
+               OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[(2) - (2)].str)));
+               if(!cfg_parse_memsize((yyvsp[(2) - (2)].str), &cfg_parser->cfg->ratelimit_size))
+                       yyerror("memory size expected");
+               free((yyvsp[(2) - (2)].str));
+       }
+    break;
+
+  case 249:
+/* Line 1792 of yacc.c  */
+#line 1245 "./util/configparser.y"
+    {
+               OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[(2) - (2)].str)));
+               if(atoi((yyvsp[(2) - (2)].str)) == 0)
+                       yyerror("number expected");
+               else {
+                       cfg_parser->cfg->ratelimit_slabs = atoi((yyvsp[(2) - (2)].str));
+                       if(!is_pow2(cfg_parser->cfg->ratelimit_slabs))
+                               yyerror("must be a power of 2");
+               }
+               free((yyvsp[(2) - (2)].str));
+       }
+    break;
+
+  case 250:
+/* Line 1792 of yacc.c  */
+#line 1258 "./util/configparser.y"
+    {
+               OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
+               if(atoi((yyvsp[(3) - (3)].str)) == 0 && strcmp((yyvsp[(3) - (3)].str), "0") != 0) {
+                       yyerror("number expected");
+               } else {
+                       if(!cfg_str2list_insert(&cfg_parser->cfg->
+                               ratelimit_for_domain, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                               fatal_exit("out of memory adding "
+                                       "ratelimit-for-domain");
+               }
+       }
+    break;
+
+  case 251:
+/* Line 1792 of yacc.c  */
+#line 1271 "./util/configparser.y"
+    {
+               OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)));
+               if(atoi((yyvsp[(3) - (3)].str)) == 0 && strcmp((yyvsp[(3) - (3)].str), "0") != 0) {
+                       yyerror("number expected");
+               } else {
+                       if(!cfg_str2list_insert(&cfg_parser->cfg->
+                               ratelimit_below_domain, (yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].str)))
+                               fatal_exit("out of memory adding "
+                                       "ratelimit-below-domain");
+               }
+       }
+    break;
+
+  case 252:
+/* Line 1792 of yacc.c  */
+#line 1284 "./util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->stubs->name)
@@ -3580,9 +3680,9 @@ yyreduce:
        }
     break;
 
-  case 243:
+  case 253:
 /* Line 1792 of yacc.c  */
-#line 1234 "./util/configparser.y"
+#line 1294 "./util/configparser.y"
     {
                OUTYY(("P(stub-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[(2) - (2)].str)))
@@ -3590,9 +3690,9 @@ yyreduce:
        }
     break;
 
-  case 244:
+  case 254:
 /* Line 1792 of yacc.c  */
-#line 1241 "./util/configparser.y"
+#line 1301 "./util/configparser.y"
     {
                OUTYY(("P(stub-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[(2) - (2)].str)))
@@ -3600,9 +3700,9 @@ yyreduce:
        }
     break;
 
-  case 245:
+  case 255:
 /* Line 1792 of yacc.c  */
-#line 1248 "./util/configparser.y"
+#line 1308 "./util/configparser.y"
     {
                OUTYY(("P(stub-first:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3612,9 +3712,9 @@ yyreduce:
        }
     break;
 
-  case 246:
+  case 256:
 /* Line 1792 of yacc.c  */
-#line 1257 "./util/configparser.y"
+#line 1317 "./util/configparser.y"
     {
                OUTYY(("P(stub-prime:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3625,9 +3725,9 @@ yyreduce:
        }
     break;
 
-  case 247:
+  case 257:
 /* Line 1792 of yacc.c  */
-#line 1267 "./util/configparser.y"
+#line 1327 "./util/configparser.y"
     {
                OUTYY(("P(name:%s)\n", (yyvsp[(2) - (2)].str)));
                if(cfg_parser->cfg->forwards->name)
@@ -3638,9 +3738,9 @@ yyreduce:
        }
     break;
 
-  case 248:
+  case 258:
 /* Line 1792 of yacc.c  */
-#line 1277 "./util/configparser.y"
+#line 1337 "./util/configparser.y"
     {
                OUTYY(("P(forward-host:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[(2) - (2)].str)))
@@ -3648,9 +3748,9 @@ yyreduce:
        }
     break;
 
-  case 249:
+  case 259:
 /* Line 1792 of yacc.c  */
-#line 1284 "./util/configparser.y"
+#line 1344 "./util/configparser.y"
     {
                OUTYY(("P(forward-addr:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[(2) - (2)].str)))
@@ -3658,9 +3758,9 @@ yyreduce:
        }
     break;
 
-  case 250:
+  case 260:
 /* Line 1792 of yacc.c  */
-#line 1291 "./util/configparser.y"
+#line 1351 "./util/configparser.y"
     {
                OUTYY(("P(forward-first:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3670,17 +3770,17 @@ yyreduce:
        }
     break;
 
-  case 251:
+  case 261:
 /* Line 1792 of yacc.c  */
-#line 1300 "./util/configparser.y"
+#line 1360 "./util/configparser.y"
     { 
                OUTYY(("\nP(remote-control:)\n")); 
        }
     break;
 
-  case 262:
+  case 272:
 /* Line 1792 of yacc.c  */
-#line 1311 "./util/configparser.y"
+#line 1371 "./util/configparser.y"
     {
                OUTYY(("P(control_enable:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3691,9 +3791,9 @@ yyreduce:
        }
     break;
 
-  case 263:
+  case 273:
 /* Line 1792 of yacc.c  */
-#line 1321 "./util/configparser.y"
+#line 1381 "./util/configparser.y"
     {
                OUTYY(("P(control_port:%s)\n", (yyvsp[(2) - (2)].str)));
                if(atoi((yyvsp[(2) - (2)].str)) == 0)
@@ -3703,9 +3803,9 @@ yyreduce:
        }
     break;
 
-  case 264:
+  case 274:
 /* Line 1792 of yacc.c  */
-#line 1330 "./util/configparser.y"
+#line 1390 "./util/configparser.y"
     {
                OUTYY(("P(control_interface:%s)\n", (yyvsp[(2) - (2)].str)));
                if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[(2) - (2)].str)))
@@ -3713,9 +3813,9 @@ yyreduce:
        }
     break;
 
-  case 265:
+  case 275:
 /* Line 1792 of yacc.c  */
-#line 1337 "./util/configparser.y"
+#line 1397 "./util/configparser.y"
     {
                OUTYY(("P(control_use_cert:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3726,9 +3826,9 @@ yyreduce:
        }
     break;
 
-  case 266:
+  case 276:
 /* Line 1792 of yacc.c  */
-#line 1347 "./util/configparser.y"
+#line 1407 "./util/configparser.y"
     {
                OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_key_file);
@@ -3736,9 +3836,9 @@ yyreduce:
        }
     break;
 
-  case 267:
+  case 277:
 /* Line 1792 of yacc.c  */
-#line 1354 "./util/configparser.y"
+#line 1414 "./util/configparser.y"
     {
                OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->server_cert_file);
@@ -3746,9 +3846,9 @@ yyreduce:
        }
     break;
 
-  case 268:
+  case 278:
 /* Line 1792 of yacc.c  */
-#line 1361 "./util/configparser.y"
+#line 1421 "./util/configparser.y"
     {
                OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_key_file);
@@ -3756,9 +3856,9 @@ yyreduce:
        }
     break;
 
-  case 269:
+  case 279:
 /* Line 1792 of yacc.c  */
-#line 1368 "./util/configparser.y"
+#line 1428 "./util/configparser.y"
     {
                OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->control_cert_file);
@@ -3766,17 +3866,17 @@ yyreduce:
        }
     break;
 
-  case 270:
+  case 280:
 /* Line 1792 of yacc.c  */
-#line 1375 "./util/configparser.y"
+#line 1435 "./util/configparser.y"
     {
                OUTYY(("\nP(dnstap:)\n"));
        }
     break;
 
-  case 285:
+  case 295:
 /* Line 1792 of yacc.c  */
-#line 1392 "./util/configparser.y"
+#line 1452 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3785,9 +3885,9 @@ yyreduce:
        }
     break;
 
-  case 286:
+  case 296:
 /* Line 1792 of yacc.c  */
-#line 1400 "./util/configparser.y"
+#line 1460 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dnstap_socket_path);
@@ -3795,9 +3895,9 @@ yyreduce:
        }
     break;
 
-  case 287:
+  case 297:
 /* Line 1792 of yacc.c  */
-#line 1407 "./util/configparser.y"
+#line 1467 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3806,9 +3906,9 @@ yyreduce:
        }
     break;
 
-  case 288:
+  case 298:
 /* Line 1792 of yacc.c  */
-#line 1415 "./util/configparser.y"
+#line 1475 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3817,9 +3917,9 @@ yyreduce:
        }
     break;
 
-  case 289:
+  case 299:
 /* Line 1792 of yacc.c  */
-#line 1423 "./util/configparser.y"
+#line 1483 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dnstap_identity);
@@ -3827,9 +3927,9 @@ yyreduce:
        }
     break;
 
-  case 290:
+  case 300:
 /* Line 1792 of yacc.c  */
-#line 1430 "./util/configparser.y"
+#line 1490 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->dnstap_version);
@@ -3837,9 +3937,9 @@ yyreduce:
        }
     break;
 
-  case 291:
+  case 301:
 /* Line 1792 of yacc.c  */
-#line 1437 "./util/configparser.y"
+#line 1497 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3849,9 +3949,9 @@ yyreduce:
        }
     break;
 
-  case 292:
+  case 302:
 /* Line 1792 of yacc.c  */
-#line 1446 "./util/configparser.y"
+#line 1506 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3861,9 +3961,9 @@ yyreduce:
        }
     break;
 
-  case 293:
+  case 303:
 /* Line 1792 of yacc.c  */
-#line 1455 "./util/configparser.y"
+#line 1515 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3873,9 +3973,9 @@ yyreduce:
        }
     break;
 
-  case 294:
+  case 304:
 /* Line 1792 of yacc.c  */
-#line 1464 "./util/configparser.y"
+#line 1524 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3885,9 +3985,9 @@ yyreduce:
        }
     break;
 
-  case 295:
+  case 305:
 /* Line 1792 of yacc.c  */
-#line 1473 "./util/configparser.y"
+#line 1533 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3897,9 +3997,9 @@ yyreduce:
        }
     break;
 
-  case 296:
+  case 306:
 /* Line 1792 of yacc.c  */
-#line 1482 "./util/configparser.y"
+#line 1542 "./util/configparser.y"
     {
                OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[(2) - (2)].str)));
                if(strcmp((yyvsp[(2) - (2)].str), "yes") != 0 && strcmp((yyvsp[(2) - (2)].str), "no") != 0)
@@ -3909,17 +4009,17 @@ yyreduce:
        }
     break;
 
-  case 297:
+  case 307:
 /* Line 1792 of yacc.c  */
-#line 1491 "./util/configparser.y"
+#line 1551 "./util/configparser.y"
     { 
                OUTYY(("\nP(python:)\n")); 
        }
     break;
 
-  case 301:
+  case 311:
 /* Line 1792 of yacc.c  */
-#line 1500 "./util/configparser.y"
+#line 1560 "./util/configparser.y"
     {
                OUTYY(("P(python-script:%s)\n", (yyvsp[(2) - (2)].str)));
                free(cfg_parser->cfg->python_script);
@@ -3929,7 +4029,7 @@ yyreduce:
 
 
 /* Line 1792 of yacc.c  */
-#line 3933 "util/configparser.c"
+#line 4033 "util/configparser.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4161,7 +4261,7 @@ yyreturn:
 
 
 /* Line 2055 of yacc.c  */
-#line 1505 "./util/configparser.y"
+#line 1565 "./util/configparser.y"
 
 
 /* parse helper routines could be here */

diff --git a/util/configparser.h b/util/configparser.h
index a8ab6ee593f2bbe5454d14361278e3e779616654..70145a316ea238507dc7cf7637b0fc9fbedf3524 100644 (file)
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -195,7 +195,12 @@ extern int yydebug;
      VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES = 404,
      VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES = 405,
      VAR_HARDEN_ALGO_DOWNGRADE = 406,
-     VAR_IP_TRANSPARENT = 407
+     VAR_IP_TRANSPARENT = 407,
+     VAR_RATELIMIT = 408,
+     VAR_RATELIMIT_SLABS = 409,
+     VAR_RATELIMIT_SIZE = 410,
+     VAR_RATELIMIT_FOR_DOMAIN = 411,
+     VAR_RATELIMIT_BELOW_DOMAIN = 412
    };
 #endif
 /* Tokens.  */
@@ -349,6 +354,11 @@ extern int yydebug;
 #define VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES 405
 #define VAR_HARDEN_ALGO_DOWNGRADE 406
 #define VAR_IP_TRANSPARENT 407
+#define VAR_RATELIMIT 408
+#define VAR_RATELIMIT_SLABS 409
+#define VAR_RATELIMIT_SIZE 410
+#define VAR_RATELIMIT_FOR_DOMAIN 411
+#define VAR_RATELIMIT_BELOW_DOMAIN 412
 
 
 
@@ -362,7 +372,7 @@ typedef union YYSTYPE
 
 
 /* Line 2058 of yacc.c  */
-#line 366 "util/configparser.h"
+#line 376 "util/configparser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

diff --git a/util/configparser.y b/util/configparser.y
index fb94be9d4b8d0771897bacef9a0141135b274a61..6b860fc1f0c220c38bf19429eb07a442b6233a98 100644 (file)
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -119,6 +119,8 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES
 %token VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES
 %token VAR_HARDEN_ALGO_DOWNGRADE VAR_IP_TRANSPARENT
+%token VAR_RATELIMIT VAR_RATELIMIT_SLABS VAR_RATELIMIT_SIZE
+%token VAR_RATELIMIT_FOR_DOMAIN VAR_RATELIMIT_BELOW_DOMAIN
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -179,7 +181,9 @@ content_server: server_num_threads | server_verbosity | server_port |
        server_so_reuseport | server_delay_close | server_unblock_lan_zones |
        server_dns64_prefix | server_dns64_synthall |
        server_infra_cache_min_rtt | server_harden_algo_downgrade |
-       server_ip_transparent
+       server_ip_transparent | server_ratelimit | server_ratelimit_slabs |
+       server_ratelimit_size | server_ratelimit_for_domain |
+       server_ratelimit_below_domain
        ;
 stubstart: VAR_STUB_ZONE
        {
@@ -1220,6 +1224,62 @@ server_dns64_synthall: VAR_DNS64_SYNTHALL STRING_ARG
                free($2);
        }
        ;
+server_ratelimit: VAR_RATELIMIT STRING_ARG 
+       { 
+               OUTYY(("P(server_ratelimit:%s)\n", $2)); 
+               if(atoi($2) == 0 && strcmp($2, "0") != 0)
+                       yyerror("number expected");
+               else cfg_parser->cfg->ratelimit = atoi($2);
+               free($2);
+       }
+       ;
+server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG
+       {
+               OUTYY(("P(server_ratelimit_size:%s)\n", $2));
+               if(!cfg_parse_memsize($2, &cfg_parser->cfg->ratelimit_size))
+                       yyerror("memory size expected");
+               free($2);
+       }
+       ;
+server_ratelimit_slabs: VAR_RATELIMIT_SLABS STRING_ARG
+       {
+               OUTYY(("P(server_ratelimit_slabs:%s)\n", $2));
+               if(atoi($2) == 0)
+                       yyerror("number expected");
+               else {
+                       cfg_parser->cfg->ratelimit_slabs = atoi($2);
+                       if(!is_pow2(cfg_parser->cfg->ratelimit_slabs))
+                               yyerror("must be a power of 2");
+               }
+               free($2);
+       }
+       ;
+server_ratelimit_for_domain: VAR_RATELIMIT_FOR_DOMAIN STRING_ARG STRING_ARG
+       {
+               OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", $2, $3));
+               if(atoi($3) == 0 && strcmp($3, "0") != 0) {
+                       yyerror("number expected");
+               } else {
+                       if(!cfg_str2list_insert(&cfg_parser->cfg->
+                               ratelimit_for_domain, $2, $3))
+                               fatal_exit("out of memory adding "
+                                       "ratelimit-for-domain");
+               }
+       }
+       ;
+server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG
+       {
+               OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", $2, $3));
+               if(atoi($3) == 0 && strcmp($3, "0") != 0) {
+                       yyerror("number expected");
+               } else {
+                       if(!cfg_str2list_insert(&cfg_parser->cfg->
+                               ratelimit_below_domain, $2, $3))
+                               fatal_exit("out of memory adding "
+                                       "ratelimit-below-domain");
+               }
+       }
+       ;
 stub_name: VAR_NAME STRING_ARG
        {
                OUTYY(("P(name:%s)\n", $2));

diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index 5a77432c775e51e486f33b8de74ea8ed9dd84caa..1397e9c1359d05e84af9987b38bf92fa374d80a4 100644 (file)
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -210,6 +210,7 @@ fptr_whitelist_hash_sizefunc(lruhash_sizefunc_t fptr)
        else if(fptr == &ub_rrset_sizefunc) return 1;
        else if(fptr == &infra_sizefunc) return 1;
        else if(fptr == &key_entry_sizefunc) return 1;
+       else if(fptr == &rate_sizefunc) return 1;
        else if(fptr == &test_slabhash_sizefunc) return 1;
        return 0;
 }
@@ -221,6 +222,7 @@ fptr_whitelist_hash_compfunc(lruhash_compfunc_t fptr)
        else if(fptr == &ub_rrset_compare) return 1;
        else if(fptr == &infra_compfunc) return 1;
        else if(fptr == &key_entry_compfunc) return 1;
+       else if(fptr == &rate_compfunc) return 1;
        else if(fptr == &test_slabhash_compfunc) return 1;
        return 0;
 }
@@ -232,6 +234,7 @@ fptr_whitelist_hash_delkeyfunc(lruhash_delkeyfunc_t fptr)
        else if(fptr == &ub_rrset_key_delete) return 1;
        else if(fptr == &infra_delkeyfunc) return 1;
        else if(fptr == &key_entry_delkeyfunc) return 1;
+       else if(fptr == &rate_delkeyfunc) return 1;
        else if(fptr == &test_slabhash_delkey) return 1;
        return 0;
 }
@@ -243,6 +246,7 @@ fptr_whitelist_hash_deldatafunc(lruhash_deldatafunc_t fptr)
        else if(fptr == &rrset_data_delete) return 1;
        else if(fptr == &infra_deldatafunc) return 1;
        else if(fptr == &key_entry_deldatafunc) return 1;
+       else if(fptr == &rate_deldatafunc) return 1;
        else if(fptr == &test_slabhash_deldata) return 1;
        return 0;
 }