odhcp6c: various bugfixes * Don't prematurely send RENEW / REBIND when T1 or T2 is > 1 day * Add "norelease" option to not send a RELEASE when stopping

SVN-Revision: 35902
This commit is contained in:
Steven Barth 2013-03-08 07:04:38 +00:00
parent 1f77bfff96
commit 39a001dc69
2 changed files with 7 additions and 4 deletions

View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_VERSION:=2013-02-12 PKG_VERSION:=2013-03-08
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
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=31ce2ea9f57322d526daf266c7fca4bd407297cb PKG_SOURCE_VERSION:=e8b07f018cbdf8f2a08f93af46904e7ffb9eb123
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

View file

@ -10,6 +10,7 @@ proto_dhcpv6_init_config() {
proto_config_add_string "clientid" proto_config_add_string "clientid"
proto_config_add_string "reqopts" proto_config_add_string "reqopts"
proto_config_add_string "noslaaconly" proto_config_add_string "noslaaconly"
proto_config_add_string "norelease"
proto_config_add_string "ip6prefix" proto_config_add_string "ip6prefix"
} }
@ -17,8 +18,8 @@ proto_dhcpv6_setup() {
local config="$1" local config="$1"
local iface="$2" local iface="$2"
local reqaddress reqprefix clientid reqopts noslaaconly ip6prefix local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
json_get_vars reqaddress reqprefix clientid reqopts noslaaconly ip6prefix json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
# Configure # Configure
@ -32,6 +33,8 @@ proto_dhcpv6_setup() {
[ "$noslaaconly" = "1" ] && append opts "-S" [ "$noslaaconly" = "1" ] && append opts "-S"
[ "$norelease" = "1" ] && append opts "-k"
for opt in $reqopts; do for opt in $reqopts; do
append opts "-r$opt" append opts "-r$opt"
done done