gordon/TunnelKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code tidying

Browse Source
This commit is contained in:
Gordon Grant-Stuart 2023-01-31 10:14:42 +00:00
parent bdc5369f8f
commit 2cf1628716
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tunnelkeeper
View File

@ -21,7 +21,7 @@ function ruroot () {
fi fi
} }
DEBUGLEVEL=$(grep -i -m1 "debug" $TKCONF | grep -o [0-9]) DEBUGLEVEL=$(awk '/^debug/ {print $2}' $TKCONF)
case "$DEBUGLEVEL" in case "$DEBUGLEVEL" in
2) dbgopt='-v';; 2) dbgopt='-v';;
3) dbgopt='-vvv';; 3) dbgopt='-vvv';;
@ -32,6 +32,11 @@ function dbg () {
[[ $DEBUGLEVEL != "0" ]] && logger -t tunnelkeeper [[ $DEBUGLEVEL != "0" ]] && logger -t tunnelkeeper
} }
function connect () {
ssh -F "${SSHCONF}" $dbgopt -N $1 '#tunnelkeeper' 2>&1 | dbg
}
case "$1" in case "$1" in
FORKSTART ) FORKSTART )
echo -n $$ > "$BASEDIR/var/${2}.connected" echo -n $$ > "$BASEDIR/var/${2}.connected"
@ -48,7 +53,8 @@ case "$1" in
done done
else # passwordless auth else # passwordless auth
while [[ -e "$BASEDIR/var/${2}.connected" ]]; do while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg # ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg
connect $2
sleep 5 sleep 5
done done
fi fi
@ -56,10 +62,10 @@ case "$1" in
FORKSCREEN ) FORKSCREEN )
while [[ -e "$BASEDIR/var/${2}.connected" ]]; do while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
echo $$ > "$BASEDIR/var/${2}.screen" echo $$ > "$BASEDIR/var/${2}.screen"
ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg # ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg
connect $2
done done
;; ;;
# FORKKILL ) kill $(sudo netstat -tnlp | grep "127[0-9\.]*:${2}" | grep -o '[0-9]*/ssh' | grep -o '[0-9]*') &>/dev/null ;;
FORKDEL ) rm "$BASEDIR/var/${2}.connected" ;; FORKDEL ) rm "$BASEDIR/var/${2}.connected" ;;
FORKKILL ) pkill -f '#tunnelkeeper' &>/dev/null ;; FORKKILL ) pkill -f '#tunnelkeeper' &>/dev/null ;;
start) start)