aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/config
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/config
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/config')
-rwxr-xr-xpackage/network/config/netifd/files/lib/netifd/dhcp.script1
-rwxr-xr-xpackage/network/config/netifd/files/lib/netifd/proto/dhcp.sh6
2 files changed, 5 insertions, 2 deletions
diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index c597840362..948c3cd665 100755
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -54,6 +54,7 @@ setup_interface () {
json_add_int ip6prefixlen "$ip6rdprefixlen"
json_add_string tunlink "$INTERFACE"
[ -n "$IFACE6RD_DELEGATE" ] && json_add_boolean delegate "$IFACE6RD_DELEGATE"
+ [ -n "$ZONE6RD" ] && json_add_string zone "$ZONE6RD"
json_close_object
ubus call network add_dynamic "$(json_dump)"
diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index 80c3562e69..93f4a5e09a 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -15,14 +15,15 @@ proto_dhcp_init_config() {
proto_config_add_string iface6rd
proto_config_add_string sendopts
proto_config_add_boolean delegate
+ proto_config_add_string zone6rd
}
proto_dhcp_setup() {
local config="$1"
local iface="$2"
- local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate
- json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate
+ local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd
+ json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd
local opt dhcpopts
for opt in $reqopts; do
@@ -37,6 +38,7 @@ proto_dhcp_setup() {
[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
[ -n "$iface6rd" ] && append dhcpopts "-O 212"
+ [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
[ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
proto_export "INTERFACE=$config"