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

Allow a provider name in addition to an interface name in enable/disable

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-12-01 10:30:42 -08:00
parent d27965a4d2
commit 568e3b2e5b
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -780,7 +780,7 @@ sub add_a_provider( $$ ) {
"qt \$TC qdisc del dev $physical root", "qt \$TC qdisc del dev $physical root",
"qt \$TC qdisc del dev $physical ingress\n" ) if $tcdevices->{$interface}; "qt \$TC qdisc del dev $physical ingress\n" ) if $tcdevices->{$interface};
emit( "progress_message2 \"Provider $table stopped\"" ); emit( "progress_message2 \" Provider $table ($number) stopped\"" );
pop_indent; pop_indent;
@ -1125,14 +1125,21 @@ EOF
for my $provider (@providers ) { for my $provider (@providers ) {
my $providerref = $providers{$provider}; my $providerref = $providers{$provider};
emit( "$providerref->{physical})", if ( $providerref->{optional} ) {
" if [ -z \"`\$IP -$family route ls table $providerref->{number}`\" ]; then", if ( $providerref->{shared} || $providerref->{physical} eq $provider) {
" start_provider_$provider", emit "$provider})";
' else', } else {
' startup_error "Interface $g_interface is already enabled"', emit( "$providerref->{physical}|$provider)" );
' fi', }
' ;;'
) if $providerref->{optional}; emit ( " if [ -z \"`\$IP -$family route ls table $providerref->{number}`\" ]; then",
" start_provider_$provider",
' else',
' startup_error "Interface $g_interface is already enabled"',
' fi',
' ;;'
);
}
} }
pop_indent; pop_indent;
@ -1140,7 +1147,7 @@ EOF
emit << 'EOF';; emit << 'EOF';;
*) *)
startup_error "$g_interface is not an optional provider interface" startup_error "$g_interface is not an optional provider or provider interface"
;; ;;
esac esac
} }