aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2013-01-15 13:08:14 +0000
committerSteven Barth <cyrus@openwrt.org>2013-01-15 13:08:14 +0000
commit955a1e8e28a117a1cee056cab5eb7d6ea25974b9 (patch)
tree8cc2cf745615c27c327e4e915c2c9ab81d15a3cf
parent811cd2acf4ff784a746c421685ef189971beb141 (diff)
downloadupstream-955a1e8e28a117a1cee056cab5eb7d6ea25974b9.tar.gz
upstream-955a1e8e28a117a1cee056cab5eb7d6ea25974b9.tar.bz2
upstream-955a1e8e28a117a1cee056cab5eb7d6ea25974b9.zip
6rd: add support for native IPv6 prefix handling
SVN-Revision: 35173
-rw-r--r--package/network/ipv6/6rd/Makefile2
-rw-r--r--package/network/ipv6/6rd/files/6rd.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile
index 3d4549674f..f64cab3fe0 100644
--- a/package/network/ipv6/6rd/Makefile
+++ b/package/network/ipv6/6rd/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6rd
-PKG_VERSION:=2
+PKG_VERSION:=3
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/6rd/files/6rd.sh b/package/network/ipv6/6rd/files/6rd.sh
index 59c3169b39..b681f2bbe6 100644
--- a/package/network/ipv6/6rd/files/6rd.sh
+++ b/package/network/ipv6/6rd/files/6rd.sh
@@ -42,8 +42,12 @@ proto_6rd_setup() {
local ip6subnet=$(6rdcalc "$ip6prefix/$ip6prefixlen" "$ipaddr/$ip4prefixlen")
local ip6addr="${ip6subnet%%::*}::1"
+ # Determine the IPv6 prefix
+ local ip6lanprefix="$ip6subnet/$(($ip6prefixlen + 32 - $ip4prefixlen))"
+
proto_init_update "$link" 1
proto_add_ipv6_address "$ip6addr" "$ip6prefixlen"
+ proto_add_ipv6_prefix "$ip6lanprefix"
proto_add_ipv6_route "::" 0 "::$peeraddr"
proto_add_tunnel