From f7150e6a19bfc5643fef4106bd068f6ba099f8e2 Mon Sep 17 00:00:00 2001
From: Simon Zolin <s.zolin@adguard.com>
Date: Tue, 4 Jun 2019 18:12:45 +0300
Subject: [PATCH] + dns: resolve hosts via rDNS for the top clients after the
 server has been started

---
 dns.go | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/dns.go b/dns.go
index c36d1b40..01107c84 100644
--- a/dns.go
+++ b/dns.go
@@ -68,6 +68,19 @@ func isRunning() bool {
 }
 
 func beginAsyncRDNS(ip string) {
+	if clientExists(ip) {
+		return
+	}
+
+	// add IP to rdnsIP, if not exists
+	dnsctx.rdnsLock.Lock()
+	defer dnsctx.rdnsLock.Unlock()
+	_, ok := dnsctx.rdnsIP[ip]
+	if ok {
+		return
+	}
+	dnsctx.rdnsIP[ip] = true
+
 	log.Tracef("Adding %s for rDNS resolve", ip)
 	select {
 	case dnsctx.rdnsChannel <- ip:
@@ -143,19 +156,6 @@ func asyncRDNSLoop() {
 func onDNSRequest(d *proxy.DNSContext) {
 	if d.Req.Question[0].Qtype == dns.TypeA {
 		ip, _, _ := net.SplitHostPort(d.Addr.String())
-		if clientExists(ip) {
-			return
-		}
-
-		// add IP to rdnsIP, if not exists
-		dnsctx.rdnsLock.Lock()
-		defer dnsctx.rdnsLock.Unlock()
-		_, ok := dnsctx.rdnsIP[ip]
-		if ok {
-			return
-		}
-		dnsctx.rdnsIP[ip] = true
-
 		beginAsyncRDNS(ip)
 	}
 }
@@ -238,6 +238,11 @@ func startDNSServer() error {
 		return errorx.Decorate(err, "Couldn't start forwarding DNS server")
 	}
 
+	top := dnsServer.GetStatsTop()
+	for k := range top.Clients {
+		beginAsyncRDNS(k)
+	}
+
 	return nil
 }