local ipt = require "luci.sys.iptparser".IptParser()
local uci = require "luci.model.uci".cursor_state()
local wat = require "luci.tools.webadmin"
+local fs = require "nixio.fs"
+
local clients = { }
local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime") or 1) * 60 * 60
local leasefile = "/tmp/dhcp.leases"
end)
-uci:foreach("luci_splash", "lease",
+uci:foreach("luci_splash_leases", "lease",
function(s)
if s.start and s.mac then
clients[s.mac:lower()] = {
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)
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
end
end)
-if luci.fs.access(leasefile) then
+if fs.access(leasefile) then
for l in io.lines(leasefile) do
local time, mac, ip, name = l:match("^(%d+) (%S+) (%S+) (%S+)")
if time and mac and ip then
return mac
end
+if luci.http.formvalue("status") == "1" then
+ local rv = {}
+ for _, c in utl.spairs(clients,
+ function(a,b) if clients[a].policy == clients[b].policy then
+ return (clients[a].start > clients[b].start)
+ else
+ return (clients[a].policy > clients[b].policy)
+ end
+ end)
+ do
+ if c.ip then
+ rv[#rv+1] = {
+ hostname = c.hostname or "?",
+ ip = c.ip or "?",
+ mac = showmac(c.mac) or "?",
+ timeleft = (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or (c.policy ~= "normal") and "-" or "expired",
+ trafficin = wat.byte_format(c.bytes_in) or "?",
+ trafficout = wat.byte_format(c.bytes_out) or "?",
+ policy = c.policy or "?"
+ }
+ end
+ end
+ luci.http.prepare_content("application/json")
+ luci.http.write_json(rv)
+ return
+end
-%>
+
+
<%+header%>
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+
+ XHR.poll(10 , '<%=REQUEST_URI%>', { status: 1 },
+ function(x, info)
+ {
+ var tbody = document.getElementById('splash_table');
+ if (tbody)
+ {
+ var s = '';
+ if (info.length == undefined) {
+ s += '<tr class="cbi-section-table-row"><td colspan="7" class="cbi-section-table-cell"><br /><em><%:No clients connected%></em><br /></td></tr>'
+ };
+ for (var idx = 0; idx < info.length; idx++)
+ {
+ var splash = info[idx];
+ s += String.format(
+ '<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
+ '<td class="cbi-section-table-cell">%s</td>' +
+ '<td class="cbi-section-table-cell">%s</td>' +
+ '<td class="cbi-section-table-cell">%s</td>' +
+ '<td class="cbi-section-table-cell">%s</td>' +
+ '<td class="cbi-section-table-cell">%s/%s</td>' +
+ '<td class="cbi-section-table-cell">',
+ splash.hostname, splash.ip, splash.mac, splash.timeleft, splash.trafficin, splash.trafficout);
+
+ <% if is_admin then %>
+ s += String.format('<select name="policy.%s" style="width:200px">', splash.mac.toLowerCase());
+ if (splash.policy == 'whitelist') {
+ s += '<option value="whitelist" selected="selected"><%:whitelisted%></option>'
+ } else {
+ s += '<option value="whitelist"><%:whitelisted%></option>'
+ };
+ if (splash.policy == 'normal') {
+ s += '<option value="normal" selected="selected"><%:splashed%></option>';
+ s += '<option value="kicked"><%:temporarily blocked%></option>'
+ } else {
+ s += '<option value="normal"><%:splashed%></option>'
+ };
+ if (splash.policy == 'blacklist') {
+ s+= '<option value="blacklist" selected="selected"><%:blacklisted%></option>'
+ } else {
+ s += '<option value="blacklist"><%:blacklisted%></option>'
+ };
+ s += String.format(
+ '</select>' +
+ '<input type="submit" class="cbi-button cbi-button-save" name="save.%s" value="<%:Save%>" />',
+ splash.mac.toLowerCase());
+ <% else %>
+ s += String.format('%s', splash.policy);
+ <% end %>
+ s += '</td></tr>'
+ }
+ tbody.innerHTML = s;
+ }
+ }
+ );
+//]]></script>
+
+
<div id="cbi-splash-leases" class="cbi-map">
- <h2><a id="content" name="content"><%:ff_splash Client-Splash%></a></h2>
+ <h2><a id="content" name="content"><%:Client-Splash%></a></h2>
<fieldset id="cbi-table-table" class="cbi-section">
- <legend><%:ff_splash_clients Active Clients%></legend>
+ <legend><%:Active Clients%></legend>
<div class="cbi-section-node">
<% if is_admin then %><form action="<%=REQUEST_URI%>" method="post"><% end %>
<table class="cbi-section-table">
- <tr class="cbi-section-table-titles">
- <th class="cbi-section-table-cell"><%:ff_splash_hostname Hostname%></th>
- <th class="cbi-section-table-cell"><%:ff_splash_ip IP Address%></th>
- <th class="cbi-section-table-cell"><%:ff_splash_mac MAC Address%></th>
- <th class="cbi-section-table-cell"><%:ff_splash_timeleft Time remaining%></th>
- <th class="cbi-section-table-cell"><%:ff_splash_traffic Outgoing traffic%></th>
- <th class="cbi-section-table-cell"><%:ff_splash_policy Policy%></th>
- </tr>
+ <thead>
+ <tr class="cbi-section-table-titles">
+ <th class="cbi-section-table-cell"><%:Hostname%></th>
+ <th class="cbi-section-table-cell"><%:IP Address%></th>
+ <th class="cbi-section-table-cell"><%:MAC Address%></th>
+ <th class="cbi-section-table-cell"><%:Time remaining%></th>
+ <th class="cbi-section-table-cell"><%:Traffic in/out%></th>
+ <th class="cbi-section-table-cell"><%:Policy%></th>
+ </tr>
+ </thead>
+ <tbody id="splash_table">
<%-
local count = 0
if c.ip then
count = count + 1
-%>
- <tr class="cbi-section-table-row cbi-rowstyle-<%=2-(count%2)%>">
- <td class="cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("ff_splash_unknown", "unknown") .. "</em>"%></td>
- <td class="cbi-section-table-cell"><%=c.ip or "<em>" .. translate("ff_splash_unknown", "unknown") .. "</em>"%></td>
+ <tr class="cbi-section-table-row cbi-rowstyle-<%=2-(count%2)%>">
+ <td class="cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("unknown") .. "</em>"%></td>
+ <td class="cbi-section-table-cell"><%=c.ip or "<em>" .. translate("unknown") .. "</em>"%></td>
<td class="cbi-section-table-cell"><%=showmac(c.mac)%></td>
<td class="cbi-section-table-cell"><%=
(c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or
- (c.policy ~= "normal") and "-" or "<em>" .. translate("ff_splash_expired", "expired") .. "</em>"
+ (c.policy ~= "normal") and "-" or "<em>" .. translate("expired") .. "</em>"
%></td>
- <td class="cbi-section-table-cell"><%=wat.byte_format(c.bytes)%></td>
+ <td class="cbi-section-table-cell"><%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%></td>
<td class="cbi-section-table-cell">
<% if is_admin then %>
<select name="policy.<%=c.mac:lower()%>" style="width:200px">
- <option value="whitelist"<%=c.policy=="whitelist" and ' selected="selected"'%>><%:ff_splash_whitelisted whitelisted%></option>
- <option value="normal"<%=c.policy=="normal" and not c.kicked and ' selected="selected"'%>><%:ff_splash_splashed splashed%></option>
- <option value="blacklist"<%=c.policy=="blacklist" and ' selected="selected"'%>><%:ff_splash_blacklisted blacklisted%></option>
+ <option value="whitelist"<%=c.policy=="whitelist" and ' selected="selected"'%>><%:whitelisted%></option>
+ <option value="normal"<%=c.policy=="normal" and not c.kicked and ' selected="selected"'%>><%:splashed%></option>
+ <option value="blacklist"<%=c.policy=="blacklist" and ' selected="selected"'%>><%:blacklisted%></option>
<% if c.policy == "normal" then -%>
- <option value="kick"<%=c.kicked and ' selected="selected"'%>><%:ff_splash_tempblock temporarily blocked%> (<%=wat.date_format(c.limit-os.time())%>)</option>
+ <option value="kicked"><%:temporarily blocked%></option>
<%- end %>
</select>
- <input type="submit" class="cbi-button cbi-button-save" name="save.<%=c.mac:lower()%>" value="<%:save Save%>" />
+ <input type="submit" class="cbi-button cbi-button-save" name="save.<%=c.mac:lower()%>" value="<%:Save%>" />
<% else %>
<%=c.policy%>
<% end %>
</td>
- </tr>
- <%-
+ </tr>
+ <%-
+ end
end
- end
-
- if count == 0 then
- -%>
- <tr class="cbi-section-table-row">
- <td colspan="7" class="cbi-section-table-cell">
- <br /><em><%:ff_splash_noclients No clients connected%></em><br />
- </td>
- </tr>
+ if count == 0 then
+ -%>
+ <tr class="cbi-section-table-row">
+ <td colspan="7" class="cbi-section-table-cell">
+ <br /><em><%:No clients connected%></em><br />
+ </td>
+ </tr>
<%- end -%>
+ </tbody>
</table>
<% if is_admin then %></form><% end %>
</div>
projects / project / luci.git / blobdiff