diff options
| author | Steven Barth <steven@midlink.org> | 2015-05-19 07:53:08 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-05-19 07:53:08 +0000 |
| commit | fcf1894720fd0d7ad9051e5802f366ff062b5f7c (patch) | |
| tree | 1e2d9640466dad9e6593788571a72218a893adea /package/network/ipv6/6in4 | |
| parent | 5ce1189dcfd1f0b8c42056bcf1b179be12120297 (diff) | |
| download | upstream-fcf1894720fd0d7ad9051e5802f366ff062b5f7c.tar.gz upstream-fcf1894720fd0d7ad9051e5802f366ff062b5f7c.tar.bz2 upstream-fcf1894720fd0d7ad9051e5802f366ff062b5f7c.zip | |
ipv6: remove now unneeded source-dest-routing workarounds
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45700 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6/6in4')
| -rw-r--r-- | package/network/ipv6/6in4/Makefile | 2 | ||||
| -rwxr-xr-x | package/network/ipv6/6in4/files/6in4.sh | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile index 21e69e6f49..b7c2da725c 100644 --- 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_RELEASE:=1 +PKG_RELEASE:=2 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 0289df3031..af2ddca1d7 100755 --- 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 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" @@ -48,21 +48,17 @@ proto_6in4_setup() { 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" - [ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6" + proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6" } [ -n "$ip6prefix" ] && { proto_add_ipv6_prefix "$ip6prefix" - [ "$sourcerouting" != "0" ] && proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix" + proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix" } 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_boolean "sourcerouting" } [ -n "$INCLUDE_ONLY" ] || { |