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

Remove special handling of 2000::/3 routes

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9158 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-21 17:51:08 +00:00
parent b6c1153809
commit d1d0f15893
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall-perl/Shorewall/Providers.pm
View File

@ -134,7 +134,7 @@ sub copy_table( $$$ ) {
}
emit ( ' case $net in',
' default|nexthop|2000::/3)',
' default|nexthop)',
' ;;',
' *)',
" run_ip route add table $number \$net \$route $realm",
@ -154,7 +154,7 @@ sub copy_and_edit_table( $$$$ ) {
}
emit ( ' case $net in',
' default|nexthop|2000::/3)',
' default|nexthop)',
' ;;',
' *)',
' case $(find_device $route) in',
@ -522,7 +522,7 @@ sub setup_providers() {
emit ( '#',
'# Capture the default route(s) if we don\'t have it (them) already.',
'#',
'[ -f ${VARDIR}/default_route ] || ip -' . $family . ' route list | grep -E \'^\s*(default |nexthop |2000::/3 )\' > ${VARDIR}/default_route',
'[ -f ${VARDIR}/default_route ] || ip -' . $family . ' route list | grep -E \'^\s*(default |nexthop )\' > ${VARDIR}/default_route',
'#',
'# Initialize the file that holds \'undo\' commands',
'#',

10
Shorewall-perl/prog.header6
View File

@ -396,7 +396,7 @@ find_nexthop() # $1 = interface
#
find_default_interface() {
ip -6 route list | while read first rest; do
[ "$first" = 2000::/3 -o "$first" = default ] && echo $(find_device $rest) && return
[ "$first" = default ] && echo $(find_device $rest) && return
done
}
@ -504,7 +504,7 @@ get_routed_networks() # $1 = interface name, $2-n = Fatal error message
ip -6 route show dev $1 2> /dev/null |
while read address rest; do
case "$address" in
default|2000::/3)
default)
if [ $# -gt 1 ]; then
shift
fatal_error "$@"
@ -754,7 +754,7 @@ detect_gateway() # $1 = interface
#
# Maybe there's a default route through this gateway already
#
[ -n "$gateway" ] || gateway=$(find_gateway $(ip -6 route list dev $interface | grep -E '^(default |2000::/3)'))
[ -n "$gateway" ] || gateway=$(find_gateway $(ip -6 route list dev $interface | grep '^default'))
#
# Last hope -- is there a load-balancing route through the interface?
#
@ -859,14 +859,14 @@ restore_default_route() {
while read route ; do
case $route in
2000::/3*)
default)
if [ -n "$default_route" ]; then
case "$default_route" in
*metric*)
#
# Don't restore a route with a metric -- we only replace the one with metric == 0
#
qt ip -6 route delete 2000::/3 metric 0 && \
qt ip -6 route delete default metric 0 && \
progress_message "Default Route with metric 0 deleted"
;;
*)