search for: handle_len

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

...(i == num) + fatal("Request ID mismatch (%d)", id); + + return i; +} + +static void +remove_request(struct request *rq, int *num, int i) +{ + memmove(rq + i, rq + i + 1, (*num - i - 1) * sizeof(struct request)); + --*num; +} + +static void +send_request(int fd, const char *handle, u_int handle_len, int type, + const struct request *rq, Buffer *m) +{ + buffer_clear(m); + buffer_put_char(m, SSH2_FXP_READ); + buffer_put_int(m, rq->id); + buffer_put_string(m, handle, handle_len); + buffer_put_int64(m, rq->offset); + buffer_put_int(m, rq->len); + send_msg(fd, m)...

...uot;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 offset, size; ! u_int handle_len, mode, type, id, buflen, savemode; struct request { u_int id;...

...tes = 0; +off_t totalbytes = 0; +char *curfile = NULL; + static void send_msg(int fd, Buffer *m) { @@ -671,7 +676,7 @@ int do_download(int fd_in, int fd_out, char *remote_path, char *local_path, - int pflag) + int pflag, void (*progressbar)(int)) { int local_fd; u_int expected_id, handle_len, mode, type, id; @@ -724,6 +729,11 @@ return(-1); } + totalbytes = a->size; + curfile = remote_path; + if (progressbar) + (progressbar)(0); + /* Read from remote and write to local */ offset = 0; for(;;) { @@ -785,6 +795,7 @@ offset += len; xfree(data); + statbytes = offs...

--- ../openssh/sftp-client.c Fri Feb 9 08:44:24 2001 +++ sftp-client.c Fri Feb 9 19:14:01 2001 @@ -331,7 +331,7 @@ error("Couldn't read directory: %s", fx2txt(status)); do_close(fd_in, fd_out, handle, handle_len); - return(NULL); + return(0); } } else if (type != SSH2_FXP_NAME) fatal("Expected SSH2_FXP_NAME(%d) packet, got %d",

...tes = 0; +off_t totalbytes = 0; +char *curfile = NULL; + static void send_msg(int fd, Buffer *m) { @@ -670,7 +675,7 @@ int do_download(int fd_in, int fd_out, char *remote_path, char *local_path, - int pflag) + int pflag, void (*progressbar)(int)) { int local_fd; u_int expected_id, handle_len, mode, type, id; @@ -723,6 +728,11 @@ return(-1); } + totalbytes = a->size; + curfile = remote_path; + if (progressbar) + (progressbar)(0); + /* Read from remote and write to local */ offset = 0; for (;;) { @@ -784,6 +794,7 @@ offset += len; xfree(data); + statbytes = off...

...progressmeter(0, offset, file_size, filename); + signal(SIGALRM, updateprogressmeter); + alarm(PROGRESSTIME); + errno = save_errno; +} + int do_download(int fd_in, int fd_out, char *remote_path, char *local_path, int pflag) { int local_fd; u_int expected_id, handle_len, mode, type, id; - u_int64_t offset; char *handle; Buffer msg; Attrib junk, *a; @@ -723,6 +739,12 @@ return(-1); } + file_size = a->size; + filename = remote_path; + progressmeter(-1, offset, file_size, filename); + signal(SIGALRM, updateprogressmeter); + alarm(PROGRESSTIME); + /*...

...ss_counter = 0; @@ -969,8 +990,13 @@ } int +#ifdef REGET +do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, + int pflag, int rflag) +#else do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, int pflag) +#endif { int local_fd, status; u_int handle_len, id, type; @@ -1023,6 +1049,13 @@ buffer_put_char(&msg, SSH2_FXP_OPEN); buffer_put_int(&msg, id); buffer_put_cstring(&msg, remote_path); + +#ifdef REGET + if(rflag) + buffer_put_int(&msg, SSH2_FXF_WRITE); + else +#endif + buffer_put_int(&msg, SSH2_FXF_WRITE|SSH2_FXF_CRE...

...} if ((size_t)st.st_size > size) { error("Unable to resume download of \"%s\": " "local file is larger than remote", local_path); fail: do_close(conn, handle, handle_len); buffer_free(&msg); free(handle); return -1; in the fail label, local_fd is not closed in case open() call was successful. -- You are receiving this mail because: You are watching the assignee of the bug.

...: 0; + if (status != 0) + error("Couldn't set ownership on symlink \"%s\": %s", filename, + strerror(status)); + } + } + return(status); + } + static void send_read_request(int fd_out, u_int id, u_int64_t offset, u_int len, char *handle, u_int handle_len) *** sftp.1@@\main\1 Tue Oct 1 17:26:04 2002 --- sftp.1 Wed Oct 2 07:59:00 2002 *************** *** 185,190 **** --- 185,199 ---- .Fl P flag is specified, then the file's full permission and access time are copied too. + .It Xo Ic getlink + .Ar remote-path + .Xc + Retrieve the + .Ar re...

Known issues: 1) Linux 'sleep 20' -- Unfixable before 2.5.0 (known work around) 2) HP/UX signal issue -- Patched and HP/UX 11 works in v2 3) SCO 2/ Native Compiler -- Unfixable before 2.5.0 (known work around) 4) NeXTStep -- Resynced, MAX_GROUPS vs NGROUPS unresolved (not major) 5) DG/UX regcomp/regexec -- Fixed. 6) Cray signal issues -- ??? 7) Solaris '$PATH' issue -- ??