From 0fe5bebe203d917b2d0fceeaa52932fc684faf3b Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Thu, 28 Apr 2016 17:59:07 +0200 Subject: [PATCH] replace batctl-calls with gluon.mesh --- .../lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo | 3 ++- .../files/lib/gluon/status-page/www/cgi-bin/dyn/stations | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo index 657f17e5..91743046 100755 --- a/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo +++ b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo @@ -8,6 +8,7 @@ badrequest() { 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 diff --git a/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations index 258122fb..fa6444ae 100755 --- a/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations +++ b/package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations @@ -8,7 +8,8 @@ badrequest() { 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'"