[luci-app-bmx6]: fix status page

[feed/routing.git] / luci-app-bmx6 / files / www / cgi-bin / bmx6-info

diff --git a/luci-app-bmx6/files/www/cgi-bin/bmx6-info b/luci-app-bmx6/files/www/cgi-bin/bmx6-info
index 931cbf68a4b4545246751e8cfc946fc7eeb93e33..52630816f76bef63c8d1363aee42490ecd8795a1 100644 (file)
--- a/luci-app-bmx6/files/www/cgi-bin/bmx6-info
+++ b/luci-app-bmx6/files/www/cgi-bin/bmx6-info
@@ -76,7 +76,7 @@ print_query() {
         }
 
        # If the query is a file, just printing the file
-       [ -f "$BMX6_DIR/$QUERY" ] && cat "$BMX6_DIR/$QUERY";
+       [ -f "$BMX6_DIR/$1" ] && cat "$BMX6_DIR/$1";
 }
 
 if [ "${QUERY##*/}" == "all" ]; then
@@ -84,6 +84,13 @@ if [ "${QUERY##*/}" == "all" ]; then
        QALL=1
 fi
 
+if [ "$QUERY" == '$info' ]; then
+       echo '{ "info": [ '
+       print_query status
+       echo -n ","
+       print_query interfaces
+       echo "] }"
+fi
 
 if [ "$QUERY" == '$neighbours' ]; then
        QALL=1
@@ -97,7 +104,7 @@ if [ "$QUERY" == '$neighbours' ]; then
        exit 0
 
 else if [ "$QUERY" == '$tunnels' ]; then
-       bmx6 -c --jshow tunnels
+       bmx6 -c --jshow tunnels /r=0
        exit 0
 
 else