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

Make interface zone dependent on zone type

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7316 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-09-11 00:41:55 +00:00
parent 597c8fecc0
commit 3ef4b5efae
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall-perl/Shorewall/Zones.pm
View File

@ -156,7 +156,10 @@ our %zonetypes = ( 1 => 'ipv4' ,
# options => { <option1> = <val1> , # options => { <option1> = <val1> ,
# ... # ...
# } # }
# zone => <zone name> # zone => { { <zonetype1> => <zone name> ,
# { <zonetype2> => <zone name> ,
# ...
# }
# bridge => <bridge> # bridge => <bridge>
# broadcasts => 'none', 'detect' or [ <addr1>, <addr2>, ... ] # broadcasts => 'none', 'detect' or [ <addr1>, <addr2>, ... ]
# } # }
@ -493,7 +496,7 @@ sub add_group_to_zone($$$$$)
my $arrayref; my $arrayref;
my $zoneref = $zones{$zone}; my $zoneref = $zones{$zone};
my $zonetype = $zoneref->{type}; my $zonetype = $zoneref->{type};
my $ifacezone = $interfaces{$interface}{zone}; my $ifacezone = $interfaces{$interface}{$zonetype}{zone};
$zoneref->{interfaces}{$interface} = 1; $zoneref->{interfaces}{$interface} = 1;
@ -806,9 +809,12 @@ sub validate_interfaces_file( $ )
@networks = allipv4; @networks = allipv4;
} }
add_group_to_zone( $zone, $zoneref->{type}, $interface, \@networks, $optionsref ) if $zone && @networks; my $zonetype = $zoneref->{type};
$interfaces{$interface}{zone} = $zone; #Must follow the call to add_group_to_zone() add_group_to_zone( $zone, $zonetype, $interface, \@networks, $optionsref ) if $zone && @networks;
$interfaces{$interface}{$zonetype}{zone} = $zone; #Must follow the call to add_group_to_zone()
$interfaces{$interface}{zone} = 1;
progress_message " Interface \"$currentline\" Validated"; progress_message " Interface \"$currentline\" Validated";