local fs = require "nixio.fs"
local netstate = luci.model.uci.cursor_state():get_all("network")
-m = Map("network", translate("interfaces"))
+m = Map("network", translate("Interfaces"))
local created
local netstat = sys.net.deviceinfo()
s = m:section(TypedSection, "interface", "")
s.addremove = true
+s.anonymous = false
s.extedit = luci.dispatcher.build_url("admin", "network", "network") .. "/%s"
s.template = "cbi/tblsection"
s.override_scheme = true
os.execute(call .. " " .. section .. " >/dev/null 2>&1")
end
-ifname = s:option(DummyValue, "ifname", translate("device"))
+ifname = s:option(DummyValue, "ifname", translate("Device"))
function ifname.cfgvalue(self, section)
return netstate[section] and netstate[section].ifname
end
if luci.model.uci.cursor():load("firewall") then
- zone = s:option(DummyValue, "_zone", translate("zone"))
+ zone = s:option(DummyValue, "_zone", translate("Zone"))
zone.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "zones")
function zone.cfgvalue(self, section)
end
end
-hwaddr = s:option(DummyValue, "_hwaddr")
+hwaddr = s:option(DummyValue, "_hwaddr",
+ translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"),
+ translate("Hardware Address"))
function hwaddr.cfgvalue(self, section)
local ix = self.map:get(section, "ifname") or ""
- return fs.readfile("/sys/class/net/" .. ix .. "/address")
- or luci.util.exec("ifconfig " .. ix):match(" ([A-F0-9:]+)%s*\n")
- or "n/a"
+ local mac = fs.readfile("/sys/class/net/" .. ix .. "/address")
+
+ if not mac then
+ mac = luci.util.exec("ifconfig " .. ix)
+ mac = mac and mac:match(" ([A-F0-9:]+)%s*\n")
+ end
+
+ if mac and #mac > 0 then
+ return mac:upper()
+ end
+
+ return "?"
end
-ipaddr = s:option(DummyValue, "ipaddr", translate("addresses"))
+ipaddr = s:option(DummyValue, "ipaddr",
+ translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>" ..
+ "-Address"))
function ipaddr.cfgvalue(self, section)
return table.concat(wa.network_get_addresses(section), ", ")
end
-txrx = s:option(DummyValue, "_txrx")
+txrx = s:option(DummyValue, "_txrx", translate("Traffic"),
+ translate("transmitted / received"))
function txrx.cfgvalue(self, section)
local ix = self.map:get(section, "ifname")
return string.format("%s / %s", tx, rx)
end
-errors = s:option(DummyValue, "_err")
+errors = s:option(DummyValue, "_err", translate("Errors"),
+ translate("TX / RX"))
function errors.cfgvalue(self, section)
local ix = self.map:get(section, "ifname")