Author: cyrus
Date: 2014-06-04 11:59:45 +0200 (Wed, 04 Jun 2014)
New Revision: 41001
Modified:
trunk/package/network/ipv6/odhcp6c/Makefile
trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh
Log:
dhcpv6: set default solicit timeout back to 120s
This deliberatly breaks RFC 7083 since its not really user-friendly.
Modified: trunk/package/network/ipv6/odhcp6c/Makefile
===================================================================
--- trunk/package/network/ipv6/odhcp6c/Makefile 2014-06-04 07:20:31 UTC (rev
41000)
+++ trunk/package/network/ipv6/odhcp6c/Makefile 2014-06-04 09:59:45 UTC (rev
41001)
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c
-PKG_VERSION:=2014-05-30
+PKG_VERSION:=2014-06-04
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
Modified: trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh
===================================================================
--- trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh 2014-06-04 07:20:31 UTC
(rev 41000)
+++ trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh 2014-06-04 09:59:45 UTC
(rev 41001)
@@ -24,14 +24,15 @@
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 @@
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"
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
