extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-14 19:54:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

More massaging of redundant test suppression

Browse Source
This commit is contained in:
Tom Eastep 2009-11-17 11:14:02 -08:00
parent 831611e792
commit 4579a71574
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -521,18 +521,31 @@ sub add_a_provider( ) {
progress_message " Provider \"$currentline\" $done"; progress_message " Provider \"$currentline\" $done";
} }
sub finish_if_statement() { #
if ( our $last_base ) { # Begin an 'if' statement testing whether the passed interface is available
#
sub start_new_if( $ ) {
our $current_if = shift;
emit ( '', qq(if [ -n "\$${current_if}_IS_USABLE" ]; then) );
push_indent;
}
#
# Complete any current 'if' statement in the output script
#
sub finish_current_if() {
if ( our $current_if ) {
pop_indent; pop_indent;
emit ( "fi\n" ); emit ( "fi\n" );
$last_base = ''; $current_if = '';
} }
} }
sub add_an_rtrule( ) { sub add_an_rtrule( ) {
my ( $source, $dest, $provider, $priority ) = split_line 4, 4, 'route_rules file'; my ( $source, $dest, $provider, $priority ) = split_line 4, 4, 'route_rules file';
our $last_base; our $current_if;
unless ( $providers{$provider} ) { unless ( $providers{$provider} ) {
my $found = 0; my $found = 0;
@ -592,29 +605,21 @@ sub add_an_rtrule( ) {
$priority = "priority $priority"; $priority = "priority $priority";
emit ( "qt \$IP -$family rule del $source $dest $priority" ) if $config{DELETE_THEN_ADD}; finish_current_if, emit ( "qt \$IP -$family rule del $source $dest $priority" ) if $config{DELETE_THEN_ADD};
my ( $optional, $number ) = ( $providers{$provider}{optional} , $providers{$provider}{number} ); my ( $optional, $number ) = ( $providers{$provider}{optional} , $providers{$provider}{number} );
if ( $optional ) { if ( $optional ) {
my $base = uc chain_base( $providers{$provider}{physical} ); my $base = uc chain_base( $providers{$provider}{physical} );
finish_current_if if $base ne $current_if;
finish_if_statement if $base ne $last_base; start_new_if( $base ) unless $current_if;
unless ( $last_base ) {
emit ( '', qq(if [ -n "\$${base}_IS_USABLE" ]; then) );
push_indent;
$last_base = $base;
}
} else { } else {
finish_if_statement; finish_current_if;
} }
emit ( "run_ip rule add $source $dest $priority table $number", emit ( "run_ip rule add $source $dest $priority table $number",
"echo \"qt \$IP -$family rule del $source $dest $priority\" >> \${VARDIR}/undo_routing" ); "echo \"qt \$IP -$family rule del $source $dest $priority\" >> \${VARDIR}/undo_routing" );
finish_if_statement if $optional && $config{DELETE_THEN_ADD};
progress_message " Routing rule \"$currentline\" $done"; progress_message " Routing rule \"$currentline\" $done";
} }
@ -748,7 +753,7 @@ sub setup_providers() {
my $fn = open_file 'route_rules'; my $fn = open_file 'route_rules';
if ( $fn ) { if ( $fn ) {
our $last_base = ''; our $current_if = '';
first_entry "$doing $fn..."; first_entry "$doing $fn...";
@ -756,7 +761,7 @@ sub setup_providers() {
add_an_rtrule while read_a_line; add_an_rtrule while read_a_line;
finish_if_statement; finish_current_if;
} }
setup_null_routing if $config{NULL_ROUTE_RFC1918}; setup_null_routing if $config{NULL_ROUTE_RFC1918};