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

Back out fix for multiple bridges with wildcard ports

Browse Source
This commit is contained in:
Tom Eastep 2009-11-05 16:34:41 -08:00
parent fb3477b8b5
commit a98195e156
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,8 +504,6 @@ sub zone_report()
my $grouplist = join ',', ( @$hosts ); my $grouplist = join ',', ( @$hosts );
$grouplist = join '!', ( $grouplist, $exclusions) if $exclusions; $grouplist = join '!', ( $grouplist, $exclusions) if $exclusions;
$interface =~ s/\++/+/;
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
progress_message_nocompress " $interface:$grouplist"; progress_message_nocompress " $interface:$grouplist";
} else { } else {
@ -563,8 +561,6 @@ sub dump_zone_contents()
$grouplist = join '!', ( $grouplist, $exclusions ) if $exclusions; $grouplist = join '!', ( $grouplist, $exclusions ) if $exclusions;
$interface =~ s/\++/+/;
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
$entry .= " $interface:$grouplist"; $entry .= " $interface:$grouplist";
} else { } else {
@ -740,15 +736,7 @@ sub process_interface( $ ) {
fatal_error "Your iptables is not recent enough to support bridge ports" unless $capabilities{KLUDGEFREE}; fatal_error "Your iptables is not recent enough to support bridge ports" unless $capabilities{KLUDGEFREE};
fatal_error "Invalid Interface Name ($interface:$port)" unless $port eq '' || $port =~ /^[\w.@%-]+\+?$/; fatal_error "Invalid Interface Name ($interface:$port)" unless $port eq '' || $port =~ /^[\w.@%-]+\+?$/;
fatal_error "Duplicate Interface ($port)" if $interfaces{$port};
if ( $port =~ /\+$/ ) {
while ( $interfaces{$port} ) {
fatal_error "Duplicate Interface ($interface:$port)" if $interfaces{$port}{bridge} eq $interface;
$port .= '+';
}
} else {
fatal_error "Duplicate Interface ($port)" if $interfaces{$port};
}
fatal_error "$interface is not a defined bridge" unless $interfaces{$interface} && $interfaces{$interface}{options}{bridge}; fatal_error "$interface is not a defined bridge" unless $interfaces{$interface} && $interfaces{$interface}{options}{bridge};
fatal_error "Bridge Ports may only be associated with 'bport' zones" if $zone && $zoneref->{type} != BPORT; fatal_error "Bridge Ports may only be associated with 'bport' zones" if $zone && $zoneref->{type} != BPORT;