daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
Simon Zolin
2020-03-19 14:22:16 +03:00
parent 82f36341e3
commit e822443600
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
home/openwrt.go
View File

@@ -120,6 +120,8 @@ func (oc *openwrtConfig) readConf(data []byte, section string, iface string) {
} }
} }
} }
// Parse static DHCP leases from system configuration data
func (oc *openwrtConfig) readConfDHCPStatic(data []byte) error { func (oc *openwrtConfig) readConfDHCPStatic(data []byte) error {
state := 0 state := 0
sr := strings.NewReader(string(data)) sr := strings.NewReader(string(data))
@@ -254,7 +256,8 @@ func (oc *openwrtConfig) prepareOutput() error {
return nil return nil
} }
func (oc *openwrtConfig) Start() error { // Process - read and process system configuration data
func (oc *openwrtConfig) Process() error {
data, err := ioutil.ReadFile("/etc/config/network") data, err := ioutil.ReadFile("/etc/config/network")
if err != nil { if err != nil {
return err return err
@@ -272,7 +275,7 @@ func (oc *openwrtConfig) Start() error {
return err return err
} }
oc.readConfDHCPStatic(data) err = oc.readConfDHCPStatic(data)
if err != nil { if err != nil {
return err return err
} }
@@ -283,7 +286,7 @@ func (oc *openwrtConfig) Start() error {
// Read system configuration files and write our configuration files // Read system configuration files and write our configuration files
func autoConfig(configFn string) error { func autoConfig(configFn string) error {
oc := openwrtConfig{} oc := openwrtConfig{}
err := oc.Start() err := oc.Process()
if err != nil { if err != nil {
return err return err
} }
@@ -334,7 +337,10 @@ func autoConfig(configFn string) error {
IP: ocl.IP.To4(), IP: ocl.IP.To4(),
Hostname: ocl.Hostname, Hostname: ocl.Hostname,
} }
ds.AddStaticLeaseWithFlags(l, false) err = ds.AddStaticLeaseWithFlags(l, false)
if err != nil {
continue
}
log.Debug("Static DHCP lease: %s -> %s (%s)", log.Debug("Static DHCP lease: %s -> %s (%s)",
l.HWAddr, l.IP, l.Hostname) l.HWAddr, l.IP, l.Hostname)
} }