From b0771c43ea996b6f3c3a38ef7c6f5b28eaf04a89 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 6 Jul 2009 21:14:59 +0000 Subject: applications/luci-splash: - rewrote init script, cli - introduce download traffic counters - adept user interface --- .../luasrc/controller/splash/splash.lua | 81 +++++++++------------- .../luasrc/view/admin_status/splash.htm | 32 ++++++--- 2 files changed, 54 insertions(+), 59 deletions(-) (limited to 'applications/luci-splash/luasrc') diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua index 88aafcdf5..13f9f4121 100644 --- a/applications/luci-splash/luasrc/controller/splash/splash.lua +++ b/applications/luci-splash/luasrc/controller/splash/splash.lua @@ -24,7 +24,7 @@ function action_activate() local ip = luci.http.getenv("REMOTE_ADDR") or "127.0.0.1" local mac = luci.sys.net.ip4mac(ip:match("^[\[::ffff:]*(%d+.%d+%.%d+%.%d+)\]*$")) if mac and luci.http.formvalue("accept") then - os.execute("luci-splash add "..mac.." >/dev/null 2>&1") + os.execute("luci-splash lease "..mac.." >/dev/null 2>&1") luci.http.redirect(luci.model.uci.cursor():get("freifunk", "community", "homepage")) else luci.http.redirect(luci.dispatcher.build_url()) @@ -35,63 +35,44 @@ function action_status_admin() local uci = luci.model.uci.cursor_state() local macs = luci.http.formvaluetable("save") - local function delete_mac(what, mac) - uci:delete_all("luci_splash", what, - function(s) - return ( s.mac and s.mac:lower() == mac ) - end) - end - - local function leases(mac) - local leases = { } - - uci:foreach("luci_splash", "lease", function(s) - if s.start and s.mac and s.mac:lower() ~= mac then - leases[#leases+1] = { - start = s.start, - mac = s.mac - } - end - end) - - uci:revert("luci_splash") - - return leases - end - - local function commit(leases, no_commit) - if not no_commit then - uci:save("luci_splash") - uci:commit("luci_splash") - end - - for _, l in ipairs(leases) do - uci:section("luci_splash", "lease", nil, l) - end - - uci:save("luci_splash") - os.execute("/etc/init.d/luci_splash restart") - end + local changes = { + whitelist = { }, + blacklist = { }, + lease = { }, + remove = { } + } for key, _ in pairs(macs) do local policy = luci.http.formvalue("policy.%s" % key) local mac = luci.http.protocol.urldecode(key) - local lslist = leases(policy ~= "kick" and mac) - - delete_mac("blacklist", mac) - delete_mac("whitelist", mac) if policy == "whitelist" or policy == "blacklist" then - uci:section("luci_splash", policy, nil, { mac = mac }) - elseif policy == "normal" then - lslist[#lslist+1] = { mac = mac, start = os.time() } - elseif policy == "kick" then - for _, l in ipairs(lslist) do - if l.mac:lower() == mac then l.kicked="1" end - end + changes[policy][#changes[policy]+1] = mac + elseif policy == "normal" then + changes["lease"][#changes["lease"]+1] = mac + elseif policy == "kicked" then + changes["remove"][#changes["remove"]+1] = mac end + end + + if #changes.whitelist > 0 then + os.execute("luci-splash whitelist %s >/dev/null" + % table.concat(changes.whitelist)) + end + + if #changes.blacklist > 0 then + os.execute("luci-splash blacklist %s >/dev/null" + % table.concat(changes.blacklist)) + end + + if #changes.lease > 0 then + os.execute("luci-splash lease %s >/dev/null" + % table.concat(changes.lease)) + end - commit(lslist) + if #changes.remove > 0 then + os.execute("luci-splash remove %s >/dev/null" + % table.concat(changes.remove)) end luci.template.render("admin_status/splash", { is_admin = true }) diff --git a/applications/luci-splash/luasrc/view/admin_status/splash.htm b/applications/luci-splash/luasrc/view/admin_status/splash.htm index 4690e3348..99395200d 100644 --- a/applications/luci-splash/luasrc/view/admin_status/splash.htm +++ b/applications/luci-splash/luasrc/view/admin_status/splash.htm @@ -35,10 +35,10 @@ uci:foreach("luci_splash", "lease", start = tonumber(s.start), limit = ( tonumber(s.start) + leasetime ), mac = s.mac:upper(), + ipaddr = s.ipaddr, policy = "normal", packets = 0, bytes = 0, - kicked = s.kicked and true or false } end end) @@ -58,11 +58,25 @@ for _, r in ipairs(ipt:find({table="nat", chain="luci_splash_leases"})) do end end -for _, r in ipairs(ipt:find({table="filter", chain="luci_splash_filter", options={"MAC"}})) do - local c = clients[r.options[2]:lower()] - if c and c.packets == 0 then - c.bytes = tonumber(r.bytes) - c.packets = tonumber(r.packets) +for mac, client in pairs(clients) do + client.bytes_in = 0 + client.bytes_out = 0 + client.packets_in = 0 + client.packets_out = 0 + + if client.ipaddr then + local rin = ipt:find({table="mangle", chain="luci_splash_mark_in", destination=client.ipaddr}) + local rout = ipt:find({table="mangle", chain="luci_splash_mark_out", options={"MAC", client.mac:upper()}}) + + if rin and #rin > 0 then + client.bytes_in = rin[1].bytes + client.packets_in = rin[1].packets + end + + if rout and #rout > 0 then + client.bytes_out = rout[1].bytes + client.packets_out = rout[1].packets + end end end @@ -123,7 +137,7 @@ end <%:ff_splash_ip IP Address%> <%:ff_splash_mac MAC Address%> <%:ff_splash_timeleft Time remaining%> - <%:ff_splash_traffic Outgoing traffic%> + <%:ff_splash_traffic Traffic in/out%> <%:ff_splash_policy Policy%> @@ -149,7 +163,7 @@ end (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or (c.policy ~= "normal") and "-" or "" .. translate("ff_splash_expired", "expired") .. "" %> - <%=wat.byte_format(c.bytes)%> + <%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%> <% if is_admin then %> -- cgit v1.2.3