X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fnetwork.lua;h=466acb084d19b8c2c702c3146f384e445932eccd;hp=8adfbf1372284259bf0b44e18afc8aa1fbce4158;hb=3386d649ea5c7b98ab654e0ae9c7228615b476b2;hpb=382a33f40a76cedc945ae6895a1341118ca48e4e
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 8adfbf137..466acb084 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -13,134 +13,60 @@ You may obtain a copy of the License at
$Id$
]]--
-local sys = require "luci.sys"
-local wa = require "luci.tools.webadmin"
-local fs = require "nixio.fs"
+local fs = require "nixio.fs"
-local netstate = luci.model.uci.cursor_state():get_all("network")
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
-
-function s.filter(self, section)
- return section ~= "loopback" and section
-end
-
-function s.create(self, section)
- if TypedSection.create(self, section) then
- created = section
- else
- self.invalid_cts = true
- end
-end
-
-function s.parse(self, ...)
- TypedSection.parse(self, ...)
- if created then
- m.uci:save("network")
- luci.http.redirect(luci.dispatcher.build_url("admin", "network", "network")
- .. "/" .. created)
- end
-end
-
-up = s:option(Flag, "up")
-function up.cfgvalue(self, section)
- return netstate[section] and netstate[section].up or "0"
-end
-
-function up.write(self, section, value)
- 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)
- return table.concat(wa.network_get_zones(section) or { "-" }, ", ")
- end
-end
-
-hwaddr = s:option(DummyValue, "_hwaddr",
- translate("MAC-Address"),
- translate("Hardware Address"))
-
-function hwaddr.cfgvalue(self, section)
- local ix = self.map:get(section, "ifname") or ""
- ix = (type(ix) == "table") and ix[1] or ix
-
- 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")
+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
- if mac and #mac > 0 then
- return mac:upper()
- end
-
- return "?"
-end
-
-
-ipaddr = s:option(DummyValue, "ipaddr",
- translate("IPv4" ..
- "-Address"))
-function ipaddr.cfgvalue(self, section)
- return table.concat(wa.network_get_addresses(section), ", ")
-end
-
-txrx = s:option(DummyValue, "_txrx", translate("Traffic"),
- translate("transmitted / received"))
-
-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 wa.byte_format(tonumber(rx)) or "-"
-
- local tx = netstat and netstat[ix] and netstat[ix][9]
- tx = tx and wa.byte_format(tonumber(tx)) or "-"
-
- return string.format("%s / %s", tx, rx)
-end
-
-errors = s:option(DummyValue, "_err", translate("Errors"),
- translate("TX / RX"))
-
-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)
+ 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"))
+else
+ m.pageaction = false
end
return m