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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 37cc214..da11268 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -35,11 +35,14 @@
 #define LIB_EXT "so"
 #endif
 
+static const char *user_agent = "uclient-fetch";
+static const char *post_data;
 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 default_certs = false;
+static bool no_output;
 static const char *output_file;
 static int output_fd = -1;
 static int error_ret;
@@ -47,10 +50,15 @@ 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 void request_done(struct uclient *cl);
 
 static int open_output_file(const char *path, bool create)
 {
-	char *filename;
+	char *filename = NULL;
 	int flags = O_WRONLY;
 	int ret;
 
@@ -58,35 +66,25 @@ static int open_output_file(const char *path, bool create)
 		flags |= O_CREAT | O_EXCL;
 
 	if (output_file) {
-		if (!strcmp(output_file, "-"))
-			return STDOUT_FILENO;
-
-		if (!quiet)
-			fprintf(stderr, "Writing to stdout\n");
+		if (!strcmp(output_file, "-")) {
+			if (!quiet)
+				fprintf(stderr, "Writing to stdout\n");
 
-		unlink(output_file);
-		return open(output_file, flags, 0644);
+			return STDOUT_FILENO;
+		}
+	} else {
+		filename = uclient_get_url_filename(path, "index.html");
+		output_file = filename;
 	}
 
-	filename = uclient_get_url_filename(path, "index.html");
 	if (!quiet)
-		fprintf(stderr, "Writing to '%s'\n", filename);
-	ret = open(filename, flags, 0644);
+		fprintf(stderr, "Writing to '%s'\n", output_file);
+	ret = open(output_file, flags, 0644);
 	free(filename);
 
 	return ret;
 }
 
-static void request_done(struct uclient *cl)
-{
-	if (output_fd >= 0 && !output_file) {
-		close(output_fd);
-		output_fd = -1;
-	}
-	uclient_disconnect(cl);
-	uloop_end();
-}
-
 static void header_done_cb(struct uclient *cl)
 {
 	static int retries;
@@ -103,6 +101,8 @@ static void header_done_cb(struct uclient *cl)
 	switch (cl->status_code) {
 	case 204:
 	case 200:
+		if (no_output)
+			break;
 		output_fd = open_output_file(cl->url->location, true);
 		if (output_fd < 0) {
 			if (!quiet)
@@ -126,7 +126,7 @@ static void read_data_cb(struct uclient *cl)
 	char buf[256];
 	int len;
 
-	if (output_fd < 0)
+	if (!no_output && output_fd < 0)
 		return;
 
 	while (1) {
@@ -135,7 +135,8 @@ static void read_data_cb(struct uclient *cl)
 			return;
 
 		out_bytes += len;
-		write(output_fd, buf, len);
+		if (!no_output)
+			write(output_fd, buf, len);
 	}
 }
 
@@ -156,6 +157,10 @@ static int init_request(struct uclient *cl)
 	int rc;
 
 	out_bytes = 0;
+	uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
+
+	if (timeout)
+		cl->timeout_msecs = timeout * 1000;
 
 	rc = uclient_connect(cl);
 	if (rc)
@@ -163,10 +168,18 @@ static int init_request(struct uclient *cl)
 
 	msg_connecting(cl);
 
-	rc = uclient_http_set_request_type(cl, "GET");
+	rc = uclient_http_set_request_type(cl, post_data ? "POST" : "GET");
 	if (rc)
 		return rc;
 
+	uclient_http_reset_headers(cl);
+	uclient_http_set_header(cl, "User-Agent", user_agent);
+
+	if (post_data) {
+		uclient_http_set_header(cl, "Content-Type", "application/x-www-form-urlencoded");
+		uclient_write(cl, post_data, strlen(post_data));
+	}
+
 	rc = uclient_request(cl);
 	if (rc)
 		return rc;
@@ -174,6 +187,25 @@ static int init_request(struct uclient *cl)
 	return 0;
 }
 
+static void request_done(struct uclient *cl)
+{
+	if (n_urls) {
+		uclient_set_url(cl, *urls, auth_str);
+		n_urls--;
+		error_ret = init_request(cl);
+		if (error_ret == 0)
+			return;
+	}
+
+	if (output_fd >= 0 && !output_file) {
+		close(output_fd);
+		output_fd = -1;
+	}
+	uclient_disconnect(cl);
+	uloop_end();
+}
+
+
 static void eof_cb(struct uclient *cl)
 {
 	if (!cl->data_eof) {
@@ -238,6 +270,12 @@ static int usage(const char *progname)
 		"Options:\n"
 		"	-q:                             Turn off status messages\n"
 		"	-O <file>:                      Redirect output to file (use \"-\" for stdout)\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"
 		"\n"
 		"HTTPS options:\n"
 		"	--ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
@@ -282,6 +320,10 @@ enum {
 	L_CA_CERTIFICATE,
 	L_USER,
 	L_PASSWORD,
+	L_USER_AGENT,
+	L_POST_DATA,
+	L_SPIDER,
+	L_TIMEOUT,
 };
 
 static const struct option longopts[] = {
@@ -289,21 +331,27 @@ static const struct option longopts[] = {
 	[L_CA_CERTIFICATE] = { "ca-certificate", required_argument },
 	[L_USER] = { "user", required_argument },
 	[L_PASSWORD] = { "password", required_argument },
+	[L_USER_AGENT] = { "user-agent", required_argument },
+	[L_POST_DATA] = { "post-data", required_argument },
+	[L_SPIDER] = { "spider", no_argument },
+	[L_TIMEOUT] = { "timeout", required_argument },
 	{}
 };
 
+
+
 int main(int argc, char **argv)
 {
 	const char *progname = argv[0];
 	struct uclient *cl;
-	int ch;
 	int longopt_idx = 0;
 	bool has_cert = false;
+	int i, ch;
 	int rc;
 
 	init_ustream_ssl();
 
-	while ((ch = getopt_long(argc, argv, "qO:", longopts, &longopt_idx)) != -1) {
+	while ((ch = getopt_long(argc, argv, "O:qsU:", longopts, &longopt_idx)) != -1) {
 		switch(ch) {
 		case 0:
 			switch (longopt_idx) {
@@ -327,16 +375,37 @@ int main(int argc, char **argv)
 				password = strdup(optarg);
 				memset(optarg, '*', strlen(optarg));
 				break;
+			case L_USER_AGENT:
+				user_agent = optarg;
+				break;
+			case L_POST_DATA:
+				post_data = optarg;
+				break;
+			case L_SPIDER:
+				no_output = true;
+				break;
+			case L_TIMEOUT:
+				timeout = atoi(optarg);
+				break;
 			default:
 				return usage(progname);
 			}
 			break;
+		case 'U':
+			user_agent = optarg;
+			break;
 		case 'O':
 			output_file = optarg;
 			break;
 		case 'q':
 			quiet = true;
 			break;
+		case 's':
+			no_output = true;
+			break;
+		case 'T':
+			timeout = atoi(optarg);
+			break;
 		default:
 			return usage(progname);
 		}
@@ -348,11 +417,18 @@ int main(int argc, char **argv)
 	if (verify && !has_cert)
 		default_certs = true;
 
-	if (argc != 1)
+	if (argc < 1)
 		return usage(progname);
 
-	if (!strncmp(argv[0], "https", 5) && !ssl_ctx)
-		return no_ssl(progname);
+	if (!ssl_ctx) {
+		for (i = 0; i < argc; i++) {
+			if (!strncmp(argv[i], "https", 5))
+				return no_ssl(progname);
+		}
+	}
+
+	urls = argv + 1;
+	n_urls = argc - 1;
 
 	uloop_init();
 
@@ -372,10 +448,8 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if (ssl_ctx) {
+	if (ssl_ctx && default_certs)
 		init_ca_cert();
-		uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
-	}
 
 	rc = init_request(cl);
 	if (!rc) {