Streamline sort of interfaces array

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6471 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-06 15:40:34 +00:00
parent a3961093be
commit 173f63b00b

View File

@ -339,15 +339,8 @@ sub validate_interfaces_file()
for my $interface ( @ifaces ) {
my $interfaceref = $interfaces{$interface};
next if $interfaceref->{options}{port};
if ( $interfaceref->{options}{bridge} ) {
for my $port ( grep $interfaces{$_}{options}{port} && $interfaces{$_}{bridge} eq $interface, @ifaces ) {
push @interfaces, $port;
}
}
push @interfaces, $interface;
push @interfaces, ( grep $interfaces{$_}{options}{port} && $interfaces{$_}{bridge} eq $interface, @ifaces ) if $interfaceref->{options}{bridge};
push @interfaces, $interface unless $interfaceref->{options}{port};
}
}