From a0e8a366b37d272fb876166ea4757df153e91a91 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Mon, 1 Jan 2018 17:24:46 +0200 Subject: [PATCH] geoipbackend: Add per-AFI IP expansions Allows records like A %ip4 AAAA %ip6. --- modules/geoipbackend/geoipbackend.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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); -- 2.47.2