Ticket #152: iproute2.sh.diff

iproute2.sh

@@ -139 +139 @@
                 set -- "${one}" "${two}" via "$@"
         fi
 
-        local cmd= have_metric=false 
+        local family_list= gateway_specified=false
+        local cmd= have_metric=false is_default_route=false
         while [ -n "$1" ]; do
                 case "$1" in
+                        default) cmd="${cmd} $1"; is_default_route=true;;
+                        via) cmd="${cmd} $1"; gateway_specified=true;;
                         metric) cmd="${cmd} $1"; have_metric=true;;
                         netmask) cmd="${cmd}/$(_netmask2cidr "$2")"; shift;;
+                        -A|-f|-family) family_list="${family_list} $2"; shift;;
                         -host|-net);;
-                        -A)     [ "$2" = "inet6" ] && shift;;
                         *) cmd="${cmd} $1";;
                 esac
                 shift
@@ -155 +158 @@
                 cmd="${cmd} metric ${metric}"
         fi
 
-        ip route append ${cmd} dev "${IFACE}"
-        eend $?
+        # We have really default route - no gateway, no family - iproute2 can't
+        # determine which family we use by gateway address, so it will default to ipv4.
+        if ${is_default_route} && ! ${gateway_specified} && [ -z "${family_list}" ] && \
+                        ip -family inet6 addr show dev "${IFACE}" &>/dev/null; then
+                ewarn "Adding default route for both ipv4 and ipv6"
+                family_list="inet inet6";
+        fi
+        
+        if [ -n "${family_list}" ]; then
+                for family in ${family_list}; do
+                        ip -family ${family} route append ${cmd} dev "${IFACE}" || eend 1
+                done
+
+                eend 0
+        else
+                ip route append ${cmd} dev "${IFACE}"
+                eend $?
+        fi
 }
 
 _delete_addresses()