From d4f0b06a478505a716478b56f9890e708898a58b Mon Sep 17 00:00:00 2001 From: Max S Kash Date: Tue, 8 Mar 2022 18:57:01 +0500 Subject: [PATCH] luci-mod-status,mod-network: Added fqdn-name to DHCPv4 lease table Added code to display fcdn-name in DHCPv4 lease table. (based on code in DHCPv6 lease table) Signed-off-by: Max S Kash Indentation adjused and wrapped commit message Signed-off-by: Florian Eckert --- .../htdocs/luci-static/resources/view/network/dhcp.js | 11 ++++++++++- .../resources/view/status/include/40_dhcp.js | 10 +++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index 6c4178b7df..f3211539da 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -639,8 +639,17 @@ return view.extend({ else 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 [ - lease.hostname || '?', + host || '-', lease.ipaddr, lease.macaddr, exp diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js index b93f26875d..956c1b20f9 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js @@ -102,8 +102,16 @@ return baseclass.extend({ else 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 = [ - lease.hostname || '-', + host || '-', lease.ipaddr, lease.macaddr, exp -- 2.30.2