luci-0.9: merge r6346

This commit is contained in:
Jo-Philipp Wich 2010-10-28 18:22:14 +00:00
parent b8e71be773
commit 2f14ec03ae
2 changed files with 6 additions and 5 deletions

View File

@ -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

View File

@ -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",
@ -426,11 +426,11 @@ function list()
) do
if (s[".type"] == "whitelist" or s[".type"] == "blacklist") and s.mac then
local mac = s.mac:lower()
local arp = arpcache[mac]:lower()
local arp = arpcache[mac]
print(string.format(
"%-17s %-15s %-9s %4s %-7s %9s %9s",
mac, arp and arp[2] or "?", s[".type"], "- ",
arp and arp[1] or "?", "-", "-"
mac, arp and arp[2] or "?", s[".type"],
"- ", arp and arp[1] or "?", "-", "-"
))
end
end