Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* luci/model/admin-full: override scheme for network overview page too to prevent "network.foo.ifname has no value" errors after wifi config created a new network on demand

Browse source
This commit is contained in:
Jo-Philipp Wich 2008-09-13 04:44:03 +00:00
parent a8d165a5bf
commit d124dd9bb5
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/admin-full/luasrc/model/cbi/admin_network/network.lua
View file

@ -25,6 +25,7 @@ s = m:section(TypedSection, "interface", "")
s.addremove = true
s.extedit = luci.dispatcher.build_url("admin", "network", "network") .. "/%s"
s.template = "cbi/tblsection"
s.override_scheme = true
function s.filter(self, section)
return section ~= "loopback" and section
@ -86,7 +87,7 @@ function hwaddr.cfgvalue(self, section)
return luci.fs.readfile("/sys/class/net/" .. ix .. "/address")
or luci.util.exec("ifconfig " .. ix):match(" ([A-F0-9:]+)%s*\n")
or "n/a"
end
@ -100,13 +101,13 @@ txrx = s:option(DummyValue, "_txrx")
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
@ -114,14 +115,14 @@ errors = s:option(DummyValue, "_err")
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
return m
return m