Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5751 from MaxSKash/21.02-DHCP-lease-table

Browse source 
[21.02]luci-mod-status,mod-network: Added fqdn-name to DHCPv4 lease table
This commit is contained in:
Florian Eckert 2022-08-10 07:20:58 +02:00 committed by GitHub
commit cb08713227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -639,8 +639,17 @@ return view.extend({
else else
exp = '%t'.format(lease.expires); exp = '%t'.format(lease.expires);
var hint = lease.macaddr ? hosts[lease.macaddr] : null,
name = hint ? hint.name : null,
host = null;
if (name && lease.hostname && lease.hostname != name)
host = '%s (%s)'.format(lease.hostname, name);
else if (lease.hostname)
host = lease.hostname;
return [ return [
lease.hostname || '?', host || '-',
lease.ipaddr, lease.ipaddr,
lease.macaddr, lease.macaddr,
exp exp

10
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
View file

@ -102,8 +102,16 @@ return baseclass.extend({
else else
exp = '%t'.format(lease.expires); exp = '%t'.format(lease.expires);
var hint = lease.macaddr ? machints.filter(function(h) { return h[0] == lease.macaddr })[0] : null,
host = null;
if (hint && lease.hostname && lease.hostname != hint[1])
host = '%s (%s)'.format(lease.hostname, hint[1]);
else if (lease.hostname)
host = lease.hostname;
rows = [ rows = [
lease.hostname || '-', host || '-',
lease.ipaddr, lease.ipaddr,
lease.macaddr, lease.macaddr,
exp exp