X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=uclient-fetch.c;h=ab29ceac2803e03dbf78cde41ee1904384596470;hb=b9bb340542facf12789047182d2f05a11499dcdd;hp=965f62142e1f9551fb1510692bc71563211783c5;hpb=b733f729ede556b62ca81714cba05029d9dbafb4;p=project%2Fuclient.git

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 965f621..ab29cea 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -35,6 +35,8 @@
 #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;
@@ -47,6 +49,10 @@ static int out_bytes;
 static char *username;
 static char *password;
 static char *auth_str;
+static char **urls;
+static int n_urls;
+
+static void request_done(struct uclient *cl);
 
 static int open_output_file(const char *path, bool create)
 {
@@ -77,16 +83,6 @@ static int open_output_file(const char *path, bool create)
 	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;
@@ -156,6 +152,7 @@ static int init_request(struct uclient *cl)
 	int rc;
 
 	out_bytes = 0;
+	uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
 
 	rc = uclient_connect(cl);
 	if (rc)
@@ -163,10 +160,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 +179,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) {
@@ -240,6 +264,8 @@ static int usage(const char *progname)
 		"	-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"
 		"\n"
 		"HTTPS options:\n"
 		"	--ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
@@ -284,6 +310,8 @@ enum {
 	L_CA_CERTIFICATE,
 	L_USER,
 	L_PASSWORD,
+	L_USER_AGENT,
+	L_POST_DATA,
 };
 
 static const struct option longopts[] = {
@@ -291,21 +319,25 @@ 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 },
 	{}
 };
 
+
+
 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, "qO:U:", longopts, &longopt_idx)) != -1) {
 		switch(ch) {
 		case 0:
 			switch (longopt_idx) {
@@ -329,10 +361,19 @@ 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;
 			default:
 				return usage(progname);
 			}
 			break;
+		case 'U':
+			user_agent = optarg;
+			break;
 		case 'O':
 			output_file = optarg;
 			break;
@@ -350,11 +391,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();
 
@@ -374,10 +422,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) {