From dac4df8f12bc4d4c5a25f026fc701687cc11bad8 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 30 Apr 2014 15:52:30 +0000 Subject: odhcp6c: add preliminary support for MAP provisioning git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40604 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/ipv6/odhcp6c/files/dhcpv6.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'package/network/ipv6/odhcp6c/files/dhcpv6.sh') diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 90a83718e5..226ca76d04 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -17,6 +17,8 @@ proto_dhcpv6_init_config() { proto_config_add_string 'ip6prefix:ip6addr' proto_config_add_string iface_dslite proto_config_add_string zone_dslite + proto_config_add_string iface_map + proto_config_add_string zone_map proto_config_add_string 'ifaceid:ip6addr' proto_config_add_string 'sourcerouting:bool' proto_config_add_string "userclass" @@ -28,8 +30,8 @@ proto_dhcpv6_setup() { local config="$1" local iface="$2" - local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass delegate zone_dslite - json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass delegate zone_dslite + local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map + json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map # Configure @@ -59,9 +61,12 @@ 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" [ "$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" proto_export "INTERFACE=$config" proto_run_command "$config" odhcp6c \ -- cgit v1.2.3