address review feedback

Author: tgauth

regress/channel-timeout.sh

@@ -9,7 +9,7 @@ rm -f $OBJ/sshd_proxy.orig
 cp $OBJ/sshd_proxy $OBJ/sshd_proxy.orig
 
 verbose "no timeout"
-${SSH} -vvv -F $OBJ/ssh_proxy somehost "sleep 5 ; exit 23"
+${SSH} -F $OBJ/ssh_proxy somehost "sleep 5 ; exit 23"
 r=$?
 if [ $r -ne 23 ]; then
 	fail "ssh failed"
@@ -19,7 +19,7 @@ verbose "command timeout"
 (cat $OBJ/sshd_proxy.orig ; echo "ChannelTimeout session:command=1") \
 	> $OBJ/sshd_proxy
 verbose "${SSH} -vvv -F $OBJ/ssh_proxy somehost"
-${SSH} -vvv -F $OBJ/ssh_proxy somehost "sleep 5 ; exit 23"
+${SSH} -F $OBJ/ssh_proxy somehost "sleep 5 ; exit 23"
 r=$?
 # return value is -1 which is being mapped back to 127 instead of 255 for some reason
 if [ $r -ne 127 ]; then

scp.c

@@ -185,8 +185,9 @@ pid_t do_cmd_pid2 = -1;
 
 /* SFTP copy parameters */
 #ifdef WINDOWS
-// match DEFAULT_COPY_BUFLEN from sftp-client.c unless overriden below with -X input
-size_t sftp_copy_buflen = 32768; 
+#define MAX_SFTP_COPY_BUFLEN 204800
+#define DEFAULT_COPY_BUFLEN 32768
+size_t sftp_copy_buflen = DEFAULT_COPY_BUFLEN;
 #else
 size_t sftp_copy_buflen;
 #endif // WINDOWS
@@ -776,13 +777,12 @@ main(int argc, char **argv)
 				}
 				sftp_copy_buflen = (size_t)llv;
 #ifdef WINDOWS
-				size_t max_sftp_buf_len = 204800;
-				if (sftp_copy_buflen > max_sftp_buf_len) {
+				if (sftp_copy_buflen > MAX_SFTP_COPY_BUFLEN) {
 					if (verbose_mode)
 						fmprintf(stderr,
 							"Buffer value of %d is too large for Win32-OpenSSH. Setting buffer to %d\n", 
-							sftp_copy_buflen, max_sftp_buf_len);
-					sftp_copy_buflen = max_sftp_buf_len;
+							sftp_copy_buflen, MAX_SFTP_COPY_BUFLEN);
+					sftp_copy_buflen = MAX_SFTP_COPY_BUFLEN;
 				}
 #endif // WINDOWS
 			} else if (strncmp(optarg, "nrequests=", 10) == 0) {