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

Simplify logic in loopback helper functions

Browse Source
This commit is contained in:
Tom Eastep 2010-07-08 17:11:27 -07:00
parent 8d5f04d5a5
commit 9eca7fb37b
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1678,18 +1678,14 @@ sub generate_dest_rules( $$$$ ) {
my $type2 = $z2ref->{type}; my $type2 = $z2ref->{type};
if ( $type2 == VSERVER ) { if ( $type2 == VSERVER ) {
my $dest_hosts_ref = $z2ref->{hosts}; for my $hostref ( @{$z2ref->{hosts}{ip}{'%vserver%'}} ) {
my $exclusion = dest_exclusion( $hostref->{exclusions}, $chain);
for my $typeref ( values %{$dest_hosts_ref} ) {
for my $hostref ( @{$typeref->{'%vserver%'}} ) {
my $exclusion = dest_exclusion( $hostref->{exclusions}, $chain);
for my $net ( @{$hostref->{hosts}} ) { for my $net ( @{$hostref->{hosts}} ) {
add_jump( $chainref, add_jump( $chainref,
$exclusion , $exclusion ,
0, 0,
join('', $match, match_dest_net( $net ) ) ) join('', $match, match_dest_net( $net ) ) )
}
} }
} }
} else { } else {
@ -1708,20 +1704,16 @@ sub generate_source_rules( $$$$ ) {
# #
# Not a CONTINUE policy with no rules # Not a CONTINUE policy with no rules
# #
my $source_hosts_ref = defined_zone( $z1 )->{hosts}; for my $hostref ( @{defined_zone( $z1 )->{hosts}{ip}{'%vserver%'}} ) {
my $ipsec_match = match_ipsec_in $z1 , $hostref;
for my $typeref ( values %{$source_hosts_ref} ) { my $exclusion = source_exclusion( $hostref->{exclusions}, $chain);
for my $hostref ( @{$typeref->{'%vserver%'}} ) {
my $ipsec_match = match_ipsec_in $z1 , $hostref;
my $exclusion = source_exclusion( $hostref->{exclusions}, $chain);
for my $net ( @{$hostref->{hosts}} ) { for my $net ( @{$hostref->{hosts}} ) {
generate_dest_rules( $outchainref, generate_dest_rules( $outchainref,
$exclusion, $exclusion,
$z2, $z2,
join('', match_source_net( $net ), $match , $ipsec_match ) join('', match_source_net( $net ), $match , $ipsec_match )
); );
}
} }
} }
} }