From: Otto Moerbeek Date: Mon, 3 Oct 2022 07:19:48 +0000 (+0200) Subject: Tweaks: fix build with dnstabp disabled, process config changes X-Git-Tag: rec-4.9.0-alpha0~1^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=678915f28f50892dfb34c3ad957e36144cc5d0fe;p=thirdparty%2Fpdns.git Tweaks: fix build with dnstabp disabled, process config changes --- diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index f869fe5e6e..ba69d2c6b2 100644 --- 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 918ccfe724..29d7c49b8f 100644 --- 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 348ab0a62c..548cc2c0c8 100644 --- 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& luaconfsLocal); bool checkOutgoingProtobufExport(LocalStateHolder& luaconfsLocal); +#ifdef HAVE_FSTRM bool checkFrameStreamExport(LocalStateHolder& 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& 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& policyTags, const std::string& requestorId, const std::string& deviceId, const std::string& deviceName, const std::map& meta);