search for: num_req

...(int fd_in, int fd_out) { @@ -674,12 +721,15 @@ int pflag) { int local_fd; - u_int expected_id, handle_len, mode, type, id; + u_int handle_len, mode, type, id; u_int64_t offset; char *handle; Buffer msg; Attrib junk, *a; int status; + struct request req[REQUEST_QUEUE_SIZE]; + int num_req = 0, max_req = 1, reply; + int write_error = 0, read_error = 0, write_errno; a = do_stat(fd_in, fd_out, remote_path, 0); if (a == NULL) @@ -726,87 +776,103 @@ /* Read from remote and write to local */ offset = 0; - for(;;) { - u_int len; + while (num_req > 0 || max_req > 0) {...

Folks, I've noticed poor performance using sftp. If anyone has any advice on how to improve performance, I'd like to hear it. Test simply involved transferring a single 143MB MP3 file using defaults for all the program configs. The opensshd 3.0.2p1 server is used in all tests. Software: openssh suite 3.0.2p1 psftp (putty sftp client) latest dev snapshot pscp (putty scp client) latest

...6,672 ---- status = get_status(conn->fd_in, id); if (status != SSH2_FX_OK) ! error("Couldn't symlink file \"%s\" to \"%s\": %s", oldpath, newpath, fx2txt(status)); return(status); *************** *** 746,752 **** int local_fd, status, num_req, max_req, write_error; int read_error, write_errno; u_int64_t offset, size; ! u_int handle_len, mode, type, id, buflen; struct request { u_int id; u_int len; --- 796,802 ---- int local_fd, status, num_req, max_req, write_error; int read_error, write_errno; u_int64_t offse...

...ogress) { - if (size) - start_progress_meter(remote_path, size, - &progress_counter); - else - printf("Fetching %s to %s\n", remote_path, local_path); - } + if (showprogress && size != 0) + start_progress_meter(remote_path, size, &progress_counter); while (num_req > 0 || max_req > 0) { char *data; @@ -1032,8 +1027,6 @@ offset = 0; if (showprogress) start_progress_meter(local_path, sb.st_size, &offset); - else - printf("Uploading %s to %s\n", local_path, remote_path); for (;;) { int len;

...| O_TRUNC, + mode | S_IWRITE); +#endif if (local_fd == -1) { error("Couldn't open local file \"%s\" for writing: %s", local_path, strerror(errno)); @@ -810,6 +821,16 @@ /* Read from remote and write to local */ write_error = read_error = write_errno = num_req = offset = 0; + +#ifdef REGET + if (rflag) { + long posn; + posn = lseek(local_fd, 0L, SEEK_END); + debug3("reget: restarting at file position %ld\n", posn); + offset = (u_int64_t)posn; + } +#endif + max_req = 1; progress_counter = 0; @@ -969,8 +990,13 @@ } int +#ifdef REGET...