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

Correct usage of $physwild, replacing with $wildcard

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2020-09-10 13:06:39 -07:00
parent b154803f22
commit 9e6aec7687
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1540,7 +1540,7 @@ sub process_interface( $$ ) {
zones => {}, zones => {},
origin => shortlineinfo( '' ), origin => shortlineinfo( '' ),
wildcard => $wildcard, wildcard => $wildcard,
physwild => $physwild, physwild => $physwild, #Currently unused
}; };
$interfaces{$physical} = $interfaceref if $physical ne $interface; $interfaces{$physical} = $interfaceref if $physical ne $interface;
@ -1941,7 +1941,7 @@ sub find_interfaces_by_option( $;$ ) {
my $interfaceref = $interfaces{$interface}; my $interfaceref = $interfaces{$interface};
next unless $interfaceref->{root}; # Don't return '+' interface next unless $interfaceref->{root}; # Don't return '+' interface
next if $procinterfaceoptions{$option} && $interfaceref->{physwild}; # Ignore /proc options on wildcard interface next if $procinterfaceoptions{$option} && $interfaceref->{wildcard}; # Ignore /proc options on wildcard interface
my $optionsref = $interfaceref->{options}; my $optionsref = $interfaceref->{options};
if ( $nonzero ) { if ( $nonzero ) {
@ -2400,7 +2400,7 @@ sub generate_all_acasts() {
my $interfaceref = $interfaces{$interface}; my $interfaceref = $interfaces{$interface};
my $physical = $interfaceref->{physical}; my $physical = $interfaceref->{physical};
if ( $interfaceref->{physwild} ) { if ( $interfaceref->{wildcard} ) {
$physical =~ s/\+/*/; $physical =~ s/\+/*/;
if ( $interfaceref->{options}{omitanycast} ) { if ( $interfaceref->{options}{omitanycast} ) {