From 50a8009804c44bad589c4a673c726b9cee1635cd Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 2 Sep 2019 10:59:45 +0200 Subject: [PATCH] dnsdist: Display the DoH and DoT binds in the web view --- pdns/dnsdist-web.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc index 11df6a9ccc..08e289f9d5 100644 --- a/pdns/dnsdist-web.cc +++ b/pdns/dnsdist-web.cc @@ -860,15 +860,16 @@ static void connectionThread(int sock, ComboAddress remote) if(!acl.empty()) acl += ", "; acl+=s; } - string localaddresses; + string localaddressesStr; + std::set localaddresses; for(const auto& front : g_frontends) { - if (front->tcp) { - continue; - } - if (!localaddresses.empty()) { - localaddresses += ", "; + localaddresses.insert(front->local.toStringWithPort()); + } + for (const auto& addr : localaddresses) { + if (!localaddressesStr.empty()) { + localaddressesStr += ", "; } - localaddresses += front->local.toStringWithPort(); + localaddressesStr += addr; } Json my_json = Json::object { @@ -882,7 +883,7 @@ static void connectionThread(int sock, ComboAddress remote) { "cache-hit-response-rules", cacheHitResponseRules}, { "self-answered-response-rules", selfAnsweredResponseRules}, { "acl", acl}, - { "local", localaddresses}, + { "local", localaddressesStr}, { "dohFrontends", dohs } }; resp.headers["Content-Type"] = "application/json"; -- 2.47.2