From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/4] unbound-dhcp-leases-bridge: Don't overwrite static leases Date: Mon, 21 Oct 2024 16:38:48 +0000 Message-ID: <20241021163849.1265183-3-michael.tremer@ipfire.org> In-Reply-To: <20241021163849.1265183-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7778433641849291367==" List-Id: --===============7778433641849291367== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When we import all static leases, their remark will be used as hostname (because WTF?) and might be overwritten if the device is not sending any or even the same hostname. This patch avoids that static leases will be modified. Signed-off-by: Michael Tremer --- config/unbound/unbound-dhcp-leases-bridge | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbou= nd-dhcp-leases-bridge index 2cbdaa004..66ea28054 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -216,6 +216,11 @@ class UnboundDHCPLeasesBridge(object): # Find the old lease old_lease =3D self._find_lease(address) =20 + # Don't update fixed leases as they might clear the hostname + if old_lease and old_lease.fixed: + log.debug("Won't update fixed lease %s" % old_lease) + return + # Create a new lease lease =3D Lease(address, { "client-hostname" : name, @@ -581,19 +586,20 @@ class FixLeases(object): "client-hostname" : hostname, "starts" : now.strftime("%w %Y/%m/%d %H:%M:%S"), "ends" : "never", - }) + }, fixed=3DTrue) leases.append(l) =20 return leases =20 =20 class Lease(object): - def __init__(self, ipaddr, properties): + def __init__(self, ipaddr, properties, fixed=3DFalse): if not isinstance(ipaddr, ipaddress.IPv4Address): ipaddr =3D ipaddress.IPv4Address(ipaddr) =20 self.ipaddr =3D ipaddr self._properties =3D properties + self.fixed =3D fixed =20 def __repr__(self): return "<%s for %s (%s)>" % (self.__class__.__name__, self.ipaddr, self.ho= stname) --=20 2.39.5 --===============7778433641849291367==--