Attachment #2925 for bug #2659




last=$PORT
fwd=""
CTL=$OBJ/ctl-sock
rm -f $CTL

for j in 0 1 2; do
	for i in 0 1 2; do

		q=$p
	fi
	trace "start forwarding, fork to background"
	rm -f $CTL
	${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f $fwd somehost sleep 10

	trace "transfer over forwarded channels and check result"
	${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \

	test -s ${COPY}		|| fail "failed copy of ${DATA}"
	cmp ${DATA} ${COPY}	|| fail "corrupted copy of ${DATA}"

	${SSH} -S $CTL -O exit somehost
done

for p in ${SSH_PROTOCOLS}; do

	${SSH} -$p -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true

	trace "clear local forward proto $p"
	rm -f $CTL
	${SSH} -S $CTL -M -$p -f -F $OBJ/ssh_config -L ${base}01:127.0.0.1:$PORT \
	    -oClearAllForwardings=yes somehost sleep 10
	if [ $? != 0 ]; then
		fail "connection failed with cleared local forwarding"

		     >>$TEST_REGRESS_LOGFILE 2>&1 && \
			fail "local forwarding not cleared"
	fi
	${SSH} -S $CTL -O exit somehost
	
	trace "clear remote forward proto $p"
	rm -f $CTL
	${SSH} -S $CTL -M -$p -f -F $OBJ/ssh_config -R ${base}01:127.0.0.1:$PORT \
	    -oClearAllForwardings=yes somehost sleep 10
	if [ $? != 0 ]; then
		fail "connection failed with cleared remote forwarding"

		     >>$TEST_REGRESS_LOGFILE 2>&1 && \
			fail "remote forwarding not cleared"
	fi
	${SSH} -S $CTL -O exit somehost
done

for p in 2; do

echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config
for p in ${SSH_PROTOCOLS}; do
	trace "config file: start forwarding, fork to background"
	rm -f $CTL
	${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f somehost sleep 10

	trace "config file: transfer over forwarded channels and check result"

for p in 2; do
	trace "transfer over chained unix domain socket forwards and check result"
	rm -f $OBJ/unix-[123].fwd
	rm -f $CTL $CTL.[123]
	${SSH} -S $CTL -M -f -F $OBJ/ssh_config -R${base}01:[$OBJ/unix-1.fwd] somehost sleep 10
	${SSH} -S $CTL.1 -M -f -F $OBJ/ssh_config -L[$OBJ/unix-1.fwd]:[$OBJ/unix-2.fwd] somehost sleep 10
	${SSH} -S $CTL.2 -M -f -F $OBJ/ssh_config -R[$OBJ/unix-2.fwd]:[$OBJ/unix-3.fwd] somehost sleep 10
	${SSH} -S $CTL.3 -M -f -F $OBJ/ssh_config -L[$OBJ/unix-3.fwd]:127.0.0.1:$PORT somehost sleep 10
	${SSH} -F $OBJ/ssh_config -p${base}01 -o 'ConnectionAttempts=4' \
		somehost cat ${DATA} > ${COPY}
	test -s ${COPY}			|| fail "failed copy ${DATA}"
	cmp ${DATA} ${COPY}		|| fail "corrupted copy of ${DATA}"

	${SSH} -S $CTL -O exit somehost
	${SSH} -S $CTL.1 -O exit somehost
	${SSH} -S $CTL.2 -O exit somehost
	${SSH} -S $CTL.3 -O exit somehost
done
- 

Return to bug 2659

Lines 11-17 base=33 Link Here

(-)a/regress/forwarding.sh (-14 / +19 lines)
11	last=$PORT	11	last=$PORT
12	fwd=""	12	fwd=""
13	CTL=$OBJ/ctl-sock	13	CTL=$OBJ/ctl-sock
14	rm -f $CTL
15		14
16	for j in 0 1 2; do	15	for j in 0 1 2; do
17	for i in 0 1 2; do	16	for i in 0 1 2; do
Lines 29-35 for p in ${SSH_PROTOCOLS}; do Link Here
29	q=$p	28	q=$p
30	fi	29	fi
31	trace "start forwarding, fork to background"	30	trace "start forwarding, fork to background"
32	${SSH} -$p -F $OBJ/ssh_config -f $fwd somehost sleep 10	31	rm -f $CTL
		32	${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f $fwd somehost sleep 10
33		33
34	trace "transfer over forwarded channels and check result"	34	trace "transfer over forwarded channels and check result"
35	${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \	35	${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
Lines 37-43 for p in ${SSH_PROTOCOLS}; do Link Here
37	test -s ${COPY} \|\| fail "failed copy of ${DATA}"	37	test -s ${COPY} \|\| fail "failed copy of ${DATA}"
38	cmp ${DATA} ${COPY} \|\| fail "corrupted copy of ${DATA}"	38	cmp ${DATA} ${COPY} \|\| fail "corrupted copy of ${DATA}"
39		39
40	sleep 10	40	${SSH} -S $CTL -O exit somehost
41	done	41	done
42		42
43	for p in ${SSH_PROTOCOLS}; do	43	for p in ${SSH_PROTOCOLS}; do
Lines 75-81 for p in ${SSH_PROTOCOLS}; do Link Here
75	${SSH} -$p -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true	75	${SSH} -$p -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true
76		76
77	trace "clear local forward proto $p"	77	trace "clear local forward proto $p"
78	${SSH} -$p -f -F $OBJ/ssh_config -L ${base}01:127.0.0.1:$PORT \	78	rm -f $CTL
		79	${SSH} -S $CTL -M -$p -f -F $OBJ/ssh_config -L ${base}01:127.0.0.1:$PORT \
79	-oClearAllForwardings=yes somehost sleep 10	80	-oClearAllForwardings=yes somehost sleep 10
80	if [ $? != 0 ]; then	81	if [ $? != 0 ]; then
81	fail "connection failed with cleared local forwarding"	82	fail "connection failed with cleared local forwarding"
Lines 85-94 for p in ${SSH_PROTOCOLS}; do Link Here
85	>>$TEST_REGRESS_LOGFILE 2>&1 && \	86	>>$TEST_REGRESS_LOGFILE 2>&1 && \
86	fail "local forwarding not cleared"	87	fail "local forwarding not cleared"
87	fi	88	fi
88	sleep 10	89	${SSH} -S $CTL -O exit somehost
89		90
90	trace "clear remote forward proto $p"	91	trace "clear remote forward proto $p"
91	${SSH} -$p -f -F $OBJ/ssh_config -R ${base}01:127.0.0.1:$PORT \	92	rm -f $CTL
		93	${SSH} -S $CTL -M -$p -f -F $OBJ/ssh_config -R ${base}01:127.0.0.1:$PORT \
92	-oClearAllForwardings=yes somehost sleep 10	94	-oClearAllForwardings=yes somehost sleep 10
93	if [ $? != 0 ]; then	95	if [ $? != 0 ]; then
94	fail "connection failed with cleared remote forwarding"	96	fail "connection failed with cleared remote forwarding"
Lines 98-104 for p in ${SSH_PROTOCOLS}; do Link Here
98	>>$TEST_REGRESS_LOGFILE 2>&1 && \	100	>>$TEST_REGRESS_LOGFILE 2>&1 && \
99	fail "remote forwarding not cleared"	101	fail "remote forwarding not cleared"
100	fi	102	fi
101	sleep 10	103	${SSH} -S $CTL -O exit somehost
102	done	104	done
103		105
104	for p in 2; do	106	for p in 2; do
Lines 115-120 echo "LocalForward ${base}01 127.0.0.1:$PORT" >> $OBJ/ssh_config Link Here
115	echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config	117	echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config
116	for p in ${SSH_PROTOCOLS}; do	118	for p in ${SSH_PROTOCOLS}; do
117	trace "config file: start forwarding, fork to background"	119	trace "config file: start forwarding, fork to background"
		120	rm -f $CTL
118	${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f somehost sleep 10	121	${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f somehost sleep 10
119		122
120	trace "config file: transfer over forwarded channels and check result"	123	trace "config file: transfer over forwarded channels and check result"
Lines 129-143 done Link Here
129	for p in 2; do	132	for p in 2; do
130	trace "transfer over chained unix domain socket forwards and check result"	133	trace "transfer over chained unix domain socket forwards and check result"
131	rm -f $OBJ/unix-[123].fwd	134	rm -f $OBJ/unix-[123].fwd
132	${SSH} -f -F $OBJ/ssh_config -R${base}01:[$OBJ/unix-1.fwd] somehost sleep 10	135	rm -f $CTL $CTL.[123]
133	${SSH} -f -F $OBJ/ssh_config -L[$OBJ/unix-1.fwd]:[$OBJ/unix-2.fwd] somehost sleep 10	136	${SSH} -S $CTL -M -f -F $OBJ/ssh_config -R${base}01:[$OBJ/unix-1.fwd] somehost sleep 10
134	${SSH} -f -F $OBJ/ssh_config -R[$OBJ/unix-2.fwd]:[$OBJ/unix-3.fwd] somehost sleep 10	137	${SSH} -S $CTL.1 -M -f -F $OBJ/ssh_config -L[$OBJ/unix-1.fwd]:[$OBJ/unix-2.fwd] somehost sleep 10
135	${SSH} -f -F $OBJ/ssh_config -L[$OBJ/unix-3.fwd]:127.0.0.1:$PORT somehost sleep 10	138	${SSH} -S $CTL.2 -M -f -F $OBJ/ssh_config -R[$OBJ/unix-2.fwd]:[$OBJ/unix-3.fwd] somehost sleep 10
		139	${SSH} -S $CTL.3 -M -f -F $OBJ/ssh_config -L[$OBJ/unix-3.fwd]:127.0.0.1:$PORT somehost sleep 10
136	${SSH} -F $OBJ/ssh_config -p${base}01 -o 'ConnectionAttempts=4' \	140	${SSH} -F $OBJ/ssh_config -p${base}01 -o 'ConnectionAttempts=4' \
137	somehost cat ${DATA} > ${COPY}	141	somehost cat ${DATA} > ${COPY}
138	test -s ${COPY} \|\| fail "failed copy ${DATA}"	142	test -s ${COPY} \|\| fail "failed copy ${DATA}"
139	cmp ${DATA} ${COPY} \|\| fail "corrupted copy of ${DATA}"	143	cmp ${DATA} ${COPY} \|\| fail "corrupted copy of ${DATA}"
140		144
141	#wait	145	${SSH} -S $CTL -O exit somehost
142	sleep 10	146	${SSH} -S $CTL.1 -O exit somehost
		147	${SSH} -S $CTL.2 -O exit somehost
		148	${SSH} -S $CTL.3 -O exit somehost
143	done	149	done
144	-