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

More optimization fixes

Browse Source
This commit is contained in:
Tom Eastep 2011-02-15 19:24:14 -08:00
parent 99f38bfca1
commit b03e3b94ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1676,7 +1676,7 @@ sub replace_references( $$ ) {
my $rule = 0;
for ( @{$fromref->{rules}} ) {
$rule++;
if ( s/ -([jg]) $name($|\s)/ -$1 ${target}$2/ ) {
if ( s/ -([jg]) $name(.*$)/ -$1 ${target}$2/ ) {
add_reference ( $fromref, $tableref->{$target} );
$count++;
trace( $fromref, 'R', $rule, $_ ) if $debug;
@ -1685,7 +1685,7 @@ sub replace_references( $$ ) {
}
}
delete $tableref->{target}{references}{$chainref->{name}};
delete $tableref->{$target}{references}{$chainref->{name}};
} else {
#
# The target is a builtin -- we must use '-j'
@ -1695,7 +1695,7 @@ sub replace_references( $$ ) {
my $rule = 0;
for ( @{$fromref->{rules}} ) {
$rule++;
if ( s/ -[jg] $name($|\s)/ -j ${target}$1/ ) {
if ( s/ -[jg] $name(.*$)/ -j ${target}$1/ ) {
$count++ ;
trace( $fromref, 'R', $rule, $_ ) if $debug;
}
@ -1896,7 +1896,7 @@ sub optimize_level4( $$ ) {
#
# Chain has a single rule
#
if ( $firstrule =~ /^-A -[jg] ([^\s])(\s+-m comment .*)?\s*$/ ) {
if ( $firstrule =~ /^-A -[jg] ([^\s]+)(\s+-m comment .*)?\s*$/ ) {
#
# Easy case -- the rule is a simple jump
#