ipv6: remove now unneeded source-dest-routing workarounds

[openwrt/svn-archive/archive.git] / package / network / ipv6 / odhcp6c / files / dhcpv6.script

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 515bee32b4c79896fc5834db821730c80ad5f25f..a2adf39ad16725203a0d3cf2aa84cdcffeed571d 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -34,10 +34,10 @@ setup_interface () {
 
        for prefix in $PREFIXES; do
                proto_add_ipv6_prefix "$prefix"
-                local entry="${prefix#*/}"
-                entry="${entry#*,}"
-                entry="${entry#*,}"
-                local valid="${entry%%,*}"
+               local entry="${prefix#*/}"
+               entry="${entry#*,}"
+               entry="${entry#*,}"
+               local valid="${entry%%,*}"
 
                if [ -z "$RA_ADDRESSES" -a -z "$RA_ROUTES" -a \
                                -z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then
@@ -69,10 +69,10 @@ setup_interface () {
 
                proto_add_ipv6_address "$addr" "$mask" "$preferred" "$valid" 1
 
-                if [ -z "$RA_ADDRESSES" -a -z "$RA_ROUTES" -a \
-                                -z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then
-                        RA_ROUTES="::/0,$SERVER,$valid,4096"
-                fi
+               if [ -z "$RA_ADDRESSES" -a -z "$RA_ROUTES" -a \
+                               -z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then
+                       RA_ROUTES="::/0,$SERVER,$valid,4096"
+               fi
        done
 
        for entry in $RA_ROUTES; do
@@ -86,10 +86,9 @@ setup_interface () {
                entry="${entry#*,}"
                local metric="${entry%%,*}"
 
-               if [ -z "$SOURCE_ROUTING" -o -z "$gw" ]; then
+               if [ -z "$gw" ]; then
                        proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid"
                else
-                       proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "::/128"
                        for prefix in $PREFIXES $ADDRESSES; do
                                local paddr="${prefix%%,*}"
                                proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr"
@@ -122,7 +121,7 @@ setup_interface () {
        [ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE)
 
        if [ "$IFACE_MAP" != 0 -a -n "$MAPTYPE" -a -n "$MAPRULE" ]; then
-               [ -z "$IFACE_MAP" -o "$IFACE_MAP" = 1 ] && IFACE_MAP=${INTERFACE}_map
+               [ -z "$IFACE_MAP" -o "$IFACE_MAP" = 1 ] && IFACE_MAP=${INTERFACE}_4
                json_init
                json_add_string name "$IFACE_MAP"
                json_add_string ifname "@$INTERFACE"
@@ -136,7 +135,7 @@ setup_interface () {
                json_close_object
                ubus call network add_dynamic "$(json_dump)"
        elif [ -n "$AFTR" -a "$IFACE_DSLITE" != 0 -a -f /lib/netifd/proto/dslite.sh ]; then
-               [ -z "$IFACE_DSLITE" -o "$IFACE_DSLITE" = 1 ] && IFACE_DSLITE=${INTERFACE}_dslite
+               [ -z "$IFACE_DSLITE" -o "$IFACE_DSLITE" = 1 ] && IFACE_DSLITE=${INTERFACE}_4
                json_init
                json_add_string name "$IFACE_DSLITE"
                json_add_string ifname "@$INTERFACE"
@@ -149,7 +148,7 @@ setup_interface () {
                json_close_object
                ubus call network add_dynamic "$(json_dump)"
        elif [ "$IFACE_464XLAT" != 0 -a -f /lib/netifd/proto/464xlat.sh ]; then
-               [ -z "$IFACE_464XLAT" -o "$IFACE_464XLAT" = 1 ] && IFACE_464XLAT=${INTERFACE}_464xlat
+               [ -z "$IFACE_464XLAT" -o "$IFACE_464XLAT" = 1 ] && IFACE_464XLAT=${INTERFACE}_4
                json_init
                json_add_string name "$IFACE_464XLAT"
                json_add_string ifname "@$INTERFACE"