From: Josh Soref Date: Thu, 11 Mar 2021 03:51:03 +0000 (-0500) Subject: spelling: rule X-Git-Tag: rec-4.5.0-beta1~30^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=534364d315292a0339ce4b764d91d7439dbedfb3;p=thirdparty%2Fpdns.git spelling: rule Signed-off-by: Josh Soref --- diff --git a/pdns/dnsdist-lua-actions.cc b/pdns/dnsdist-lua-actions.cc index 4d1fd9e36c..707afe83e3 100644 --- a/pdns/dnsdist-lua-actions.cc +++ b/pdns/dnsdist-lua-actions.cc @@ -1557,7 +1557,7 @@ private: }; template -static void addAction(GlobalStateHolder > *someRulActions, const luadnsrule_t& var, const std::shared_ptr& action, boost::optional& params) { +static void addAction(GlobalStateHolder > *someRuleActions, const luadnsrule_t& var, const std::shared_ptr& action, boost::optional& params) { setLuaSideEffect(); std::string name; @@ -1566,8 +1566,8 @@ static void addAction(GlobalStateHolder > *someRulActions, const luadn parseRuleParams(params, uuid, name, creationOrder); auto rule = makeRule(var); - someRulActions->modify([&rule, &action, &uuid, creationOrder, &name](vector& rulactions){ - rulactions.push_back({std::move(rule), std::move(action), std::move(name), std::move(uuid), creationOrder}); + someRuleActions->modify([&rule, &action, &uuid, creationOrder, &name](vector& ruleactions){ + ruleactions.push_back({std::move(rule), std::move(action), std::move(name), std::move(uuid), creationOrder}); }); } @@ -1628,7 +1628,7 @@ void setupLuaActions(LuaContext& luaCtx) throw std::runtime_error("addAction() can only be called with query-related actions, not response-related ones. Are you looking for addResponseAction()?"); } - addAction(&g_rulactions, var, boost::get >(era), params); + addAction(&g_ruleactions, var, boost::get >(era), params); }); luaCtx.writeFunction("addResponseAction", [](luadnsrule_t var, boost::variant, std::shared_ptr > era, boost::optional params) { @@ -1636,7 +1636,7 @@ void setupLuaActions(LuaContext& luaCtx) throw std::runtime_error("addResponseAction() can only be called with response-related actions, not query-related ones. Are you looking for addAction()?"); } - addAction(&g_resprulactions, var, boost::get >(era), params); + addAction(&g_respruleactions, var, boost::get >(era), params); }); luaCtx.writeFunction("addCacheHitResponseAction", [](luadnsrule_t var, boost::variant, std::shared_ptr> era, boost::optional params) { @@ -1644,7 +1644,7 @@ void setupLuaActions(LuaContext& luaCtx) throw std::runtime_error("addCacheHitResponseAction() can only be called with response-related actions, not query-related ones. Are you looking for addAction()?"); } - addAction(&g_cachehitresprulactions, var, boost::get >(era), params); + addAction(&g_cachehitrespruleactions, var, boost::get >(era), params); }); luaCtx.writeFunction("addSelfAnsweredResponseAction", [](luadnsrule_t var, boost::variant, std::shared_ptr> era, boost::optional params) { @@ -1652,7 +1652,7 @@ void setupLuaActions(LuaContext& luaCtx) throw std::runtime_error("addSelfAnsweredResponseAction() can only be called with response-related actions, not query-related ones. Are you looking for addAction()?"); } - addAction(&g_selfansweredresprulactions, var, boost::get >(era), params); + addAction(&g_selfansweredrespruleactions, var, boost::get >(era), params); }); luaCtx.registerFunction("printStats", [](const DNSAction& ta) { @@ -1670,9 +1670,9 @@ void setupLuaActions(LuaContext& luaCtx) luaCtx.writeFunction("getAction", [](unsigned int num) { setLuaNoSideEffect(); boost::optional> ret; - auto rulactions = g_rulactions.getCopy(); - if(num < rulactions.size()) - ret=rulactions[num].d_action; + auto ruleactions = g_ruleactions.getCopy(); + if(num < ruleactions.size()) + ret=ruleactions[num].d_action; return ret; }); diff --git a/pdns/dnsdist-lua-rules.cc b/pdns/dnsdist-lua-rules.cc index 4fbe70ff76..7fc73b84f3 100644 --- a/pdns/dnsdist-lua-rules.cc +++ b/pdns/dnsdist-lua-rules.cc @@ -127,17 +127,17 @@ static std::string rulesToString(const std::vector& rules, boost::optional -static void showRules(GlobalStateHolder > *someRulActions, boost::optional vars) { +static void showRules(GlobalStateHolder > *someRuleActions, boost::optional vars) { setLuaNoSideEffect(); - auto rules = someRulActions->getLocal(); + auto rules = someRuleActions->getLocal(); g_outputBuffer += rulesToString(*rules, vars); } template -static void rmRule(GlobalStateHolder > *someRulActions, boost::variant id) { +static void rmRule(GlobalStateHolder > *someRuleActions, boost::variant id) { setLuaSideEffect(); - auto rules = someRulActions->getCopy(); + auto rules = someRuleActions->getCopy(); if (auto str = boost::get(&id)) { try { const auto uuid = getUniqueID(*str); @@ -167,25 +167,25 @@ static void rmRule(GlobalStateHolder > *someRulActions, boost::variant } rules.erase(rules.begin()+*pos); } - someRulActions->setState(std::move(rules)); + someRuleActions->setState(std::move(rules)); } template -static void moveRuleToTop(GlobalStateHolder > *someRulActions) { +static void moveRuleToTop(GlobalStateHolder > *someRuleActions) { setLuaSideEffect(); - auto rules = someRulActions->getCopy(); + auto rules = someRuleActions->getCopy(); if(rules.empty()) return; auto subject = *rules.rbegin(); rules.erase(std::prev(rules.end())); rules.insert(rules.begin(), subject); - someRulActions->setState(std::move(rules)); + someRuleActions->setState(std::move(rules)); } template -static void mvRule(GlobalStateHolder > *someRespRulActions, unsigned int from, unsigned int to) { +static void mvRule(GlobalStateHolder > *someRespRuleActions, unsigned int from, unsigned int to) { setLuaSideEffect(); - auto rules = someRespRulActions->getCopy(); + auto rules = someRespRuleActions->getCopy(); if(from >= rules.size() || to > rules.size()) { g_outputBuffer = "Error: attempt to move rules from/to invalid index\n"; return; @@ -199,7 +199,7 @@ static void mvRule(GlobalStateHolder > *someRespRulActions, unsigned i --to; rules.insert(rules.begin()+to, subject); } - someRespRulActions->setState(std::move(rules)); + someRespRuleActions->setState(std::move(rules)); } template @@ -241,75 +241,75 @@ void setupLuaRules(LuaContext& luaCtx) luaCtx.registerFunction::*)()const>("toString", [](const std::shared_ptr& rule) { return rule->toString(); }); luaCtx.writeFunction("showResponseRules", [](boost::optional vars) { - showRules(&g_resprulactions, vars); + showRules(&g_respruleactions, vars); }); luaCtx.writeFunction("rmResponseRule", [](boost::variant id) { - rmRule(&g_resprulactions, id); + rmRule(&g_respruleactions, id); }); luaCtx.writeFunction("mvResponseRuleToTop", []() { - moveRuleToTop(&g_resprulactions); + moveRuleToTop(&g_respruleactions); }); luaCtx.writeFunction("mvResponseRule", [](unsigned int from, unsigned int to) { - mvRule(&g_resprulactions, from, to); + mvRule(&g_respruleactions, from, to); }); luaCtx.writeFunction("showCacheHitResponseRules", [](boost::optional vars) { - showRules(&g_cachehitresprulactions, vars); + showRules(&g_cachehitrespruleactions, vars); }); luaCtx.writeFunction("rmCacheHitResponseRule", [](boost::variant id) { - rmRule(&g_cachehitresprulactions, id); + rmRule(&g_cachehitrespruleactions, id); }); luaCtx.writeFunction("mvCacheHitResponseRuleToTop", []() { - moveRuleToTop(&g_cachehitresprulactions); + moveRuleToTop(&g_cachehitrespruleactions); }); luaCtx.writeFunction("mvCacheHitResponseRule", [](unsigned int from, unsigned int to) { - mvRule(&g_cachehitresprulactions, from, to); + mvRule(&g_cachehitrespruleactions, from, to); }); luaCtx.writeFunction("showSelfAnsweredResponseRules", [](boost::optional vars) { - showRules(&g_selfansweredresprulactions, vars); + showRules(&g_selfansweredrespruleactions, vars); }); luaCtx.writeFunction("rmSelfAnsweredResponseRule", [](boost::variant id) { - rmRule(&g_selfansweredresprulactions, id); + rmRule(&g_selfansweredrespruleactions, id); }); luaCtx.writeFunction("mvSelfAnsweredResponseRuleToTop", []() { - moveRuleToTop(&g_selfansweredresprulactions); + moveRuleToTop(&g_selfansweredrespruleactions); }); luaCtx.writeFunction("mvSelfAnsweredResponseRule", [](unsigned int from, unsigned int to) { - mvRule(&g_selfansweredresprulactions, from, to); + mvRule(&g_selfansweredrespruleactions, from, to); }); luaCtx.writeFunction("rmRule", [](boost::variant id) { - rmRule(&g_rulactions, id); + rmRule(&g_ruleactions, id); }); luaCtx.writeFunction("mvRuleToTop", []() { - moveRuleToTop(&g_rulactions); + moveRuleToTop(&g_ruleactions); }); luaCtx.writeFunction("mvRule", [](unsigned int from, unsigned int to) { - mvRule(&g_rulactions, from, to); + mvRule(&g_ruleactions, from, to); }); luaCtx.writeFunction("clearRules", []() { setLuaSideEffect(); - g_rulactions.modify([](decltype(g_rulactions)::value_type& rulactions) { - rulactions.clear(); + g_ruleactions.modify([](decltype(g_ruleactions)::value_type& ruleactions) { + ruleactions.clear(); }); }); luaCtx.writeFunction("setRules", [](const std::vector>>& newruleactions) { setLuaSideEffect(); - g_rulactions.modify([newruleactions](decltype(g_rulactions)::value_type& gruleactions) { + g_ruleactions.modify([newruleactions](decltype(g_ruleactions)::value_type& gruleactions) { gruleactions.clear(); for (const auto& pair : newruleactions) { const auto& newruleaction = pair.second; @@ -323,49 +323,49 @@ void setupLuaRules(LuaContext& luaCtx) luaCtx.writeFunction("getTopRules", [](boost::optional top) { setLuaNoSideEffect(); - auto rules = g_rulactions.getLocal(); + auto rules = g_ruleactions.getLocal(); return getTopRules(*rules, top.get_value_or(10)); }); luaCtx.writeFunction("topRules", [](boost::optional top, boost::optional vars) { setLuaNoSideEffect(); - auto rules = g_rulactions.getLocal(); + auto rules = g_ruleactions.getLocal(); return rulesToString(getTopRules(*rules, top.get_value_or(10)), vars); }); luaCtx.writeFunction("getCacheHitResponseRules", [](boost::optional top) { setLuaNoSideEffect(); - auto rules = g_cachehitresprulactions.getLocal(); + auto rules = g_cachehitrespruleactions.getLocal(); return getTopRules(*rules, top.get_value_or(10)); }); luaCtx.writeFunction("topCacheHitRules", [](boost::optional top, boost::optional vars) { setLuaNoSideEffect(); - auto rules = g_cachehitresprulactions.getLocal(); + auto rules = g_cachehitrespruleactions.getLocal(); return rulesToString(getTopRules(*rules, top.get_value_or(10)), vars); }); luaCtx.writeFunction("getTopResponseRules", [](boost::optional top) { setLuaNoSideEffect(); - auto rules = g_resprulactions.getLocal(); + auto rules = g_respruleactions.getLocal(); return getTopRules(*rules, top.get_value_or(10)); }); luaCtx.writeFunction("topResponseRules", [](boost::optional top, boost::optional vars) { setLuaNoSideEffect(); - auto rules = g_resprulactions.getLocal(); + auto rules = g_respruleactions.getLocal(); return rulesToString(getTopRules(*rules, top.get_value_or(10)), vars); }); luaCtx.writeFunction("getTopSelfAnsweredResponseRules", [](boost::optional top) { setLuaNoSideEffect(); - auto rules = g_selfansweredresprulactions.getLocal(); + auto rules = g_selfansweredrespruleactions.getLocal(); return getTopRules(*rules, top.get_value_or(10)); }); luaCtx.writeFunction("topSelfAnsweredResponseRules", [](boost::optional top, boost::optional vars) { setLuaNoSideEffect(); - auto rules = g_selfansweredresprulactions.getLocal(); + auto rules = g_selfansweredrespruleactions.getLocal(); return rulesToString(getTopRules(*rules, top.get_value_or(10)), vars); }); @@ -549,7 +549,7 @@ void setupLuaRules(LuaContext& luaCtx) }); luaCtx.writeFunction("showRules", [](boost::optional vars) { - showRules(&g_rulactions, vars); + showRules(&g_ruleactions, vars); }); luaCtx.writeFunction("RDRule", []() { diff --git a/pdns/dnsdist-tcp.cc b/pdns/dnsdist-tcp.cc index ba86a35cbc..398f6fa1db 100644 --- a/pdns/dnsdist-tcp.cc +++ b/pdns/dnsdist-tcp.cc @@ -539,7 +539,7 @@ void IncomingTCPConnectionState::handleResponse(std::shared_ptrd_threadData.localRespRulactions, dr, false)) { + if (!processResponse(response.d_buffer, state->d_threadData.localRespRuleActions, dr, false)) { state->terminateClientConnection(); return; } diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc index eec18b2022..0880712697 100644 --- a/pdns/dnsdist-web.cc +++ b/pdns/dnsdist-web.cc @@ -723,10 +723,10 @@ static void handlePrometheus(const YaHTTP::Request& req, YaHTTP::Response& resp) output << "# HELP dnsdist_rule_hits " << "Number of hits of that rule" << "\n"; output << "# TYPE dnsdist_rule_hits " << "counter" << "\n"; - addRulesToPrometheusOutput(output, g_rulactions); - addRulesToPrometheusOutput(output, g_resprulactions); - addRulesToPrometheusOutput(output, g_cachehitresprulactions); - addRulesToPrometheusOutput(output, g_selfansweredresprulactions); + addRulesToPrometheusOutput(output, g_ruleactions); + addRulesToPrometheusOutput(output, g_respruleactions); + addRulesToPrometheusOutput(output, g_cachehitrespruleactions); + addRulesToPrometheusOutput(output, g_selfansweredrespruleactions); output << "# HELP dnsdist_dynblocks_nmg_top_offenders_hits_per_second " << "Number of hits per second blocked by Dynamic Blocks (netmasks) for the top offenders, averaged over the last 60s" << "\n"; output << "# TYPE dnsdist_dynblocks_nmg_top_offenders_hits_per_second " << "gauge" << "\n"; @@ -1022,7 +1022,7 @@ static void handleStats(const YaHTTP::Request& req, YaHTTP::Response& resp) Json::array rules; /* unfortunately DNSActions have getStats(), and DNSResponseActions do not. */ - auto localRules = g_rulactions.getLocal(); + auto localRules = g_ruleactions.getLocal(); num = 0; for (const auto& a : *localRules) { Json::object rule{ @@ -1037,9 +1037,9 @@ static void handleStats(const YaHTTP::Request& req, YaHTTP::Response& resp) rules.push_back(rule); } - auto responseRules = someResponseRulesToJson(&g_resprulactions); - auto cacheHitResponseRules = someResponseRulesToJson(&g_cachehitresprulactions); - auto selfAnsweredResponseRules = someResponseRulesToJson(&g_selfansweredresprulactions); + auto responseRules = someResponseRulesToJson(&g_respruleactions); + auto cacheHitResponseRules = someResponseRulesToJson(&g_cachehitrespruleactions); + auto selfAnsweredResponseRules = someResponseRulesToJson(&g_selfansweredrespruleactions); string acl; diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc index f490ac125f..86cdd1abae 100644 --- a/pdns/dnsdist.cc +++ b/pdns/dnsdist.cc @@ -76,7 +76,7 @@ not *that* bad actually, but now that we are thread safe, might want to scale */ -/* the Rulaction plan +/* the RuleAction plan Set of Rules, if one matches, it leads to an Action Both rules and actions could conceivably be Lua based. On the C++ side, both could be inherited from a class Rule and a class Action, @@ -121,10 +121,10 @@ size_t g_udpVectorSize{1}; IDs are assigned by atomic increments of the socket offset. */ -GlobalStateHolder > g_rulactions; -GlobalStateHolder > g_resprulactions; -GlobalStateHolder > g_cachehitresprulactions; -GlobalStateHolder > g_selfansweredresprulactions; +GlobalStateHolder > g_ruleactions; +GlobalStateHolder > g_respruleactions; +GlobalStateHolder > g_cachehitrespruleactions; +GlobalStateHolder > g_selfansweredrespruleactions; Rings g_rings; QueryCount g_qcount; @@ -402,11 +402,11 @@ static bool encryptResponse(PacketBuffer& response, size_t maximumSize, bool tcp } #endif /* HAVE_DNSCRYPT */ -static bool applyRulesToResponse(LocalStateHolder >& localRespRulactions, DNSResponse& dr) +static bool applyRulesToResponse(LocalStateHolder >& localRespRuleActions, DNSResponse& dr) { DNSResponseAction::Action action=DNSResponseAction::Action::None; std::string ruleresult; - for(const auto& lr : *localRespRulactions) { + for(const auto& lr : *localRespRuleActions) { if(lr.d_rule->matches(&dr)) { lr.d_rule->d_matches++; action=(*lr.d_action)(&dr, &ruleresult); @@ -437,9 +437,9 @@ static bool applyRulesToResponse(LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) +bool processResponse(PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) { - if (!applyRulesToResponse(localRespRulactions, dr)) { + if (!applyRulesToResponse(localRespRuleActions, dr)) { return false; } @@ -547,7 +547,7 @@ void responderThread(std::shared_ptr dss) { try { setThreadName("dnsdist/respond"); - auto localRespRulactions = g_resprulactions.getLocal(); + auto localRespRuleActions = g_respruleactions.getLocal(); const size_t initialBufferSize = getInitialUDPPacketBufferSize(); PacketBuffer response(initialBufferSize); @@ -640,7 +640,7 @@ void responderThread(std::shared_ptr dss) } memcpy(&cleartextDH, dr.getHeader(), sizeof(cleartextDH)); - if (!processResponse(response, localRespRulactions, dr, ids->cs && ids->cs->muted)) { + if (!processResponse(response, localRespRuleActions, dr, ids->cs && ids->cs->muted)) { continue; } @@ -985,7 +985,7 @@ static bool applyRulesToQuery(LocalHolders& holders, DNSQuestion& dq, const stru DNSAction::Action action=DNSAction::Action::None; string ruleresult; bool drop = false; - for(const auto& lr : *holders.rulactions) { + for(const auto& lr : *holders.ruleactions) { if(lr.d_rule->matches(&dq)) { lr.d_rule->d_matches++; action=(*lr.d_action)(&dq, &ruleresult); @@ -1132,7 +1132,7 @@ static bool prepareOutgoingResponse(LocalHolders& holders, ClientState& cs, DNSQ dr.qTag = dq.qTag; dr.delayMsec = dq.delayMsec; - if (!applyRulesToResponse(cacheHit ? holders.cacheHitRespRulactions : holders.selfAnsweredRespRulactions, dr)) { + if (!applyRulesToResponse(cacheHit ? holders.cacheHitRespRuleactions : holders.selfAnsweredRespRuleactions, dr)) { return false; } diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh index 0c00d2c831..3c1d668e13 100644 --- a/pdns/dnsdist.hh +++ b/pdns/dnsdist.hh @@ -1161,10 +1161,10 @@ extern GlobalStateHolder > g_carbon; extern GlobalStateHolder g_policy; extern GlobalStateHolder g_dstates; extern GlobalStateHolder g_pools; -extern GlobalStateHolder > g_rulactions; -extern GlobalStateHolder > g_resprulactions; -extern GlobalStateHolder > g_cachehitresprulactions; -extern GlobalStateHolder > g_selfansweredresprulactions; +extern GlobalStateHolder > g_ruleactions; +extern GlobalStateHolder > g_respruleactions; +extern GlobalStateHolder > g_cachehitrespruleactions; +extern GlobalStateHolder > g_selfansweredrespruleactions; extern GlobalStateHolder g_ACL; extern ComboAddress g_serverControl; // not changed during runtime @@ -1201,15 +1201,15 @@ extern std::vector > g_dynBPFFilters; struct LocalHolders { - LocalHolders(): acl(g_ACL.getLocal()), policy(g_policy.getLocal()), rulactions(g_rulactions.getLocal()), cacheHitRespRulactions(g_cachehitresprulactions.getLocal()), selfAnsweredRespRulactions(g_selfansweredresprulactions.getLocal()), servers(g_dstates.getLocal()), dynNMGBlock(g_dynblockNMG.getLocal()), dynSMTBlock(g_dynblockSMT.getLocal()), pools(g_pools.getLocal()) + LocalHolders(): acl(g_ACL.getLocal()), policy(g_policy.getLocal()), ruleactions(g_ruleactions.getLocal()), cacheHitRespRuleactions(g_cachehitrespruleactions.getLocal()), selfAnsweredRespRuleactions(g_selfansweredrespruleactions.getLocal()), servers(g_dstates.getLocal()), dynNMGBlock(g_dynblockNMG.getLocal()), dynSMTBlock(g_dynblockSMT.getLocal()), pools(g_pools.getLocal()) { } LocalStateHolder acl; LocalStateHolder policy; - LocalStateHolder > rulactions; - LocalStateHolder > cacheHitRespRulactions; - LocalStateHolder > selfAnsweredRespRulactions; + LocalStateHolder > ruleactions; + LocalStateHolder > cacheHitRespRuleactions; + LocalStateHolder > selfAnsweredRespRuleactions; LocalStateHolder servers; LocalStateHolder > dynNMGBlock; LocalStateHolder > dynSMTBlock; @@ -1229,7 +1229,7 @@ bool getLuaNoSideEffect(); // set if there were only explicit declarations of _n void resetLuaSideEffect(); // reset to indeterminate state bool responseContentMatches(const PacketBuffer& response, const DNSName& qname, const uint16_t qtype, const uint16_t qclass, const ComboAddress& remote, unsigned int& qnameWireLength); -bool processResponse(PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted); +bool processResponse(PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted); bool processRulesResult(const DNSAction::Action& action, DNSQuestion& dq, std::string& ruleresult, bool& drop); bool checkQueryHeaders(const struct dnsheader* dh); diff --git a/pdns/dnsdistdist/dnsdist-tcp-upstream.hh b/pdns/dnsdistdist/dnsdist-tcp-upstream.hh index 54c3d88f2b..3cbf575576 100644 --- a/pdns/dnsdistdist/dnsdist-tcp-upstream.hh +++ b/pdns/dnsdistdist/dnsdist-tcp-upstream.hh @@ -5,12 +5,12 @@ class TCPClientThreadData { public: - TCPClientThreadData(): localRespRulactions(g_resprulactions.getLocal()), mplexer(std::unique_ptr(FDMultiplexer::getMultiplexerSilent())) + TCPClientThreadData(): localRespRuleActions(g_respruleactions.getLocal()), mplexer(std::unique_ptr(FDMultiplexer::getMultiplexerSilent())) { } LocalHolders holders; - LocalStateHolder > localRespRulactions; + LocalStateHolder > localRespRuleActions; std::unique_ptr mplexer{nullptr}; }; diff --git a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc index cf1a53e246..c5259f0869 100644 --- a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc +++ b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc @@ -33,10 +33,10 @@ struct DNSDistStats g_stats; GlobalStateHolder g_ACL; -GlobalStateHolder > g_rulactions; -GlobalStateHolder > g_resprulactions; -GlobalStateHolder > g_cachehitresprulactions; -GlobalStateHolder > g_selfansweredresprulactions; +GlobalStateHolder > g_ruleactions; +GlobalStateHolder > g_respruleactions; +GlobalStateHolder > g_cachehitrespruleactions; +GlobalStateHolder > g_selfansweredrespruleactions; GlobalStateHolder g_dstates; QueryCount g_qcount; @@ -83,12 +83,12 @@ bool responseContentMatches(const PacketBuffer& response, const DNSName& qname, return true; } -static std::function >& localRespRulactions, DNSResponse& dr, bool muted)> s_processResponse; +static std::function >& localRespRuleActions, DNSResponse& dr, bool muted)> s_processResponse; -bool processResponse(PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) +bool processResponse(PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) { if (s_processResponse) { - return s_processResponse(response, localRespRulactions, dr, muted); + return s_processResponse(response, localRespRuleActions, dr, muted); } return false; @@ -831,7 +831,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -870,7 +870,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { throw std::runtime_error("Unexpected error while processing the response"); }; @@ -908,7 +908,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return false; }; @@ -950,7 +950,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -976,7 +976,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) s_processQuery = [](DNSQuestion& dq, ClientState& cs, LocalHolders& holders, std::shared_ptr& selectedBackend) -> ProcessQueryResult { return ProcessQueryResult::SendAnswer; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1013,7 +1013,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1080,7 +1080,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1141,7 +1141,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1175,7 +1175,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1219,7 +1219,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1274,7 +1274,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1328,7 +1328,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1385,7 +1385,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1435,7 +1435,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1493,7 +1493,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1532,7 +1532,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1593,7 +1593,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnection_BackendNoOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1776,7 +1776,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -1907,7 +1907,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2075,7 +2075,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2150,7 +2150,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) } return ProcessQueryResult::Drop; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2232,7 +2232,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) } return ProcessQueryResult::Drop; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2345,7 +2345,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2496,7 +2496,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2602,7 +2602,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2735,7 +2735,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = proxyEnabledBackend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2799,7 +2799,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -2975,7 +2975,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendOOOR) selectedBackend = backend1; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; }; @@ -3186,7 +3186,7 @@ BOOST_AUTO_TEST_CASE(test_IncomingConnectionOOOR_BackendNotOOOR) selectedBackend = backend; return ProcessQueryResult::PassToBackend; }; - s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRulactions, DNSResponse& dr, bool muted) -> bool { + s_processResponse = [](PacketBuffer& response, LocalStateHolder >& localRespRuleActions, DNSResponse& dr, bool muted) -> bool { return true; };