From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 27 May 2019 12:33:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into rec-dnstap
X-Git-Tag: dnsdist-1.4.0-beta1~13^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8232924fb4ada6d73d99e33c6bd71d125becc37;p=pdns

Merge remote-tracking branch 'origin/master' into rec-dnstap
---

b8232924fb4ada6d73d99e33c6bd71d125becc37
diff --cc pdns/recursordist/Makefile.am
index b0703c7dc,9d1faba04..12d93f680
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@@ -375,36 -373,15 +386,32 @@@ endi
  BUILT_SOURCES += dnsmessage.pb.cc
  pdns_recursor_LDADD += $(PROTOBUF_LIBS)
  nodist_pdns_recursor_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
 +nodist_testrunner_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
 +
 +if FSTRM
 +BUILT_SOURCES += dnstap.pb.cc
 +pdns_recursor.$(OBJEXT): dnstap.pb.cc dnsmessage.pb.cc
 +testrunner$(OBJEXT): dnstap.pb.cc dnsmessage.pb.cc
 +nodist_pdns_recursor_SOURCES += dnstap.pb.cc dnstap.pb.h
 +nodist_testrunner_SOURCES += dnstap.pb.cc dnstap.pb.h
 +else
  pdns_recursor.$(OBJEXT): dnsmessage.pb.cc
 +testrunner$(OBJEXT): dnsmessage.pb.cc
 +endif
  
 -nodist_testrunner_SOURCES = dnsmessage.pb.cc dnsmessage.pb.h
  testrunner_LDADD += $(PROTOBUF_LIBS)
 -testrunner$(OBJEXT): dnsmessage.pb.cc
  
  endif
- 
- pdns_recursor_SOURCES += \
- 	uuid-utils.hh uuid-utils.cc
- 
  endif
  
 +if FSTRM
 +pdns_recursor_SOURCES += \
 +	dnstap.cc dnstap.hh rec-dnstap.hh
 +
 +pdns_recursor_LDADD += \
 +	$(FSTRM_LIBS)
 +endif
 +
  rec_control_SOURCES = \
  	arguments.cc arguments.hh \
  	dnsname.hh dnsname.cc \
diff --cc pdns/syncres.hh
index 787fd795d,b316c92d4..db606870f
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@@ -56,11 -57,11 +57,14 @@@
  
  #ifdef HAVE_PROTOBUF
  #include <boost/uuid/uuid.hpp>
 +#ifdef HAVE_FSTRM
 +#include "fstrm_logger.hh"
 +#endif /* HAVE_FSTRM */
  #endif
  
+ extern GlobalStateHolder<SuffixMatchNode> g_dontThrottleNames;
+ extern GlobalStateHolder<NetmaskGroup> g_dontThrottleNetmasks;
+ 
  class RecursorLua4;
  
  typedef map<