X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-fetch.c;h=5ab2ea08faec0c118592432986d1da55059abf69;hp=da1126859b9521a36c231e070e9ad35b573fbc4c;hb=243aea1f7f1b50da2228a89812ff77a92dae82ad;hpb=5c52f09ef02a07e7c99393a6bb97d956fe3bffe4

diff --git a/uclient-fetch.c b/uclient-fetch.c
index da11268..5ab2ea0 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -17,12 +17,16 @@
  */
 
 #define _GNU_SOURCE
+#include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <dlfcn.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <glob.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <signal.h>
 
 #include <libubox/blobmsg.h>
 
@@ -41,29 +45,55 @@ static struct ustream_ssl_ctx *ssl_ctx;
 static const struct ustream_ssl_ops *ssl_ops;
 static int quiet = false;
 static bool verify = true;
+static bool proxy = true;
 static bool default_certs = false;
 static bool no_output;
 static const char *output_file;
 static int output_fd = -1;
 static int error_ret;
 static int out_bytes;
-static char *username;
-static char *password;
 static char *auth_str;
 static char **urls;
 static int n_urls;
 static int timeout;
+static bool resume, cur_resume;
 
+static int init_request(struct uclient *cl);
 static void request_done(struct uclient *cl);
 
-static int open_output_file(const char *path, bool create)
+static const char *
+get_proxy_url(char *url)
+{
+	char prefix[16];
+	char *sep;
+
+	if (!proxy)
+		return NULL;
+
+	sep = strchr(url, ':');
+	if (!sep)
+		return NULL;
+
+	if (sep - url > 5)
+		return NULL;
+
+	memcpy(prefix, url, sep - url);
+	strcpy(prefix + (sep - url), "_proxy");
+	return getenv(prefix);
+}
+
+static int open_output_file(const char *path, uint64_t resume_offset)
 {
 	char *filename = NULL;
-	int flags = O_WRONLY;
+	int flags;
 	int ret;
 
-	if (create)
-		flags |= O_CREAT | O_EXCL;
+	if (cur_resume)
+		flags = O_RDWR;
+	else
+		flags = O_WRONLY | O_EXCL;
+
+	flags |= O_CREAT;
 
 	if (output_file) {
 		if (!strcmp(output_file, "-")) {
@@ -82,11 +112,30 @@ static int open_output_file(const char *path, bool create)
 	ret = open(output_file, flags, 0644);
 	free(filename);
 
+	if (ret < 0)
+		return ret;
+
+	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;
+	}
+
+	out_bytes += resume_offset;
+
 	return ret;
 }
 
 static void header_done_cb(struct uclient *cl)
 {
+	static const struct blobmsg_policy policy = {
+		.name = "content-range",
+		.type = BLOBMSG_TYPE_STRING
+	};
+	struct blob_attr *attr;
+	uint64_t resume_offset = 0, resume_end, resume_size;
 	static int retries;
 
 	if (retries < 10 && uclient_http_redirect(cl)) {
@@ -97,13 +146,48 @@ static void header_done_cb(struct uclient *cl)
 		return;
 	}
 
-	retries = 0;
+	if (cl->status_code == 204 && cur_resume) {
+		/* Resume attempt failed, try normal download */
+		cur_resume = false;
+		init_request(cl);
+		return;
+	}
+
 	switch (cl->status_code) {
+	case 416:
+		if (!quiet)
+			fprintf(stderr, "File download already fully retrieved; nothing to do.\n");
+		request_done(cl);
+		break;
+	case 206:
+		if (!cur_resume) {
+			if (!quiet)
+				fprintf(stderr, "Error: Partial content received, full content requested\n");
+			error_ret = 8;
+			request_done(cl);
+			break;
+		}
+
+		blobmsg_parse(&policy, 1, &attr, blob_data(cl->meta), blob_len(cl->meta));
+		if (!attr) {
+			if (!quiet)
+				fprintf(stderr, "Content-Range header is missing\n");
+			error_ret = 8;
+			break;
+		}
+
+		if (sscanf(blobmsg_get_string(attr), "bytes %"PRIu64"-%"PRIu64"/%"PRIu64,
+			   &resume_offset, &resume_end, &resume_size) != 3) {
+			if (!quiet)
+				fprintf(stderr, "Content-Range header is invalid\n");
+			error_ret = 8;
+			break;
+		}
 	case 204:
 	case 200:
 		if (no_output)
 			break;
-		output_fd = open_output_file(cl->url->location, true);
+		output_fd = open_output_file(cl->url->location, resume_offset);
 		if (output_fd < 0) {
 			if (!quiet)
 				perror("Cannot open output file");
@@ -152,6 +236,29 @@ static void msg_connecting(struct uclient *cl)
 	fprintf(stderr, "Connecting to %s:%d\n", addr, port);
 }
 
+static void check_resume_offset(struct uclient *cl)
+{
+	char range_str[64];
+	struct stat st;
+	char *file;
+	int ret;
+
+	file = uclient_get_url_filename(cl->url->location, "index.html");
+	if (!file)
+		return;
+
+	ret = stat(file, &st);
+	free(file);
+	if (ret)
+		return;
+
+	if (!st.st_size)
+		return;
+
+	snprintf(range_str, sizeof(range_str), "bytes=%"PRIu64"-", (uint64_t) st.st_size);
+	uclient_http_set_header(cl, "Range", range_str);
+}
+
 static int init_request(struct uclient *cl)
 {
 	int rc;
@@ -174,6 +281,8 @@ static int init_request(struct uclient *cl)
 
 	uclient_http_reset_headers(cl);
 	uclient_http_set_header(cl, "User-Agent", user_agent);
+	if (cur_resume)
+		check_resume_offset(cl);
 
 	if (post_data) {
 		uclient_http_set_header(cl, "Content-Type", "application/x-www-form-urlencoded");
@@ -189,9 +298,18 @@ static int init_request(struct uclient *cl)
 
 static void request_done(struct uclient *cl)
 {
+	const char *proxy_url;
+
 	if (n_urls) {
-		uclient_set_url(cl, *urls, auth_str);
+		proxy_url = get_proxy_url(*urls);
+		if (proxy_url) {
+			uclient_set_url(cl, proxy_url, NULL);
+			uclient_set_proxy_url(cl, *urls, auth_str);
+		} else {
+			uclient_set_url(cl, *urls, auth_str);
+		}
 		n_urls--;
+		cur_resume = resume;
 		error_ret = init_request(cl);
 		if (error_ret == 0)
 			return;
@@ -270,12 +388,14 @@ static int usage(const char *progname)
 		"Options:\n"
 		"	-q:                             Turn off status messages\n"
 		"	-O <file>:                      Redirect output to file (use \"-\" for stdout)\n"
+		"	-P <dir>:			Set directory for output files\n"
 		"	--user=<user>			HTTP authentication username\n"
 		"	--password=<password>		HTTP authentication password\n"
 		"	--user-agent|-U <str>		Set HTTP user agent\n"
 		"	--post-data=STRING		use the POST method; send STRING as the data\n"
 		"	--spider|-s			Spider mode - only check file existence\n"
 		"	--timeout=N|-T N		Set connect/request timeout to N seconds\n"
+		"	--proxy=on|off|-Y on|off	Enable/disable env var configured proxy\n"
 		"\n"
 		"HTTPS options:\n"
 		"	--ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
@@ -324,6 +444,9 @@ enum {
 	L_POST_DATA,
 	L_SPIDER,
 	L_TIMEOUT,
+	L_CONTINUE,
+	L_PROXY,
+	L_NO_PROXY,
 };
 
 static const struct option longopts[] = {
@@ -335,6 +458,9 @@ static const struct option longopts[] = {
 	[L_POST_DATA] = { "post-data", required_argument },
 	[L_SPIDER] = { "spider", no_argument },
 	[L_TIMEOUT] = { "timeout", required_argument },
+	[L_CONTINUE] = { "continue", no_argument },
+	[L_PROXY] = { "proxy", required_argument },
+	[L_NO_PROXY] = { "no-proxy", no_argument },
 	{}
 };
 
@@ -343,15 +469,19 @@ static const struct option longopts[] = {
 int main(int argc, char **argv)
 {
 	const char *progname = argv[0];
+	const char *proxy_url;
+	char *username = NULL;
+	char *password = NULL;
 	struct uclient *cl;
 	int longopt_idx = 0;
 	bool has_cert = false;
 	int i, ch;
 	int rc;
 
+	signal(SIGPIPE, SIG_IGN);
 	init_ustream_ssl();
 
-	while ((ch = getopt_long(argc, argv, "O:qsU:", longopts, &longopt_idx)) != -1) {
+	while ((ch = getopt_long(argc, argv, "cO:P:qsU:Y:", longopts, &longopt_idx)) != -1) {
 		switch(ch) {
 		case 0:
 			switch (longopt_idx) {
@@ -387,16 +517,36 @@ int main(int argc, char **argv)
 			case L_TIMEOUT:
 				timeout = atoi(optarg);
 				break;
+			case L_CONTINUE:
+				resume = true;
+				break;
+			case L_PROXY:
+				if (strcmp(optarg, "on") != 0)
+					proxy = false;
+				break;
+			case L_NO_PROXY:
+				proxy = false;
+				break;
 			default:
 				return usage(progname);
 			}
 			break;
+		case 'c':
+			resume = true;
+			break;
 		case 'U':
 			user_agent = optarg;
 			break;
 		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;
@@ -406,6 +556,10 @@ int main(int argc, char **argv)
 		case 'T':
 			timeout = atoi(optarg);
 			break;
+		case 'Y':
+			if (strcmp(optarg, "on") != 0)
+				proxy = false;
+			break;
 		default:
 			return usage(progname);
 		}
@@ -442,7 +596,13 @@ int main(int argc, char **argv)
 	if (!quiet)
 		fprintf(stderr, "Downloading '%s'\n", argv[0]);
 
-	cl = uclient_new(argv[0], auth_str, &cb);
+	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);
+	} else {
+		cl = uclient_new(argv[0], auth_str, &cb);
+	}
 	if (!cl) {
 		fprintf(stderr, "Failed to allocate uclient context\n");
 		return 1;
@@ -451,6 +611,7 @@ int main(int argc, char **argv)
 	if (ssl_ctx && default_certs)
 		init_ca_cert();
 
+	cur_resume = resume;
 	rc = init_request(cl);
 	if (!rc) {
 		/* no error received, we can enter main loop */