holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Add 'wildcard' member to the interface table

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2014-08-11 08:30:44 -07:00
parent e545329eb9
commit 6f777098d7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -469,7 +469,7 @@ sub process_a_provider( $ ) {
# #
# The logical interface name was specified # The logical interface name was specified
# #
$physical = get_physical $interface; $physical = $interfaceref->{physical};
} else { } else {
# #
# A Physical name was specified # A Physical name was specified
@ -478,7 +478,7 @@ sub process_a_provider( $ ) {
# #
# Switch to the logical name unless it is a wildcard # Switch to the logical name unless it is a wildcard
# #
$interface = $interfaceref->{name} unless $interfaceref->{name} =~ /\+$/; $interface = $interfaceref->{name} unless $interfaceref->{wildcard};
} }
my $gatewaycase = ''; my $gatewaycase = '';

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

@ -193,6 +193,7 @@ our %reservedName = ( all => 1,
# physical => <physical interface name> # physical => <physical interface name>
# base => <shell variable base representing this interface> # base => <shell variable base representing this interface>
# provider => <Provider Name, if interface is associated with a provider> # provider => <Provider Name, if interface is associated with a provider>
# wildcard => undef|1 # Wildcard Name
# zones => { zone1 => 1, ... } # zones => { zone1 => 1, ... }
# } # }
# } # }
@ -1375,6 +1376,7 @@ sub process_interface( $$ ) {
base => var_base( $physical ), base => var_base( $physical ),
zones => {}, zones => {},
origin => shortlineinfo(''), origin => shortlineinfo(''),
wildcard => $wildcard,
}; };
if ( $zone ) { if ( $zone ) {
@ -1531,6 +1533,7 @@ sub known_interface($)
number => $interfaceref->{number} , number => $interfaceref->{number} ,
physical => $physical , physical => $physical ,
base => var_base( $physical ) , base => var_base( $physical ) ,
wildcard => $interfaceref->{wildcard} ,
zones => $interfaceref->{zones} , zones => $interfaceref->{zones} ,
}; };
} }
@ -1768,7 +1771,7 @@ sub find_interfaces_by_option1( $ ) {
my $optionsref = $interfaceref->{options}; my $optionsref = $interfaceref->{options};
if ( $optionsref && defined $optionsref->{$option} ) { if ( $optionsref && defined $optionsref->{$option} ) {
$wild ||= ( $interfaceref->{physical} =~ /\+$/ ); $wild ||= $interfaceref->{wildcard};
push @ints , $interface push @ints , $interface
} }
} }