modules/admin-full, modules/admin-mini: Added eyecandy ;-)

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
index 7a4b3c1343338a3b07b04660e3c0c2e32aaebbe1..20adcdf1007ba89ac974e440d25df30355e4d0c3 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua
@@ -58,8 +58,13 @@ s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-s:option(Value, "macaddr", translate("macaddress"))
-s:option(Value, "ipaddr", translate("ipaddress"))
+mac = s:option(Value, "macaddr", translate("macaddress"))
+ip = s:option(Value, "ipaddr", translate("ipaddress"))
+for i, dataset in ipairs(luci.sys.net.arptable()) do
+       ip:value(dataset["IP address"])
+       mac:value(dataset["HW address"],
+        dataset["HW address"] .. " (" .. dataset["IP address"] .. ")")
+end
 
        
 return m, m2

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
index 05334049da964d50b72ec092e437cc1f35009956..3d26d6a9d60aa6e805a4a498588487a5add4d046 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -59,7 +59,12 @@ s.addremove = true
 s.anonymous = true
 s.template = "cbi/tblsection"
 
-s:option(Value, "macaddr", translate("macaddress"))
-s:option(Value, "ipaddr", translate("ipaddress"))
+mac = s:option(Value, "macaddr", translate("macaddress"))
+ip = s:option(Value, "ipaddr", translate("ipaddress"))
+for i, dataset in ipairs(luci.sys.net.arptable()) do
+       ip:value(dataset["IP address"])
+       mac:value(dataset["HW address"],
+        dataset["HW address"] .. " (" .. dataset["IP address"] .. ")")
+end
 
 return m, m2
\ No newline at end of file

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index e2d4e3c0c5a516eb16373f35e74b77368337bf8d..2e1d7955f9c79cd5a2d695e1990688998073c49b 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -16,7 +16,12 @@ m = Map("network", "Network")
 
 s = m:section(NamedSection, "lan", "interface", translate("m_n_local"))
 s:option(Value, "ipaddr", translate("ipaddress"))
-s:option(Value, "netmask", translate("netmask"))
+
+nm = s:option(Value, "netmask", translate("netmask"))
+nm:value("255.255.255.0")
+nm:value("255.255.0.0")
+nm:value("255.0.0.0")
+
 gw = s:option(Value, "gateway", translate("gateway") .. translate("cbi_optional"))
 gw.rmempty = true
 dns = s:option(Value, "dns", translate("dnsserver") .. translate("cbi_optional"))