From: Aki Tuomi <cmouse@cmouse.fi>
Date: Sun, 1 May 2022 18:03:42 +0000 (+0300)
Subject: geoipbackend: Move global custom mapping and format to object
X-Git-Tag: rec-5.0.0-alpha1~27^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=924dd14a0e25ff7ef3e27df98f93029a247251d4;p=thirdparty%2Fpdns.git

geoipbackend: Move global custom mapping and format to object

Simplifies following change
---

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 4ca8ed0a47..232b2d517b 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -149,15 +149,13 @@ void GeoIPBackend::initialize()
 
   // Global lookup formats and mapping will be used
   // if none defined at the domain level.
-  vector<string> global_mapping_lookup_formats;
-  map<std::string, std::string> global_custom_mapping;
   if (YAML::Node formats = config["mapping_lookup_formats"]) {
-    global_mapping_lookup_formats = formats.as<vector<string>>();
-    if (!validateMappingLookupFormats(global_mapping_lookup_formats))
+    d_global_mapping_lookup_formats = formats.as<vector<string>>();
+    if (!validateMappingLookupFormats(d_global_mapping_lookup_formats))
       throw PDNSException(string("%mp is not allowed in mapping lookup"));
   }
   if (YAML::Node mapping = config["custom_mapping"]) {
-    global_custom_mapping = mapping.as<map<std::string, std::string>>();
+    d_global_custom_mapping = mapping.as<map<std::string, std::string>>();
   }
 
   for (YAML::const_iterator _domain = config["domains"].begin(); _domain != config["domains"].end(); _domain++) {
@@ -275,13 +273,13 @@ void GeoIPBackend::initialize()
         dom.mapping_lookup_formats = mapping_lookup_formats;
       }
       else {
-        dom.mapping_lookup_formats = global_mapping_lookup_formats;
+        dom.mapping_lookup_formats = d_global_mapping_lookup_formats;
       }
       if (YAML::Node mapping = domain["custom_mapping"]) {
         dom.custom_mapping = mapping.as<map<std::string, std::string>>();
       }
       else {
-        dom.custom_mapping = global_custom_mapping;
+        dom.custom_mapping = d_global_custom_mapping;
       }
 
       dom.services[srvName].netmask4 = netmask4;
diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh
index e036ab4f1e..d4138383b1 100644
--- a/modules/geoipbackend/geoipbackend.hh
+++ b/modules/geoipbackend/geoipbackend.hh
@@ -79,4 +79,6 @@ private:
   bool lookup_static(const GeoIPDomain& dom, const DNSName& search, const QType& qtype, const DNSName& qdomain, const Netmask& addr, GeoIPNetmask& gl);
   vector<DNSResourceRecord> d_result;
   vector<GeoIPInterface> d_files;
+  std::vector<std::string> d_global_mapping_lookup_formats;
+  std::map<std::string, std::string> d_global_custom_mapping;
 };