aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/ipv6/6rd
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-03-26 10:12:49 +0000
committerSteven Barth <cyrus@openwrt.org>2014-03-26 10:12:49 +0000
commit0555ebf66d415045b176181cde25ba2ed063c09d (patch)
tree7e4c9b3cc2e88b27a8c4dfb6d1877d923e7d16e1 /package/network/ipv6/6rd
parent2a893c205727686089887358498248ea21a91106 (diff)
downloadupstream-0555ebf66d415045b176181cde25ba2ed063c09d.tar.gz
upstream-0555ebf66d415045b176181cde25ba2ed063c09d.tar.bz2
upstream-0555ebf66d415045b176181cde25ba2ed063c09d.zip
6rd / ds-lite: make the firewall-zones of nested-protocols configurable
SVN-Revision: 40020
Diffstat (limited to 'package/network/ipv6/6rd')
-rw-r--r--package/network/ipv6/6rd/Makefile2
-rw-r--r--package/network/ipv6/6rd/files/6rd.sh9
2 files changed, 8 insertions, 3 deletions
diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile
index 5a4807805c..19177f1c46 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:=5
+PKG_VERSION:=6
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 e80729c341..58b16c8ff7 100644
--- a/package/network/ipv6/6rd/files/6rd.sh
+++ b/package/network/ipv6/6rd/files/6rd.sh
@@ -14,8 +14,8 @@ proto_6rd_setup() {
local iface="$2"
local link="6rd-$cfg"
- local mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting
- json_get_vars mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting
+ local mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
+ json_get_vars mtu df ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink sourcerouting zone
[ -z "$ip6prefix" -o -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS"
@@ -68,6 +68,10 @@ proto_6rd_setup() {
[ -n "$tunlink" ] && json_add_string link "$tunlink"
proto_close_tunnel
+ proto_add_data
+ [ -n "$zone" ] && json_add_string zone "$zone"
+ proto_close_data
+
proto_send_update "$cfg"
}
@@ -89,6 +93,7 @@ proto_6rd_init_config() {
proto_config_add_string "ip4prefixlen"
proto_config_add_string "tunlink"
proto_config_add_boolean "sourcerouting"
+ proto_config_add_string "zone"
}
[ -n "$INCLUDE_ONLY" ] || {