From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 27 Mar 2010 14:54:06 +0000 (+0000)
Subject: modules/admin-{mini,full}: prevent crash in iface overview page if ifconfig does... 
X-Git-Tag: 0.10.0~763
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=903bea9683aa6f6843c9cd3697d40ca15989f104

modules/admin-{mini,full}: prevent crash in iface overview page if ifconfig does not return information
---

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 8d34fa7cf..2dc9e9b43 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -86,9 +86,18 @@ end
 hwaddr = s:option(DummyValue, "_hwaddr")
 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"
+	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
 
 
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index 43ad212cc..57edc4718 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -41,9 +41,18 @@ 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"
+	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