Tweaks: fix build with dnstabp disabled, process config changes

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index f869fe5e6e08e96686dc3fe1d67c2f0423b2bb0f..ba69d2c6b2e2b21ea792d14112b3d39221fab66b 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -920,6 +920,7 @@ void startDoResolve(void* p)
 
 #ifdef HAVE_FSTRM
     checkFrameStreamExport(luaconfsLocal, luaconfsLocal->frameStreamExportConfig, t_frameStreamServersInfo);
+    checkFrameStreamExport(luaconfsLocal, luaconfsLocal->nodFrameStreamExportConfig, t_nodFrameStreamServersInfo);
 #endif
 
     DNSPacketWriter pw(packet, dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_mdp.d_qclass, dc->d_mdp.d_header.opcode);

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index 918ccfe7245f7862560491045c05dbc9739a56ab..29d7c49b8f4617cc489203df8cb07b691bef03a0 100644 (file)
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -49,6 +49,8 @@ bool operator==(const FrameStreamExportConfig& configA, const FrameStreamExportC
   return configA.enabled              == configB.enabled              &&
          configA.logQueries           == configB.logQueries           &&
          configA.logResponses         == configB.logResponses         &&
+         configA.logNODs              == configB.logNODs              &&
+         configA.logUDRs              == configB.logUDRs              &&
          configA.bufferHint           == configB.bufferHint           &&
          configA.flushTimeout         == configB.flushTimeout         &&
          configA.inputQueueSize       == configB.inputQueueSize       &&

diff --git a/pdns/recursordist/rec-main.hh b/pdns/recursordist/rec-main.hh
index 348ab0a62c4e84e1ac4defd652bdc30a397f8e36..548cc2c0c81fce6a0ddefab9c788284112d928d6 100644 (file)
--- a/pdns/recursordist/rec-main.hh
+++ b/pdns/recursordist/rec-main.hh
@@ -511,7 +511,9 @@ void parseACLs();
 PacketBuffer GenUDPQueryResponse(const ComboAddress& dest, const string& query);
 bool checkProtobufExport(LocalStateHolder<LuaConfigItems>& luaconfsLocal);
 bool checkOutgoingProtobufExport(LocalStateHolder<LuaConfigItems>& luaconfsLocal);
+#ifdef HAVE_FSTRM
 bool checkFrameStreamExport(LocalStateHolder<LuaConfigItems>& luaconfsLocal, const FrameStreamExportConfig& config, FrameStreamServersInfo& serverInfos);
+#endif
 void getQNameAndSubnet(const std::string& question, DNSName* dnsname, uint16_t* qtype, uint16_t* qclass,
                        bool& foundECS, EDNSSubnetOpts* ednssubnet, EDNSOptionViewMap* options);
 void protobufLogQuery(LocalStateHolder<LuaConfigItems>& luaconfsLocal, const boost::uuids::uuid& uniqueId, const ComboAddress& remote, const ComboAddress& local, const ComboAddress& mappedSource, const Netmask& ednssubnet, bool tcp, uint16_t id, size_t len, const DNSName& qname, uint16_t qtype, uint16_t qclass, const std::unordered_set<std::string>& policyTags, const std::string& requestorId, const std::string& deviceId, const std::string& deviceName, const std::map<std::string, RecursorLua4::MetaValue>& meta);