projects
/
project
/
uclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support for connection timeout
[project/uclient.git]
/
uclient-fetch.c
diff --git
a/uclient-fetch.c
b/uclient-fetch.c
index
1644921
..
0617a02
100644
(file)
--- a/
uclient-fetch.c
+++ b/
uclient-fetch.c
@@
-16,6
+16,7
@@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#define _GNU_SOURCE
#include <unistd.h>
#include <stdio.h>
#include <dlfcn.h>
#include <unistd.h>
#include <stdio.h>
#include <dlfcn.h>
@@
-41,6
+42,9
@@
static const char *output_file;
static int output_fd = -1;
static int error_ret;
static int out_bytes;
static int output_fd = -1;
static int error_ret;
static int out_bytes;
+static char *username;
+static char *password;
+static char *auth_str;
static int open_output_file(const char *path, bool create)
{
static int open_output_file(const char *path, bool create)
{
@@
-142,16
+146,30
@@
static void msg_connecting(struct uclient *cl)
return;
uclient_get_addr(addr, &port, &cl->remote_addr);
return;
uclient_get_addr(addr, &port, &cl->remote_addr);
- fprintf(stderr, "Connecting to %s
%s:%d\n", cl->url->host
, addr, port);
+ fprintf(stderr, "Connecting to %s
:%d\n"
, addr, port);
}
}
-static
void
init_request(struct uclient *cl)
+static
int
init_request(struct uclient *cl)
{
{
+ int rc;
+
out_bytes = 0;
out_bytes = 0;
- uclient_connect(cl);
+
+ rc = uclient_connect(cl);
+ if (rc)
+ return rc;
+
msg_connecting(cl);
msg_connecting(cl);
- uclient_http_set_request_type(cl, "GET");
- uclient_request(cl);
+
+ rc = uclient_http_set_request_type(cl, "GET");
+ if (rc)
+ return rc;
+
+ rc = uclient_request(cl);
+ if (rc)
+ return rc;
+
+ return 0;
}
static void eof_cb(struct uclient *cl)
}
static void eof_cb(struct uclient *cl)
@@
-176,6
+194,10
@@
static void handle_uclient_error(struct uclient *cl, int code)
type = "Connection failed";
error_ret = 4;
break;
type = "Connection failed";
error_ret = 4;
break;
+ case UCLIENT_ERROR_TIMEDOUT:
+ type = "Connection timed out";
+ error_ret = 4;
+ break;
case UCLIENT_ERROR_SSL_INVALID_CERT:
type = "Invalid SSL certificate";
ignore = !verify;
case UCLIENT_ERROR_SSL_INVALID_CERT:
type = "Invalid SSL certificate";
ignore = !verify;
@@
-247,11
+269,15
@@
static int no_ssl(const char *progname)
enum {
L_NO_CHECK_CERTIFICATE,
L_CA_CERTIFICATE,
enum {
L_NO_CHECK_CERTIFICATE,
L_CA_CERTIFICATE,
+ L_USER,
+ L_PASSWORD,
};
static const struct option longopts[] = {
[L_NO_CHECK_CERTIFICATE] = { "no-check-certificate", no_argument },
[L_CA_CERTIFICATE] = { "ca-certificate", required_argument },
};
static const struct option longopts[] = {
[L_NO_CHECK_CERTIFICATE] = { "no-check-certificate", no_argument },
[L_CA_CERTIFICATE] = { "ca-certificate", required_argument },
+ [L_USER] = { "user", required_argument },
+ [L_PASSWORD] = { "password", required_argument },
{}
};
{}
};
@@
-261,6
+287,7
@@
int main(int argc, char **argv)
struct uclient *cl;
int ch;
int longopt_idx = 0;
struct uclient *cl;
int ch;
int longopt_idx = 0;
+ int rc;
init_ustream_ssl();
init_ustream_ssl();
@@
-275,6
+302,18
@@
int main(int argc, char **argv)
if (ssl_ctx)
ssl_ops->context_add_ca_crt_file(ssl_ctx, optarg);
break;
if (ssl_ctx)
ssl_ops->context_add_ca_crt_file(ssl_ctx, optarg);
break;
+ case L_USER:
+ if (!strlen(optarg))
+ break;
+ username = strdup(optarg);
+ memset(optarg, '*', strlen(optarg));
+ break;
+ case L_PASSWORD:
+ if (!strlen(optarg))
+ break;
+ password = strdup(optarg);
+ memset(optarg, '*', strlen(optarg));
+ break;
default:
return usage(progname);
}
default:
return usage(progname);
}
@@
-301,7
+340,17
@@
int main(int argc, char **argv)
uloop_init();
uloop_init();
- cl = uclient_new(argv[0], NULL, &cb);
+ if (username) {
+ if (password)
+ asprintf(&auth_str, "%s:%s", username, password);
+ else
+ auth_str = username;
+ }
+
+ if (!quiet)
+ fprintf(stderr, "Downloading '%s'\n", argv[0]);
+
+ cl = uclient_new(argv[0], auth_str, &cb);
if (!cl) {
fprintf(stderr, "Failed to allocate uclient context\n");
return 1;
if (!cl) {
fprintf(stderr, "Failed to allocate uclient context\n");
return 1;
@@
-310,8
+359,15
@@
int main(int argc, char **argv)
if (ssl_ctx)
uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
if (ssl_ctx)
uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
- init_request(cl);
- uloop_run();
+ rc = init_request(cl);
+ if (!rc) {
+ /* no error received, we can enter main loop */
+ uloop_run();
+ } else {
+ fprintf(stderr, "Failed to establish connection\n");
+ error_ret = 4;
+ }
+
uloop_done();
uclient_free(cl);
uloop_done();
uclient_free(cl);