a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: - dhcp: don't replace a static lease with a dynamic one 

Close #1015 #1016

* commit 'fd3e153a043941c6f72d7f1c9cfaecdd537a490e':
  - dhcp: don't replace a static lease with a dynamic one
This commit is contained in:
Simon Zolin 2019-09-23 20:02:44 +03:00
parent f6404ef181 fd3e153a04
commit ce007e665d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhcpd/dhcpd.go
View File

@ -506,7 +506,9 @@ func (s *Server) handleDHCP4Request(p dhcp4.Packet, options dhcp4.Options) dhcp4
return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil) return dhcp4.ReplyPacket(p, dhcp4.NAK, s.ipnet.IP, nil, 0, nil)
} }
if lease.Expiry.Unix() != leaseExpireStatic {
lease.Expiry = time.Now().Add(s.leaseTime) lease.Expiry = time.Now().Add(s.leaseTime)
}
log.Tracef("Replying with ACK. IP: %s HW: %s Expire: %s", log.Tracef("Replying with ACK. IP: %s HW: %s Expire: %s",
lease.IP, lease.HWAddr, lease.Expiry) lease.IP, lease.HWAddr, lease.Expiry)
opt := s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterRequestList]) opt := s.leaseOptions.SelectOrderOrAll(options[dhcp4.OptionParameterRequestList])