From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 24 Dec 2024 14:06:29 +0000 (+0100)
Subject: dnsdist: Move DNSRule declaration to dnsdist-rules.hh
X-Git-Tag: dnsdist-2.0.0-alpha1~160^2~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8daefa53e894e486fabb85c283083cde93d5bc47;p=thirdparty%2Fpdns.git

dnsdist: Move DNSRule declaration to dnsdist-rules.hh
---

diff --git a/pdns/dnsdistdist/dnsdist-rules.hh b/pdns/dnsdistdist/dnsdist-rules.hh
index 129da7c8b9..2d8c4a8415 100644
--- a/pdns/dnsdistdist/dnsdist-rules.hh
+++ b/pdns/dnsdistdist/dnsdist-rules.hh
@@ -36,6 +36,18 @@
 #include "dnsparser.hh"
 #include "dns_random.hh"
 
+class DNSRule
+{
+public:
+  virtual ~DNSRule()
+  {
+  }
+  virtual bool matches(const DNSQuestion* dq) const = 0;
+  virtual string toString() const = 0;
+  mutable stat_t d_matches{0};
+};
+
+
 class MaxQPSIPRule : public DNSRule
 {
 public:
diff --git a/pdns/dnsdistdist/dnsdist-web.cc b/pdns/dnsdistdist/dnsdist-web.cc
index 26c34edc4d..253c00d3bb 100644
--- a/pdns/dnsdistdist/dnsdist-web.cc
+++ b/pdns/dnsdistdist/dnsdist-web.cc
@@ -43,6 +43,7 @@
 #include "dnsdist-prometheus.hh"
 #include "dnsdist-rings.hh"
 #include "dnsdist-rule-chains.hh"
+#include "dnsdist-rules.hh"
 #include "dnsdist-web.hh"
 #include "dolog.hh"
 #include "gettime.hh"
diff --git a/pdns/dnsdistdist/dnsdist.cc b/pdns/dnsdistdist/dnsdist.cc
index 6fb77dcaf1..670d8e5553 100644
--- a/pdns/dnsdistdist/dnsdist.cc
+++ b/pdns/dnsdistdist/dnsdist.cc
@@ -57,6 +57,7 @@
 #include "dnsdist-proxy-protocol.hh"
 #include "dnsdist-random.hh"
 #include "dnsdist-rings.hh"
+#include "dnsdist-rules.hh"
 #include "dnsdist-secpoll.hh"
 #include "dnsdist-self-answers.hh"
 #include "dnsdist-snmp.hh"
diff --git a/pdns/dnsdistdist/dnsdist.hh b/pdns/dnsdistdist/dnsdist.hh
index 24e3a3ca99..1ea7104cc0 100644
--- a/pdns/dnsdistdist/dnsdist.hh
+++ b/pdns/dnsdistdist/dnsdist.hh
@@ -895,17 +895,6 @@ void responderThread(std::shared_ptr<DownstreamState> dss);
 
 class DNSDistPacketCache;
 
-class DNSRule
-{
-public:
-  virtual ~DNSRule()
-  {
-  }
-  virtual bool matches(const DNSQuestion* dq) const = 0;
-  virtual string toString() const = 0;
-  mutable stat_t d_matches{0};
-};
-
 struct ServerPool
 {
   ServerPool() :