From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 10 May 2024 16:51:41 +0000 (+0100)
Subject: unbound-dhcp-leases-bridge: Make expiry check work for stub leases
X-Git-Tag: v2.29-core188~10^2~86^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1908e3d0708d6298a5424ec6402c6562a75036d8;p=ipfire-2.x.git

unbound-dhcp-leases-bridge: Make expiry check work for stub leases

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
index 3045efbab7..fb4c50e1ee 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -279,7 +279,7 @@ class UnboundDHCPLeasesBridge(object):
 				log.debug("  %s:" % lease.fqdn)
 				log.debug("    Start: %s" % lease.time_starts)
 				log.debug("    End  : %s" % lease.time_ends)
-				if lease.expired:
+				if lease.has_expired():
 					log.debug("    Expired")
 
 		self.unbound.update_dhcp_leases(self.leases)
@@ -296,7 +296,7 @@ class UnboundDHCPLeasesBridge(object):
 			return
 
 		# Don't add expired leases
-		elif lease.expired:
+		elif lease.has_expired():
 			log.debug("Skipping expired lease: %s" % lease)
 			return
 
@@ -632,8 +632,10 @@ class Lease(object):
 
 		return self._parse_time(ends)
 
-	@property
-	def expired(self):
+	def has_expired(self):
+		if not self.time_starts:
+			return
+
 		if not self.time_ends:
 			return self.time_starts > datetime.datetime.utcnow()