extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 22:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'fallback' without weight

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-10-09 06:58:41 -07:00
parent 3afd6a3ad3
commit 035db174d8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,7 +579,7 @@ sub add_a_provider( $$ ) {
emit qq(echo "qt \$IP -$family route del default dev $physical table ) . DEFAULT_TABLE . qq(" >> \${VARDIR}/undo_${table}_routing); emit qq(echo "qt \$IP -$family route del default dev $physical table ) . DEFAULT_TABLE . qq(" >> \${VARDIR}/undo_${table}_routing);
} }
$default = 1; $fallback = 1;
} }
unless ( $local ) { unless ( $local ) {
@ -630,9 +630,14 @@ sub add_a_provider( $$ ) {
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 : abs $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;
@ -711,8 +716,12 @@ sub add_a_provider( $$ ) {
$via .= " weight $weight"; $via .= " weight $weight";
$via .= " $realm" if $realm; $via .= " $realm" if $realm;
if ( $default < 0 ) {
emit( qq( run_ip route del default $via metric $number) );
} else {
emit( qq( delete_gateway "$via" $tbl $physical) ); emit( qq( delete_gateway "$via" $tbl $physical) );
} }
}
emit( '', emit( '',
" qt \$TC qdisc del dev $physical root", " qt \$TC qdisc del dev $physical root",