extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 17:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unconditionally cache interface lookup results

Browse Source
This commit is contained in:
Tom Eastep 2010-12-20 10:31:14 -08:00
parent 7a1a303265
commit 8c8e4d1654
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -1187,13 +1187,11 @@ sub map_physical( $$ ) {
# If the passed name matches a wildcard and 'cache' is true, an entry for the name is added in # If the passed name matches a wildcard and 'cache' is true, an entry for the name is added in
# %interfaces. # %interfaces.
# #
sub known_interface($;$) sub known_interface($)
{ {
my ( $interface, $cache ) = @_; my ( $interface, $cache ) = @_;
my $interfaceref = $interfaces{$interface}; my $interfaceref = $interfaces{$interface};
$cache = 1 unless defined $cache;
return $interfaceref if $interfaceref; return $interfaceref if $interfaceref;
fatal_error "Invalid interface ($interface)" if $interface =~ /\*/; fatal_error "Invalid interface ($interface)" if $interface =~ /\*/;
@ -1204,17 +1202,13 @@ sub known_interface($;$)
if ( $i ne $root && $interface ne $root && substr( $interface, 0, length $root ) eq $root ) { if ( $i ne $root && $interface ne $root && substr( $interface, 0, length $root ) eq $root ) {
my $physical = map_physical( $interface, $interfaceref ); my $physical = map_physical( $interface, $interfaceref );
my $copyref = { options => $interfaceref->{options}, return $interfaces{$interface} = { options => $interfaceref->{options},
bridge => $interfaceref->{bridge} , bridge => $interfaceref->{bridge} ,
name => $i , name => $i ,
number => $interfaceref->{number} , number => $interfaceref->{number} ,
physical => $physical , physical => $physical ,
base => chain_base( $physical ) , base => chain_base( $physical ) ,
}; };
$interfaces{$interface} = $copyref if $cache;
return $copyref;
} }
} }