diff options
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r-- | regress/multiplex.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 8ee140be6..d36efad0a 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.25 2014/07/22 01:32:12 djm Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.26 2014/12/22 01:14:49 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | CTL=/tmp/openssh.regress.ctl-sock.$$ | 4 | CTL=/tmp/openssh.regress.ctl-sock.$$ |
@@ -90,7 +90,7 @@ cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" | |||
90 | rm -f ${COPY} | 90 | rm -f ${COPY} |
91 | verbose "test $tid: forward" | 91 | verbose "test $tid: forward" |
92 | trace "forward over TCP/IP and check result" | 92 | trace "forward over TCP/IP and check result" |
93 | $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} & | 93 | $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} > /dev/null & |
94 | netcat_pid=$! | 94 | netcat_pid=$! |
95 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L127.0.0.1:$((${PORT} + 2)):127.0.0.1:$((${PORT} + 1)) otherhost >>$TEST_SSH_LOGFILE 2>&1 | 95 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L127.0.0.1:$((${PORT} + 2)):127.0.0.1:$((${PORT} + 1)) otherhost >>$TEST_SSH_LOGFILE 2>&1 |
96 | $NC -d 127.0.0.1 $((${PORT} + 2)) > ${COPY} < /dev/null | 96 | $NC -d 127.0.0.1 $((${PORT} + 2)) > ${COPY} < /dev/null |
@@ -99,11 +99,11 @@ kill $netcat_pid 2>/dev/null | |||
99 | rm -f ${COPY} $OBJ/unix-[123].fwd | 99 | rm -f ${COPY} $OBJ/unix-[123].fwd |
100 | 100 | ||
101 | trace "forward over UNIX and check result" | 101 | trace "forward over UNIX and check result" |
102 | $NC -Ul $OBJ/unix-1.fwd < ${DATA} & | 102 | $NC -Ul $OBJ/unix-1.fwd < ${DATA} > /dev/null & |
103 | netcat_pid=$! | 103 | netcat_pid=$! |
104 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 | 104 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 |
105 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 | 105 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 |
106 | $NC -d -U $OBJ/unix-3.fwd > ${COPY} </dev/null | 106 | $NC -d -U $OBJ/unix-3.fwd > ${COPY} < /dev/null |
107 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" | 107 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" |
108 | kill $netcat_pid 2>/dev/null | 108 | kill $netcat_pid 2>/dev/null |
109 | rm -f ${COPY} $OBJ/unix-[123].fwd | 109 | rm -f ${COPY} $OBJ/unix-[123].fwd |