example: update usage info

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

diff --git a/uclient-http.c b/uclient-http.c
index 2005f0c..e7d3ff0 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -61,6 +61,7 @@ static const char * const request_types[__REQ_MAX] = {
 struct uclient_http {
        struct uclient uc;
 
+       const struct ustream_ssl_ops *ssl_ops;
        struct ustream_ssl_ctx *ssl_ctx;
        struct ustream *us;
 
@@ -68,7 +69,6 @@ struct uclient_http {
        struct ustream_ssl ussl;
 
        bool ssl_require_validation;
-       bool ssl_ctx_ext;
        bool ssl;
        bool eof;
        bool connection_close;
@@ -101,6 +101,7 @@ static const char * const uclient_http_prefix[] = {
 
 static int uclient_do_connect(struct uclient_http *uh, const char *port)
 {
+       socklen_t sl;
        int fd;
 
        if (uh->uc.url->port)
@@ -111,6 +112,14 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
                return -1;
 
        ustream_fd_init(&uh->ufd, fd);
+
+       memset(&uh->uc.local_addr, 0, sizeof(uh->uc.local_addr));
+       memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+
+       sl = sizeof(uh->uc.local_addr);
+       getsockname(fd, &uh->uc.local_addr.sa, &sl);
+       getpeername(fd, &uh->uc.remote_addr.sa, &sl);
+
        return 0;
 }
 
@@ -496,6 +505,8 @@ uclient_http_send_headers(struct uclient_http *uh)
        uclient_http_add_auth_header(uh);
 
        ustream_printf(uh->us, "\r\n");
+
+       uh->state = HTTP_STATE_HEADERS_SENT;
 }
 
 static void uclient_http_headers_complete(struct uclient_http *uh)
@@ -516,7 +527,7 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
        if (uh->uc.cb->header_done)
                uh->uc.cb->header_done(&uh->uc);
 
-       if (uh->req_type == REQ_HEAD) {
+       if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
                uh->eof = true;
                uclient_notify_eof(uh);
        }
@@ -643,13 +654,15 @@ static int uclient_setup_http(struct uclient_http *uh)
        int ret;
 
        uh->us = us;
+       uh->ssl = false;
+
        us->string_data = true;
        us->notify_state = uclient_notify_state;
        us->notify_read = uclient_notify_read;
 
        ret = uclient_do_connect(uh, "80");
        if (ret)
-               return ret;
+               return UCLIENT_ERROR_CONNECT;
 
        return 0;
 }
@@ -704,12 +717,12 @@ static int uclient_setup_https(struct uclient_http *uh)
        uh->ssl = true;
        uh->us = us;
 
+       if (!uh->ssl_ctx)
+               return UCLIENT_ERROR_MISSING_SSL_CONTEXT;
+
        ret = uclient_do_connect(uh, "443");
        if (ret)
-               return ret;
-
-       if (!uh->ssl_ctx)
-               uh->ssl_ctx = ustream_ssl_context_new(false);
+               return UCLIENT_ERROR_CONNECT;
 
        us->string_data = true;
        us->notify_state = uclient_ssl_notify_state;
@@ -717,8 +730,8 @@ static int uclient_setup_https(struct uclient_http *uh)
        uh->ussl.notify_error = uclient_ssl_notify_error;
        uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
        uh->ussl.notify_connected = uclient_ssl_notify_connected;
-       ustream_ssl_init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
-       ustream_ssl_set_peer_cn(&uh->ussl, uh->uc.url->host);
+       uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
+       uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host);
 
        return 0;
 }
@@ -740,9 +753,6 @@ static int uclient_http_connect(struct uclient *cl)
        else
                ret = uclient_setup_http(uh);
 
-       if (ret)
-               uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
-
        return ret;
 }
 
@@ -758,18 +768,16 @@ static struct uclient *uclient_http_alloc(void)
 
 static void uclient_http_free_ssl_ctx(struct uclient_http *uh)
 {
-       if (uh->ssl_ctx && !uh->ssl_ctx_ext)
-               ustream_ssl_context_free(uh->ssl_ctx);
-
-       uh->ssl_ctx_ext = false;
+       uh->ssl_ops = NULL;
+       uh->ssl_ctx = NULL;
 }
 
 static void uclient_http_free(struct uclient *cl)
 {
        struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 
-       uclient_http_free_ssl_ctx(uh);
        uclient_http_free_url_state(cl);
+       uclient_http_free_ssl_ctx(uh);
        blob_buf_free(&uh->headers);
        blob_buf_free(&uh->meta);
        free(uh);
@@ -799,7 +807,7 @@ uclient_http_set_request_type(struct uclient *cl, const char *type)
 }
 
 int
-uclient_http_reset_headers(struct uclient *cl, const char *name, const char *value)
+uclient_http_reset_headers(struct uclient *cl)
 {
        struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 
@@ -833,10 +841,11 @@ uclient_http_send_data(struct uclient *cl, char *buf, unsigned int len)
 
        uclient_http_send_headers(uh);
 
-       ustream_printf(uh->us, "%X\r\n", len);
-       if (len > 0)
+       if (len > 0) {
+               ustream_printf(uh->us, "%X\r\n", len);
                ustream_write(uh->us, buf, len, false);
-       ustream_printf(uh->us, "\r\n");
+               ustream_printf(uh->us, "\r\n");
+       }
 
        return len;
 }
@@ -964,7 +973,8 @@ bool uclient_http_redirect(struct uclient *cl)
        return true;
 }
 
-int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bool require_validation)
+int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *ops,
+                            struct ustream_ssl_ctx *ctx, bool require_validation)
 {
        struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 
@@ -974,8 +984,8 @@ int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bo
        uclient_http_free_url_state(cl);
 
        uclient_http_free_ssl_ctx(uh);
+       uh->ssl_ops = ops;
        uh->ssl_ctx = ctx;
-       uh->ssl_ctx_ext = !!ctx;
        uh->ssl_require_validation = !!ctx && require_validation;
 
        return 0;