summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-07-03 20:26:04 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-07-03 20:26:04 +1000
commit7a2466291b03fd93059a6887b0f771d27bc64e79 (patch)
tree32698a9f0e0a4700309d66c8c51fbf1f02c32878
parent3f521e21c0b94cd0ac4752d60a9f9b4dfa9bf3f8 (diff)
- 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
-rw-r--r--ChangeLog5
-rw-r--r--regress/dynamic-forward.sh35
2 files changed, 26 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index a21f7b9f9..a25c622c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
24 [ssh.c] 24 [ssh.c]
25 convert hostkeyalias to lowercase, otherwise uppercase aliases will 25 convert hostkeyalias to lowercase, otherwise uppercase aliases will
26 not match at all; ok henning@ 26 not match at all; ok henning@
27 - markus@cvs.openbsd.org 2003/07/03 08:21:46
28 [regress/dynamic-forward.sh]
29 add socks5; speedup; reformat; based on patch from dtucker@zip.com.au
27 30
2820030630 3120030630
29 - (djm) Search for support functions necessary to build our 32 - (djm) Search for support functions necessary to build our
@@ -644,4 +647,4 @@
644 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 647 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
645 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 648 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
646 649
647$Id: ChangeLog,v 1.2841 2003/07/03 06:20:42 dtucker Exp $ 650$Id: ChangeLog,v 1.2842 2003/07/03 10:26:04 dtucker Exp $
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index 90a2ab225..d090814c5 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: dynamic-forward.sh,v 1.1 2003/06/26 14:23:10 markus Exp $ 1# $OpenBSD: dynamic-forward.sh,v 1.2 2003/07/03 08:21:46 markus Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="dynamic forwarding" 4tid="dynamic forwarding"
@@ -19,19 +19,28 @@ trace "will use ProxyCommand $proxycmd"
19start_sshd 19start_sshd
20 20
21for p in 1 2; do 21for p in 1 2; do
22 for s in 4; do
23 for h in 127.0.0.1 localhost; do
24 trace "testing ssh protocol $p socks version $s host $h"
25 trace "start dynamic forwarding, fork to background" 22 trace "start dynamic forwarding, fork to background"
26 ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT somehost sleep 10 23 ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \
24 exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
27 25
28 trace "transfer over forwarded channel and check result" 26 for s in 4 5; do
29 ${SSH} -F $OBJ/ssh_config -o "ProxyCommand ${proxycmd}${s} $h $PORT" \ 27 for h in 127.0.0.1 localhost; do
30 somehost cat /bin/ls > $OBJ/ls.copy 28 trace "testing ssh protocol $p socks version $s host $h"
31 test -f $OBJ/ls.copy || fail "failed copy /bin/ls" 29 ${SSH} -F $OBJ/ssh_config \
32 cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" 30 -o "ProxyCommand ${proxycmd}${s} $h $PORT" \
31 somehost cat /bin/ls > $OBJ/ls.copy
32 test -f $OBJ/ls.copy || fail "failed copy /bin/ls"
33 cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
34 done
35 done
33 36
34 sleep 10 37 if [ -f $OBJ/remote_pid ]; then
35 done 38 remote=`cat $OBJ/remote_pid`
36 done 39 trace "terminate remote shell, pid $remote"
40 if [ $remote -gt 1 ]; then
41 kill -HUP $remote
42 fi
43 else
44 fail "no pid file: $OBJ/remote_pid"
45 fi
37done 46done