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

*(dhcpd): refactoring, use dhcpd/network_utils where possible

Browse Source
This commit is contained in:
Andrey Meshkov
2020-02-12 15:04:25 +03:00
parent 8d039c572f
commit d8d48c5386
6 changed files with 88 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
home/control_install.go
View File

@@ -13,6 +13,8 @@ import (
"runtime"
"strconv"
"github.com/AdguardTeam/AdGuardHome/dhcpd"
"github.com/AdguardTeam/golibs/log"
)
@@ -141,19 +143,19 @@ func handleInstallCheckConfig(w http.ResponseWriter, r *http.Request) {
respData.StaticIP.Error = fmt.Sprintf("Couldn't find network interface by IP %s", reqData.DNS.IP)
} else if reqData.DNS.SetStaticIP {
err = setStaticIP(interfaceName)
err = dhcpd.SetStaticIP(interfaceName)
staticIPStatus = "error"
respData.StaticIP.Error = err.Error()
} else {
// check if we have a static IP
isStaticIP, err := hasStaticIP(interfaceName)
isStaticIP, err := dhcpd.HasStaticIP(interfaceName)
if err != nil {
staticIPStatus = "error"
respData.StaticIP.Error = err.Error()
} else if !isStaticIP {
staticIPStatus = "no"
respData.StaticIP.IP = getFullIP(interfaceName)
respData.StaticIP.IP = dhcpd.GetFullIP(interfaceName)
}
}
respData.StaticIP.Static = staticIPStatus