AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-15 19:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge: * dhcp: when adding a static lease, it can replace a dynamic lease

Browse Source 
Close #833

* commit '7acbeb89569cd0260a0e21eae3a2439b419c2e24':
  * dhcp: when adding a static lease, it can replace a dynamic lease
This commit is contained in:
Simon Zolin 2019-08-23 17:18:10 +03:00
commit dd632d3f69
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dhcpd/dhcpd.go
View File

@ -550,7 +550,10 @@ func (s *Server) AddStaticLease(l Lease) error {
defer s.leasesLock.Unlock() defer s.leasesLock.Unlock()
if s.findReservedHWaddr(l.IP) != nil { if s.findReservedHWaddr(l.IP) != nil {
return fmt.Errorf("IP is already used") err := s.rmDynamicLeaseWithIP(l.IP)
if err != nil {
return err
}
} }
s.leases = append(s.leases, &l) s.leases = append(s.leases, &l)
s.reserveIP(l.IP, l.HWAddr) s.reserveIP(l.IP, l.HWAddr)
@ -558,6 +561,41 @@ func (s *Server) AddStaticLease(l Lease) error {
return nil return nil
} }
// Remove a dynamic lease by IP address
func (s *Server) rmDynamicLeaseWithIP(ip net.IP) error {
var newLeases []*Lease
for _, lease := range s.leases {
if bytes.Equal(lease.IP.To4(), ip) {
if lease.Expiry.Unix() == leaseExpireStatic {
return fmt.Errorf("Static lease with the same IP already exists")
}
continue
}
newLeases = append(newLeases, lease)
}
s.leases = newLeases
s.unreserveIP(ip)
return nil
}
// Remove a lease
func (s *Server) rmLease(l Lease) error {
var newLeases []*Lease
for _, lease := range s.leases {
if bytes.Equal(lease.IP.To4(), l.IP) {
if !bytes.Equal(lease.HWAddr, l.HWAddr) ||
lease.Hostname != l.Hostname {
return fmt.Errorf("Lease not found")
}
continue
}
newLeases = append(newLeases, lease)
}
s.leases = newLeases
s.unreserveIP(l.IP)
return nil
}
// RemoveStaticLease removes a static lease (thread-safe) // RemoveStaticLease removes a static lease (thread-safe)
func (s *Server) RemoveStaticLease(l Lease) error { func (s *Server) RemoveStaticLease(l Lease) error {
if s.IPpool == nil { if s.IPpool == nil {
@ -578,19 +616,10 @@ func (s *Server) RemoveStaticLease(l Lease) error {
return fmt.Errorf("Lease not found") return fmt.Errorf("Lease not found")
} }
var newLeases []*Lease err := s.rmLease(l)
for _, lease := range s.leases { if err != nil {
if bytes.Equal(lease.IP.To4(), l.IP) { return err
if !bytes.Equal(lease.HWAddr, l.HWAddr) ||
lease.Hostname != l.Hostname {
return fmt.Errorf("Lease not found")
}
continue
}
newLeases = append(newLeases, lease)
} }
s.leases = newLeases
s.unreserveIP(l.IP)
s.dbStore() s.dbStore()
return nil return nil
} }