diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-05-19 07:53:08 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-05-19 07:53:08 +0000 |
| commit | 08f057c703fca370fd2f212eef6e0122028be023 (patch) | |
| tree | ab36479b9a4bbdc9245af4dcfd80acbac2771c98 /package/network/ipv6/6to4 | |
| parent | 12969569086d18bd6ee4235224ea098607e860b9 (diff) | |
| download | upstream-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/6to4')
| -rw-r--r-- | package/network/ipv6/6to4/Makefile | 2 | ||||
| -rwxr-xr-x | package/network/ipv6/6to4/files/6to4.sh | 13 |
2 files changed, 5 insertions, 10 deletions
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 |