mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-11-22 21:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

* dhcp: now static leases functionality works before DHCP is started

Browse source
This commit is contained in:
Simon Zolin 2019-11-06 13:04:01 +03:00
parent b105f20837
commit b9c0b55356
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dhcpd/dhcpd.go
View file

@ -100,9 +100,14 @@ func (s *Server) CheckConfig(config ServerConfig) error {
func Create(config ServerConfig) *Server { func Create(config ServerConfig) *Server {
s := Server{} s := Server{}
s.conf = config s.conf = config
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename)
if s.conf.HTTPRegister != nil { if s.conf.HTTPRegister != nil {
s.registerHandlers() s.registerHandlers()
} }
// we can't delay database loading until DHCP server is started,
// because we need static leases functionality available beforehand
s.dbLoad()
return &s return &s
} }
@ -112,7 +117,6 @@ func (s *Server) Init(config ServerConfig) error {
if err != nil { if err != nil {
return err return err
} }
s.dbLoad()
return nil return nil
} }
@ -178,7 +182,7 @@ func (s *Server) setConfig(config ServerConfig) error {
s.conf.WorkDir = oldconf.WorkDir s.conf.WorkDir = oldconf.WorkDir
s.conf.HTTPRegister = oldconf.HTTPRegister s.conf.HTTPRegister = oldconf.HTTPRegister
s.conf.ConfigModified = oldconf.ConfigModified s.conf.ConfigModified = oldconf.ConfigModified
s.conf.DBFilePath = filepath.Join(config.WorkDir, dbFilename) s.conf.DBFilePath = oldconf.DBFilePath
return nil return nil
} }
@ -565,10 +569,6 @@ func (s *Server) handleDecline(p dhcp4.Packet, options dhcp4.Options) dhcp4.Pack
// AddStaticLease adds a static lease (thread-safe) // AddStaticLease adds a static lease (thread-safe)
func (s *Server) AddStaticLease(l Lease) error { func (s *Server) AddStaticLease(l Lease) error {
if s.IPpool == nil {
return fmt.Errorf("DHCP server isn't started")
}
if len(l.IP) != 4 { if len(l.IP) != 4 {
return fmt.Errorf("Invalid IP") return fmt.Errorf("Invalid IP")
} }
@ -629,10 +629,6 @@ func (s *Server) rmLease(l Lease) error {
// 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 {
return fmt.Errorf("DHCP server isn't started")
}
if len(l.IP) != 4 { if len(l.IP) != 4 {
return fmt.Errorf("Invalid IP") return fmt.Errorf("Invalid IP")
} }
@ -675,10 +671,6 @@ func (s *Server) StaticLeases() []Lease {
s.leasesLock.Lock() s.leasesLock.Lock()
defer s.leasesLock.Unlock() defer s.leasesLock.Unlock()
if s.IPpool == nil {
s.dbLoad()
}
var result []Lease var result []Lease
for _, lease := range s.leases { for _, lease := range s.leases {
if lease.Expiry.Unix() == 1 { if lease.Expiry.Unix() == 1 {