From aad829a96d021919f79b8c651247358a685e3dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
Date: Sun, 10 Apr 2022 15:09:41 +0200
Subject: [PATCH] fff-ra: Set preferred lifetime smaller than valid lifetime
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A recent change (b26399283a) introduced an upper limit for the preferred
and valid lifetimes, so the statically configured addresses on the client
interface do not result in infinite lifetimes.

This upper bound is derived from the dhcp lease time. However, the
preferred lifetime is unexpectedly bound by an explicit configuration
option in recent versions of odhcpd. Due to our short dhcp leasetime,
the default value of this option is higher than the lease time, which
results preferred lifetimes longer than the valid lifetime.

As this behavior is rather unintuitive, a proper fix for it should be
done upstream (see #238). Until then, lower the preferred lifetime
option to the same value as our leasetime.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
---
 src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
index 458dbe45..e4524723 100644
--- a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
+++ b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
@@ -5,6 +5,12 @@ uci batch <<EOF
 	set dhcp.client.ra_default='2'
 	set dhcp.client.ra_management='0'
 	set dhcp.client.ra_useleasetime='1'
+
+	# Work around unexpected behavior of odhcpd (see #238).
+	#
+	# This value has to be less then or equal to
+	# dhcp.client.leasetime (set in fff-dhcp).
+	set dhcp.client.preferred_lifetime='1h'
 EOF
 
 exit 0