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

Pull request: home: don't miss blocked clients in client search api

Browse Source 
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master

Updates #2428.

Squashed commit of the following:

commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 15 16:32:53 2021 +0300

    home: don't miss blocked clients in client search api
This commit is contained in:
Ainar Garipov
2021-01-15 20:30:48 +03:00
parent 56cb8a4dde
commit 679bbcdc26
5 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/home/controlinstall.go
View File

@@ -109,7 +109,7 @@ func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request)
if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort {
err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
if err != nil {
respData.Web.Status = fmt.Sprintf("%v", err)
respData.Web.Status = err.Error()
}
}
@@ -137,7 +137,7 @@ func (web *Web) handleInstallCheckConfig(w http.ResponseWriter, r *http.Request)
}
if err != nil {
respData.DNS.Status = fmt.Sprintf("%v", err)
respData.DNS.Status = err.Error()
} else if reqData.DNS.IP != "0.0.0.0" {
respData.StaticIP = handleStaticIP(reqData.DNS.IP, reqData.SetStaticIP)
}