expect: { '': {} }
});
+var callLuciRpcGetNetworkDevices = rpc.declare({
+ object: 'luci-rpc',
+ method: 'getNetworkDevices',
+ expect: { '': {} }
+});
+
+var callLuciRpcGetDHCPLeases = rpc.declare({
+ object: 'luci-rpc',
+ method: 'getDHCPLeases',
+ expect: { '': {} }
+});
+
var graphPolls = [],
pollInterval = 3,
- dns_cache = {},
- service_cache = {},
+ dns_cache = Object.create(null),
+ service_cache = Object.create(null),
+ ethers_cache = Object.create(null),
+ ethers_cache_is_loaded = false,
enableLookups = false,
filterText = '';
});
},
- updateConntrack: function(conn) {
- function fetchServices() {
- if (Object.keys(service_cache).length > 0) return;
-
- fs.read('/etc/services')
- .then((rawData) => {
- const lines = rawData.split('\n'); // Split data into lines
- // Parse each line to extract port and service info
- lines.forEach(line => {
- const match = line.match(/^([\w-]+)\s+(\d+)\/(\w+)/); // Regex to match service definition
- if (match) {
- const [, service, port, protocol] = match;
- // Cache the service info by port and protocol
- if (!service_cache[port]) service_cache[port] = {};
- service_cache[port][protocol] = service;
- }
- });
- })
- .catch((error) => {
- console.error('Error fetching services:', error);
- });
- }
-
- function joinAddressWithPortOrServiceName(address, port, protocol) {
- if (!port) return address;
-
- if (enableLookups) {
- fetchServices();
- const service = service_cache[Number(port)]?.[protocol];
- if (service)
- return `${address}:${service}`;
+ updateConntrack: async function(conn) {
+ async function fetchServices() {
+ if (!enableLookups) return;
+ if (Object.keys(service_cache).length > 0) return;
+
+ try {
+ const rawData = await fs.read('/etc/services');
+ const lines = rawData.split('\n');
+
+ for (const line of lines) {
+ const match = line.match(/^([\w-]+)\s+(\d+)\/(\w+)/);
+ if (match) {
+ const service = match[1].toUpperCase();
+ const port = match[2];
+ const protocol = match[3].toUpperCase();
+ if (!(port in service_cache)) service_cache[port] = {};
+ service_cache[port][protocol] = service;
+ }
+ }
+ } catch (err) {
+ console.error('Error fetching services:', err);
+ }
}
- return `${address}:${port}`;
- }
-
- var lookup_queue = [ ];
- var rows = [];
- conn.sort(function(a, b) {
- return b.bytes - a.bytes;
- });
+ function joinAddressWithPortOrServiceName(address, port, protocol) {
+ if (!port) return address;
+ if (enableLookups) {
+ const service = service_cache[port]?.[protocol];
+ if (service) return `${address}:${service}`;
+ }
+ return `${address}:${port}`;
+ }
- for (var i = 0; i < conn.length; i++)
- {
- var c = conn[i];
+ await fetchServices();
- if ((c.src == '127.0.0.1' && c.dst == '127.0.0.1') ||
- (c.src == '::1' && c.dst == '::1'))
- continue;
+ const lookup_queue = new Set();
+ const rows = [];
- if (!dns_cache[c.src] && lookup_queue.indexOf(c.src) == -1)
- lookup_queue.push(c.src);
+ conn.sort((a, b) => b.bytes - a.bytes);
- if (!dns_cache[c.dst] && lookup_queue.indexOf(c.dst) == -1)
- lookup_queue.push(c.dst);
+ for (const c of conn) {
+ if ((c.src === '127.0.0.1' && c.dst === '127.0.0.1') ||
+ (c.src === '::1' && c.dst === '::1'))
+ continue;
- var src = dns_cache[c.src] || (c.layer3 == 'ipv6' ? '[' + c.src + ']' : c.src);
- var dst = dns_cache[c.dst] || (c.layer3 == 'ipv6' ? '[' + c.dst + ']' : c.dst);
+ if (enableLookups) {
+ if (!(c.src in dns_cache)) lookup_queue.add(c.src);
+ if (!(c.dst in dns_cache)) lookup_queue.add(c.dst);
+ }
- const network = c.layer3.toUpperCase();
- const protocol = c.layer4.toUpperCase();
- const source ='%h'.format(joinAddressWithPortOrServiceName(src, c.sport, protocol));
- const destination = '%h'.format(joinAddressWithPortOrServiceName(dst, c.dport, protocol));
- const transfer = [ c.bytes, '%1024.2mB (%d %s)'.format(c.bytes, c.packets, _('Pkts.')) ];
+ const src = enableLookups && (c.src in dns_cache) ? dns_cache[c.src] : (c.layer3 === 'ipv6' ? `[${c.src}]` : c.src);
+ const dst = enableLookups && (c.dst in dns_cache) ? dns_cache[c.dst] : (c.layer3 === 'ipv6' ? `[${c.dst}]` : c.dst);
+ const network = c.layer3.toUpperCase();
+ const protocol = c.layer4.toUpperCase();
+ const source = '%h'.format(joinAddressWithPortOrServiceName(src, c.sport, protocol));
+ const destination = '%h'.format(joinAddressWithPortOrServiceName(dst, c.dport, protocol));
+ const transfer = [c.bytes, '%1024.2mB (%d %s)'.format(c.bytes, c.packets, _('Pkts.'))];
+
+ if (filterText) {
+ const filterTextExpressions = filterText.split(' ');
+ if (filterTextExpressions.some(el => el.toUpperCase() !== network && el.toUpperCase() !== protocol
+ && !c.src.includes(el) && !source.includes(el)
+ && !c.dst.includes(el) && !destination.includes(el))) {
+ continue;
+ }
+ }
- if (filterText) {
- let filterTextExpressions = filterText.split(' ');
- if (filterTextExpressions.some((element) => element.toUpperCase() !== network && element.toUpperCase() !== protocol
- && !(c.src.includes(element) || source.includes(element))
- && !(c.dst.includes(element) || destination.includes(element)))) {
- continue;
- }
+ rows.push([network, protocol, source, destination, transfer]);
}
- rows.push([
- network,
- protocol,
- source,
- destination,
- transfer,
- ]);
- }
+ cbi_update_table('#connections', rows, E('em', _('No information available')));
- cbi_update_table('#connections', rows, E('em', _('No information available')));
+ if (!enableLookups || lookup_queue.size === 0) return;
- if (enableLookups && lookup_queue.length > 0) {
- // Take a batch of max 100 addresses
- const reduced_lookup_queue = lookup_queue.length > 100
- ? lookup_queue.slice(0, 100)
- : lookup_queue;
+ const reduced_lookup_queue = lookup_queue.size > 100
+ ? new Set([...lookup_queue].slice(0, 100))
+ : new Set(lookup_queue);
- const checked = new Set(reduced_lookup_queue);
+ async function softFailure(fn) {
+ try {
+ return await fn();
+ } catch (err) {
+ console.debug('Lookup failed:', err);
+ return null;
+ }
+ }
- callNetworkRrdnsLookup(reduced_lookup_queue, 5000, 1000).then(function (replies) {
- const unresolved = [];
+ function updateDnsCache(addr, name) {
+ if (!addr || !name) return;
+ if (!(addr in dns_cache)) dns_cache[addr] = name;
+ lookup_queue.delete(addr);
+ reduced_lookup_queue.delete(addr);
+ }
- // 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];
- return false; // resolved → remove
+ // 1. DHCP Leases
+ const leases = await softFailure(() => callLuciRpcGetDHCPLeases());
+ if (leases && Object.keys(leases).length !== 0) {
+ for (const lease of [...(leases.dhcp_leases || []), ...(leases.dhcp6_leases || [])]) {
+ const addr = lease.ipaddr || lease.ip6addr;
+ updateDnsCache(addr, lease.hostname);
}
- 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;
- }
- }
+ }
- // 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 (reduced_lookup_queue.size > 0) {
+ // 2. Reverse DNS Lookup
+ const dnsReplies = await softFailure(() => callNetworkRrdnsLookup([...reduced_lookup_queue], 5000, 1000));
+ if (dnsReplies && Object.keys(dnsReplies).length !== 0) {
+ for (const addr of Object.keys(dnsReplies)) updateDnsCache(addr, dnsReplies[addr]);
+ }
+ }
+
+ if (reduced_lookup_queue.size > 0) {
+ // 3. Resolve names via hints
+ const hints = ethers_cache_is_loaded ? ethers_cache : await softFailure(() => callLuciRpcGetHostHints());
+
+ if (hints && Object.keys(hints).length !== 0) {
+ for (const [ether, obj] of Object.entries(hints)) {
+ if (!ether || !obj?.name) continue;
+ if (!(ether in ethers_cache) && Object.keys(obj).length !== 0) ethers_cache[ether] = obj;
+ for (const addr of [...(obj.ipaddrs || []), ...(obj.ip6addrs || [])])
+ updateDnsCache(addr, obj.name);
}
+ if (Object.keys(ethers_cache).length) ethers_cache_is_loaded = true;
+ }
+ }
- if ((recheck_lookup_queue[address] || 0) > 2) {
- dns_cache[address] = address.includes(':') ? `[${address}]` : address;
- return false; // give up → remove
+ if (reduced_lookup_queue.size > 0) {
+ // 4. Network devices
+ const devices = await softFailure(() => callLuciRpcGetNetworkDevices());
+ if (devices) {
+ for (const device of Object.values(devices)) {
+ if (!device.mac) continue;
+ const name = ethers_cache[device.mac]?.name;
+ if (!name) continue;
+ for (const item of [...(device.ipaddrs || []), ...(device.ip6addrs || [])])
+ updateDnsCache(item.address, name);
}
+ }
+ }
+ // Final cleanup for unresolved addresses
+ for (const address of reduced_lookup_queue)
+ if ((recheck_lookup_queue[address] || 0) > 2)
+ dns_cache[address] = address.includes(':') ? `[${address}]` : address;
+ else
recheck_lookup_queue[address] = (recheck_lookup_queue[address] || 0) + 1;
- return true; // unresolved → keep
- });
- });
- }
- var btn = document.querySelector('.btn.toggle-lookups');
- if (btn) {
+ const btn = document.querySelector('.btn.toggle-lookups');
+ if (btn) {
btn.firstChild.data = enableLookups ? _('Disable DNS lookups') : _('Enable DNS lookups');
btn.classList.remove('spinning');
btn.disabled = false;
- }
- });
- }
+ }
},
- pollData: function() {
- poll.add(L.bind(function() {
+ pollData: async function() {
+ poll.add(L.bind(async function() {
var tasks = [
L.resolveDefault(callLuciConntrackList(), [])
];
tasks.push(L.resolveDefault(callLuciRealtimeStats('conntrack'), []));
}
- return Promise.all(tasks).then(L.bind(function(datasets) {
- this.updateConntrack(datasets[0]);
-
- for (var gi = 0; gi < graphPolls.length; gi++) {
- var ctx = graphPolls[gi],
- data = datasets[gi + 1],
- values = ctx.values,
- lines = ctx.lines,
- info = ctx.info;
-
- var data_scale = 0;
- var data_wanted = Math.floor(ctx.width / ctx.step);
- var last_timestamp = NaN;
-
- for (var i = 0, di = 0; di < lines.length; di++) {
- if (lines[di] == null)
+ const datasets = await Promise.all(tasks);
+ await this.updateConntrack(datasets[0]);
+ for (var gi = 0; gi < graphPolls.length; gi++) {
+ var ctx = graphPolls[gi],
+ data = datasets[gi + 1],
+ values = ctx.values,
+ lines = ctx.lines,
+ info = ctx.info;
+
+ var data_scale = 0;
+ var data_wanted = Math.floor(ctx.width / ctx.step);
+ var last_timestamp = NaN;
+
+ for (var i = 0, di = 0; di < lines.length; di++) {
+ if (lines[di] == null)
+ continue;
+
+ var multiply = (lines[di].multiply != null) ? lines[di].multiply : 1,
+ offset = (lines[di].offset != null) ? lines[di].offset : 0;
+
+ for (var j = ctx.timestamp ? 0 : 1; j < data.length; j++) {
+ /* skip overlapping entries */
+ if (data[j][0] <= ctx.timestamp)
continue;
- var multiply = (lines[di].multiply != null) ? lines[di].multiply : 1,
- offset = (lines[di].offset != null) ? lines[di].offset : 0;
-
- for (var j = ctx.timestamp ? 0 : 1; j < data.length; j++) {
- /* skip overlapping entries */
- if (data[j][0] <= ctx.timestamp)
- continue;
-
- if (i == 0) {
- ctx.fill++;
- last_timestamp = data[j][0];
- }
-
- info.line_current[i] = data[j][di + 1] * multiply;
- info.line_current[i] -= Math.min(info.line_current[i], offset);
- values[i].push(info.line_current[i]);
+ if (i == 0) {
+ ctx.fill++;
+ last_timestamp = data[j][0];
}
- i++;
+ info.line_current[i] = data[j][di + 1] * multiply;
+ info.line_current[i] -= Math.min(info.line_current[i], offset);
+ values[i].push(info.line_current[i]);
}
- /* cut off outdated entries */
- ctx.fill = Math.min(ctx.fill, data_wanted);
+ i++;
+ }
- for (var i = 0; i < values.length; i++) {
- var len = values[i].length;
- values[i] = values[i].slice(len - data_wanted, len);
+ /* cut off outdated entries */
+ ctx.fill = Math.min(ctx.fill, data_wanted);
- /* find peaks, averages */
- info.line_peak[i] = NaN;
- info.line_average[i] = 0;
+ for (var i = 0; i < values.length; i++) {
+ var len = values[i].length;
+ values[i] = values[i].slice(len - data_wanted, len);
- for (var j = 0; j < values[i].length; j++) {
- info.line_peak[i] = isNaN(info.line_peak[i]) ? values[i][j] : Math.max(info.line_peak[i], values[i][j]);
- info.line_average[i] += values[i][j];
- }
+ /* find peaks, averages */
+ info.line_peak[i] = NaN;
+ info.line_average[i] = 0;
- info.line_average[i] = info.line_average[i] / ctx.fill;
+ for (var j = 0; j < values[i].length; j++) {
+ info.line_peak[i] = isNaN(info.line_peak[i]) ? values[i][j] : Math.max(info.line_peak[i], values[i][j]);
+ info.line_average[i] += values[i][j];
}
- info.peak = Math.max.apply(Math, info.line_peak);
+ info.line_average[i] = info.line_average[i] / ctx.fill;
+ }
- /* remember current timestamp, calculate horizontal scale */
- if (!isNaN(last_timestamp))
- ctx.timestamp = last_timestamp;
+ info.peak = Math.max.apply(Math, info.line_peak);
- var size = Math.floor(Math.log2(info.peak)),
- div = Math.pow(2, size - (size % 10)),
- mult = info.peak / div,
- mult = (mult < 5) ? 2 : ((mult < 50) ? 10 : ((mult < 500) ? 100 : 1000));
+ /* remember current timestamp, calculate horizontal scale */
+ if (!isNaN(last_timestamp))
+ ctx.timestamp = last_timestamp;
- info.peak = info.peak + (mult * div) - (info.peak % (mult * div));
+ var size = Math.floor(Math.log2(info.peak)),
+ div = Math.pow(2, size - (size % 10)),
+ mult = info.peak / div,
+ mult = (mult < 5) ? 2 : ((mult < 50) ? 10 : ((mult < 500) ? 100 : 1000));
- data_scale = ctx.height / info.peak;
+ info.peak = info.peak + (mult * div) - (info.peak % (mult * div));
- /* plot data */
- for (var i = 0, di = 0; di < lines.length; di++) {
- if (lines[di] == null)
- continue;
+ data_scale = ctx.height / info.peak;
- var el = ctx.svg.firstElementChild.getElementById(lines[di].line),
- pt = '0,' + ctx.height,
- y = 0;
+ /* plot data */
+ for (var i = 0, di = 0; di < lines.length; di++) {
+ if (lines[di] == null)
+ continue;
- if (!el)
- continue;
+ var el = ctx.svg.firstElementChild.getElementById(lines[di].line),
+ pt = '0,' + ctx.height,
+ y = 0;
- for (var j = 0; j < values[i].length; j++) {
- var x = j * ctx.step;
+ if (!el)
+ continue;
- y = ctx.height - Math.floor(values[i][j] * data_scale);
- //y -= Math.floor(y % (1 / data_scale));
+ for (var j = 0; j < values[i].length; j++) {
+ var x = j * ctx.step;
- y = isNaN(y) ? ctx.height : y;
+ y = ctx.height - Math.floor(values[i][j] * data_scale);
+ //y -= Math.floor(y % (1 / data_scale));
- pt += ' ' + x + ',' + y;
- }
-
- pt += ' ' + ctx.width + ',' + y + ' ' + ctx.width + ',' + ctx.height;
+ y = isNaN(y) ? ctx.height : y;
- el.setAttribute('points', pt);
-
- i++;
+ pt += ' ' + x + ',' + y;
}
- info.label_25 = 0.25 * info.peak;
- info.label_50 = 0.50 * info.peak;
- info.label_75 = 0.75 * info.peak;
+ pt += ' ' + ctx.width + ',' + y + ' ' + ctx.width + ',' + ctx.height;
+
+ el.setAttribute('points', pt);
- if (typeof(ctx.cb) == 'function')
- ctx.cb(ctx.svg, info);
+ i++;
}
- }, this));
+
+ info.label_25 = 0.25 * info.peak;
+ info.label_50 = 0.50 * info.peak;
+ info.label_75 = 0.75 * info.peak;
+
+ if (typeof(ctx.cb) == 'function')
+ ctx.cb(ctx.svg, info);
+ }
}, this), pollInterval);
},
git.99rst.org / openwrt-luci.git / commitdiff