dnsdist: move MMDB feature flag to `mmdb.hh`

Signed-off-by: Ensar Sarajčić <dev@ensarsarajcic.com>

diff --git a/pdns/dnsdistdist/dnsdist-configuration-yaml.cc b/pdns/dnsdistdist/dnsdist-configuration-yaml.cc
index 5ab50ca0d668214a9a998915b92dc3e30ddd5fe2..426cfdbf40eaa5b4232450927acfc9db0d4b609d 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-configuration-yaml.cc
+++ b/pdns/dnsdistdist/dnsdist-configuration-yaml.cc
@@ -47,9 +47,7 @@
 #include "dnsdist-xsk.hh"
 #include "fstrm_logger.hh"
 #include "iputils.hh"
-#ifdef HAVE_MMDB
 #include "mmdb.hh"
-#endif
 #include "remote_logger.hh"
 #include "remote_logger_pool.hh"
 #include "xsk.hh"
@@ -75,12 +73,7 @@ struct Context
 
 using XSKMap = std::vector<std::shared_ptr<XskSocket>>;
 
-using RegisteredTypes = std::variant<std::shared_ptr<DNSDistPacketCache>, std::shared_ptr<dnsdist::rust::settings::DNSSelector>, std::shared_ptr<dnsdist::rust::settings::DNSActionWrapper>, std::shared_ptr<dnsdist::rust::settings::DNSResponseActionWrapper>, std::shared_ptr<NetmaskGroup>, std::shared_ptr<KeyValueStore>, std::shared_ptr<KeyValueLookupKey>, std::shared_ptr<RemoteLoggerInterface>, std::shared_ptr<ServerPolicy>, std::shared_ptr<TimedIPSetRule>, std::shared_ptr<XSKMap>
-#ifdef HAVE_MMDB
-                                     ,
-                                     std::shared_ptr<MMDB>
-#endif
-                                     >;
+using RegisteredTypes = std::variant<std::shared_ptr<DNSDistPacketCache>, std::shared_ptr<dnsdist::rust::settings::DNSSelector>, std::shared_ptr<dnsdist::rust::settings::DNSActionWrapper>, std::shared_ptr<dnsdist::rust::settings::DNSResponseActionWrapper>, std::shared_ptr<NetmaskGroup>, std::shared_ptr<KeyValueStore>, std::shared_ptr<KeyValueLookupKey>, std::shared_ptr<RemoteLoggerInterface>, std::shared_ptr<ServerPolicy>, std::shared_ptr<TimedIPSetRule>, std::shared_ptr<XSKMap>, std::shared_ptr<MMDB>>;
 static LockGuarded<std::unordered_map<std::string, RegisteredTypes>> s_registeredTypesMap;
 static std::atomic<bool> s_inConfigCheckMode;
 static std::atomic<bool> s_inClientMode;
@@ -1403,12 +1396,7 @@ bool loadConfigurationFromFile(const std::string& fileName, [[maybe_unused]] boo
 void addLuaBindingsForYAMLObjects([[maybe_unused]] LuaContext& luaCtx)
 {
 #if defined(HAVE_YAML_CONFIGURATION)
-  using ReturnValue = std::optional<boost::variant<std::shared_ptr<DNSDistPacketCache>, std::shared_ptr<DNSRule>, std::shared_ptr<DNSAction>, std::shared_ptr<DNSResponseAction>, std::shared_ptr<NetmaskGroup>, std::shared_ptr<KeyValueStore>, std::shared_ptr<KeyValueLookupKey>, std::shared_ptr<RemoteLoggerInterface>, std::shared_ptr<ServerPolicy>, std::shared_ptr<TimedIPSetRule>, std::shared_ptr<XSKMap>
-#ifdef HAVE_MMDB
-                                                   ,
-                                                   std::shared_ptr<MMDB>
-#endif
-                                                   >>;
+  using ReturnValue = std::optional<boost::variant<std::shared_ptr<DNSDistPacketCache>, std::shared_ptr<DNSRule>, std::shared_ptr<DNSAction>, std::shared_ptr<DNSResponseAction>, std::shared_ptr<NetmaskGroup>, std::shared_ptr<KeyValueStore>, std::shared_ptr<KeyValueLookupKey>, std::shared_ptr<RemoteLoggerInterface>, std::shared_ptr<ServerPolicy>, std::shared_ptr<TimedIPSetRule>, std::shared_ptr<XSKMap>, std::shared_ptr<MMDB>>>;
 
   luaCtx.writeFunction("getObjectFromYAMLConfiguration", [](const std::string& name) -> ReturnValue {
     auto map = s_registeredTypesMap.lock();

diff --git a/pdns/dnsdistdist/dnsdist-lua-bindings-mmdb.cc b/pdns/dnsdistdist/dnsdist-lua-bindings-mmdb.cc
index 7aa1fbe4a90d6517f420d938c967f0cce9ef7354..2388f0be62b32b8db1d4d40c7c86b85edf41c371 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-lua-bindings-mmdb.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-bindings-mmdb.cc
@@ -23,9 +23,7 @@
 #include "dnsdist-lua.hh"
 #include "iputils.hh"
 #include <memory>
-#ifdef HAVE_MMDB
 #include "mmdb.hh"
-#endif
 
 void setupLuaBindingsMMDB([[maybe_unused]] LuaContext& luaCtx)
 {

diff --git a/pdns/dnsdistdist/mmdb.cc b/pdns/dnsdistdist/mmdb.cc
index 19c5560670158bd5b74ecaa4743b3261601607ee..c0b6b7a99c616341d8c767a327d3178647811328 100644 (file)
--- a/pdns/dnsdistdist/mmdb.cc
+++ b/pdns/dnsdistdist/mmdb.cc
@@ -20,13 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MMDB
+#include "dnsdist-logging.hh"
 #include "dnsdist-lua-types.hh"
 #include <boost/variant/get.hpp>
 #include <memory>
 #include <string>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "dolog.hh"
 #include "iputils.hh"
@@ -254,3 +257,4 @@ std::optional<MMDBEntryList> MMDB::getEntryList(MMDB_entry_s* entry) const
   }
   return {entry_data_list};
 }
+#endif

diff --git a/pdns/dnsdistdist/mmdb.hh b/pdns/dnsdistdist/mmdb.hh
index bfab18fc86f33cffffb68fd30c543d6fab7eca77..f7ce2f8f408e916b4f9b427c8bb074909d7defbd 100644 (file)
--- a/pdns/dnsdistdist/mmdb.hh
+++ b/pdns/dnsdistdist/mmdb.hh
@@ -21,6 +21,7 @@
  */
 #pragma once
 
+#ifdef HAVE_MMDB
 #include "dnsdist-lua-types.hh"
 #include "iputils.hh"
 #include <maxminddb.h>
@@ -77,3 +78,8 @@ public:
 private:
   std::unique_ptr<MMDB_entry_data_list_s, decltype(&MMDB_free_entry_data_list)> d_entry_list_first;
 };
+#else
+class MMDB
+{
+};
+#endif