aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2017-09-02 22:05:01 +0200
committerHans Dedecker <dedeckeh@gmail.com>2017-09-03 21:34:48 +0200
commit05c3647d35bb6fe762b221f36f68d44cce15b963 (patch)
tree3d4888dc8fae572d9b3749bcdcdfddf42b0925c0
parent046618f5da1c94f085de8504fcfc26ee858ddde4 (diff)
downloadupstream-05c3647d35bb6fe762b221f36f68d44cce15b963.tar.gz
upstream-05c3647d35bb6fe762b221f36f68d44cce15b963.tar.bz2
upstream-05c3647d35bb6fe762b221f36f68d44cce15b963.zip
odhcp6c: add ra_holdoff config option and update to git HEAD version (FS#964)
51733a6 ra: align RA update interval with RFC4861 (FS#964) Add ra_holdoff config option which allows to configure the RA minimum update interval which is by default 3 seconds as stated in RFC4861. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/ipv6/odhcp6c/Makefile8
-rwxr-xr-xpackage/network/ipv6/odhcp6c/files/dhcpv6.sh7
2 files changed, 9 insertions, 6 deletions
diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index 6671e01c91..a95a380e0d 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(LEDE_GIT)/project/odhcp6c.git
-PKG_SOURCE_DATE:=2017-03-22
-PKG_SOURCE_VERSION:=0463b0571af90fbab2bfc75d3338d6bf503dc0fb
-PKG_MIRROR_HASH:=42c500f6d7839fadcc29cd939ebea1b468be69616af160f9a2b82507bcd39520
+PKG_SOURCE_DATE:=2017-09-02
+PKG_SOURCE_VERSION:=51733a6d3bfe0fb9e8c53aea22231e5b8a1f64c3
+PKG_MIRROR_HASH:=7ab8d3755c588b493792110d871c682cdd8e944ae21db64177321c464c104fb3
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
PKG_LICENSE:=GPL-2.0
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index 9e3f669733..56f75521e7 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -31,14 +31,15 @@ proto_dhcpv6_init_config() {
proto_config_add_boolean fakeroutes
proto_config_add_boolean sourcefilter
proto_config_add_boolean keep_ra_dnslifetime
+ proto_config_add_int "ra_holdoff"
}
proto_dhcpv6_setup() {
local config="$1"
local iface="$2"
- local reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime
- json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime
+ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
# Configure
@@ -64,6 +65,8 @@ proto_dhcpv6_setup() {
[ "$keep_ra_dnslifetime" = "1" ] && append opts "-L"
+ [ -n "$ra_holdoff" ] && append opts "-m$ra_holdoff"
+
for opt in $reqopts; do
append opts "-r$opt"
done