summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-08 07:04:38 +0000
committercyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-08 07:04:38 +0000
commitf65a3594956ddf9f6f1e1ae1ae405cc27175acb4 (patch)
tree5283d66a4a9cd52ce7f342e1115c40dbbe7474cd
parent985d666e366bb9ef159439265f77a2ad04e08f0f (diff)
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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35902 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/ipv6/odhcp6c/Makefile4
-rwxr-xr-xpackage/network/ipv6/odhcp6c/files/dhcpv6.sh7
2 files changed, 7 insertions, 4 deletions
diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index 8bf3ebe43..f1509f702 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c
-PKG_VERSION:=2013-02-12
+PKG_VERSION:=2013-03-08
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=31ce2ea9f57322d526daf266c7fca4bd407297cb
+PKG_SOURCE_VERSION:=e8b07f018cbdf8f2a08f93af46904e7ffb9eb123
PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index b1837a9c6..6cf7521fe 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -10,6 +10,7 @@ proto_dhcpv6_init_config() {
proto_config_add_string "clientid"
proto_config_add_string "reqopts"
proto_config_add_string "noslaaconly"
+ proto_config_add_string "norelease"
proto_config_add_string "ip6prefix"
}
@@ -17,8 +18,8 @@ proto_dhcpv6_setup() {
local config="$1"
local iface="$2"
- local reqaddress reqprefix clientid reqopts noslaaconly ip6prefix
- json_get_vars reqaddress reqprefix clientid reqopts noslaaconly ip6prefix
+ local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
# Configure
@@ -32,6 +33,8 @@ proto_dhcpv6_setup() {
[ "$noslaaconly" = "1" ] && append opts "-S"
+ [ "$norelease" = "1" ] && append opts "-k"
+
for opt in $reqopts; do
append opts "-r$opt"
done