Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.10: Merge r8706

Browse source
This commit is contained in:
Manuel Munz 2012-06-18 11:14:12 +00:00
parent fd96871acd
commit 870fb6989f
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
applications/luci-splash/root/usr/sbin/luci-splash
View file

@ -191,6 +191,10 @@ function ipt_delete_all(args, comp, off)
end
end
-- Convert mac to uci-compatible section name
function convert_mac_to_secname(mac)
return string.gsub(mac, ":", "")
end
-- Add a lease to state and invoke add_rule
function add_lease(mac, arp, no_uci)
@ -208,7 +212,7 @@ function add_lease(mac, arp, no_uci)
-- Add lease if there is an ip addr
if ipaddr then
if not no_uci then
uci:section("luci_splash", "lease", nil, {
uci:section("luci_splash", "lease", convert_mac_to_secname(mac), {
mac = mac,
ipaddr = ipaddr,
start = os.time()
@ -241,7 +245,7 @@ end
-- Add a whitelist entry
function add_whitelist(mac)
uci:section("luci_splash", "whitelist", nil, { mac = mac })
uci:section("luci_splash", "whitelist", convert_mac_to_secname(mac), { mac = mac })
uci:save("luci_splash")
uci:commit("luci_splash")
add_whitelist_rule(mac)
@ -250,7 +254,7 @@ end
-- Add a blacklist entry
function add_blacklist(mac)
uci:section("luci_splash", "blacklist", nil, { mac = mac })
uci:section("luci_splash", "blacklist", convert_mac_to_secname(mac), { mac = mac })
uci:save("luci_splash")
uci:commit("luci_splash")
add_blacklist_rule(mac)
@ -343,7 +347,7 @@ function sync()
remove_lease_rule(v.mac, v.ipaddr)
else
-- Rewrite state
uci:section("luci_splash", "lease", nil, {
uci:section("luci_splash", "lease", convert_mac_to_secname(v.mac), {
mac = v.mac,
ipaddr = v.ipaddr,
start = v.start