From ad7c5cb9dc052f6c6d53ef75824bd9cebbd8baff Mon Sep 17 00:00:00 2001
From: Simon Zolin <s.zolin@adguard.com>
Date: Tue, 2 Jul 2019 12:19:36 +0300
Subject: [PATCH] * /status: "dns_addresses": add port if not 53
---
home/control.go | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/home/control.go b/home/control.go
index 48b31a2d..6aa85ccf 100644
--- a/home/control.go
+++ b/home/control.go
@@ -80,27 +80,43 @@ func httpUpdateConfigReloadDNSReturnOK(w http.ResponseWriter, r *http.Request) {
returnOK(w)
}
-func handleStatus(w http.ResponseWriter, r *http.Request) {
- log.Tracef("%s %v", r.Method, r.URL)
+func addDNSAddress(dnsAddresses *[]string, addr string) {
+ if config.DNS.Port != 53 {
+ addr = fmt.Sprintf("%s:%d", addr, config.DNS.Port)
+ }
+ *dnsAddresses = append(*dnsAddresses, addr)
+}
+// Get the list of DNS addresses the server is listening on
+func getDNSAddresses() []string {
dnsAddresses := []string{}
+
if config.DNS.BindHost == "0.0.0.0" {
+
ifaces, e := getValidNetInterfacesForWeb()
if e != nil {
log.Error("Couldn't get network interfaces: %v", e)
+ return []string{}
}
+
for _, iface := range ifaces {
for _, addr := range iface.Addresses {
- dnsAddresses = append(dnsAddresses, addr)
+ addDNSAddress(&dnsAddresses, addr)
}
}
- }
- if len(dnsAddresses) == 0 {
- dnsAddresses = append(dnsAddresses, config.DNS.BindHost)
+
+ } else {
+ addDNSAddress(&dnsAddresses, config.DNS.BindHost)
}
+ return dnsAddresses
+}
+
+func handleStatus(w http.ResponseWriter, r *http.Request) {
+ log.Tracef("%s %v", r.Method, r.URL)
+
data := map[string]interface{}{
- "dns_addresses": dnsAddresses,
+ "dns_addresses": getDNSAddresses(),
"http_port": config.BindPort,
"dns_port": config.DNS.Port,
"protection_enabled": config.DNS.ProtectionEnabled,