aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2013-01-15 13:08:05 +0000
committerSteven Barth <cyrus@openwrt.org>2013-01-15 13:08:05 +0000
commit2a94f67029eb9c58faca930687751f0ca7202050 (patch)
tree140b99e0e89c15d9d339374788002b11365e00d0 /package/network
parenta1e92f6dd136564cd129b4ea5ac4a0860f030cb4 (diff)
downloadupstream-2a94f67029eb9c58faca930687751f0ca7202050.tar.gz
upstream-2a94f67029eb9c58faca930687751f0ca7202050.tar.bz2
upstream-2a94f67029eb9c58faca930687751f0ca7202050.zip
6in4: add support for native IPv6 prefix handling
SVN-Revision: 35171
Diffstat (limited to 'package/network')
-rw-r--r--package/network/ipv6/6in4/Makefile2
-rwxr-xr-xpackage/network/ipv6/6in4/files/6in4.sh7
2 files changed, 6 insertions, 3 deletions
diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile
index fcb0a7e756..cddf0372e5 100644
--- a/package/network/ipv6/6in4/Makefile
+++ b/package/network/ipv6/6in4/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6in4
-PKG_VERSION:=12
+PKG_VERSION:=13
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh
index 651d7b97b7..ef25322346 100755
--- a/package/network/ipv6/6in4/files/6in4.sh
+++ b/package/network/ipv6/6in4/files/6in4.sh
@@ -14,8 +14,8 @@ proto_6in4_setup() {
local iface="$2"
local link="6in4-$cfg"
- local mtu ttl ipaddr peeraddr ip6addr tunnelid username password
- json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password
+ local mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password
+ json_get_vars mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password
[ -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS"
@@ -43,6 +43,8 @@ proto_6in4_setup() {
proto_add_ipv6_address "$local6" "$mask6"
}
+ [ -n "$ip6prefix" ] && proto_add_ipv6_prefix "$ip6prefix"
+
proto_add_tunnel
json_add_string mode sit
json_add_int mtu "${mtu:-1280}"
@@ -79,6 +81,7 @@ proto_6in4_init_config() {
proto_config_add_string "ipaddr"
proto_config_add_string "ip6addr"
+ proto_config_add_string "ip6prefix"
proto_config_add_string "peeraddr"
proto_config_add_string "tunnelid"
proto_config_add_string "username"