location-query: Add output for ipset

Fixes: #12202
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/man/location-query.txt b/man/location-query.txt
index ed6f4e586504962dec468cd27fc018cadd6f0ab1..ad129ede5231f15984c99451335040d25c48279e 100644 (file)
--- a/man/location-query.txt
+++ b/man/location-query.txt
@@ -50,6 +50,7 @@ or countries.
        directly loaded into other software. The following options are available:
        +
        * 'list' (default): Just lists all networks, one per line
+       * 'ipset': For ipset
        * 'nftables': For nftables
        * 'xt_geoip': Returns a list of networks to be loaded into the xt_geoip
          kernel module

diff --git a/src/python/location-query.in b/src/python/location-query.in
index 83f23ee1209a0e243a4609ee747e3f705d257d65..72b7c25041acb8fd51cd697df2b2890874da8b03 100644 (file)
--- a/src/python/location-query.in
+++ b/src/python/location-query.in
@@ -69,6 +69,17 @@ class OutputFormatter(object):
                print(network)
 
 
+class IpsetOutputFormatter(OutputFormatter):
+       """
+               For nftables
+       """
+       def open(self):
+               print("create %s hash:net family inet hashsize 1024 maxelem 65536" % self.name)
+
+       def network(self, network):
+               print("add %s %s" % (self.name, network))
+
+
 class NftablesOutputFormatter(OutputFormatter):
        """
                For nftables
@@ -102,6 +113,7 @@ class XTGeoIPOutputFormatter(OutputFormatter):
 
 class CLI(object):
        output_formats = {
+               "ipset"    : IpsetOutputFormatter,
                "list"     : OutputFormatter,
                "nftables" : NftablesOutputFormatter,
                "xt_geoip" : XTGeoIPOutputFormatter,