Renamed reworked UCI API to uci2 to allow a peaceful coexistence with the old one

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

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
index 00c001e..fce84fe 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -15,15 +15,15 @@ $Id$
 require("luci.sys")
 require("luci.tools.webadmin")
 
-
-m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
+local netstate = luci.model.uci.cursor_state():get_all("network")
+m = Map("network", translate("interfaces"))
 
 local created
 local netstat = luci.sys.net.deviceinfo()
 
-s = m:section(TypedSection, "interface", translate("interfaces"))
+s = m:section(TypedSection, "interface", "")
 s.addremove = true
-s.extedit   = luci.http.getenv("REQUEST_URI") .. "/%s"
+s.extedit   = luci.dispatcher.build_url("admin", "network", "network") .. "/%s"
 s.template  = "cbi/tblsection"
 
 function s.filter(self, section)
@@ -39,38 +39,65 @@ end
 function s.parse(self, ...)
        TypedSection.parse(self, ...)
        if created then
-               luci.http.redirect(luci.http.getenv("REQUEST_URI") .. "/" .. created)
+               m.uci:save("network")
+               luci.http.redirect(luci.dispatcher.build_url("admin", "network", "network")
+                .. "/" .. created)
        end
 end
 
 up = s:option(Flag, "up")
-up.stateful = true
+function up.cfgvalue(self, section)
+       return netstate[section] and netstate[section].up or "0"
+end
+
 function up.write(self, section, value)
-       local call = value == "1" and "ifdown" or "ifup"
-       os.execute(call .. " " .. section)
+       local call
+       if value == "1" then
+               call = "ifup"
+       elseif value == "0" then
+               call = "ifdown"
+       end
+       os.execute(call .. " " .. section .. " >/dev/null 2>&1")
+end
+
+ifname = s:option(DummyValue, "ifname", translate("device"))
+function ifname.cfgvalue(self, section)
+       return netstate[section] and netstate[section].ifname
+end
+
+ifname.titleref = luci.dispatcher.build_url("admin", "network", "vlan")
+
+
+if luci.model.uci.cursor():load("firewall") then
+       zone = s:option(DummyValue, "_zone", translate("zone"))
+       zone.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "zones")
+
+       function zone.cfgvalue(self, section)
+               local zones = luci.tools.webadmin.network_get_zones(section)
+               return zones and table.concat(zones, ", ") or "-"
+       end
 end
 
 hwaddr = s:option(DummyValue, "_hwaddr")
 function hwaddr.cfgvalue(self, section)
-       local ix = self.map:stateget(section, "ifname") or ""
-       return luci.fs.readfile("/sys/class/net/" .. ix .. "/address") or "n/a"
+       local ix = self.map:get(section, "ifname") or ""
+       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
 
 
-ipaddr = s:option(DummyValue, "ipaddr")
-
+ipaddr = s:option(DummyValue, "ipaddr", translate("addresses"))
 function ipaddr.cfgvalue(self, section)
-       local ip = self.map:stateget(section, "ipaddr")
-       local nm = self.map:stateget(section, "netmask")
-       
-       local parsed = ip and luci.ip.IPv4(ip, nm)
-       return parsed and parsed:string() or ""
+       local addr = luci.tools.webadmin.network_get_addresses(section)
+       return table.concat(addr, ", ")
 end
 
-txrx = s:option(DummyValue, "_rx", "TX / RX")
+txrx = s:option(DummyValue, "_txrx")
 
 function txrx.cfgvalue(self, section)
-       local ix = self.map:stateget(section, "ifname")
+       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 "-"
@@ -81,10 +108,10 @@ function txrx.cfgvalue(self, section)
        return string.format("%s / %s", tx, rx)
 end
 
-errors = s:option(DummyValue, "_err", "Errors", "TX / RX")
+errors = s:option(DummyValue, "_err")
 
 function errors.cfgvalue(self, section)
-       local ix = self.map:stateget(section, "ifname")
+       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]