From 78fd18c8e99a7f0a07c9253b718bfbe6660710df Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Mon, 18 Jun 2012 11:12:38 +0000 Subject: applications/luci-splash: when more than two clients where leased and another one got a lease luci-splash dropped the others, see #431. Thanks to andrenarchy for the patch --- applications/luci-splash/root/usr/sbin/luci-splash | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'applications/luci-splash/root/usr/sbin') diff --git a/applications/luci-splash/root/usr/sbin/luci-splash b/applications/luci-splash/root/usr/sbin/luci-splash index ae459ad726..474617380e 100755 --- 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 +-- 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) @@ -342,7 +346,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 -- cgit v1.2.3