uclient-fetch: set server_name of the ssl context to support SNI

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

diff --git a/uclient-fetch.c b/uclient-fetch.c
index d4db108..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.
  */
 
+#define _GNU_SOURCE
 #include <unistd.h>
 #include <stdio.h>
 #include <dlfcn.h>
@@ -148,13 +149,27 @@ static void msg_connecting(struct uclient *cl)
        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;
-       uclient_connect(cl);
+
+       rc = uclient_connect(cl);
+       if (rc)
+               return rc;
+
        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)
@@ -179,6 +194,10 @@ static void handle_uclient_error(struct uclient *cl, int code)
                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;
@@ -268,6 +287,7 @@ int main(int argc, char **argv)
        struct uclient *cl;
        int ch;
        int longopt_idx = 0;
+       int rc;
 
        init_ustream_ssl();
 
@@ -339,8 +359,15 @@ int main(int argc, char **argv)
        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);