From: Philip Prindeville <redacted>
Date: Thu, 15 Jan 2026 01:45:11 +0000 (-0700)
Subject: kea: send subnet renew time if not per host
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=12b8c3a54338a25ae26e2214e5e8906fe27424d0;p=openwrt-packages.git

kea: send subnet renew time if not per host

If the renewal-time isn't set for the host, but it's forced to send,
send the subnet renew time value instead.

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/net/kea/files/dhcp4.sh b/net/kea/files/dhcp4.sh
index 46735f240..615c0ce8e 100755
--- a/net/kea/files/dhcp4.sh
+++ b/net/kea/files/dhcp4.sh
@@ -548,7 +548,7 @@ static_host_add() {
 
 	getvar s_renewal_time "${pfx}_renewal_time"
 
-	config_get renewal_time "$cfg" "renewal_time" "$s_renewal_time"
+	config_get renewal_time "$cfg" "renewal_time"
 
 	json_select "$index"		# why "$index" and not "$pfx"?
 	json_select "reservations"
@@ -603,8 +603,11 @@ static_host_add() {
 		fi
 
 		always="$(is_force_send "$force_send" "renewal-time")"
-		## option_data "name:dhcp-renewal-time" "data:int=$renewal_time" $always
-		option_data "name:dhcp-renewal-time" "data:string=$renewal_time" $always
+		if [ -n "$renewal_time" ]; then
+			option_data "name:dhcp-renewal-time" "data:string=$renewal_time" $always
+		elif [ -n "$always" ]; then
+			option_data "name:dhcp-renewal-time" "data:string=$s_renewal_time" $always
+		fi
 
 		### need special handling for list dhcp_option 'option:xxx,yyy'
 		config_list_foreach "$cfg" "dhcp_option" append_dhcp_options