From b3ac932e87e9423ba7ed3e408bec99ee92311829 Mon Sep 17 00:00:00 2001
From: Gordon Grant-Stuart <gordon@grant-stuart.com>
Date: Thu, 1 Dec 2022 17:31:00 +0000
Subject: [PATCH] added restart

---
 tunnelkeeper | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tunnelkeeper b/tunnelkeeper
index dfa8c7a..6988fd7 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -20,15 +20,15 @@ function ruroot () {
 }
 
 if [[ "${2}" == "--debug" ]]; then
-  dev=$(tty)
-  echo "debug enabled on $dev" > $dev
+  dbg=$(tty) # Terminal for the forked processes to print debug info to.
+  echo "debug enabled on $dbg" > $dbg
 else
-  dev='/dev/null'
+  dbg='/dev/null'
 fi
 
 case "$1" in
   FORKSTART )
-    [[ "$3" != "/dev/null" ]] && vvv='-vvv' || vvv='' # debug mode
+    [[ "$3" == "/dev/null" ]] && vvv='' || vvv='-vvv' # debug mode
     touch "$BASEDIR/var/${2}.connected"
     while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
       ssh -F "${CONFFILE}" $vvv -N $2 &> $3
@@ -36,7 +36,7 @@ case "$1" in
     done
   ;;
   FORKKILL )
-    kill $(sudo netstat -tnlp | grep "127.0.0.1:${2}" | grep -o '[0-9]*/ssh' | grep -o '[0-9]*') &> $3
+    kill $(sudo netstat -tnlp | grep "127.0.0.1:${2}" | grep -o '[0-9]*/ssh' | grep -o '[0-9]*') &>/dev/null
   ;;
   FORKDEL )
     rm "$BASEDIR/var/${2}.connected"
@@ -46,12 +46,16 @@ case "$1" in
       exit
     fi
     echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
-    cat "$CONFFILE" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % $dev &
+    cat "$CONFFILE" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % $dbg &
   ;;
   stop)
     rm "$BASEDIR/var/tunnelkeeper.pid"
-    cat "$CONFFILE" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL % $dev
-    cat "$CONFFILE" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL % $dev
+    cat "$CONFFILE" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL %
+    cat "$CONFFILE" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL %
+  ;;
+  restart)
+    $0 stop
+    $0 start
   ;;
   install )
     ruroot
@@ -98,6 +102,6 @@ WantedBy=multi-user.target" > /lib/systemd/system/tunnelkeeper.service
     vi "$CONFFILE"
   ;;
    * )
-    echo -e "\nUsage: $(basename $0) start|stop|install|uninstall|config|list [--debug]\n"
+    echo -e "\nUsage: $(basename $0) start|stop|restart|install|uninstall|config|list [--debug]\n"
   ;;
 esac