From: Otto Moerbeek Date: Fri, 23 Oct 2020 07:48:02 +0000 (+0200) Subject: Reformat X-Git-Tag: auth-4.4.0-alpha2~21^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75e04a03d9be8f3c99b9967dd2d4786ae18c25da;p=thirdparty%2Fpdns.git Reformat --- diff --git a/pdns/recursordist/test-syncres_cc1.cc b/pdns/recursordist/test-syncres_cc1.cc index 6c298bf8cf..e9523f0278 100644 --- a/pdns/recursordist/test-syncres_cc1.cc +++ b/pdns/recursordist/test-syncres_cc1.cc @@ -414,7 +414,8 @@ BOOST_AUTO_TEST_CASE(test_all_nss_network_error) } } -BOOST_AUTO_TEST_CASE(test_all_nss_send_tc_then_garbage_over_tcp) { +BOOST_AUTO_TEST_CASE(test_all_nss_send_tc_then_garbage_over_tcp) +{ std::unique_ptr sr; initSR(sr); @@ -423,7 +424,6 @@ 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, boost::optional context, LWResult* res, bool* chained) { - if (isRootServer(ip)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "lock-up.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -459,7 +459,8 @@ BOOST_AUTO_TEST_CASE(test_all_nss_send_tc_then_garbage_over_tcp) { } } -BOOST_AUTO_TEST_CASE(test_all_nss_send_garbage_over_udp) { +BOOST_AUTO_TEST_CASE(test_all_nss_send_garbage_over_udp) +{ std::unique_ptr sr; initSR(sr); @@ -469,7 +470,6 @@ BOOST_AUTO_TEST_CASE(test_all_nss_send_garbage_over_udp) { 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, boost::optional context, LWResult* res, bool* chained) { - if (isRootServer(ip)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "lock-up.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -503,7 +503,8 @@ BOOST_AUTO_TEST_CASE(test_all_nss_send_garbage_over_udp) { } } -BOOST_AUTO_TEST_CASE(test_regular_ns_send_refused) { +BOOST_AUTO_TEST_CASE(test_regular_ns_send_refused) +{ std::unique_ptr sr; initSR(sr); @@ -513,7 +514,6 @@ BOOST_AUTO_TEST_CASE(test_regular_ns_send_refused) { 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, boost::optional context, LWResult* res, bool* chained) { - if (isRootServer(ip)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "refused.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -547,7 +547,8 @@ BOOST_AUTO_TEST_CASE(test_regular_ns_send_refused) { } } -BOOST_AUTO_TEST_CASE(test_forward_ns_send_refused) { +BOOST_AUTO_TEST_CASE(test_forward_ns_send_refused) +{ std::unique_ptr sr; initSR(sr); @@ -559,13 +560,12 @@ BOOST_AUTO_TEST_CASE(test_forward_ns_send_refused) { const DNSName target("www.refused."); SyncRes::AuthDomain ad; - const std::vector forwardedNSs { ComboAddress("192.0.2.42:53"), ComboAddress("192.0.2.43:53") }; + const std::vector forwardedNSs{ComboAddress("192.0.2.42:53"), ComboAddress("192.0.2.43:53")}; ad.d_rdForward = false; 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, boost::optional context, LWResult* res, bool* chained) { - if (isRootServer(ip)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "refused.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800); @@ -598,7 +598,8 @@ BOOST_AUTO_TEST_CASE(test_forward_ns_send_refused) { } } -BOOST_AUTO_TEST_CASE(test_forward_ns_send_servfail) { +BOOST_AUTO_TEST_CASE(test_forward_ns_send_servfail) +{ std::unique_ptr sr; initSR(sr); @@ -610,13 +611,12 @@ BOOST_AUTO_TEST_CASE(test_forward_ns_send_servfail) { const DNSName target("www.refused."); SyncRes::AuthDomain ad; - const std::vector forwardedNSs { ComboAddress("192.0.2.42:53"), ComboAddress("192.0.2.43:53") }; + const std::vector forwardedNSs{ComboAddress("192.0.2.42:53"), ComboAddress("192.0.2.43:53")}; ad.d_rdForward = false; 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, boost::optional context, LWResult* res, bool* chained) { - if (isRootServer(ip)) { setLWResult(res, 0, false, false, true); addRecordToLW(res, "refused.", QType::NS, "a.gtld-servers.net.", DNSResourceRecord::AUTHORITY, 172800);