From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 7 Jul 2022 10:50:40 +0000 (+0200)
Subject: dnsdist: Use static arrays for the protocols, as suggested by Otto
X-Git-Tag: rec-4.9.0-alpha0~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb0e631257a1fc230ce73846680fdbf01d0f0b7c;p=thirdparty%2Fpdns.git

dnsdist: Use static arrays for the protocols, as suggested by Otto
---

diff --git a/pdns/dnsdist-protocols.cc b/pdns/dnsdist-protocols.cc
index e6c47a6441..4fc02eeb63 100644
--- a/pdns/dnsdist-protocols.cc
+++ b/pdns/dnsdist-protocols.cc
@@ -27,7 +27,7 @@
 
 namespace dnsdist
 {
-const std::vector<std::string> Protocol::s_names = {
+const std::array<std::string, Protocol::s_numberOfProtocols> Protocol::s_names = {
   "DoUDP",
   "DoTCP",
   "DNSCryptUDP",
@@ -35,7 +35,7 @@ const std::vector<std::string> Protocol::s_names = {
   "DoT",
   "DoH"};
 
-static const std::vector<std::string> prettyNames = {
+const std::array<std::string, Protocol::s_numberOfProtocols> Protocol::s_prettyNames = {
   "Do53 UDP",
   "Do53 TCP",
   "DNSCrypt UDP",
@@ -71,7 +71,7 @@ const std::string& Protocol::toString() const
 
 const std::string& Protocol::toPrettyString() const
 {
-  return prettyNames.at(static_cast<uint8_t>(d_protocol));
+  return s_prettyNames.at(static_cast<uint8_t>(d_protocol));
 }
 
 }
diff --git a/pdns/dnsdist-protocols.hh b/pdns/dnsdist-protocols.hh
index 981a8860d4..fbd51683b8 100644
--- a/pdns/dnsdist-protocols.hh
+++ b/pdns/dnsdist-protocols.hh
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include <vector>
+#include <array>
 #include <string>
 
 namespace dnsdist
@@ -58,6 +58,8 @@ public:
 private:
   typeenum d_protocol;
 
-  static const std::vector<std::string> s_names;
+  static constexpr size_t s_numberOfProtocols = 6;
+  static const std::array<std::string, s_numberOfProtocols> s_names;
+  static const std::array<std::string, s_numberOfProtocols> s_prettyNames;
 };
 }