From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 10 May 2024 16:47:44 +0000 (+0100)
Subject: unbound-dhcp-leases-bridge: Don't parse any inactive leases
X-Git-Tag: v2.29-core188~10^2~86^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dac4464e91f5d83ae87ece96974656319f98dafa;p=ipfire-2.x.git

unbound-dhcp-leases-bridge: Don't parse any inactive 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 4cfb165848..f07719d82a 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -296,9 +296,9 @@ class UnboundDHCPLeasesBridge(object):
 			log.debug("Skipping lease for which a static host exists: %s" % lease)
 			return
 
-		# Don't add inactive or expired leases
-		elif not lease.active or lease.expired:
-			log.debug("Skipping inactive or expired lease: %s" % lease)
+		# Don't add expired leases
+		elif lease.expired:
+			log.debug("Skipping expired lease: %s" % lease)
 			return
 
 		# Remove any previous leases
@@ -437,6 +437,9 @@ class DHCPLeases(object):
 				if not "hardware" in properties:
 					continue
 
+				# Skip inactive leases
+				elif not properties.get("binding", "state active"):
+					continue
 
 				lease = Lease(ipaddr, properties)
 				leases.append(lease)
@@ -556,9 +559,6 @@ class Lease(object):
 		})
 
 	@property
-	def active(self):
-		return self.binding_state == "active"
-	@property
 	def hostname(self):
 		hostname = self._properties.get("client-hostname")