aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/ipv6/6rd/files
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-05-19 07:53:08 +0000
committerSteven Barth <cyrus@openwrt.org>2015-05-19 07:53:08 +0000
commit08f057c703fca370fd2f212eef6e0122028be023 (patch)
treeab36479b9a4bbdc9245af4dcfd80acbac2771c98 /package/network/ipv6/6rd/files
parent12969569086d18bd6ee4235224ea098607e860b9 (diff)
downloadupstream-08f057c703fca370fd2f212eef6e0122028be023.tar.gz
upstream-08f057c703fca370fd2f212eef6e0122028be023.tar.bz2
upstream-08f057c703fca370fd2f212eef6e0122028be023.zip
ipv6: remove now unneeded source-dest-routing workarounds
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 45700
Diffstat (limited to 'package/network/ipv6/6rd/files')
-rw-r--r--package/network/ipv6/6rd/files/6rd.sh13
1 files changed, 4 insertions, 9 deletions
diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh
index b48513640e..6c68b3bcb4 100644
--- 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 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"
@@ -54,13 +54,8 @@ proto_6rd_setup() {
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