From 77612e3e3ec6acc34217a32148be9a18c866751c Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Sat, 30 May 2015 22:02:05 +0200 Subject: [PATCH 1/1] contrib/meshwizard: add ipv6only option to txtinfo/jsoninfo plugin config --- .../files/usr/bin/meshwizard/helpers/setup_olsrd.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh index f51b75e6a..d212ca472 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh @@ -115,18 +115,29 @@ setup_watchdog() { } setup_jsoninfo() { - # Setup jsoninfo proto="$1" uci batch <<- EOF set $cfg.olsrd_jsoninfo=LoadPlugin set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo.so.0.0" EOF if [ "$proto" = "6" ]; then - uci set $cfg.olsrd_jsoninfo.port='9091' + uci set $cfg.olsrd_jsoninfo.ipv6only='1' fi uci_commitverbose "Setup olsr jsoninfo plugin" $cfg } +setup_txtinfo() { + proto="$1" + uci batch <<- EOF + set $cfg.olsrd_txtinfo=LoadPlugin + set $cfg.olsrd_txtinfo.library="olsrd_txtinfo.so.0.1" + EOF + if [ "$proto" = "6" ]; then + uci set $cfg.olsrd_txtinfo.ipv6only='1' + fi + uci_commitverbose "Setup olsr txtinfo plugin" $cfg +} + for proto in $protocols; do cfg="olsrd" @@ -145,5 +156,5 @@ for proto in $protocols; do setup_dyngw_plain setup_watchdog setup_jsoninfo $proto - + setup_txtinfo $proto done -- 2.11.0