X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fnetwork.lua;h=566b986b2cafdc5ea7925a3b6913d301f7efcbd0;hb=98d1bef6816c5a7562e625b6e65b42f4342f1132;hp=c117e93f741f777645edc58a223d8d8405d7cdd4;hpb=7c765875884d6866c53b63757731b079bace2e9b;p=project%2Fluci.git

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 c117e93f7..566b986b2 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -25,6 +25,7 @@ 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
@@ -74,7 +75,7 @@ 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 = s:option(DummyValue, "_zone", translate("Zone"))
 	zone.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "zones")
 
 	function zone.cfgvalue(self, section)
@@ -82,21 +83,38 @@ if luci.model.uci.cursor():load("firewall") then
 	end
 end
 
-hwaddr = s:option(DummyValue, "_hwaddr")
+hwaddr = s:option(DummyValue, "_hwaddr",
+	translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"),
+        translate("Hardware Address"))
+
 function hwaddr.cfgvalue(self, section)
 	local ix = self.map:get(section, "ifname") or ""
-	return fs.readfile("/sys/class/net/" .. ix .. "/address")
-	 or luci.util.exec("ifconfig " .. ix):match(" ([A-F0-9:]+)%s*\n")
-	 or "n/a"
+	      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")
+	end
+
+	if mac and #mac > 0 then
+		return mac:upper()
+	end
+
+	return "?"
 end
 
 
-ipaddr = s:option(DummyValue, "ipaddr", translate("Addresses"))
+ipaddr = s:option(DummyValue, "ipaddr",
+	translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>" ..
+		"-Address"))
 function ipaddr.cfgvalue(self, section)
 	return table.concat(wa.network_get_addresses(section), ", ")
 end
 
-txrx = s:option(DummyValue, "_txrx")
+txrx = s:option(DummyValue, "_txrx", translate("Traffic"),
+	translate("transmitted / received"))
 
 function txrx.cfgvalue(self, section)
 	local ix = self.map:get(section, "ifname")
@@ -110,7 +128,8 @@ function txrx.cfgvalue(self, section)
 	return string.format("%s / %s", tx, rx)
 end
 
-errors = s:option(DummyValue, "_err")
+errors = s:option(DummyValue, "_err", translate("Errors"),
+	translate("TX / RX"))
 
 function errors.cfgvalue(self, section)
 	local ix = self.map:get(section, "ifname")
@@ -124,4 +143,53 @@ function errors.cfgvalue(self, section)
 	return string.format("%s / %s", tx, rx)
 end
 
+-- 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
+
+	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"))
+end
+
 return m