From: Otto Moerbeek Date: Tue, 30 Jan 2024 10:12:34 +0000 (+0100) Subject: Avoid a cases of `an exception may be thrown in function '' which should not throw... X-Git-Tag: dnsdist-1.9.0~16^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0f8e484a37a8011e337ef9f4d56ee4ea02d7a5a;p=thirdparty%2Fpdns.git Avoid a cases of `an exception may be thrown in function '' which should not throw exceptions (bugprone-exception-escape)` The use of a DNSName capture by value is the culprit. Avoid those by using [&]', telling the compiler to figure out the captures by itself but use refs. This *could* lead to issues if we modify the value in the lambda, so this conversion should be checked! --- diff --git a/pdns/iputils.hh b/pdns/iputils.hh index 4ef0b8f764..1e4fa28a2d 100644 --- a/pdns/iputils.hh +++ b/pdns/iputils.hh @@ -212,8 +212,9 @@ union ComboAddress { sin4.sin_port = 0; if(makeIPv4sockaddr(str, &sin4)) { sin6.sin6_family = AF_INET6; - if(makeIPv6sockaddr(str, &sin6) < 0) + if(makeIPv6sockaddr(str, &sin6) < 0) { throw PDNSException("Unable to convert presentation address '"+ str +"'"); + } } if(!sin4.sin_port) // 'str' overrides port! diff --git a/pdns/recursordist/lwres.cc b/pdns/recursordist/lwres.cc index d33f9896a2..28e142ed85 100644 --- a/pdns/recursordist/lwres.cc +++ b/pdns/recursordist/lwres.cc @@ -104,7 +104,7 @@ static bool isEnabledForQueries(const std::shared_ptr>>& fstreamLoggers, const struct timeval& queryTime, const ComboAddress& localip, const ComboAddress& ip, DnstapMessage::ProtocolType protocol, const boost::optional& auth, const vector& packet) +static void logFstreamQuery(const std::shared_ptr>>& fstreamLoggers, const struct timeval& queryTime, const ComboAddress& localip, const ComboAddress& address, DnstapMessage::ProtocolType protocol, const boost::optional& auth, const vector& packet) { if (fstreamLoggers == nullptr) return; @@ -113,7 +113,7 @@ static void logFstreamQuery(const std::shared_ptr(packet.data()), packet.size(), &ts, nullptr, auth); + DnstapMessage message(std::move(str), DnstapMessage::MessageType::resolver_query, SyncRes::s_serverID, &localip, &address, protocol, reinterpret_cast(packet.data()), packet.size(), &ts, nullptr, auth); str = message.getBuffer(); for (auto& logger : *fstreamLoggers) { @@ -134,7 +134,7 @@ static bool isEnabledForResponses(const std::shared_ptr>>& fstreamLoggers, const ComboAddress& localip, const ComboAddress& ip, DnstapMessage::ProtocolType protocol, const boost::optional& auth, const PacketBuffer& packet, const struct timeval& queryTime, const struct timeval& replyTime) +static void logFstreamResponse(const std::shared_ptr>>& fstreamLoggers, const ComboAddress& localip, const ComboAddress& address, DnstapMessage::ProtocolType protocol, const boost::optional& auth, const PacketBuffer& packet, const struct timeval& queryTime, const struct timeval& replyTime) { if (fstreamLoggers == nullptr) return; @@ -144,7 +144,7 @@ static void logFstreamResponse(const std::shared_ptr(packet.data()), packet.size(), &ts1, &ts2, auth); + DnstapMessage message(std::move(str), DnstapMessage::MessageType::resolver_response, SyncRes::s_serverID, &localip, &address, protocol, reinterpret_cast(packet.data()), packet.size(), &ts1, &ts2, auth); str = message.getBuffer(); for (auto& logger : *fstreamLoggers) { @@ -154,7 +154,7 @@ static void logFstreamResponse(const std::shared_ptr>>& outgoingLoggers, const boost::optional& initialRequestId, const boost::uuids::uuid& uuid, const ComboAddress& ip, const DNSName& domain, int type, uint16_t qid, bool doTCP, bool tls, size_t bytes, const boost::optional& srcmask) +static void logOutgoingQuery(const std::shared_ptr>>& outgoingLoggers, const boost::optional& initialRequestId, const boost::uuids::uuid& uuid, const ComboAddress& address, const DNSName& domain, int type, uint16_t qid, bool doTCP, bool tls, size_t bytes, const boost::optional& srcmask) { if (!outgoingLoggers) { return; @@ -177,7 +177,7 @@ static void logOutgoingQuery(const std::shared_ptr>>& outgoingLoggers, const boost::optional& initialRequestId, const boost::uuids::uuid& uuid, const ComboAddress& ip, const DNSName& domain, int type, uint16_t qid, bool doTCP, bool tls, const boost::optional& srcmask, size_t bytes, int rcode, const std::vector& records, const struct timeval& queryTime, const std::set& exportTypes) +static void logIncomingResponse(const std::shared_ptr>>& outgoingLoggers, const boost::optional& initialRequestId, const boost::uuids::uuid& uuid, const ComboAddress& address, const DNSName& domain, int type, uint16_t qid, bool doTCP, bool tls, const boost::optional& srcmask, size_t bytes, int rcode, const std::vector& records, const struct timeval& queryTime, const std::set& exportTypes) { if (!outgoingLoggers) { return; @@ -234,7 +234,7 @@ static void logIncomingResponse(const std::shared_ptr& srcmask, const ResolveContext& context, const std::shared_ptr>>& outgoingLoggers, const std::shared_ptr>>& fstrmLoggers, const std::set& exportTypes, LWResult* lwr, bool* chained) +LWResult::Result asyncresolve(const ComboAddress& address, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional& srcmask, const ResolveContext& context, const std::shared_ptr>>& outgoingLoggers, const std::shared_ptr>>& fstrmLoggers, const std::set& exportTypes, LWResult* lwr, bool* chained) { TCPOutConnectionManager::Connection connection; - auto ret = asyncresolve(ip, domain, type, doTCP, sendRDQuery, EDNS0Level, now, srcmask, context, outgoingLoggers, fstrmLoggers, exportTypes, lwr, chained, connection); + auto ret = asyncresolve(address, domain, type, doTCP, sendRDQuery, EDNS0Level, now, srcmask, context, outgoingLoggers, fstrmLoggers, exportTypes, lwr, chained, connection); if (doTCP) { if (connection.d_handler && lwr->d_validpacket) { - t_tcp_manager.store(*now, ip, std::move(connection)); + t_tcp_manager.store(*now, address, std::move(connection)); } } return ret; diff --git a/pdns/recursordist/lwres.hh b/pdns/recursordist/lwres.hh index 917c4dc441..8fca61fe15 100644 --- a/pdns/recursordist/lwres.hh +++ b/pdns/recursordist/lwres.hh @@ -63,9 +63,6 @@ public: class LWResult { public: - LWResult() : - d_usec(0) {} - enum class Result : uint8_t { Timeout = 0, @@ -88,4 +85,4 @@ LWResult::Result asendto(const void* data, size_t len, int flags, const ComboAdd LWResult::Result arecvfrom(PacketBuffer& packet, int flags, const ComboAddress& fromAddr, size_t& len, uint16_t qid, const DNSName& domain, uint16_t qtype, int fileDesc, const struct timeval& now); -LWResult::Result asyncresolve(const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional& srcmask, const ResolveContext& context, const std::shared_ptr>>& outgoingLoggers, const std::shared_ptr>>& fstrmLoggers, const std::set& exportTypes, LWResult* res, bool* chained); +LWResult::Result asyncresolve(const ComboAddress& address, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* now, boost::optional& srcmask, const ResolveContext& context, const std::shared_ptr>>& outgoingLoggers, const std::shared_ptr>>& fstrmLoggers, const std::set& exportTypes, LWResult* lwr, bool* chained); diff --git a/pdns/recursordist/test-syncres_cc1.cc b/pdns/recursordist/test-syncres_cc1.cc index 1b484393ba..38cd8b9cf5 100644 --- a/pdns/recursordist/test-syncres_cc1.cc +++ b/pdns/recursordist/test-syncres_cc1.cc @@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(test_root_primed_ns) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(test_root_not_primed) size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == g_rootdnsname && type == QType::NS) { @@ -121,8 +121,8 @@ BOOST_AUTO_TEST_CASE(test_root_not_primed_and_no_response) then call getRootNS(), for which at least one of the root servers needs to answer. None will, so it should ServFail. */ - sr->setAsyncCallback([&downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { - downServers.insert(ip); + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + downServers.insert(address); return LWResult::Result::Timeout; }); @@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(test_root_ns_poison_resistance) primeHints(); const DNSName target("www.example.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (domain == g_rootdnsname && type == QType::NS) { setLWResult(res, 0, true, false, true); @@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(test_root_primed_ns_update) size_t queriesCount = 0; - auto asynccb = [target, &queriesCount, aroot, newA, newAAAA](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + auto asynccb = [&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -265,10 +265,10 @@ static void test_edns_formerr_fallback_f(bool sample) size_t queriesWithEDNS = 0; size_t queriesWithoutEDNS = 0; - sr->setAsyncCallback([&queriesWithEDNS, &queriesWithoutEDNS, &noEDNSServer, sample](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool /* sendRDQuery */, int EDNS0Level, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool doTCP, bool /* sendRDQuery */, int EDNS0Level, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (EDNS0Level != 0) { queriesWithEDNS++; - noEDNSServer = ip; + noEDNSServer = address; setLWResult(res, RCode::FormErr); return LWResult::Result::Success; @@ -323,14 +323,14 @@ BOOST_AUTO_TEST_CASE(test_edns_formerr_but_edns_enabled) size_t queriesWithoutEDNS = 0; std::set usedServers; - sr->setAsyncCallback([&queriesWithEDNS, &queriesWithoutEDNS, &usedServers](const ComboAddress& ip, const DNSName& /* domain */, int type, bool /* doTCP */, bool /* sendRDQuery */, int EDNS0Level, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int type, bool /* doTCP */, bool /* sendRDQuery */, int EDNS0Level, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (EDNS0Level > 0) { queriesWithEDNS++; } else { queriesWithoutEDNS++; } - usedServers.insert(ip); + usedServers.insert(address); if (type == QType::DNAME) { setLWResult(res, RCode::FormErr); @@ -368,7 +368,7 @@ BOOST_AUTO_TEST_CASE(test_meta_types) for (const auto qtype : invalidTypes) { size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { queriesCount++; return LWResult::Result::Timeout; }); @@ -388,7 +388,7 @@ BOOST_AUTO_TEST_CASE(test_tc_fallback_to_tcp) std::unique_ptr sr; initSR(sr); - sr->setAsyncCallback([](const ComboAddress& /* ip */, const DNSName& domain, int type, bool doTCP, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool doTCP, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (!doTCP) { setLWResult(res, 0, false, true, false); return LWResult::Result::Success; @@ -417,7 +417,7 @@ BOOST_AUTO_TEST_CASE(test_tc_over_tcp) size_t tcpQueriesCount = 0; - sr->setAsyncCallback([&tcpQueriesCount](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool doTCP, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool doTCP, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (!doTCP) { setLWResult(res, 0, true, true, false); return LWResult::Result::Success; @@ -452,15 +452,15 @@ BOOST_AUTO_TEST_CASE(test_all_nss_down) primeHints(); - sr->setAsyncCallback([&downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -470,10 +470,8 @@ BOOST_AUTO_TEST_CASE(test_all_nss_down) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else { - downServers.insert(ip); - return LWResult::Result::Timeout; - } + downServers.insert(address); + return LWResult::Result::Timeout; }); DNSName target("powerdns.com."); @@ -499,15 +497,15 @@ BOOST_AUTO_TEST_CASE(test_all_nss_network_error) primeHints(); - sr->setAsyncCallback([&downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -517,10 +515,8 @@ BOOST_AUTO_TEST_CASE(test_all_nss_network_error) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else { - downServers.insert(ip); - return LWResult::Result::Timeout; - } + downServers.insert(address); + return LWResult::Result::Timeout; }); /* exact same test than the previous one, except instead of a time out we fake a network error */ @@ -548,8 +544,8 @@ BOOST_AUTO_TEST_CASE(test_all_nss_send_tc_then_garbage_over_tcp) std::set downServers; - sr->setAsyncCallback([&downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool doTCP, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool doTCP, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "lock-up.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -561,13 +557,11 @@ BOOST_AUTO_TEST_CASE(test_all_nss_send_tc_then_garbage_over_tcp) setLWResult(res, 0, false, true, false); return LWResult::Result::Success; } - else { - downServers.insert(ip); + downServers.insert(address); - setLWResult(res, RCode::FormErr, false, false, false); - res->d_validpacket = false; - return LWResult::Result::Success; - } + setLWResult(res, RCode::FormErr, false, false, false); + res->d_validpacket = false; + return LWResult::Result::Success; }); DNSName target("www.lock-up."); @@ -594,8 +588,8 @@ BOOST_AUTO_TEST_CASE(test_all_nss_send_garbage_over_udp) std::set downServers; size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount, &downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "lock-up.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -604,7 +598,7 @@ BOOST_AUTO_TEST_CASE(test_all_nss_send_garbage_over_udp) } ++queriesCount; - downServers.insert(ip); + downServers.insert(address); setLWResult(res, RCode::FormErr, false, false, false); res->d_validpacket = false; @@ -638,8 +632,8 @@ BOOST_AUTO_TEST_CASE(test_regular_ns_send_refused) std::set downServers; size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount, &downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "refused.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -648,7 +642,7 @@ BOOST_AUTO_TEST_CASE(test_regular_ns_send_refused) } ++queriesCount; - downServers.insert(ip); + downServers.insert(address); setLWResult(res, RCode::Refused, false, false, true); @@ -690,8 +684,8 @@ BOOST_AUTO_TEST_CASE(test_forward_ns_send_refused) ad.d_servers = forwardedNSs; (*SyncRes::t_sstorage.domainmap)[target] = ad; - sr->setAsyncCallback([&queriesCount, &downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "refused.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -700,7 +694,7 @@ BOOST_AUTO_TEST_CASE(test_forward_ns_send_refused) } ++queriesCount; - downServers.insert(ip); + downServers.insert(address); setLWResult(res, RCode::Refused, false, false, true); @@ -741,8 +735,8 @@ BOOST_AUTO_TEST_CASE(test_forward_ns_send_servfail) ad.d_servers = forwardedNSs; (*SyncRes::t_sstorage.domainmap)[DNSName("refused.")] = ad; - sr->setAsyncCallback([&queriesCount, &downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "refused.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -751,7 +745,7 @@ BOOST_AUTO_TEST_CASE(test_forward_ns_send_servfail) } ++queriesCount; - downServers.insert(ip); + downServers.insert(address); setLWResult(res, RCode::ServFail, false, false, true); @@ -784,8 +778,8 @@ BOOST_AUTO_TEST_CASE(test_only_one_ns_up_resolving_itself_with_glue) DNSName target("www.powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain == target) { addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -801,7 +795,7 @@ BOOST_AUTO_TEST_CASE(test_only_one_ns_up_resolving_itself_with_glue) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.3:53")) { + if (address == ComboAddress("192.0.2.3:53")) { setLWResult(res, 0, true, false, true); if (domain == DNSName("pdns-public-ns2.powerdns.net.")) { if (type == QType::A) { @@ -838,15 +832,15 @@ BOOST_AUTO_TEST_CASE(test_os_limit_errors) primeHints(); - sr->setAsyncCallback([&downServers](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -856,17 +850,15 @@ BOOST_AUTO_TEST_CASE(test_os_limit_errors) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else { + { if (downServers.size() < 3) { /* only the last one will answer */ - downServers.insert(ip); + downServers.insert(address); return LWResult::Result::OSLimitError; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, "powerdns.com.", QType::A, "192.0.2.42"); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, "powerdns.com.", QType::A, "192.0.2.42"); + return LWResult::Result::Success; } }); @@ -895,20 +887,20 @@ BOOST_AUTO_TEST_CASE(test_glued_referral) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ if (domain != target) { return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -918,14 +910,12 @@ BOOST_AUTO_TEST_CASE(test_glued_referral) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4"); return LWResult::Result::Success; } - else { - return LWResult::Result::Timeout; - } + return LWResult::Result::Timeout; }); vector ret; @@ -945,8 +935,8 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain.isPartOf(DNSName("com."))) { @@ -964,20 +954,20 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral) addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { if (domain == target) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); return LWResult::Result::Success; } - else if (domain == DNSName("pdns-public-ns1.powerdns.org.")) { + if (domain == DNSName("pdns-public-ns1.powerdns.org.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, "pdns-public-ns1.powerdns.org.", QType::A, "192.0.2.2"); addRecordToLW(res, "pdns-public-ns1.powerdns.org.", QType::AAAA, "2001:DB8::2"); return LWResult::Result::Success; } - else if (domain == DNSName("pdns-public-ns2.powerdns.org.")) { + if (domain == DNSName("pdns-public-ns2.powerdns.org.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, "pdns-public-ns2.powerdns.org.", QType::A, "192.0.2.3"); addRecordToLW(res, "pdns-public-ns2.powerdns.org.", QType::AAAA, "2001:DB8::3"); @@ -987,14 +977,12 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral) setLWResult(res, RCode::NXDomain, false, false, true); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4"); return LWResult::Result::Success; } - else { - return LWResult::Result::Timeout; - } + return LWResult::Result::Timeout; }); vector ret; @@ -1015,8 +1003,8 @@ BOOST_AUTO_TEST_CASE(test_endless_glueless_referral) const DNSName target("powerdns.com."); size_t count = 0; - sr->setAsyncCallback([target, &count](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain.isPartOf(DNSName("com."))) { @@ -1050,7 +1038,7 @@ BOOST_AUTO_TEST_CASE(test_endless_glueless_referral) vector ret; BOOST_CHECK_EXCEPTION(sr->beginResolve(target, QType(QType::A), QClass::IN, ret), ImmediateServFailException, - [](const ImmediateServFailException& isfe) { + [&](const ImmediateServFailException& isfe) { return isfe.reason.substr(0, 9) == "More than"; }); } @@ -1064,8 +1052,8 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_aaaa_task) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain.isPartOf(DNSName("com."))) { @@ -1083,14 +1071,14 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_aaaa_task) addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { if (domain == target) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); return LWResult::Result::Success; } - else if (domain == DNSName("pdns-public-ns1.powerdns.org.")) { + if (domain == DNSName("pdns-public-ns1.powerdns.org.")) { setLWResult(res, 0, true, false, true); if (type == QType::A) { addRecordToLW(res, "pdns-public-ns1.powerdns.org.", QType::A, "192.0.2.2"); @@ -1100,7 +1088,7 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_aaaa_task) } return LWResult::Result::Success; } - else if (domain == DNSName("pdns-public-ns2.powerdns.org.")) { + if (domain == DNSName("pdns-public-ns2.powerdns.org.")) { setLWResult(res, 0, true, false, true); if (type == QType::A) { addRecordToLW(res, "pdns-public-ns2.powerdns.org.", QType::A, "192.0.2.3"); @@ -1114,14 +1102,12 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_aaaa_task) setLWResult(res, RCode::NXDomain, false, false, true); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4"); return LWResult::Result::Success; } - else { - return LWResult::Result::Timeout; - } + return LWResult::Result::Timeout; }); vector ret; @@ -1152,11 +1138,11 @@ BOOST_AUTO_TEST_CASE(test_edns_subnet_by_domain) incomingECS.source = Netmask("192.0.2.128/32"); sr->setQuerySource(ComboAddress(), boost::optional(incomingECS)); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -1166,7 +1152,7 @@ BOOST_AUTO_TEST_CASE(test_edns_subnet_by_domain) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -1212,8 +1198,8 @@ BOOST_AUTO_TEST_CASE(test_edns_subnet_by_addr) incomingECS.source = Netmask("2001:DB8::FF/128"); sr->setQuerySource(ComboAddress(), boost::optional(incomingECS)); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { BOOST_REQUIRE(!srcmask); setLWResult(res, 0, false, false, true); @@ -1221,7 +1207,7 @@ BOOST_AUTO_TEST_CASE(test_edns_subnet_by_addr) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "2001:db8::/56"); @@ -1264,8 +1250,8 @@ BOOST_AUTO_TEST_CASE(test_ecs_use_requestor) // No incoming ECS data sr->setQuerySource(ComboAddress("192.0.2.127"), boost::none); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { BOOST_REQUIRE(!srcmask); setLWResult(res, 0, false, false, true); @@ -1273,7 +1259,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_use_requestor) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); @@ -1308,8 +1294,8 @@ BOOST_AUTO_TEST_CASE(test_ecs_use_scope_zero) // No incoming ECS data, Requestor IP not in ecs-add-for sr->setQuerySource(ComboAddress("192.0.2.127"), boost::none); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { BOOST_REQUIRE(!srcmask); setLWResult(res, 0, false, false, true); @@ -1317,7 +1303,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_use_scope_zero) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "127.0.0.1/32"); @@ -1353,8 +1339,8 @@ BOOST_AUTO_TEST_CASE(test_ecs_honor_incoming_mask) incomingECS.source = Netmask("192.0.0.0/16"); sr->setQuerySource(ComboAddress("192.0.2.127"), boost::optional(incomingECS)); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { BOOST_REQUIRE(!srcmask); setLWResult(res, 0, false, false, true); @@ -1362,7 +1348,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_honor_incoming_mask) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.0.0/16"); @@ -1398,8 +1384,8 @@ BOOST_AUTO_TEST_CASE(test_ecs_honor_incoming_mask_zero) incomingECS.source = Netmask("0.0.0.0/0"); sr->setQuerySource(ComboAddress("192.0.2.127"), boost::optional(incomingECS)); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { BOOST_REQUIRE(!srcmask); setLWResult(res, 0, false, false, true); @@ -1407,7 +1393,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_honor_incoming_mask_zero) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "127.0.0.1/32"); @@ -1438,21 +1424,21 @@ BOOST_AUTO_TEST_CASE(test_following_cname) const DNSName target("cname.powerdns.com."); const DNSName cnameTarget("cname-target.powerdns.com"); - sr->setAsyncCallback([target, cnameTarget](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, cnameTarget.toString()); return LWResult::Result::Success; } - else if (domain == cnameTarget) { + if (domain == cnameTarget) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); } @@ -1483,14 +1469,14 @@ BOOST_AUTO_TEST_CASE(test_cname_nxdomain) const DNSName target("cname.powerdns.com."); const DNSName cnameTarget("cname-target.powerdns.com"); - sr->setAsyncCallback([target, cnameTarget](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, RCode::NXDomain, true, false, false); @@ -1541,8 +1527,8 @@ BOOST_AUTO_TEST_CASE(test_included_poisonous_cname) const DNSName target("cname.powerdns.com."); const DNSName cnameTarget("cname-target.powerdns.com"); - sr->setAsyncCallback([target, cnameTarget](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); @@ -1550,7 +1536,7 @@ BOOST_AUTO_TEST_CASE(test_included_poisonous_cname) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, 0, true, false, false); @@ -1558,7 +1544,7 @@ BOOST_AUTO_TEST_CASE(test_included_poisonous_cname) addRecordToLW(res, cnameTarget, QType::A, "192.0.2.2", DNSResourceRecord::ADDITIONAL); return LWResult::Result::Success; } - else if (domain == cnameTarget) { + if (domain == cnameTarget) { setLWResult(res, 0, true, false, false); addRecordToLW(res, cnameTarget, QType::A, "192.0.2.3"); return LWResult::Result::Success; @@ -1592,17 +1578,17 @@ BOOST_AUTO_TEST_CASE(test_cname_loop) size_t count = 0; const DNSName target("cname.powerdns.com."); - sr->setAsyncCallback([target, &count](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { count++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, 0, true, false, false); @@ -1645,34 +1631,34 @@ BOOST_AUTO_TEST_CASE(test_cname_long_loop) const DNSName target3("cname3.powerdns.com."); const DNSName target4("cname4.powerdns.com."); - sr->setAsyncCallback([target1, target2, target3, target4, &count](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { count++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == target1) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, target2.toString()); return LWResult::Result::Success; } - else if (domain == target2) { + if (domain == target2) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, target3.toString()); return LWResult::Result::Success; } - else if (domain == target3) { + if (domain == target3) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, target4.toString()); return LWResult::Result::Success; } - else if (domain == target4) { + if (domain == target4) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, target1.toString()); return LWResult::Result::Success; @@ -1710,15 +1696,15 @@ BOOST_AUTO_TEST_CASE(test_cname_length) size_t length = 0; const DNSName target("cname.powerdns.com."); - sr->setAsyncCallback([target, &length](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, std::to_string(length) + "-cname.powerdns.com"); @@ -1746,7 +1732,7 @@ BOOST_AUTO_TEST_CASE(test_cname_target_servfail) const DNSName target("cname.powerdns.com."); const DNSName cnameTarget("cname-target.powerdns.com"); - resolver->setAsyncCallback([target, cnameTarget](const ComboAddress& ipAddress, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + resolver->setAsyncCallback([&](const ComboAddress& ipAddress, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (isRootServer(ipAddress)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -1789,7 +1775,7 @@ BOOST_AUTO_TEST_CASE(test_cname_target_servfail_servestale) const DNSName target("cname.powerdns.com."); const DNSName cnameTarget("cname-target.powerdns.com"); - resolver->setAsyncCallback([target, cnameTarget](const ComboAddress& ipAddress, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + resolver->setAsyncCallback([&](const ComboAddress& ipAddress, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (isRootServer(ipAddress)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -1832,10 +1818,10 @@ BOOST_AUTO_TEST_CASE(test_time_limit) size_t queries = 0; const DNSName target("cname.powerdns.com."); - sr->setAsyncCallback([target, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); /* Pretend that this query took 2000 ms */ res->d_usec = 2000; @@ -1844,7 +1830,7 @@ BOOST_AUTO_TEST_CASE(test_time_limit) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -1888,10 +1874,10 @@ BOOST_AUTO_TEST_CASE(test_dname_processing) size_t queries = 0; - sr->setAsyncCallback([dnameOwner, dnameTarget, target, cnameTarget, uncachedTarget, uncachedCNAMETarget, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain.isPartOf(dnameOwner)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, dnameOwner, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -1905,7 +1891,7 @@ BOOST_AUTO_TEST_CASE(test_dname_processing) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.1:53")) { + else if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, 0, true, false, false); addRecordToLW(res, dnameOwner, QType::DNAME, dnameTarget.toString()); @@ -1913,7 +1899,7 @@ BOOST_AUTO_TEST_CASE(test_dname_processing) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == cnameTarget) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -2032,13 +2018,13 @@ BOOST_AUTO_TEST_CASE(test_dname_dnssec_secure) size_t queries = 0; - sr->setAsyncCallback([dnameOwner, dnameTarget, target, cnameTarget, keys, &queries](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; /* We don't use the genericDSAndDNSKEYHandler here, as it would deny names existing at the wrong level of the tree, due to the way computeZoneCuts works * As such, we need to do some more work to make the answers correct. */ - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain.countLabels() == 0 && type == QType::DNSKEY) { // .|DNSKEY setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); @@ -2069,7 +2055,7 @@ BOOST_AUTO_TEST_CASE(test_dname_dnssec_secure) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.1:53")) { + else if (address == ComboAddress("192.0.2.1:53")) { if (domain.countLabels() == 1 && type == QType::DNSKEY) { // powerdns|DNSKEY setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); @@ -2087,7 +2073,7 @@ BOOST_AUTO_TEST_CASE(test_dname_dnssec_secure) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain.countLabels() == 1 && type == QType::DNSKEY) { // example|DNSKEY setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); @@ -2183,7 +2169,7 @@ BOOST_AUTO_TEST_CASE(test_dname_plus_ns_dnssec_secure) size_t queries = 0; - sr->setAsyncCallback([dnameOwner, dnameTarget, target, cnameTarget, keys, &queries](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; if (type == QType::DS || type == QType::DNSKEY) { @@ -2202,7 +2188,7 @@ BOOST_AUTO_TEST_CASE(test_dname_plus_ns_dnssec_secure) addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (domain == cnameTarget) { + if (domain == cnameTarget) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); addRRSIG(keys, res->d_records, dnameTarget, 300); @@ -2290,10 +2276,10 @@ BOOST_AUTO_TEST_CASE(test_dname_dnssec_insecure) size_t queries = 0; - sr->setAsyncCallback([dnameOwner, dnameTarget, target, cnameTarget, keys, &queries](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain.countLabels() == 0 && type == QType::DNSKEY) { // .|DNSKEY setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); @@ -2327,7 +2313,7 @@ BOOST_AUTO_TEST_CASE(test_dname_dnssec_insecure) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.1:53")) { + else if (address == ComboAddress("192.0.2.1:53")) { if (domain.countLabels() == 1 && type == QType::DNSKEY) { // powerdns|DNSKEY setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); @@ -2345,7 +2331,7 @@ BOOST_AUTO_TEST_CASE(test_dname_dnssec_insecure) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == target && type == QType::DS) { // dname.example|DS return genericDSAndDNSKEYHandler(res, domain, dnameTarget, type, keys, false); } @@ -2419,10 +2405,10 @@ BOOST_AUTO_TEST_CASE(test_dname_processing_no_CNAME) size_t queries = 0; - sr->setAsyncCallback([dnameOwner, dnameTarget, target, cnameTarget, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain.isPartOf(dnameOwner)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, dnameOwner, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -2436,7 +2422,7 @@ BOOST_AUTO_TEST_CASE(test_dname_processing_no_CNAME) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.1:53")) { + else if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, 0, true, false, false); addRecordToLW(res, dnameOwner, QType::DNAME, dnameTarget.toString()); @@ -2444,7 +2430,7 @@ BOOST_AUTO_TEST_CASE(test_dname_processing_no_CNAME) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == cnameTarget) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -2510,20 +2496,20 @@ BOOST_AUTO_TEST_CASE(test_glued_referral_child_ns_set_wrong) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ if (domain != target) { return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -2533,14 +2519,14 @@ BOOST_AUTO_TEST_CASE(test_glued_referral_child_ns_set_wrong) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { if (type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4"); return LWResult::Result::Success; } - else if (type == QType::NS) { + if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-nsX1.powerdns.com.", DNSResourceRecord::ANSWER, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-nsX2.powerdns.com.", DNSResourceRecord::ANSWER, 172800); @@ -2550,13 +2536,9 @@ BOOST_AUTO_TEST_CASE(test_glued_referral_child_ns_set_wrong) addRecordToLW(res, "pdns-public-nsX2.powerdns.com.", QType::AAAA, "2001:DB8::12", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else { - return LWResult::Result::Timeout; - } - } - else { return LWResult::Result::Timeout; } + return LWResult::Result::Timeout; }); vector ret; diff --git a/pdns/recursordist/test-syncres_cc10.cc b/pdns/recursordist/test-syncres_cc10.cc index d43570f0e6..fe0738a739 100644 --- a/pdns/recursordist/test-syncres_cc10.cc +++ b/pdns/recursordist/test-syncres_cc10.cc @@ -20,12 +20,12 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only) int queries = 0; const DNSName target("powerdns.com."); - sr->setAsyncCallback([target, &v4Hit, &v6Hit, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); - v4Hit |= ip.isIPv4(); - v6Hit |= ip.isIPv6(); + v4Hit |= address.isIPv4(); + v6Hit |= address.isIPv6(); if (domain == DNSName("powerdns.com.")) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, false); v4Hit |= true; if (domain == DNSName("powerdns.com.")) { @@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only) } return LWResult::Result::Success; } - else if (ip == ComboAddress("[2001:DB8:1::53]:53")) { + if (address == ComboAddress("[2001:DB8:1::53]:53")) { setLWResult(res, 0, true, false, false); v6Hit |= true; if (domain == DNSName("powerdns.com.")) { @@ -73,9 +73,9 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only_no_A_in_delegation) int queries = 0; const DNSName target("powerdns.com."); - sr->setAsyncCallback([target, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain == DNSName("powerdns.com.")) { @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v4_only_no_A_in_delegation) } return LWResult::Result::Success; } - else if (ip == ComboAddress("[2001:DB8:1::53]:53")) { + if (address == ComboAddress("[2001:DB8:1::53]:53")) { setLWResult(res, 0, true, false, false); if (domain == DNSName("powerdns.com.")) { addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -112,9 +112,9 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v6_only_no_AAAA_in_delegation) int queries = 0; const DNSName target("powerdns.com."); - sr->setAsyncCallback([target, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain == DNSName("powerdns.com.")) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE(test_outgoing_v6_only_no_AAAA_in_delegation) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, false); if (domain == DNSName("powerdns.com.")) { addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut_invalid_ds_denia size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut_invalid_ds_denia addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("sub.powerdns.com.")) { + if (domain == DNSName("sub.powerdns.com.")) { /* sends a NODATA for the DS, but it is in fact a NXD proof, which would be bogus if the zone was actually secure */ setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); @@ -186,15 +186,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut_invalid_ds_denia addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -202,7 +200,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut_invalid_ds_denia addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain.isPartOf(DNSName("powerdns.com."))) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -213,14 +211,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut_invalid_ds_denia return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain.isPartOf(DNSName("sub.powerdns.com."))) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("sub.powerdns.com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("nx.powerdns.com.")) { + if (domain == DNSName("nx.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300); @@ -294,7 +292,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_wrong_rrsig_fake_signer) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -309,15 +307,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_wrong_rrsig_fake_signer) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -325,7 +321,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_wrong_rrsig_fake_signer) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain.isPartOf(DNSName("powerdns.com."))) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -336,14 +332,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_wrong_rrsig_fake_signer) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain.isPartOf(DNSName("sub.powerdns.com."))) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("com.") /* wrong signer !! */, 300, /* broken !!!*/ true); return LWResult::Result::Success; } - else if (domain == DNSName("www.powerdns.com.")) { + if (domain == DNSName("www.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); return LWResult::Result::Success; @@ -409,7 +405,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_soa) size_t queriesCount = 0; - sr->setAsyncCallback([targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -424,21 +420,19 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_soa) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("sub.powerdns.com.")) { + if (domain == DNSName("sub.powerdns.com.")) { /* sends a NODATA for the DS */ setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -446,7 +440,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_soa) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain.isPartOf(DNSName("powerdns.com."))) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -457,21 +451,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_soa) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == DNSName("nxd.sub.powerdns.com.")) { setLWResult(res, RCode::NXDomain, true, false, true); addNSECRecordToLW(DNSName("nxc.sub.powerdns.com."), DNSName("nxe.sub.powerdnsz.com."), {QType::AAAA}, 600, res->d_records); addRRSIG(keys, res->d_records, DNSName("sub.powerdns.com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("nodata.sub.powerdns.com.")) { + if (domain == DNSName("nodata.sub.powerdns.com.")) { setLWResult(res, 0, true, false, true); /* NSEC but no SOA */ addNSECRecordToLW(DNSName("nodata.sub.powerdns.com."), DNSName("nodata2.sub.powerdnsz.com."), {QType::AAAA}, 600, res->d_records); addRRSIG(keys, res->d_records, DNSName("sub.powerdns.com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("www.powerdns.com.")) { + if (domain == DNSName("www.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); return LWResult::Result::Success; @@ -555,7 +549,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_dnskey) size_t queriesCount = 0; - sr->setAsyncCallback([targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -570,17 +564,15 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_dnskey) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("sub.powerdns.com.")) { + if (domain == DNSName("sub.powerdns.com.")) { /* sends a NODATA for the DS */ setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == DNSName("sub.powerdns.com.")) { /* sends a NODATA for the DNSKEY */ setLWResult(res, 0, true, false, true); @@ -592,8 +584,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_dnskey) } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -601,7 +593,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_dnskey) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain.isPartOf(DNSName("powerdns.com."))) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -612,14 +604,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_missing_dnskey) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == DNSName("www.sub.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("sub.powerdns.com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("www.powerdns.com.")) { + if (domain == DNSName("www.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); return LWResult::Result::Success; @@ -685,7 +677,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_dnskey) size_t queriesCount = 0; - sr->setAsyncCallback([targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -700,17 +692,15 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_dnskey) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("sub.powerdns.com.")) { + if (domain == DNSName("sub.powerdns.com.")) { /* sends a NODATA for the DS */ setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == DNSName("sub.powerdns.com.")) { /* sends a NXD for the DNSKEY */ setLWResult(res, RCode::NXDomain, true, false, true); @@ -722,8 +712,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_dnskey) } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -731,7 +721,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_dnskey) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain.isPartOf(DNSName("powerdns.com."))) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -742,14 +732,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_dnskey) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == DNSName("www.sub.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("sub.powerdns.com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("www.powerdns.com.")) { + if (domain == DNSName("www.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); return LWResult::Result::Success; @@ -815,7 +805,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_ds) size_t queriesCount = 0; - sr->setAsyncCallback([targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -830,21 +820,19 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_ds) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("sub.powerdns.com.")) { + if (domain == DNSName("sub.powerdns.com.")) { /* sends a NXD!! for the DS */ setLWResult(res, RCode::NXDomain, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -852,7 +840,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_ds) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain.isPartOf(DNSName("powerdns.com."))) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -863,14 +851,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_ds) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == DNSName("www.sub.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("sub.powerdns.com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("www.powerdns.com.")) { + if (domain == DNSName("www.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); return LWResult::Result::Success; @@ -948,23 +936,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_loop) size_t queriesCount = 0; - sr->setAsyncCallback([targetAddr, &queriesCount, keys, wrongKeys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == DNSName("powerdns.com.")) { /* wrong DNSKEY */ return genericDSAndDNSKEYHandler(res, domain, domain, type, wrongKeys); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -972,7 +958,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_loop) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain.isPartOf(DNSName("powerdns.com."))) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com."), QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -982,7 +968,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_loop) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == DNSName("www.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); @@ -1078,21 +1064,21 @@ BOOST_AUTO_TEST_CASE(test_servestale) const int theTTL = 5; - sr->setAsyncCallback([&downServers, &downCount, &lookupCount, target](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ - if (downServers.find(ip) != downServers.end()) { + if (downServers.find(address) != downServers.end()) { downCount++; return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); @@ -1102,15 +1088,13 @@ BOOST_AUTO_TEST_CASE(test_servestale) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, theTTL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4", DNSResourceRecord::ANSWER, 5); lookupCount++; return LWResult::Result::Success; } - else { - return LWResult::Result::Timeout; - } + return LWResult::Result::Timeout; }); time_t now = time(nullptr); @@ -1216,21 +1200,21 @@ BOOST_AUTO_TEST_CASE(test_servestale_neg) const int theTTL = 5; - sr->setAsyncCallback([&downServers, &downCount, &lookupCount, target](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ - if (downServers.find(ip) != downServers.end()) { + if (downServers.find(address) != downServers.end()) { downCount++; return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); @@ -1240,7 +1224,7 @@ BOOST_AUTO_TEST_CASE(test_servestale_neg) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, theTTL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, "powerdns.com.", QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 60", DNSResourceRecord::AUTHORITY); lookupCount++; @@ -1351,21 +1335,21 @@ BOOST_AUTO_TEST_CASE(test_servestale_neg_to_available) const int theTTL = 5; const int negTTL = 60; - sr->setAsyncCallback([&downServers, &downCount, &lookupCount, &negLookup, target](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ - if (downServers.find(ip) != downServers.end()) { + if (downServers.find(address) != downServers.end()) { downCount++; return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); @@ -1375,14 +1359,14 @@ BOOST_AUTO_TEST_CASE(test_servestale_neg_to_available) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, theTTL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { if (negLookup) { setLWResult(res, 0, true, false, true); addRecordToLW(res, "powerdns.com.", QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 60", DNSResourceRecord::AUTHORITY, negTTL); lookupCount++; return LWResult::Result::Success; } - else { + { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4", DNSResourceRecord::ANSWER, theTTL); lookupCount++; @@ -1494,21 +1478,21 @@ BOOST_AUTO_TEST_CASE(test_servestale_cname_to_nxdomain) const int theTTL = 5; const int negTTL = 60; - sr->setAsyncCallback([&downServers, &downCount, &lookupCount, &cnameOK, target, auth](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ - if (downServers.find(ip) != downServers.end()) { + if (downServers.find(address) != downServers.end()) { downCount++; return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); @@ -1518,7 +1502,7 @@ BOOST_AUTO_TEST_CASE(test_servestale_cname_to_nxdomain) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, theTTL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { if (cnameOK) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::CNAME, "cname.powerdns.com.", DNSResourceRecord::ANSWER, 5); @@ -1526,12 +1510,10 @@ BOOST_AUTO_TEST_CASE(test_servestale_cname_to_nxdomain) lookupCount++; return LWResult::Result::Success; } - else { - setLWResult(res, RCode::NXDomain, true, false, true); - addRecordToLW(res, auth, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 60", DNSResourceRecord::AUTHORITY, negTTL); - lookupCount++; - return LWResult::Result::Success; - } + setLWResult(res, RCode::NXDomain, true, false, true); + addRecordToLW(res, auth, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 60", DNSResourceRecord::AUTHORITY, negTTL); + lookupCount++; + return LWResult::Result::Success; } else { return LWResult::Result::Timeout; @@ -1649,7 +1631,7 @@ BOOST_AUTO_TEST_CASE(test_servestale_cname_to_nodata) const time_t theTTL = 5; const time_t negTTL = 60; - sr->setAsyncCallback([&downServers, &downCount, &lookupCount, &cnameOK, target, auth](const ComboAddress& ipAddress, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const boost::optional& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& ipAddress, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ if (downServers.find(ipAddress) != downServers.end()) { downCount++; @@ -1797,22 +1779,22 @@ BOOST_AUTO_TEST_CASE(test_servestale_immediateservfail) const int theTTL = 5; - sr->setAsyncCallback([&downServers, &downCount, &lookupCount, target](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ - if (downServers.find(ip) != downServers.end()) { + if (downServers.find(address) != downServers.end()) { downCount++; throw ImmediateServFailException("FAIL!"); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, theTTL); @@ -1822,7 +1804,7 @@ BOOST_AUTO_TEST_CASE(test_servestale_immediateservfail) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, theTTL); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4", DNSResourceRecord::ANSWER, 5); lookupCount++; @@ -1871,20 +1853,20 @@ BOOST_AUTO_TEST_CASE(test_glued_referral_additional_update) const DNSName target1("powerdns.com."); const DNSName target2("pdns.com."); - sr->setAsyncCallback([=](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ if (domain != target1 && domain != target2) { return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { if (domain == target1) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -1907,7 +1889,7 @@ BOOST_AUTO_TEST_CASE(test_glued_referral_additional_update) } return LWResult::Result::Timeout; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); if (domain == target1) { addRecordToLW(res, target1, QType::A, "192.0.2.4"); @@ -1962,20 +1944,20 @@ BOOST_AUTO_TEST_CASE(test_glued_referral_additional_no_update_because_locked) const DNSName target1("powerdns.com."); const DNSName target2("pdns.com."); - sr->setAsyncCallback([=](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ if (domain != target1 && domain != target2) { return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { if (domain == target1) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -1998,7 +1980,7 @@ BOOST_AUTO_TEST_CASE(test_glued_referral_additional_no_update_because_locked) } return LWResult::Result::Timeout; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); if (domain == target1) { addRecordToLW(res, target1, QType::A, "192.0.2.4"); @@ -2052,20 +2034,20 @@ BOOST_AUTO_TEST_CASE(test_locked_nonauth_update_to_auth) const DNSName target("powerdns.com."); - sr->setAsyncCallback([=](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, boost::optional /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { /* this will cause issue with qname minimization if we ever implement it */ if (domain != target) { return LWResult::Result::Timeout; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, target, QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, target, QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -2075,13 +2057,13 @@ BOOST_AUTO_TEST_CASE(test_locked_nonauth_update_to_auth) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { if (type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4"); return LWResult::Result::Success; } - else if (type == QType::NS) { + if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::ANSWER, 172800); addRecordToLW(res, target, QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::ANSWER, 172800); diff --git a/pdns/recursordist/test-syncres_cc2.cc b/pdns/recursordist/test-syncres_cc2.cc index de8f18a481..7f57813e6b 100644 --- a/pdns/recursordist/test-syncres_cc2.cc +++ b/pdns/recursordist/test-syncres_cc2.cc @@ -20,10 +20,10 @@ static void do_test_referral_depth(bool limited) size_t queries = 0; const DNSName target("www.powerdns.com."); - sr->setAsyncCallback([target, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain == DNSName("www.powerdns.com.")) { @@ -45,7 +45,7 @@ static void do_test_referral_depth(bool limited) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, false); if (domain == DNSName("www.powerdns.com.")) { addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -118,10 +118,10 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_loop) const DNSName target2("powerdns.org."); size_t queriesToNS = 0; - sr->setAsyncCallback([target1, target2, &queriesToNS](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesToNS++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain.isPartOf(DNSName("com."))) { @@ -139,14 +139,14 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_loop) addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { if (domain.isPartOf(target1)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "ns1.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "ns2.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); return LWResult::Result::Success; } - else if (domain.isPartOf(target2)) { + if (domain.isPartOf(target2)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.org.", QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.org.", QType::NS, "ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -184,10 +184,10 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_loop_with_nonresolving) const DNSName target2("powerdns.org."); size_t queriesToNS = 0; - sr->setAsyncCallback([target1, target2, &queriesToNS](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesToNS++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain.isPartOf(DNSName("com."))) { @@ -205,14 +205,14 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_loop_with_nonresolving) addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { if (domain.isPartOf(target1)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "ns1.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "ns2.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); return LWResult::Result::Success; } - else if (domain.isPartOf(target2)) { + if (domain.isPartOf(target2)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.org.", QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.org.", QType::NS, "ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -249,8 +249,8 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_with_non_resolving) size_t queryCount = 0; - sr->setAsyncCallback([target, &queryCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); if (domain.isPartOf(DNSName("com."))) { @@ -268,14 +268,14 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_with_non_resolving) addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { if (domain == target) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.org.", DNSResourceRecord::AUTHORITY, 172800); return LWResult::Result::Success; } - else if (domain == DNSName("pdns-public-ns1.powerdns.org.")) { + if (domain == DNSName("pdns-public-ns1.powerdns.org.")) { queryCount++; setLWResult(res, 0, true, false, true); if (queryCount > 8) { @@ -297,13 +297,12 @@ BOOST_AUTO_TEST_CASE(test_glueless_referral_with_non_resolving) setLWResult(res, RCode::NXDomain, false, false, true); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4"); return LWResult::Result::Success; } - else - return LWResult::Result::Timeout; + return LWResult::Result::Timeout; }); SyncRes::s_nonresolvingnsmaxfails = 10; @@ -344,17 +343,17 @@ BOOST_AUTO_TEST_CASE(test_cname_qperq) size_t queries = 0; const DNSName target("cname.powerdns.com."); - sr->setAsyncCallback([target, &queries](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queries++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, std::to_string(queries) + "-cname.powerdns.com"); @@ -388,15 +387,15 @@ BOOST_AUTO_TEST_CASE(test_throttled_server) const ComboAddress ns("192.0.2.1:53"); size_t queriesToNS = 0; - sr->setAsyncCallback([target, ns, &queriesToNS](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { queriesToNS++; @@ -474,15 +473,15 @@ BOOST_AUTO_TEST_CASE(test_dont_query_server) const ComboAddress ns("192.0.2.1:53"); size_t queriesToNS = 0; - sr->setAsyncCallback([target, ns, &queriesToNS](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { queriesToNS++; @@ -518,10 +517,10 @@ BOOST_AUTO_TEST_CASE(test_root_nx_trust) const ComboAddress ns("192.0.2.1:53"); size_t queriesCount = 0; - sr->setAsyncCallback([target1, target2, ns, &queriesCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain == target1) { setLWResult(res, RCode::NXDomain, true, false, true); @@ -535,7 +534,7 @@ BOOST_AUTO_TEST_CASE(test_root_nx_trust) return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -583,10 +582,10 @@ BOOST_AUTO_TEST_CASE(test_root_nx_trust_specific) /* This time the root denies target1 with a "com." SOA instead of a "." one. We should add target1 to the negcache, but not "com.". */ - sr->setAsyncCallback([target1, target2, ns, &queriesCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain == target1) { setLWResult(res, RCode::NXDomain, true, false, true); @@ -600,7 +599,7 @@ BOOST_AUTO_TEST_CASE(test_root_nx_trust_specific) return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -645,10 +644,10 @@ BOOST_AUTO_TEST_CASE(test_root_nx_dont_trust) const ComboAddress ns("192.0.2.1:53"); size_t queriesCount = 0; - sr->setAsyncCallback([target1, target2, ns, &queriesCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain == target1) { setLWResult(res, RCode::NXDomain, true, false, true); @@ -662,7 +661,7 @@ BOOST_AUTO_TEST_CASE(test_root_nx_dont_trust) return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); @@ -708,16 +707,16 @@ BOOST_AUTO_TEST_CASE(test_rfc8020_nothing_underneath) const ComboAddress ns("192.0.2.1:53"); size_t queriesCount = 0; - sr->setAsyncCallback([ns, &queriesCount](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "ns1.powerdns.com.", QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, RCode::NXDomain, true, false, false); addRecordToLW(res, "powerdns.com.", QType::SOA, "ns1.powerdns.com. hostmaster.powerdns.com. 2017032800 1800 900 604800 86400", DNSResourceRecord::AUTHORITY, 86400); return LWResult::Result::Success; @@ -817,7 +816,7 @@ BOOST_AUTO_TEST_CASE(test_rfc8020_nothing_underneath_dnssec) size_t queriesCount = 0; - sr->setAsyncCallback([target1, target2, target3, target4, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -833,12 +832,10 @@ BOOST_AUTO_TEST_CASE(test_rfc8020_nothing_underneath_dnssec) addRRSIG(keys, res->d_records, auth, 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -846,7 +843,7 @@ BOOST_AUTO_TEST_CASE(test_rfc8020_nothing_underneath_dnssec) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -863,7 +860,7 @@ BOOST_AUTO_TEST_CASE(test_rfc8020_nothing_underneath_dnssec) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); if (domain == DNSName("powerdns.com.")) { @@ -977,16 +974,16 @@ BOOST_AUTO_TEST_CASE(test_rfc8020_nodata) const ComboAddress ns("192.0.2.1:53"); size_t queriesCount = 0; - sr->setAsyncCallback([ns, target1, target2, target3, &queriesCount](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "ns1.powerdns.com.", QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { if (domain == target1) { // NODATA for TXT, NOERROR for A if (type == QType::TXT) { setLWResult(res, RCode::NoError, true); @@ -1051,16 +1048,16 @@ BOOST_AUTO_TEST_CASE(test_rfc8020_nodata_bis) const ComboAddress ns("192.0.2.1:53"); size_t queriesCount = 0; - sr->setAsyncCallback([ns, target1, target2, target3, &queriesCount](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "ns1.powerdns.com.", QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { if (domain == target1) { // NODATA for TXT, NOERROR for A if (type == QType::TXT) { setLWResult(res, RCode::NoError, true); @@ -1127,11 +1124,11 @@ BOOST_AUTO_TEST_CASE(test_dont_skip_negcache_for_variable_response) incomingECS.source = Netmask("192.0.2.128/32"); sr->setQuerySource(ComboAddress(), boost::optional(incomingECS)); - sr->setAsyncCallback([target, cnameTarget](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "pdns-public-ns1.powerdns.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -1140,7 +1137,7 @@ BOOST_AUTO_TEST_CASE(test_dont_skip_negcache_for_variable_response) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { /* Type 2 NXDOMAIN (rfc2308 section-2.1) */ setLWResult(res, RCode::NXDomain, true, false, true); @@ -1183,7 +1180,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_limit_allowed) sr->setQuerySource(ComboAddress(), boost::optional(incomingECS)); SyncRes::s_ecsipv4cachelimit = 24; - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); @@ -1222,7 +1219,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_limit_no_ttl_limit_allowed) sr->setQuerySource(ComboAddress(), boost::optional(incomingECS)); SyncRes::s_ecsipv4cachelimit = 16; - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); @@ -1261,7 +1258,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_allowed) sr->setQuerySource(ComboAddress(), boost::optional(incomingECS)); SyncRes::s_ecscachelimitttl = 30; - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); @@ -1301,7 +1298,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_and_scope_allowed) SyncRes::s_ecscachelimitttl = 100; SyncRes::s_ecsipv4cachelimit = 24; - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); @@ -1341,7 +1338,7 @@ BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_notallowed) SyncRes::s_ecscachelimitttl = 100; SyncRes::s_ecsipv4cachelimit = 16; - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); @@ -1375,8 +1372,8 @@ BOOST_AUTO_TEST_CASE(test_ns_speed) std::map nsCounts; - sr->setAsyncCallback([target, &nsCounts](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, domain, QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -1391,16 +1388,16 @@ BOOST_AUTO_TEST_CASE(test_ns_speed) return LWResult::Result::Success; } - else { - nsCounts[ip]++; + { + nsCounts[address]++; - if (ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("192.0.2.2:53")) { BOOST_CHECK_LT(nsCounts.size(), 3U); /* let's time out on pdns-public-ns2.powerdns.com. */ return LWResult::Result::Timeout; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { BOOST_CHECK_EQUAL(nsCounts.size(), 3U); setLWResult(res, 0, true, false, true); @@ -1444,8 +1441,8 @@ BOOST_AUTO_TEST_CASE(test_flawed_nsset) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -1453,7 +1450,7 @@ BOOST_AUTO_TEST_CASE(test_flawed_nsset) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.254"); return LWResult::Result::Success; @@ -1486,16 +1483,16 @@ BOOST_AUTO_TEST_CASE(test_completely_flawed_nsset) const DNSName target("powerdns.com."); size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount, target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip) && domain == target) { + if (isRootServer(address) && domain == target) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, domain, QType::NS, "pdns-public-ns3.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); return LWResult::Result::Success; } - else if (domain == DNSName("pdns-public-ns2.powerdns.com.") || domain == DNSName("pdns-public-ns3.powerdns.com.")) { + if (domain == DNSName("pdns-public-ns2.powerdns.com.") || domain == DNSName("pdns-public-ns3.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, ".", QType::SOA, "a.root-servers.net. nstld.verisign-grs.com. 2017032800 1800 900 604800 86400", DNSResourceRecord::AUTHORITY, 86400); return LWResult::Result::Success; @@ -1522,10 +1519,10 @@ BOOST_AUTO_TEST_CASE(test_completely_flawed_big_nsset) const DNSName target("powerdns.com."); size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount, target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip) && domain == target) { + if (isRootServer(address) && domain == target) { setLWResult(res, 0, false, false, true); // 20 NS records for (int i = 0; i < 20; i++) { @@ -1534,7 +1531,7 @@ BOOST_AUTO_TEST_CASE(test_completely_flawed_big_nsset) } return LWResult::Result::Success; } - else if (domain.toString().length() > 14 && domain.toString().substr(0, 14) == "pdns-public-ns") { + if (domain.toString().length() > 14 && domain.toString().substr(0, 14) == "pdns-public-ns") { setLWResult(res, 0, true, false, true); addRecordToLW(res, ".", QType::SOA, "a.root-servers.net. nstld.verisign-grs.com. 2017032800 1800 900 604800 86400", DNSResourceRecord::AUTHORITY, 86400); return LWResult::Result::Success; @@ -1564,7 +1561,7 @@ BOOST_AUTO_TEST_CASE(test_cache_hit) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { return LWResult::Result::Timeout; }); @@ -1594,7 +1591,7 @@ BOOST_AUTO_TEST_CASE(test_no_rd) sr->setCacheOnly(); - sr->setAsyncCallback([target, &queriesCount](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { queriesCount++; return LWResult::Result::Timeout; }); @@ -1616,15 +1613,15 @@ BOOST_AUTO_TEST_CASE(test_cache_min_max_ttl) const DNSName target("cachettl.powerdns.com."); const ComboAddress ns("192.0.2.1:53"); - sr->setAsyncCallback([target, ns](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 7200); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2", DNSResourceRecord::ANSWER, 10); @@ -1674,11 +1671,11 @@ BOOST_AUTO_TEST_CASE(test_cache_min_max_ecs_ttl) sr->setQuerySource(ComboAddress(), boost::optional(incomingECS)); SyncRes::addEDNSDomain(target); - sr->setAsyncCallback([target, ns](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& srcmask, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { BOOST_REQUIRE(srcmask); BOOST_CHECK_EQUAL(srcmask->toString(), "192.0.2.0/24"); - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -1687,7 +1684,7 @@ BOOST_AUTO_TEST_CASE(test_cache_min_max_ecs_ttl) return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2", DNSResourceRecord::ANSWER, 10); @@ -1738,8 +1735,8 @@ BOOST_AUTO_TEST_CASE(test_cache_expired_ttl) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -1747,7 +1744,7 @@ BOOST_AUTO_TEST_CASE(test_cache_expired_ttl) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.2"); return LWResult::Result::Success; @@ -1783,8 +1780,8 @@ BOOST_AUTO_TEST_CASE(test_cache_almost_expired_ttl) const DNSName target("powerdns.com."); - auto cb = [target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + auto callback = [&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -1792,7 +1789,7 @@ BOOST_AUTO_TEST_CASE(test_cache_almost_expired_ttl) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.2"); return LWResult::Result::Success; @@ -1800,7 +1797,7 @@ BOOST_AUTO_TEST_CASE(test_cache_almost_expired_ttl) return LWResult::Result::Timeout; }; - sr->setAsyncCallback(cb); + sr->setAsyncCallback(callback); /* we populate the cache with an 60s TTL entry that is 31s old*/ const time_t now = sr->getNow().tv_sec; diff --git a/pdns/recursordist/test-syncres_cc3.cc b/pdns/recursordist/test-syncres_cc3.cc index 60106a8f43..1bb73faa60 100644 --- a/pdns/recursordist/test-syncres_cc3.cc +++ b/pdns/recursordist/test-syncres_cc3.cc @@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(test_cache_auth) check that we only return one result, and we only cache one too. */ const DNSName target("cache-auth.powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.2", DNSResourceRecord::ANSWER, 10); addRecordToLW(res, domain, QType::A, "192.0.2.2", DNSResourceRecord::ADDITIONAL, 10); @@ -54,14 +54,14 @@ BOOST_AUTO_TEST_CASE(test_unauth_any) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); @@ -89,9 +89,9 @@ static void test_no_data_f(bool qmin) const DNSName target("powerdns.com."); sr->setAsyncCallback( - [target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, - struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, - LWResult* res, bool* /* chained */) { + [&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, + struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, + LWResult* res, bool* /* chained */) { setLWResult(res, 0, true, false, true); return LWResult::Result::Success; }); @@ -124,8 +124,8 @@ BOOST_AUTO_TEST_CASE(test_extra_answers) const DNSName target2("www2.powerdns.com."); // in bailiwick, but not asked for const DNSName target3("www.random.net."); // out of bailiwick and not asked for - sr->setAsyncCallback([target, target2, target3](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -188,11 +188,11 @@ BOOST_AUTO_TEST_CASE(test_dnssec_extra_answers) generateKeyMaterial(DNSName("powerdns.com"), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors); g_luaconfs.setState(luaconfsCopy); - sr->setAsyncCallback([target, target2, target3, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRRSIG(keys, res->d_records, DNSName("."), 300); @@ -248,7 +248,7 @@ BOOST_AUTO_TEST_CASE(test_skip_opt_any) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); addRecordToLW(res, domain, QType::ANY, "\\# 0"); @@ -271,7 +271,7 @@ BOOST_AUTO_TEST_CASE(test_nodata_nsec_nodnssec) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); /* the NSEC and RRSIG contents are complete garbage, please ignore them */ @@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE(test_nodata_nsec_dnssec) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); /* the NSEC and RRSIG contents are complete garbage, please ignore them */ @@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(test_nx_nsec_nodnssec) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, RCode::NXDomain, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); /* the NSEC and RRSIG contents are complete garbage, please ignore them */ @@ -346,7 +346,7 @@ BOOST_AUTO_TEST_CASE(test_nx_nsec_dnssec) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, RCode::NXDomain, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); /* the NSEC and RRSIG contents are complete garbage, please ignore them */ @@ -372,7 +372,7 @@ BOOST_AUTO_TEST_CASE(test_qclass_none) /* apart from special names and QClass::ANY, anything else than QClass::IN should be rejected right away */ size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { queriesCount++; return LWResult::Result::Timeout; }); @@ -394,7 +394,7 @@ BOOST_AUTO_TEST_CASE(test_answer_no_aa) const DNSName target("powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.1"); return LWResult::Result::Success; @@ -424,8 +424,8 @@ BOOST_AUTO_TEST_CASE(test_special_types) /* {A,I}XFR, RRSIG and NSEC3 should be rejected right away */ size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount](const ComboAddress& ip, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { - cerr << "asyncresolve called to ask " << ip.toStringWithPort() << " about " << domain.toString() << " / " << QType(type).toString() << " over " << (doTCP ? "TCP" : "UDP") << " (rd: " << sendRDQuery << ", EDNS0 level: " << EDNS0Level << ")" << endl; + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool doTCP, bool sendRDQuery, int EDNS0Level, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + cerr << "asyncresolve called to ask " << address.toStringWithPort() << " about " << domain.toString() << " / " << QType(type).toString() << " over " << (doTCP ? "TCP" : "UDP") << " (rd: " << sendRDQuery << ", EDNS0 level: " << EDNS0Level << ")" << endl; queriesCount++; return LWResult::Result::Timeout; }); @@ -464,7 +464,7 @@ BOOST_AUTO_TEST_CASE(test_special_names) size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { queriesCount++; return LWResult::Result::Timeout; }); @@ -587,14 +587,14 @@ BOOST_AUTO_TEST_CASE(test_nameserver_ipv4_rpz) const DNSName target("rpz.powerdns.com."); const ComboAddress ns("192.0.2.1:53"); - sr->setAsyncCallback([target, ns](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, false, true, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); @@ -628,14 +628,14 @@ BOOST_AUTO_TEST_CASE(test_nameserver_ipv6_rpz) const DNSName target("rpz.powerdns.com."); const ComboAddress ns("[2001:DB8::42]:53"); - sr->setAsyncCallback([target, ns](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); @@ -670,14 +670,14 @@ BOOST_AUTO_TEST_CASE(test_nameserver_name_rpz) const ComboAddress ns("192.0.2.1:53"); const DNSName nsName("ns1.powerdns.com."); - sr->setAsyncCallback([target, ns, nsName](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, nsName.toString(), DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, nsName, QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); @@ -712,14 +712,14 @@ BOOST_AUTO_TEST_CASE(test_nameserver_name_rpz_disabled) const ComboAddress ns("192.0.2.1:53"); const DNSName nsName("ns1.powerdns.com."); - sr->setAsyncCallback([target, ns, nsName](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (isRootServer(ip)) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, nsName.toString(), DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, nsName, QType::A, ns.toString(), DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ns) { + if (address == ns) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); @@ -767,9 +767,9 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_nord) size_t queriesCount = 0; - sr->setAsyncCallback([forwardedNS, &queriesCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { ++queriesCount; - if (ip == forwardedNS) { + if (address == forwardedNS) { BOOST_CHECK_EQUAL(sendRDQuery, false); setLWResult(res, 0, true, false, true); @@ -826,10 +826,10 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_rd) ad.d_servers.push_back(forwardedNS); (*SyncRes::t_sstorage.domainmap)[target] = ad; - sr->setAsyncCallback([forwardedNS, &queriesCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (ip == forwardedNS) { + if (address == forwardedNS) { BOOST_CHECK_EQUAL(sendRDQuery, true); /* set AA=0, we are a recursor */ @@ -877,9 +877,9 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_nord) size_t queriesCount = 0; - sr->setAsyncCallback([forwardedNS, &queriesCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { ++queriesCount; - if (ip == forwardedNS) { + if (address == forwardedNS) { BOOST_CHECK_EQUAL(sendRDQuery, true); setLWResult(res, 0, true, false, true); @@ -935,8 +935,8 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd) ad.d_servers.push_back(forwardedNS); (*SyncRes::t_sstorage.domainmap)[target] = ad; - sr->setAsyncCallback([forwardedNS](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { - if (ip == forwardedNS) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + if (address == forwardedNS) { BOOST_CHECK_EQUAL(sendRDQuery, true); setLWResult(res, 0, true, false, true); @@ -981,12 +981,12 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd_dnssec) ad.d_servers.push_back(forwardedNS); (*SyncRes::t_sstorage.domainmap)[g_rootdnsname] = ad; - sr->setAsyncCallback([target, cnameTarget, keys, forwardedNS, &queriesCount](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; BOOST_CHECK_EQUAL(sendRDQuery, true); - if (ip != forwardedNS) { + if (address != forwardedNS) { return LWResult::Result::Timeout; } @@ -1052,7 +1052,7 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_nord_dnssec) ad.d_servers.push_back(forwardedNS); (*SyncRes::t_sstorage.domainmap)[DNSName("test.")] = ad; - sr->setAsyncCallback([parent, target1, target2, keys, forwardedNS, &queriesCount, &DSforParentCount](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; BOOST_CHECK_EQUAL(sendRDQuery, false); @@ -1064,19 +1064,17 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_nord_dnssec) if (domain != parent && domain.isPartOf(parent)) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false /* no cut / delegation */); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, parent, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 42); addRRSIG(keys, res->d_records, g_rootdnsname, 300); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); } - if (ip != forwardedNS) { + if (address != forwardedNS) { return LWResult::Result::Timeout; } @@ -1156,12 +1154,12 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd_dnssec_bogus) ad.d_servers.push_back(forwardedNS); (*SyncRes::t_sstorage.domainmap)[g_rootdnsname] = ad; - sr->setAsyncCallback([target, cnameTarget, keys, forwardedNS, &queriesCount](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; BOOST_CHECK_EQUAL(sendRDQuery, true); - if (ip != forwardedNS) { + if (address != forwardedNS) { return LWResult::Result::Timeout; } @@ -1224,25 +1222,21 @@ BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd_dnssec_nodata_bogus) size_t queriesCount = 0; - sr->setAsyncCallback([target, forwardedNS, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool sendRDQuery, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; BOOST_CHECK_EQUAL(sendRDQuery, true); - if (ip != forwardedNS) { + if (address != forwardedNS) { return LWResult::Result::Timeout; } if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - - setLWResult(res, 0, false, false, true); - return LWResult::Result::Success; - } - return LWResult::Result::Timeout; + setLWResult(res, 0, false, false, true); + return LWResult::Result::Success; }); vector ret; @@ -1287,7 +1281,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_oob) (*SyncRes::t_sstorage.domainmap)[authZone] = ad; - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { queriesCount++; return LWResult::Result::Timeout; }); @@ -1355,7 +1349,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_oob_cname) (*SyncRes::t_sstorage.domainmap)[authZone] = ad; - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* /* res */, bool* /* chained */) { queriesCount++; return LWResult::Result::Timeout; }); @@ -1426,7 +1420,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone) (*map)[target] = ad; SyncRes::setDomainMap(map); - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); @@ -1475,7 +1469,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_cname_lead_to_oob) (*map)[authZone] = ad; SyncRes::setDomainMap(map); - sr->setAsyncCallback([&queriesCount, target, authZone](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target) { @@ -1531,7 +1525,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_oob_lead_to_outgoing_queryb) (*map)[target] = ad; SyncRes::setDomainMap(map); - sr->setAsyncCallback([&queriesCount, externalCNAME, addr](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == externalCNAME) { @@ -1587,7 +1581,7 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_ds) (*map)[target] = ad; SyncRes::setDomainMap(map); - sr->setAsyncCallback([&queriesCount](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type != QType::DS) { setLWResult(res, 0, true, false, true); diff --git a/pdns/recursordist/test-syncres_cc4.cc b/pdns/recursordist/test-syncres_cc4.cc index 520f59cd55..2f21dd32b0 100644 --- a/pdns/recursordist/test-syncres_cc4.cc +++ b/pdns/recursordist/test-syncres_cc4.cc @@ -146,13 +146,13 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_delegation) takes too long. */ const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([&queriesCount, target, targetAddr, nsAddr, authZone, keys, fixedNow](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, DNSName("."), type, keys, domain == DNSName("com.") || domain == authZone, fixedNow); } - if (ip == ComboAddress(nsAddr.toString(), 53) && domain == target) { + if (address == ComboAddress(nsAddr.toString(), 53) && domain == target) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); return LWResult::Result::Success; @@ -213,10 +213,10 @@ BOOST_AUTO_TEST_CASE(test_auth_zone_delegation_point) (*map)[authZone] = ad; SyncRes::setDomainMap(map); - sr->setAsyncCallback([&queriesCount, nsAddr, target, targetAddr](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (ip == ComboAddress(nsAddr.toString(), 53) && domain == target) { + if (address == ComboAddress(nsAddr.toString(), 53) && domain == target) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); return LWResult::Result::Success; @@ -483,7 +483,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_root_validation_csk) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -502,7 +502,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_root_validation_csk) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -568,7 +568,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_root_validation_ksk_zsk) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, zskeys, kskeys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -587,7 +587,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_root_validation_ksk_zsk) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -636,7 +636,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_dnskey) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -655,7 +655,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_dnskey) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -712,7 +712,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_without_zone_flag) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -730,7 +730,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_without_zone_flag) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -788,7 +788,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_revoked) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -806,7 +806,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_revoked) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -871,7 +871,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_doesnt_match_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -890,7 +890,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_doesnt_match_ds) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -982,7 +982,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_rrsig_signed_with_unknown_dnskey) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys, rrsigkeys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1001,7 +1001,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_rrsig_signed_with_unknown_dnskey) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1049,7 +1049,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_rrsig) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1068,7 +1068,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_rrsig) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1124,7 +1124,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_rrsig_noaa) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1144,7 +1144,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_rrsig_noaa) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1213,7 +1213,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_unknown_ds_algorithm) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1232,7 +1232,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_unknown_ds_algorithm) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1293,7 +1293,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_unknown_ds_digest) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1312,7 +1312,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_unknown_ds_digest) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1366,7 +1366,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_bad_sig) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys, fixedNow](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1385,7 +1385,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_bad_sig) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1434,7 +1434,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_bad_algo) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1454,7 +1454,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_bad_algo) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1505,7 +1505,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_unsigned_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -1523,7 +1523,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_unsigned_ds) return LWResult::Result::Success; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); /* Include the DS but omit the RRSIG*/ @@ -1532,7 +1532,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_unsigned_ds) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, RCode::NoError, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, auth, 300); @@ -1586,7 +1586,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_unsigned_ds_direct) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -1604,7 +1604,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_unsigned_ds_direct) return LWResult::Result::Success; } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); /* Include the DS but omit the RRSIG*/ diff --git a/pdns/recursordist/test-syncres_cc5.cc b/pdns/recursordist/test-syncres_cc5.cc index 32d600856d..7e97556b38 100644 --- a/pdns/recursordist/test-syncres_cc5.cc +++ b/pdns/recursordist/test-syncres_cc5.cc @@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_various_algos) const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys, fixedNow](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_various_algos) return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, true, fixedNow); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_various_algos) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_various_algos) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -132,7 +132,7 @@ static void testFixedPointInTime(time_t fixedNow) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys, fixedNow](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -144,7 +144,7 @@ static void testFixedPointInTime(time_t fixedNow) return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, true, fixedNow); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -153,7 +153,7 @@ static void testFixedPointInTime(time_t fixedNow) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -171,7 +171,7 @@ static void testFixedPointInTime(time_t fixedNow) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_a_then_ns) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -269,7 +269,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_a_then_ns) return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_a_then_ns) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -296,7 +296,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_a_then_ns) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -360,7 +360,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_a_then_ns) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -372,7 +372,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_a_then_ns) return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -381,7 +381,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_a_then_ns) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -400,7 +400,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_a_then_ns) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -466,7 +466,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_with_nta) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -478,7 +478,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_with_nta) return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -487,7 +487,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_with_nta) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -505,7 +505,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_with_nta) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -567,7 +567,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_with_nta) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -575,14 +575,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_with_nta) addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -595,7 +595,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_with_nta) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -651,14 +651,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -666,7 +666,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -683,7 +683,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -742,7 +742,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nxdomain_nsec) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -758,12 +758,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nxdomain_nsec) addRRSIG(keys, res->d_records, auth, 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -771,7 +769,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nxdomain_nsec) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -788,7 +786,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nxdomain_nsec) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); if (domain == DNSName("powerdns.com.")) { @@ -858,7 +856,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -870,12 +868,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard) addRRSIG(keys, res->d_records, DNSName("powerdns.com"), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -883,7 +879,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -900,7 +896,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { @@ -977,7 +973,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_proof_before_rrsig) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -989,12 +985,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_proof_before_rrsig) addRRSIG(keys, res->d_records, DNSName("powerdns.com"), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1002,7 +996,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_proof_before_rrsig) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -1019,7 +1013,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_proof_before_rrsig) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { @@ -1092,7 +1086,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_nodata_nowildcard) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1109,8 +1103,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_nodata_nowildcard) } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1118,7 +1112,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_nodata_nowildcard) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); /* no data */ addRecordToLW(res, DNSName("com."), QType::SOA, "com. com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); @@ -1172,7 +1166,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1196,8 +1190,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard) } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1205,7 +1199,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); /* no data */ addRecordToLW(res, DNSName("com."), QType::SOA, "com. com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); @@ -1263,7 +1257,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard_duplicated_n size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1287,8 +1281,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard_duplicated_n } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1296,7 +1290,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard_duplicated_n addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); /* no data */ addRecordToLW(res, DNSName("com."), QType::SOA, "com. com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); @@ -1358,7 +1352,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard_too_many_ite size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1382,8 +1376,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard_too_many_ite } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1391,7 +1385,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard_too_many_ite addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); /* no data */ addRecordToLW(res, DNSName("com."), QType::SOA, "com. com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); @@ -1451,7 +1445,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1468,12 +1462,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard) addRRSIG(keys, res->d_records, DNSName("powerdns.com"), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1481,7 +1473,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -1498,7 +1490,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { @@ -1573,7 +1565,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard_too_many_iterations) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1585,12 +1577,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard_too_many_iterations) addRRSIG(keys, res->d_records, DNSName("powerdns.com"), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1598,7 +1588,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard_too_many_iterations) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -1615,7 +1605,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard_too_many_iterations) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { @@ -1688,7 +1678,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_missing) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1700,12 +1690,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_missing) addRRSIG(keys, res->d_records, DNSName("powerdns.com"), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1713,7 +1701,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_missing) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -1730,7 +1718,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_missing) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { @@ -1792,7 +1780,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_expanded_onto_itself) g_luaconfs.setState(luaconfsCopy); - sr->setAsyncCallback([target, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (type == QType::DS || type == QType::DNSKEY) { if (domain == target) { const auto auth = DNSName("powerdns.com."); @@ -1808,7 +1796,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_expanded_onto_itself) } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { + { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300, false, boost::none, DNSName("*.powerdns.com")); @@ -1847,7 +1835,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_expanded_onto_itself_nodata g_luaconfs.setState(luaconfsCopy); - sr->setAsyncCallback([target, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (type == QType::DS || type == QType::DNSKEY) { if (domain == target) { const auto auth = DNSName("powerdns.com."); @@ -1863,7 +1851,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_expanded_onto_itself_nodata } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { + { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "powerdns.com. bar. 2017032800 1800 900 604800 86400", DNSResourceRecord::AUTHORITY, 86400); addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300); @@ -1901,7 +1889,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_like_expanded_from_wildcard g_luaconfs.setState(luaconfsCopy); - sr->setAsyncCallback([target, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (type == QType::DS || type == QType::DNSKEY) { if (domain == target) { const auto auth = DNSName("powerdns.com."); @@ -1913,7 +1901,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_like_expanded_from_wildcard addRRSIG(keys, res->d_records, DNSName("powerdns.com"), 300, false, boost::none, DNSName("*.powerdns.com")); return LWResult::Result::Success; } - else if (domain == DNSName("sub.powerdns.com.")) { + if (domain == DNSName("sub.powerdns.com.")) { const auto auth = DNSName("powerdns.com."); /* we don't want a cut there */ setLWResult(res, 0, true, false, true); @@ -1926,7 +1914,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_like_expanded_from_wildcard } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { + { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300, false, boost::none, DNSName("*.powerdns.com")); @@ -1966,7 +1954,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_incomplete_cache_zonecut_qm) size_t queriesCount = 0; - sr->setAsyncCallback([&queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth(domain); @@ -1981,7 +1969,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_incomplete_cache_zonecut_qm) return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain == com) { setLWResult(res, 0, false, false, true); addRecordToLW(res, com, QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 3600); @@ -2009,7 +1997,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_incomplete_cache_zonecut_qm) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == hero && type == QType::NS) { setLWResult(res, 0, false, false, true); addRecordToLW(res, hero, QType::NS, "dns1.p03.nsone.net.", DNSResourceRecord::AUTHORITY, 3600); @@ -2028,7 +2016,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_incomplete_cache_zonecut_qm) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { DNSName p01("p01.nsone.net."); DNSName p03("p03.nsone.net."); DNSName p01nsone("dns1.p01.nsone.net."); @@ -2105,7 +2093,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_servfail_ds) const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys, fixedNow](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -2122,7 +2110,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_servfail_ds) return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, true, fixedNow); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -2131,7 +2119,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_servfail_ds) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -2150,7 +2138,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_servfail_ds) return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -2216,7 +2204,7 @@ static void dnssec_secure_servfail_dnskey(DNSSECMode mode, vState /* expectedVal const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys, fixedNow](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -2233,7 +2221,7 @@ static void dnssec_secure_servfail_dnskey(DNSSECMode mode, vState /* expectedVal return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, true, fixedNow); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -2242,7 +2230,7 @@ static void dnssec_secure_servfail_dnskey(DNSSECMode mode, vState /* expectedVal return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -2260,7 +2248,7 @@ static void dnssec_secure_servfail_dnskey(DNSSECMode mode, vState /* expectedVal return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -2338,7 +2326,7 @@ static void dnssec_secure_servfail_dnskey_insecure(DNSSECMode mode, vState expec const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys, pdnskeys, fixedNow](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -2356,7 +2344,7 @@ static void dnssec_secure_servfail_dnskey_insecure(DNSSECMode mode, vState expec return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, true, fixedNow); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -2365,7 +2353,7 @@ static void dnssec_secure_servfail_dnskey_insecure(DNSSECMode mode, vState expec return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -2383,7 +2371,7 @@ static void dnssec_secure_servfail_dnskey_insecure(DNSSECMode mode, vState expec return LWResult::Result::Success; } - if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); diff --git a/pdns/recursordist/test-syncres_cc6.cc b/pdns/recursordist/test-syncres_cc6.cc index 2957532128..f2fd5c15f4 100644 --- a/pdns/recursordist/test-syncres_cc6.cc +++ b/pdns/recursordist/test-syncres_cc6.cc @@ -30,7 +30,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_no_ds_on_referral_secure) size_t queriesCount = 0; size_t dsQueriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, &dsQueriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -50,21 +50,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_no_ds_on_referral_secure) addRRSIG(keys, res->d_records, auth, 300); return LWResult::Result::Success; } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); /* No DS on referral, and no denial of the DS either */ return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_no_ds_on_referral_secure) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { @@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_sign_loop) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -167,14 +167,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_sign_loop) } return LWResult::Result::Success; } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_sign_loop) addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_sign_loop) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { setLWResult(res, RCode::Refused, false, false, true); @@ -268,15 +268,15 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_denial_loop) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DNSKEY || (type == QType::DS && domain != target)) { DNSName auth(domain); return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, true); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_denial_loop) addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "insecure.powerdns.", QType::NS, "ns1.insecure.powerdns.", DNSResourceRecord::AUTHORITY, 3600); /* no DS */ @@ -293,7 +293,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_denial_loop) addRecordToLW(res, "ns1.insecure.powerdns.", QType::A, "192.0.2.2", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::DS && domain == target) { /* in that case we return a NODATA signed by the DNSKEY of the child zone */ setLWResult(res, 0, true, false, true); @@ -344,7 +344,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_root) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -355,7 +355,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_ds_root) addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, DNSName("."), 300); @@ -405,7 +405,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_signed_child) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -417,7 +417,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_signed_child) addRRSIG(keys, res->d_records, auth, 300); return LWResult::Result::Success; } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); if (domain == DNSName("www.powerdns.com.")) { @@ -428,8 +428,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_signed_child) } return LWResult::Result::Success; } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -437,7 +437,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_signed_child) addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -454,7 +454,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_signed_child) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -513,7 +513,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -529,11 +529,9 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished) addRRSIG(keys, res->d_records, auth, 300, false); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true /* cut */); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true /* cut */); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == target) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "foo. bar. 2017032800 1800 900 604800 86400", DNSResourceRecord::AUTHORITY, 86400); @@ -544,12 +542,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished) addRRSIG(keys, res->d_records, domain, 300, false); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -557,7 +553,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished) addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); addRRSIG(keys, res->d_records, domain, 300); @@ -615,7 +611,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished_nsec3) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -631,11 +627,9 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished_nsec3) addRRSIG(keys, res->d_records, auth, 300, false); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true /* cut */, boost::none, true /* nsec3 */); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true /* cut */, boost::none, true /* nsec3 */); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == target) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "foo. bar. 2017032800 1800 900 604800 86400", DNSResourceRecord::AUTHORITY, 86400); @@ -646,12 +640,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished_nsec3) addRRSIG(keys, res->d_records, domain, 300, false); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true /* cut */, boost::none, true /* nsec3 */); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true /* cut */, boost::none, true /* nsec3 */); } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); @@ -659,7 +651,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_unpublished_nsec3) addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.42"); addRRSIG(keys, res->d_records, domain, 300); @@ -716,7 +708,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_no_ds_on_referral_insecure) size_t queriesCount = 0; size_t dsQueriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, &dsQueriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -736,21 +728,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_no_ds_on_referral_insecure) addRRSIG(keys, res->d_records, auth, 300); return LWResult::Result::Success; } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); /* No DS on referral, and no denial of the DS either */ return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -766,7 +758,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_no_ds_on_referral_insecure) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("powerdns.com.")) { @@ -826,14 +818,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_unsigned_nsec) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -841,7 +833,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_unsigned_nsec) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -857,7 +849,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_unsigned_nsec) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -914,14 +906,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_no_nsec) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -929,7 +921,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_no_nsec) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -945,7 +937,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_no_nsec) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -1002,7 +994,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1014,25 +1006,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1040,7 +1028,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1057,7 +1045,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -1114,7 +1102,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_optout) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1130,25 +1118,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_optout) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true, boost::none, true, true); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true, boost::none, true, true); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1156,7 +1140,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_optout) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1177,7 +1161,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_optout) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -1231,7 +1215,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_optout) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1247,25 +1231,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_optout) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true, boost::none, true, true); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true, boost::none, true, true); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, DNSName("com."), QType::SOA, "a.gtld-servers.com. hostmastercom. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, DNSName("com."), QType::SOA, "a.gtld-servers.com. hostmastercom. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1273,7 +1253,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nxd_optout) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1341,14 +1321,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_direct_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1407,14 +1387,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_direct_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1471,7 +1451,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1483,30 +1463,26 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut) addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300); return LWResult::Result::Success; } - else if (domain == DNSName("www.sub.powerdns.com.")) { + if (domain == DNSName("www.sub.powerdns.com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("sub.powerdns.com."), QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.") || domain == DNSName("powerdns.com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1514,7 +1490,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1530,7 +1506,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("www.sub.powerdns.com.")) { @@ -1596,7 +1572,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_without_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1608,15 +1584,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_without_ds) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1624,7 +1598,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_without_ds) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1641,7 +1615,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_without_ds) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300); @@ -1695,7 +1669,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_without_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1707,15 +1681,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_without_ds) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1723,7 +1695,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_without_ds) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1740,7 +1712,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_without_ds) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300, /* broken SIG */ true); @@ -1797,7 +1769,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_cname_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys, pdnskeys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1808,20 +1780,16 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_cname_ds) addRRSIG(pdnskeys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == DNSName("powerdns.com.") || domain == DNSName("sub.powerdns.com.")) { return genericDSAndDNSKEYHandler(res, domain, domain, type, pdnskeys); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1829,7 +1797,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_cname_ds) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1845,7 +1813,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_cname_ds) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("sub.powerdns.com."), QType::NS, "ns1.sub.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); addRRSIG(pdnskeys, res->d_records, DNSName("powerdns.com."), 300); @@ -1853,7 +1821,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_broken_cname_ds) addRecordToLW(res, "ns1.sub.powerdns.com.", QType::A, "192.0.2.3", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.3:53")) { + else if (address == ComboAddress("192.0.2.3:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(pdnskeys, res->d_records, DNSName("sub.powerdns.com."), 300); @@ -1906,7 +1874,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_cname_for_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1919,8 +1887,8 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_cname_for_ds) } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1928,7 +1896,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_cname_for_ds) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -1942,7 +1910,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_cname_for_ds) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("www.powerdns.com."), QType::A, "192.168.1.1", DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, DNSName("powerdns.com."), 300); diff --git a/pdns/recursordist/test-syncres_cc7.cc b/pdns/recursordist/test-syncres_cc7.cc index 1f787bc647..641d3f08f7 100644 --- a/pdns/recursordist/test-syncres_cc7.cc +++ b/pdns/recursordist/test-syncres_cc7.cc @@ -31,7 +31,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_ta_skipped_cut) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_ta_skipped_cut) } return LWResult::Result::Success; } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("sub.powerdns.com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); @@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_ta_skipped_cut) } } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); /* no DS */ @@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_ta_skipped_cut) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com."), QType::NS, "a.gtld-servers.com."); @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_ta_skipped_cut) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { if (domain == DNSName("www.sub.powerdns.com.")) { @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nodata) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -168,9 +168,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nodata) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } else if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.")) { @@ -179,14 +177,12 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nodata) addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -194,7 +190,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nodata) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -212,7 +208,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nodata) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); addRecordToLW(res, "ns1.powerdns.com.", QType::A, "192.0.2.2", DNSResourceRecord::ADDITIONAL, 3600); @@ -288,7 +284,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -300,25 +296,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.") || domain == DNSName("powerdns.com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -326,7 +318,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, false, false, true); if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); @@ -349,7 +341,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { @@ -418,7 +410,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname_glue) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName1, targetCName2, targetCName2Addr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -430,12 +422,10 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname_glue) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -443,7 +433,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname_glue) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, false, false, true); if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); @@ -466,7 +456,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname_glue) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { @@ -540,7 +530,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_secure_cname) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -552,25 +542,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_secure_cname) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.") || domain == DNSName("powerdns.com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -578,7 +564,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_secure_cname) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -600,7 +586,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_secure_cname) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -667,14 +653,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_secure_cname) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -682,7 +668,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_secure_cname) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -699,7 +685,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_secure_cname) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -763,14 +749,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_bogus_cname) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -778,7 +764,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_bogus_cname) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -795,7 +781,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_bogus_cname) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -859,14 +845,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_cname) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else { - if (isRootServer(ip)) { + { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -874,7 +860,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_cname) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -891,7 +877,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_cname) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -955,7 +941,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_insecure_cname) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -967,25 +953,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_insecure_cname) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.") || domain == DNSName("powerdns.com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -993,7 +975,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_insecure_cname) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::NS, "a.gtld-servers.com."); @@ -1015,7 +997,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_insecure_cname) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -1076,7 +1058,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DNSKEY) { @@ -1086,14 +1068,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta) addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else if (domain == DNSName("com.")) { + if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, ". yop. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addNSECRecordToLW(DNSName("com."), DNSName("com."), {QType::NS}, 600, res->d_records); @@ -1101,7 +1083,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (target == domain) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -1114,7 +1096,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta) } return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -1172,7 +1154,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta_norrsig) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DNSKEY) { @@ -1182,14 +1164,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta_norrsig) addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else if (domain == DNSName("com.")) { + if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, ". yop. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; } } else { - if (target.isPartOf(domain) && isRootServer(ip)) { + if (target.isPartOf(domain) && isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addNSECRecordToLW(DNSName("com."), DNSName("com."), {QType::NS}, 600, res->d_records); @@ -1197,7 +1179,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta_norrsig) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (target == domain) { setLWResult(res, 0, false, false, true); addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 3600); @@ -1210,7 +1192,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta_norrsig) } return LWResult::Result::Success; } - else if (domain == target && ip == ComboAddress("192.0.2.2:53")) { + if (domain == target && address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { addRecordToLW(res, domain, QType::NS, "ns1.powerdns.com."); @@ -1266,7 +1248,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_nta) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1285,7 +1267,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_nta) return LWResult::Result::Success; } - else if (domain == target && type == QType::DNSKEY) { + if (domain == target && type == QType::DNSKEY) { setLWResult(res, 0, true, false, true); @@ -1332,7 +1314,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_no_ta) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (domain == target && type == QType::NS) { @@ -1390,13 +1372,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_nodata) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::A) { + if (type == QType::A) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com"), QType::SOA, "whatever.com. blah.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); @@ -1405,7 +1387,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_nodata) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == target) { + if (domain == target) { setLWResult(res, 0, true, false, true); return LWResult::Result::Success; } @@ -1451,7 +1433,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_missing_soa_on_nodata) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1459,11 +1441,9 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_missing_soa_on_nodata) /* proves cut */ return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "ns1.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1480,7 +1460,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_missing_soa_on_nodata) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == target) { + if (domain == target) { setLWResult(res, 0, true, false, true); return LWResult::Result::Success; } @@ -1526,7 +1506,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_missing_soa_on_nxd) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -1534,11 +1514,9 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_missing_soa_on_nxd) /* proves cut */ return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, true); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "ns1.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1555,7 +1533,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_insecure_missing_soa_on_nxd) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == target) { + if (domain == target) { setLWResult(res, RCode::NXDomain, true, false, true); return LWResult::Result::Success; } @@ -1602,13 +1580,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_nxdomain) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::A) { + if (type == QType::A) { if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, DNSName("com"), QType::SOA, "whatever.com. blah.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); @@ -1617,7 +1595,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_bogus_nxdomain) addRRSIG(keys, res->d_records, DNSName("com."), 300); return LWResult::Result::Success; } - else if (domain == target) { + if (domain == target) { setLWResult(res, RCode::NXDomain, true, false, true); return LWResult::Result::Success; } @@ -1666,32 +1644,28 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { if (domain == DNSName("www.powerdns.com.") || domain == DNSName("www2.powerdns.com.")) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1699,7 +1673,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, false, false, true); if (domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); @@ -1722,7 +1696,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cut_with_cname_at_apex) return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53")) { + if (address == ComboAddress("192.0.2.2:53")) { setLWResult(res, 0, true, false, true); if (type == QType::NS) { @@ -1805,7 +1779,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_cname_inside_secure_zone) size_t queriesCount = 0; - sr->setAsyncCallback([target, targetCName, targetCNameAddr, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS) { @@ -1814,25 +1788,21 @@ BOOST_AUTO_TEST_CASE(test_dnssec_cname_inside_secure_zone) /* technically the zone is com., but we are going to chop off in genericDSAndDNSKEYHandler() */ return genericDSAndDNSKEYHandler(res, domain, DNSName("powerdns.com."), type, keys, false); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - else if (type == QType::DNSKEY) { + if (type == QType::DNSKEY) { if (domain == g_rootdnsname || domain == DNSName("com.")) { setLWResult(res, 0, true, false, true); addDNSKEY(keys, domain, 300, res->d_records); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else { - setLWResult(res, 0, true, false, true); - addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); - return LWResult::Result::Success; - } + setLWResult(res, 0, true, false, true); + addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); + return LWResult::Result::Success; } else { - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("com."), 300, res->d_records, keys); @@ -1840,7 +1810,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_cname_inside_secure_zone) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, true, false, true); if (domain == DNSName("com.")) { diff --git a/pdns/recursordist/test-syncres_cc8.cc b/pdns/recursordist/test-syncres_cc8.cc index 06c93cd444..7306fbaba2 100644 --- a/pdns/recursordist/test-syncres_cc8.cc +++ b/pdns/recursordist/test-syncres_cc8.cc @@ -1031,7 +1031,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_negcache_validity) size_t queriesCount = 0; const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([target, &queriesCount, keys, fixedNow](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -1040,7 +1040,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_negcache_validity) if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { + { setLWResult(res, RCode::NoError, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); addRRSIG(keys, res->d_records, domain, 300); @@ -1099,7 +1099,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_negcache_bogus_validity) size_t queriesCount = 0; const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([&queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -1108,7 +1108,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_negcache_bogus_validity) if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { + { setLWResult(res, RCode::NoError, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 86400); addRRSIG(keys, res->d_records, domain, 86400); @@ -1171,7 +1171,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_cache_validity) size_t queriesCount = 0; const time_t tnow = sr->getNow().tv_sec; - sr->setAsyncCallback([target, targetAddr, &queriesCount, keys, tnow](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -1180,7 +1180,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_cache_validity) if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { + { setLWResult(res, RCode::NoError, true, false, true); addRecordToLW(res, domain, QType::A, targetAddr.toString(), DNSResourceRecord::ANSWER, 3600); addRRSIG(keys, res->d_records, domain, 1, false, boost::none, boost::none, tnow); @@ -1239,13 +1239,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cache_secure) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.1"); @@ -1305,13 +1305,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cache_insecure) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.1"); @@ -1371,13 +1371,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cache_bogus) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.1", DNSResourceRecord::ANSWER, 86400); @@ -1459,20 +1459,20 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cache_secure_any) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.1"); addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (domain == target && type == QType::AAAA) { + if (domain == target && type == QType::AAAA) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::AAAA, "2001:db8::1"); addRRSIG(keys, res->d_records, DNSName("."), 300); diff --git a/pdns/recursordist/test-syncres_cc9.cc b/pdns/recursordist/test-syncres_cc9.cc index b7344d0f9c..d921dc39ee 100644 --- a/pdns/recursordist/test-syncres_cc9.cc +++ b/pdns/recursordist/test-syncres_cc9.cc @@ -33,13 +33,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cname_cache_secure) size_t queriesCount = 0; - sr->setAsyncCallback([target, cnameTarget, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::CNAME, cnameTarget.toString()); @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cname_cache_secure) addRRSIG(keys, res->d_records, DNSName("."), 300); return LWResult::Result::Success; } - else if (domain == cnameTarget && type == QType::A) { + if (domain == cnameTarget && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, cnameTarget, QType::A, "192.0.2.1"); addRRSIG(keys, res->d_records, DNSName("."), 300); @@ -108,20 +108,20 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cname_cache_insecure) size_t queriesCount = 0; - sr->setAsyncCallback([target, cnameTarget, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::CNAME, cnameTarget.toString()); addRecordToLW(res, cnameTarget, QType::A, "192.0.2.1"); return LWResult::Result::Success; } - else if (domain == cnameTarget && type == QType::A) { + if (domain == cnameTarget && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, cnameTarget, QType::A, "192.0.2.1"); return LWResult::Result::Success; @@ -181,13 +181,13 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cname_cache_bogus) size_t queriesCount = 0; - sr->setAsyncCallback([target, cnameTarget, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::CNAME, cnameTarget.toString(), DNSResourceRecord::ANSWER, 86400); @@ -195,7 +195,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cname_cache_bogus) /* no RRSIG */ return LWResult::Result::Success; } - else if (domain == cnameTarget && type == QType::A) { + if (domain == cnameTarget && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, cnameTarget, QType::A, "192.0.2.1", DNSResourceRecord::ANSWER, 86400); /* no RRSIG */ @@ -276,7 +276,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_additional_without_rrsig) size_t queriesCount = 0; - sr->setAsyncCallback([target, addTarget, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -288,7 +288,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_additional_without_rrsig) } return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false); } - else { + { if (domain == target && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.1"); @@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_additional_without_rrsig) /* no RRSIG for the additional record */ return LWResult::Result::Success; } - else if (domain == addTarget && type == QType::A) { + if (domain == addTarget && type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, addTarget, QType::A, "192.0.2.42"); addRRSIG(keys, res->d_records, DNSName("."), 300); @@ -360,7 +360,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_secure) size_t queriesCount = 0; const time_t fixedNow = sr->getNow().tv_sec; - sr->setAsyncCallback([target, &queriesCount, keys, fixedNow](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -369,7 +369,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_secure) if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { + { setLWResult(res, RCode::NoError, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); addRRSIG(keys, res->d_records, domain, 300); @@ -445,7 +445,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_secure_ds) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; if (type == QType::DS || type == QType::DNSKEY) { @@ -501,7 +501,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_insecure) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -510,7 +510,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_insecure) if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { + { setLWResult(res, RCode::NoError, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); return LWResult::Result::Success; @@ -578,7 +578,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_bogus) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; DNSName auth = domain; @@ -587,7 +587,7 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_bogus) if (type == QType::DS || type == QType::DNSKEY) { return genericDSAndDNSKEYHandler(res, domain, auth, type, keys); } - else { + { setLWResult(res, RCode::NoError, true, false, true); addRecordToLW(res, domain, QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 86400); addRRSIG(keys, res->d_records, domain, 86400); @@ -678,10 +678,10 @@ BOOST_AUTO_TEST_CASE(test_lowercase_outgoing) const DNSName target("WWW.POWERDNS.COM"); const DNSName cname("WWW.PowerDNS.org"); - sr->setAsyncCallback([target, cname, &sentOutQnames](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { sentOutQnames.push_back(domain); - if (isRootServer(ip)) { + if (isRootServer(address)) { if (domain == target) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -695,14 +695,14 @@ BOOST_AUTO_TEST_CASE(test_lowercase_outgoing) return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.1:53")) { + else if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, cname.toString()); return LWResult::Result::Success; } } - else if (ip == ComboAddress("192.0.2.2:53")) { + else if (address == ComboAddress("192.0.2.2:53")) { if (domain == cname) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "127.0.0.1"); @@ -752,7 +752,7 @@ BOOST_AUTO_TEST_CASE(test_getDSRecords_multialgo) auto rootkey = keys.find(g_rootdnsname); keys2.insert(*rootkey); - sr->setAsyncCallback([target, keys, keys2](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { DNSName auth = domain; auth.chopOff(); if (type == QType::DS || type == QType::DNSKEY) { @@ -802,7 +802,7 @@ BOOST_AUTO_TEST_CASE(test_getDSRecords_multialgo_all_sha) // But add the existing root key otherwise no RRSIG can be created keys3.insert(*rootkey); - sr->setAsyncCallback([target, keys, keys2, keys3](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { DNSName auth = domain; auth.chopOff(); if (type == QType::DS || type == QType::DNSKEY) { @@ -855,7 +855,7 @@ BOOST_AUTO_TEST_CASE(test_getDSRecords_multialgo_two_highest) // But add the existing root key otherwise no RRSIG can be created keys3.insert(*rootkey); - sr->setAsyncCallback([target, keys, keys2, keys3](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { DNSName auth = domain; auth.chopOff(); if (type == QType::DS || type == QType::DNSKEY) { @@ -892,16 +892,16 @@ BOOST_AUTO_TEST_CASE(test_cname_plus_authority_ns_ttl) const DNSName cnameTarget("cname-target.powerdns.com"); size_t queriesCount = 0; - sr->setAsyncCallback([target, cnameTarget, &queriesCount](const ComboAddress& ip, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, DNSName("powerdns.com"), QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 42); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53")) { + if (address == ComboAddress("192.0.2.1:53")) { if (domain == target) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::CNAME, cnameTarget.toString()); @@ -910,7 +910,7 @@ BOOST_AUTO_TEST_CASE(test_cname_plus_authority_ns_ttl) addRecordToLW(res, DNSName("a.gtld-servers.net."), QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (domain == cnameTarget) { + if (domain == cnameTarget) { setLWResult(res, 0, true, false, false); addRecordToLW(res, domain, QType::A, "192.0.2.2"); } @@ -971,17 +971,15 @@ BOOST_AUTO_TEST_CASE(test_bogus_does_not_replace_secure_in_the_cache) generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys); g_luaconfs.setState(luaconfsCopy); - sr->setAsyncCallback([keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { if (type == QType::DS || type == QType::DNSKEY) { if (domain == DNSName("cname.powerdns.com.")) { return genericDSAndDNSKEYHandler(res, domain, domain, type, keys, false /* no cut */); } - else { - return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); - } + return genericDSAndDNSKEYHandler(res, domain, domain, type, keys); } - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "a.gtld-servers.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("powerdns.com."), 300, res->d_records, keys); @@ -989,7 +987,7 @@ BOOST_AUTO_TEST_CASE(test_bogus_does_not_replace_secure_in_the_cache) addRecordToLW(res, "a.gtld-servers.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else { + { setLWResult(res, 0, true, false, true); if (domain == DNSName("powerdns.com.") && type == QType::A) { addRecordToLW(res, domain, QType::A, "192.0.2.1"); @@ -1043,7 +1041,7 @@ BOOST_AUTO_TEST_CASE(test_records_sanitization_general) const DNSName target("sanitization.powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.1"); /* should be scrubbed because it doesn't match the QType */ @@ -1089,7 +1087,7 @@ BOOST_AUTO_TEST_CASE(test_records_sanitization_keep_relevant_additional_aaaa) const DNSName target("sanitization.powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& domain, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::A, "192.0.2.1"); addRecordToLW(res, domain, QType::AAAA, "2001:db8::1", DNSResourceRecord::ADDITIONAL); @@ -1123,17 +1121,17 @@ BOOST_AUTO_TEST_CASE(test_records_sanitization_keep_glue) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount](const ComboAddress& ip, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (isRootServer(ip)) { + if (isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "com.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "a.gtld-servers.net.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); addRecordToLW(res, "a.gtld-servers.net.", QType::AAAA, "2001:DB8::1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.1:53") || ip == ComboAddress("[2001:DB8::1]:53")) { + if (address == ComboAddress("192.0.2.1:53") || address == ComboAddress("[2001:DB8::1]:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns1.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); addRecordToLW(res, "powerdns.com.", QType::NS, "pdns-public-ns2.powerdns.com.", DNSResourceRecord::AUTHORITY, 172800); @@ -1144,15 +1142,13 @@ BOOST_AUTO_TEST_CASE(test_records_sanitization_keep_glue) addRecordToLW(res, "pdns-public-ns2.powerdns.com.", QType::AAAA, "2001:DB8::3", DNSResourceRecord::ADDITIONAL, 172800); return LWResult::Result::Success; } - else if (ip == ComboAddress("192.0.2.2:53") || ip == ComboAddress("192.0.2.3:53") || ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("[2001:DB8::3]:53")) { + if (address == ComboAddress("192.0.2.2:53") || address == ComboAddress("192.0.2.3:53") || address == ComboAddress("[2001:DB8::2]:53") || address == ComboAddress("[2001:DB8::3]:53")) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.4"); addRecordToLW(res, "powerdns.com.", QType::DS, "2 8 2 BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBB", DNSResourceRecord::AUTHORITY); return LWResult::Result::Success; } - else { - return LWResult::Result::Timeout; - } + return LWResult::Result::Timeout; }); const time_t now = sr->getNow().tv_sec; @@ -1193,7 +1189,7 @@ BOOST_AUTO_TEST_CASE(test_records_sanitization_scrubs_ns_nxd) const DNSName target("sanitization-ns-nxd.powerdns.com."); - sr->setAsyncCallback([target](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& /* ip */, const DNSName& /* domain */, int /* type */, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { setLWResult(res, RCode::NXDomain, true, false, true); addRecordToLW(res, "powerdns.com.", QType::SOA, "pdns-public-ns1.powerdns.com. pieter\\.lexis.powerdns.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY); addRecordToLW(res, "powerdns.com.", QType::NS, "spoofed.ns.", DNSResourceRecord::AUTHORITY, 172800); @@ -1243,22 +1239,22 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_referral_on_ds_query_insecure) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (domain.isPartOf(DNSName("signed.ds-ignorant.com.")) && ip == ComboAddress("192.0.2.1:53")) { + if (domain.isPartOf(DNSName("signed.ds-ignorant.com.")) && address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "signed.ds-ignorant.com.", QType::NS, "ns.signed.ds-ignorant.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "ns.signed.ds-ignorant.com.", QType::A, "192.0.2.2", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (type == QType::DNSKEY || (type == QType::DS && domain != target)) { + if (type == QType::DNSKEY || (type == QType::DS && domain != target)) { DNSName auth(domain); auth.chopOff(); return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, false); } - else { - if (domain.isPartOf(DNSName("ds-ignorant.com.")) && isRootServer(ip)) { + { + if (domain.isPartOf(DNSName("ds-ignorant.com.")) && isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "ds-ignorant.com.", QType::NS, "ns.ds-ignorant.com.", DNSResourceRecord::AUTHORITY, 3600); /* no DS, insecure */ @@ -1267,14 +1263,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_referral_on_ds_query_insecure) addRecordToLW(res, "ns.ds-ignorant.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (domain == target) { + if (domain == target) { if (type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.200"); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else if (type == QType::DS) { + if (type == QType::DS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "signed.ds-ignorant.com. admin\\.signed.ds-ignorant.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); addRRSIG(keys, res->d_records, domain, 300); @@ -1332,22 +1328,22 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_referral_on_ds_query_secure) size_t queriesCount = 0; - sr->setAsyncCallback([target, &queriesCount, keys](const ComboAddress& ip, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { + sr->setAsyncCallback([&](const ComboAddress& address, const DNSName& domain, int type, bool /* doTCP */, bool /* sendRDQuery */, int /* EDNS0Level */, struct timeval* /* now */, boost::optional& /* srcmask */, const ResolveContext& /* context */, LWResult* res, bool* /* chained */) { queriesCount++; - if (domain.isPartOf(DNSName("signed.ds-ignorant.com.")) && ip == ComboAddress("192.0.2.1:53")) { + if (domain.isPartOf(DNSName("signed.ds-ignorant.com.")) && address == ComboAddress("192.0.2.1:53")) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "signed.ds-ignorant.com.", QType::NS, "ns.signed.ds-ignorant.com.", DNSResourceRecord::AUTHORITY, 3600); addRecordToLW(res, "ns.signed.ds-ignorant.com.", QType::A, "192.0.2.2", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (type == QType::DNSKEY || (type == QType::DS && domain != target)) { + if (type == QType::DNSKEY || (type == QType::DS && domain != target)) { DNSName auth(domain); auth.chopOff(); return genericDSAndDNSKEYHandler(res, domain, auth, type, keys, false); } else { - if (domain.isPartOf(DNSName("ds-ignorant.com.")) && isRootServer(ip)) { + if (domain.isPartOf(DNSName("ds-ignorant.com.")) && isRootServer(address)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "ds-ignorant.com.", QType::NS, "ns.ds-ignorant.com.", DNSResourceRecord::AUTHORITY, 3600); addDS(DNSName("ds-ignorant.com."), 300, res->d_records, keys); @@ -1355,14 +1351,14 @@ BOOST_AUTO_TEST_CASE(test_dnssec_validation_referral_on_ds_query_secure) addRecordToLW(res, "ns.ds-ignorant.com.", QType::A, "192.0.2.1", DNSResourceRecord::ADDITIONAL, 3600); return LWResult::Result::Success; } - else if (domain == target) { + if (domain == target) { if (type == QType::A) { setLWResult(res, 0, true, false, true); addRecordToLW(res, target, QType::A, "192.0.2.200"); addRRSIG(keys, res->d_records, domain, 300); return LWResult::Result::Success; } - else if (type == QType::DS) { + if (type == QType::DS) { setLWResult(res, 0, true, false, true); addRecordToLW(res, domain, QType::SOA, "signed.ds-ignorant.com. admin\\.signed.ds-ignorant.com. 2017032301 10800 3600 604800 3600", DNSResourceRecord::AUTHORITY, 3600); addRRSIG(keys, res->d_records, domain, 300);