From 6e5f00062cc1ef81bcafd9d9704bb0b9a6509475 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 24 Mar 2013 14:19:31 -0700 Subject: [PATCH] Revert "Use 'replace' rather than 'add' for routes defined in the routes file." This reverts commit 215fd9e234869a40040ee0a74ab27b3e91203219. Conflicts: Shorewall/Perl/Shorewall/Providers.pm --- Shorewall/Perl/Shorewall/Providers.pm | 8 ++++---- docs/MultiISP.xml | 16 ++++------------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index 844ca8e3a..7aadd9c31 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -1172,18 +1172,18 @@ sub add_a_route( ) { if ( $gateway ne '-' ) { if ( $device ne '-' ) { - push @$routes, qq(run_ip route replace $dest via $gateway dev $physical table $id); + push @$routes, qq(run_ip route add $dest via $gateway dev $physical table $id); push @$routes, q(echo "$IP ) . qq(-$family route del $dest via $gateway dev $physical table $id > /dev/null 2>&1" >> \${VARDIR}/undo_${provider}_routing) if $number >= DEFAULT_TABLE; } elsif ( $null ) { - push @$routes, qq(run_ip route replace $null $dest table $id); + push @$routes, qq(run_ip route add $null $dest table $id); push @$routes, q(echo "$IP ) . qq(-$family route del $null $dest table $id > /dev/null 2>&1" >> \${VARDIR}/undo_${provider}_routing) if $number >= DEFAULT_TABLE; } else { - push @$routes, qq(run_ip route replace $dest via $gateway table $id); + push @$routes, qq(run_ip route add $dest via $gateway table $id); push @$routes, q(echo "$IP ) . qq(-$family route del $dest via $gateway table $id > /dev/null 2>&1" >> \${VARDIR}/undo_${provider}_routing) if $number >= DEFAULT_TABLE; } } else { fatal_error "You must specify a device for this route" unless $physical; - push @$routes, qq(run_ip route replace $dest dev $physical table $id); + push @$routes, qq(run_ip route add $dest dev $physical table $id); push @$routes, q(echo "$IP ) . qq(-$family route del $dest dev $physical table $id > /dev/null 2>&1" >> \${VARDIR}/undo_${provider}_routing) if $number >= DEFAULT_TABLE; } diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml index c359412ac..6288338a6 100644 --- a/docs/MultiISP.xml +++ b/docs/MultiISP.xml @@ -1357,20 +1357,12 @@ dmz 192.168.14.0/26 blackhole The above generates the following 3 statements for execution - upon Shorewall startup. - - Shorewall 4.5.14: + upon Shorewall startup: ip route add blackhole 10.0.0.0/8 table main ip route add blackhole 82.32.0.0/12 table dmz ip route add blackhole 192.168.14.0/26 table dmz - Shorewall 4.5.15 and later: - - ip route replace blackhole 10.0.0.0/8 table main -ip route replace blackhole 82.32.0.0/12 table dmz -ip route replace blackhole 192.168.14.0/26 table dmz - When blackhole routes are added to a provider (including 'main'), @@ -1423,9 +1415,9 @@ dmz 192.168.14.0/26 unreachable The above generates the following 3 statements for execution upon Shorewall startup: - ip route replace unreachable 10.0.0.0/8 table main -ip route replace unreachable 82.32.0.0/12 table dmz -ip route replace unreachable 192.168.14.0/26 table dmz + ip route add unreachable 10.0.0.0/8 table main +ip route add unreachable 82.32.0.0/12 table dmz +ip route add unreachable 192.168.14.0/26 table dmz When prohibit or unreachable routes are added to a