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 <asukms@ya.ru>
Indentation adjused and wrapped commit message
Signed-off-by: Florian Eckert <fe@dev.tdt.de>

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 bf67785df1565fd67329f5fda1aadee2b6f3905d..5059b389b4234eb9c7e92f305ff3dea811759f4c 100644 (file)
--- 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
@@ -726,8 +726,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 b93f26875d8603064b21912f9542fce1d2abc5f6..956c1b20f98261f2504221984b6e5249187127c1 100644 (file)
--- 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