From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 8 May 2023 18:39:54 +0000 (-0400)
Subject: [#2835] Updated ARM and ChangeLog
X-Git-Tag: Kea-2.3.8~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d89581ab7dfe50ec527f93384b110587787763e;p=thirdparty%2Fkea.git

[#2835] Updated ARM and ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 9abdc1f1d8..77abdfba34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2136.	[func]		tmark
+	The default value, in kea-dhcp6, for preferred-lifetime is
+	now calculated as: 0.625 * valid-lifetime. This calculation
+	is also used in the event that the specified value for
+	preferred-lifetime is greater than valid-lifetime.  Prior to
+	this, the default value was 3600 seconds, and there was no
+	check against sending values greater than valid-lifetime.
+	(Gitlab #2835)
+
 2135.	[build]		tomek
 	The CodeQL pipeline has been enabled on github. Developer's guide
 	updated with details.
@@ -27,7 +36,6 @@
 	duid (2 bytes for type and at most 128 bytes for value).
 	(Gitlab #2786)
 
-
 2130.	[func]		piotrek
 	Added support of DHCP Options for the Discovery of
 	Network-designated Resolvers (DNR) as per draft-ietf-add-dnr.
diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 28dfe0f429..6c5c7a4c9e 100644
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -2478,6 +2478,12 @@ non-zero values - uses these values when they are between the configured
 minimum and maximum bounds. Values outside the bounds are rounded up or down as
 needed.
 
+.. note::
+
+   As of Kea 2.3.8, if the preferred-lifetime has not been explicitly specified
+   or the specified value is larger than the value of valid-lifetime, the server
+   will use the value given by 0.625 * valid-lifetime.
+
 To send specific fixed values, use the following two parameters:
 
 -  ``renew-timer`` - specifies the value of T1 in seconds.