fix fuzz_target_dnsdistcache build

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index fa995c5c114522ada737ad7b1de4237e48173d5b..204a12ca857f6517eacf8f51b84b18c10ef51b08 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1580,7 +1580,7 @@ fuzz_target_dnsdistcache_SOURCES = \
        dnsdist-cache.cc dnsdist-cache.hh \
        dnsdist-ecs.cc dnsdist-ecs.hh \
        dnsdist-idstate.hh \
-       dnsdist-protocols.hh \
+       dnsdist-protocols.cc dnsdist-protocols.hh \
        dnslabeltext.cc \
        dnsname.cc dnsname.hh \
        dnsparser.cc dnsparser.hh \

diff --git a/pdns/dnsdist-protocols.cc b/pdns/dnsdist-protocols.cc
new file mode 100644 (file)
index 0000000..e9c66ed
--- /dev/null
+++ b/pdns/dnsdist-protocols.cc
@@ -0,0 +1,83 @@
+/*
+ * This file is part of PowerDNS or dnsdist.
+ * Copyright -- PowerDNS.COM B.V. and its contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * In addition, for the avoidance of any doubt, permission is granted to
+ * link this program with OpenSSL and to (re)distribute the binaries
+ * produced as the result of such linking.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <algorithm>
+
+#include "dnsdist-protocols.hh"
+
+namespace dnsdist
+{
+static const std::vector<std::string> names = {
+  "DoUDP",
+  "DoTCP",
+  "DNSCryptUDP",
+  "DNSCryptTCP",
+  "DoT",
+  "DoH"};
+
+static const std::vector<std::string> prettyNames = {
+  "Do53 UDP",
+  "Do53 TCP",
+  "DNSCrypt UDP",
+  "DNSCrypt TCP",
+  "DNS over TLS",
+  "DNS over HTTPS"};
+
+Protocol::Protocol(uint8_t protocol) :
+  d_protocol(protocol)
+{
+}
+Protocol& Protocol::operator=(const char* s)
+{
+  std::string str(s);
+  d_protocol = Protocol::fromString(str);
+
+  return *this;
+}
+Protocol& Protocol::operator=(const std::string& s)
+{
+  d_protocol = Protocol::fromString(s);
+
+  return *this;
+}
+Protocol::operator uint8_t() const
+{
+  return d_protocol;
+}
+const std::string& Protocol::toString() const
+{
+  return names.at(static_cast<int>(d_protocol));
+}
+const std::string& Protocol::toPrettyString() const
+{
+  return prettyNames.at(static_cast<int>(d_protocol));
+}
+uint8_t Protocol::fromString(const std::string& s)
+{
+  const auto& it = std::find(names.begin(), names.end(), s);
+  if (it != names.end()) {
+    return std::distance(names.begin(), it);
+  }
+
+  return 0;
+}
+}

diff --git a/pdns/dnsdistdist/dnsdist-protocols.cc b/pdns/dnsdistdist/dnsdist-protocols.cc
deleted file mode 100644 (file)
index e9c66ed4f234f7cd806db863aa7408abc2de3bc0..0000000000000000000000000000000000000000
--- a/pdns/dnsdistdist/dnsdist-protocols.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of PowerDNS or dnsdist.
- * Copyright -- PowerDNS.COM B.V. and its contributors
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * In addition, for the avoidance of any doubt, permission is granted to
- * link this program with OpenSSL and to (re)distribute the binaries
- * produced as the result of such linking.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <algorithm>
-
-#include "dnsdist-protocols.hh"
-
-namespace dnsdist
-{
-static const std::vector<std::string> names = {
-  "DoUDP",
-  "DoTCP",
-  "DNSCryptUDP",
-  "DNSCryptTCP",
-  "DoT",
-  "DoH"};
-
-static const std::vector<std::string> prettyNames = {
-  "Do53 UDP",
-  "Do53 TCP",
-  "DNSCrypt UDP",
-  "DNSCrypt TCP",
-  "DNS over TLS",
-  "DNS over HTTPS"};
-
-Protocol::Protocol(uint8_t protocol) :
-  d_protocol(protocol)
-{
-}
-Protocol& Protocol::operator=(const char* s)
-{
-  std::string str(s);
-  d_protocol = Protocol::fromString(str);
-
-  return *this;
-}
-Protocol& Protocol::operator=(const std::string& s)
-{
-  d_protocol = Protocol::fromString(s);
-
-  return *this;
-}
-Protocol::operator uint8_t() const
-{
-  return d_protocol;
-}
-const std::string& Protocol::toString() const
-{
-  return names.at(static_cast<int>(d_protocol));
-}
-const std::string& Protocol::toPrettyString() const
-{
-  return prettyNames.at(static_cast<int>(d_protocol));
-}
-uint8_t Protocol::fromString(const std::string& s)
-{
-  const auto& it = std::find(names.begin(), names.end(), s);
-  if (it != names.end()) {
-    return std::distance(names.begin(), it);
-  }
-
-  return 0;
-}
-}

diff --git a/pdns/dnsdistdist/dnsdist-protocols.cc b/pdns/dnsdistdist/dnsdist-protocols.cc
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..eb08cd3869eb9207e8ba4208c8288da8875f4030
--- /dev/null
+++ b/pdns/dnsdistdist/dnsdist-protocols.cc
@@ -0,0 +1 @@
+../dnsdist-protocols.cc
\ No newline at end of file