Age | Commit message (Collapse) | Author |
|
Signed-off-by: Philipp Borgers <borgers@mi.fu-berlin.de>
|
|
Older OLSRd-version outputs JSON humanreadable over multiple lines.
The introduced change in 524439cd1647e5d6d7b48f9c75ec5800a5444109 broke
the output for those users. Fix that be a finer filter regex.
Thanks to Thomas Huehn <thomas@net.t-labs.tu-berlin.de> for spotting that.
|
|
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.
|
|
if nameservice-plugin is configured, we read
in all locally known hostnames and show them
in the output:
root@stuttgarter-core:~# neigh.sh
Local Remote vTime LQ NLQ Cost Host
10.230.105.241 10.230.105.246 138851 1.000000 1.000000 1024 stuttgarter-rhnk.olsr
10.230.105.241 10.230.105.247 135717 1.000000 1.000000 1024 stuttgarter-emma.olsr
10.230.105.241 10.230.105.244 138309 1.000000 1.000000 1024 stuttgarter-sued.olsr
10.230.105.241 10.230.105.245 136001 1.000000 1.000000 1024 stuttgarter-west.olsr
10.230.105.241 10.230.105.242 134818 1.000000 1.000000 1024 stuttgarter-nord.olsr
10.230.105.241 10.230.105.243 137187 1.000000 1.000000 1024 stuttgarter-ost.olsr
10.230.105.241 10.230.105.250 139984 1.000000 1.000000 1024 stuttgarter-hof2.olsr
10.230.105.241 10.230.105.251 138294 1.000000 1.000000 1024 stuttgarter-stra2.olsr
Local Remote vTime LQ NLQ Cost Host
2001:bf7:820:901::1 2001:bf7:820:950::1 139703 1.000000 1.000000 1024 stuttgarter-rhnk.olsr
2001:bf7:820:901::1 2001:bf7:820:960::1 139541 1.000000 1.000000 1024 stuttgarter-emma.olsr
2001:bf7:820:901::1 2001:bf7:820:990::1 140415 1.000000 1.000000 1024 stuttgarter-hof2.olsr
2001:bf7:820:901::1 fde6:24f1:a388::1 141338 1.000000 1.000000 1024
the filenames for the olsrd hosts-file is taken from uci
and falls back to sane defaults.
Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
|
|
|
|
|
|
|
|
|
|
|
|
this will enable us to build freifunk images without luci.
|