Minor bugfixes

[project/luci.git] / modules / admin-mini / luasrc / model / cbi / mini / network.lua

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index dcd93a3..692f7c4 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -12,11 +12,81 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("network", "Network")
+require("luci.tools.webadmin")
+require("luci.sys")
+
+luci.model.uci.load_state("network")
+local network = luci.model.uci.get_all("network")
+luci.model.uci.unload("network")
+
+local netstat = luci.sys.net.deviceinfo()
+local ifaces = {}
+
+for k, v in pairs(network) do
+       if v[".type"] == "interface" and k ~= "loopback" then
+               table.insert(ifaces, v)
+       end
+end
+
+m = Map("network", translate("network"))
+s = m:section(Table, ifaces, translate("status"))
+s.parse = function() end
+
+s:option(DummyValue, ".name", translate("network"))
+
+hwaddr = s:option(DummyValue, "_hwaddr",
+ translate("network_interface_hwaddr"), translate("network_interface_hwaddr_desc"))
+function hwaddr.cfgvalue(self, section)
+       local ix = self.map:get(section, "ifname") or ""
+       return luci.fs.readfile("/sys/class/net/" .. ix .. "/address") or "n/a"
+end
+
+
+s:option(DummyValue, "ipaddr", translate("ipaddress"))
+
+s:option(DummyValue, "netmask", translate("netmask"))
+
+
+txrx = s:option(DummyValue, "_txrx",
+ translate("network_interface_txrx"), translate("network_interface_txrx_desc"))
+
+function txrx.cfgvalue(self, section)
+       local ix = self.map:get(section, "ifname")
+       
+       local rx = netstat and netstat[ix] and netstat[ix][1]
+       rx = rx and luci.tools.webadmin.byte_format(tonumber(rx)) or "-"
+       
+       local tx = netstat and netstat[ix] and netstat[ix][9]
+       tx = tx and luci.tools.webadmin.byte_format(tonumber(tx)) or "-"
+       
+       return string.format("%s / %s", tx, rx)
+end
+
+errors = s:option(DummyValue, "_err",
+ translate("network_interface_err"), translate("network_interface_err_desc"))
+
+function errors.cfgvalue(self, section)
+       local ix = self.map:get(section, "ifname")
+       
+       local rx = netstat and netstat[ix] and netstat[ix][3]
+       local tx = netstat and netstat[ix] and netstat[ix][11]
+       
+       rx = rx and tostring(rx) or "-"
+       tx = tx and tostring(tx) or "-"
+       
+       return string.format("%s / %s", tx, rx)
+end
+
+
 
 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"))
@@ -53,18 +123,19 @@ pwd = s:option(Value, "password", translate("password"))
 pwd:depends("proto", "pppoe")
 pwd:depends("proto", "pptp")
 
-kea = s:option(Value, "keepalive", "Keep-Alive" .. translate("cbi_optional"))
+kea = s:option(Flag, "keepalive", translate("m_n_keepalive"))
 kea:depends("proto", "pppoe")
 kea:depends("proto", "pptp")
 kea.rmempty = true
+kea.enabled = "10"
 
 
-cod = s:option(Value, "demand", "Dial on Demand" .. translate("cbi_optional"))
+cod = s:option(Value, "demand", translate("m_n_dialondemand"), "s")
 cod:depends("proto", "pppoe")
 cod:depends("proto", "pptp")
 cod.rmempty = true
 
-srv = s:option(Value, "server", "PPTP-Server")
+srv = s:option(Value, "server", translate("m_n_pptp_server"))
 srv:depends("proto", "pptp")
 srv.rmempty = true