Merge branch 'master' into qq-rule

CHANGELOG.md

@@ -29,6 +29,8 @@ and this project adheres to
 
 ### Changed
 
+- Reverse DNS now has a greater priority as the source of runtime clients'
+  informmation than ARP neighborhood.
 - Improved detection of runtime clients through more resilient ARP processing
   ([#3597]).
 - The TTL of responses served from the optimistic cache is now lowered to 10

client/src/components/ui/Icons.css

@@ -1,7 +1,6 @@
 .icons {
     display: inline-block;
     vertical-align: middle;
-    height: 100%;
 }
 
 .icon--24 {

internal/dnsforward/dnsforward.go

@@ -314,14 +314,16 @@ func (s *Server) Exchange(ip net.IP) (host string, err error) {
 		StartTime: time.Now(),
 	}
 
-	resolver := s.internalProxy
+	var resolver *proxy.Proxy
 	if s.privateNets.Contains(ip) {
 		if !s.conf.UsePrivateRDNS {
 			return "", nil
 		}
 
 		resolver = s.localResolvers
 		s.recDetector.add(*req)
+	} else {
+		resolver = s.internalProxy
 	}
 
 	if err = resolver.Resolve(ctx); err != nil {

internal/home/clients.go

@@ -53,8 +53,8 @@ type clientSource uint
 // Client sources.  The order determines the priority.
 const (
 	ClientSourceWHOIS clientSource = iota
-	ClientSourceRDNS
 	ClientSourceARP
+	ClientSourceRDNS
 	ClientSourceDHCP
 	ClientSourceHostsFile
 )
@@ -723,9 +723,7 @@ func (clients *clientsContainer) AddHost(ip net.IP, host string, src clientSourc
 	clients.lock.Lock()
 	defer clients.lock.Unlock()
 
-	ok = clients.addHostLocked(ip, host, src)
-
-	return ok, nil
+	return clients.addHostLocked(ip, host, src), nil
 }
 
 // addHostLocked adds a new IP-hostname pairing.  For internal use only.
@@ -737,6 +735,7 @@ func (clients *clientsContainer) addHostLocked(ip net.IP, host string, src clien
 			return false
 		}
 
+		rc.Host = host
 		rc.Source = src
 	} else {
 		rc = &RuntimeClient{
@@ -831,7 +830,7 @@ func (clients *clientsContainer) addFromSystemARP() {
 
 	added := 0
 	for _, n := range ns {
-		if clients.addHostLocked(n.IP, "", ClientSourceARP) {
+		if clients.addHostLocked(n.IP, n.Name, ClientSourceARP) {
 			added++
 		}
 	}

internal/home/rdns.go

@@ -125,14 +125,12 @@ func (r *RDNS) workerLoop() {
 			log.Debug("rdns: resolving %q: %s", ip, err)
 
 			continue
-		}
-
-		if host == "" {
+		} else if host == "" {
 			continue
 		}
 
-		// Don't handle any errors since AddHost doesn't return non-nil
-		// errors for now.
+		// Don't handle any errors since AddHost doesn't return non-nil errors
+		// for now.
 		_, _ = r.clients.AddHost(ip, host, ClientSourceRDNS)
 	}
 }