diff options
| author | Bastian Bittorf <bb@npl.de> | 2016-12-12 08:43:23 +0100 |
|---|---|---|
| committer | Bastian Bittorf <bb@npl.de> | 2016-12-12 08:48:11 +0100 |
| commit | 524439cd1647e5d6d7b48f9c75ec5800a5444109 (patch) | |
| tree | 7d7ce58ac3489123002004fa3228b0be75b098a3 /contrib/package/freifunk-common/files/usr | |
| parent | ac5bd8c2f1b74f7a6e0c09629c4ba96e3a8da037 (diff) | |
freifunk-common: neigh.sh: fix for new olsrd 0.9.5
Starting with version 0.9.5 the new olsr-deamon behaves
more standard-compliant and outputs correct HTTP-headers.
This would confuse the script and abort parsing.
Fix that by only trying to parse the JSON-value and
just ignore the other stuff. After this, we can see neighbours again.
Thanks to FreifunkUFO <ufo@rund.freifunk.net> for spotting this.
Diffstat (limited to 'contrib/package/freifunk-common/files/usr')
| -rwxr-xr-x | contrib/package/freifunk-common/files/usr/bin/neigh.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh index b1dc01a77e..59ea8f914f 100755 --- a/contrib/package/freifunk-common/files/usr/bin/neigh.sh +++ b/contrib/package/freifunk-common/files/usr/bin/neigh.sh @@ -66,7 +66,8 @@ VARS="$VARS neighborLinkQuality:NLQ linkCost:Cost remoteHostname:Host" for HOST in '127.0.0.1' '::1';do json_init - json_load "$(echo /links|nc ${HOST} 9090)" + json_load "$( echo /links | nc $HOST 9090 | grep ^'{' )" # remove header/non-json + if json_is_a links array;then json_select links for v in ${VARS};do |