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

de-xargs'd the forking process

Browse Source
This commit is contained in:
Gordon Grant-Stuart 2023-07-10 16:58:51 +01:00
parent 2b825f0292
commit 0ff7a57d40
1 changed files with 71 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
tunnelkeeper
View File

@ -42,7 +42,7 @@ function debugopt () {
} }
function dbg () { function dbg () {
if [[ "$(awk "/^$1/ {print \$2}" ${DEBUGCONF})" =~ "[123]" ]]; then if [[ "$(awk "/^$1/ {print \$2}" ${DEBUGCONF})" =~ [123] ]]; then
cat | sed "s/^/$(date +"%H:%M:%S") /g" >> "$BASEDIR/var/log/tunnelkeeper-$(date +"%Y%m%d").log" cat | sed "s/^/$(date +"%H:%M:%S") /g" >> "$BASEDIR/var/log/tunnelkeeper-$(date +"%Y%m%d").log"
fi fi
} }
@ -52,54 +52,91 @@ function connect () {
ssh -F "${SSHCONF}" $bo -S "$BASEDIR/var/$1.tksock" -N $1 '#tunnelkeeper' 2>&1 | dbg $1 ssh -F "${SSHCONF}" $bo -S "$BASEDIR/var/$1.tksock" -N $1 '#tunnelkeeper' 2>&1 | dbg $1
} }
function forkwatch () {
host=$1
while true; do
TIMEOUT=$(awk "/^$host/ {print \$2}" ${WATCHCONF})
sleep $TIMEOUT
echo "tick $host" | dbg
if [[ $(timeout $TIMEOUT ssh localhost -o "StrictHostKeyChecking no" -S $BASEDIR/var/$host.tksock "echo tk") != "tk" ]]; then
ssh localhost -O exit -S $BASEDIR/var/$host.tksock
echo "Killing connection to $host. Trying again." | dbg $host
fi
done
}
case "$1" in function forkstart () {
FORKSTART ) host=$1
(grep "$2" $WATCHCONF &>/dev/null) && $0 FORKWATCH $2 '#tunnelkeeper' & (grep "$host" $WATCHCONF &>/dev/null) && forkwatch $host &
if [[ $(grep -c "^$2" $PWCONF) -gt 0 ]]; then if [[ $(grep -c "^$host" $PWCONF) -gt 0 ]]; then
pass=$(awk "/^$2/ {print \$2}" ${PWCONF}) # password needed pass=$(awk "/^$host/ {print \$2}" ${PWCONF}) # password needed
screen -d -m -S "tk${2}" $0 FORKSCREEN $2 '#tunnelkeeper' screen -d -m -S "tk${host}" $0 FORKSCREEN $host '#tunnelkeeper'
while true; do while true; do
sleep 5 sleep 5
if [[ -f "$BASEDIR/var/${2}.screen" ]]; then if [[ -f "$BASEDIR/var/${host}.screen" ]]; then
screen -S "tk${2}" -X stuff "$pass screen -S "tk${host}" -X stuff "$pass
" "
rm -f "$BASEDIR/var/${2}.screen" rm -f "$BASEDIR/var/${host}.screen"
fi fi
done done
else # passwordless auth else # passwordless auth
while true; do while true; do
connect $2 connect $host
sleep 5 sleep 5
done done
fi fi
exit }
;;
FORKWATCH ) # makes sure the connection is still working, even if ssh doesn't drop it. Needs a login shell to work. ### main loop
while true; do
TIMEOUT=$(awk "/^$2/ {print \$2}" ${WATCHCONF}) case "$1" in
sleep $TIMEOUT # FORKSTART )
echo "tick $2" | dbg # (grep "$2" $WATCHCONF &>/dev/null) && $0 FORKWATCH $2 '#tunnelkeeper' &
if [[ $(timeout $TIMEOUT ssh localhost -o "StrictHostKeyChecking no" -S $BASEDIR/var/$2.tksock "echo tk") != "tk" ]]; then # if [[ $(grep -c "^$2" $PWCONF) -gt 0 ]]; then
ssh localhost -O exit -S $BASEDIR/var/$2.tksock # pass=$(awk "/^$2/ {print \$2}" ${PWCONF}) # password needed
echo "Killing connection to $2. Trying again." | dbg $2 # screen -d -m -S "tk${2}" $0 FORKSCREEN $2 '#tunnelkeeper'
fi # while true; do
done # sleep 5
exit # if [[ -f "$BASEDIR/var/${2}.screen" ]]; then
;; # screen -S "tk${2}" -X stuff "$pass
# "
# rm -f "$BASEDIR/var/${2}.screen"
# fi
# done
# else # passwordless auth
# while true; do
# connect $2
# sleep 5
# done
# fi
# exit
# ;;
# FORKWATCH ) # makes sure the connection is still working, even if ssh doesn't drop it. Needs a login shell to work.
# while true; do
# TIMEOUT=$(awk "/^$2/ {print \$2}" ${WATCHCONF})
# sleep $TIMEOUT
# echo "tick $2" | dbg
# if [[ $(timeout $TIMEOUT ssh localhost -o "StrictHostKeyChecking no" -S $BASEDIR/var/$2.tksock "echo tk") != "tk" ]]; then
# ssh localhost -O exit -S $BASEDIR/var/$2.tksock
# echo "Killing connection to $2. Trying again." | dbg $2
# fi
# done
# exit
# ;;
FORKSCREEN ) FORKSCREEN )
while true; do while true; do
echo $$ > "$BASEDIR/var/${2}.screen" echo $$ > "$BASEDIR/var/${2}.screen"
connect $2 #$dbgopt connect $2 #$dbgopt
sleep 5 sleep 5
done done
exit exit # de-forkbombing exit.
;; ;;
start) start)
[[ -e "$BASEDIR/var/tunnelkeeper.pid" ]] && exit [[ -e "$BASEDIR/var/tunnelkeeper.pid" ]] && exit
genconfig genconfig
echo $$ > "$BASEDIR/var/tunnelkeeper.pid" echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
cat "$BASEDIR/etc/tunnelkeeper.conf" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % '#tunnelkeeper' & # cat "$BASEDIR/etc/tunnelkeeper.conf" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % '#tunnelkeeper' &
cat "$BASEDIR/etc/tunnelkeeper.conf" | awk '/^Host / {print $2}' | while read host; do forkstart $host & ; done
;; ;;
stop ) stop )
rm -f "$BASEDIR/var/tunnelkeeper.pid" rm -f "$BASEDIR/var/tunnelkeeper.pid"