- markus@cvs.openbsd.org 2005/06/30 11:02:37

[openssh.git] / regress / dynamic-forward.sh

diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 90a2ab225ebf27dfcb26ef972cb0f6509a296f5c..4674a7bafebe7058b6d8d98fd34c40ce69e01986 100644 (file)
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -1,14 +1,15 @@
-#      $OpenBSD: dynamic-forward.sh,v 1.1 2003/06/26 14:23:10 markus Exp $
+#      $OpenBSD: dynamic-forward.sh,v 1.4 2004/06/22 22:55:56 dtucker Exp $
 #      Placed in the Public Domain.
 
 tid="dynamic forwarding"
 
-PORT=4242
-FWDPORT=4243
+FWDPORT=`expr $PORT + 1`
 
-if [ -x `which nc` ] && nc -h 2>&1 | grep "x proxy address" >/dev/null; then
+DATA=/bin/ls${EXEEXT}
+
+if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
        proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
-elif [ -x `which connect` ]; then
+elif have_prog connect; then
        proxycmd="connect -S 127.0.0.1:$FWDPORT -"
 else
        echo "skipped (no suitable ProxyCommand found)"
@@ -19,19 +20,31 @@ trace "will use ProxyCommand $proxycmd"
 start_sshd
 
 for p in 1 2; do
-  for s in 4; do
-    for h in 127.0.0.1 localhost; do
-       trace "testing ssh protocol $p socks version $s host $h"
        trace "start dynamic forwarding, fork to background"
-       ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT somehost sleep 10
+       ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \
+               exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
+
+       for s in 4 5; do
+           for h in 127.0.0.1 localhost; do
+               trace "testing ssh protocol $p socks version $s host $h"
+               ${SSH} -F $OBJ/ssh_config \
+                       -o "ProxyCommand ${proxycmd}${s} $h $PORT" \
+                       somehost cat $DATA > $OBJ/ls.copy
+               test -f $OBJ/ls.copy     || fail "failed copy $DATA"
+               cmp $DATA $OBJ/ls.copy || fail "corrupted copy of $DATA"
+           done
+       done
 
-       trace "transfer over forwarded channel and check result"
-       ${SSH} -F $OBJ/ssh_config -o "ProxyCommand ${proxycmd}${s} $h $PORT" \
-               somehost cat /bin/ls > $OBJ/ls.copy
-       test -f $OBJ/ls.copy     || fail "failed copy /bin/ls"
-       cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
+       if [ -f $OBJ/remote_pid ]; then
+               remote=`cat $OBJ/remote_pid`
+               trace "terminate remote shell, pid $remote"
+               if [ $remote -gt 1 ]; then
+                       kill -HUP $remote
+               fi
+       else
+               fail "no pid file: $OBJ/remote_pid"
+       fi
 
-       sleep 10
-    done
-  done
+       # Must allow time for connection tear-down
+       sleep 2
 done