Changeset 8573 for 2.0

Timestamp:

Oct 16, 2010, 7:22:34 PM (14 years ago)

Author:

rick

Message:

• PWD variable used before declared.

• sleep on FreeBSD is non interruptable, meaning signals get processed after completion. Which is kind of a pain when you try to stop/kill a script. Made the interval to wait a bit smaller.

• More logging to aid in better debugging

File:

• 2.0/nanobsd/nanobsd/files/usr/local/sshtun/sshtun.sh (modified) (4 diffs)

2.0/nanobsd/nanobsd/files/usr/local/sshtun/sshtun.sh

@@ -22 +22 @@
 # Revamp to secure and reuse in multiple setups Rick van der Zwet - Oct 2010
 
+PWD=`dirname $0`
+
 # User variables
 SSH_HOST=${SSH_HOST:-sshtun.wirelessleiden.nl}
@@ -37 +39 @@
 
 # Internal helpers, storage and shortcuts
-PWD=`dirname $0`
 SSH_PID=""
 
 # On (forced) exit, close tunnel and make sure to cleanup the leftovers.
 trap_exit() {
+   SIGNAL=$1
+   log "Received signal '$SIGNAL'"
    if [ -n "$SSH_PID" ]; then
      kill $SSH_PID
    fi
    rm -f $PIDFILE
+   exit $SIGNAL
 }
 
 # Don't leave the ssh client process behind and exit with proper exit code
 for SIGNAL in 1 2 15; do
-  trap "trap_exit; exit $SIGNAL" $SIGNAL
+  trap "trap_exit $SIGNAL" $SIGNAL
 done
 
@@ -72 +76 @@
 do
   # Connect to remote site
-  ssh ${SSH_FLAGS} -i ${SSH_KEY} ${SSH_USER}@${SSH_HOST} -o ServerAliveInterval=5 \
+  COMMAND="ssh ${SSH_FLAGS} -i ${SSH_KEY} ${SSH_USER}@${SSH_HOST} -o ServerAliveInterval=5 \
     -o ExitOnForwardFailure=yes -o BatchMode=yes  -o StrictHostKeyChecking=no \
-    -n -N  1>&2 2>> $LOGFILE &
+    -n -N" 
+  log "[INFO] Connect using $COMMAND"
+  $COMMAND 1>&2 2>> $LOGFILE &
 
   # Save the sshtun PID
@@ -88 +94 @@
 
   log "[INFO] Sleeping $RECONNECT_TIMEOUT seconds before reconnect"
-  sleep $RECONNECT_TIMEOUT
+  SECONDS=$RECONNECT_TIMEOUT
+  # Nasty hack to avoid shell from ignoring signals while sleeping a long time
+  while [ $SECONDS -ge 0 ]; do
+    sleep 5
+    SECONDS=`expr $SECONDS - 5`
+  done
+
 done