dnsdist: Move DNSRule declaration to dnsdist-rules.hh

diff --git a/pdns/dnsdistdist/dnsdist-rules.hh b/pdns/dnsdistdist/dnsdist-rules.hh
index 129da7c8b96fffbbbb2b6d0181c7759eebc5b15e..2d8c4a84154946136152545a3f3835ca34d3bad5 100644 (file)
--- 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 26c34edc4d14894c8c1fb3b6d04d07a2d7163dd9..253c00d3bb2d2f6c84b81dabf7cdbf027010d4ae 100644 (file)
--- 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 6fb77dcaf101d2fbce05079a44973bcaf47aa113..670d8e5553649355accf0ec9e761a5e3f7c55432 100644 (file)
--- 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 24e3a3ca9968afd4b7cd12925c271cf5741e532e..1ea7104cc0f025c533fecc49447995fbd3edb9a7 100644 (file)
--- 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() :