mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-02-26 06:49:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix tests

Browse source
This commit is contained in:
Simon Zolin 2020-04-30 13:53:54 +03:00
parent 4405b619d3
commit 61e071d275
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dhcpd/db.go
View file

@ -103,10 +103,13 @@ func (s *Server) dbLoad() {
s.reserveIP(lease.IP, lease.HWAddr)
}
s.srv6.leases = normalizeLeases(v6StaticLeases, []*Lease{})
v6StaticLeases = normalizeLeases(v6StaticLeases, []*Lease{})
if s.srv6 != nil {
s.srv6.leases = v6StaticLeases
}
log.Info("DHCP: loaded leases v4:%d v6:%d total-read:%d from DB",
len(s.leases), len(s.srv6.leases), numLeases)
len(s.leases), len(v6StaticLeases), numLeases)
}
// Skip duplicate leases
@ -153,17 +156,19 @@ func (s *Server) dbStore() {
leases = append(leases, lease)
}
for _, l := range s.srv6.leases {
if l.Expiry.Unix() == 0 {
continue
if s.srv6 != nil {
for _, l := range s.srv6.leases {
if l.Expiry.Unix() == 0 {
continue
}
lease := leaseJSON{
HWAddr: l.HWAddr,
IP: l.IP,
Hostname: l.Hostname,
Expiry: l.Expiry.Unix(),
}
leases = append(leases, lease)
}
lease := leaseJSON{
HWAddr: l.HWAddr,
IP: l.IP,
Hostname: l.Hostname,
Expiry: l.Expiry.Unix(),
}
leases = append(leases, lease)
}
data, err := json.Marshal(leases)

6
dhcpd/dhcpd.go
View file

@ -764,8 +764,10 @@ func (s *Server) Leases(flags int) []Lease {
}
s.leasesLock.RUnlock()
v6leases := s.srv6.GetLeases(flags)
result = append(result, v6leases...)
if s.srv6 != nil {
v6leases := s.srv6.GetLeases(flags)
result = append(result, v6leases...)
}
return result
}