From 54291b16e642e3108e9e73358cbcad31e5bb8c74 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 4 Jun 2014 09:59:45 +0000 Subject: dhcpv6: set default solicit timeout back to 120s This deliberatly breaks RFC 7083 since its not really user-friendly. SVN-Revision: 41001 --- package/network/ipv6/odhcp6c/files/dhcpv6.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'package/network/ipv6/odhcp6c/files') diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 226ca76d04..1c6d609d43 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -24,14 +24,15 @@ proto_dhcpv6_init_config() { proto_config_add_string "userclass" proto_config_add_string "vendorclass" proto_config_add_boolean delegate + proto_config_add_int "soltimeout" } 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 - json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map + local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map soltimeout + json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map soltimeout # Configure @@ -59,6 +60,8 @@ proto_dhcpv6_setup() { append opts "-r$opt" done + append opts "-t${soltimeout:-120}" + [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" -- cgit v1.2.3