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

Eliminate a parameter to add_jump()

Browse Source
This commit is contained in:
Tom Eastep 2010-09-17 11:05:35 -07:00
parent c7373ada46
commit 5357f4c347
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -620,6 +620,11 @@ sub insert_rule1($$$)
$rule .= "-m comment --comment \"$comment\"" if $comment; $rule .= "-m comment --comment \"$comment\"" if $comment;
$rule = join( ' ', '-A', $rule ); $rule = join( ' ', '-A', $rule );
if ( $number < 0 ) {
$chainref->{frozen}++;
$number = 0;
}
splice( @{$chainref->{rules}}, $number, 0, $rule ); splice( @{$chainref->{rules}}, $number, 0, $rule );
trace( $chainref, 'I', ++$number, $rule ) if $debug; trace( $chainref, 'I', ++$number, $rule ) if $debug;
@ -1040,8 +1045,8 @@ sub ensure_chain($$)
# optional 5th argument causes long port lists to be split. The optional 6th # optional 5th argument causes long port lists to be split. The optional 6th
# argument, if passed, gives the 0-relative index where the jump is to be inserted. # argument, if passed, gives the 0-relative index where the jump is to be inserted.
# #
sub add_jump( $$$;$$$$ ) { sub add_jump( $$$;$$$ ) {
my ( $fromref, $to, $goto_ok, $predicate, $expandports, $index, $freeze ) = @_; my ( $fromref, $to, $goto_ok, $predicate, $expandports, $index ) = @_;
$predicate |= ''; $predicate |= '';
@ -1074,8 +1079,6 @@ sub add_jump( $$$;$$$$ ) {
} else { } else {
add_rule ($fromref, join( '', $predicate, "-$param $to" ), $expandports || 0 ); add_rule ($fromref, join( '', $predicate, "-$param $to" ), $expandports || 0 );
} }
$fromref->{frozen}++ if $freeze;
} }
# #

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

@ -1874,20 +1874,20 @@ sub generate_matrix() {
if ( $zoneref->{options}{in}{blacklist} ) { if ( $zoneref->{options}{in}{blacklist} ) {
my $blackref = $filter_table->{blacklst}; my $blackref = $filter_table->{blacklst};
add_jump $frwd_ref , $blackref, 0, $state, 0, undef, 1; add_jump $frwd_ref , $blackref, 0, $state, 0, -1;
add_jump ensure_filter_chain( rules_chain( $zone, firewall_zone ), 1 ) , $blackref , 0, $state, 0, 0, 1; add_jump ensure_filter_chain( rules_chain( $zone, firewall_zone ), 1 ) , $blackref , 0, $state, 0, -1;
} }
if ( $zoneref->{options}{out}{blacklist} ) { if ( $zoneref->{options}{out}{blacklist} ) {
my $blackref = $filter_table->{blackout}; my $blackref = $filter_table->{blackout};
add_jump ensure_filter_chain( rules_chain( firewall_zone, $zone ), 1 ) , $blackref , 0, $state, 0, 0, 1; add_jump ensure_filter_chain( rules_chain( firewall_zone, $zone ), 1 ) , $blackref , 0, $state, 0, -1;
for my $zone1 ( @zones ) { for my $zone1 ( @zones ) {
my $ruleschain = rules_chain( $zone1, $zone ); my $ruleschain = rules_chain( $zone1, $zone );
my $ruleschainref = $filter_table->{$ruleschain}; my $ruleschainref = $filter_table->{$ruleschain};
if ( $zone ne $zone1 || ( $ruleschainref && $ruleschainref->{referenced} ) ) { if ( $zone ne $zone1 || ( $ruleschainref && $ruleschainref->{referenced} ) ) {
add_jump( ensure_filter_chain( $ruleschain, 1 ), $blackref, 0, $state, 0, 0 , 1 ); add_jump( ensure_filter_chain( $ruleschain, 1 ), $blackref, 0, $state, 0, -1 );
} }
} }
} }