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

applications/luci-splash: fix mac status query

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-07-09 16:55:41 +00:00
parent 6bfe0624b6
commit 7d7fcecb74
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-splash/luasrc/controller/splash/splash.lua
View file

@ -12,8 +12,8 @@ end
function action_dispatch() function action_dispatch()
local mac = luci.sys.net.ip4mac(luci.http.getenv("REMOTE_ADDR")) or "" local mac = luci.sys.net.ip4mac(luci.http.getenv("REMOTE_ADDR")) or ""
local status = luci.util.execl("luci-splash status "..mac)[1] local status = luci.util.execl("luci-splash status " .. mac)[1]
if #mac > 0 and ( status == "whitelisted" or status == "lease" ) then if #mac > 0 and ( status == "whitelist" or status == "lease" ) then
luci.http.redirect(luci.dispatcher.build_url()) luci.http.redirect(luci.dispatcher.build_url())
else else
luci.http.redirect(luci.dispatcher.build_url("splash", "splash")) luci.http.redirect(luci.dispatcher.build_url("splash", "splash"))

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

@ -29,7 +29,7 @@ function main(argv)
limit_down = tonumber(uci:get("luci_splash", "general", "limit_down")) or 0 limit_down = tonumber(uci:get("luci_splash", "general", "limit_down")) or 0
if ( cmd == "lease" or cmd == "add-rules" or cmd == "remove" or if ( cmd == "lease" or cmd == "add-rules" or cmd == "remove" or
cmd == "whitelist" or cmd == "blacklist" ) and #argv > 0 cmd == "whitelist" or cmd == "blacklist" or cmd == "status" ) and #argv > 0
then then
lock() lock()
@ -59,6 +59,11 @@ function main(argv)
elseif whitelist_macs[mac] then elseif whitelist_macs[mac] then
add_whitelist_rule(mac) add_whitelist_rule(mac)
end end
elseif mac and cmd == "status" then
print(leased_macs[mac] and "lease"
or whitelist_macs[mac] and "whitelist"
or blacklist_macs[mac] and "blacklist"
or "new")
elseif mac and ( cmd == "whitelist" or cmd == "blacklist" or cmd == "lease" ) then elseif mac and ( cmd == "whitelist" or cmd == "blacklist" or cmd == "lease" ) then
if cmd ~= "lease" and leased_macs[mac] then if cmd ~= "lease" and leased_macs[mac] then
print("Removing %s from leases" % mac) print("Removing %s from leases" % mac)