From: Aki Tuomi <cmouse@cmouse.fi>
Date: Sat, 30 Dec 2017 15:25:18 +0000 (+0200)
Subject: geoipbackend: Switch to new filename syntax
X-Git-Tag: dnsdist-1.3.0~85^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc629ec5b0ce230c21b0cbfedf8f1ef30b916300;p=thirdparty%2Fpdns.git

geoipbackend: Switch to new filename syntax

Requires new filename syntax, which is
[driver:]filename[;opt=value]

Currently only dat driver with mode=standard,cache,index,mmap is supported.
---

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 9f536666fa..7e3aa2470e 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -88,15 +88,13 @@ void GeoIPBackend::initialize() {
   YAML::Node config;
   vector<GeoIPDomain> tmp_domains;
 
-  string modeStr = getArg("database-cache");
   s_geoip_files.clear(); // reset pointers
 
   if (getArg("database-files").empty() == false) {
     vector<string> files;
     stringtok(files, getArg("database-files"), " ,\t\r\n");
     for(auto const& file: files) {
-      const string& fileStr = string("dat:") + file + string(";mode=") + modeStr;
-      s_geoip_files.push_back(GeoIPInterface::makeInterface(fileStr));
+      s_geoip_files.push_back(GeoIPInterface::makeInterface(file));
     }
   }
 
@@ -776,8 +774,7 @@ public:
 
   void declareArguments(const string &suffix = "") {
     declare(suffix, "zones-file", "YAML file to load zone(s) configuration", "");
-    declare(suffix, "database-files", "File(s) to load geoip data from", "");
-    declare(suffix, "database-cache", "Cache mode (standard, memory, index, mmap)", "standard");
+    declare(suffix, "database-files", "File(s) to load geoip data from ([driver:]path[;opt=value]", "");
     declare(suffix, "dnssec-keydir", "Directory to hold dnssec keys (also turns DNSSEC on)", "");
   }