dnsdist: Uglify the code to make the formatter happy

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 6ecdea0ec5287d7c8b71a7775a1ce9979f8501dd..e609699261d4d74cc8dc189afaebcfefc7e160bf 100644 (file)
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -576,15 +576,15 @@ static void setupLuaConfig(LuaContext& luaCtx, bool client, bool configCheck)
                            tlsCtx = getTLSContext(tlsParams);
 
                            if (vars.count("dohPath")) {
-#ifdef HAVE_NGHTTP2
+#ifndef HAVE_NGHTTP2
+                             throw std::runtime_error("Outgoing DNS over HTTPS support requested (via 'dohPath' on newServer()) but nghttp2 support is not available");
+#endif
+
                              config.d_dohPath = boost::get<string>(vars.at("dohPath"));
 
                              if (vars.count("addXForwardedHeaders")) {
                                config.d_addXForwardedHeaders = boost::get<bool>(vars.at("addXForwardedHeaders"));
                              }
-#else /* HAVE_NGHTTP2 */
-                             throw std::runtime_error("Outgoing DNS over HTTPS support requested (via 'dohPath' on newServer()) but nghttp2 support is not available");
-#endif /* HAVE_NGHTTP2 */
                            }
                          }
 

diff --git a/pdns/dnsdistdist/dnsdist-discovery.cc b/pdns/dnsdistdist/dnsdist-discovery.cc
index d1e06184ab503f40577b30caf08d46577926805a..bcc97200889dc78c92395c7eff84ef9092293d2c 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-discovery.cc
+++ b/pdns/dnsdistdist/dnsdist-discovery.cc
@@ -28,7 +28,8 @@
 #include "dolog.hh"
 #include "sstuff.hh"
 
-namespace dnsdist {
+namespace dnsdist
+{
 
 const DNSName ServiceDiscovery::s_discoveryDomain{"_dns.resolver.arpa."};
 const QType ServiceDiscovery::s_discoveryType{QType::SVCB};
@@ -67,12 +68,12 @@ static bool parseSVCParams(const PacketBuffer& answer, std::map<uint16_t, Design
 
   size_t idx = 0;
   /* consume qd */
-  for(; idx < qdcount; idx++) {
+  for (; idx < qdcount; idx++) {
     rrname = pr.getName();
     rrtype = pr.get16BitInt();
     rrclass = pr.get16BitInt();
-    (void) rrtype;
-    (void) rrclass;
+    (void)rrtype;
+    (void)rrclass;
   }
 
   /* parse AN */
@@ -91,7 +92,7 @@ static bool parseSVCParams(const PacketBuffer& answer, std::map<uint16_t, Design
         pr.xfrSvcParamKeyVals(params);
       }
 
-      resolvers[prio] = { std::move(target), std::move(params), {} };
+      resolvers[prio] = {std::move(target), std::move(params), {}};
     }
     else {
       pr.xfrBlob(blob);
@@ -192,7 +193,7 @@ static bool handleSVCResult(const PacketBuffer& answer, const ComboAddress& exis
       }
     }
 
-    if (tempConfig.d_protocol == dnsdist::Protocol::DoH){
+    if (tempConfig.d_protocol == dnsdist::Protocol::DoH) {
 #ifndef HAVE_DNS_OVER_HTTPS
       continue;
 #endif
@@ -246,7 +247,7 @@ bool ServiceDiscovery::getDiscoveredConfig(const UpgradeableBackend& upgradeable
     pw.addOpt(4096, 0, 0);
 
     uint16_t querySize = static_cast<uint16_t>(packet.size());
-    const uint8_t sizeBytes[] = { static_cast<uint8_t>(querySize / 256), static_cast<uint8_t>(querySize % 256) };
+    const uint8_t sizeBytes[] = {static_cast<uint8_t>(querySize / 256), static_cast<uint8_t>(querySize % 256)};
     packet.insert(packet.begin(), sizeBytes, sizeBytes + 2);
 
     Socket sock(addr.sin4.sin_family, SOCK_STREAM);
@@ -281,7 +282,7 @@ bool ServiceDiscovery::getDiscoveredConfig(const UpgradeableBackend& upgradeable
 
     packet.resize(ntohs(responseSize));
 
-    got = sock.readWithTimeout(reinterpret_cast<char *>(packet.data()), packet.size(), backend->d_config.tcpRecvTimeout);
+    got = sock.readWithTimeout(reinterpret_cast<char*>(packet.data()), packet.size(), backend->d_config.tcpRecvTimeout);
     if (got < 0 || static_cast<size_t>(got) != packet.size()) {
       if (g_verbose) {
         warnlog("Error while waiting for the ADD upgrade response from backend %s: %d", addr.toString(), got);
@@ -445,7 +446,7 @@ void ServiceDiscovery::worker()
     auto upgradeables = *(s_upgradeableBackends.lock());
     std::set<std::shared_ptr<DownstreamState>> upgradedBackends;
 
-    for (auto backendIt = upgradeables.begin(); backendIt != upgradeables.end(); ) {
+    for (auto backendIt = upgradeables.begin(); backendIt != upgradeables.end();) {
       try {
         auto& backend = *backendIt;
         if (backend.d_nextCheck > now) {
@@ -471,10 +472,9 @@ void ServiceDiscovery::worker()
       }
     }
 
-
     {
       auto backends = s_upgradeableBackends.lock();
-      for (auto it = backends->begin(); it != backends->end(); ) {
+      for (auto it = backends->begin(); it != backends->end();) {
         if (upgradedBackends.count(it->d_ds) != 0) {
           it = backends->erase(it);
         }

diff --git a/pdns/dnsdistdist/dnsdist-discovery.hh b/pdns/dnsdistdist/dnsdist-discovery.hh
index a2591c37f8292815efd033dc3a99984b023d7d4f..d96777b89e635ec1da5c58c9462b416318ce1af2 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-discovery.hh
+++ b/pdns/dnsdistdist/dnsdist-discovery.hh
@@ -30,12 +30,12 @@
 
 struct DownstreamState;
 
-namespace dnsdist {
+namespace dnsdist
+{
 
 class ServiceDiscovery
 {
 public:
-
   static bool addUpgradeableServer(std::shared_ptr<DownstreamState>& server, uint32_t interval, std::string poolAfterUpgrade, uint16_t dohSVCKey, bool keepAfterUpgrade);
 
   /* starts a background thread if needed */

diff --git a/pdns/dnsdistdist/dnsdist-nghttp2.cc b/pdns/dnsdistdist/dnsdist-nghttp2.cc
index 8e2b9d95af9106fe6a24d58772b8416735cb5725..42ad2bc656fe503382ac1735233789d55bbf3a2f 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-nghttp2.cc
+++ b/pdns/dnsdistdist/dnsdist-nghttp2.cc
@@ -191,7 +191,7 @@ bool DoHConnectionToBackend::reachedMaxStreamID() const
 
 bool DoHConnectionToBackend::reachedMaxConcurrentQueries() const
 {
-  //cerr<<"Got "<<getConcurrentStreamsCount()<<" concurrent streams, max is "<<nghttp2_session_get_remote_settings(d_session.get(), NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS)<<endl;
+  // cerr<<"Got "<<getConcurrentStreamsCount()<<" concurrent streams, max is "<<nghttp2_session_get_remote_settings(d_session.get(), NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS)<<endl;
   if (nghttp2_session_get_remote_settings(d_session.get(), NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS) <= getConcurrentStreamsCount()) {
     return true;
   }
@@ -726,9 +726,9 @@ int DoHConnectionToBackend::on_stream_close_callback(nghttp2_session* session, i
     conn->handleResponseError(std::move(request), now);
   }
 
-  //cerr<<"we now have "<<conn->getConcurrentStreamsCount()<<" concurrent connections"<<endl;
+  // cerr<<"we now have "<<conn->getConcurrentStreamsCount()<<" concurrent connections"<<endl;
   if (conn->isIdle()) {
-    //cerr<<"stopping IO"<<endl;
+    // cerr<<"stopping IO"<<endl;
     conn->stopIO();
     conn->watchForRemoteHostClosingConnection();
   }
@@ -742,9 +742,9 @@ int DoHConnectionToBackend::on_header_callback(nghttp2_session* session, const n
 
   const std::string status(":status");
   if (frame->hd.type == NGHTTP2_HEADERS && frame->headers.cat == NGHTTP2_HCAT_RESPONSE) {
-    //cerr<<"got header for "<<frame->hd.stream_id<<":"<<endl;
-    //cerr<<"- "<<std::string(reinterpret_cast<const char*>(name), namelen)<<endl;
-    //cerr<<"- "<<std::string(reinterpret_cast<const char*>(value), valuelen)<<endl;
+    // cerr<<"got header for "<<frame->hd.stream_id<<":"<<endl;
+    // cerr<<"- "<<std::string(reinterpret_cast<const char*>(name), namelen)<<endl;
+    // cerr<<"- "<<std::string(reinterpret_cast<const char*>(value), valuelen)<<endl;
     if (namelen == status.size() && memcmp(status.data(), name, status.size()) == 0) {
       auto stream = conn->d_currentStreams.find(frame->hd.stream_id);
       if (stream == conn->d_currentStreams.end()) {