From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 1 Jan 2018 15:24:46 +0000 (+0200)
Subject: geoipbackend: Add per-AFI IP expansions
X-Git-Tag: dnsdist-1.3.0~85^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0e8a366b37d272fb876166ea4757df153e91a91;p=thirdparty%2Fpdns.git

geoipbackend: Add per-AFI IP expansions

Allows records like A %ip4 AAAA %ip6.
---

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 856a3335b3..5d9def6eba 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -555,6 +555,20 @@ string GeoIPBackend::format2str(string sformat, const string& ip, bool v6, GeoIP
     } else if (!sformat.compare(cur,3,"%mo")) {
       rep = boost::str(boost::format("%02d") % (gtm.tm_mon + 1));
       tmp_gl.netmask = (v6?128:32);
+    } else if (!sformat.compare(cur,4,"%ip6")) {
+      nrep = 4;
+      if (v6)
+        rep = ip;
+      else
+        rep = "";
+      tmp_gl.netmask = (v6?128:32);
+    } else if (!sformat.compare(cur,4,"%ip4")) {
+      nrep = 4;
+      if (!v6)
+        rep = ip;
+      else
+        rep = "";
+      tmp_gl.netmask = (v6?128:32);
     } else if (!sformat.compare(cur,3,"%ip")) {
       rep = ip;
       tmp_gl.netmask = (v6?128:32);