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

Set optional provider variables when NOROUTE is true

Browse Source
This commit is contained in:
Tom Eastep 2009-06-15 11:35:46 -07:00
parent 440cc08802
commit c96db9a01c
1 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,14 +360,15 @@ sub add_a_provider( ) {
$balance = $default_balance unless $balance; $balance = $default_balance unless $balance;
$providers{$table} = { provider => $table, $providers{$table} = { provider => $table,
number => $number , number => $number ,
mark => $val ? in_hex($val) : $val , mark => $val ? in_hex($val) : $val ,
interface => $interface , interface => $interface ,
optional => $optional , optional => $optional ,
gateway => $gateway , gateway => $gateway ,
shared => $shared , gatewaycase => $gatewaycase ,
default => $default }; shared => $shared ,
default => $default };
if ( $track ) { if ( $track ) {
fatal_error "The 'track' option requires a numeric value in the MARK column" if $mark eq '-'; fatal_error "The 'track' option requires a numeric value in the MARK column" if $mark eq '-';
@ -702,6 +703,48 @@ sub finish_providers() {
} }
} }
sub test_optional_providers() {
my $first = 1;
for my $table ( @providers ) {
my $tableref = $providers{$table};
if ( $tableref->{optional} ) {
my $interface = $tableref->{interface};
my $base = uc chain_base( $interface );
my $variable;
if ( $first ) {
emit 'else';
push_indent;
$first = 0;
} else {
emit '';
}
if ( $tableref->{shared} ) {
$variable = $tableref->{mac};
} elsif ( $tableref->{gatewaycase} eq 'detect' ) {
$variable = $tableref->{gateway};
} else {
$variable = '';
}
if ( $variable ) {
emit qq(if interface_is_usable $interface && [ -n "$variable" ]; then);
} else {
emit qq(if interface_is_usable $interface; then);
}
emit( " ${base}_IS_UP=Yes" ,
'else',
" ${base}_IS_UP=" ,
'fi' );
}
}
pop_indent unless $first;
}
sub setup_providers() { sub setup_providers() {
my $providers = 0; my $providers = 0;
@ -728,6 +771,7 @@ sub setup_providers() {
setup_null_routing if $config{NULL_ROUTE_RFC1918}; setup_null_routing if $config{NULL_ROUTE_RFC1918};
emit "\nrun_ip route flush cache"; emit "\nrun_ip route flush cache";
pop_indent; pop_indent;
test_optional_providers;
emit "fi\n"; emit "fi\n";
setup_route_marking if @routemarked_interfaces; setup_route_marking if @routemarked_interfaces;