-(home): fix searching clients by mac address

dhcpd/dhcpd.go

@@ -709,9 +709,17 @@ func (s *Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
 	s.leasesLock.RLock()
 	defer s.leasesLock.RUnlock()
 
+	ip4 := ip.To4()
+	if ip4 == nil {
+		return nil
+	}
+
 	for _, l := range s.leases {
-		if l.Expiry.Unix() > now && l.IP.Equal(ip) {
-			return l.HWAddr
+		if l.IP.Equal(ip4) {
+			unix := l.Expiry.Unix()
+			if unix > now || unix == leaseExpireStatic {
+				return l.HWAddr
+			}
 		}
 	}
 	return nil

dhcpd/dhcpd_test.go

@@ -23,6 +23,7 @@ func check(t *testing.T, result bool, msg string) {
 func TestDHCP(t *testing.T) {
 	var s = Server{}
 	s.conf.DBFilePath = dbFilename
+	defer func() { _ = os.Remove(dbFilename) }()
 	var p, p2 dhcp4.Packet
 	var hw net.HardwareAddr
 	var lease *Lease
@@ -185,7 +186,7 @@ func TestDB(t *testing.T) {
 	lease, _ = s.reserveLease(p)
 	lease.Expiry = time.Unix(4000000002, 0)
 
-	os.Remove("leases.db")
+	_ = os.Remove("leases.db")
 	s.dbStore()
 	s.reset()
 
@@ -198,7 +199,7 @@ func TestDB(t *testing.T) {
 	check(t, bytes.Equal(s.leases[1].IP, []byte{1, 1, 1, 2}), "leases[1].IP")
 	check(t, s.leases[1].Expiry.Unix() == 4000000002, "leases[1].Expiry")
 
-	os.Remove("leases.db")
+	_ = os.Remove("leases.db")
 }
 
 func TestIsValidSubnetMask(t *testing.T) {