From 739df4d8b344345c26bdcb4c6c4b8575f22112fb Mon Sep 17 00:00:00 2001
From: Gordon Grant-Stuart <gordon@grant-stuart.com>
Date: Tue, 29 Nov 2022 10:04:40 +0000
Subject: [PATCH] rrg

---
 tunnelkeeper | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/tunnelkeeper b/tunnelkeeper
index 802a548..24bce85 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -22,6 +22,22 @@ function ruroot () {
 
 case "$1" in
   FORKSTART )
+    # if [[ "${2}" == "COUNTLOOPPROCESS" ]]; then # This process loops and keeps the service active
+    #   while true; do
+    #     if [[ $(find "$BASEDIR/var/" -name '*.connected' | wc -l) -eq 0 ]]; then
+    #       rm "$BASEDIR/var/tunnelkeeper.pid"
+    #     else
+    #       echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
+    #     fi
+    #     sleep 10
+    #   done
+    # else # This process connects the tunnel
+    #   touch "$BASEDIR/var/${2}.connected"
+    #   while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
+    #     ssh -F $CONFFILE -N $2 &> /dev/null
+    #     sleep 5
+    #   done
+    # fi
     touch "$BASEDIR/var/${2}.connected"
     while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
       ssh -F $CONFFILE -N $2 &> /dev/null
@@ -39,12 +55,12 @@ case "$1" in
       exit
     fi
     echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
-    cat $CONFFILE | grep '^Host ' | sed 's/^Host //' | xargs -I% -P0 $0 FORKSTART % &>/dev/null &
+    cat "$CONFFILE" | awk '/^Host ' | xargs -I% -P0 $0 FORKSTART % &>/dev/null &
   ;;
   stop)
     rm "$BASEDIR/var/tunnelkeeper.pid"
-    cat $CONFFILE | grep '^Host ' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL %
-    cat $CONFFILE | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL % &>/dev/null
+    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 % &>/dev/null
   ;;
   install )
     ruroot
@@ -81,11 +97,16 @@ WantedBy=multi-user.target" >> /lib/systemd/system/tunnelkeeper.service
     rm -rf /opt/tunnelkeeper
     echo -e "\nTunnelKeeper service uninstalled.\n"
   ;;
+  list )
+    echo "---"
+    find "$BASEDIR/var/" -name '*.connected' | sed 's/^.*\///g; s/\.connected//g'
+    echo "---"
+  ;;
   config )
     ruroot
-    vi /opt/tunnelkeeper/etc/tunnels.conf
+    vi "$CONFFILE"
   ;;
   * )
-    echo -e "\nUsage: $(basename $0) [start|stop|install|uninstall|config]\n"
+    echo -e "\nUsage: $(basename $0) [start|stop|install|uninstall|config|list]\n"
   ;;
 esac