Bugzilla – Attachment 2316 Details for
Bug 2021
sftp resume support (using size and offset)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
djm_latest_diff_anoncvs
file_2021.txt (text/plain), 13.57 KB, created by
Loganaden Velvindron
on 2013-07-12 17:08:33 AEST
(
hide
)
Description:
djm_latest_diff_anoncvs
Filename:
MIME Type:
Creator:
Loganaden Velvindron
Created:
2013-07-12 17:08:33 AEST
Size:
13.57 KB
patch
obsolete
>Index: sftp-client.c >=================================================================== >RCS file: /cvs/openssh/sftp-client.c,v >retrieving revision 1.111 >diff -u -p -r1.111 sftp-client.c >--- sftp-client.c 1 Jun 2013 22:37:06 -0000 1.111 >+++ sftp-client.c 12 Jul 2013 07:00:45 -0000 >@@ -112,7 +112,7 @@ send_msg(struct sftp_conn *conn, Buffer > iov[1].iov_len = buffer_len(m); > > if (atomiciov6(writev, conn->fd_out, iov, 2, >- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) != >+ conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) != > buffer_len(m) + sizeof(mlen)) > fatal("Couldn't send packet: %s", strerror(errno)); > >@@ -988,16 +988,17 @@ send_read_request(struct sftp_conn *conn > > int > do_download(struct sftp_conn *conn, char *remote_path, char *local_path, >- Attrib *a, int pflag) >+ Attrib *a, int pflag, int resume) > { > Attrib junk; > Buffer msg; > char *handle; >- int local_fd, status = 0, write_error; >- int read_error, write_errno; >- u_int64_t offset, size; >+ int local_fd = -1, status = 0, write_error; >+ int read_error, write_errno, reordered = 0; >+ u_int64_t offset = 0, size, highwater; > u_int handle_len, mode, type, id, buflen, num_req, max_req; > off_t progress_counter; >+ struct stat st; > struct request { > u_int id; > u_int len; >@@ -1050,21 +1051,33 @@ do_download(struct sftp_conn *conn, char > return(-1); > } > >- local_fd = open(local_path, O_WRONLY | O_CREAT | O_TRUNC, >+ local_fd = open(local_path, O_WRONLY | O_CREAT | (resume ? : O_TRUNC), > mode | S_IWUSR); > if (local_fd == -1) { > error("Couldn't open local file \"%s\" for writing: %s", > local_path, strerror(errno)); >+ goto fail; >+ } >+ if (fstat(local_fd, &st) == -1) { >+ error("Unable to stat local file \"%s\": %s", >+ local_path, strerror(errno)); >+ goto fail; >+ } >+ offset = highwater = st.st_size; >+ 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); >+ return -1; > } > > /* Read from remote and write to local */ >- write_error = read_error = write_errno = num_req = offset = 0; >+ write_error = read_error = write_errno = num_req = 0; > max_req = 1; >- progress_counter = 0; >+ progress_counter = offset; > > if (showprogress && size != 0) > start_progress_meter(remote_path, size, &progress_counter); >@@ -1139,6 +1152,10 @@ do_download(struct sftp_conn *conn, char > write_error = 1; > max_req = 0; > } >+ else if (!reordered && req->offset <= highwater) >+ highwater = req->offset + len; >+ else if (!reordered && req->offset > highwater) >+ reordered = 1; > progress_counter += len; > free(data); > >@@ -1187,7 +1204,15 @@ do_download(struct sftp_conn *conn, char > /* Sanity check */ > if (TAILQ_FIRST(&requests) != NULL) > fatal("Transfer complete, but requests still in queue"); >- >+ /* Truncate at highest contiguous point to avoid holes on interrupt */ >+ if (read_error || write_error || interrupted) { >+ if (reordered && resume) { >+ error("Unable to resume download of \"%s\": " >+ "server reordered requests", local_path); >+ } >+ debug("truncating at %llu", highwater); >+ ftruncate(local_fd, highwater); >+ } > if (read_error) { > error("Couldn't read from remote file \"%s\" : %s", > remote_path, fx2txt(status)); >@@ -1199,7 +1224,8 @@ do_download(struct sftp_conn *conn, char > do_close(conn, handle, handle_len); > } else { > status = do_close(conn, handle, handle_len); >- >+ if (interrupted) >+ status = -1; > /* Override umask and utimes if asked */ > #ifdef HAVE_FCHMOD > if (pflag && fchmod(local_fd, mode) == -1) >@@ -1227,7 +1253,7 @@ do_download(struct sftp_conn *conn, char > > static int > download_dir_internal(struct sftp_conn *conn, char *src, char *dst, >- Attrib *dirattrib, int pflag, int printflag, int depth) >+ Attrib *dirattrib, int pflag, int printflag, int depth, int resume) > { > int i, ret = 0; > SFTP_DIRENT **dir_entries; >@@ -1280,11 +1306,11 @@ download_dir_internal(struct sftp_conn * > continue; > if (download_dir_internal(conn, new_src, new_dst, > &(dir_entries[i]->a), pflag, printflag, >- depth + 1) == -1) >+ depth + 1, resume) == -1) > ret = -1; > } else if (S_ISREG(dir_entries[i]->a.perm) ) { > if (do_download(conn, new_src, new_dst, >- &(dir_entries[i]->a), pflag) == -1) { >+ &(dir_entries[i]->a), pflag, resume) == -1) { > error("Download of file %s to %s failed", > new_src, new_dst); > ret = -1; >@@ -1317,7 +1343,7 @@ download_dir_internal(struct sftp_conn * > > int > download_dir(struct sftp_conn *conn, char *src, char *dst, >- Attrib *dirattrib, int pflag, int printflag) >+ Attrib *dirattrib, int pflag, int printflag, int resume) > { > char *src_canon; > int ret; >@@ -1328,7 +1354,7 @@ download_dir(struct sftp_conn *conn, cha > } > > ret = download_dir_internal(conn, src_canon, dst, >- dirattrib, pflag, printflag, 0); >+ dirattrib, pflag, printflag, 0, resume); > free(src_canon); > return ret; > } >@@ -1553,7 +1579,7 @@ upload_dir_internal(struct sftp_conn *co > a.perm &= 01777; > if (!pflag) > a.flags &= ~SSH2_FILEXFER_ATTR_ACMODTIME; >- >+ > status = do_mkdir(conn, dst, &a, 0); > /* > * we lack a portable status for errno EEXIST, >@@ -1563,7 +1589,7 @@ upload_dir_internal(struct sftp_conn *co > if (status != SSH2_FX_OK) { > if (status != SSH2_FX_FAILURE) > return -1; >- if (do_stat(conn, dst, 0) == NULL) >+ if (do_stat(conn, dst, 0) == NULL) > return -1; > } > >@@ -1571,7 +1597,7 @@ upload_dir_internal(struct sftp_conn *co > error("Failed to open dir \"%s\": %s", src, strerror(errno)); > return -1; > } >- >+ > while (((dp = readdir(dirp)) != NULL) && !interrupted) { > if (dp->d_ino == 0) > continue; >@@ -1640,4 +1666,3 @@ path_append(char *p1, char *p2) > > return(ret); > } >- >Index: sftp-client.h >=================================================================== >RCS file: /cvs/openssh/sftp-client.h,v >retrieving revision 1.20 >diff -u -p -r1.20 sftp-client.h >--- sftp-client.h 4 Dec 2010 22:02:48 -0000 1.20 >+++ sftp-client.h 12 Jul 2013 07:00:45 -0000 >@@ -106,13 +106,13 @@ int do_symlink(struct sftp_conn *, char > * Download 'remote_path' to 'local_path'. Preserve permissions and times > * if 'pflag' is set > */ >-int do_download(struct sftp_conn *, char *, char *, Attrib *, int); >+int do_download(struct sftp_conn *, char *, char *, Attrib *, int, int); > > /* > * Recursively download 'remote_directory' to 'local_directory'. Preserve > * times if 'pflag' is set > */ >-int download_dir(struct sftp_conn *, char *, char *, Attrib *, int, int); >+int download_dir(struct sftp_conn *, char *, char *, Attrib *, int, int, int); > > /* > * Upload 'local_path' to 'remote_path'. Preserve permissions and times >Index: sftp.c >=================================================================== >RCS file: /cvs/openssh/sftp.c,v >retrieving revision 1.159 >diff -u -p -r1.159 sftp.c >--- sftp.c 5 Jun 2013 22:30:21 -0000 1.159 >+++ sftp.c 12 Jul 2013 07:00:45 -0000 >@@ -88,6 +88,9 @@ int showprogress = 1; > /* When this option is set, we always recursively download/upload directories */ > int global_rflag = 0; > >+/* When this option is set, we resume download if possible */ >+int global_aflag = 0; >+ > /* When this option is set, the file transfers will always preserve times */ > int global_pflag = 0; > >@@ -151,6 +154,7 @@ extern char *__progname; > #define I_SYMLINK 21 > #define I_VERSION 22 > #define I_PROGRESS 23 >+#define I_REGET 26 > > struct CMD { > const char *c; >@@ -190,6 +194,7 @@ static const struct CMD cmds[] = { > { "put", I_PUT, LOCAL }, > { "pwd", I_PWD, REMOTE }, > { "quit", I_QUIT, NOARGS }, >+ { "reget", I_REGET, REMOTE }, > { "rename", I_RENAME, REMOTE }, > { "rm", I_RM, REMOTE }, > { "rmdir", I_RMDIR, REMOTE }, >@@ -239,6 +244,7 @@ help(void) > " filesystem containing 'path'\n" > "exit Quit sftp\n" > "get [-Ppr] remote [local] Download file\n" >+ "reget remote [local] Resume download file\n" > "help Display this help text\n" > "lcd path Change local directory to 'path'\n" > "lls [ls-options [path]] Display local directory listing\n" >@@ -350,8 +356,8 @@ make_absolute(char *p, char *pwd) > } > > static int >-parse_getput_flags(const char *cmd, char **argv, int argc, int *pflag, >- int *rflag) >+parse_getput_flags(const char *cmd, char **argv, int argc, >+ int *aflag, int *pflag, int *rflag) > { > extern int opterr, optind, optopt, optreset; > int ch; >@@ -359,9 +365,12 @@ parse_getput_flags(const char *cmd, char > optind = optreset = 1; > opterr = 0; > >- *rflag = *pflag = 0; >- while ((ch = getopt(argc, argv, "PpRr")) != -1) { >+ *aflag = *rflag = *pflag = 0; >+ while ((ch = getopt(argc, argv, "aPpRr")) != -1) { > switch (ch) { >+ case 'a': >+ *aflag = 1; >+ break; > case 'p': > case 'P': > *pflag = 1; >@@ -519,7 +528,7 @@ pathname_is_dir(char *pathname) > > static int > process_get(struct sftp_conn *conn, char *src, char *dst, char *pwd, >- int pflag, int rflag) >+ int pflag, int rflag, int resume) > { > char *abs_src = NULL; > char *abs_dst = NULL; >@@ -571,15 +580,18 @@ process_get(struct sftp_conn *conn, char > } > free(tmp); > >- if (!quiet) >+ resume |= global_aflag; >+ if (!quiet && resume) >+ printf("Resuming %s to %s\n", g.gl_pathv[i], abs_dst); >+ else if (!quiet && !resume) > printf("Fetching %s to %s\n", g.gl_pathv[i], abs_dst); > if (pathname_is_dir(g.gl_pathv[i]) && (rflag || global_rflag)) { > if (download_dir(conn, g.gl_pathv[i], abs_dst, NULL, >- pflag || global_pflag, 1) == -1) >+ pflag || global_pflag, 1, resume) == -1) > err = -1; > } else { > if (do_download(conn, g.gl_pathv[i], abs_dst, NULL, >- pflag || global_pflag) == -1) >+ pflag || global_pflag, resume) == -1) > err = -1; > } > free(abs_dst); >@@ -1118,8 +1130,9 @@ makeargv(const char *arg, int *argcp, in > } > > static int >-parse_args(const char **cpp, int *pflag, int *rflag, int *lflag, int *iflag, >- int *hflag, int *sflag, unsigned long *n_arg, char **path1, char **path2) >+parse_args(const char **cpp, int *aflag, int *hflag, int *iflag, int *lflag, >+ int *pflag, int *rflag, int *sflag, unsigned long *n_arg, >+ char **path1, char **path2) > { > const char *cmd, *cp = *cpp; > char *cp2, **argv; >@@ -1163,14 +1176,15 @@ parse_args(const char **cpp, int *pflag, > } > > /* Get arguments and parse flags */ >- *lflag = *pflag = *rflag = *hflag = *n_arg = 0; >+ *aflag = *lflag = *pflag = *rflag = *hflag = *n_arg = 0; > *path1 = *path2 = NULL; > optidx = 1; > switch (cmdnum) { > case I_GET: >+ case I_REGET: > case I_PUT: > if ((optidx = parse_getput_flags(cmd, argv, argc, >- pflag, rflag)) == -1) >+ aflag, pflag, rflag)) == -1) > return -1; > /* Get first pathname (mandatory) */ > if (argc - optidx < 1) { >@@ -1185,6 +1199,11 @@ parse_args(const char **cpp, int *pflag, > /* Destination is not globbed */ > undo_glob_escape(*path2); > } >+ if (*aflag && cmdnum == I_PUT) { >+ /* XXX implement resume for uploads */ >+ error("Resume is not supported for uploads"); >+ return -1; >+ } > break; > case I_LINK: > if ((optidx = parse_link_flags(cmd, argv, argc, sflag)) == -1) >@@ -1293,7 +1312,8 @@ parse_dispatch_command(struct sftp_conn > int err_abort) > { > char *path1, *path2, *tmp; >- int pflag = 0, rflag = 0, lflag = 0, iflag = 0, hflag = 0, sflag = 0; >+ int aflag = 0, hflag = 0, iflag = 0, lflag = 0, pflag = 0; >+ int rflag = 0, sflag = 0; > int cmdnum, i; > unsigned long n_arg = 0; > Attrib a, *aa; >@@ -1302,9 +1322,8 @@ parse_dispatch_command(struct sftp_conn > glob_t g; > > path1 = path2 = NULL; >- cmdnum = parse_args(&cmd, &pflag, &rflag, &lflag, &iflag, &hflag, >- &sflag, &n_arg, &path1, &path2); >- >+ cmdnum = parse_args(&cmd, &aflag, &hflag, &iflag, &lflag, &pflag, >+ &rflag, &sflag, &n_arg, &path1, &path2); > if (iflag != 0) > err_abort = 0; > >@@ -1319,8 +1338,12 @@ parse_dispatch_command(struct sftp_conn > /* Unrecognized command */ > err = -1; > break; >+ case I_REGET: >+ aflag = 1; >+ /* FALLTHROUGH */ > case I_GET: >- err = process_get(conn, path1, path2, *pwd, pflag, rflag); >+ err = process_get(conn, path1, path2, *pwd, pflag, >+ rflag, aflag); > break; > case I_PUT: > err = process_put(conn, path1, path2, *pwd, pflag, rflag); >@@ -1948,12 +1971,10 @@ interactive_loop(struct sftp_conn *conn, > } > } else { > /* XXX this is wrong wrt quoting */ >- if (file2 == NULL) >- snprintf(cmd, sizeof cmd, "get %s", dir); >- else >- snprintf(cmd, sizeof cmd, "get %s %s", dir, >- file2); >- >+ snprintf(cmd, sizeof cmd, "get%s %s%s%s", >+ global_aflag ? " -a" : "", dir, >+ file2 == NULL ? "" : " ", >+ file2 == NULL ? "" : file2); > err = parse_dispatch_command(conn, cmd, > &remote_path, 1); > free(dir); >@@ -2142,7 +2163,7 @@ main(int argc, char **argv) > infile = stdin; > > while ((ch = getopt(argc, argv, >- "1246hpqrvCc:D:i:l:o:s:S:b:B:F:P:R:")) != -1) { >+ "1246ahpqrvCc:D:i:l:o:s:S:b:B:F:P:R:")) != -1) { > switch (ch) { > /* Passed through to ssh(1) */ > case '4': >@@ -2181,6 +2202,9 @@ main(int argc, char **argv) > break; > case '2': > sshver = 2; >+ break; >+ case 'a': >+ global_aflag = 1; > break; > case 'B': > copy_buffer_len = strtol(optarg, &cp, 10);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 2021
:
2165
|
2168
|
2170
|
2198
|
2199
|
2302
|
2304
|
2305
|
2313
|
2314
| 2316