From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 10 Jan 2025 10:11:56 +0000 (+0100)
Subject: dnsdist: fix doh3-less compile
X-Git-Tag: dnsdist-2.0.0-alpha1~180^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15028%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: fix doh3-less compile
---

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index cf53f3335b..91a4e3d35a 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -221,7 +221,7 @@ dnsdist_SOURCES = \
 	dnstap.cc dnstap.hh \
 	dnswriter.cc dnswriter.hh \
 	doh.hh \
-	doh3.hh \
+	doh3.cc doh3.hh \
 	dolog.cc dolog.hh \
 	doq-common.hh \
 	doq.hh \
@@ -321,6 +321,7 @@ testrunner_SOURCES = \
 	dnsname.cc dnsname.hh \
 	dnsparser.hh dnsparser.cc \
 	dnswriter.cc dnswriter.hh \
+	doh3.cc doh3.hh \
 	dolog.cc dolog.hh \
 	ednscookies.cc ednscookies.hh \
 	ednsextendederror.cc ednsextendederror.hh \
@@ -479,11 +480,6 @@ if HAVE_DNS_OVER_QUIC
 dnsdist_SOURCES += doq.cc
 endif
 
-if HAVE_DNS_OVER_HTTP3
-dnsdist_SOURCES += doh3.cc
-testrunner_SOURCES += doh3.cc
-endif
-
 if HAVE_QUICHE
 AM_CPPFLAGS += $(QUICHE_CFLAGS)
 dnsdist_LDADD += $(QUICHE_LDFLAGS) $(QUICHE_LIBS)
diff --git a/pdns/dnsdistdist/doh3.hh b/pdns/dnsdistdist/doh3.hh
index 0288ad1445..91d097c09c 100644
--- a/pdns/dnsdistdist/doh3.hh
+++ b/pdns/dnsdistdist/doh3.hh
@@ -23,8 +23,11 @@
 
 #include <memory>
 #include <string>
+#include <unordered_map>
 
 #include "config.h"
+
+#ifdef HAVE_DNS_OVER_HTTP3
 #include "channel.hh"
 #include "iputils.hh"
 #include "libssl.hh"
@@ -34,6 +37,7 @@
 
 struct DOH3ServerConfig;
 struct DownstreamState;
+#endif
 
 namespace dnsdist::doh3
 {
@@ -117,18 +121,16 @@ void doh3Thread(ClientState* clientState);
 
 struct DOH3Unit
 {
-  std::string getHTTPPath() const;
-  std::string getHTTPQueryString() const;
-  const std::string& getHTTPHost() const;
-  const std::string& getHTTPScheme() const;
-  const dnsdist::doh3::h3_headers_t& getHTTPHeaders() const;
+  [[nodiscard]] std::string getHTTPPath() const;
+  [[nodiscard]] std::string getHTTPQueryString() const;
+  [[nodiscard]] std::string getHTTPHost() const;
+  [[nodiscard]] std::string getHTTPScheme() const;
+  [[nodiscard]] const dnsdist::doh3::h3_headers_t& getHTTPHeaders() const;
 };
 
 struct DOH3Frontend
 {
-  DOH3Frontend()
-  {
-  }
+  DOH3Frontend() = default;
   void setup()
   {
   }