luci-mod-admin-full: fix incorrect length of DUID-LL

The length of DUID-LL is 80 bits (16 bit DUID type, 16 bit hardware type, 48 bit mac)
which corresponds to 20 nibbles. Also lower the minimum required length of DUID to
20 nibbles in order to allow entering a DUID-LL.

Signed-off-by: Arjen de Korte <build+github@de-korte.org>

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 0c01ceffca24358c9dc7f578740914ec1177e7ea..3ce0bc466e6519597969da76babdb4f69d24efca 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -297,7 +297,7 @@ time = s:option(Value, "leasetime", translate("Lease time"))
 time.rmempty  = true
 
 duid = s:option(Value, "duid", translate("<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"))
-duid.datatype = "and(rangelength(28,36),hexstring)"
+duid.datatype = "and(rangelength(20,36),hexstring)"
 fp = io.open("/var/hosts/odhcpd")
 if fp then
        for line in fp:lines() do

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
index ea6ee91c7146f8e32a61a3b6c04e0b50a8e5f133..28a37dcd98a61a18e34d0e27731578ab9f1be425 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
@@ -5,7 +5,7 @@
                        return duid.substr(16).replace(/(..)(?=..)/g, '$1:').toUpperCase();
 
                // DUID-LL / Ethernet
-               if (duid.length === 24 && duid.substr(0, 8) === '00030001')
+               if (duid.length === 20 && duid.substr(0, 8) === '00030001')
                        return duid.substr(8).replace(/(..)(?=..)/g, '$1:').toUpperCase();
 
                return null;

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index 18f66c2a82d326f3a88a21f5c3bc6d74dbf4f447..ff5e26de94114c5c8fa068eeb8b5dbe3e7652c55 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -150,7 +150,7 @@
                        return duid.substr(16).replace(/(..)(?=..)/g, '$1:').toUpperCase();
 
                // DUID-LL / Ethernet
-               if (duid.length === 24 && duid.substr(0, 8) === '00030001')
+               if (duid.length === 20 && duid.substr(0, 8) === '00030001')
                        return duid.substr(8).replace(/(..)(?=..)/g, '$1:').toUpperCase();
 
                return null;