diff options
| author | Steven Barth <steven@midlink.org> | 2015-04-09 08:17:32 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-04-09 08:17:32 +0000 |
| commit | 46ae0c2d711254ceb0d27ed4254a4416b93ca5d5 (patch) | |
| tree | ebceba5326f9505a01bddd1d65f2b9aeb62a9897 /package/network/ipv6/odhcp6c/files/dhcpv6.sh | |
| parent | 408328dff3def5cb4389c1c79a863e0061a47ee2 (diff) | |
| download | master-187ad058-46ae0c2d711254ceb0d27ed4254a4416b93ca5d5.tar.gz master-187ad058-46ae0c2d711254ceb0d27ed4254a4416b93ca5d5.tar.bz2 master-187ad058-46ae0c2d711254ceb0d27ed4254a4416b93ca5d5.zip | |
odhcp6c: add 464xlat integration, fix dslite integration
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45323 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6/odhcp6c/files/dhcpv6.sh')
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 5914abe0bb..9fb6fa342f 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -19,6 +19,8 @@ proto_dhcpv6_init_config() { proto_config_add_string zone_dslite proto_config_add_string iface_map proto_config_add_string zone_map + proto_config_add_string iface_464xlat + proto_config_add_string zone_464xlat proto_config_add_string zone proto_config_add_string 'ifaceid:ip6addr' proto_config_add_string 'sourcerouting:bool' @@ -33,8 +35,8 @@ proto_dhcpv6_setup() { local config="$1" local iface="$2" - local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout fakeroutes - json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout fakeroutes + local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes + json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes # Configure @@ -67,11 +69,13 @@ proto_dhcpv6_setup() { [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" + [ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat" [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1" [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0" [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0" [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite" [ -n "$zone_map" ] && proto_export "ZONE_MAP=$zone_map" + [ -n "$zone_464xlat" ] && proto_export "ZONE_464XLAT=$zone_464xlat" [ -n "$zone" ] && proto_export "ZONE=$zone" [ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1" |