diff options
Diffstat (limited to 'regress/dynamic-forward.sh')
| -rw-r--r-- | regress/dynamic-forward.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index dd67c9639eaf..84f8ee19280a 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.11 2015/03/03 22:35:19 markus Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.13 2017/09/21 19:18:12 markus Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -17,33 +17,34 @@ trace "will use ProxyCommand $proxycmd" start_sshd -for p in ${SSH_PROTOCOLS}; do +for d in D R; do n=0 error="1" trace "start dynamic forwarding, fork to background" + while [ "$error" -ne 0 -a "$n" -lt 3 ]; do n=`expr $n + 1` - ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q \ + ${SSH} -F $OBJ/ssh_config -f -$d $FWDPORT -q \ -oExitOnForwardFailure=yes somehost exec sh -c \ \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' error=$? if [ "$error" -ne 0 ]; then - trace "forward failed proto $p attempt $n err $error" + trace "forward failed attempt $n err $error" sleep $n fi done if [ "$error" -ne 0 ]; then - fatal "failed to start dynamic forwarding proto $p" + fatal "failed to start dynamic forwarding" fi 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" + trace "testing ssh socks version $s host $h (-$d)" ${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" + somehost cat ${DATA} > ${COPY} + test -f ${COPY} || fail "failed copy ${DATA}" + cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" done done @@ -56,4 +57,5 @@ for p in ${SSH_PROTOCOLS}; do else fail "no pid file: $OBJ/remote_pid" fi + done |