From: Manuel Munz <munz@comuno.net>
Date: Sat, 30 May 2015 18:45:17 +0000 (+0200)
Subject: meshwizard: use different port (9091) for ipv6 jsoninfo
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b0d1ce83b63929bd16e1ebceea273515243a7975;p=project%2Fluci.git

meshwizard: use different port (9091) for ipv6 jsoninfo
---

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 9d18a582ac..f51b75e6ac 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,12 +115,16 @@ setup_watchdog() {
 }
 
 setup_jsoninfo() {
-    # 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
-    uci_commitverbose "Setup olsr jsoninfo plugin" $cfg
+	if [ "$proto" = "6" ]; then
+		uci set $cfg.olsrd_jsoninfo.port='9091'
+	fi
+	uci_commitverbose "Setup olsr jsoninfo plugin" $cfg
 }
 
 
@@ -140,6 +144,6 @@ for proto in $protocols; do
     setup_nameservice
     setup_dyngw_plain
     setup_watchdog
-    setup_jsoninfo
+    setup_jsoninfo $proto
 
 done