[regress/dynamic-forward.sh]
     add socks5; speedup; reformat; based on patch from dtucker@zip.com.au
This commit is contained in:
Darren Tucker 2003-07-03 20:26:04 +10:00
parent 3f521e21c0
commit 7a2466291b
2 changed files with 26 additions and 14 deletions

View File

@ -24,6 +24,9 @@
[ssh.c] [ssh.c]
convert hostkeyalias to lowercase, otherwise uppercase aliases will convert hostkeyalias to lowercase, otherwise uppercase aliases will
not match at all; ok henning@ not match at all; ok henning@
- markus@cvs.openbsd.org 2003/07/03 08:21:46
[regress/dynamic-forward.sh]
add socks5; speedup; reformat; based on patch from dtucker@zip.com.au
20030630 20030630
- (djm) Search for support functions necessary to build our - (djm) Search for support functions necessary to build our
@ -644,4 +647,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2841 2003/07/03 06:20:42 dtucker Exp $ $Id: ChangeLog,v 1.2842 2003/07/03 10:26:04 dtucker Exp $

View File

@ -1,4 +1,4 @@
# $OpenBSD: dynamic-forward.sh,v 1.1 2003/06/26 14:23:10 markus Exp $ # $OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="dynamic forwarding" tid="dynamic forwarding"
@ -19,19 +19,28 @@ trace "will use ProxyCommand $proxycmd"
start_sshd start_sshd
for p in 1 2; do for p in 1 2; do
for s in 4; do trace "start dynamic forwarding, fork to background"
${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 for h in 127.0.0.1 localhost; do
trace "testing ssh protocol $p socks version $s host $h" trace "testing ssh protocol $p socks version $s host $h"
trace "start dynamic forwarding, fork to background" ${SSH} -F $OBJ/ssh_config \
${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT somehost sleep 10 -o "ProxyCommand ${proxycmd}${s} $h $PORT" \
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 somehost cat /bin/ls > $OBJ/ls.copy
test -f $OBJ/ls.copy || fail "failed copy /bin/ls" test -f $OBJ/ls.copy || fail "failed copy /bin/ls"
cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
done
done
sleep 10 if [ -f $OBJ/remote_pid ]; then
done remote=`cat $OBJ/remote_pid`
done trace "terminate remote shell, pid $remote"
if [ $remote -gt 1 ]; then
kill -HUP $remote
fi
else
fail "no pid file: $OBJ/remote_pid"
fi
done done