From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 28 Oct 2010 18:20:15 +0000 (+0000)
Subject: applications/luci-splash: add missing insmod for act_police, fix a crash in cli util
X-Git-Tag: 0.10.0~566
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=6fa65fa9ec7a85a4fda885b385dc988cfb258dc2

applications/luci-splash: add missing insmod for act_police, fix a crash in cli util
---

diff --git a/applications/luci-splash/root/etc/init.d/luci_splash b/applications/luci-splash/root/etc/init.d/luci_splash
index d6f0a3376..5206d448c 100755
--- a/applications/luci-splash/root/etc/init.d/luci_splash
+++ b/applications/luci-splash/root/etc/init.d/luci_splash
@@ -179,6 +179,7 @@ start() {
 
 	### Load required modules
 	[ "$LIMIT_UP" -gt 0 -a "$LIMIT_DOWN" -gt 0 ] && {
+		silent insmod act_police
 		silent insmod cls_fw
 		silent insmod cls_u32
 		silent insmod sch_htb
diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-splash/root/usr/sbin/luci-splash
index 62c2ac635..b8b701458 100755
--- a/applications/luci-splash/root/usr/sbin/luci-splash
+++ b/applications/luci-splash/root/usr/sbin/luci-splash
@@ -380,7 +380,7 @@ function list()
 	-- Get current arp cache
 	local arpcache = { }
 	for _, entry in ipairs(net.arptable()) do
-		arpcache[entry["HW address"]:lower()] = { entry["Device"], entry["IP address"] }
+		arpcache[entry["HW address"]:lower()] = { entry["Device"]:lower(), entry["IP address"]:lower() }
 	end
 
 	-- Find traffic usage
@@ -410,7 +410,7 @@ function list()
 		if s[".type"] == "lease" and s.mac then
 			local ti, to = traffic(s)
 			local mac = s.mac:lower()
-			local arp = arpcache[mac]:lower()
+			local arp = arpcache[mac]
 			print(string.format(
 				"%-17s  %-15s  %-9s  %3dm  %-7s  %7dKB  %7dKB",
 				mac, s.ipaddr, "leased",
@@ -429,8 +429,8 @@ function list()
 			local arp = arpcache[mac]
 			print(string.format(
 				"%-17s  %-15s  %-9s  %4s  %-7s  %9s  %9s",
-				mac, arp and arp[2]:lower() or "?", s[".type"],
-				"- ", arp and arp[1]:lower() or "?", "-", "-"
+				mac, arp and arp[2] or "?", s[".type"],
+				"- ", arp and arp[1] or "?", "-", "-"
 			))
 		end
 	end