From fcf1894720fd0d7ad9051e5802f366ff062b5f7c 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45700 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/ipv6/6to4/Makefile | 2 +- package/network/ipv6/6to4/files/6to4.sh | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'package/network/ipv6/6to4') diff --git a/package/network/ipv6/6to4/Makefile b/package/network/ipv6/6to4/Makefile index 6be2cc5770..fcec90de0b 100644 --- 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_RELEASE:=1 +PKG_RELEASE:=2 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 ce1de53ea8..57efc525c5 100755 --- 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 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 ) @@ -65,13 +65,8 @@ proto_6to4_setup() { 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 -- cgit v1.2.3