diff options
| author | Steven Barth <steven@midlink.org> | 2014-03-26 10:12:49 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-03-26 10:12:49 +0000 |
| commit | 58ca40c218871497e81d4cffacea10bef2c265bf (patch) | |
| tree | 5d0ebda34fd6e711497d03a74fce42003345ed32 /package/network/config | |
| parent | 3e85c08bbb6bd627bc8edf5f45aa3fcc4d1c8081 (diff) | |
| download | master-187ad058-58ca40c218871497e81d4cffacea10bef2c265bf.tar.gz master-187ad058-58ca40c218871497e81d4cffacea10bef2c265bf.tar.bz2 master-187ad058-58ca40c218871497e81d4cffacea10bef2c265bf.zip | |
6rd / ds-lite: make the firewall-zones of nested-protocols configurable
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40020 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/config')
| -rwxr-xr-x | package/network/config/netifd/files/lib/netifd/dhcp.script | 1 | ||||
| -rwxr-xr-x | package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 6 |
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" |