dnsdist: Fix clang-tidy warnings

diff --git a/pdns/dnsdistdist/dnsdist-backend.cc b/pdns/dnsdistdist/dnsdist-backend.cc
index 607c709c358aab69a83d640a4638c02726e89021..7fdd7faa21b8e1107ee5c74bd92ea087d7a969ef 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-backend.cc
+++ b/pdns/dnsdistdist/dnsdist-backend.cc
@@ -727,7 +727,7 @@ bool DownstreamState::healthCheckRequired(std::optional<time_t> currentTime)
 
     return false;
   }
-  else if (d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active) {
+  if (d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active) {
 
     if (d_nextCheck > 1) {
       --d_nextCheck;
@@ -985,7 +985,7 @@ bool DownstreamState::parseSourceParameter(const std::string& source, Downstream
   return false;
 }
 
-bool DownstreamState::parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string str)
+bool DownstreamState::parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string& str)
 {
   if (pdns_iequals(str, "auto")) {
     config.d_availability = DownstreamState::Availability::Auto;

diff --git a/pdns/dnsdistdist/dnsdist.hh b/pdns/dnsdistdist/dnsdist.hh
index 3c3c135659a2b567a03c7326ed50a3644ffa4d55..7a9f5f2e8471cd18e22fc4e38c31794cd88569aa 100644 (file)
--- a/pdns/dnsdistdist/dnsdist.hh
+++ b/pdns/dnsdistdist/dnsdist.hh
@@ -731,7 +731,7 @@ private:
 
 public:
   static bool parseSourceParameter(const std::string& source, Config& config);
-  static bool parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string str);
+  static bool parseAvailabilityConfigFromStr(DownstreamState::Config& config, const std::string& str);
 
   void updateStatisticsInfo()
   {

diff --git a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
index 3b93b9cf7a88670b981ef67550fb579e26661231..3948bc58921d127ace4a29552d61fe0f5b9f718b 100644 (file)
--- a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
+++ b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc
@@ -305,22 +305,22 @@ BOOST_AUTO_TEST_CASE(test_CheckAutoRestorePreviousHealthCheckMode)
   /* prevents a re-connection */
   config.remote = ComboAddress("0.0.0.0");
 
-  DownstreamState ds(std::move(config), nullptr, false);
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
-  ds.setUp();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Up);
-  ds.setAuto();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
-  ds.setActiveAuto();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
-  ds.setUp();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Up);
-  ds.setAuto();
-  BOOST_CHECK(ds.d_config.d_availability == DownstreamState::Availability::Auto);
-  BOOST_CHECK(ds.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
+  DownstreamState downstream(std::move(config), nullptr, false);
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
+  downstream.setUp();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Up);
+  downstream.setAuto();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Lazy);
+  downstream.setActiveAuto();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
+  downstream.setUp();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Up);
+  downstream.setAuto();
+  BOOST_CHECK(downstream.d_config.d_availability == DownstreamState::Availability::Auto);
+  BOOST_CHECK(downstream.d_config.d_healthCheckMode == DownstreamState::HealthCheckMode::Active);
 }
 
 BOOST_AUTO_TEST_SUITE_END()