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

Auto-detect bridge when no options specified. Remove extra logic.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-23 09:28:11 -07:00
parent 05752dcf0b
commit 626b28fcd0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -753,9 +753,6 @@ sub process_interface( $$ ) {
fatal_error "Firewall zone not allowed in ZONE column of interface record" if $zoneref->{type} == FIREWALL; fatal_error "Firewall zone not allowed in ZONE column of interface record" if $zoneref->{type} == FIREWALL;
} }
$bcasts = '' if $bcasts eq '-';
$options = '' if $options eq '-';
my ($interface, $port, $extra) = split /:/ , $originalinterface, 3; my ($interface, $port, $extra) = split /:/ , $originalinterface, 3;
fatal_error "Invalid INTERFACE ($originalinterface)" if ! $interface || defined $extra; fatal_error "Invalid INTERFACE ($originalinterface)" if ! $interface || defined $extra;
@ -800,7 +797,7 @@ sub process_interface( $$ ) {
my $physical = $interface; my $physical = $interface;
my $broadcasts; my $broadcasts;
unless ( $bcasts eq '' || $bcasts eq 'detect' ) { unless ( $bcasts eq '-' || $bcasts eq 'detect' ) {
my @broadcasts = split_list $bcasts, 'address'; my @broadcasts = split_list $bcasts, 'address';
for my $address ( @broadcasts ) { for my $address ( @broadcasts ) {
@ -820,7 +817,7 @@ sub process_interface( $$ ) {
my $hostoptionsref = {}; my $hostoptionsref = {};
if ( $options ) { if ( $options ne '-' ) {
my %hostoptions = ( dynamic => 0 ); my %hostoptions = ( dynamic => 0 );
@ -941,7 +938,12 @@ sub process_interface( $$ ) {
$zoneref->{options}{in_out}{routeback} = 1 if $zoneref && $options{routeback}; $zoneref->{options}{in_out}{routeback} = 1 if $zoneref && $options{routeback};
$hostoptionsref = \%hostoptions; $hostoptionsref = \%hostoptions;
} } else {
#
# No options specified -- auto-detect bridge
#
$hostoptionsref->{routeback} = $options{routeback} = is_a_bridge( $physical ) unless $export;
}
$physical{$physical} = $interfaces{$interface} = { name => $interface , $physical{$physical} = $interfaces{$interface} = { name => $interface ,
bridge => $bridge , bridge => $bridge ,