extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for 'fallback' without weight

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-10-09 07:53:59 -07:00
parent 809f27decd
commit 31e0b186bf
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -628,16 +628,11 @@ sub add_a_provider( $$ ) {
push_indent; push_indent;
if ( $balance || $default ) { if ( $balance || $default > 0 ) {
$tbl = $default ? DEFAULT_TABLE : $config{USE_DEFAULT_RT} ? BALANCE_TABLE : MAIN_TABLE; $tbl = $default ? DEFAULT_TABLE : $config{USE_DEFAULT_RT} ? BALANCE_TABLE : MAIN_TABLE;
$weight = $balance ? $balance : abs $default; $weight = $balance ? $balance : $default;
if ( $default < 0 ) { if ( $gateway ) {
if ( $gateway ) {
emit qq(run_ip -$family add default table $tbl via $gateway dev $physical weight $weight $realm metric $number);
} else {
emit qq(run_ip -$family add default table $tbl via $gateway dev $physical weight $weight $realm);
elsif ( $gateway ) {
emit qq(add_gateway "nexthop via $gateway dev $physical weight $weight $realm" ) . $tbl; emit qq(add_gateway "nexthop via $gateway dev $physical weight $weight $realm" ) . $tbl;
} else { } else {
emit qq(add_gateway "nexthop dev $physical weight $weight $realm" ) . $tbl; emit qq(add_gateway "nexthop dev $physical weight $weight $realm" ) . $tbl;
@ -701,34 +696,40 @@ sub add_a_provider( $$ ) {
my $undo = "\${VARDIR}/undo_${table}_routing"; my $undo = "\${VARDIR}/undo_${table}_routing";
emit( "if [ -f $undo ]; then", emit( "if [ -f $undo ]; then" );
" . $undo",
" > $undo" ); push_indent;
if ( $balance || $default ) { if ( $balance || $default ) {
$tbl = $default ? DEFAULT_TABLE : $config{USE_DEFAULT_RT} ? BALANCE_TABLE : MAIN_TABLE; $tbl = $default ? DEFAULT_TABLE : $config{USE_DEFAULT_RT} ? BALANCE_TABLE : MAIN_TABLE;
$weight = $balance ? $balance : $default; $weight = $balance ? $balance : $default;
my $via = 'via'; my $via;
$via .= " $gateway" if $gateway; if ( $gateway ) {
$via .= " dev $physical"; $via = "via $gateway dev $physical";
$via .= " weight $weight"; } else {
$via = "dev $physical";
}
$via .= " weight $weight" unless $weight < 0;
$via .= " $realm" if $realm; $via .= " $realm" if $realm;
if ( $default < 0 ) { emit( qq(delete_gateway "$via" $tbl $physical) ) unless $default < 0;
emit( qq( run_ip route del default $via metric $number) );
} else {
emit( qq( delete_gateway "$via" $tbl $physical) );
}
} }
emit( '',
" qt \$TC qdisc del dev $physical root",
" qt \$TC qdisc del dev $physical ingress\n" ) if $tcdevices->{$interface};
emit( " progress_message2 \"Provider $table stopped\"", emit (". $undo",
'else', "> $undo" );
emit( '',
"qt \$TC qdisc del dev $physical root",
"qt \$TC qdisc del dev $physical ingress\n" ) if $tcdevices->{$interface};
emit( "progress_message2 \"Provider $table stopped\"" );
pop_indent;
emit( 'else',
" startup_error \"$undo does not exist\"", " startup_error \"$undo does not exist\"",
'fi' 'fi'
); );