ipv6: remove now unneeded source-dest-routing workarounds

Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 45700

diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile
index 21e69e6f49acf8716726cbe0bca0c9b0e0f4b104..b7c2da725ccd80090bb5ce653de4334de380ac5d 100644 (file)
--- a/package/network/ipv6/6in4/Makefile
+++ b/package/network/ipv6/6in4/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
 PKG_VERSION:=21
 
 PKG_NAME:=6in4
 PKG_VERSION:=21

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh
index 0289df30316cbf48ab38fb99346ff889e647b206..af2ddca1d7959a56e0cc6d71e3e769acab3cabc2 100755 (executable)
--- a/package/network/ipv6/6in4/files/6in4.sh
+++ b/package/network/ipv6/6in4/files/6in4.sh
@@ -27,8 +27,8 @@ proto_6in4_setup() {
        local iface="$2"
        local link="6in4-$cfg"
 
        local iface="$2"
        local link="6in4-$cfg"
 

-       local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
-       json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
+       local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey
+       json_get_vars mtu ttl tos ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey

 
        [ -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"
 
        [ -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"


@@ -48,21 +48,17 @@ proto_6in4_setup() {
 
        proto_init_update "$link" 1
 
 
        proto_init_update "$link" 1
 

-       local source=""
-       [ "$sourcerouting" != "0" ] && source="::/128"
-       proto_add_ipv6_route "::" 0 "" "" "" "$source"
-

        [ -n "$ip6addr" ] && {
                local local6="${ip6addr%%/*}"
                local mask6="${ip6addr##*/}"
                [[ "$local6" = "$mask6" ]] && mask6=
                proto_add_ipv6_address "$local6" "$mask6"
        [ -n "$ip6addr" ] && {
                local local6="${ip6addr%%/*}"
                local mask6="${ip6addr##*/}"
                [[ "$local6" = "$mask6" ]] && mask6=
                proto_add_ipv6_address "$local6" "$mask6"

-               [ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
+               proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"

        }
 
        [ -n "$ip6prefix" ] && {
                proto_add_ipv6_prefix "$ip6prefix"
        }
 
        [ -n "$ip6prefix" ] && {
                proto_add_ipv6_prefix "$ip6prefix"

-               [ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
+               proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"

        }
 
        proto_add_tunnel
        }
 
        proto_add_tunnel


@@ -146,7 +142,6 @@ proto_6in4_init_config() {
        proto_config_add_int "mtu"
        proto_config_add_int "ttl"
        proto_config_add_string "tos"
        proto_config_add_int "mtu"
        proto_config_add_int "ttl"
        proto_config_add_string "tos"

-       proto_config_add_boolean "sourcerouting"

 }
 
 [ -n "$INCLUDE_ONLY" ] || {
 }
 
 [ -n "$INCLUDE_ONLY" ] || {

diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile
index f9b7eae1391a820862f22c6e1d578d543e361261..cde711771c50351fa39f30b3cc9c0c5cf0774ba0 100644 (file)
--- a/package/network/ipv6/6rd/Makefile
+++ b/package/network/ipv6/6rd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6rd
 PKG_VERSION:=9
 
 PKG_NAME:=6rd
 PKG_VERSION:=9

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh
index b48513640e848535cb51d82cdf4c7d040235e782..6c68b3bcb42069c5c9939ec5ac1ab39ce7fd833e 100644 (file)
--- a/package/network/ipv6/6rd/files/6rd.sh
+++ b/package/network/ipv6/6rd/files/6rd.sh
@@ -14,8 +14,8 @@ proto_6rd_setup() {
        local iface="$2"
        local link="6rd-$cfg"
 
        local iface="$2"
        local link="6rd-$cfg"
 

-       local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
-       json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
+       local mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone
+       json_get_vars mtu df ttl tos ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink zone

 
        [ -z "$ip6prefix" -o -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"
 
        [ -z "$ip6prefix" -o -z "$peeraddr" ] && {
                proto_notify_error "$cfg" "MISSING_ADDRESS"


@@ -54,13 +54,8 @@ proto_6rd_setup() {
        proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
        proto_add_ipv6_prefix "$ip6lanprefix"
 
        proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
        proto_add_ipv6_prefix "$ip6lanprefix"
 

-       if [ "$sourcerouting" != "0" ]; then
-               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "::/128"
-               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
-               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"
-       else
-               proto_add_ipv6_route "::" 0 "::$peeraddr" 4096
-       fi
+       proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6addr/$ip6prefixlen"
+       proto_add_ipv6_route "::" 0 "::$peeraddr" 4096 "" "$ip6lanprefix"

 
        proto_add_tunnel
        json_add_string mode sit
 
        proto_add_tunnel
        json_add_string mode sit

diff --git a/package/network/ipv6/6to4/Makefile b/package/network/ipv6/6to4/Makefile
index 6be2cc57706a6b45128aa21ca5943621adac5eed..fcec90de0bf7e53e7c849777121e0dd853b9e1ca 100644 (file)
--- a/package/network/ipv6/6to4/Makefile
+++ b/package/network/ipv6/6to4/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6to4
 PKG_VERSION:=12
 
 PKG_NAME:=6to4
 PKG_VERSION:=12

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/network/ipv6/6to4/files/6to4.sh b/package/network/ipv6/6to4/files/6to4.sh
index ce1de53ea851d405bdf2303ee00d0ddb3d2c919e..57efc525c5a4d98f7fd2b2f95258adb9b73a7c48 100755 (executable)
--- a/package/network/ipv6/6to4/files/6to4.sh
+++ b/package/network/ipv6/6to4/files/6to4.sh
@@ -34,8 +34,8 @@ proto_6to4_setup() {
        local iface="$2"
        local link="6to4-$cfg"
 
        local iface="$2"
        local link="6to4-$cfg"
 

-       local mtu ttl tos ipaddr sourcerouting
-       json_get_vars mtu ttl tos ipaddr sourcerouting
+       local mtu ttl tos ipaddr
+       json_get_vars mtu ttl tos ipaddr

 
        ( proto_add_host_dependency "$cfg" 0.0.0.0 )
 
 
        ( proto_add_host_dependency "$cfg" 0.0.0.0 )
 


@@ -65,13 +65,8 @@ proto_6to4_setup() {
        proto_add_ipv6_address "$local6" 16
        proto_add_ipv6_prefix "$prefix6::/48"
 
        proto_add_ipv6_address "$local6" 16
        proto_add_ipv6_prefix "$prefix6::/48"
 

-       if [ "$sourcerouting" != "0" ]; then
-               proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "::/128"
-               proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
-               proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"
-       else
-               proto_add_ipv6_route "::" 0 "::192.88.99.1"
-       fi
+       proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$local6/16"
+       proto_add_ipv6_route "::" 0 "::192.88.99.1" "" "" "$prefix6::/48"

 
        proto_add_tunnel
        json_add_string mode sit
 
        proto_add_tunnel
        json_add_string mode sit

diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index d5b1700d375145c9f0122c016687eb9e4f502650..c53a523f68ce05f9f4aad08e171f256fb5f1e366 100644 (file)
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c

-PKG_VERSION:=2015-05-16
+PKG_VERSION:=2015-05-19

 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 5e5b9a9cea89cb499cbf99c15dfa6486e26d0e94..a2adf39ad16725203a0d3cf2aa84cdcffeed571d 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -86,10 +86,9 @@ setup_interface () {
                entry="${entry#*,}"
                local metric="${entry%%,*}"
 
                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"
                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"
                        for prefix in $PREFIXES $ADDRESSES; do
                                local paddr="${prefix%%,*}"
                                proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid" "$paddr"

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index 9fb6fa342fa5540eb544f435c5ab32960bd32a2d..adcb1007a9684af6fff821be7490640ba09ffa10 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -23,7 +23,6 @@ proto_dhcpv6_init_config() {
        proto_config_add_string zone_464xlat
        proto_config_add_string zone
        proto_config_add_string 'ifaceid:ip6addr'
        proto_config_add_string zone_464xlat
        proto_config_add_string zone
        proto_config_add_string 'ifaceid:ip6addr'

-       proto_config_add_string 'sourcerouting:bool'

        proto_config_add_string "userclass"
        proto_config_add_string "vendorclass"
        proto_config_add_boolean delegate
        proto_config_add_string "userclass"
        proto_config_add_string "vendorclass"
        proto_config_add_boolean delegate


@@ -35,8 +34,8 @@ proto_dhcpv6_setup() {
        local config="$1"
        local iface="$2"
 
        local config="$1"
        local iface="$2"
 

-       local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
-       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
+       local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes
+       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes

 
 
        # Configure
 
 
        # Configure


@@ -70,7 +69,6 @@ proto_dhcpv6_setup() {
        [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
        [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map"
        [ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat"
        [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
        [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map"
        [ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat"

-       [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"

        [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
        [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
        [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"
        [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
        [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
        [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"