webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Arne Fitzenreiter
2015-01-02 14:42:30 +01:00
parent a91fd50d80 214cc7b195
commit 9692499b2a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/firewall/rules.pl
View File

@@ -280,7 +280,7 @@ sub buildrules {
# Concurrent connection limit # Concurrent connection limit
my @ratelimit_options = (); my @ratelimit_options = ();
if (($elements gt 34) && ($$hash{$key}[32] eq 'ON')) { if (($elements ge 34) && ($$hash{$key}[32] eq 'ON')) {
my $conn_limit = $$hash{$key}[33]; my $conn_limit = $$hash{$key}[33];
if ($conn_limit ge 1) { if ($conn_limit ge 1) {
@@ -296,13 +296,13 @@ sub buildrules {
} }
# Ratelimit # Ratelimit
if (($elements gt 37) && ($$hash{$key}[34] eq 'ON')) { if (($elements ge 37) && ($$hash{$key}[34] eq 'ON')) {
my $rate_limit = "$$hash{$key}[35]/$$hash{$key}[36]"; my $rate_limit = "$$hash{$key}[35]/$$hash{$key}[36]";
if ($rate_limit) { if ($rate_limit) {
push(@ratelimit_options, ("-m", "limit")); push(@ratelimit_options, ("-m", "limit"));
push(@ratelimit_options, ("--limit", $rate_limit)); push(@ratelimit_options, ("--limit", $rate_limit));
} }
} }
# Check which protocols are used in this rule and so that we can # Check which protocols are used in this rule and so that we can

1
config/rootfiles/core/86/filelists/files
View File

@@ -1,6 +1,7 @@
etc/system-release etc/system-release
etc/issue etc/issue
opt/pakfire/etc/pakfire.conf opt/pakfire/etc/pakfire.conf
usr/lib/firewall/rules.pl
usr/local/bin/update-bootloader usr/local/bin/update-bootloader
var/ipfire/header.pl var/ipfire/header.pl
var/ipfire/langs var/ipfire/langs