luci-app-bmx6: add new methods to bmx6-info and clean/sanityze the code
Signed-off-by: Pau Escrich <p4u@dabax.net>
This commit is contained in:
Pau Escrich
parent
a881d5d4a6
commit
9646815e7d
|
|
@ -1,28 +1,9 @@
|
|||
#!/bin/sh
|
||||
# Copyright (C) 2011 Pau Escrich
|
||||
# Contributors Jo-Philipp Wich <xm@subsignal.org>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along
|
||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# The full GNU General Public License is included in this distribution in
|
||||
# the file called "COPYING".
|
||||
#
|
||||
# This script gives information about bmx6
|
||||
# Can be executed from a linux shell: ./bmx6-info -s links
|
||||
# Or from web interfae (with cgi enabled): http://host/cgi-bin/bmx6-info?links
|
||||
# If you ask for a directory you wil get the directory contents in JSON forman
|
||||
# Special methods are tagged with '$', like $myself or $neighbours: http://host/cgi-bin/bmx6-info?$myself
|
||||
# When '$' is not used, raw bmx6 information from the filesystem is returned (/var/runb/bmx6/json/)
|
||||
|
||||
BMX6_DIR="$(uci get bmx6.general.runtimeDir 2>/dev/null)" || BMX6_DIR="/var/run/bmx6/json"
|
||||
|
||||
|
|
@ -31,9 +12,10 @@ if [ "$1" == "-s" ]; then
|
|||
QUERY="$2"
|
||||
else
|
||||
QUERY="${QUERY_STRING%%=*}"
|
||||
QUERY="${QUERY%%\?*}"
|
||||
QUERY="${QUERY%%\&*}"
|
||||
echo "Content-type: application/json"
|
||||
echo ""
|
||||
|
||||
fi
|
||||
|
||||
check_path() {
|
||||
|
|
@ -66,7 +48,7 @@ print_query() {
|
|||
for entry in "$BMX6_DIR/$1/"*; do
|
||||
[ -f "$entry" ] &&
|
||||
{
|
||||
${comma:+echo "$comma"}
|
||||
${comma:+echo -n "$comma"}
|
||||
tr -d '\n' < "$entry"
|
||||
comma=","
|
||||
}
|
||||
|
|
@ -74,7 +56,6 @@ print_query() {
|
|||
echo -n " ]"
|
||||
}
|
||||
}
|
||||
|
||||
# If the query is a file, just printing the file
|
||||
[ -f "$BMX6_DIR/$1" ] && cat "$BMX6_DIR/$1";
|
||||
}
|
||||
|
|
@ -84,36 +65,54 @@ if [ "${QUERY##*/}" == "all" ]; then
|
|||
QALL=1
|
||||
fi
|
||||
|
||||
if [ "$QUERY" == '$myself' ]; then
|
||||
hostname="$(cat /proc/sys/kernel/hostname)"
|
||||
ip6="$(bmx6 -c show=status | grep ^BMX | awk '{print $5}')"
|
||||
ip4="$(bmx6 -c show=status | grep ^BMX | awk '{print $6}')"
|
||||
cidr6=$(lua -l luci.ip -e "ip=luci.ip.new(\"$ip6\"); print(ip:network():string()..'/'..ip:prefix())")
|
||||
cidr4=$(lua -l luci.ip -e "ip=luci.ip.new(\"$ip4\"); print(ip:network():string()..'/'..ip:prefix())")
|
||||
echo -n "{\"myself\":{\"hostname\":\"$hostname\",\"ip6\":\"$ip6\",\"ip4\":\"$ip4\",\"net6\":\"$cidr6\",\"net4\":\"$cidr4\"}}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$QUERY" == '$info' ]; then
|
||||
echo '{ "info": [ '
|
||||
echo -n '{ "info": [ '
|
||||
print_query status
|
||||
echo -n ","
|
||||
print_query interfaces
|
||||
echo "] }"
|
||||
echo -n "] }"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$QUERY" == '$neighbours' ]; then
|
||||
QALL=1
|
||||
echo '{ "neighbours": [ '
|
||||
echo '{ "originators": '
|
||||
echo -n '{ "neighbours": [ '
|
||||
echo -n '{ "originators": '
|
||||
print_query originators
|
||||
echo '}, '
|
||||
echo '{ "descriptions": '
|
||||
echo -n '}, '
|
||||
echo -n '{ "descriptions": '
|
||||
print_query descriptions
|
||||
echo "} ] }"
|
||||
echo -n "} ] }"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
else if [ "$QUERY" == '$tunnels' ]; then
|
||||
if [ "$QUERY" == '$tunnels' ]; then
|
||||
bmx6 -c --jshow tunnels /r=0
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$QUERY" == "" ]; then
|
||||
echo -n '{ "queries": ['
|
||||
echo -n '{ "name": "$myself", "info": "basic network information of self node" },'
|
||||
echo -n '{ "name": "$info", "info": "full network and device information of self node" },'
|
||||
echo -n '{ "name": "$tunnels", "info": "accnouncements (tunnels) published by the mesh network" },'
|
||||
echo -n '{ "name": "$neighbours", "info": "list of all my neighbours and their information" },'
|
||||
echo -n '{ "name": "/", "info": "raw bmx6 json API" }]}'
|
||||
exit 0
|
||||
fi
|
||||
|
||||
else
|
||||
check_path "$BMX6_DIR/$QUERY"
|
||||
print_query $QUERY
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
ls -1F "$BMX6_DIR"
|
||||
#ls -1F "$BMX6_DIR"
|
||||
exit 0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue