X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=uclient-fetch.c;h=065742eeed3378167b234cb664efb19750af26e0;hb=f0754619b9ee216b0cb5fc7484f861e876781984;hp=c64afb7e0b2b10ded49c967547af69a3c7f5343f;hpb=97f6c34884927dbf1b1858ab232e00c61fce48de;p=project%2Fuclient.git diff --git a/uclient-fetch.c b/uclient-fetch.c index c64afb7..065742e 100644 --- a/uclient-fetch.c +++ b/uclient-fetch.c @@ -18,6 +18,7 @@ #define _GNU_SOURCE #include +#include #include #include #include @@ -26,9 +27,11 @@ #include #include #include +#include #include +#include "progress.h" #include "uclient.h" #include "uclient-utils.h" @@ -50,16 +53,27 @@ static bool no_output; static const char *output_file; static int output_fd = -1; static int error_ret; -static int out_bytes; +static off_t out_offset; +static off_t out_bytes; +static off_t out_len; static char *auth_str; static char **urls; static int n_urls; static int timeout; static bool resume, cur_resume; +static struct progress pmt; +static struct uloop_timeout pmt_timer; + static int init_request(struct uclient *cl); static void request_done(struct uclient *cl); +static void pmt_update(struct uloop_timeout *t) +{ + progress_update(&pmt, out_offset, out_bytes, out_len); + uloop_timeout_set(t, 1000); +} + static const char * get_proxy_url(char *url) { @@ -90,7 +104,10 @@ static int open_output_file(const char *path, uint64_t resume_offset) if (cur_resume) flags = O_RDWR; else - flags = O_WRONLY | O_EXCL; + flags = O_WRONLY | O_TRUNC; + + if (!cur_resume && !output_file) + flags |= O_EXCL; flags |= O_CREAT; @@ -99,7 +116,8 @@ static int open_output_file(const char *path, uint64_t resume_offset) if (!quiet) fprintf(stderr, "Writing to stdout\n"); - return STDOUT_FILENO; + ret = STDOUT_FILENO; + goto done; } } else { filename = uclient_get_url_filename(path, "index.html"); @@ -109,40 +127,63 @@ static int open_output_file(const char *path, uint64_t resume_offset) if (!quiet) fprintf(stderr, "Writing to '%s'\n", output_file); ret = open(output_file, flags, 0644); - free(filename); - if (ret < 0) - return ret; + goto free; if (resume_offset && lseek(ret, resume_offset, SEEK_SET) < 0) { if (!quiet) fprintf(stderr, "Failed to seek %"PRIu64" bytes in output file\n", resume_offset); close(ret); - return -1; + ret = -1; + goto free; } + out_offset = resume_offset; out_bytes += resume_offset; +done: + if (!quiet) { + progress_init(&pmt, output_file); + pmt_timer.cb = pmt_update; + pmt_timer.cb(&pmt_timer); + } +free: + free(filename); return ret; } static void header_done_cb(struct uclient *cl) { - static const struct blobmsg_policy policy = { - .name = "content-range", - .type = BLOBMSG_TYPE_STRING + enum { + H_RANGE, + H_LEN, + __H_MAX + }; + static const struct blobmsg_policy policy[__H_MAX] = { + [H_RANGE] = { .name = "content-range", .type = BLOBMSG_TYPE_STRING }, + [H_LEN] = { .name = "content-length", .type = BLOBMSG_TYPE_STRING }, }; - struct blob_attr *attr; + struct blob_attr *tb[__H_MAX]; uint64_t resume_offset = 0, resume_end, resume_size; static int retries; - if (retries < 10 && uclient_http_redirect(cl)) { - if (!quiet) - fprintf(stderr, "Redirected to %s on %s\n", cl->url->location, cl->url->host); + if (retries < 10) { + int ret = uclient_http_redirect(cl); + if (ret < 0) { + if (!quiet) + fprintf(stderr, "Failed to redirect to %s on %s\n", cl->url->location, cl->url->host); + error_ret = 8; + request_done(cl); + return; + } + if (ret > 0) { + if (!quiet) + fprintf(stderr, "Redirected to %s on %s\n", cl->url->location, cl->url->host); - retries++; - return; + retries++; + return; + } } if (cl->status_code == 204 && cur_resume) { @@ -152,6 +193,8 @@ static void header_done_cb(struct uclient *cl) return; } + blobmsg_parse(policy, __H_MAX, tb, blob_data(cl->meta), blob_len(cl->meta)); + switch (cl->status_code) { case 416: if (!quiet) @@ -167,15 +210,15 @@ static void header_done_cb(struct uclient *cl) break; } - blobmsg_parse(&policy, 1, &attr, blob_data(cl->meta), blob_len(cl->meta)); - if (!attr) { + if (!tb[H_RANGE]) { if (!quiet) fprintf(stderr, "Content-Range header is missing\n"); error_ret = 8; break; } - if (sscanf(blobmsg_get_string(attr), "bytes %"PRIu64"-%"PRIu64"/%"PRIu64, + if (sscanf(blobmsg_get_string(tb[H_RANGE]), + "bytes %"PRIu64"-%"PRIu64"/%"PRIu64, &resume_offset, &resume_end, &resume_size) != 3) { if (!quiet) fprintf(stderr, "Content-Range header is invalid\n"); @@ -186,6 +229,10 @@ static void header_done_cb(struct uclient *cl) case 200: if (no_output) break; + + if (tb[H_LEN]) + out_len = strtoul(blobmsg_get_string(tb[H_LEN]), NULL, 10); + output_fd = open_output_file(cl->url->location, resume_offset); if (output_fd < 0) { if (!quiet) @@ -262,7 +309,9 @@ static int init_request(struct uclient *cl) { int rc; + out_offset = 0; out_bytes = 0; + out_len = 0; uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify); if (timeout) @@ -325,12 +374,18 @@ static void request_done(struct uclient *cl) static void eof_cb(struct uclient *cl) { + if (!quiet) { + pmt_update(&pmt_timer); + uloop_timeout_cancel(&pmt_timer); + fprintf(stderr, "\n"); + } + if (!cl->data_eof) { if (!quiet) fprintf(stderr, "Connection reset prematurely\n"); error_ret = 4; } else if (!quiet) { - fprintf(stderr, "Download completed (%d bytes)\n", out_bytes); + fprintf(stderr, "Download completed (%"PRIu64" bytes)\n", (uint64_t) out_bytes); } request_done(cl); } @@ -385,8 +440,11 @@ static int usage(const char *progname) fprintf(stderr, "Usage: %s [options] \n" "Options:\n" - " -q: Turn off status messages\n" - " -O : Redirect output to file (use \"-\" for stdout)\n" + " -4 Use IPv4 only\n" + " -6 Use IPv6 only\n" + " -q Turn off status messages\n" + " -O Redirect output to file (use \"-\" for stdout)\n" + " -P Set directory for output files\n" " --user= HTTP authentication username\n" " --password= HTTP authentication password\n" " --user-agent|-U Set HTTP user agent\n" @@ -396,8 +454,8 @@ static int usage(const char *progname) " --proxy=on|off|-Y on|off Enable/disable env var configured proxy\n" "\n" "HTTPS options:\n" - " --ca-certificate=: Load CA certificates from file \n" - " --no-check-certificate: don't validate the server's certificate\n" + " --ca-certificate= Load CA certificates from file \n" + " --no-check-certificate don't validate the server's certificate\n" "\n", progname); return 1; } @@ -475,10 +533,12 @@ int main(int argc, char **argv) bool has_cert = false; int i, ch; int rc; + int af = -1; + signal(SIGPIPE, SIG_IGN); init_ustream_ssl(); - while ((ch = getopt_long(argc, argv, "cO:qsU:Y:", longopts, &longopt_idx)) != -1) { + while ((ch = getopt_long(argc, argv, "46cO:P:qsT:U:Y:", longopts, &longopt_idx)) != -1) { switch(ch) { case 0: switch (longopt_idx) { @@ -528,6 +588,12 @@ int main(int argc, char **argv) return usage(progname); } break; + case '4': + af = AF_INET; + break; + case '6': + af = AF_INET6; + break; case 'c': resume = true; break; @@ -537,6 +603,13 @@ int main(int argc, char **argv) case 'O': output_file = optarg; break; + case 'P': + if (chdir(optarg)) { + if (!quiet) + perror("Change output directory"); + exit(1); + } + break; case 'q': quiet = true; break; @@ -589,7 +662,8 @@ int main(int argc, char **argv) proxy_url = get_proxy_url(argv[0]); if (proxy_url) { cl = uclient_new(proxy_url, auth_str, &cb); - uclient_set_proxy_url(cl, argv[0], NULL); + if (cl) + uclient_set_proxy_url(cl, argv[0], NULL); } else { cl = uclient_new(argv[0], auth_str, &cb); } @@ -597,6 +671,8 @@ int main(int argc, char **argv) fprintf(stderr, "Failed to allocate uclient context\n"); return 1; } + if (af >= 0) + uclient_http_set_address_family(cl, af); if (ssl_ctx && default_certs) init_ca_cert();