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

Revert version of modules with only whitespace changes; rename a couple of functions for clarity

Browse Source
This commit is contained in:
Tom Eastep 2010-07-07 06:43:07 -07:00
parent 74092a9b14
commit 591a4bc7f6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Actions.pm
View File

@ -57,7 +57,7 @@ our @EXPORT = qw( merge_levels
$macro_commands $macro_commands
); );
our @EXPORT_OK = qw( initialize ); our @EXPORT_OK = qw( initialize );
our $VERSION = '4.4_11'; our $VERSION = '4.4_10';
# #
# Used Actions. Each action that is actually used has an entry with value 1. # Used Actions. Each action that is actually used has an entry with value 1.

2
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -43,7 +43,7 @@ use Shorewall::Raw;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT = qw( compiler ); our @EXPORT = qw( compiler );
our @EXPORT_OK = qw( $export ); our @EXPORT_OK = qw( $export );
our $VERSION = '4.4_11'; our $VERSION = '4.4_10';
our $export; our $export;

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

@ -1669,9 +1669,9 @@ sub rules_target( $$ ) {
} }
# #
# Generate loopback rules for one destination zone # Generate rules for one destination zone
# #
sub generate_loopback_rules1( $$$$ ) { sub generate_dest_rules( $$$$ ) {
my ( $chainref, $chain, $z2, $match ) = @_; my ( $chainref, $chain, $z2, $match ) = @_;
my $z2ref = find_zone( $z2 ); my $z2ref = find_zone( $z2 );
@ -1698,9 +1698,9 @@ sub generate_loopback_rules1( $$$$ ) {
} }
# #
# Generate loopback rules for one on-firewall source zone # Generate rules for one on-firewall source zone
# #
sub generate_loopback_rules2( $$$$ ) { sub generate_source_rules( $$$$ ) {
my ( $outchainref, $z1, $z2, $match ) = @_; my ( $outchainref, $z1, $z2, $match ) = @_;
my $chain = rules_target ( $z1, $z2 ); my $chain = rules_target ( $z1, $z2 );
@ -1716,7 +1716,7 @@ sub generate_loopback_rules2( $$$$ ) {
my $exclusion = source_exclusion( $hostref->{exclusions}, $chain); my $exclusion = source_exclusion( $hostref->{exclusions}, $chain);
for my $net ( @{$hostref->{hosts}} ) { for my $net ( @{$hostref->{hosts}} ) {
generate_loopback_rules1( $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 )
@ -1755,11 +1755,11 @@ sub handle_loopback_traffic() {
for my $z2 ( @zones ) { for my $z2 ( @zones ) {
my $chain = rules_target( $z1, $z2 ); my $chain = rules_target( $z1, $z2 );
generate_loopback_rules1( $outchainref, $chain, $z2, $rule ) if $chain; generate_dest_rules( $outchainref, $chain, $z2, $rule ) if $chain;
} }
} else { } else {
for my $z2 ( @zones ) { for my $z2 ( @zones ) {
generate_loopback_rules2( $outchainref, $z1, $z2, $rule ); generate_source_rules( $outchainref, $z1, $z2, $rule );
} }
} }
@ -1992,7 +1992,7 @@ sub generate_matrix() {
$use_output = 1; $use_output = 1;
for my $vzone ( vserver_zones ) { for my $vzone ( vserver_zones ) {
generate_loopback_rules2 ( $outputref, $vzone, $zone, $dest ); generate_source_rules ( $outputref, $vzone, $zone, $dest );
} }
} else { } else {
$outputref = $filter_table->{OUTPUT}; $outputref = $filter_table->{OUTPUT};
@ -2052,7 +2052,7 @@ sub generate_matrix() {
for my $vzone ( @vservers ) { for my $vzone ( @vservers ) {
my $target = rules_target( $zone, $vzone ); my $target = rules_target( $zone, $vzone );
generate_loopback_rules1( $inputchainref, $target, $vzone, $source . $ipsec_in_match ) if $target; generate_dest_rules( $inputchainref, $target, $vzone, $source . $ipsec_in_match ) if $target;
} }
} else { } else {
$inputchainref = $filter_table->{INPUT}; $inputchainref = $filter_table->{INPUT};