nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 0fe5bebe20 into ba62b698c0

Browse Source
This commit is contained in:
Christof Schulze 2016-10-13 18:44:38 +00:00 committed by GitHub
commit 5bbef161bb
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo
View File

@ -8,6 +8,7 @@ badrequest() {
echo 'Access-Control-Allow-Origin: *' echo 'Access-Control-Allow-Origin: *'
batctl if | cut -d: -f1 | grep -qxF "$QUERY_STRING" || badrequest #batctl if | cut -d: -f1 | grep -qxF "$QUERY_STRING" || badrequest
lua -e 'mesh = require(gluon.mesh); for interface, _ in ipairs(mesh.interfaces()) do print(interface .. "\n"); end;' | grep -qxF "$QUERY_STRING" || badrequest
exec /usr/bin/gluon-neighbour-info -s neighbour -i "$QUERY_STRING" -d ff02::2:1001 -p 1001 -r nodeinfo exec /usr/bin/gluon-neighbour-info -s neighbour -i "$QUERY_STRING" -d ff02::2:1001 -p 1001 -r nodeinfo

3
package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations
View File

@ -8,7 +8,8 @@ badrequest() {
echo 'Access-Control-Allow-Origin: *' echo 'Access-Control-Allow-Origin: *'
batctl if | cut -d: -f1 | grep -qxF "$QUERY_STRING" || badrequest #batctl if | cut -d: -f1 | grep -qxF "$QUERY_STRING" || badrequest
lua -e 'mesh = require(gluon.mesh); for interface, _ in ipairs(mesh.interfaces()) do print(interface .. "\n"); end;' | grep -qxF "$QUERY_STRING" || badrequest
CMD="exec /lib/gluon/status-page/providers/stations '$QUERY_STRING'" CMD="exec /lib/gluon/status-page/providers/stations '$QUERY_STRING'"

6
package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/interfaces
View File

@ -3,16 +3,16 @@
util = require 'luci.util' util = require 'luci.util'
json = require 'luci.jsonc' json = require 'luci.jsonc'
fs = require 'nixio.fs' fs = require 'nixio.fs'
mesh = require 'gluon.mesh'
io.write("Access-Control-Allow-Origin: *\n") io.write("Access-Control-Allow-Origin: *\n")
io.write("Content-type: application/json\n\n") io.write("Content-type: application/json\n\n")
list = util.exec('batctl if') -- list = util.exec('batctl if')
interfaces = {} interfaces = {}
for _, line in ipairs(util.split(list)) do for interface, _ in ipairs(mesh.interfaces()) do
ifname = line:match('^(.-):')
if ifname ~= nil then if ifname ~= nil then
pcall(function() pcall(function()
local address = util.trim(fs.readfile('/sys/class/net/' .. ifname .. '/address')) local address = util.trim(fs.readfile('/sys/class/net/' .. ifname .. '/address'))