From: Konstantin Glukhov <redacted>
Date: Thu, 8 Jan 2026 08:38:21 +0000 (+0900)
Subject: luci-mod-status: aid DNS lookups with /etc/ethers
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=688008b6964d0c48e3692adfb537124bd8fd7716;p=openwrt-luci.git

luci-mod-status: aid DNS lookups with /etc/ethers

- Integrate luci-rpc.getHostHints for host-hints lookup
- Stop mutating lookup_queue during iteration; use Set + filter()
  to remove resolved entries safely
- Collect unresolved addresses, consult host hints, and apply hinted names
- Use explicit defaults for recheck counters

Rationale:

Host hints provide a low-cost way to resolve IPv6 SLAAC and link-local
addresses, improving lookup coverage.

Bug fixes:

Removing elements from lookup_queue with splice() while iterating
reduced_lookup_queue could remove wrong indices or skip entries.
Switching to filter() and a Set fixes this class of logic bugs.

Signed-off-by: Konstantin Glukhov <redacted>
---

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js
index f6d505416d..b7cd7c875f 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js
@@ -24,6 +24,12 @@ var callNetworkRrdnsLookup = rpc.declare({
 	expect: { '': {} }
 });
 
+var callLuciRpcGetHostHints = rpc.declare({
+	object: 'luci-rpc',
+	method: 'getHostHints',
+	expect: { '': {} }
+});
+
 var graphPolls = [],
     pollInterval = 3,
     dns_cache = {},
@@ -158,31 +164,55 @@ return view.extend({
 		cbi_update_table('#connections', rows, E('em', _('No information available')));
 
 		if (enableLookups && lookup_queue.length > 0) {
-			var reduced_lookup_queue = lookup_queue;
+			// Take a batch of max 100 addresses
+			const reduced_lookup_queue = lookup_queue.length > 100
+				? lookup_queue.slice(0, 100)
+				: lookup_queue;
 
-			if (lookup_queue.length > 100)
-				reduced_lookup_queue = lookup_queue.slice(0, 100);
+			const checked = new Set(reduced_lookup_queue);
 
-			callNetworkRrdnsLookup(reduced_lookup_queue, 5000, 1000).then(function(replies) {
-				for (var index in reduced_lookup_queue) {
-					var address = reduced_lookup_queue[index];
-
-					if (!address)
-						continue;
+			callNetworkRrdnsLookup(reduced_lookup_queue, 5000, 1000).then(function (replies) {
+				const unresolved = [];
 
+				// Remove resolved addresses from lookup_queue, keep unresolved
+				lookup_queue = lookup_queue.filter(address => {
+					if (!checked.has(address)) return true; // outside this batch → keep
 					if (replies[address]) {
 						dns_cache[address] = replies[address];
-						lookup_queue.splice(reduced_lookup_queue.indexOf(address), 1);
-						continue;
+						return false; // resolved → remove
 					}
+					unresolved.push(address);
+					return true; // unresolved → keep
+				});
+
+				if (unresolved.length > 0) {
+					callLuciRpcGetHostHints().then(function (hints) {
+						const ipNameMap = {};
+
+						for (const hint of Object.values(hints || {})) {
+							if (!hint || !hint.name) continue;
+							for (const ip of [...(hint.ipaddrs || []), ...(hint.ip6addrs || [])]) {
+								ipNameMap[ip] = hint.name;
+							}
+						}
 
-					if (recheck_lookup_queue[address] > 2) {
-						dns_cache[address] = (address.match(/:/)) ? '[' + address + ']' : address;
-						lookup_queue.splice(index, 1);
-					}
-					else {
-						recheck_lookup_queue[address] = (recheck_lookup_queue[address] || 0) + 1;
-					}
+						// Apply host hints and recheck logic
+						lookup_queue = lookup_queue.filter(address => {
+							if (!checked.has(address)) return true; // outside batch → keep
+							if (ipNameMap[address]) {
+								dns_cache[address] = ipNameMap[address]
+								return false; // resolved → remove
+							}
+
+							if ((recheck_lookup_queue[address] || 0) > 2) {
+								dns_cache[address] = address.includes(':') ? `[${address}]` : address;
+								return false; // give up → remove
+							}
+
+							recheck_lookup_queue[address] = (recheck_lookup_queue[address] || 0) + 1;
+							return true; // unresolved → keep
+						});
+					});
 				}
 
 				var btn = document.querySelector('.btn.toggle-lookups');