example: handle uclient connection errors

[project/uclient.git] / uclient-example.c

diff --git a/uclient-example.c b/uclient-example.c
index 32fc314..144696c 100644 (file)
--- a/uclient-example.c
+++ b/uclient-example.c
@@ -35,8 +35,9 @@
 static struct ustream_ssl_ctx *ssl_ctx;
 static const struct ustream_ssl_ops *ssl_ops;
 static int quiet = false;
+static bool verify = true;
 static const char *output_file;
-static int output_fd;
+static int output_fd = -1;
 static int error_ret;
 
 static int open_output_file(const char *path, bool create)
@@ -83,26 +84,55 @@ static int open_output_file(const char *path, bool create)
        return open(filename, flags, 0644);
 }
 
+static void request_done(struct uclient *cl)
+{
+       if (output_fd >= 0) {
+               close(output_fd);
+               output_fd = -1;
+       }
+       uclient_disconnect(cl);
+       uloop_end();
+}
+
 static void example_header_done(struct uclient *cl)
 {
+       static int retries;
+
        struct blob_attr *cur;
        int rem;
 
-       if (quiet)
+       if (retries < 10 && uclient_http_redirect(cl)) {
+               if (!quiet)
+                       fprintf(stderr, "Redirected to %s on %s\n", cl->url->location, cl->url->host);
+
+               retries++;
                return;
+       }
 
-       printf("Headers (%d): \n", cl->status_code);
-       blobmsg_for_each_attr(cur, cl->meta, rem) {
-               printf("%s=%s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
+       retries = 0;
+       if (!quiet) {
+               fprintf(stderr, "Headers (%d): \n", cl->status_code);
+               blobmsg_for_each_attr(cur, cl->meta, rem) {
+                       fprintf(stderr, "%s=%s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
+               }
        }
 
-       output_fd = open_output_file(cl->url->location, true);
-       if (output_fd < 0) {
-               if (!quiet)
-                       perror("Cannot open output file");
-               error_ret = 3;
-               uclient_disconnect(cl);
-               uloop_end();
+       switch (cl->status_code) {
+       case 204:
+       case 200:
+               output_fd = open_output_file(cl->url->location, true);
+               if (output_fd < 0) {
+                       if (!quiet)
+                               perror("Cannot open output file");
+                       error_ret = 3;
+                       request_done(cl);
+               }
+               break;
+
+       default:
+               request_done(cl);
+               error_ret = 8;
+               break;
        }
 }
 
@@ -111,7 +141,7 @@ static void example_read_data(struct uclient *cl)
        char buf[256];
        int len;
 
-       if (error_ret)
+       if (output_fd < 0)
                return;
 
        while (1) {
@@ -143,37 +173,50 @@ static void init_request(struct uclient *cl)
        uclient_request(cl);
 }
 
-static void request_done(struct uclient *cl)
-{
-       uloop_end();
-}
-
 static void example_eof(struct uclient *cl)
 {
-       static int retries;
-
-       if (retries < 10 && uclient_http_redirect(cl)) {
-               retries++;
-               return;
-       }
-
-       retries = 0;
        request_done(cl);
 }
 
-static void example_error(struct uclient *cl, int code)
+static void handle_uclient_error(struct uclient *cl, int code)
 {
+       const char *type = "Unknown error";
+       bool ignore = false;
+
+       switch(code) {
+       case UCLIENT_ERROR_CONNECT:
+               type = "Connection failed";
+               error_ret = 4;
+               break;
+       case UCLIENT_ERROR_SSL_INVALID_CERT:
+               type = "Invalid SSL certificate";
+               ignore = !verify;
+               error_ret = 5;
+               break;
+       case UCLIENT_ERROR_SSL_CN_MISMATCH:
+               type = "Server hostname does not match SSL certificate";
+               ignore = !verify;
+               error_ret = 5;
+               break;
+       default:
+               error_ret = 1;
+               break;
+       }
+
        if (!quiet)
-               fprintf(stderr, "Error %d!\n", code);
+               fprintf(stderr, "Connection error: %s%s\n", type, ignore ? " (ignored)" : "");
 
-       request_done(cl);
+       if (ignore)
+               error_ret = 0;
+       else
+               request_done(cl);
 }
 
 static const struct uclient_cb cb = {
        .header_done = example_header_done,
        .data_read = example_read_data,
        .data_eof = example_eof,
-       .error = example_error,
+       .error = handle_uclient_error,
 };
 
 static int usage(const char *progname)
@@ -227,7 +270,6 @@ int main(int argc, char **argv)
 {
        const char *progname = argv[0];
        struct uclient *cl;
-       bool verify = true;
        int ch;
        int longopt_idx = 0;