183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcpv6: set default solicit timeout back to 120s

Browse Source 
This deliberatly breaks RFC 7083 since its not really user-friendly.

SVN-Revision: 41001
This commit is contained in:
Steven Barth 2014-06-04 09:59:45 +00:00
parent 5a9c834a12
commit 54291b16e6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/ipv6/odhcp6c/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_VERSION:=2014-05-30 PKG_VERSION:=2014-06-04
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

7
package/network/ipv6/odhcp6c/files/dhcpv6.sh
View File

@ -24,14 +24,15 @@ proto_dhcpv6_init_config() {
proto_config_add_string "userclass" proto_config_add_string "userclass"
proto_config_add_string "vendorclass" proto_config_add_string "vendorclass"
proto_config_add_boolean delegate proto_config_add_boolean delegate
proto_config_add_int "soltimeout"
} }
proto_dhcpv6_setup() { proto_dhcpv6_setup() {
local config="$1" local config="$1"
local iface="$2" 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 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 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 # Configure
@ -59,6 +60,8 @@ proto_dhcpv6_setup() {
append opts "-r$opt" append opts "-r$opt"
done done
append opts "-t${soltimeout:-120}"
[ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
[ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
[ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map"