$Id$
]]--
+
require("luci.tools.webadmin")
require("luci.sys")
+require("luci.fs")
+
+local has_pptp = luci.fs.mtime("/usr/sbin/pptp")
+local has_pppoe = luci.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")
-luci.model.uci.load_state("network")
-local wireless = luci.model.uci.get_all("network")
-luci.model.uci.unload("network")
+local network = luci.model.uci.cursor_state():get_all("network")
local netstat = luci.sys.net.deviceinfo()
local ifaces = {}
-for k, v in pairs(wireless) do
+for k, v in pairs(network) do
if v[".type"] == "interface" and k ~= "loopback" then
table.insert(ifaces, v)
end
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"
+ 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
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
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.addremove = false
s:option(Value, "ipaddr", translate("ipaddress"))
nm = s:option(Value, "netmask", translate("netmask"))
s = m:section(NamedSection, "wan", "interface", translate("m_n_inet"))
+s.addremove = false
p = s:option(ListValue, "proto", translate("protocol"))
+p.override_values = true
p:value("none", "disabled")
p:value("static", translate("manual", "manual"))
p:value("dhcp", translate("automatic", "automatic"))
-p:value("pppoe", "PPPoE")
-p:value("pptp", "PPTP")
+if has_pppoe then p:value("pppoe", "PPPoE") end
+if has_pptp then p:value("pptp", "PPTP") end
+
+if not ( has_pppoe and has_pptp ) then
+ p.description = translate("network_interface_prereq_mini")
+end
+
ip = s:option(Value, "ipaddr", translate("ipaddress"))
ip:depends("proto", "static")
usr:depends("proto", "pptp")
pwd = s:option(Value, "password", translate("password"))
+pwd.password = true
pwd:depends("proto", "pppoe")
pwd:depends("proto", "pptp")
-return m
\ No newline at end of file
+return m