projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-0.10: Merge r8706
[project/luci.git]
/
applications
/
luci-splash
/
root
/
usr
/
sbin
/
luci-splash
diff --git
a/applications/luci-splash/root/usr/sbin/luci-splash
b/applications/luci-splash/root/usr/sbin/luci-splash
index
7738679
..
22b2734
100755
(executable)
--- a/
applications/luci-splash/root/usr/sbin/luci-splash
+++ b/
applications/luci-splash/root/usr/sbin/luci-splash
@@
-191,6
+191,10
@@
function ipt_delete_all(args, comp, off)
end
end
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)
-- 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
-- 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()
mac = mac,
ipaddr = ipaddr,
start = os.time()
@@
-241,7
+245,7
@@
end
-- Add a whitelist entry
function add_whitelist(mac)
-- 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)
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)
-- 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)
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
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
mac = v.mac,
ipaddr = v.ipaddr,
start = v.start