From 08f057c703fca370fd2f212eef6e0122028be023 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 19 May 2015 07:53:08 +0000 Subject: ipv6: remove now unneeded source-dest-routing workarounds Signed-off-by: Steven Barth SVN-Revision: 45700 --- package/network/ipv6/6rd/Makefile | 2 +- package/network/ipv6/6rd/files/6rd.sh | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'package/network/ipv6/6rd') diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile index f9b7eae139..cde711771c 100644 --- 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_RELEASE:=1 +PKG_RELEASE:=2 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 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 -- cgit v1.2.3