From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 06/12] rules.pl: Move to ipset based data for LOCATIONBLOCK feature.
Date: Mon, 14 Feb 2022 21:03:28 +0000 [thread overview]
Message-ID: <631d16b9-ed55-5657-fb1e-95a14c3f43d9@ipfire.org> (raw)
In-Reply-To: <20220214184257.2406-6-stefan.schantl@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 949 bytes --]
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> config/firewall/rules.pl | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
> index 5b1153b08..e009c1838 100644
> --- a/config/firewall/rules.pl
> +++ b/config/firewall/rules.pl
> @@ -671,7 +671,11 @@ sub locationblock {
> # is enabled.
> foreach my $location (@locations) {
> if(exists $locationsettings{$location} && $locationsettings{$location} eq "on") {
> - run("$IPTABLES -A LOCATIONBLOCK -m geoip --src-cc $location -j DROP");
> + # Call function to load the networks list for this country.
> + &ipset_restore($location);
> +
> + # Call iptables and create rule to use the loaded ipset list.
> + run("$IPTABLES -A LOCATIONBLOCK -m set --match-set CC_$location src -j DROP");
> }
> }
> }
next prev parent reply other threads:[~2022-02-14 21:03 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 18:42 [PATCH 01/12] location-functions.pl: Rename and set the location for exported databases to "/var/lib/location/ipset/" Stefan Schantl
2022-02-14 18:42 ` [PATCH 02/12] location-functions.pl: Remove ending backslash from location_dir variable Stefan Schantl
2022-02-14 21:01 ` Peter Müller
2022-02-14 18:42 ` [PATCH 03/12] rules.pl: Move flush of LOCATIONBLOCK into main flush() function Stefan Schantl
2022-02-14 21:02 ` Peter Müller
2022-02-15 12:42 ` Michael Tremer
2022-02-14 18:42 ` [PATCH 04/12] rules.pl: Destroy all ipset lists on rule reload Stefan Schantl
2022-02-14 21:02 ` Peter Müller
2022-02-15 12:41 ` Michael Tremer
2022-02-15 19:28 ` Tim FitzGeorge
2022-02-16 10:45 ` Michael Tremer
2022-02-17 4:56 ` Stefan Schantl
2022-02-27 14:28 ` Stefan Schantl
2022-02-14 18:42 ` [PATCH 05/12] rules.pl: Add tiny ipset_restore function Stefan Schantl
2022-02-14 21:03 ` Peter Müller
2022-02-15 12:41 ` Michael Tremer
2022-02-14 18:42 ` [PATCH 06/12] rules.pl: Move to ipset based data for LOCATIONBLOCK feature Stefan Schantl
2022-02-14 21:03 ` Peter Müller [this message]
2022-02-15 12:40 ` Michael Tremer
2022-02-14 18:42 ` [PATCH 07/12] rules.pl: Move to ipset based data for location based firewall rules Stefan Schantl
2022-02-14 21:05 ` Peter Müller
2022-02-15 12:40 ` Michael Tremer
2022-02-14 18:42 ` [PATCH 08/12] update-location-database: Export database to ipset compatible format now Stefan Schantl
2022-02-14 21:05 ` Peter Müller
2022-02-15 12:39 ` Michael Tremer
2022-02-14 18:42 ` [PATCH 09/12] rules.pl: Do not try to restore the same ipset multiple times Stefan Schantl
2022-02-14 21:05 ` Peter Müller
2022-02-15 12:39 ` Michael Tremer
2022-02-17 5:35 ` Stefan Schantl
2022-02-17 5:40 ` [PATCH] rules.pl: Adjust check against loading the same lists " Stefan Schantl
2022-02-17 19:25 ` Peter Müller
2022-02-14 18:42 ` [PATCH 10/12] rules.pl: Check if an ipset db file exists before call to restore it Stefan Schantl
2022-02-14 21:06 ` Peter Müller
2022-02-15 12:38 ` Michael Tremer
2022-02-14 18:42 ` [PATCH 11/12] rules.pl: Add workaround to hide a warning about an only once used variable Stefan Schantl
2022-02-14 21:07 ` Peter Müller
2022-02-15 12:37 ` Michael Tremer
2022-02-14 18:42 ` [PATCH 12/12] libloc: Export DB in ipset compatible format Stefan Schantl
2022-02-14 21:06 ` Peter Müller
2022-02-15 12:37 ` Michael Tremer
2022-02-14 21:01 ` [PATCH 01/12] location-functions.pl: Rename and set the location for exported databases to "/var/lib/location/ipset/" Peter Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=631d16b9-ed55-5657-fb1e-95a14c3f43d9@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox