mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-27 21:22:16 +02:00
Modify optimization 8 loop to continue until no chains are combined.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
8e1284f74c
commit
e7a4aaafc1
@ -1777,7 +1777,7 @@ sub optimize_ruleset() {
|
|||||||
while ( $progress ) {
|
while ( $progress ) {
|
||||||
$progress = 0;
|
$progress = 0;
|
||||||
$passes++;
|
$passes++;
|
||||||
|
|
||||||
for my $chainref ( grep $_->{referenced} && ! $_->{builtin}, values %{$chain_table{$table}} ) {
|
for my $chainref ( grep $_->{referenced} && ! $_->{builtin}, values %{$chain_table{$table}} ) {
|
||||||
my $rules = $chainref->{rules};
|
my $rules = $chainref->{rules};
|
||||||
next if not @$rules;
|
next if not @$rules;
|
||||||
@ -1791,7 +1791,7 @@ sub optimize_ruleset() {
|
|||||||
for ( my $i = 0; $i <= $#$rules; $i++ ) {
|
for ( my $i = 0; $i <= $#$rules; $i++ ) {
|
||||||
next CHAIN unless $rules->[$i] eq $rules1->[$i];
|
next CHAIN unless $rules->[$i] eq $rules1->[$i];
|
||||||
}
|
}
|
||||||
|
|
||||||
replace_references1 $chainref1, $chainref->{name}, '';
|
replace_references1 $chainref1, $chainref->{name}, '';
|
||||||
$progress = 1;
|
$progress = 1;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user