From 3c5901d712b9b81bb4d82eed5c2676078d2283ae Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Wed, 14 Mar 2018 11:14:34 +0100 Subject: [PATCH] rec: Constify the methods of RecursorLua4 when possible (cherry picked from commit 5899ee547f3772a9eac3d37c6c6995056ee74ab9) --- pdns/lua-recursor4.cc | 20 ++++++++++---------- pdns/lua-recursor4.hh | 20 ++++++++++---------- pdns/recursordist/test-syncres_cc.cc | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pdns/lua-recursor4.cc b/pdns/lua-recursor4.cc index 8de18f49a8..a2cc8e0338 100644 --- a/pdns/lua-recursor4.cc +++ b/pdns/lua-recursor4.cc @@ -564,32 +564,32 @@ RecursorLua4::RecursorLua4(const std::string& fname) d_gettag_ffi = d_lw->readVariable>("gettag_ffi").get_value_or(0); } -bool RecursorLua4::prerpz(DNSQuestion& dq, int& ret) +bool RecursorLua4::prerpz(DNSQuestion& dq, int& ret) const { return genhook(d_prerpz, dq, ret); } -bool RecursorLua4::preresolve(DNSQuestion& dq, int& ret) +bool RecursorLua4::preresolve(DNSQuestion& dq, int& ret) const { return genhook(d_preresolve, dq, ret); } -bool RecursorLua4::nxdomain(DNSQuestion& dq, int& ret) +bool RecursorLua4::nxdomain(DNSQuestion& dq, int& ret) const { return genhook(d_nxdomain, dq, ret); } -bool RecursorLua4::nodata(DNSQuestion& dq, int& ret) +bool RecursorLua4::nodata(DNSQuestion& dq, int& ret) const { return genhook(d_nodata, dq, ret); } -bool RecursorLua4::postresolve(DNSQuestion& dq, int& ret) +bool RecursorLua4::postresolve(DNSQuestion& dq, int& ret) const { return genhook(d_postresolve, dq, ret); } -bool RecursorLua4::preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, bool isTcp, vector& res, int& ret) +bool RecursorLua4::preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, bool isTcp, vector& res, int& ret) const { bool variableAnswer = false; bool wantsRPZ = false; @@ -599,14 +599,14 @@ bool RecursorLua4::preoutquery(const ComboAddress& ns, const ComboAddress& reque return genhook(d_preoutquery, dq, ret); } -bool RecursorLua4::ipfilter(const ComboAddress& remote, const ComboAddress& local, const struct dnsheader& dh) +bool RecursorLua4::ipfilter(const ComboAddress& remote, const ComboAddress& local, const struct dnsheader& dh) const { if(d_ipfilter) return d_ipfilter(remote, local, dh); return false; // don't block } -unsigned int RecursorLua4::gettag(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map& ednsOptions, bool tcp, std::string& requestorId, std::string& deviceId) +unsigned int RecursorLua4::gettag(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map& ednsOptions, bool tcp, std::string& requestorId, std::string& deviceId) const { if(d_gettag) { auto ret = d_gettag(remote, ednssubnet, local, qname, qtype, ednsOptions, tcp); @@ -665,7 +665,7 @@ public: bool tcp; }; -unsigned int RecursorLua4::gettag_ffi(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map& ednsOptions, bool tcp, std::string& requestorId, std::string& deviceId, uint32_t& ttlCap, bool& variable) +unsigned int RecursorLua4::gettag_ffi(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map& ednsOptions, bool tcp, std::string& requestorId, std::string& deviceId, uint32_t& ttlCap, bool& variable) const { if (d_gettag_ffi) { pdns_ffi_param_t param(qname, qtype, local, remote, ednssubnet, *policyTags, ednsOptions, requestorId, deviceId, ttlCap, variable, tcp); @@ -680,7 +680,7 @@ unsigned int RecursorLua4::gettag_ffi(const ComboAddress& remote, const Netmask& return 0; } -bool RecursorLua4::genhook(luacall_t& func, DNSQuestion& dq, int& ret) +bool RecursorLua4::genhook(const luacall_t& func, DNSQuestion& dq, int& ret) const { if(!func) return false; diff --git a/pdns/lua-recursor4.hh b/pdns/lua-recursor4.hh index f19e620166..d36fd7cdda 100644 --- a/pdns/lua-recursor4.hh +++ b/pdns/lua-recursor4.hh @@ -120,17 +120,17 @@ public: DNSName followupName; }; - unsigned int gettag(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map&, bool tcp, std::string& requestorId, std::string& deviceId); - unsigned int gettag_ffi(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map&, bool tcp, std::string& requestorId, std::string& deviceId, uint32_t& ttlCap, bool& variable); + unsigned int gettag(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map&, bool tcp, std::string& requestorId, std::string& deviceId) const; + unsigned int gettag_ffi(const ComboAddress& remote, const Netmask& ednssubnet, const ComboAddress& local, const DNSName& qname, uint16_t qtype, std::vector* policyTags, LuaContext::LuaObject& data, const std::map&, bool tcp, std::string& requestorId, std::string& deviceId, uint32_t& ttlCap, bool& variable) const; - bool prerpz(DNSQuestion& dq, int& ret); - bool preresolve(DNSQuestion& dq, int& ret); - bool nxdomain(DNSQuestion& dq, int& ret); - bool nodata(DNSQuestion& dq, int& ret); - bool postresolve(DNSQuestion& dq, int& ret); + bool prerpz(DNSQuestion& dq, int& ret) const; + bool preresolve(DNSQuestion& dq, int& ret) const; + bool nxdomain(DNSQuestion& dq, int& ret) const; + bool nodata(DNSQuestion& dq, int& ret) const ; + bool postresolve(DNSQuestion& dq, int& ret) const; - bool preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, bool isTcp, vector& res, int& ret); - bool ipfilter(const ComboAddress& remote, const ComboAddress& local, const struct dnsheader&); + bool preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, bool isTcp, vector& res, int& ret) const; + bool ipfilter(const ComboAddress& remote, const ComboAddress& local, const struct dnsheader&) const; bool needDQ() const { @@ -150,7 +150,7 @@ public: private: typedef std::function luacall_t; luacall_t d_prerpz, d_preresolve, d_nxdomain, d_nodata, d_postresolve, d_preoutquery, d_postoutquery; - bool genhook(luacall_t& func, DNSQuestion& dq, int& ret); + bool genhook(const luacall_t& func, DNSQuestion& dq, int& ret) const; typedef std::function ipfilter_t; ipfilter_t d_ipfilter; }; diff --git a/pdns/recursordist/test-syncres_cc.cc b/pdns/recursordist/test-syncres_cc.cc index 515df28828..6e3ce1671a 100644 --- a/pdns/recursordist/test-syncres_cc.cc +++ b/pdns/recursordist/test-syncres_cc.cc @@ -34,7 +34,7 @@ int getMTaskerTID() return 0; } -bool RecursorLua4::preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, bool isTcp, vector& res, int& ret) +bool RecursorLua4::preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, bool isTcp, vector& res, int& ret) const { return false; } -- 2.47.2