extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-22 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve quoting in the route-balancing logic

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2018-01-21 14:46:51 -08:00
parent 416224ee05
commit 64f704a964
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,22 +338,22 @@ sub balance_default_route( $$$$ ) {
if ( $first_default_route ) { if ( $first_default_route ) {
if ( $balanced_providers == 1 ) { if ( $balanced_providers == 1 ) {
if ( $gateway ) { if ( $gateway ) {
emit "DEFAULT_ROUTE=\"via $gateway dev $interface $realm\""; emit qq(DEFAULT_ROUTE="via $gateway dev $interface $realm");
} else { } else {
emit "DEFAULT_ROUTE=\"dev $interface $realm\""; emit qq(DEFAULT_ROUTE="dev $interface $realm");
} }
} elsif ( $gateway ) { } elsif ( $gateway ) {
emit "DEFAULT_ROUTE=\"nexthop via $gateway dev $interface weight $weight $realm\""; emit qq(DEFAULT_ROUTE="nexthop via $gateway dev $interface weight $weight $realm");
} else { } else {
emit "DEFAULT_ROUTE=\"nexthop dev $interface weight $weight $realm\""; emit qq(DEFAULT_ROUTE="nexthop dev $interface weight $weight $realm");
} }
$first_default_route = 0; $first_default_route = 0;
} else { } else {
if ( $gateway ) { if ( $gateway ) {
emit "DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop via $gateway dev $interface weight $weight $realm\""; emit qq(DEFAULT_ROUTE="\$DEFAULT_ROUTE nexthop via $gateway dev $interface weight $weight $realm");
} else { } else {
emit "DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop dev $interface weight $weight $realm\""; emit qq(DEFAULT_ROUTE="\$DEFAULT_ROUTE nexthop dev $interface weight $weight $realm");
} }
} }
} }
@ -368,22 +368,22 @@ sub balance_fallback_route( $$$$ ) {
if ( $first_fallback_route ) { if ( $first_fallback_route ) {
if ( $fallback_providers == 1 ) { if ( $fallback_providers == 1 ) {
if ( $gateway ) { if ( $gateway ) {
emit "FALLBACK_ROUTE=\"via $gateway dev $interface $realm\""; emit qq(FALLBACK_ROUTE="via $gateway dev $interface $realm");
} else { } else {
emit "FALLBACK_ROUTE=\"dev $interface $realm\""; emit qq(FALLBACK_ROUTE="dev $interface $realm");
} }
} elsif ( $gateway ) { } elsif ( $gateway ) {
emit "FALLBACK_ROUTE=\"nexthop via $gateway dev $interface weight $weight $realm\""; emit qq(FALLBACK_ROUTE="nexthop via $gateway dev $interface weight $weight $realm");
} else { } else {
emit "FALLBACK_ROUTE=\"nexthop dev $interface weight $weight $realm\""; emit qq(FALLBACK_ROUTE="nexthop dev $interface weight $weight $realm");
} }
$first_fallback_route = 0; $first_fallback_route = 0;
} else { } else {
if ( $gateway ) { if ( $gateway ) {
emit "FALLBACK_ROUTE=\"\$FALLBACK_ROUTE nexthop via $gateway dev $interface weight $weight $realm\""; emit qq(FALLBACK_ROUTE="\$FALLBACK_ROUTE nexthop via $gateway dev $interface weight $weight $realm");
} else { } else {
emit "FALLBACK_ROUTE=\"\$FALLBACK_ROUTE nexthop dev $interface weight $weight $realm\""; emit qq(FALLBACK_ROUTE="\$FALLBACK_ROUTE nexthop dev $interface weight $weight $realm");
} }
} }
} }