From 3850cbac53a445aee136d0f8bb7276e46d221646 Mon Sep 17 00:00:00 2001
From: Conrad Lara - KG6JEI <KG6JEI@amsat.org>
Date: Sun, 24 May 2015 12:59:11 -0700
Subject: [PATCH] tunnels: Tunnels should only start when in mesh mode

Tunnels are not supported in other modes as such we should only let them start in mesh mode.
---
 files/etc/init.d/vtund    |  5 +--
 files/etc/init.d/vtundsrv | 64 +++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/files/etc/init.d/vtund b/files/etc/init.d/vtund
index 5d627abf..795ed5c3 100755
--- a/files/etc/init.d/vtund
+++ b/files/etc/init.d/vtund
@@ -106,8 +106,9 @@ apply_uci_config() {
 }
 
 start() {
-	# only if vtun is installed
-	if [[ -x "/usr/sbin/vtund" ]]
+	# only if vtun is installed and ind mesh mode
+        configmode=$(uci -q -c /etc/local/uci/ get hsmmmesh.settings.config)
+	if [ -x "/usr/sbin/vtund" -a "$configmode" = "mesh" ]
 	then
 		apply_uci_config
 		config_load vtun
diff --git a/files/etc/init.d/vtundsrv b/files/etc/init.d/vtundsrv
index 5339b360..63a94945 100755
--- a/files/etc/init.d/vtundsrv
+++ b/files/etc/init.d/vtundsrv
@@ -97,36 +97,48 @@ apply_uci_config() {
 }
 
 start() {
-	apply_uci_config
-	config_load vtun
 
-	#if options section doesn't exist, add it
-	echo "testing for options..."
-	j=`uci get vtun.@options[0]`
-	if [ $? -ne 0 ] 
-		then
-		j=`uci add vtun options`
-		j='uci commit vtun'
+	configmode=$(uci -q -c /etc/local/uci/ get hsmmmesh.settings.config)
+	if [ -x "/usr/sbin/vtund" -a "$configmode" = "mesh" ]
+        then
+
+		apply_uci_config
 		config_load vtun
+
+		#if options section doesn't exist, add it
+		echo "testing for options..."
+		j=`uci get vtun.@options[0]`
+		if [ $? -ne 0 ] 
+			then
+			j=`uci add vtun options`
+			j='uci commit vtun'
+			config_load vtun
+		fi
+
+		# Remove the current config files
+		mkdir -p /tmp/vtun
+		rm -f $SERVER_CONF
+
+		config_foreach network_config network
+		config_foreach options_config options "$SERVER_CONF"
+		config_foreach allowed_client_config client "$SERVER_CONF"
+
+		# START SERVER LISTENER
+		/usr/sbin/vtund -s -f $SERVER_CONF
 	fi
-	
-	# Remove the current config files
-	mkdir -p /tmp/vtun
-	rm -f $SERVER_CONF
-	
-	config_foreach network_config network
-	config_foreach options_config options "$SERVER_CONF"
-	config_foreach allowed_client_config client "$SERVER_CONF"
-	
-	# START SERVER LISTENER
-	/usr/sbin/vtund -s -f $SERVER_CONF
 }
 
 stop() {
-	# find the vtund SERVER process... --- FIX THIS
-	for x in `ps -w|grep -F 'vtund[s]:'|grep -v grep|awk '{print $1}'`
-	do
-		s=`echo $s $x`
-	done
-	kill $s
+
+        # only if vtun is installed
+        if [ -x "/usr/sbin/vtund" ]
+        then
+
+		# find the vtund SERVER process... --- FIX THIS
+		for x in `ps -w|grep -F 'vtund[s]:'|grep -v grep|awk '{print $1}'`
+		do
+			s=`echo $s $x`
+		done
+		kill $s
+	fi
 }