Add support for changing ULA prefix

[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..f2984b5 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -12,87 +12,71 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.sys")
-require("luci.tools.webadmin")
 
-
-m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
-
-local created
-local netstat = luci.sys.net.deviceinfo()
-
-s = m:section(TypedSection, "interface", translate("interfaces"))
-s.addremove = true
-s.extedit   = luci.http.getenv("REQUEST_URI") .. "/%s"
-s.template  = "cbi/tblsection"
-
-function s.filter(self, section)
-       return section ~= "loopback" and section
-end
-
-function s.create(self, section)
-       if TypedSection.create(self, section) then
-               created = section
+local fs = require "nixio.fs"
+
+m = Map("network", translate("Interfaces"))
+m.pageaction = false
+m:section(SimpleSection).template = "admin_network/iface_overview"
+
+-- Show ATM bridge section if we have the capabilities
+if fs.access("/usr/sbin/br2684ctl") then
+       atm = m:section(TypedSection, "atm-bridge", translate("ATM Bridges"),
+               translate("ATM bridges expose encapsulated ethernet in AAL5 " ..
+                       "connections as virtual Linux network interfaces which can " ..
+                       "be used in conjunction with DHCP or PPP to dial into the " ..
+                       "provider network."))
+
+       atm.addremove = true
+       atm.anonymous = true
+
+       atm.create = function(self, section)
+               local sid = TypedSection.create(self, section)
+               local max_unit = -1
+
+               m.uci:foreach("network", "atm-bridge",
+                       function(s)
+                               local u = tonumber(s.unit)
+                               if u ~= nil and u > max_unit then
+                                       max_unit = u
+                               end
+                       end)
+
+               m.uci:set("network", sid, "unit", max_unit + 1)
+               m.uci:set("network", sid, "atmdev", 0)
+               m.uci:set("network", sid, "encaps", "llc")
+               m.uci:set("network", sid, "payload", "bridged")
+               m.uci:set("network", sid, "vci", 35)
+               m.uci:set("network", sid, "vpi", 8)
+
+               return sid
        end
-end
 
-function s.parse(self, ...)
-       TypedSection.parse(self, ...)
-       if created then
-               luci.http.redirect(luci.http.getenv("REQUEST_URI") .. "/" .. created)
-       end
+       atm:tab("general", translate("General Setup"))
+       atm:tab("advanced", translate("Advanced Settings"))
+
+       vci    = atm:taboption("general", Value, "vci", translate("ATM Virtual Channel Identifier (VCI)"))
+       vpi    = atm:taboption("general", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)"))
+       encaps = atm:taboption("general", ListValue, "encaps", translate("Encapsulation mode"))
+       encaps:value("llc", translate("LLC"))
+       encaps:value("vc", translate("VC-Mux"))
+
+       atmdev  = atm:taboption("advanced", Value, "atmdev", translate("ATM device number"))
+       unit    = atm:taboption("advanced", Value, "unit", translate("Bridge unit number"))
+       payload = atm:taboption("advanced", ListValue, "payload", translate("Forwarding mode"))
+       payload:value("bridged", translate("bridged"))
+       payload:value("routed", translate("routed"))
+       m.pageaction = true
 end
 
-up = s:option(Flag, "up")
-up.stateful = true
-function up.write(self, section, value)
-       local call = value == "1" and "ifdown" or "ifup"
-       os.execute(call .. " " .. section)
+local network = require "luci.model.network"
+if network:has_ipv6() then
+       local s = m:section(NamedSection, "globals", "globals", translate("Global network options"))
+       local o = s:option(Value, "ula_prefix", translate("IPv6 ULA-Prefix"))
+       o.datatype = "ip6addr"
+       o.rmempty = true
+       m.pageaction = true
 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"
-end
-
-
-ipaddr = s:option(DummyValue, "ipaddr")
-
-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 ""
-end
-
-txrx = s:option(DummyValue, "_rx", "TX / RX")
-
-function txrx.cfgvalue(self, section)
-       local ix = self.map:stateget(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", "Errors", "TX / RX")
-
-function errors.cfgvalue(self, section)
-       local ix = self.map:stateget(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
\ No newline at end of file
+return m